diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-30 10:38:17 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-30 13:04:32 +0000 |
| commit | 66a2598e164e2003bed045f03e9ed6c0921f7f2b (patch) | |
| tree | a6f27b5ab336d3c724b5438c79bb34e2540faa4e | |
| parent | bc340ff02dcc519dc4fa7770c3da6140048108c8 (diff) | |
convert over hidden windows-only ByteStrings
| -rw-r--r-- | svtools/source/misc/transfer.cxx | 17 | ||||
| -rw-r--r-- | svx/source/dialog/sendreportw32.cxx | 5 | ||||
| -rw-r--r-- | vcl/inc/win/saldata.hxx | 2 | ||||
| -rw-r--r-- | vcl/win/source/app/saldata.cxx | 6 |
4 files changed, 16 insertions, 14 deletions
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 9cf2990f2c4c..aac712644d95 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -927,14 +927,15 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, memset( &rFDesc1, 0, sizeof( FILEDESCRIPTOR ) ); rFDesc1.dwFlags = FD_LINKUI; - ByteString aStr( rBmk.GetDescription(), eSysCSet ); - for( sal_uInt16 nChar = 0; nChar < aStr.Len(); ++nChar ) - if( strchr( "\\/:*?\"<>|", aStr.GetChar( nChar ) ) ) - aStr.Erase( nChar--, 1 ); - - aStr.Insert( "Shortcut to ", 0 ); - aStr += ".URL"; - strcpy( rFDesc1.cFileName, aStr.GetBuffer() ); + rtl::OStringBuffer aStr(rtl::OUStringToOString( + rBmk.GetDescription(), eSysCSet)); + for( sal_uInt16 nChar = 0; nChar < aStr.getLength(); ++nChar ) + if( strchr( "\\/:*?\"<>|", aStr[nChar] ) ) + aStr.remove(nChar--, 1); + + aStr.insert(0, RTL_CONSTASCII_STRINGPARAM("Shortcut to ")); + aStr.append(RTL_CONSTASCII_STRINGPARAM(".URL")); + strcpy( rFDesc1.cFileName, aStr.getStr() ); maAny <<= aSeq; } diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx index 4f2a45c946fb..514fd46bc02c 100644 --- a/svx/source/dialog/sendreportw32.cxx +++ b/svx/source/dialog/sendreportw32.cxx @@ -203,9 +203,10 @@ namespace svx{ if ( fp ) { - ByteString strUTF8( GetUsing(), RTL_TEXTENCODING_UTF8 ); + rtl::OString strUTF8(rtl::OUStringToOString(GetUsing(), + RTL_TEXTENCODING_UTF8)); - fwrite( strUTF8.GetBuffer(), 1, strUTF8.Len(), fp ); + fwrite( strUTF8.getStr(), 1, strUTF8.getLength(), fp ); fclose( fp ); } diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index 7450af00b3ed..2d6bbf1563f6 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -245,7 +245,7 @@ bool ImplIsFontAvailable( HDC hDC, const UniString& rName ); // \WIN\SOURCE\APP\SALDATA.CXX rtl_TextEncoding ImplSalGetSystemEncoding(); -ByteString ImplSalGetWinAnsiString( const UniString& rStr, sal_Bool bFileName = FALSE ); +rtl::OString ImplSalGetWinAnsiString( const UniString& rStr, sal_Bool bFileName = FALSE ); UniString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen = STRING_LEN ); int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 ); diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx index 0fd4cf7f1591..854849f46b55 100644 --- a/vcl/win/source/app/saldata.cxx +++ b/vcl/win/source/app/saldata.cxx @@ -53,12 +53,12 @@ rtl_TextEncoding ImplSalGetSystemEncoding() // ----------------------------------------------------------------------- -ByteString ImplSalGetWinAnsiString( const UniString& rStr, sal_Bool bFileName ) +rtl::OString ImplSalGetWinAnsiString( const UniString& rStr, sal_Bool bFileName ) { rtl_TextEncoding eEncoding = ImplSalGetSystemEncoding(); if ( bFileName ) { - return ByteString( rStr, eEncoding, + return rtl::OUStringToOString( rStr, eEncoding, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_UNDERLINE | RTL_UNICODETOTEXT_FLAGS_INVALID_UNDERLINE | RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE | @@ -67,7 +67,7 @@ ByteString ImplSalGetWinAnsiString( const UniString& rStr, sal_Bool bFileName ) } else { - return ByteString( rStr, eEncoding, + return rtl::OUStringToOString( rStr, eEncoding, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT | RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT | RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE | |