Bug 28007 - После изменения шаблона "Picture with Caption" остается картинка...

Bug 28007 - После изменения шаблона "Picture with Caption" остается картинка на определенных стилях 

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

Common/Drawings/Format/Shape.js

@@ -161,6 +161,10 @@ function ConvertParagraphToPPTX(paragraph, drawingDocument, newParent)
         {
             new_paragraph.Internal_Content_Add(new_paragraph.Content.length, CopyRunToPPTX(Item, new_paragraph), false);
         }
+        else if(Item.Type === para_Hyperlink)
+        {
+
+        }
     }
     var EndRun = new ParaRun(new_paragraph);
     EndRun.Add_ToContent( 0, new ParaEnd() );
@@ -168,6 +172,12 @@ function ConvertParagraphToPPTX(paragraph, drawingDocument, newParent)
     return new_paragraph;
 }
 
+function ConvertHyperlinkToPPTX(hyperlink, paragraph)
+{
+    var hyperlink = new ParaHyperlink();
+    return hyperlink;
+}
+
 function ConvertParagraphToWord(paragraph, docContent)
 {
     var _docContent = isRealObject(docContent) ? docContent : paragraph.Parent;
@@ -1725,7 +1735,6 @@ CShape.prototype =
     {
         return ExecuteNoHistory(function()
         {
-
             var parent_objects = this.getParentObjects();
             var default_style = new CStyle("defaultStyle", null, null, null, true);
             default_style.ParaPr.Spacing.LineRule = linerule_Auto;
@@ -2001,7 +2010,7 @@ CShape.prototype =
                         _b_empty_text = this.txBody.content.Is_Empty();
                     }
                 }
-                return (_b_empty_text && (this.brush == null || this.brush.fill == null));
+                return (_b_empty_text /* && (this.brush == null || this.brush.fill == null)*/);
             }
         }
         else {
@@ -3293,14 +3302,6 @@ CShape.prototype =
             this.spPr.setLn(_new_line);
     },
 
-    setGeometry: function (geometry) {
-        var old_geometry = this.spPr.geometry;
-        var new_geometry = geometry;
-        this.spPr.geometry = geometry;
-        History.Add(this, { Type: historyitem_SetShapeSetGeometry, oldGeometry: old_geometry, newGeometry: new_geometry });
-        this.recalcInfo.recalculateGeometry = true;
-    },
-
     changeFill: function (unifill) {
 
         if(this.recalcInfo.recalculateBrush)