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

Mike Kaganski mike.kaganski at collabora.com
Mon Mar 5 14:15:21 UTC 2018


 sfx2/source/dialog/mailmodel.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit af269d967be348b813ea6d9e5e92a95886143622
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Mon Mar 5 07:22:14 2018 +0100

    We now use Unicode with MAPISendMailW, so no need for this
    
    Change-Id: I6f03b4212a3434cb5feae8da29107c5f411218e3
    Reviewed-on: https://gerrit.libreoffice.org/50759
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index aa712142cf6b..0bf38e6601dd 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -750,11 +750,7 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css:
                     OUString subject(
                         url.getBase(
                             INetURLObject::LAST_SEGMENT, false,
-#ifdef _WIN32
-                            INetURLObject::DecodeMechanism::NONE)); // MAPISendMail does not accept Unicode
-#else
                             INetURLObject::DecodeMechanism::WithCharset));
-#endif
                     if (subject.isEmpty()) {
                         subject = maAttachedDocuments[0];
                     }


More information about the Libreoffice-commits mailing list