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 /include/oox/ppt | |
| 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 'include/oox/ppt')
| -rw-r--r-- | include/oox/ppt/pptimport.hxx | 2 | ||||
| -rw-r--r-- | include/oox/ppt/pptshape.hxx | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index eafb114b47fd..29ef3c5732a6 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -77,8 +77,6 @@ public: ::Color getSchemeColor( sal_Int32 nToken ) const; - static std::vector< PPTShape* > maPPTShapes; - #if OSL_DEBUG_LEVEL > 0 static XmlFilterBase* mpDebugFilterBase; #endif diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx index e67a77635111..f452e585abcf 100644 --- a/include/oox/ppt/pptshape.hxx +++ b/include/oox/ppt/pptshape.hxx @@ -66,8 +66,7 @@ public: const oox::drawingml::Theme* pTheme, const css::uno::Reference< css::drawing::XShapes >& rxShapes, basegfx::B2DHomMatrix& aTransformation, - ::oox::drawingml::ShapeIdMap* pShapeMap, - bool bhasSameSubTypeIndex = false ); + ::oox::drawingml::ShapeIdMap* pShapeMap ); ShapeLocation getShapeLocation() const { return meShapeLocation; }; void setReferenced( bool bReferenced ){ mbReferenced = bReferenced; }; |