summaryrefslogtreecommitdiff
path: root/vcl/aqua
diff options
context:
space:
mode:
authorelixir <prashant3.yishu@gmail.com>2013-03-07 19:35:49 +0530
committerFridrich Strba <fridrich@documentfoundation.org>2013-03-11 15:50:44 +0000
commit7d1f4cdec307bb1e761bb5dd3d8231bba5833e10 (patch)
tree106a20fe24e8935e9b4943f17dad49dba67aa013 /vcl/aqua
parentc9d7427707ca36f60079833f53efd435202fe231 (diff)
fdo#38838: Converting String/UniString to OUString
Change-Id: If64db96005fcd8a42e4fa24041867b99183965f9 Reviewed-on: https://gerrit.libreoffice.org/2586 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'vcl/aqua')
-rw-r--r--vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
index 8e2a4bba93af..5703eac989b2 100644
--- a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
@@ -296,16 +296,16 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, ImplDevFontAttributes& rDF
continue;
// convert to unicode name
- UniString aUtf16Name;
+ OUString aUtf16Name;
if( eEncoding == RTL_TEXTENCODING_UNICODE ) // we are just interested in UTF16 encoded names
- aUtf16Name = rtl::OUString( (const sal_Unicode*)&aNameBuffer[0], nNameLength/2 );
+ aUtf16Name = OUString( (const sal_Unicode*)&aNameBuffer[0], nNameLength/2 );
else if( eEncoding == RTL_TEXTENCODING_UCS4 )
- aUtf16Name = UniString(); // TODO
+ aUtf16Name = OUString(); // TODO
else // assume the non-unicode encoded names are byte encoded
- aUtf16Name = UniString( &aNameBuffer[0], nNameLength, eEncoding );
++ aUtf16Name = OUString( &aNameBuffer[0], nNameLength, eEncoding );
// ignore empty strings
- if( aUtf16Name.Len() <= 0 )
+ if( aUtf16Name.getLength() <= 0 )
continue;
// handle the name depending on its namecode
@@ -313,7 +313,7 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, ImplDevFontAttributes& rDF
{
case kFontFamilyName:
// ignore font names starting with '.'
- if( aUtf16Name.GetChar(0) == '.' )
+ if( aUtf16Name[0] == '.' )
nNameValue = 0;
else if( rDFA.GetFamilyName().Len() )
{