diff options
author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-11-10 22:37:13 +0100 |
---|---|---|
committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-11-10 22:37:13 +0100 |
commit | 2afcfb6132a1dd7a4e04ca676a7756bc2fed93f0 (patch) | |
tree | 54f412ec0da43fd53d1716fedeb982f234b97e0d /oox | |
parent | 653cc4c38dd2c05aecbee156aef460f5a361e579 (diff) |
tdf#103792: No placeholder text imported for empty title shape
Reviewed-on: https://gerrit.libreoffice.org/30731
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit dc024cdd91e3c33eeff8eea22fdef0d90d4dd2c0)
Change-Id: I95b4358f0d4311e8f427c8de18863049fb718d9b
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/drawingml/shape.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/pptshape.cxx | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 08e852c159e5..8bd5cfc4c46b 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1089,7 +1089,7 @@ Reference< XShape > Shape::createAndInsert( aCharStyleProperties.maCharColor.assignIfUsed( pFontRef->maPhClr ); } } - + xText->setString(""); Reference < XTextCursor > xAt = xText->createTextCursor(); getTextBody()->insertAt( rFilterBase, xText, xAt, aCharStyleProperties, mpMasterTextListStyle ); } diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index ce9b835c2b5f..c1b37d3d5873 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -139,7 +139,6 @@ void PPTShape::addShape( { sServiceName = "com.sun.star.presentation.TitleTextShape"; aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getTitleTextStyle() : rSlidePersist.getTitleTextStyle(); - bClearText = true; } break; case XML_subTitle : |