[Libreoffice-commits] core.git: Branch 'libreoffice-7-1-4' - xmloff/source

[Noel Grandin (via logerrit)]

 xmloff/source/core/XMLEmbeddedObjectImportContext.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 1069208bd430fb7b3a35b039fe49eddfdf59b3bb
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jun 3 14:15:13 2021 +0200
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Fri Jun 4 11:15:59 2021 +0200

    tdf#142546 broken formulas in .FODT files
    
    regression from
        commit 81fe31d2c8977791f9b90ab1da4fbb1a778f87fb
        Date:   Tue Nov 3 18:25:10 2020 +0200
        use fastparser in XMLEmbeddedObjectImportContext
    
    Change-Id: Ib5bae81001ae97c574c078c979484f016c7d4323
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116664
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 06a983b213b8fb71fdac1004868d7b4fdd6a9833)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116470
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    (cherry picked from commit 5f70c1f1ebd67db3f98ec132baf40e629de7a1c1)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116471
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    Tested-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index 5f6073d171bc..e468384122dd 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -135,6 +135,11 @@ void XMLEmbeddedObjectImportContext::SetComponent( Reference< XComponent > const
     xImporter->setTargetDocument( rComp );
 
     xComp = rComp;  // keep ref to component only if there is a handler
+
+    // #i34042: copy namepspace declarations
+    // We created a new instance of XMLImport, so we need to propogate the namespace
+    // declarations to it.
+    pFastHandler->GetNamespaceMap() = GetImport().GetNamespaceMap();
 }
 
 XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(