diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-18 17:47:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-21 09:20:34 +0000 |
| commit | 3b52a83f6598b8f0387f94ea8619acaed4ebeb11 (patch) | |
| tree | 47fd3ac18fe264a5fa3b2efdb9653547b36be3b9 | |
| parent | dfce3b53b75c95bafb1e6f9d76a298515eb8a124 (diff) | |
Related: fdo#32553/fdo#31792 nsure correct odt mimetype and pdf export filterlibreoffice-3-3-2
Signed-off-by: Petr Mladek <pmladek@suse.cz>
(cherry picked from commit b59804d94e107c5227532aa3511d4fad1dd15436)
| -rw-r--r-- | sw/source/ui/dbui/mmoutputpage.cxx | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index f6d0409700..2b6c5feeb2 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -1043,7 +1043,6 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) nEnd = rConfigItem.GetMergedDocumentCount(); } bool bAsBody = false; - bool bIsPDF = false; rtl_TextEncoding eEncoding = ::gsl_getSystemTextEncoding(); SfxFilterContainer* pFilterContainer = SwDocShell::Factory().GetFilterContainer(); const SfxFilter *pSfxFlt = 0; @@ -1051,8 +1050,22 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) String sExtension = lcl_GetExtensionForDocType(nDocType); switch( nDocType ) { - case MM_DOCTYPE_OOO : break; - case MM_DOCTYPE_PDF : bIsPDF = true; break; + case MM_DOCTYPE_OOO: + { + //Make sure we don't pick e.g. the flat xml filter + //for this format + pSfxFlt = SwIoSystem::GetFilterOfFormat( + String::CreateFromAscii( FILTER_XML ), + SwDocShell::Factory().GetFilterContainer() ); + } + break; + case MM_DOCTYPE_PDF: + { + pSfxFlt = pFilterContainer->GetFilter4FilterName( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("writer_pdf_Export")), + SFX_FILTER_EXPORT); + } + break; case MM_DOCTYPE_WORD: { //the method SwIOSystemGetFilterOfFormat( ) returns the template filter @@ -1195,14 +1208,6 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) INetURLObject(), utl::TempFile::CreateTempName(0), URIHelper::GetMaybeFileHdl()) ); -/* if(bIsPDF) - { - SfxDispatcher* pSfxDispatcher = pTempView->GetViewFrame()->GetDispatcher(); - pSfxDispatcher->Execute( - SID_DIRECTEXPORTDOCASPDF, - SFX_CALLMODE_SYNCHRON, &aName, &aFilterName, 0L ); - } - else*/ { uno::Sequence< beans::PropertyValue > aFilterValues(MM_DOCTYPE_TEXT == nDocType ? 2 : 1); beans::PropertyValue* pFilterValues = aFilterValues.getArray(); |