From 92518d513fe021be58a0bbeb04fd9306eb23ebda Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 3 Jan 2014 12:07:30 +0100 Subject: 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 --- include/oox/drawingml/shape.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') 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 ); -- cgit