[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sw/source

[Libreoffice Gerrit user]

 sw/source/ui/dbui/mmoutputpage.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 38be1e0d67f77870c4802e6aa23f1cb422631cbc
Author: Caolán McNamara <caol...@redhat.com>
Date:   Tue Jan 15 12:47:13 2013 +0000

    fix mailmerge output as plain text, explicitly pick correct .txt export 
filter
    
    Change-Id: Ie277dc58d9e562ffa2a0edd17c18aafe4f4bd4de
    (cherry picked from commit a5dc04633d79f5abee85d919e097983117d2abd4)
    Reviewed-on: https://gerrit.libreoffice.org/1697
    Reviewed-by: Michael Stahl <mst...@redhat.com>
    Tested-by: Michael Stahl <mst...@redhat.com>

diff --git a/sw/source/ui/dbui/mmoutputpage.cxx 
b/sw/source/ui/dbui/mmoutputpage.cxx
index c88c168..35ba499 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -1084,7 +1084,11 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, 
PushButton*, pButton)
         }
         break;
         case MM_DOCTYPE_TEXT:
+        {
             bAsBody = true;
+            pSfxFlt = pFilterContainer->GetFilter4FilterName(
+                OUString("Text (encoded)"), SFX_FILTER_EXPORT);
+        }
         break;
     }
     if(!pSfxFlt)

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits