Поправил баг с номерами слайдов, баг с границами таблиц в презентациях, баг с переносом текста,

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

Common/Drawings/Format/TextBody.js

@@ -372,7 +372,7 @@ CTextBody.prototype =
     },
 
 
-    getFieldText: function(fieldType, slide)
+    getFieldText: function(fieldType, slide, firstSlideNum)
     {
         var ret = "";
         if(this.parent && this.parent.isPlaceholder())
@@ -394,9 +394,10 @@ CTextBody.prototype =
                 }
                 case phType_sldNum :
                 {
+                    var _firstSlideNum = isRealNumber(firstSlideNum) ? firstSlideNum : 1;
                     if(slide instanceof Slide)
                     {
-                        ret += "" + (slide.num+1);
+                        ret += "" + (slide.num+_firstSlideNum);
                     }
                     break;
                 }

Common/Shapes/Serialize.js

@@ -6792,7 +6792,8 @@ function BinaryPPTYLoader()
                     {
                        /// txbody.textFieldFlag = true;
 
-                        var str_field = txbody.getFieldText(_last_field_type, this.TempMainObject);
+
+                        var str_field = txbody.getFieldText(_last_field_type, this.TempMainObject, (this.presentation && this.presentation.pres && isRealNumber(this.presentation.pres.attrFirstSlideNum)) ? this.presentation.pres.attrFirstSlideNum : 1);
                         if(str_field.length > 0)
                         {
                             txbody.content.Internal_Content_RemoveAll();
@@ -7018,16 +7019,19 @@ function BinaryPPTYLoader()
                                 var new_run = new ParaRun(par, false), hyperlink = null;
                                 if (null != _run)
                                 {
-                                    if (_run.hlink !== undefined)
-                                    {
-                                        hyperlink = new ParaHyperlink();
-                                        hyperlink.Set_Value(_run.hlink.url);
-                                    }
+
                                     var text_pr = new CTextPr();
                                     if(_run.Unifill && !_run.Unifill.fill)
                                     {
                                         _run.Unifill = undefined;
                                     }
+                                    if (_run.hlink !== undefined)
+                                    {
+                                        hyperlink = new ParaHyperlink();
+                                        hyperlink.Set_Value(_run.hlink.url);
+                                        _run.Unifill = CreateUniFillSchemeColorWidthTint(11, 0);
+                                        _run.Underline = true;
+                                    }
                                     text_pr.Set_FromObject(_run);
                                     new_run.Set_Pr(text_pr)
                                 }

PowerPoint/Editor/Format/ShapePrototype.js

@@ -495,13 +495,13 @@ CShape.prototype.recalculateContent = function()
             && isRealNumber(this.spPr.geometry.rect.l) && isRealNumber(this.spPr.geometry.rect.t)
             && isRealNumber(this.spPr.geometry.rect.r) && isRealNumber(this.spPr.geometry.rect.r))
         {
-            w = this.spPr.geometry.rect.r - this.spPr.geometry.rect.l - (l_ins + r_ins);
-            h = this.spPr.geometry.rect.b - this.spPr.geometry.rect.t - (t_ins + b_ins);
+            w = this.spPr.geometry.rect.r - this.spPr.geometry.rect.l - (l_ins + r_ins) + 1;
+            h = this.spPr.geometry.rect.b - this.spPr.geometry.rect.t - (t_ins + b_ins) + 1;
         }
         else
         {
-            w = this.extX - (l_ins + r_ins);
-            h = this.extY - (t_ins + b_ins);
+            w = this.extX - (l_ins + r_ins) + 1;
+            h = this.extY - (t_ins + b_ins) + 1;
         }
 
         if(this.txBody)

Word/Editor/Serialize2.js

@@ -5245,7 +5245,7 @@ function BinaryFileReader(doc, openParams)
                 var elem = aStyles[i];
                 var stylePaste = oReadResult.styles[elem.style];
                 var isEqualName = null;
-                if (null != stylePaste && null != stylePaste.style) {
+                if (null != stylePaste && null != stylePaste.style && oDocumentStyles) {
                     for (var j in oDocumentStyles.Style) {
                         var styleDoc = oDocumentStyles.Style[j];
                         isAlreadyContainsStyle = styleDoc.isEqual(stylePaste.style);

Word/Editor/Table.js

@@ -21255,8 +21255,14 @@ CTableCell.prototype =
         // Полученные настройки совместим с прямыми настройками ячейки
         CellPr.Merge( this.Pr );
 
+        if(Table.bPresentation)
+        {
+            CellPr.Check_PresentationPr(Table.Get_Theme())
+        }
+
         return { CellPr : CellPr, ParaPr : ParaPr, TextPr : TextPr };
     },
+
 //-----------------------------------------------------------------------------------
 // Функции, к которым идет обращение из контента
 //-----------------------------------------------------------------------------------