From 55b379495007d3d694fb3533baa0d607c710d582 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 14 Dec 2012 09:44:22 +0000 Subject: callcatcher: update unused code list Change-Id: Ie975cd2df17461de1bb94a23d4daf081f6588fe7 --- tools/inc/tools/string.hxx | 4 +-- tools/source/string/tustring.cxx | 54 ---------------------------------------- 2 files changed, 2 insertions(+), 56 deletions(-) (limited to 'tools') diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index b98899ef502f..674c36d46f65 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -131,6 +131,8 @@ private: sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS ); TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr ); TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr, xub_StrLen nLen ); + TOOLS_DLLPRIVATE UniString( sal_Unicode c ); + TOOLS_DLLPRIVATE UniString& Assign( const sal_Unicode* pCharStr, xub_StrLen nLen ); TOOLS_DLLPRIVATE UniString& Expand( xub_StrLen nCount, sal_Unicode cExpandChar ); public: UniString(); @@ -138,7 +140,6 @@ public: UniString( const UniString& rStr ); UniString( const UniString& rStr, xub_StrLen nPos, xub_StrLen nLen ); UniString( const rtl::OUString& rStr ); - UniString( sal_Unicode c ); UniString(char c); // ...but allow "UniString('a')" UniString( const sal_Char* pByteStr, rtl_TextEncoding eTextEncoding, @@ -174,7 +175,6 @@ public: UniString& Assign( const UniString& rStr ); UniString& Assign( const rtl::OUString& rStr ); UniString& Assign( const sal_Unicode* pCharStr ); - UniString& Assign( const sal_Unicode* pCharStr, xub_StrLen nLen ); UniString& Assign( sal_Unicode c ); inline UniString & Assign(char c) // ...but allow "Assign('a')" { return Assign(static_cast< sal_Unicode >(c)); } diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx index 898d2d899597..0beac79dba6a 100644 --- a/tools/source/string/tustring.cxx +++ b/tools/source/string/tustring.cxx @@ -320,16 +320,6 @@ STRCODE* STRING::AllocBuffer( xub_StrLen nLen ) return mpData->maStr; } -STRING::STRING( STRCODE c ) -{ - DBG_CTOR( STRING, DBGCHECKSTRING ); - DBG_ASSERT( c, "String::String() - c is 0" ); - - // Initalize maintenance data - mpData = ImplAllocData( 1 ); - mpData->maStr[0] = c; -} - STRING& STRING::Insert( STRCODE c, xub_StrLen nIndex ) { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); @@ -677,50 +667,6 @@ STRING& STRING::Append( STRCODE c ) return *this; } -STRING& STRING::Assign( const STRCODE* pCharStr, xub_StrLen nLen ) -{ - DBG_CHKTHIS( STRING, DBGCHECKSTRING ); - DBG_ASSERT( pCharStr, "String::Assign() - pCharStr is NULL" ); - - if ( nLen == STRING_LEN ) - nLen = ImplStringLen( pCharStr ); - -#ifdef DBG_UTIL - if ( DbgIsAssert() ) - { - for ( xub_StrLen i = 0; i < nLen; i++ ) - { - if ( !pCharStr[i] ) - { - OSL_FAIL( "String::Assign() : nLen is wrong" ); - } - } - } -#endif - - if ( !nLen ) - { - STRING_NEW((STRING_TYPE **)&mpData); - } - else - { - // copy without allocation if string length is identical - if ( (nLen == mpData->mnLen) && (mpData->mnRefCount == 1) ) - memcpy( mpData->maStr, pCharStr, nLen*sizeof( STRCODE ) ); - else - { - // free old string - STRING_RELEASE((STRING_TYPE *)mpData); - - // allocate string of new size and copy - mpData = ImplAllocData( nLen ); - memcpy( mpData->maStr, pCharStr, nLen*sizeof( STRCODE ) ); - } - } - - return *this; -} - STRING& STRING::Assign( STRCODE c ) { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); -- cgit v1.2.3