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@collabora.com>
2020-08-10 06:18:49 +02:00
parent 7b64bd9063
commit 33696b2820
1 changed files with 13 additions and 0 deletions
@@ -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)
                {