[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - oox/source

[Gülşah Köse (via logerrit)]

 oox/source/ppt/pptshape.cxx |   13 +++++++++++++
 1 file changed, 13 insertions(+)

New commits:
commit 8faf8f173fe75bfa27b615db0ea177941a775724
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Sat Aug 8 00:34:37 2020 +0300
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Sep 1 18:00:44 2020 +0200

    tdf#133015 Inherit numCol from placeholder.
    
    Change-Id: I402a40be7e8899ca017996f2bf77a2fb884b9462
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100372
    Tested-by: Jenkins
    Reviewed-by: Gülşah Köse <gulsah.kose at collabora.com>
    Signed-off-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101749

diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 3a8e1bac0951..7e67de80100e 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -229,6 +229,19 @@ void PPTShape::addShape(
         {
             if (TextBodyPtr pTextBody = getTextBody())
             {
+                // If slide shape has not numCol but placeholder has we should inherit from placeholder.
+                if (pTextBody->getTextProperties().mnNumCol == 1 &&
+                    mnSubType &&
+                    getSubTypeIndex().has() &&
+                    rSlidePersist.getMasterPersist())
+                {
+                    oox::drawingml::ShapePtr pPlaceholder = PPTShape::findPlaceholderByIndex(
+                                                                            getSubTypeIndex().get(),
+                                                                            rSlidePersist.getMasterPersist()->getShapes()->getChildren());
+                    if (pPlaceholder && pPlaceholder->getTableProperties())
+                        pTextBody->getTextProperties().mnNumCol = pPlaceholder->getTableProperties()->getTableGrid().size();
+                }
+
                 sal_Int32 nNumCol = pTextBody->getTextProperties().mnNumCol;
                 if (nNumCol > 1)
                 {