diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-04-01 14:48:36 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-04-02 12:57:27 +0200 |
| commit | 708f8c4dfcf29550e5f69cb09add76403a4eefa8 (patch) | |
| tree | 533694aad5f743716e18efc6c19d0f4084b063c1 | |
| parent | a9ed52fca453f14cd38d948eba749248892577e4 (diff) | |
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@posteo.de>
(cherry picked from commit fdc768a10024998f6ed27991ea722645b3f5c246)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91511
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Michael Stahl <michael.stahl@cib.de>
| -rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
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 |