strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

can remove ByteString::Convert now

Browse source
This commit is contained in:
Caolán McNamara 2011-09-13 08:49:03 +01:00
parent 7a16bd69d0
commit a558a8da56
2 changed files with 0 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/inc/tools/string.hxx
View file

@ -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 );

31
tools/source/string/strcvt.cxx
View file

@ -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)
{