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

Word/Drawing/DrawingDocument.js

@@ -3656,14 +3656,6 @@ function CDrawingDocument()
         this.m_oWordControl.m_oApi.sync_SearchEndCallback();
     }
 
-    this.ClearPageSelection = function(pageIndex)
-    {
-        if (this.m_arrPages[pageIndex])
-        {
-            this.m_arrPages[pageIndex].selectionArray.splice(0, this.m_arrPages[pageIndex].selectionArray.length);
-        }
-    }
-
     this.SelectionStart = function()
     {
     }
@@ -3705,7 +3697,26 @@ function CDrawingDocument()
     this.AddPageSelection = function(pageIndex, x, y, w, h)
     {
         if (pageIndex < this.m_lDrawingFirst || pageIndex > this.m_lDrawingEnd)
+        {
+            if (this.m_oWordControl.MobileTouchManager)
+            {
+                var r = new _rect();
+                r.x = x;
+                r.y = y;
+                r.w = w;
+                r.h = h;
+
+                if (null == this.m_oWordControl.MobileTouchManager.RectSelect1)
+                {
+                    this.m_oWordControl.MobileTouchManager.RectSelect1 = r;
+                    this.m_oWordControl.MobileTouchManager.PageSelect1 = pageIndex;
+                }
+
+                this.m_oWordControl.MobileTouchManager.RectSelect2 = r;
+                this.m_oWordControl.MobileTouchManager.PageSelect2 = pageIndex;
+            }
             return;
+        }
 
         var page = this.m_arrPages[pageIndex];
         var drawPage = page.drawingPage;
@@ -3762,6 +3773,24 @@ function CDrawingDocument()
             ctx.lineTo(x4, y4);
             ctx.closePath();
         }
+
+        if (this.m_oWordControl.MobileTouchManager)
+        {
+            var r = new _rect();
+            r.x = x;
+            r.y = y;
+            r.w = w;
+            r.h = h;
+
+            if (null == this.m_oWordControl.MobileTouchManager.RectSelect1)
+            {
+                this.m_oWordControl.MobileTouchManager.RectSelect1 = r;
+                this.m_oWordControl.MobileTouchManager.PageSelect1 = pageIndex;
+            }
+
+            this.m_oWordControl.MobileTouchManager.RectSelect2 = r;
+            this.m_oWordControl.MobileTouchManager.PageSelect2 = pageIndex;
+        }
     }
 
     this.AddPageSelection2 = function(pageIndex, x, y, width, height)

Word/Drawing/HtmlPage.js

@@ -2563,10 +2563,17 @@ function CEditorPage(api)
                 this.CheckShowOverlay();
                 drDoc.private_StartDrawSelection(overlay);
 
-                for (var i = drDoc.m_lDrawingFirst; i <= drDoc.m_lDrawingEnd; i++)
+                if (!this.MobileTouchManager)
                 {
-                    if (!drDoc.IsFreezePage(i))
-                        this.m_oLogicDocument.Selection_Draw_Page(i);
+                    for (var i = drDoc.m_lDrawingFirst; i <= drDoc.m_lDrawingEnd; i++)
+                    {
+                        if (!drDoc.IsFreezePage(i))
+                            this.m_oLogicDocument.Selection_Draw_Page(i);
+                    }
+                }
+                else
+                {
+                    this.m_oLogicDocument.Selection_Draw_Pages(0, drDoc.m_lPagesCount - 1);
                 }
 
                 drDoc.private_EndDrawSelection();