summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--oox/source/ppt/pptshape.cxx13
1 files changed, 13 insertions, 0 deletions
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 647435888fe3..d017b4348d93 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)
{