[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - xmloff/source

[Pierre Marty (via logerrit)]

 xmloff/source/draw/ximpstyl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9e78b352caa270b65ceb5076b54a9b4194d4f5b6
Author:     Pierre Marty <pmarty at linagora.com>
AuthorDate: Mon Sep 20 14:56:33 2021 +0200
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Fri Sep 24 11:29:24 2021 +0200

    tdf#141978: corrects the value assigned to AutoLayout while loading .odp file
    
            SdXMLPresentationPageLayoutContext::endFastElement(sal_Int32)
              now assigns the value AUTOLAYOUT_TITLE_6CONTENT
              instead of AUTOLAYOUT_4CLIPART at file loading
    
    Change-Id: Ic441d64fc62e1dd08873305a4cafd9823babe46f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122360
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 5bcced4776bb73846ef4f98795e217e4fb923e40)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122439
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index aa1520fe7047..bd92fc2a373b 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -617,7 +617,7 @@ void SdXMLPresentationPageLayoutContext::endFastElement(sal_Int32 )
             }
             case 7:
             {
-                mnTypeId = AUTOLAYOUT_4CLIPART; // FIXME: not AUTOLAYOUT_TITLE_6CONTENT?
+                mnTypeId = AUTOLAYOUT_TITLE_6CONTENT; // tdf#141978: Apply 6content layout
                 break;
             }
             default: