oox/source/ppt/pptshape.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ccd07c3bf5849a7939ea02a46b1c160ede16f03c
Author:     Szymon Kłos <[email protected]>
AuthorDate: Wed Aug 2 08:57:54 2023 +0200
Commit:     Szymon Kłos <[email protected]>
CommitDate: Fri Aug 4 09:14:37 2023 +0200

    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 <[email protected]>

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 :

Reply via email to