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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

1 files changed, 15 insertions, 0 deletions

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<text::XTextRange>())),
+        m_xAltChunkStartingRange(rMediaDesc.getUnpackedValueOrDefault("AltChunkStartingRange", uno::Reference<text::XTextRange>())),
         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<RedlineParamsPtr>());
+
+    if (m_bIsAltChunk)
+    {
+        m_bIsFirstSection = false;
+    }
 }
 
 
@@ -2987,10 +2994,18 @@ void DomainMapper_Impl::HandleAltChunk(const OUString& rStreamName)
         uno::Reference<io::XStream> xInputStream = new utl::OStreamWrapper(aMemory);
         // Not handling AltChunk during paste for now.
         uno::Reference<text::XTextRange> xInsertTextRange = GetCurrentXText()->getEnd();
+        uno::Reference<text::XTextRange> xSectionStartingRange;
+        SectionPropertyMap* pSectionContext = GetSectionContext();
+        if (pSectionContext)
+        {
+            xSectionStartingRange = pSectionContext->GetStartingRange();
+        }
         uno::Sequence<beans::PropertyValue> 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.