From bf1772c9fe7206c2594b2db5f6da3ca97003ba98 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 26 Oct 2020 17:52:42 +0100 Subject: DOCX import, altChunk: fix missing page break Somewhat similar to copy&paste, the altChunk mechanism drops styles from the inner document by default. A surprising consequence of that is sections in the inner document have the default page size. This leads to a page break when the content of the outer document ends and the content of the inner document starts. Fix the importer to support this: 1) Ignore the page size and number in DomainMapper::lcl_attribute(). 2) Pass the start of the current section to the sub-importer, so that it can insert the starting page break at the right place. (cherry picked from commit 32c322e9d037b29ded2297b400a2c596c042f1fa) Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.hxx Change-Id: Id3955f2b35a139692254c4ac1233e96eef2620e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104870 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna --- .../qa/cppunittests/dmapper/DomainMapper_Impl.cxx | 18 +++++++++++++++--- .../qa/cppunittests/dmapper/data/alt-chunk.docx | Bin 21945 -> 22007 bytes writerfilter/source/dmapper/DomainMapper.cxx | 12 +++++++++--- writerfilter/source/dmapper/DomainMapper_Impl.cxx | 15 +++++++++++++++ writerfilter/source/dmapper/DomainMapper_Impl.hxx | 4 ++++ writerfilter/source/dmapper/PropertyMap.cxx | 6 +++++- 6 files changed, 48 insertions(+), 7 deletions(-) (limited to 'writerfilter') diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx index 8aa53fcee3ec..d09a476dce4a 100644 --- a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx @@ -120,16 +120,28 @@ CPPUNIT_TEST_FIXTURE(Test, testAltChunk) uno::UNO_QUERY); uno::Reference xParaEnum = xParaEnumAccess->createEnumeration(); uno::Reference xPara; + uno::Reference xParaProps; xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("Outer para 1"), xPara->getString()); + xParaProps.set(xPara, uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("outer, before sect break"), xPara->getString()); + CPPUNIT_ASSERT_EQUAL(OUString("Standard"), + xParaProps->getPropertyValue("PageStyleName").get()); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("Outer para 2"), xPara->getString()); + xParaProps.set(xPara, uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("outer, after sect break"), xPara->getString()); + + // Without the accompanying fix in place, this test would have failed with: + // - Expected: Converted1 + // - Actual : Standard + // i.e. the page break between the first and the second paragraph was missing. + CPPUNIT_ASSERT_EQUAL(OUString("Converted1"), + xParaProps->getPropertyValue("PageStyleName").get()); // Without the accompanying fix in place, this test would have failed with a // container.NoSuchElementException, as the document had only 2 paragraphs, all the "inner" // content was lost. xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("Inner para 1"), xPara->getString()); + CPPUNIT_ASSERT_EQUAL(OUString("inner doc, first para"), xPara->getString()); } } diff --git a/writerfilter/qa/cppunittests/dmapper/data/alt-chunk.docx b/writerfilter/qa/cppunittests/dmapper/data/alt-chunk.docx index 3348cfd0c04c..40d071ff40a6 100644 Binary files a/writerfilter/qa/cppunittests/dmapper/data/alt-chunk.docx and b/writerfilter/qa/cppunittests/dmapper/data/alt-chunk.docx differ diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 04f5e2a6bec6..7789b54c0f5c 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1050,7 +1050,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) m_pImpl->m_oBackgroundColor = nIntValue; break; case NS_ooxml::LN_CT_PageNumber_start: - if (pSectionContext != nullptr) + if (pSectionContext != nullptr && !m_pImpl->IsAltChunk()) pSectionContext->SetPageNumber(nIntValue); break; case NS_ooxml::LN_CT_PageNumber_fmt: @@ -2110,9 +2110,15 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) OSL_ENSURE(pSectionContext, "SectionContext unavailable!"); if(pSectionContext) { - pSectionContext->Insert( PROP_HEIGHT, uno::makeAny( CT_PageSz.h ) ); + if (!m_pImpl->IsAltChunk()) + { + pSectionContext->Insert(PROP_HEIGHT, uno::makeAny(CT_PageSz.h)); + } pSectionContext->Insert( PROP_IS_LANDSCAPE, uno::makeAny( CT_PageSz.orient )); - pSectionContext->Insert( PROP_WIDTH, uno::makeAny( CT_PageSz.w ) ); + if (!m_pImpl->IsAltChunk()) + { + pSectionContext->Insert(PROP_WIDTH, uno::makeAny(CT_PageSz.w)); + } } break; diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index a3f8e9f27110..a146f7d1802f 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -302,7 +302,9 @@ DomainMapper_Impl::DomainMapper_Impl( m_aAnnotationPositions(), m_aSmartTagHandler(m_xComponentContext, m_xTextDocument), m_xInsertTextRange(rMediaDesc.getUnpackedValueOrDefault("TextInsertModeRange", uno::Reference())), + m_xAltChunkStartingRange(rMediaDesc.getUnpackedValueOrDefault("AltChunkStartingRange", uno::Reference())), m_bIsNewDoc(!rMediaDesc.getUnpackedValueOrDefault("InsertMode", false)), + m_bIsAltChunk(rMediaDesc.getUnpackedValueOrDefault("AltChunkMode", false)), m_bIsReadGlossaries(rMediaDesc.getUnpackedValueOrDefault("ReadGlossaries", false)), m_bInTableStyleRunProps(false), m_nTableDepth(0), @@ -345,6 +347,11 @@ DomainMapper_Impl::DomainMapper_Impl( m_pSdtHelper = new SdtHelper(*this); m_aRedlines.push(std::vector()); + + if (m_bIsAltChunk) + { + m_bIsFirstSection = false; + } } @@ -2987,10 +2994,18 @@ void DomainMapper_Impl::HandleAltChunk(const OUString& rStreamName) uno::Reference xInputStream = new utl::OStreamWrapper(aMemory); // Not handling AltChunk during paste for now. uno::Reference xInsertTextRange = GetCurrentXText()->getEnd(); + uno::Reference xSectionStartingRange; + SectionPropertyMap* pSectionContext = GetSectionContext(); + if (pSectionContext) + { + xSectionStartingRange = pSectionContext->GetStartingRange(); + } uno::Sequence aDescriptor(comphelper::InitPropertySequence({ { "InputStream", uno::Any(xInputStream) }, { "InsertMode", uno::Any(true) }, { "TextInsertModeRange", uno::Any(xInsertTextRange) }, + { "AltChunkMode", uno::Any(true) }, + { "AltChunkStartingRange", uno::Any(xSectionStartingRange) }, })); // Do the actual import. diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index a0587cacddd3..768e86fe9dc8 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -584,8 +584,10 @@ private: public: css::uno::Reference m_xInsertTextRange; + css::uno::Reference m_xAltChunkStartingRange; private: bool const m_bIsNewDoc; + bool m_bIsAltChunk = false; bool const m_bIsReadGlossaries; public: DomainMapper_Impl( @@ -974,6 +976,8 @@ public: /// If we're importing into a new document, or just pasting to an existing one. bool IsNewDoc() const { return m_bIsNewDoc;} + bool IsAltChunk() const { return m_bIsAltChunk;} + /// If we're importing autotext. bool IsReadGlossaries() const { return m_bIsReadGlossaries;} diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index ef5ac73ac4af..dc487df3b45c 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1696,7 +1696,11 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) evenOddStyle->setPropertyValue( getPropertyName( PROP_PAGE_STYLE_LAYOUT ), uno::makeAny( style::PageStyleLayout_RIGHT ) ); } - if ( xRangeProperties.is() && rDM_Impl.IsNewDoc() ) + if (rDM_Impl.m_xAltChunkStartingRange.is()) + { + xRangeProperties.set(rDM_Impl.m_xAltChunkStartingRange, uno::UNO_QUERY); + } + if (xRangeProperties.is() && (rDM_Impl.IsNewDoc() || rDM_Impl.IsAltChunk())) { // Avoid setting page style in case of autotext: so inserting the autotext at the // end of the document does not introduce an unwanted page break. -- cgit