summaryrefslogtreecommitdiff
path: root/oox/source/token
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2021-06-05 00:19:06 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2021-06-08 14:51:57 +0200
commit486a11ad6fdae1714200229462b69f328be06b5a (patch)
tree592469c652c8919cc1e864d20ea10f5d5b8b167a /oox/source/token
parentd0a1616ccad0dd5f5a02c1b0204f537b57d0b4b5 (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/source/token')
-rw-r--r--oox/source/token/properties.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index d50cd4bb124d..980c1bb8c0f2 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -528,6 +528,7 @@ TextBox
TextBreak
TextCameraZRotateAngle
TextColor
+TextColumns
TextFitToSize
TextFrames
TextHorizontalAdjust