From 55b1d635350cb76ee3e19e90c938eedd38ac3342 Mon Sep 17 00:00:00 2001
From: Tünde Tóth <toth.tunde@nisz.hu>
Date: Mon, 21 Nov 2022 11:30:16 +0100
Subject: tdf#152153 DOCX export: fix lost images at embedded documents
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Handling of image counter was incorrect if the
document contains embedded documents, overwriting
images with the other ones.

See also commit cf2dc247ff5f726238856e9b46a4926a30430e14
"DOCX export: image deduplication and clean up" and
 commit 3f6df3835fec71ea61894f9a3bbfe5e4a06a5495
"DOCX export: fix image counters for multiple documents".

Change-Id: I3ce3e370f96fa8b9feca3bc73f06ddca933215d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143036
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
---
 include/oox/export/drawingml.hxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/oox')

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 3f74f124d767..bf2ed44bca70 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -143,7 +143,7 @@ class OOX_DLLPUBLIC DrawingML
 {
 
 private:
-    static int mnImageCounter;
+    static std::stack<sal_Int32> mnImageCounter;
     static int mnWdpImageCounter;
     static std::map<OUString, OUString> maWdpCache;
     static sal_Int32 mnDrawingMLCount;
-- 
cgit