summaryrefslogtreecommitdiff
path: root/vcl/generic
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2012-06-04 22:33:55 +0200
committerJulien Nabet <serval2412@yahoo.fr>2012-06-04 22:35:15 +0200
commit881accb9a75fd080e706a6e184de955ae0ae17e1 (patch)
tree20375b358aa5692b761c2bae20e08edc844ccaa7 /vcl/generic
parent187c1cd4af803de5bfa8228195e30d150e5cb6cb (diff)
Change return PrintFontManager::countFontconfigFonts
PrintFontManager::countFontconfigFonts returns an int but it's never used so let's drop the int returned Change-Id: Iab00916aec36b899a04555743d698a3fc1d45085
Diffstat (limited to 'vcl/generic')
-rw-r--r--vcl/generic/fontmanager/fontconfig.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index db538461f823..fbe18dd22169 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -479,10 +479,11 @@ static void lcl_FcFontSetRemove(FcFontSet* pFSet, int i)
memmove(pFSet->fonts + i, pFSet->fonts + i + 1, nTail*sizeof(FcPattern*));
}
-int PrintFontManager::countFontconfigFonts( boost::unordered_map<rtl::OString, int, rtl::OStringHash>& o_rVisitedPaths )
+void PrintFontManager::countFontconfigFonts( boost::unordered_map<rtl::OString, int, rtl::OStringHash>& o_rVisitedPaths )
{
+#if OSL_DEBUG_LEVEL > 1
int nFonts = 0;
-
+#endif
FontCfgWrapper& rWrapper = FontCfgWrapper::get();
FcFontSet* pFSet = rWrapper.getFontSet();
@@ -640,7 +641,9 @@ int PrintFontManager::countFontconfigFonts( boost::unordered_map<rtl::OString, i
fontID aFont = m_nNextFontID++;
m_aFonts[ aFont ] = pUpdate;
m_aFontFileToFontID[ aBase ].insert( aFont );
+#if OSL_DEBUG_LEVEL > 1
nFonts++;
+#endif
#if OSL_DEBUG_LEVEL > 2
fprintf( stderr, "inserted font %s as fontID %d\n", family, aFont );
#endif
@@ -661,7 +664,6 @@ int PrintFontManager::countFontconfigFonts( boost::unordered_map<rtl::OString, i
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "inserted %d fonts from fontconfig\n", nFonts );
#endif
- return nFonts;
}
void PrintFontManager::deinitFontconfig()