summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-04-01 14:58:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-04-01 17:13:20 +0200
commitc95db2f6a088de12012b88fa8505ae42b0cc90c7 (patch)
tree92d18b3c9d2be833c908213d284865187bf73759 /sw/source
parent923cc749536013f4a11d96ab085c4e730e160d6d (diff)
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@redhat.com>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx2
-rw-r--r--sw/source/ui/dbui/mmresultdialogs.cxx6
2 files changed, 4 insertions, 4 deletions
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: