diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-12-14 13:39:14 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-14 13:40:07 +0000 |
commit | f356303302630f1d1d4a99189fc0c26f7f338911 (patch) | |
tree | e3044014cadc96958efbdfa9a3ea96bde8a54b96 /tools | |
parent | d8729cfc6413c15af7c9e9eaecbffcc23d37ab7b (diff) |
strip ByteClass down some more
Diffstat (limited to 'tools')
-rw-r--r-- | tools/inc/tools/string.hxx | 6 | ||||
-rw-r--r-- | tools/source/string/strcvt.cxx | 13 |
2 files changed, 3 insertions, 16 deletions
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index 527062d8fd18..8f3be409d9b9 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -163,6 +163,9 @@ private: ByteString( const sal_Unicode* pUniStr, xub_StrLen nLen, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed methods without compiler making somethiing to fit + ByteString( const UniString& rUniStr, + rtl_TextEncoding eTextEncoding, + sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed methods without compiler making somethiing to fit void Assign(int); // not implemented; to detect misuses of // Assign(sal_Char) void operator =(int); // not implemented; to detect misuses @@ -179,9 +182,6 @@ public: ByteString( const rtl::OString& rStr ); ByteString( const sal_Char* pCharStr ); ByteString( const sal_Char* pCharStr, xub_StrLen nLen ); - ByteString( const UniString& rUniStr, - rtl_TextEncoding eTextEncoding, - sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS ); ~ByteString(); operator rtl::OString () const diff --git a/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx index 75f193419f43..0f4a14516fce 100644 --- a/tools/source/string/strcvt.cxx +++ b/tools/source/string/strcvt.cxx @@ -29,19 +29,6 @@ // ======================================================================= -ByteString::ByteString( const UniString& rUniStr, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags ) -{ - DBG_CTOR( ByteString, DbgCheckByteString ); - DBG_CHKOBJ( &rUniStr, UniString, DbgCheckUniString ); - - mpData = NULL; - rtl_uString2String( (rtl_String **)(&mpData), - rUniStr.mpData->maStr, rUniStr.mpData->mnLen, - eTextEncoding, nCvtFlags ); -} - -// ======================================================================= - ByteString::ByteString( const rtl::OString& rStr ) : mpData(NULL) { |