[Libreoffice-commits] .: vcl/aqua

Caolán McNamara caolan at kemper.freedesktop.org
Thu Aug 2 01:17:39 PDT 2012


 vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c87e4eb383975b7c16bd696e27750bc711555ae5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 2 09:17:06 2012 +0100

    mac-only UniString from sal_Unicode*
    
    Change-Id: If6432543c194668075b5b0a821e4bad8d7dd4839

diff --git a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
index 346fd6b..ba75744 100644
--- a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
@@ -307,7 +307,7 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, ImplDevFontAttributes& rDF
         // convert to unicode name
         UniString aUtf16Name;
         if( eEncoding == RTL_TEXTENCODING_UNICODE ) // we are just interested in UTF16 encoded names
-            aUtf16Name = UniString( (const sal_Unicode*)&aNameBuffer[0], nNameLength/2 );
+            aUtf16Name = rtl::OUString( (const sal_Unicode*)&aNameBuffer[0], nNameLength/2 );
         else if( eEncoding == RTL_TEXTENCODING_UCS4 )
             aUtf16Name = UniString(); // TODO
         else // assume the non-unicode encoded names are byte encoded


More information about the Libreoffice-commits mailing list