From 50d93ff6ea05bd49d68c34664529ec66262b14b0 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 17 Feb 2020 14:35:54 +0100 Subject: DOCX import: don't touch the ZOrder of inline, in-shape objects 1) This is not needed: Word only supports inline "anchoring" in textboxes. 2) If the textbox has a certain ZOrder, we don't want the inline shapes to be behind the textbox. 3) This allows restoring the old assert in sw_ooxmlexport7 that was changed in commit 99847d6b3005c5444ed5a46ca578c0e40149d77c (DOCX import: fix ZOrder of inline vs anchored shapes, 2020-02-12). (cherry picked from commit 70ae12fe0b9e33633fc62cf805c261ef51fb4b59) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport7.cxx Change-Id: I817e4fb70cb789e8eb116219050fc1aeaec76667 --- writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx | 17 +++++++++++++++++ .../dmapper/data/inline-inshape-anchored-zorder.docx | Bin 0 -> 17243 bytes writerfilter/source/dmapper/DomainMapper.cxx | 2 ++ writerfilter/source/dmapper/DomainMapper.hxx | 1 + writerfilter/source/dmapper/GraphicImport.cxx | 3 ++- 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 writerfilter/qa/cppunittests/dmapper/data/inline-inshape-anchored-zorder.docx (limited to 'writerfilter') diff --git a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx index d5140f134cb3..01dd3d6ca602 100644 --- a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx +++ b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx @@ -124,6 +124,23 @@ CPPUNIT_TEST_FIXTURE(Test, testInlineAnchoredZOrder) // i.e. the rectangle (with no name) was on top of the oval one, not the other way around. CPPUNIT_ASSERT_EQUAL(OUString("Oval 2"), xOval->getName()); } + +CPPUNIT_TEST_FIXTURE(Test, testInlineInShapeAnchoredZOrder) +{ + // This document has a textbox shape and then an inline shape inside that. + // The ZOrder of the inline shape is larger than the hosting textbox, so the image is visible. + OUString aURL + = m_directories.getURLFromSrc(DATA_DIRECTORY) + "inline-inshape-anchored-zorder.docx"; + getComponent() = loadFromDesktop(aURL); + uno::Reference xDrawPageSupplier(getComponent(), uno::UNO_QUERY); + uno::Reference xDrawPage = xDrawPageSupplier->getDrawPage(); + uno::Reference xOval(xDrawPage->getByIndex(1), uno::UNO_QUERY); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: Picture 1 + // - Actual : Text Box 2 + // i.e. the image was behind the textbox that was hosting it. + CPPUNIT_ASSERT_EQUAL(OUString("Picture 1"), xOval->getName()); +} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/qa/cppunittests/dmapper/data/inline-inshape-anchored-zorder.docx b/writerfilter/qa/cppunittests/dmapper/data/inline-inshape-anchored-zorder.docx new file mode 100644 index 000000000000..3792285f4849 Binary files /dev/null and b/writerfilter/qa/cppunittests/dmapper/data/inline-inshape-anchored-zorder.docx differ diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 938cc59be726..97e34afb7926 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3867,6 +3867,8 @@ bool DomainMapper::IsInHeaderFooter() const return m_pImpl->IsInHeaderFooter(); } +bool DomainMapper::IsInShape() const { return m_pImpl->IsInShape(); } + bool DomainMapper::IsInTable() const { return m_pImpl->hasTableManager() && m_pImpl->getTableManager().isInCell(); diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx index 0913dd125814..55f9a20e0373 100644 --- a/writerfilter/source/dmapper/DomainMapper.hxx +++ b/writerfilter/source/dmapper/DomainMapper.hxx @@ -112,6 +112,7 @@ public: bool IsInHeaderFooter() const; bool IsInTable() const; bool IsStyleSheetImport() const; + bool IsInShape() const; void hasControls( const bool bSet ) { mbHasControls = bSet; } diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index df5f644e34ba..33540be2ff72 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -288,7 +288,8 @@ public: ,m_rAligns(rAligns) ,m_rPositivePercentages(rPositivePercentages) { - if (eGraphicImportType == GraphicImportType::IMPORT_AS_DETECTED_INLINE) + if (eGraphicImportType == GraphicImportType::IMPORT_AS_DETECTED_INLINE + && !rDMapper.IsInShape()) { zOrder = 0; } -- cgit