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

[Miklos Vajna]

 tools/source/inet/inetstrm.cxx |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 793d4810c8cd087b42df51ab5326e35f4dd1132d
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Mar 22 13:07:47 2013 +0100

    tools: remove no longer needed CONSTASCII_STRINGPARAM macro
    
    Change-Id: I5edf79ed165b8ed8e96e091f3f29ded0ac6067f2

diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index 009c905..544f23d 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -31,8 +31,6 @@ inline sal_Bool SAL_CALL ascii_isWhitespace( sal_Unicode ch )
     return ((ch <= 0x20) && ch);
 }
 
-#define CONSTASCII_STRINGPARAM(a) (a), RTL_TEXTENCODING_ASCII_US
-
 /** Quoted-Printable Encoding */
 class INetMessageEncodeQPStream_Impl : public INetMessageIStream
 {
@@ -1173,14 +1171,13 @@ int INetMIMEMessageStream::GetMsgLine (sal_Char *pData, sal_uIntPtr nSize)
             {
                 String aPCT (pMsg->GetParent()->GetContentType());
                 if (aPCT.CompareIgnoreCaseToAscii ("message/rfc822", 14) == 0)
-                    pMsg->SetMIMEVersion (
-                        String(CONSTASCII_STRINGPARAM("1.0")));
+                    pMsg->SetMIMEVersion ("1.0");
                 else
                     pMsg->SetMIMEVersion (String());
             }
             else
             {
-                pMsg->SetMIMEVersion (String(CONSTASCII_STRINGPARAM("1.0")));
+                pMsg->SetMIMEVersion ("1.0");
             }
 
             // Check ContentType.
@@ -1226,14 +1223,12 @@ int INetMIMEMessageStream::GetMsgLine (sal_Char *pData, sal_uIntPtr nSize)
             if (eEncoding == INETMSG_ENCODING_BASE64)
             {
                 // Base64.
-                pMsg->SetContentTransferEncoding (
-                    String(CONSTASCII_STRINGPARAM("base64")));
+                pMsg->SetContentTransferEncoding ("base64");
             }
             else if (eEncoding == INETMSG_ENCODING_QUOTED)
             {
                 // Quoted-Printable.
-                pMsg->SetContentTransferEncoding (
-                    String(CONSTASCII_STRINGPARAM("quoted-printable")));
+                pMsg->SetContentTransferEncoding ("quoted-printable");
             }
             else
             {