Merge tag 'v4.3.3' into develop

v4.3.3 v4.3.3

Conflicts:
	common/spellCheckLanguagesAll.js

common/Shapes/Serialize.js

@@ -9027,8 +9027,12 @@ function CPres()
                         oThis.bcr.Read1(nDocLength, function(t,l){
                             return oBinary_DocumentTableReader.ReadDocumentContent(t,l, content_arr);
                         });
-                        for(var i = 0, length = content_arr.length; i < length; ++i)
-                            shape.textBoxContent.Internal_Content_Add(i, content_arr[i]);
+                        for(var i = 0, length = content_arr.length; i < length; ++i){
+                            if(i == length - 1)
+                                shape.textBoxContent.Internal_Content_Add(i, content_arr[i], true);
+                            else
+                                shape.textBoxContent.Internal_Content_Add(i, content_arr[i], false);
+                        }
 
                         s.pos = oThis.stream.pos;
                         s.cur = oThis.stream.cur;

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)
         {