fix bug 34785

4df570e5 · SergeyLuzyanin · 643da387 · 4df570e5
Commit 4df570e5 authored Apr 24, 2017 by SergeyLuzyanin
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 9 deletions

word/Editor/Styles.js word/Editor/Styles.js +13 -9

No files found.
--- a/word/Editor/Styles.js
+++ b/word/Editor/Styles.js
@@ -3770,16 +3770,20 @@ CStyles.prototype =

                if (TableStyle != null || ShapeStyle != null)
                {
-                    if (ShapeStyle != null)
-                    {
-                        Pr.TextPr.Merge(ShapeStyle.TextPr);
-                        Pr.ParaPr.Merge(ShapeStyle.ParaPr);
-                    }
                    if (TableStyle != null)
                    {
                        Pr.TextPr.Merge(TableStyle.TextPr);
                        Pr.ParaPr.Merge(TableStyle.ParaPr);
                    }
+                    if (ShapeStyle != null)
+                    {
+                        Pr.TextPr.Merge(ShapeStyle.TextPr);
+                        if(!TableStyle)
+                        {
+                            Pr.ParaPr.Merge(ShapeStyle.ParaPr);
+                        }
+
+                    }
                }
                else
                {
@@ -6981,10 +6985,10 @@ CTextPr.prototype =
            this.Unifill = TextPr.Unifill.createDuplicate();
        else
        {
-            //if(undefined != TextPr.Color)
-            //{
-            //    this.Unifill = undefined;
-            //}
+            if(undefined != TextPr.Color)
+            {
+                this.Unifill = undefined;
+            }
        }
        if(undefined != TextPr.FontRef)
        {