diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2020-08-08 00:34:37 +0300 |
|---|---|---|
| committer | Gülşah Köse <gulsah.kose@collabora.com> | 2020-08-18 19:00:37 +0200 |
| commit | 103eb18195f370bd654fa5333147923b1a0958f8 (patch) | |
| tree | f1a13625830512e657cdf64ccea5ab2a4291b694 /oox | |
| parent | 985922fe1a5dfd9ce02f7d24c4083d9d69544951 (diff) | |
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>
(cherry picked from commit 33696b2820ce3c8b21b753d2c2bf92345ecb9276)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100356
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ppt/pptshape.cxx | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index eaad8c40c095..88277219d0b0 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -231,6 +231,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) { |