diff options
| author | Tünde Tóth <toth.tunde@nisz.hu> | 2022-11-24 15:30:37 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2022-11-29 17:37:28 +0100 |
| commit | 01246f06cfeeb6a1070e82351e2559def4f5d820 (patch) | |
| tree | 2826f750ba90cfd2c66eabbd453ec4ab75fbd218 /include | |
| parent | ae132145ff42a95dc24fb124847c04af4b8c8dab (diff) | |
tdf#152152 DOCX export: fix lost WDP images in artistic effects
Handling of WDP image counter was incorrect if the
document contains embedded documents, overwriting
WDP images with the other ones.
See also commit 55b1d635350cb76ee3e19e90c938eedd38ac3342
"tdf#152153 DOCX export: fix lost images at embedded documents"
and commit cf2dc247ff5f726238856e9b46a4926a30430e14
"DOCX export: image deduplication and clean up"
and commit b5f6a5cfc517ecd8aa6ba96471d854b07b92ebaa
"ooxml: Do not repeat wdp files in artistic effects".
Change-Id: Ia26784519f6d514ee8c90c7a91a367feeba140b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143235
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/export/drawingml.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index 543fb072921f..eb0fea23b95c 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -144,8 +144,8 @@ class OOX_DLLPUBLIC DrawingML private: static std::stack<sal_Int32> mnImageCounter; - static int mnWdpImageCounter; - static std::map<OUString, OUString> maWdpCache; + static std::stack<sal_Int32> mnWdpImageCounter; + static std::stack<std::map<OUString, OUString>> maWdpCache; static sal_Int32 mnDrawingMLCount; static sal_Int32 mnVmlCount; static std::stack<std::unordered_map<BitmapChecksum, OUString>> maExportGraphics; @@ -348,7 +348,6 @@ public: static bool IsGroupShape( const css::uno::Reference< css::drawing::XShape >& rXShape ); sal_Int32 getBulletMarginIndentation (const css::uno::Reference< css::beans::XPropertySet >& rXPropSet,sal_Int16 nLevel, std::u16string_view propName); - static void ResetCounters(); static void ResetMlCounters(); static void PushExportGraphics(); |