summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-06-03 14:15:13 +0200
committerXisco Fauli <xiscofauli@libreoffice.org>2021-06-03 21:54:27 +0200
commit5f70c1f1ebd67db3f98ec132baf40e629de7a1c1 (patch)
tree4b2e47b7197cd3a926101d60d3a94dfd8fd280df
parent740d12d8a8294d4bfd28e6c3e4cf1e0ed560b198 (diff)
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@collabora.co.uk> (cherry picked from commit 06a983b213b8fb71fdac1004868d7b4fdd6a9833) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116470 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
-rw-r--r--xmloff/source/core/XMLEmbeddedObjectImportContext.cxx5
1 files changed, 5 insertions, 0 deletions
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(