diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-27 09:58:25 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-27 09:23:22 +0000 |
commit | 85ce665ee43b1f20df593fc36f935c5799418f54 (patch) | |
tree | 30421081d4cf73ab0e34a05981b609cb0a5229a1 /sw/source/core/inc/fntcache.hxx | |
parent | a25327e4b18768e40c6044c86ce09136cfc23c10 (diff) |
sw: prefix members of SwFntObj
Change-Id: I98af56984ae559eb4a7fcd1df261e4274b61d66a
Reviewed-on: https://gerrit.libreoffice.org/26692
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/source/core/inc/fntcache.hxx')
-rw-r--r-- | sw/source/core/inc/fntcache.hxx | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index 053456bb930e..33423b9eae4c 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -61,20 +61,20 @@ class SwFntObj : public SwCacheObj friend void InitCore(); friend void FinitCore(); - vcl::Font aFont; - vcl::Font *pScrFont; - vcl::Font *pPrtFont; - VclPtr<OutputDevice> pPrinter; - sal_uInt16 nGuessedLeading; - sal_uInt16 nExtLeading; - sal_uInt16 nScrAscent; - sal_uInt16 nPrtAscent; - sal_uInt16 nScrHeight; - sal_uInt16 nPrtHeight; - sal_uInt16 nPropWidth; - sal_uInt16 nZoom; - bool bSymbol : 1; - bool bPaintBlank : 1; + vcl::Font m_aFont; + vcl::Font *m_pScrFont; + vcl::Font *m_pPrtFont; + VclPtr<OutputDevice> m_pPrinter; + sal_uInt16 m_nGuessedLeading; + sal_uInt16 m_nExtLeading; + sal_uInt16 m_nScrAscent; + sal_uInt16 m_nPrtAscent; + sal_uInt16 m_nScrHeight; + sal_uInt16 m_nPrtHeight; + sal_uInt16 m_nPropWidth; + sal_uInt16 m_nZoom; + bool m_bSymbol : 1; + bool m_bPaintBlank : 1; static long nPixWidth; static MapMode *pPixMap; @@ -87,12 +87,12 @@ public: virtual ~SwFntObj(); - inline vcl::Font *GetScrFont() { return pScrFont; } - inline vcl::Font& GetFont() { return aFont; } - inline const vcl::Font& GetFont() const { return aFont; } + inline vcl::Font *GetScrFont() { return m_pScrFont; } + inline vcl::Font& GetFont() { return m_aFont; } + inline const vcl::Font& GetFont() const { return m_aFont; } - inline sal_uInt16 GetGuessedLeading() const { return nGuessedLeading; } - inline sal_uInt16 GetExternalLeading() const { return nExtLeading; } + inline sal_uInt16 GetGuessedLeading() const { return m_nGuessedLeading; } + inline sal_uInt16 GetExternalLeading() const { return m_nExtLeading; } sal_uInt16 GetFontAscent( const SwViewShell *pSh, const OutputDevice& rOut ); sal_uInt16 GetFontHeight( const SwViewShell *pSh, const OutputDevice& rOut ); @@ -101,10 +101,10 @@ public: void GuessLeading( const SwViewShell& rSh, const FontMetric& rMet ); void SetDevFont( const SwViewShell *pSh, OutputDevice& rOut ); - inline OutputDevice* GetPrt() const { return pPrinter; } - inline sal_uInt16 GetZoom() const { return nZoom; } - inline sal_uInt16 GetPropWidth() const { return nPropWidth; } - inline bool IsSymbol() const { return bSymbol; } + inline OutputDevice* GetPrt() const { return m_pPrinter; } + inline sal_uInt16 GetZoom() const { return m_nZoom; } + inline sal_uInt16 GetPropWidth() const { return m_nPropWidth; } + inline bool IsSymbol() const { return m_bSymbol; } void DrawText( SwDrawTextInfo &rInf ); /// determine the TextSize (of the printer) |