diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-04-06 18:54:51 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-04-07 10:03:15 +0200 |
| commit | 79ef3c7ae3b2f7be5ba6fe38997e846fd9c7e0ee (patch) | |
| tree | c36b3f4838cffbcabf628d88f572cc6fa001b0c2 /sw/source/filter/xml/wrtxml.cxx | |
| parent | 795a3ad8efa8b418f3c6477379c13560c3b4b890 (diff) | |
tdf#141467 xmloff,sc,sw: ODF export: reorder flys' ZOrder/z-index harder
Also keep the control layer distinct from the foreground, as a follow-up
to tdf#133487.
Try to improve the detection of already sorted indexes a bit to avoid
unnecessary sorting.
Hilariously the test docs require adding 3 additional items to the
extension schema.
Change-Id: I629d5b09294f679717677b9d89537d905ac4c404
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113696
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/source/filter/xml/wrtxml.cxx')
| -rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 288814017c25..be2a21aeeefa 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -58,6 +58,7 @@ #include <unotools/ucbstreamhelper.hxx> #include <swerror.h> #include "wrtxml.hxx" +#include "zorder.hxx" #include <strings.hrc> #include <comphelper/documentconstants.hxx> @@ -186,11 +187,7 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS uno::Reference<lang::XComponent> const xModelComp(m_pDoc->GetDocShell()->GetModel()); uno::Reference<drawing::XDrawPageSupplier> const xDPS(xModelComp, uno::UNO_QUERY); assert(xDPS.is()); - xmloff::FixZOrder(xDPS->getDrawPage(), - [](uno::Reference<beans::XPropertySet> const& xShape) - { - return !*o3tl::doAccess<bool>(xShape->getPropertyValue("Opaque")); - }); + xmloff::FixZOrder(xDPS->getDrawPage(), sw::GetZOrderLayer(m_pDoc->getIDocumentDrawModelAccess())); // save show redline mode ... RedlineFlags const nOrigRedlineFlags = m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); |