[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-3' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/ui/dbui/mmlayoutpage.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 708f8c4dfcf29550e5f69cb09add76403a4eefa8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Apr 1 14:48:36 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Thu Apr 2 12:57:27 2020 +0200

    Resolves: tdf#131767 explicitly get the odt filter
    
    instead of using CXML which might return either the desired writer8 odt filter
    or the StarOffice_XML__Writer filter which both have CXML set as userdata
    
    Change-Id: I3da7e7ee9a0069642c09766e8778bcaf247a4575
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91509
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit fdc768a10024998f6ed27991ea722645b3f5c246)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91511
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Tested-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 8a2dcf3f6766..d504212c77d9 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -33,6 +33,7 @@
 #include <sfx2/dispatch.hxx>
 #include <svl/stritem.hxx>
 #include <sfx2/docfilt.hxx>
+#include <sfx2/fcontnr.hxx>
 #include <svtools/unitconv.hxx>
 #include <com/sun/star/text/XParagraphCursor.hpp>
 #include <com/sun/star/view/XViewSettingsSupplier.hpp>
@@ -91,9 +92,10 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage(weld::Container* pPage, SwMailMerge
     , m_xDownPB(m_xBuilder->weld_button("down"))
     , m_xZoomLB(m_xBuilder->weld_combo_box("zoom"))
 {
-    std::shared_ptr<const SfxFilter> pSfxFlt = SwIoSystem::GetFilterOfFormat(
-            FILTER_XML,
-            SwDocShell::Factory().GetFilterContainer() );
+    std::shared_ptr<const SfxFilter> pSfxFlt =
+            SwDocShell::Factory().GetFilterContainer()->
+            GetFilter4FilterName("writer8");
+
     //save the current document into a temporary file
     {
         //temp file needs its own block