summaryrefslogtreecommitdiff
path: root/sw/source/core/inc/rootfrm.hxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-11-12 14:01:36 +0100
committerMichael Stahl <mstahl@redhat.com>2015-11-13 11:03:05 +0100
commitcd3b8cc57d0e0f77da32438e95c3ab1cf79338bc (patch)
tree1b382a959cc7e5d395be4ae563c17be8d108a1af /sw/source/core/inc/rootfrm.hxx
parentc6d796c3bfc969f232f7a9a92fb9be105e3bf7f1 (diff)
sw: rename some more global variables
Change-Id: I6f4d0bb57c5d82984ff29b621dc4570f453be31d
Diffstat (limited to 'sw/source/core/inc/rootfrm.hxx')
-rw-r--r--sw/source/core/inc/rootfrm.hxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 91a09192e1b1..7feb3c6d984f 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -60,8 +60,8 @@ class SwRootFrm: public SwLayoutFrm
friend inline void SetLastPage( SwPageFrm* );
// For creating and destroying of the virtual output device manager
- friend void _FrmInit(); // Creates mpVout
- friend void _FrmFinit(); // Destroys mpVout
+ friend void _FrmInit(); // Creates s_pVout
+ friend void _FrmFinit(); // Destroys s_pVout
std::vector<SwRect> maPageRects;// returns the current rectangle for each page frame
// the rectangle is extended to the top/bottom/left/right
@@ -74,9 +74,9 @@ class SwRootFrm: public SwLayoutFrm
bool mbNeedGrammarCheck; // true when sth needs to be checked (not necessarily started yet!)
- static SwLayVout *mpVout;
- static bool mbInPaint; // Protection against double Paints
- static bool mbNoVirDev;// No virt. Device for SystemPaints
+ static SwLayVout *s_pVout;
+ static bool s_isInPaint; // Protection against double Paints
+ static bool s_isNoVirDev;// No virt. Device for SystemPaints
bool mbCheckSuperfluous :1; // Search for empty Pages?
bool mbIdleFormat :1; // Trigger Idle Formatter?
@@ -328,9 +328,9 @@ public:
const SwPageFrm *GetLastPage() const { return mpLastPage; }
SwPageFrm *GetLastPage() { return mpLastPage; }
- static bool IsInPaint() { return mbInPaint; }
+ static bool IsInPaint() { return s_isInPaint; }
- static void SetNoVirDev( const bool bNew ) { mbNoVirDev = bNew; }
+ static void SetNoVirDev(const bool bNew) { s_isNoVirDev = bNew; }
inline long GetBrowseWidth() const;
inline void InvalidateBrowseWidth();