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

Word/Drawing/DrawingDocument.js

@@ -4207,6 +4207,11 @@ function CDrawingDocument()
                 _ar[i] = new CTab(__tabs[i].Pos, g_tabtype_center);
             else if (__tabs[i].Value == tab_Right)
                 _ar[i] = new CTab(__tabs[i].Pos, g_tabtype_right);
+            else
+            {
+                // не должно такого быть. но приходит
+                _ar[i] = new CTab(__tabs[i].Pos, g_tabtype_left);
+            }
         }
 
         hor_ruler.CorrectTabs();

Word/Drawing/Rulers.js

@@ -2542,15 +2542,18 @@ function CVerRuler()
         htmlElement.width = htmlElement.width;
         var context = htmlElement.getContext('2d');
 
-        if (!this.IsRetina && null != this.m_oCanvas)
-        {
-            context.drawImage(this.m_oCanvas, 0, 0, this.m_oCanvas.width, this.m_oCanvas.height,
-                0, top - 5, this.m_oCanvas.width, this.m_oCanvas.height);
-        }
-        else
+        if (null != this.m_oCanvas)
         {
-            context.drawImage(this.m_oCanvas, 0, 0, this.m_oCanvas.width, this.m_oCanvas.height,
-                0, (top - 5) << 1, this.m_oCanvas.width, this.m_oCanvas.height);
+            if (!this.IsRetina)
+            {
+                context.drawImage(this.m_oCanvas, 0, 0, this.m_oCanvas.width, this.m_oCanvas.height,
+                    0, top - 5, this.m_oCanvas.width, this.m_oCanvas.height);
+            }
+            else
+            {
+                context.drawImage(this.m_oCanvas, 0, 0, this.m_oCanvas.width, this.m_oCanvas.height,
+                    0, (top - 5) << 1, this.m_oCanvas.width, this.m_oCanvas.height);
+            }
         }
     }
 

Word/Drawing/scrolls/scroll.js

@@ -42,7 +42,7 @@ function CArrowDrawer()
         if (size == this.Size && is_retina == this.IsRetina && null != this.ImageLeft)
             return;
 
-        this.Size = size;
+        this.Size = Math.max(size, 1);
         this.IsRetina = is_retina;
 
         if (this.IsRetina)