diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-03-20 11:37:07 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-20 12:57:34 +0000 |
commit | 55a40209072bac2526e74d5be7dd7be5ccd2c175 (patch) | |
tree | 3dd0257a893fcd6ff16ab164608b952f65041a94 /tools/source | |
parent | callcatcher: update list, I suspect SvLBoxBmp cannot be instantiated (diff) | |
download | core-55a40209072bac2526e74d5be7dd7be5ccd2c175.tar.gz core-55a40209072bac2526e74d5be7dd7be5ccd2c175.zip |
remove ToDouble/ToFloat
Diffstat (limited to 'tools/source')
-rw-r--r-- | tools/source/generic/config.cxx | 2 | ||||
-rw-r--r-- | tools/source/inet/inetmime.cxx | 10 | ||||
-rw-r--r-- | tools/source/rc/resmgr.cxx | 4 | ||||
-rw-r--r-- | tools/source/string/tustring.cxx | 18 |
4 files changed, 8 insertions, 26 deletions
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index dc0c08b56821..767e17a736c1 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -888,7 +888,7 @@ rtl::OString Config::ReadKey(const rtl::OString& rKey) const // ----------------------------------------------------------------------- -UniString Config::ReadKey(const rtl::OString& rKey, rtl_TextEncoding eEncoding) const +rtl::OUString Config::ReadKey(const rtl::OString& rKey, rtl_TextEncoding eEncoding) const { if ( mpData->mbIsUTF8BOM ) eEncoding = RTL_TEXTENCODING_UTF8; diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index a711e4adc0a9..531d5fc3c3c1 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -1947,7 +1947,7 @@ void INetMIME::writeUTF8(INetMIMEOutputSink & rSink, sal_uInt32 nChar) // static void INetMIME::writeHeaderFieldBody(INetMIMEOutputSink & rSink, HeaderFieldType eType, - const UniString & rBody, + const rtl::OUString& rBody, rtl_TextEncoding ePreferredEncoding, bool bInitialSpace) { @@ -1959,7 +1959,7 @@ void INetMIME::writeHeaderFieldBody(INetMIMEOutputSink & rSink, INetMIMEEncodedWordOutputSink::SPACE_ALWAYS : INetMIMEEncodedWordOutputSink::SPACE_NO, ePreferredEncoding); - aOutput.write(rBody.GetBuffer(), rBody.GetBuffer() + rBody.Len()); + aOutput.write(rBody.getStr(), rBody.getStr() + rBody.getLength()); aOutput.flush(); } else @@ -1967,8 +1967,8 @@ void INetMIME::writeHeaderFieldBody(INetMIMEOutputSink & rSink, enum Brackets { BRACKETS_OUTSIDE, BRACKETS_OPENING, BRACKETS_INSIDE }; Brackets eBrackets = BRACKETS_OUTSIDE; - const sal_Unicode * pBodyPtr = rBody.GetBuffer(); - const sal_Unicode * pBodyEnd = pBodyPtr + rBody.Len(); + const sal_Unicode * pBodyPtr = rBody.getStr(); + const sal_Unicode * pBodyEnd = pBodyPtr + rBody.getLength(); while (pBodyPtr != pBodyEnd) switch (*pBodyPtr) { @@ -2757,7 +2757,7 @@ bool INetMIME::translateUTF8Char(const sal_Char *& rBegin, //============================================================================ // static -UniString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType, +rtl::OUString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType, const rtl::OString& rBody) { // Due to a bug in INetCoreRFC822MessageStream::ConvertTo7Bit(), old diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 8e9931e9f050..bc4e4ad65119 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -727,7 +727,7 @@ UniString GetTypeRes_Impl( const ResId& rTypeId ) { // Funktion verlassen, falls Resourcefehler in dieser Funktion static int bInUse = sal_False; - UniString aTypStr( UniString::CreateFromInt32( rTypeId.GetId() ) ); + rtl::OUString aTypStr(OUString::valueOf(static_cast<sal_Int32>(rTypeId.GetId()))); if ( !bInUse ) { @@ -741,7 +741,7 @@ UniString GetTypeRes_Impl( const ResId& rTypeId ) rTypeId.SetRT( RSC_STRING ); if ( rTypeId.GetResMgr()->IsAvailable( rTypeId ) ) { - aTypStr = UniString( rTypeId ); + aTypStr = ResId::toString(rTypeId); // Versions Resource Klassenzeiger ans Ende setzen rTypeId.GetResMgr()->Increment( sizeof( RSHEADER_TYPE ) ); } diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx index 53f5473eb29a..f3879e8d8126 100644 --- a/tools/source/string/tustring.cxx +++ b/tools/source/string/tustring.cxx @@ -105,24 +105,6 @@ sal_Int64 UniString::ToInt64() const // ----------------------------------------------------------------------- -float UniString::ToFloat() const -{ - DBG_CHKTHIS( UniString, DbgCheckUniString ); - - return rtl_ustr_toFloat( mpData->maStr ); -} - -// ----------------------------------------------------------------------- - -double UniString::ToDouble() const -{ - DBG_CHKTHIS( UniString, DbgCheckUniString ); - - return rtl_ustr_toDouble( mpData->maStr ); -} - -// ----------------------------------------------------------------------- - xub_StrLen STRING::SearchChar( const STRCODE* pChars, xub_StrLen nIndex ) const { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); |