diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2023-08-02 08:57:54 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2023-08-04 09:14:37 +0200 |
| commit | ccd07c3bf5849a7939ea02a46b1c160ede16f03c (patch) | |
| tree | bb3685f1ba0a1e247e21109d4c4e76ce083c0c5a | |
| parent | 694bacca057c9f1d93ab27d61199aec9d060b868 (diff) | |
oox: don't use master style by default
By default a shape with empty type attribute in placeholder tag: <p:ph/>
will get subtype = XML_obj (oox/source/drawingml/shapecontext.cxx:81)
When it is not referencing any master style shape by idx attribute
we shouldn't use master list style to be compatible with MSO.
Change-Id: Ib695b695885892dbe659e70a28daff1799c5f50e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155232
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
| -rw-r--r-- | oox/source/ppt/pptshape.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index daa482eab94f..b6dd0f1c4603 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -206,7 +206,8 @@ void PPTShape::addShape( case XML_obj : { sServiceName = sOutlinerShapeService; - aMasterTextListStyle = rSlidePersist.getMasterPersist() ? rSlidePersist.getMasterPersist()->getBodyTextStyle() : rSlidePersist.getBodyTextStyle(); + if (getSubTypeIndex().has_value()) + aMasterTextListStyle = rSlidePersist.getMasterPersist() ? rSlidePersist.getMasterPersist()->getBodyTextStyle() : rSlidePersist.getBodyTextStyle(); } break; case XML_body : |