diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2020-08-07 14:53:13 +0300 |
|---|---|---|
| committer | Gülşah Köse <gulsah.kose@collabora.com> | 2020-08-16 23:42:52 +0200 |
| commit | e53b41b88e0468566451e90acddf72071549aaf4 (patch) | |
| tree | b13aff736221e2a586a0cfa91a14e71e984b5772 /oox | |
| parent | d8db387729092f5010d50ece4406a48517cd7917 (diff) | |
tdf#133015 Do not import multicol table text on master.
Change-Id: I0a1b1dc2f9b314858ed90347065407bcd1dbbb73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100311
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100827
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/inc/drawingml/table/tableproperties.hxx | 2 | ||||
| -rw-r--r-- | oox/source/drawingml/table/tableproperties.cxx | 5 | ||||
| -rw-r--r-- | oox/source/ppt/pptshape.cxx | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/oox/inc/drawingml/table/tableproperties.hxx b/oox/inc/drawingml/table/tableproperties.hxx index 40a0cc8efe0b..5434ce5a9e32 100644 --- a/oox/inc/drawingml/table/tableproperties.hxx +++ b/oox/inc/drawingml/table/tableproperties.hxx @@ -61,7 +61,7 @@ public: const ::oox::drawingml::TextListStylePtr& pMasterTextListStyle ); /// Distributes text body with multiple columns in table cells. - void pullFromTextBody(oox::drawingml::TextBodyPtr pTextBody, sal_Int32 nShapeWidth, bool bhasSameSubTypeIndex); + void pullFromTextBody(oox::drawingml::TextBodyPtr pTextBody, sal_Int32 nShapeWidth, bool bhasSameSubTypeIndex, bool bMaster); private: diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx index 3b1bbfb6514b..431a198e7ef2 100644 --- a/oox/source/drawingml/table/tableproperties.cxx +++ b/oox/source/drawingml/table/tableproperties.cxx @@ -213,7 +213,7 @@ void TableProperties::pushToPropSet(const ::oox::core::XmlFilterBase& rFilterBas xTableStyleToDelete.reset(); } -void TableProperties::pullFromTextBody(oox::drawingml::TextBodyPtr pTextBody, sal_Int32 nShapeWidth, bool bhasSameSubTypeIndex) +void TableProperties::pullFromTextBody(oox::drawingml::TextBodyPtr pTextBody, sal_Int32 nShapeWidth, bool bhasSameSubTypeIndex, bool bMaster) { // Create table grid and a single row. sal_Int32 nNumCol = pTextBody->getTextProperties().mnNumCol; @@ -251,6 +251,9 @@ void TableProperties::pullFromTextBody(oox::drawingml::TextBodyPtr pTextBody, sa // Copy properties provided by <a:lstStyle>. pCellTextBody->getTextListStyle() = pTextBody->getTextListStyle(); + if (bMaster) + continue; + for (sal_Int32 nParaInCol = 0; nParaInCol < nParaPerCol; ++nParaInCol) { if (nPara < pTextBody->getParagraphs().size()) diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index e8182142c459..eaad8c40c095 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -238,7 +238,7 @@ void PPTShape::addShape( // represent that as a table. sServiceName = "com.sun.star.drawing.TableShape"; oox::drawingml::table::TablePropertiesPtr pTableProperties = getTableProperties(); - pTableProperties->pullFromTextBody(pTextBody, maSize.Width, bhasSameSubTypeIndex); + pTableProperties->pullFromTextBody(pTextBody, maSize.Width, bhasSameSubTypeIndex, meShapeLocation == Layout); setTextBody(nullptr); } } |