правка багов

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

Common/Drawings/CommonController.js

@@ -932,7 +932,7 @@ DrawingObjectsController.prototype =
                 this.selection.textSelection.paragraphAdd(paraItem, bRecalculate);
                 this.selection.textSelection.select(this, this.selection.textSelection.selectStartPage);
             }
-            else if(this.selectedObjects.length > 0)
+            else if(this.selectedObjects.length > 0 && this.selectedObjects[0].parent)
             {
                 this.selectedObjects[0].parent.GoTo_Text();
                 this.resetSelection();
@@ -2686,7 +2686,7 @@ DrawingObjectsController.prototype =
         {
             if(this.selectedObjects.length === 0)
                 return;
-            this.moveSelectedObjects(-this.drawingDocument.GetMMPerDot(5), 0);
+            this.moveSelectedObjects(-this.convertPixToMM(5), 0);
         }
     },
 
@@ -2702,7 +2702,7 @@ DrawingObjectsController.prototype =
         {
             if(this.selectedObjects.length === 0)
                 return;
-            this.moveSelectedObjects(this.drawingDocument.GetMMPerDot(5), 0);
+            this.moveSelectedObjects(this.convertPixToMM(5), 0);
         }
     },
 
@@ -2719,7 +2719,7 @@ DrawingObjectsController.prototype =
         {
             if(this.selectedObjects.length === 0)
                 return;
-            this.moveSelectedObjects(0, -this.drawingDocument.GetMMPerDot(5));
+            this.moveSelectedObjects(0, -this.convertPixToMM(5));
         }
     },
 
@@ -2735,7 +2735,7 @@ DrawingObjectsController.prototype =
         {
             if(this.selectedObjects.length === 0)
                 return;
-            this.moveSelectedObjects(0, this.drawingDocument.GetMMPerDot(5));
+            this.moveSelectedObjects(0, this.convertPixToMM(5));
         }
     },
 

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -101,6 +101,16 @@ CGraphicObjects.prototype =
         return this.document.theme;
     },
 
+    isViewMode: function()
+    {
+        return editor.isViewMode;
+    },
+
+    convertPixToMM: function(v)
+    {
+        return this.document.DrawingDocument.GetMMPerDot(v);
+    },
+
     updateCursorType: function(pageIndex, x, y, e, bTextFlag)
     {
         var ret;

Word/Editor/SerializeCommon.js

@@ -1067,11 +1067,11 @@ function CPPTXContentWriter()
                 _writer.StartRecord(0);
 
                 var elem = spTree[i];
-                switch(grObject.getObjectType())
+                switch(elem.getObjectType())
                 {
                     case historyitem_type_Shape:
                     {
-                        if(grObject.bWordShape)
+                        if(elem.bWordShape)
                         {
                             this.WriteShape(elem, Document, oMapCommentId, oNumIdMap, copyParams);
                         }