diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-13 08:49:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-13 10:15:23 +0100 |
| commit | a558a8da5650da5453a517214fc721a65de4f3ee (patch) | |
| tree | 2504a386cf5e64bd8313b9b06cdce36336dee728 /tools | |
| parent | 7a16bd69d07ac995b6baaecc958ea6811c173bb5 (diff) | |
can remove ByteString::Convert now
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/inc/tools/string.hxx | 5 | ||||
| -rw-r--r-- | tools/source/string/strcvt.cxx | 31 |
2 files changed, 0 insertions, 36 deletions
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index 62d55b2090e2..091a5abb5745 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -181,11 +181,6 @@ private: // Append(char) void operator +=(int); // not implemented; to detect misuses // of operator +=(sal_Char) - - ByteString& Convert( rtl_TextEncoding eSource, - rtl_TextEncoding eTarget, - sal_Bool bReplace = sal_True ); - public: ByteString(); ByteString( const ByteString& rStr ); diff --git a/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx index 58717bcb5702..b61b0079494a 100644 --- a/tools/source/string/strcvt.cxx +++ b/tools/source/string/strcvt.cxx @@ -299,37 +299,6 @@ void ByteString::ImplStringConvert( // ======================================================================= -ByteString& ByteString::Convert( rtl_TextEncoding eSource, rtl_TextEncoding eTarget, sal_Bool bReplace ) -{ - DBG_CHKTHIS( ByteString, DbgCheckByteString ); - - // rtl_TextEncoding Dontknow kann nicht konvertiert werden - if ( (eSource == RTL_TEXTENCODING_DONTKNOW) || (eTarget == RTL_TEXTENCODING_DONTKNOW) ) - return *this; - - // Wenn Source und Target gleich sind, muss nicht konvertiert werden - if ( eSource == eTarget ) - return *this; - - // rtl_TextEncoding Symbol nur nach Unicode oder von Unicode wandeln, ansonsten - // wollen wir die Zeichencodes beibehalten - if ( (eSource == RTL_TEXTENCODING_SYMBOL) && - (eTarget != RTL_TEXTENCODING_UTF7) && - (eTarget != RTL_TEXTENCODING_UTF8) ) - return *this; - if ( (eTarget == RTL_TEXTENCODING_SYMBOL) && - (eSource != RTL_TEXTENCODING_UTF7) && - (eSource != RTL_TEXTENCODING_UTF8) ) - return *this; - - // Zeichensatz umwandeln - ImplStringConvert( eSource, eTarget, bReplace ); - - return *this; -} - -// ======================================================================= - ByteString::ByteString( const rtl::OString& rStr ) : mpData(NULL) { |