summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2016-11-10 00:41:49 +0100
committerTamás Zolnai <tamas.zolnai@collabora.com>2016-11-10 17:50:04 +0000
commitdc024cdd91e3c33eeff8eea22fdef0d90d4dd2c0 (patch)
tree88c8e64ca6fffff23dfca43532edc85501a809f3 /oox
parentba2137d5117f3cd63d781dd545726cefddbcb1ff (diff)
tdf#103792: No placeholder text imported for empty title shape
Change-Id: I95b4358f0d4311e8f427c8de18863049fb718d9b Reviewed-on: https://gerrit.libreoffice.org/30731 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/shape.cxx2
-rw-r--r--oox/source/ppt/pptshape.cxx1
2 files changed, 1 insertions, 2 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 1befb50c1e7d..159dc6449708 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1140,7 +1140,7 @@ Reference< XShape > const & Shape::createAndInsert(
}
}
}
-
+ 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 9a673b73a8b5..18a256595ae8 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -142,7 +142,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 :