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

remove deprecated ByteString::CreateFromUnicode

Browse Source
This commit is contained in:
Caolán McNamara
2011-08-10 21:21:04 +01:00
parent c2a634416b
commit 35c83a7f4f
3 changed files with 10 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sc/source/core/tool/interpr1.cxx
View File

@@ -2782,7 +2782,15 @@ void ScInterpreter::ScCode()
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCode" ); RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCode" );
//2do: make it full range unicode? //2do: make it full range unicode?
const String& rStr = GetString(); const String& rStr = GetString();
PushInt( (sal_uChar) ByteString::ConvertFromUnicode( rStr.GetChar(0), gsl_getSystemTextEncoding() ) ); //"classic" ByteString conversion flags
const sal_uInt32 convertFlags =
RTL_UNICODETOTEXT_FLAGS_NONSPACING_IGNORE |
RTL_UNICODETOTEXT_FLAGS_CONTROL_IGNORE |
RTL_UNICODETOTEXT_FLAGS_FLUSH |
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |
RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT |
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE;
PushInt( (sal_uChar) rtl::OUStringToOString(rtl::OUString(rStr.GetChar(0)), gsl_getSystemTextEncoding(), convertFlags).toChar() );
} }

6
tools/inc/tools/string.hxx
View File

@@ -175,9 +175,6 @@ private:
// Append(char) // Append(char)
void operator +=(int); // not implemented; to detect misuses void operator +=(int); // not implemented; to detect misuses
// of operator +=(sal_Char) // of operator +=(sal_Char)
static sal_Size ConvertFromUnicode( sal_Unicode c, sal_Char* pBuf, sal_Size nBufLen,
rtl_TextEncoding eTextEncoding );
public: public:
ByteString(); ByteString();
ByteString( const ByteString& rStr ); ByteString( const ByteString& rStr );
@@ -257,8 +254,7 @@ public:
ByteString& Convert( rtl_TextEncoding eSource, ByteString& Convert( rtl_TextEncoding eSource,
rtl_TextEncoding eTarget, rtl_TextEncoding eTarget,
sal_Bool bReplace = sal_True ); sal_Bool bReplace = sal_True );
static sal_Char ConvertFromUnicode(sal_Unicode c,
rtl_TextEncoding eTextEncoding);
ByteString& ConvertLineEnd( LineEnd eLineEnd ); ByteString& ConvertLineEnd( LineEnd eLineEnd );
ByteString& ConvertLineEnd() ByteString& ConvertLineEnd()
{ return ConvertLineEnd( GetSystemLineEnd() ); } { return ConvertLineEnd( GetSystemLineEnd() ); }

46
tools/source/string/strcvt.cxx
View File

@@ -384,52 +384,6 @@ ByteString& ByteString::Convert( rtl_TextEncoding eSource, rtl_TextEncoding eTar
return *this; return *this;
} }
// -----------------------------------------------------------------------
char ByteString::ConvertFromUnicode(sal_Unicode c, rtl_TextEncoding eTextEncoding)
{
sal_Size nLen;
char aBuf[30];
nLen = ConvertFromUnicode(c, aBuf, sizeof( aBuf ), eTextEncoding);
if ( nLen == 1 )
return aBuf[0];
else
return 0;
}
// -----------------------------------------------------------------------
sal_Size ByteString::ConvertFromUnicode( sal_Unicode c, char* pBuf, sal_Size nBufLen, rtl_TextEncoding eTextEncoding )
{
// TextEncoding Dontknow wird nicht konvertiert
if ( eTextEncoding == RTL_TEXTENCODING_DONTKNOW )
return '\0';
rtl_UnicodeToTextConverter hConverter;
sal_uInt32 nInfo;
sal_Size nSrcChars;
sal_Size nDestBytes;
sal_Unicode cUni = c;
sal_uInt32 nFlags = RTL_UNICODETOTEXT_FLAGS_NONSPACING_IGNORE |
RTL_UNICODETOTEXT_FLAGS_CONTROL_IGNORE |
RTL_UNICODETOTEXT_FLAGS_FLUSH;
nFlags |= RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |
RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT;
nFlags |= RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE;
if ( nBufLen > 1 )
nFlags |= RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACESTR;
hConverter = rtl_createUnicodeToTextConverter( eTextEncoding );
nDestBytes = rtl_convertUnicodeToText( hConverter, 0,
&cUni, 1,
(sal_Char*)pBuf, nBufLen,
nFlags,
&nInfo, &nSrcChars );
rtl_destroyUnicodeToTextConverter( hConverter );
return nDestBytes;
}
// ======================================================================= // =======================================================================
ByteString::ByteString( const rtl::OString& rStr ) ByteString::ByteString( const rtl::OString& rStr )