В IdCounter добавлен флаг m_bRead для отключения компиляции настроек во время чтения

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

Common/editorscommon.js

@@ -1491,6 +1491,7 @@ function CIdCounter ()
 {
     this.m_sUserId        = null;
     this.m_bLoad          = true;
+    this.m_bRead          = false;
     this.m_nIdCounterLoad = 0; // Счетчик Id для загрузки
     this.m_nIdCounterEdit = 0; // Счетчик Id для работы
 }

Excel/model/DrawingObjects/Format/ShapePrototype.js

@@ -29,6 +29,11 @@ CShape.prototype.setDrawingBase = function(drawingBase)
     }
 };
 
+CShape.prototype.Get_Numbering =  function()
+{
+    return new CNumbering();
+};
+
 CShape.prototype.getTextArtTranslate = function()
 {
     return Asc["editor"].textArtTranslate;

Excel/model/clipboard.js

@@ -57,7 +57,7 @@
 					if (!t.element) 
 					{
 						found = false; 
-						
+						
 						//TODO - review later(commented for edge)
 						/*if(AscBrowser.isIE)
 						{
@@ -92,7 +92,7 @@
 				t.element.style.zIndex = -1000;
 				t.element.style.display = ELEMENT_DISPAY_STYLE;
 				t.element.setAttribute("contentEditable", true);
-				
+				
 				//TODO - review later(commented for edge)
 				if (!found /*&& !AscBrowser.isIE*/) {doc.body.appendChild(t.element);}
 				
@@ -1057,16 +1057,16 @@
                     pastebin.style.fontSize = Def_rPr.FontSize + "pt";*/
                     pastebin.style.lineHeight = "1px";//todo FF всегда возвращает computedStyle в px, поэтому лучше явно указать default значнение
                     pastebin.setAttribute("contentEditable", true);
-                    
-					if(!AscBrowser.isIE)//edge insert on event only text
-					{
-						 pastebin.onpaste = function(e){
-							if (!window.GlobalPasteFlag)
-								return;
-							
-							t._bodyPaste(worksheet,e);
-							pastebin.onpaste = null;
-						};
+                    
+					if(!AscBrowser.isIE)//edge insert on event only text
+					{
+						 pastebin.onpaste = function(e){
+							if (!window.GlobalPasteFlag)
+								return;
+							
+							t._bodyPaste(worksheet,e);
+							pastebin.onpaste = null;
+						};
 					}
                    
                     document.body.appendChild( pastebin );
@@ -1078,9 +1078,9 @@
                     {
                         pastebin.removeChild(aChildNodes[i]);
                     }
-					
-					if(!AscBrowser.isIE)//edge insert on event only text
-					{
+					
+					if(!AscBrowser.isIE)//edge insert on event only text
+					{
 						pastebin.onpaste = function(e){
 							if (!window.GlobalPasteFlag)
 								return;
@@ -2714,6 +2714,7 @@
 			ReadFromBinaryWord : function(sBase64, worksheet)
 			{
 			    History.TurnOff();
+                g_oIdCounter.m_bRead = true;
 				//передавать CDrawingDocument текущего worksheet
 				var oTempDrawingDocument = worksheet.model.DrawingDocument;
 				
@@ -2737,8 +2738,9 @@
 				
 				window.global_pptx_content_loader.End_UseFullUrl();
 				History.TurnOn();
+                g_oIdCounter.m_bRead = false;
 			    editor = oOldEditor;
-				
+
 			    return oRes;
 			},
 			

PowerPoint/Editor/Format/ShapePrototype.js

@@ -716,6 +716,10 @@ CShape.prototype.setParent2 = function(parent)
         }
     }
 };
+CShape.prototype.Get_Numbering =  function()
+{
+    return new CNumbering();
+};
 CShape.prototype.getIsSingleBody = function(x, y)
 {
     if(!this.isPlaceholder())

Word/Editor/DocumentContent.js

@@ -9780,7 +9780,7 @@ CDocumentContent.prototype.Get_NumberingInfo = function(NumberingEngine, ParaId,
 };
 CDocumentContent.prototype.private_RecalculateNumbering = function(Elements)
 {
-    if (true === g_oIdCounter.m_bLoad)
+    if (true === g_oIdCounter.m_bLoad || true === g_oIdCounter.m_bRead)
         return;
 
     for (var Index = 0, Count = Elements.length; Index < Count; ++Index)

Word/Editor/Paragraph.js

@@ -7734,7 +7734,7 @@ Paragraph.prototype =
     {
         if ( true === this.CompiledPr.NeedRecalc )
         {
-            if (undefined !== this.Parent && null !== this.Parent && true !== g_oIdCounter.m_bLoad)
+            if (undefined !== this.Parent && null !== this.Parent && true !== g_oIdCounter.m_bLoad && true !== g_oIdCounter.m_bRead)
             {
                 this.CompiledPr.Pr = this.Internal_CompileParaPr2();
                 if(!this.bFromDocument)