diff options
| author | Mark Hung <marklh9@gmail.com> | 2020-06-28 10:57:09 +0800 |
|---|---|---|
| committer | Mark Hung <marklh9@gmail.com> | 2020-07-04 06:40:55 +0200 |
| commit | 7dcc18b5ac79d9a3e7564492428a275bf9b386db (patch) | |
| tree | cfc37048ad3ad3d0fae8cb390360a3f339d8f20d /include/oox/export/shapes.hxx | |
| parent | 92c2318db92c3f102243ef1f8a9a492796932ff6 (diff) | |
tdf#119223 export the object name for pptx documents.
Originally the name was always an object type plus
an index. That not only ignores the existing
object name, but also makes an unnamed object named
in the roundtrip. So here the object name is used
no matter it is empty or not, to keep unamed object
unamed.
Change-Id: Ib29a8fbc1fd67fa9a4a4efbfd0b2e9c4fb50de0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96908
Tested-by: Jenkins
Reviewed-by: Mark Hung <marklh9@gmail.com>
Diffstat (limited to 'include/oox/export/shapes.hxx')
| -rw-r--r-- | include/oox/export/shapes.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx index 2dbbb658c036..53d505f168a2 100644 --- a/include/oox/export/shapes.hxx +++ b/include/oox/export/shapes.hxx @@ -87,10 +87,12 @@ public: typedef std::unordered_map< css::uno::Reference< css::drawing::XShape>, sal_Int32> ShapeHashMap; protected: - sal_Int32 mnShapeIdMax, mnPictureIdMax; + sal_Int32 mnShapeIdMax; void WriteGraphicObjectShapePart( const css::uno::Reference< css::drawing::XShape >& xShape, const Graphic *pGraphic=nullptr ); + OUString GetShapeName(const css::uno::Reference< css::drawing::XShape >& xShape); + private: sal_Int32 mnXmlNamespace; MapMode maMapModeSrc, maMapModeDest; |