oox/source/ppt/pptshape.cxx | 13 +++++++++++++
1 file changed, 13 insertions(+)
New commits:
commit 103eb18195f370bd654fa5333147923b1a0958f8
Author: Gülşah Köse <gulsah.k...@collabora.com>
AuthorDate: Sat Aug 8 00:34:37 2020 +0300
Commit: Gülşah Köse <gulsah.k...@collabora.com>
CommitDate: Tue Aug 18 19:00:37 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.k...@collabora.com>
(cherry picked from commit 33696b2820ce3c8b21b753d2c2bf92345ecb9276)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100356
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
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)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
