[Libreoffice-commits] core.git: vcl/inc vcl/source vcl/win

[Chris Sherlock]

 vcl/inc/fontinstance.hxx         |    2 +-
 vcl/inc/fontmanager.hxx          |   20 +++++++++-----------
 vcl/source/font/fontcache.cxx    |    4 ++--
 vcl/source/font/fontinstance.cxx |    4 ++--
 vcl/win/gdi/winlayout.cxx        |    4 ++--
 5 files changed, 16 insertions(+), 18 deletions(-)

New commits:
commit eba202b65accc0b4c4e08346c8e579eea58342f4
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sat Jan 9 12:58:19 2016 +1100

    vcl: rename m_pFontCache to mpFontCache in LogicalFontInstance
    
    This is the only variable in LogicalFontInstance with m_ as the
    prefix, so changing to mpFontCache for consistency.
    
    Also small tab cleanup in fontmanager.hxx
    
    Change-Id: Id79392337795259568fbe71efb5200f1e31219a8

diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx
index 01f4c59..892ce15 100644
--- a/vcl/inc/fontinstance.hxx
+++ b/vcl/inc/fontinstance.hxx
@@ -40,7 +40,7 @@ public:
     virtual         ~LogicalFontInstance();
 
 public: // TODO: make data members private
-    ImplFontCache * m_pFontCache;
+    ImplFontCache * mpFontCache;
     FontSelectPattern  maFontSelData;          // FontSelectionData
     ImplFontAttributes  maFontAttributes;       // Font attributes
     const ConvertChar* mpConversion;           // used e.g. for StarBats->StarSymbol
diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx
index bbb7517..0e54e9b 100644
--- a/vcl/inc/fontmanager.hxx
+++ b/vcl/inc/fontmanager.hxx
@@ -244,28 +244,26 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
     };
 
     fontID                                      m_nNextFontID;
-    std::unordered_map< fontID, PrintFont* >       m_aFonts;
-    std::unordered_map< int, FontFamily >        m_aFamilyTypes;
-    std::list< OString >               m_aFontDirectories;
+    std::unordered_map< fontID, PrintFont* >    m_aFonts;
+    std::unordered_map< int, FontFamily >       m_aFamilyTypes;
+    std::list< OString >                        m_aFontDirectories;
     std::list< int >                            m_aPrivateFontDirectories;
-    utl::MultiAtomProvider*                   m_pAtoms;
+    utl::MultiAtomProvider*                     m_pAtoms;
     // for speeding up findFontFileID
     std::unordered_map< OString, std::set< fontID >, OStringHash >
                                                 m_aFontFileToFontID;
 
     std::unordered_map< OString, int, OStringHash >
     m_aDirToAtom;
-    std::unordered_map< int, OString >     m_aAtomToDir;
-    int                                        m_nNextDirAtom;
+    std::unordered_map< int, OString >          m_aAtomToDir;
+    int                                         m_nNextDirAtom;
 
-    std::unordered_multimap< OString, sal_Unicode, OStringHash >
-        m_aAdobenameToUnicode;
-    std::unordered_multimap< sal_Unicode, OString >
-        m_aUnicodeToAdobename;
+    std::unordered_multimap< OString, sal_Unicode, OStringHash > m_aAdobenameToUnicode;
+    std::unordered_multimap< sal_Unicode, OString > m_aUnicodeToAdobename;
     std::unordered_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode;
     std::unordered_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode;
 
-    mutable FontCache*                                                        m_pFontCache;
+    mutable FontCache*                         m_pFontCache;
 
     OString getAfmFile( PrintFont* pFont ) const;
     OString getFontFile( PrintFont* pFont ) const;
diff --git a/vcl/source/font/fontcache.cxx b/vcl/source/font/fontcache.cxx
index 41723f8..25fe889 100644
--- a/vcl/source/font/fontcache.cxx
+++ b/vcl/source/font/fontcache.cxx
@@ -217,7 +217,7 @@ LogicalFontInstance* ImplFontCache::GetFontInstance( PhysicalFontCollection* pFo
     {
         // create a new logical font instance from this physical font face
         pFontInstance = pFontData->CreateFontInstance( aFontSelData );
-        pFontInstance->m_pFontCache = this;
+        pFontInstance->mpFontCache = this;
 
         // if we're subtituting from or to a symbol font we may need a symbol
         // conversion table
@@ -284,7 +284,7 @@ LogicalFontInstance* ImplFontCache::GetGlyphFallbackFont( PhysicalFontCollection
 
 void ImplFontCache::Acquire(LogicalFontInstance* pFontInstance)
 {
-    assert(pFontInstance->m_pFontCache == this);
+    assert(pFontInstance->mpFontCache == this);
 
     if (0 == pFontInstance->mnRefCount++)
         --mnRef0Count;
diff --git a/vcl/source/font/fontinstance.cxx b/vcl/source/font/fontinstance.cxx
index 2da9b38..2b3490a 100644
--- a/vcl/source/font/fontinstance.cxx
+++ b/vcl/source/font/fontinstance.cxx
@@ -80,7 +80,7 @@ namespace std
 
 
 LogicalFontInstance::LogicalFontInstance( const FontSelectPattern& rFontSelData )
-    : m_pFontCache(nullptr)
+    : mpFontCache(nullptr)
     , maFontSelData( rFontSelData )
     , maFontAttributes( rFontSelData )
     , mpConversion( nullptr )
@@ -98,7 +98,7 @@ LogicalFontInstance::LogicalFontInstance( const FontSelectPattern& rFontSelData
 LogicalFontInstance::~LogicalFontInstance()
 {
     delete mpUnicodeFallbackList;
-    m_pFontCache = nullptr;
+    mpFontCache = nullptr;
 }
 
 void LogicalFontInstance::AddFallbackForUnicode( sal_UCS4 cChar, FontWeight eWeight, const OUString& rFontName )
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 70c0dc5..828634d 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -518,12 +518,12 @@ WinLayout::WinLayout(HDC hDC, const ImplWinFontData& rWFD, ImplWinFontEntry& rWF
     mrWinFontEntry(rWFE)
 {
     // keep mrWinFontEntry alive
-    mrWinFontEntry.m_pFontCache->Acquire(&mrWinFontEntry);
+    mrWinFontEntry.mpFontCache->Acquire(&mrWinFontEntry);
 }
 
 WinLayout::~WinLayout()
 {
-    mrWinFontEntry.m_pFontCache->Release(&mrWinFontEntry);
+    mrWinFontEntry.mpFontCache->Release(&mrWinFontEntry);
 }
 
 void WinLayout::InitFont() const