mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Related: fdo#38838 remove UniString::Copy

Browse Source 
Change-Id: I566e3ade54962bbc6ace9b757f79c1b8ed9ffd00
This commit is contained in:
Caolán McNamara 2013-10-21 14:32:36 +01:00
parent ffd0e29110
commit cfda947d7c
2 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/tools/string.hxx
View File

@ -103,7 +103,6 @@ public:
UniString();
UniString( const ResId& rResId );
UniString( const UniString& rStr );
UniString( const UniString& rStr, xub_StrLen nPos, xub_StrLen nLen );
UniString( const OUString& rStr );
~UniString();
@ -133,9 +132,6 @@ public:
xub_StrLen Len() const { return (xub_StrLen)mpData->mnLen; }
UniString Copy( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN ) const
{ return UniString( *this, nIndex, nCount ); }
const sal_Unicode* GetBuffer() const { return mpData->maStr; }
friend sal_Bool operator == ( const UniString& rStr1, const UniString& rStr2 );

34
tools/source/string/strimp.cxx
View File

@ -94,40 +94,6 @@ STRING::STRING( const STRING& rStr )
mpData = rStr.mpData;
}
STRING::STRING( const STRING& rStr, xub_StrLen nPos, xub_StrLen nLen )
: mpData( NULL )
{
if ( nPos > rStr.mpData->mnLen )
nLen = 0;
else
{
// correct length if necessary
sal_Int32 nMaxLen = rStr.mpData->mnLen-nPos;
if ( nLen > nMaxLen )
nLen = static_cast< xub_StrLen >(nMaxLen);
}
if ( nLen )
{
// Increase reference counter if it suffices
if ( (nPos == 0) && (nLen == rStr.mpData->mnLen) )
{
STRING_ACQUIRE((STRING_TYPE *)rStr.mpData);
mpData = rStr.mpData;
}
else
{
// otherwise, copy string
mpData = ImplAllocData( nLen );
memcpy( mpData->maStr, rStr.mpData->maStr+nPos, nLen*sizeof( STRCODE ) );
}
}
else
{
STRING_NEW((STRING_TYPE **)&mpData);
}
}
STRING::~STRING()
{
// free string data