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

PowerPoint/Drawing/DrawingDocument.js

@@ -2296,7 +2296,11 @@ function CDrawingDocument()
     {
         var hor_ruler = this.m_oWordControl.m_oHorRuler;
 
-        var _len = ParaTabs.length;
+        var __tabs = ParaTabs.Tabs;
+        if (undefined === __tabs)
+            __tabs = ParaTabs;
+
+        var _len = __tabs.length;
         if ((Default_Tab == hor_ruler.m_dDefaultTab) && (hor_ruler.m_arrTabs.length == _len) && (_len == 0))
         {
             // потом можно и проверить сами табы
@@ -2307,9 +2311,20 @@ function CDrawingDocument()
         hor_ruler.m_arrTabs = [];
         var _ar = hor_ruler.m_arrTabs;
 
-        var _len = ParaTabs.length;
         for (var i = 0; i < _len; i++)
-            _ar[i] = new CTab(ParaTabs[i].Pos, g_tabtype_left);
+        {
+            if (__tabs[i].Value == tab_Left)
+                _ar[i] = new CTab(__tabs[i].Pos, g_tabtype_left);
+            else if (__tabs[i].Value == tab_Center)
+                _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();
         this.m_oWordControl.UpdateHorRuler();

PowerPoint/Drawing/HtmlPage.js

@@ -923,11 +923,13 @@ function CEditorPage(api)
         if (false === oThis.m_oApi.bInit_word_control)
             return;
 
-        // пока только левые табы
-        return;
-
         var oWordControl = oThis;
         if (oWordControl.m_nTabsType == g_tabtype_left)
+        {
+            oWordControl.m_nTabsType = g_tabtype_center;
+            oWordControl.m_oLeftRuler_buttonsTabs.HtmlElement.style.backgroundPosition = "0px -37px";
+        }
+        else if (oWordControl.m_nTabsType == g_tabtype_center)
         {
             oWordControl.m_nTabsType = g_tabtype_right;
             oWordControl.m_oLeftRuler_buttonsTabs.HtmlElement.style.backgroundPosition = "0px -18px";

PowerPoint/Editor/Format/Paragraph.js

@@ -8364,6 +8364,7 @@ Paragraph.prototype =
             TextPr.RFonts.Ascii.Name = TextPr.FontFamily.Name;
             TextPr.RFonts.CS.Name = TextPr.FontFamily.Name;
             TextPr.RFonts.HAnsi.Name = TextPr.FontFamily.Name;
+            TextPr.RFonts.EastAsia.Name = TextPr.FontFamily.Name;
             this.CompiledPr.NeedRecalc = false;
         }
 

PowerPoint/api.js

@@ -881,7 +881,7 @@ asc_docs_api.prototype.CreateCSS = function()
     var style1 = document.createElement('style');
     style1.type = 'text/css';
     style1.innerHTML = ".buttonTabs {\
-background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAAmCAYAAAAm56DSAAAABGdBTUEAALGPC/xhBQAAAO9JREFUSEvtlj0Kg0AQhc3FbBQslK38q0QXtFkvkSplruLFPMOEJwgmgozLi5XCdPIx88b58DFNkwSsBzBWBSzQMuEKe77e4lsr4ws2z7OcLTRww87lps7MOSfjOB4uRQ1r21a6ruPAyrKUqqo4sDRNxRjDgcVxLEmSLMC6rsVau8tQnVkYhgJglmWCkZEhlrK9EjVMc1rXwGjWYHjtP3Kkduab1zXb1HxXv+/cnR0rG0c+DAPn0AFqmoYDAyjPcw6sKAqBfb18hoz6vl9GAwiSjKLID7ZmhNEAgnVhX6/ONBdxzQX4mmP3S0X1GQP2AWVA4FGLO9QYAAAAAElFTkSuQmCC);\
+background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAA5CAYAAADUZxCcAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAUVJREFUWEftlr9OhEAQhwex4i0srXwWXsCERhsTKwoaCLWViY2WvgC8ipXlvQOE/wHMbGa5nHe77J57ykW+ZLLshPyyswlfsNI0HcEQF7QawWjYNObH54Y1juHm+oqtO2EPd7esqcPL2/sUttw7O9OwMAwhiiLazSMNK4qClSrSsLIsWakye7Kqqmg3zyWtB2maBmzbBs/zwHGcqeI4pjd2kZ6sbVvo+x6GYZhqHMWSWe7ndBprmMDomGdwZ6tplfm7MDRvEAS020crrOs6qOuadvtohWGQzLxaYWhdmXmlpsU7QkGicXnQ0WPiHWEQjsaDsCdiNa0+RsdcbtjptO0/3rOmDk/Pr6u2f4BSmO/7rOb4/ZPNSZGjFJbnOWRZRjsxQm27rktPW7BnWRb7r02ShLpbhCfjzv9eXOGHWO7n9C+0DfAFUOr1fzFrfLcAAAAASUVORK5CYII=);\
 background-position: 0px 0px;\
 background-repeat: no-repeat;\
 }";