diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-28 12:18:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-28 13:53:36 +0100 |
| commit | ba23ece286671f8f9b5baf245239996e1e1fabdb (patch) | |
| tree | 7314f9c83e9c92a72563856459c4a217fc42227e /tools | |
| parent | 2ee701afd333ef01bc5d4f62543aaf0f5ac5ed3c (diff) | |
probably the last uses of the one argument String::CreateFromAscii variant
Change-Id: I36aab317da2f69f12aaefc24895ad9eaa6b69a7c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/inc/tools/inetmsg.hxx | 2 | ||||
| -rw-r--r-- | tools/source/inet/inetmsg.cxx | 10 | ||||
| -rw-r--r-- | tools/source/inet/inetstrm.cxx | 3 |
3 files changed, 7 insertions, 8 deletions
diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx index db94ca62f94f..7d3a2c0b9f8f 100644 --- a/tools/inc/tools/inetmsg.hxx +++ b/tools/inc/tools/inetmsg.hxx @@ -500,7 +500,7 @@ public: return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_TRANSFER_ENCODING]); } - UniString GetDefaultContentType (); + rtl::OUString GetDefaultContentType (); /** Message container methods. */ diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index 7c5e89193b1f..273d995a82a4 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -1033,18 +1033,18 @@ void INetMIMEMessage::SetContentTransferEncoding ( /* * GetDefaultContentType. */ -UniString INetMIMEMessage::GetDefaultContentType() +rtl::OUString INetMIMEMessage::GetDefaultContentType() { if (pParent != NULL) { - String aParentCT (pParent->GetContentType()); - if (aParentCT.Len() == 0) + rtl::OUString aParentCT (pParent->GetContentType()); + if (aParentCT.isEmpty()) aParentCT = pParent->GetDefaultContentType(); - if (aParentCT.CompareIgnoreCaseToAscii ("multipart/digest") == 0) + if (aParentCT.equalsIgnoreAsciiCase("multipart/digest")) return rtl::OUString("message/rfc822"); } - return String("text/plain; charset=us-ascii", RTL_TEXTENCODING_ASCII_US); + return rtl::OUString("text/plain; charset=us-ascii"); } /* diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index c06bfef00a1e..08ab939492a9 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -1738,8 +1738,7 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize) */ if (pMsg->GetContentType().Len() == 0) { - String aDefaultCT = pMsg->GetDefaultContentType(); - pMsg->SetContentType (aDefaultCT); + pMsg->SetContentType(pMsg->GetDefaultContentType()); } if (eEncoding == INETMSG_ENCODING_BINARY) |