vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
New commits: commit 3220899cd80dd3e0f10e305d882da92eaeed8055 Author: Tor Lillqvist <[email protected]> Date: Mon Jun 25 11:37:52 2012 +0300 Fix error: redefinition of 'value' Change-Id: I6c887971b91380543a2c59a4f1b477b9eb4a49b8 diff --git a/vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx b/vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx index 08db4fd..faaf11b 100644 --- a/vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx +++ b/vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx @@ -11,6 +11,7 @@ static bool GetDevFontAttributes( CTFontDescriptorRef font_descriptor, ImplDevFontAttributes& rDFA ) { + int value = 0; // reset the attributes rDFA.meFamily = FAMILY_DONTKNOW; @@ -35,7 +36,6 @@ static bool GetDevFontAttributes( CTFontDescriptorRef font_descriptor, ImplDevFo CFRelease(rHeadTable); #else CFNumberRef format = (CFNumberRef)CTFontDescriptorCopyAttribute(font_descriptor, kCTFontFormatAttribute); - int value = 0; CFNumberGetValue(format, kCFNumberIntType, &value); CFRelease(format); @@ -54,7 +54,6 @@ static bool GetDevFontAttributes( CTFontDescriptorRef font_descriptor, ImplDevFo CFDictionaryRef traits = (CFDictionaryRef)CTFontDescriptorCopyAttribute(font_descriptor, kCTFontTraitsAttribute); CFNumberRef symbolics = (CFNumberRef)CFDictionaryGetValue(traits, kCTFontSymbolicTrait); - int value = 0; CFNumberGetValue(symbolics, kCFNumberIntType, &value); CFRelease(symbolics); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
