doctrenderer save to pdf error

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59637 954022d7-b5bf-4e40-9824-e11837661b57

Word/Editor/Document.js

@@ -1389,7 +1389,7 @@ CDocument.prototype =
                 {
                     if ( PageIndex + 1 > this.FullRecalc.StartPage + 2 )
                     {
-                        if (window["native"]["WC_CheckSuspendRecalculate"]())
+                        if (window["native"]["WC_CheckSuspendRecalculate"] && window["native"]["WC_CheckSuspendRecalculate"]())
                             return;
                     }
 
@@ -2027,7 +2027,7 @@ CDocument.prototype =
             {
                 if ( _PageIndex > this.FullRecalc.StartPage + 2 )
                 {
-					if (window["native"]["WC_CheckSuspendRecalculate"]())
+					if (window["native"]["WC_CheckSuspendRecalculate"] && window["native"]["WC_CheckSuspendRecalculate"]())
 						return;                    
                 }
 

Word/api.js

@@ -7774,17 +7774,23 @@ window["asc_docs_api"].prototype["asc_nativeCalculateFile"] = function()
             CollaborativeEditing.Release_Locks();
             return;
         }
-    }    
-
-    History.RecalcData_Add( { Type : historyrecalctype_Inline, Data : { Pos : 0, PageNum : 0 } } );
+    }
 
-    //Recalculate для Document
     Document.CurPos.ContentPos = 0;
-    History.RecalcData_Add({Type: historyrecalctype_Drawing, All: true});
-    Document.DrawingObjects.addToZIndexManagerAfterOpen();
 
-    Document.Recalculate();
-    
+    var RecalculateData =
+    {
+        Inline : { Pos : 0, PageNum : 0 },
+        Flow   : [],
+        HdrFtr : [],
+        Drawings: {
+            All: true,
+            Map:{}
+        }
+    };
+
+    Document.Recalculate(false, false, RecalculateData);
+
     this.ShowParaMarks = false;
 };