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

New commits:
commit d94fb20384aebd68d16182c53cc21d4e3c9fc03c
Author:     Gülşah Köse <[email protected]>
AuthorDate: Fri Dec 12 16:32:33 2025 +0300
Commit:     Gabor Kelemen <[email protected]>
CommitDate: Wed Dec 17 16:06:23 2025 +0100

    tdf#169456 Fix the placeholder of master slide style issue
    
    In some cases we see the object in the slide has no fill syle directly but 
parent object
    in master slide can has fill style.
    
    We should apply the style to object in this case.
    
    Signed-off-by: Gülşah Köse <[email protected]>
    Change-Id: I0b061cfde4ac2067c84383764770f155564531a3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195368
    Reviewed-by: Caolán McNamara <[email protected]>
    Tested-by: Jenkins CollaboraOffice <[email protected]>
    Tested-by: Caolán McNamara <[email protected]>
    (cherry picked from commit 92b0bcb3136a77de97415b900a0e9b4a271715ae)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195672
    Tested-by: Jenkins
    Reviewed-by: Gabor Kelemen <[email protected]>
    (cherry picked from commit 7ab8ed87dca177f22b162df5dfbba3052b82596d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195767

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index ff2d2edabea7..659282c93d52 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1644,7 +1644,8 @@ Reference< XShape > const & Shape::createAndInsert(
         }
 
         FillProperties aFillProperties = getActualFillProperties(pTheme, 
&rShapeOrParentShapeFillProps);
-        if (getFillProperties().moFillType.has_value() && 
getFillProperties().moFillType.value() == XML_grpFill)
+        if ((getFillProperties().moFillType.has_value() && 
getFillProperties().moFillType.value() == XML_grpFill) ||
+            aFillProperties.maFillColor.isPlaceHolder() )
             getFillProperties().assignUsed(aFillProperties);
         if(!bIsCroppedGraphic && !bIs3DGraphic)
             aFillProperties.pushToPropMap(aShapeProps, rGraphicHelper, 
mnRotation, nFillPhClr,

Reply via email to