loplugin:staticfunction

Change-Id: I909cf7e77f9d7194575636248196fda311fffdb6

4 files changed, 14 insertions, 19 deletions

diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx
index e978eb754a23..3dcba186f49f 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -475,7 +475,7 @@ void FontCache::read()
 /*
  *  FontCache::copyPrintFont
  */
-void FontCache::copyPrintFont( const PrintFontManager::PrintFont* pFrom, PrintFontManager::PrintFont* pTo ) const
+void FontCache::copyPrintFont( const PrintFontManager::PrintFont* pFrom, PrintFontManager::PrintFont* pTo )
 {
     if( pFrom->m_eType != pTo->m_eType )
         return;
@@ -519,7 +519,7 @@ void FontCache::copyPrintFont( const PrintFontManager::PrintFont* pFrom, PrintFo
 /*
  *  FontCache::equalsPrintFont
  */
-bool FontCache::equalsPrintFont( const PrintFontManager::PrintFont* pLeft, PrintFontManager::PrintFont* pRight ) const
+bool FontCache::equalsPrintFont( const PrintFontManager::PrintFont* pLeft, PrintFontManager::PrintFont* pRight )
 {
     if( pLeft->m_eType != pRight->m_eType )
         return false;
@@ -580,7 +580,7 @@ bool FontCache::equalsPrintFont( const PrintFontManager::PrintFont* pLeft, Print
 /*
  *  FontCache::clonePrintFont
  */
-PrintFontManager::PrintFont* FontCache::clonePrintFont( const PrintFontManager::PrintFont* pOldFont ) const
+PrintFontManager::PrintFont* FontCache::clonePrintFont( const PrintFontManager::PrintFont* pOldFont )
 {
     PrintFontManager::PrintFont* pFont = NULL;
     switch( pOldFont->m_eType )
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index f872164e9a63..0804791d1650 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -252,14 +252,9 @@ void FontCfgWrapper::release()
 
 namespace
 {
-    class localizedsorter
-    {
-        public:
-            localizedsorter() {};
-            FcChar8* bestname(const std::vector<lang_and_element> &elements, const LanguageTag & rLangTag);
-    };
+    static FcChar8* bestname(const std::vector<lang_and_element> &elements, const LanguageTag & rLangTag);
 
-    FcChar8* localizedsorter::bestname(const std::vector<lang_and_element> &elements, const LanguageTag & rLangTag)
+    FcChar8* bestname(const std::vector<lang_and_element> &elements, const LanguageTag & rLangTag)
     {
         FcChar8* candidate = elements.begin()->second;
         /* FIXME-BCP47: once fontconfig supports language tags this
@@ -359,7 +354,7 @@ FcResult FontCfgWrapper::LocalizedElementFromPattern(FcPattern* pPattern, FcChar
                 osl_getProcessLocale(&pLoc);
                 m_pLanguageTag = new LanguageTag(*pLoc);
             }
-            *element = localizedsorter().bestname(lang_and_elements, *m_pLanguageTag);
+            *element = bestname(lang_and_elements, *m_pLanguageTag);
 
             //if this element is a fontname, map the other names to this best-name
             if (rtl_str_compare(elementtype, FC_FAMILY) == 0)
@@ -1171,7 +1166,7 @@ public:
 };
 
 ImplFontOptions* PrintFontManager::getFontOptions(
-    const FastPrintFontInfo& rInfo, int nSize, void (*subcallback)(void*)) const
+    const FastPrintFontInfo& rInfo, int nSize, void (*subcallback)(void*))
 {
     FontCfgWrapper& rWrapper = FontCfgWrapper::get();
 
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index f2b67d1aca84..37cc0e719c62 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -977,7 +977,7 @@ std::vector<fontID> PrintFontManager::findFontFileIDs( int nDirID, const OString
     return aIds;
 }
 
-OUString PrintFontManager::convertTrueTypeName( void* pRecord ) const
+OUString PrintFontManager::convertTrueTypeName( void* pRecord )
 {
     NameRecord* pNameRecord = static_cast<NameRecord*>(pRecord);
     OUString aValue;
@@ -1120,7 +1120,7 @@ namespace
     }
 }
 
-void PrintFontManager::analyzeTrueTypeFamilyName( void* pTTFont, ::std::list< OUString >& rNames ) const
+void PrintFontManager::analyzeTrueTypeFamilyName( void* pTTFont, ::std::list< OUString >& rNames )
 {
     OUString aFamily;
 
@@ -1618,7 +1618,7 @@ int PrintFontManager::getFontFaceNumber( fontID nFontID ) const
     return nRet;
 }
 
-FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily ) const
+FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily )
 {
     typedef struct {
         const char*  mpName;
diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx
index 41cff1650311..1d8a4612fb4f 100644
--- a/vcl/generic/print/glyphset.hxx
+++ b/vcl/generic/print/glyphset.hxx
@@ -78,10 +78,10 @@ private:
     bool        AddGlyphID (sal_GlyphId nGlyphId, sal_Unicode nUnicode,
                                 unsigned char* nOutGlyphID,
                                 sal_Int32* nOutGlyphSetID);
-    void            AddNotdef (char_map_t &rCharMap);
-    void            AddNotdef (glyph_map_t &rGlyphMap);
-    unsigned char       GetAnsiMapping (sal_Unicode nUnicodeChar);
-    unsigned char       GetSymbolMapping (sal_Unicode nUnicodeChar);
+    static void     AddNotdef (char_map_t &rCharMap);
+    static void     AddNotdef (glyph_map_t &rGlyphMap);
+    static unsigned char  GetAnsiMapping (sal_Unicode nUnicodeChar);
+    static unsigned char  GetSymbolMapping (sal_Unicode nUnicodeChar);
 
     void            ImplDrawText (PrinterGfx &rGfx, const Point& rPoint,
                                   const sal_Unicode* pStr, sal_Int16 nLen);