vcl/generic/fontmanager/fontconfig.cxx | 8 +++++--- vcl/inc/vcl/fontmanager.hxx | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-)
New commits: commit 881accb9a75fd080e706a6e184de955ae0ae17e1 Author: Julien Nabet <[email protected]> Date: Mon Jun 4 22:33:55 2012 +0200 Change return PrintFontManager::countFontconfigFonts PrintFontManager::countFontconfigFonts returns an int but it's never used so let's drop the int returned Change-Id: Iab00916aec36b899a04555743d698a3fc1d45085 diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index db53846..fbe18dd 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() diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx index 2cb07ae..3bdfa48 100644 --- a/vcl/inc/vcl/fontmanager.hxx +++ b/vcl/inc/vcl/fontmanager.hxx @@ -334,7 +334,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager called from <code>initialize()</code> */ void initFontconfig(); - int countFontconfigFonts( boost::unordered_map<rtl::OString, int, rtl::OStringHash>& o_rVisitedPaths ); + void countFontconfigFonts( boost::unordered_map<rtl::OString, int, rtl::OStringHash>& o_rVisitedPaths ); /* deinitialize fontconfig */ void deinitFontconfig(); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
