diff options
| author | Radek Doulik <rodo@novell.com> | 2012-05-23 17:05:36 +0200 |
|---|---|---|
| committer | Radek Doulik <rodo@novell.com> | 2012-05-23 17:09:14 +0200 |
| commit | 038564c910e43f569b7c6abebffe2ad6ec9a1822 (patch) | |
| tree | 2c8407e406454fec46fa03ca46b581dfc9135f11 /oox/inc | |
| parent | 1bb9a60a9609422c5b74dc547ddb358afbed03f5 (diff) | |
do not insert empty texbodies for empty placeholder shapes
- the original problem can be reproduced by creating new empty presentation in powerpoint.
after it is loaded in impress, it was completely blank, without placeholder shape
texts (Click to add title, Click to add text)
Change-Id: I541554e273372ad09cca2fb91e27a17eb1f3a00e
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/oox/drawingml/shape.hxx | 1 | ||||
| -rw-r--r-- | oox/inc/oox/drawingml/textbody.hxx | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/oox/inc/oox/drawingml/shape.hxx b/oox/inc/oox/drawingml/shape.hxx index f2553fb0eef4..09ea5028b94e 100644 --- a/oox/inc/oox/drawingml/shape.hxx +++ b/oox/inc/oox/drawingml/shape.hxx @@ -189,6 +189,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, const ::com::sun::star::awt::Rectangle* pShapeRect, sal_Bool bClearText, + sal_Bool bDoNotInsertEmptyTextBody, basegfx::B2DHomMatrix& aTransformation ); void addChildren( diff --git a/oox/inc/oox/drawingml/textbody.hxx b/oox/inc/oox/drawingml/textbody.hxx index aa2fdcd71317..7fad554ee9c4 100644 --- a/oox/inc/oox/drawingml/textbody.hxx +++ b/oox/inc/oox/drawingml/textbody.hxx @@ -68,6 +68,7 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor > & xAt, const TextCharacterProperties& rTextStyleProperties, const TextListStylePtr& pMasterTextListStyle ) const; + bool isEmpty(); protected: TextParagraphVector maParagraphs; TextBodyProperties maTextProperties; |