summaryrefslogtreecommitdiff
path: root/vcl/aqua/source/gdi
diff options
context:
space:
mode:
authorPierre-André Jacquod <pjacquod@alumni.ethz.ch>2011-10-07 20:40:01 +0200
committerPierre-André Jacquod <pjacquod@alumni.ethz.ch>2011-10-07 20:42:31 +0200
commit78b1cc1a08d712212152a1e57400c8b07654e471 (patch)
tree4bd5dac454ae192f716756e08eafa1149bd9d858 /vcl/aqua/source/gdi
parent49861a0246547554e285b4d14f049a28addd4ddc (diff)
Revert "cppcheck scope reduction in vcl/..salatsuifontutils.cxx"
This reverts commit e45b962f49829d5c60c913383b2132b579af3fab. this is the most probale cause of the breakage on MacOSX tinderbox. Do not really understand why it should break, but I do not see other potential guilty commits... No MacOSX at hand... so revert and see
Diffstat (limited to 'vcl/aqua/source/gdi')
-rw-r--r--vcl/aqua/source/gdi/salatsuifontutils.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/aqua/source/gdi/salatsuifontutils.cxx b/vcl/aqua/source/gdi/salatsuifontutils.cxx
index d9d2c8ece6b4..e124b3c0763d 100644
--- a/vcl/aqua/source/gdi/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/salatsuifontutils.cxx
@@ -237,6 +237,7 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, ImplDevFontAttributes& rDF
return false;
int nBestNameValue = 0;
int nBestStyleValue = 0;
+ FontLanguageCode eBestLangCode = 0;
const FontLanguageCode eUILangCode = Application::GetSettings().GetUILanguage();
typedef std::vector<char> NameBuffer;
NameBuffer aNameBuffer( 256 );
@@ -332,7 +333,7 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, ImplDevFontAttributes& rDF
{
// get the best family name
nBestNameValue = nNameValue;
- FontLanguageCode eBestLangCode = eFontNameLanguage;
+ eBestLangCode = eFontNameLanguage;
rDFA.maName = aUtf16Name;
}
break;