summaryrefslogtreecommitdiff
path: root/vcl/generic
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-01-16 10:07:18 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-01-16 10:21:57 +0000
commite2260726ae54a25b26b86f35c4148d20d4b823d3 (patch)
tree43ffd1ee9939a2440ea63ae887c8cd064fb28627 /vcl/generic
parent27951fd37d9a4b506adacb3c12395e7504422a14 (diff)
Same expression on both sides of '-'
Diffstat (limited to 'vcl/generic')
-rw-r--r--vcl/generic/fontmanager/fontconfig.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index a5d1c15a49e4..4fd5d9e7406e 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -165,13 +165,13 @@ namespace
{
FcChar8 *pNameA=NULL, *pNameB=NULL;
- bool bHaveA = FcPatternGetString(a, FC_FAMILY, 0, &pNameA) == FcResultMatch;
- bool bHaveB = FcPatternGetString(b, FC_FAMILY, 0, &pNameB) == FcResultMatch;
+ int nHaveA = FcPatternGetString(a, FC_FAMILY, 0, &pNameA) == FcResultMatch;
+ int nHaveB = FcPatternGetString(b, FC_FAMILY, 0, &pNameB) == FcResultMatch;
- if (bHaveA && bHaveB)
+ if (nHaveA && nHaveB)
return strcmp((const char*)pNameA, (const char*)pNameB);
- return bHaveA - bHaveB;
+ return nHaveA - nHaveB;
}
//Sort fonts so that fonts with the same family name are side-by-side, with
@@ -187,13 +187,13 @@ namespace
int nVersionA=0, nVersionB=0;
- bool bHaveA = FcPatternGetInteger(a, FC_FONTVERSION, 0, &nVersionA) == FcResultMatch;
- bool bHaveB = FcPatternGetInteger(b, FC_FONTVERSION, 0, &nVersionB) == FcResultMatch;
+ int nHaveA = FcPatternGetInteger(a, FC_FONTVERSION, 0, &nVersionA) == FcResultMatch;
+ int nHaveB = FcPatternGetInteger(b, FC_FONTVERSION, 0, &nVersionB) == FcResultMatch;
- if (bHaveA && bHaveB)
+ if (nHaveA && nHaveB)
return nVersionA > nVersionB;
- return bHaveA - bHaveA;
+ return nHaveA > nHaveB;
}
};