zoomIn/out & pdf crash

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

Word/Drawing/HtmlPage.js

@@ -1070,6 +1070,9 @@ function CEditorPage(api)
                 break;
             }
         }
+		
+		if (oThis.m_nZoomValue <= _Zoom)
+			return;
 
         var _old_val = oThis.m_nZoomValue;
         oThis.m_nZoomValue = _Zoom;
@@ -1095,6 +1098,9 @@ function CEditorPage(api)
                 break;
             }
         }
+		
+		if (oThis.m_nZoomValue >= _Zoom)
+			return;
 
         var _old_val = oThis.m_nZoomValue;
         oThis.m_nZoomValue = _Zoom;

Word/api.js

@@ -5741,13 +5741,9 @@ asc_docs_api.prototype.GenerateStyles = function()
     }
 
     var StylesPainter = new CStylesPainter();
-    if (null == this.LoadedObject && null != this.WordControl.m_oLogicDocument)
-    {
-        StylesPainter.GenerateStyles(this, this.WordControl.m_oLogicDocument.Get_Styles().Style);
-    }
-    else
+    if (null != this.WordControl.m_oLogicDocument)
     {
-        StylesPainter.GenerateStyles(this, this.LoadedObjectDS);
+        StylesPainter.GenerateStyles(this, (null == this.LoadedObject) ? this.WordControl.m_oLogicDocument.Get_Styles().Style : this.LoadedObjectDS);
     }
 };
 asc_docs_api.prototype.asyncFontsDocumentEndLoaded = function()