diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-06-05 00:19:06 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-06-08 14:51:57 +0200 |
| commit | 486a11ad6fdae1714200229462b69f328be06b5a (patch) | |
| tree | 592469c652c8919cc1e864d20ea10f5d5b8b167a /oox/inc | |
| parent | d0a1616ccad0dd5f5a02c1b0204f537b57d0b4b5 (diff) | |
editengine-columns: PPTX support (tdf#118458)
The unit tests that used to check the workaround using tables to
emulate columns (implemented in tdf#120028) are changed to test
import of the columns.
This reverts some commits related to the mentioned workaround,
namely aef569ed83a3ccc02639e5b2a1c7cc131ba262fc,
c50ae6a282ed83762bf634fed5c91033eb305c88,
7b64bd90637a6722438bf873b1ded74ab3424c46,
33696b2820ce3c8b21b753d2c2bf92345ecb9276,
99dff69b561a8fe2d9437e6aa67a9581a6666f41.
Change-Id: I97693ad4a981780e822070938992f274920df5a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116738
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/drawingml/table/tableproperties.hxx | 3 | ||||
| -rw-r--r-- | oox/inc/drawingml/textbodyproperties.hxx | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/oox/inc/drawingml/table/tableproperties.hxx b/oox/inc/drawingml/table/tableproperties.hxx index ec8b3c4c5b60..34e361b18add 100644 --- a/oox/inc/drawingml/table/tableproperties.hxx +++ b/oox/inc/drawingml/table/tableproperties.hxx @@ -58,9 +58,6 @@ public: const css::uno::Reference < css::beans::XPropertySet > & xPropSet, 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, bool bMaster); - private: const TableStyle& getUsedTableStyle(const ::oox::core::XmlFilterBase& rFilterBase, std::unique_ptr<TableStyle>& rTableStyleToDelete); diff --git a/oox/inc/drawingml/textbodyproperties.hxx b/oox/inc/drawingml/textbodyproperties.hxx index 8a51c2bb906e..41fbb832a5d8 100644 --- a/oox/inc/drawingml/textbodyproperties.hxx +++ b/oox/inc/drawingml/textbodyproperties.hxx @@ -42,8 +42,6 @@ struct TextBodyProperties std::optional< sal_Int32 > moTextOffRight; css::drawing::TextVerticalAdjust meVA; OUString msPrst; - /// Number of requested columns. - sal_Int32 mnNumCol = 1; /// Normal autofit: font scale (default: 100%). sal_Int32 mnFontScale = 100000; OUString msHorzOverflow; |