[Libreoffice-commits] core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/ui/dbui/mmlayoutpage.cxx    |    2 +-
 sw/source/ui/dbui/mmresultdialogs.cxx |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c95db2f6a088de12012b88fa8505ae42b0cc90c7
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Apr 1 14:58:15 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Apr 1 17:13:20 2020 +0200

    Related: tdf#131767 explicitly get the odt filter
    
    in the other place that looks similar in mailmerge
    
    Change-Id: I9bd9b4ffe9c7f10ff2aaa604a62130c9dea1838d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91493
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 3984af74545c..537a60e5ad69 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -86,7 +86,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage(weld::Container* pPage, SwMailMerge
 {
     std::shared_ptr<const SfxFilter> pSfxFlt =
             SwDocShell::Factory().GetFilterContainer()->
-            GetFilter4FilterName("writer8");
+            GetFilter4FilterName("writer8", SfxFilterFlags::EXPORT);
 
     //save the current document into a temporary file
     {
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 44a3248cb4d0..adbc284c5b97 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -898,9 +898,9 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog, SendDocumentsHdl_Impl, weld::Button&, voi
         {
             //Make sure we don't pick e.g. the flat xml filter
             //for this format
-            pSfxFlt = SwIoSystem::GetFilterOfFormat(
-                FILTER_XML,
-                SwDocShell::Factory().GetFilterContainer() );
+            pSfxFlt = pFilterContainer->GetFilter4FilterName(
+                "writer8",
+                SfxFilterFlags::EXPORT);
         }
         break;
         case MM_DOCTYPE_PDF: