очищен кэш страниц при asc_CloseFile.

поправлен баг с приходом изменений в режиме OnlyReader

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

Word/Drawing/DrawingDocument.js

@@ -2219,6 +2219,17 @@ function CDrawingDocument()
         }
     }
 
+    this.CloseFile = function()
+    {
+        this.ClearCachePages();
+        this.m_arrPages.splice(0, this.m_arrPages.length);
+        this.m_lPagesCount      = 0;
+
+        this.m_lDrawingFirst    = -1;
+        this.m_lDrawingEnd      = -1;
+        this.m_lCurrentPage     = -1;
+    }
+
     this.CheckRasterImageOnScreen = function(src)
     {
         if (null == this.m_oWordControl.m_oLogicDocument)

Word/Drawing/HtmlPage.js

@@ -2165,6 +2165,20 @@ function CEditorPage(api)
         this.ReaderTouchManager.ChangeFontSize();
     }
 
+    this.IsReaderMode = function()
+    {
+        return (this.ReaderModeCurrent == 1);
+    }
+    this.UpdateReaderContent = function()
+    {
+        if (this.ReaderModeCurrent == 1 && this.ReaderModeDivWrapper != null)
+        {
+            this.ReaderModeDivWrapper.innerHTML = "<div id=\"reader_id\" style=\"width:100%;display:block;z-index:9;font-family:arial;font-size:" +
+                this.ReaderFontSizes[this.ReaderFontSizeCur] + "pt;position:absolute;resize:none;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:5%;padding-right:5%;padding-top:10%;padding-bottom:10%;background-color:#FFFFFF;\">" +
+                this.m_oApi.ContentToHTML(true) + "</div>";
+        }
+    }
+
     this.EnableReaderMode = function()
     {
         this.ReaderModeCurrent = 1;

Word/api.js

@@ -6277,7 +6277,11 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function()
                     var data = {All:true};
                     Document.DrawingObjects.recalculate_(data);
                     Document.DrawingObjects.recalculateText_(data);
-                    this.ChangeReaderMode();
+
+                    if (!this.WordControl.IsReaderMode())
+                        this.ChangeReaderMode();
+                    else
+                        this.WordControl.UpdateReaderContent();
                 }
             }
         }
@@ -7484,6 +7488,8 @@ asc_docs_api.prototype.asc_CloseFile = function()
 	oLogicDocument.Stop_Recalculate();
 	oLogicDocument.Stop_CheckSpelling();
 	window.global_pptx_content_loader.ImageMapChecker = {};
+
+    this.WordControl.m_oDrawingDocument.CloseFile();
 };
 
 window["asc_docs_api"] = asc_docs_api;