diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-02-08 09:06:10 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-02-08 14:57:16 +0000 |
| commit | 9e310cc32923ceb4b18d97ce68d54a339b935f01 (patch) | |
| tree | d79b44b80c15f6bdb3116db4c9b6955a9e6cb4c9 /vcl/win | |
| parent | 9c427991d9658a870ee0eb1bdc4cd3b393c93fd5 (diff) | |
fdo#38838 Some removal/replacement of the String/UniString with OUString
Change-Id: I6daea312198fae3a9717bd8d4fea6371aa4cd275
Reviewed-on: https://gerrit.libreoffice.org/1962
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/app/saldata.cxx | 4 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx index 9d1c0fa33465..ff5a10f406d1 100644 --- a/vcl/win/source/app/saldata.cxx +++ b/vcl/win/source/app/saldata.cxx @@ -44,9 +44,9 @@ rtl_TextEncoding ImplSalGetSystemEncoding() // ----------------------------------------------------------------------- -UniString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen ) +OUString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen ) { - return UniString( pStr, nLen, ImplSalGetSystemEncoding(), + return OUString( pStr, nLen, ImplSalGetSystemEncoding(), RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT | RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT ); diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index a410028ac3d2..406fa3000d68 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -1457,7 +1457,7 @@ void ImplGetLogFontFromFontSelect( HDC hDC, LOGFONTW& rLogFont, bool /*bTestVerticalAvail*/ ) { - UniString aName; + OUString aName; if ( pFont->mpFontData ) aName = pFont->mpFontData->GetFamilyName(); else |