From a09a5142bc17cce62bc13fdeb4674feba39217d8 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 11 Aug 2011 23:20:31 +0100 Subject: reduce ByteString api --- tools/inc/tools/string.hxx | 3 --- tools/source/string/strcvt.cxx | 25 ------------------------- 2 files changed, 28 deletions(-) (limited to 'tools') diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index a1428a6c2f73..296dc296e72c 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -186,9 +186,6 @@ public: ByteString( const UniString& rUniStr, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS ); - ByteString( const UniString& rUniStr, xub_StrLen nPos, xub_StrLen nLen, - rtl_TextEncoding eTextEncoding, - sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS ); ByteString( const sal_Unicode* pUniStr, xub_StrLen nLen, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS ); diff --git a/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx index 22bb517e8582..210636f8073b 100644 --- a/tools/source/string/strcvt.cxx +++ b/tools/source/string/strcvt.cxx @@ -57,31 +57,6 @@ ByteString::ByteString( const UniString& rUniStr, rtl_TextEncoding eTextEncoding // ----------------------------------------------------------------------- -ByteString::ByteString( const UniString& rUniStr, xub_StrLen nPos, xub_StrLen nLen, - rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags ) -{ - DBG_CTOR( ByteString, DbgCheckByteString ); - DBG_CHKOBJ( &rUniStr, UniString, DbgCheckUniString ); - - // Stringlaenge ermitteln - if ( nPos > rUniStr.mpData->mnLen ) - nLen = 0; - else - { - // Laenge korrigieren, wenn noetig - sal_Int32 nMaxLen = rUniStr.mpData->mnLen-nPos; - if ( nLen > nMaxLen ) - nLen = static_cast< xub_StrLen >(nMaxLen); - } - - mpData = NULL; - rtl_uString2String( (rtl_String **)(&mpData), - rUniStr.mpData->maStr+nPos, nLen, - eTextEncoding, nCvtFlags ); -} - -// ----------------------------------------------------------------------- - ByteString::ByteString( const sal_Unicode* pUniStr, xub_StrLen nLen, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags ) { -- cgit