From 9bc6160e0acbc78be998129ea55ed7e4529959fa Mon Sep 17 00:00:00 2001
From: Michael Stahl <michael.stahl@allotropia.de>
Date: Mon, 8 Mar 2021 20:03:35 +0100
Subject: tdf#133487 sw ODF export: reorder flys' ZOrder/z-index...

... so background shapes have lower z-index than foreground shapes,
as is recommended by ODF 1.3.

Also let SdrObjList::sort() record Undo actions, because earlier Undo
actions could expect the previous sort order.

Change-Id: Idbecf0a2acd525d42efc0ac92677b1c7987cc6ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112180
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
---
 include/svx/strings.hrc        | 1 +
 include/xmloff/shapeexport.hxx | 9 +++++++++
 2 files changed, 10 insertions(+)

(limited to 'include')

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 1b59e4d765e8..3a307cdc6a36 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -155,6 +155,7 @@
 #define STR_EditPutToTop                                    NC_("STR_EditPutToTop", "Move %1 to front")
 #define STR_EditPutToBtm                                    NC_("STR_EditPutToBtm", "Move %1 to back")
 #define STR_EditRevOrder                                    NC_("STR_EditRevOrder", "Reverse order of %1")
+#define STR_SortShapes                                      NC_("STR_SortShapes", "Sort shapes")
 #define STR_EditMove                                        NC_("STR_EditMove", "Move %1")
 #define STR_EditResize                                      NC_("STR_EditResize", "Resize %1")
 #define STR_EditRotate                                      NC_("STR_EditRotate", "Rotate %1")
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index ff38aeaf4cab..e5012d84836d 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -28,6 +28,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
+#include <functional>
 #include <map>
 #include <xmloff/animexp.hxx>
 #include <xmloff/families.hxx>
@@ -297,6 +298,14 @@ public:
     const rtl::Reference< XMLTableExport >&     GetShapeTableExport();
 };
 
+namespace xmloff {
+
+XMLOFF_DLLPUBLIC void FixZOrder(
+    css::uno::Reference<css::drawing::XShapes> const& xShapes,
+    std::function<bool(css::uno::Reference<css::beans::XPropertySet> const&)> const& rIsInBackground);
+
+} // namespace xmloff
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit