diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-09-16 17:51:12 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-09-17 09:59:50 +0200 |
| commit | b3d50feaa87b670baf68288974005ac26ad31736 (patch) | |
| tree | a9c56145058ad468fb114d6bda3eafd9d6af1934 /oox | |
| parent | 3f1749f4958d3c167e6134703e0f5e41e6bde0d6 (diff) | |
bnc#584721: Import subtitle block to master slides
For some reason subtitle block was skipped for
layouts. It seems we can enable it for layout too,
it appears well on master slides.
Change-Id: I23ec7d4fcce045099bfca9e94a8c9335beaf7468
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ppt/pptshape.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index a9ed0b945388..cc94f60ba4bc 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -144,12 +144,9 @@ void PPTShape::addShape( break; case XML_subTitle : { - if ( ( meShapeLocation == Master ) || ( meShapeLocation == Layout ) ) - sServiceName = OUString(); - else { - sServiceName = "com.sun.star.presentation.SubtitleShape"; - aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getBodyTextStyle() : rSlidePersist.getBodyTextStyle(); - } + sServiceName = "com.sun.star.presentation.SubtitleShape"; + aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getBodyTextStyle() : rSlidePersist.getBodyTextStyle(); + bClearText = true; } break; case XML_obj : |