Attachment 93838 Details for Bug 72042 – 0001-fdo-72042-workaround.patch

[patch] 0001-fdo-72042-workaround.patch

0001-fdo-72042-workaround.patch (text/plain), 1.42 KB, created by Tomofumi Yagi on 2014-02-11 07:18:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomofumi Yagi

Created: 2014-02-11 07:18:45 UTC

Size: 1.42 KB

patch

obsolete

>diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
>index 8211b9f..766abba 100644
>--- a/vcl/quartz/ctfonts.cxx
>+++ b/vcl/quartz/ctfonts.cxx
>@@ -302,9 +302,20 @@ ImplDevFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool
>     rDFA.mbEmbeddable = false;
>     rDFA.mbSubsettable = true;
> 
>+    // UI language tag
>+    OString const rLang = OUStringToOString( Application::GetSettings().GetUILanguageTag().getLanguage(), RTL_TEXTENCODING_UTF8 );
>+    CFStringRef pUILang = CFStringCreateWithBytes( kCFAllocatorDefault, reinterpret_cast<const UInt8*>(rLang.getStr()),
>+                                                 strlen( rLang.getStr() ), kCFStringEncodingUTF8, false );
>+
>     // get font name
>-    CFStringRef pFamilyName = (CFStringRef)CTFontDescriptorCopyAttribute( pFD, kCTFontFamilyNameAttribute );
>+    CFStringRef pLang = NULL;
>+    CFStringRef pFamilyName = (CFStringRef)CTFontDescriptorCopyLocalizedAttribute( pFD, kCTFontDisplayNameAttribute, &pLang );
>+    if ( CFStringCompare( pUILang, pLang, 0 ) != kCFCompareEqualTo ) {
>+        CFRelease( pFamilyName );
>+        pFamilyName = (CFStringRef)CTFontDescriptorCopyAttribute( pFD, kCTFontDisplayNameAttribute );
>+    }
>     rDFA.SetFamilyName( GetOUString( pFamilyName ) );
>+
>     // get font style
>     CFStringRef pStyleName = (CFStringRef)CTFontDescriptorCopyAttribute( pFD, kCTFontStyleNameAttribute );
>     rDFA.SetStyleName( GetOUString( pStyleName ) );

Actions: View | Splinter Review

Attachments on bug 72042: 89844 | 89845 | 89846 | 89847 | 93838

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.