Get_StyleFromFormatting

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

Word/Editor/DocumentContent.js

@@ -9272,13 +9272,13 @@ CDocumentContent.prototype.Get_StyleFromFormatting = function()
         if (true == this.Selection.Use)
         {
             if (this.Selection.StartPos > this.Selection.EndPos)
-                return this.Content[this.Selection.EndPos].Get_StyleFromFormatting(oStyle);
+                return this.Content[this.Selection.EndPos].Get_StyleFromFormatting();
             else
-                return this.Content[this.Selection.StartPos].Get_StyleFromFormatting(oStyle);
+                return this.Content[this.Selection.StartPos].Get_StyleFromFormatting();
         }
         else
         {
-            return this.Content[this.CurPos.ContentPos].Get_StyleFromFormatting(oStyle);
+            return this.Content[this.CurPos.ContentPos].Get_StyleFromFormatting();
         }
     }
 };

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -1696,6 +1696,27 @@ CGraphicObjects.prototype =
         return this.document.Get_ColorMap();
     },
 
+
+    Get_StyleFromFormatting: function()
+    {
+        var oContent = this.getTargetDocContent();
+        if(oContent)
+        {
+            var oStyleFormatting = oContent.Get_StyleFromFormatting();
+            var oTextPr = oStyleFormatting.TextPr;
+            if(oTextPr.TextFill)
+            {
+                oTextPr.TextFill = undefined;
+            }
+            if(oTextPr.TextOutline)
+            {
+                oTextPr.TextOutline = undefined;
+            }
+            return oStyleFormatting;
+        }
+        return null;
+    },
+
     getParagraphTextPr: function()
     {
         var ret =  DrawingObjectsController.prototype.getParagraphTextPr.call(this);