drawingML import: fix default character height of WPG rectangles

The problem was that due to setting it to 18 in oox, the rectangle
didn't inherit the default 11 from the document.

Change-Id: I05c3b9c1d64eec58695e2039651a5f015df1f9e4

1 files changed, 2 insertions, 2 deletions

diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 5fcb91c1d5a4..f39f75d03c82 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -72,7 +72,7 @@ class OOX_DLLPUBLIC Shape
 {
 public:
 
-    explicit Shape( const sal_Char* pServiceType = 0 );
+    explicit Shape( const sal_Char* pServiceType = 0, bool bDefaultHeight = true );
     explicit Shape( const ShapePtr& pSourceShape );
     virtual ~Shape();
 
@@ -126,7 +126,7 @@ public:
     const OptValue< sal_Int32 >&    getSubTypeIndex() const { return moSubTypeIndex; }
 
     // setDefaults has to be called if styles are imported (OfficeXML is not storing properties having the default value)
-    void                            setDefaults();
+    void                            setDefaults(bool bHeight);
 
     ::oox::vml::OleObjectInfo&      setOleObjectType();
     ChartShapeInfo&                 setChartType( bool bEmbedShapes );