Bug 29117 - Разблокировать ряд настроек при селекте текста, находящегося в разных ячейках таблицы

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

PowerPoint/Editor/Format/Presentation.js

@@ -2841,7 +2841,7 @@ CPresentation.prototype =
         {
             editor.sync_slidePropCallback(this.Slides[this.CurPage]);
             var graphic_objects = this.Slides[this.CurPage].graphicObjects;
-            var target_content = graphic_objects.getTargetDocContent(), drawing_props = graphic_objects.getDrawingProps(), i;
+            var target_content = graphic_objects.getTargetDocContent(undefined, true), drawing_props = graphic_objects.getDrawingProps(), i;
             var para_pr = graphic_objects.getParagraphParaPr(), text_pr = graphic_objects.getParagraphTextPr();
             var flag = undefined;
             if(!para_pr)

Word/Editor/Table.js

@@ -5295,7 +5295,28 @@ CTable.prototype =
 
             var TextPr = this.Get_Paragraph_TextPr();
             if ( null != TextPr )
+            {
+                var theme = this.Get_Theme();
+                if(theme && theme.themeElements && theme.themeElements.fontScheme)
+                {
+                    if(TextPr.FontFamily)
+                    {
+                        TextPr.FontFamily.Name =  theme.themeElements.fontScheme.checkFont(TextPr.FontFamily.Name);
+                    }
+                    if(TextPr.RFonts)
+                    {
+                        if(TextPr.RFonts.Ascii)
+                            TextPr.RFonts.Ascii.Name     = theme.themeElements.fontScheme.checkFont(TextPr.RFonts.Ascii.Name);
+                        if(TextPr.RFonts.EastAsia)
+                            TextPr.RFonts.EastAsia.Name  = theme.themeElements.fontScheme.checkFont(TextPr.RFonts.EastAsia.Name);
+                        if(TextPr.RFonts.HAnsi)
+                            TextPr.RFonts.HAnsi.Name     = theme.themeElements.fontScheme.checkFont(TextPr.RFonts.HAnsi.Name);
+                        if(TextPr.RFonts.CS)
+                            TextPr.RFonts.CS.Name        = theme.themeElements.fontScheme.checkFont(TextPr.RFonts.CS.Name);
+                    }
+                }
                 editor.UpdateTextPr( TextPr );
+            }
         }
     },