git-svn-id:...

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@53369 954022d7-b5bf-4e40-9824-e11837661b57

DoctRenderer/COMMON/JoinerPPT/Program.cs

@@ -21,10 +21,17 @@ namespace Joiner
             string strRoot = strApplication + "\\OfficeWeb\\";
             List<string> files = new List<string>();
 
-            files.Add("../ServerComponents/DoctRenderer/COMMON/native.js");
+            //files.Add("../ServerComponents/DoctRenderer/COMMON/native.js");
+            //files.Add("Common/3rdparty/XRegExp/xregexp-all.js");
+            
             files.Add("Common/browser.js");
-            files.Add("Common/3rdparty/XRegExp/xregexp-all.js");
             files.Add("Common/editorscommon.js");
+
+            files.Add("Common/downloaderfiles.js");
+            files.Add("Common/docscoapicommon.js");
+            files.Add("Common/docscoapi.js");
+            files.Add("Common/spellcheckapi.js");
+
             files.Add("Common/wordcopypaste.js");
     		
             files.Add("Common/apiCommon.js");
@@ -49,6 +56,10 @@ namespace Joiner
             files.Add("Common/FontsFreeType/FontManager.js");
             files.Add("Word/Drawing/Externals.js");
             files.Add("Word/Drawing/GlobalLoaders.js");
+            
+            files.Add("Word/Drawing/Rulers.js");
+            files.Add("Word/Drawing/WorkEvents.js");
+            files.Add("Word/Drawing/Controls.js");
 
             files.Add("Word/Drawing/translations.js");            
             files.Add("Word/Drawing/Metafile.js");
@@ -142,10 +153,14 @@ namespace Joiner
             files.Add("PowerPoint/Editor/GraphicObjects.js");
             files.Add("PowerPoint/Editor/States.js");
 
-            files.Add("../ServerComponents/DoctRenderer/COMMON/native_ppt/DrawingDocument.js");
-            files.Add("../ServerComponents/DoctRenderer/COMMON/native_ppt/HtmlPage.js");
-            files.Add("../ServerComponents/DoctRenderer/COMMON/native_ppt/api.js");
-            files.Add("../ServerComponents/DoctRenderer/COMMON/native_ppt/corrector.js");
+            files.Add("PowerPoint/Drawing/DrawingDocument.js");
+            files.Add("PowerPoint/Drawing/HtmlPage.js");
+            files.Add("PowerPoint/api.js");
+
+            //files.Add("../ServerComponents/DoctRenderer/COMMON/native_ppt/DrawingDocument.js");
+            //files.Add("../ServerComponents/DoctRenderer/COMMON/native_ppt/HtmlPage.js");
+            //files.Add("../ServerComponents/DoctRenderer/COMMON/native_ppt/api.js");
+            //files.Add("../ServerComponents/DoctRenderer/COMMON/native_ppt/corrector.js");
 
             StringBuilder oBuilder = new StringBuilder();
 

DoctRenderer/COMMON/native.js

@@ -282,19 +282,11 @@ function NativeApplyChanges()
 function NativeGetFileString()
 {
     return _api.asc_nativeGetFile();
-    if (NATIVE_DOCUMENT_TYPE == "presentation")
-    {
-        var writer = new CBinaryFileWriter();
-        window.editor.WordControl.m_oLogicDocument.CalculateComments();
-        return writer.WriteDocument(window.editor.WordControl.m_oLogicDocument);
-    }
 }
 
 function GetNativeCountPages()
 {
     return _api.asc_nativePrintPagesCount();
-    if (NATIVE_DOCUMENT_TYPE == "presentation")
-        return window.editor.WordControl.m_oDrawingDocument.SlidesCount;
 }
 
 window.memory1 = null;
@@ -324,16 +316,6 @@ function GetNativePageBase64(pageIndex)
     
     _api.asc_nativePrint(native_renderer, pageIndex);
     return window.memory1;
-    
-    /*
-    if (NATIVE_DOCUMENT_TYPE == "presentation")
-    {
-        var _logic_doc = window.editor.WordControl.m_oLogicDocument;
-        native_renderer.BeginPage(_logic_doc.Width, _logic_doc.Height);
-        window.editor.WordControl.m_oLogicDocument.DrawPage(pageIndex, native_renderer);
-        native_renderer.EndPage();    
-    }
-    */
 }
 
 function GetNativeId()

DoctRenderer/DoctRenderer.h

@@ -238,6 +238,7 @@ public:
 				case DoctRendererFormat::PDF:
 					{
 						sResource = MAKEINTRESOURCE(IDB_SCRIPT_EDITOR);
+						strCorrector = _T("var NATIVE_DOCUMENT_TYPE = \"document\";");
 						break;
 					}
 				default:
@@ -253,6 +254,7 @@ public:
 				case DoctRendererFormat::PDF:
 					{
 						sResource = MAKEINTRESOURCE(IDB_SCRIPT_PPTX);
+						strCorrector = _T("var NATIVE_DOCUMENT_TYPE = \"presentation\";");
 						break;
 					}
 				default:
@@ -531,6 +533,7 @@ private:
 					if (try_catch.HasCaught()) 
 					{
 						int nLineError = try_catch.Message()->GetLineNumber();
+						CString strCode = to_cstring(try_catch.Message()->GetSourceLine());
 						strException = to_cstring(try_catch.Message()->Get()); //  ?  
 						return FALSE;
 					}
@@ -556,6 +559,7 @@ private:
 					if (try_catch.HasCaught()) 
 					{
 						int nLineError = try_catch.Message()->GetLineNumber();
+						CString strCode = to_cstring(try_catch.Message()->GetSourceLine());
 						strException = to_cstring(try_catch.Message()->Get()); //  ?  
 						return FALSE;
 					}
@@ -569,6 +573,7 @@ private:
 					
 					if (try_catch.HasCaught()) 
 					{
+						CString strCode = to_cstring(try_catch.Message()->GetSourceLine());
 						strException = to_cstring(try_catch.Message()->Get()); //  ?  
 						return FALSE;
 					}