diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2020-07-23 13:45:51 +0300 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-09-01 17:59:33 +0200 |
| commit | ed057e1ecbdfaa067d635f38e46501ff3ec776a1 (patch) | |
| tree | 382c18b3c8389cc57dc8055022ecedd516d1668b /include | |
| parent | dcdfa57df779f6abdc8eb7c83320d05132d431ff (diff) | |
tdf#133015 Fix duplicated row and column problem.
LibreOffice imports multicolumn texboxes as tables. When
document has numCols=2 (or more) attribute at slidelayout and slide,
the table rows and columns duplicates.
maPPTShapes vector holds our PPTShape objects, hasSameSubTypeIndex
function finds the status that I mention above. So that we can prevent
that duplication.
Change-Id: Iee03d130452a16e9b46d471a9b6ed5910e6351ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99279
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101747
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/ppt/pptimport.hxx | 3 | ||||
| -rw-r--r-- | include/oox/ppt/pptshape.hxx | 3 | ||||
| -rw-r--r-- | include/oox/ppt/slidepersist.hxx | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index 28ae6df51da6..e96f04b70374 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -31,6 +31,7 @@ #include <oox/drawingml/drawingmltypes.hxx> #include <oox/drawingml/theme.hxx> #include <oox/ppt/slidepersist.hxx> +#include <oox/ppt/pptshape.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> @@ -76,6 +77,8 @@ 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 f452e585abcf..e67a77635111 100644 --- a/include/oox/ppt/pptshape.hxx +++ b/include/oox/ppt/pptshape.hxx @@ -66,7 +66,8 @@ public: const oox::drawingml::Theme* pTheme, const css::uno::Reference< css::drawing::XShapes >& rxShapes, basegfx::B2DHomMatrix& aTransformation, - ::oox::drawingml::ShapeIdMap* pShapeMap ); + ::oox::drawingml::ShapeIdMap* pShapeMap, + bool bhasSameSubTypeIndex = false ); ShapeLocation getShapeLocation() const { return meShapeLocation; }; void setReferenced( bool bReferenced ){ mbReferenced = bReferenced; }; diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx index 3dd9d65977b0..c09e5f0b0da0 100644 --- a/include/oox/ppt/slidepersist.hxx +++ b/include/oox/ppt/slidepersist.hxx @@ -67,6 +67,7 @@ public: oox::drawingml::ShapePtr const & pShapesPtr, const ::oox::drawingml::TextListStylePtr & ); ~SlidePersist(); + const css::uno::Reference< css::drawing::XDrawPage >& getPage() const { return mxPage; }; #if OSL_DEBUG_LEVEL > 0 |