diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/win/saldata.hxx | 2 | ||||
| -rw-r--r-- | vcl/win/source/app/saldata.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
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 | |