sd/source/filter/eppt/pptx-epptooxml.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d299526cb6e87e277219f062419b243a5b5e27f0
Author:     Aron Budea <[email protected]>
AuthorDate: Wed Dec 24 03:25:24 2025 +1100
Commit:     Xisco Fauli <[email protected]>
CommitDate: Wed Dec 24 00:30:59 2025 +0100

    tdf#170102 PP's Title and Content layout exported incorrectly
    
    In tdf#169825's fix I tried to correct the layout type
    corresponding to AUTOLAYOUT_OBJ, originating from PP's obj
    ST_SlideLayoutType to AUTOLAYOUT_TITLE_CONTENT, which had
    unexpected side-effects:
    PPTX->ODP->PPTX conversion of a 'Title, Content' layout added
    placeholder artifact.
    
    Revert that part of the change for now.
    
    Regression from eb338daa90afd569e1b86c058bb88a89fab6a557.
    
    Change-Id: I5ba7ee14c4ae3a3a336b051edee4ca8702b87397
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196169
    Tested-by: Jenkins
    Reviewed-by: Balazs Varga <[email protected]>
    (cherry picked from commit 04e5572c796b63da94aedbd07b2b7bd972422161)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196175
    Reviewed-by: Xisco Fauli <[email protected]>

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 558a142e5d62..d58db330beb7 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -253,7 +253,7 @@ const PPTXLayoutInfo aLayoutInfo[] =
     { 8, "Title and table", "tbl" },
     { 9, "Title, clipart on left, text on right", "clipArtAndTx" },
     { 10, "Title, text on left, object on right", "txAndObj" },
-    { 11, "Title and object", "obj" },
+    {  1, "Title and object", "obj" },
     { 12, "Title, text on left, two objects on right", "txAndTwoObj" },
     { 13, "Title, object on left, text on right", "objAndTx" },
     { 14, "Title, object on top, text on bottom", "objOverTx" },

Reply via email to