diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-12-20 14:21:43 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-01-18 22:53:25 +0100 |
| commit | b634f8d675b362e47fa555df7fb0cdeb5753f5b3 (patch) | |
| tree | 5aab970064b959cc42b148220e23d2600017e326 /oox | |
| parent | 548b1bb28950dfed7c095614d913f4daf7c14ec3 (diff) | |
tdf#96051: FILESAVE: Roundtrip any PPTX file with Shapes creates invalid OOXML
Revert "bnc#584721: Import subtitle block to master slides"
This reverts commit b3d50feaa87b670baf68288974005ac26ad31736.
It seems the imported subtitle block makes export corrupt the
output. Better to have a valid output.
(cherry picked from commit a9db17aabc3ac970e6e4754e28310d20138144d9)
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: I1a3d4f03e4fa0c4431a5394495682a1b9d7677bc
Reviewed-on: https://gerrit.libreoffice.org/20921
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit e18c062be49042945644db438608a6e58c7dc98a)
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ppt/pptshape.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index cf61562ae6ad..f347639040ec 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -144,9 +144,12 @@ void PPTShape::addShape( break; case XML_subTitle : { - sServiceName = "com.sun.star.presentation.SubtitleShape"; - aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getBodyTextStyle() : rSlidePersist.getBodyTextStyle(); - bClearText = true; + if ( ( meShapeLocation == Master ) || ( meShapeLocation == Layout ) ) + sServiceName = OUString(); + else { + sServiceName = "com.sun.star.presentation.SubtitleShape"; + aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getBodyTextStyle() : rSlidePersist.getBodyTextStyle(); + } } break; case XML_obj : |