Kaydet (Commit) 85ce665e authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: prefix members of SwFntObj

Change-Id: I98af56984ae559eb4a7fcd1df261e4274b61d66a
Reviewed-on: https://gerrit.libreoffice.org/26692Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst a25327e4
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment