summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-04-18 09:38:05 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-04-18 09:55:24 +0200
commite35b772e44096c3a5d1077df7b243fae08e33621 (patch)
treed309f2f19c6b2aaad329919409246a4a5d34881a
parent3677823cea29f6d0b054827a8df1ae3aa84c4523 (diff)
SwDrawTextInfo: confusing p prefix for non-pointers
Change-Id: Id5b055081f8bed3399326aa0e1c6372edf4da29f
-rw-r--r--sw/source/core/inc/drawfont.hxx20
-rw-r--r--sw/source/core/txtnode/swfont.cxx10
2 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index f4a8b3d61f8b..c61ae9fced43 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -42,12 +42,12 @@ class SwDrawTextInfo
OutputDevice* pOut;
ViewShell* pSh;
const SwScriptInfo* pScriptInfo;
- Point pPos;
- OUString pText;
+ Point m_aPos;
+ OUString m_aText;
const SwWrongList* pWrong;
const SwWrongList* pGrammarCheck;
const SwWrongList* pSmartTags;
- Size pSize;
+ Size m_aSize;
SwFont *pFnt;
SwUnderlineFont* pUnderFnt;
xub_StrLen* pHyphPos;
@@ -111,7 +111,7 @@ public:
pSh = pS;
pOut = &rO;
pScriptInfo = pSI;
- pText = rSt;
+ m_aText = rSt;
nIdx = nI;
nLen = nL;
nKern = 0;
@@ -190,7 +190,7 @@ public:
#ifdef DBG_UTIL
OSL_ENSURE( m_bPos, "DrawTextInfo: Undefined Position" );
#endif
- return pPos;
+ return m_aPos;
}
xub_StrLen *GetHyphPos() const
@@ -203,7 +203,7 @@ public:
const OUString &GetText() const
{
- return pText;
+ return m_aText;
}
const SwWrongList* GetWrong() const
@@ -232,7 +232,7 @@ public:
#ifdef DBG_UTIL
OSL_ENSURE( m_bSize, "DrawTextInfo: Undefined Size" );
#endif
- return pSize;
+ return m_aSize;
}
SwFont* GetFont() const
@@ -400,7 +400,7 @@ public:
void SetPos( const Point &rNew )
{
- pPos = rNew;
+ m_aPos = rNew;
#ifdef DBG_UTIL
m_bPos = true;
#endif
@@ -416,7 +416,7 @@ public:
void SetText( const OUString &rNew )
{
- pText = rNew;
+ m_aText = rNew;
}
void SetWrong( const SwWrongList* pNew )
@@ -442,7 +442,7 @@ public:
void SetSize( const Size &rNew )
{
- pSize = rNew;
+ m_aSize = rNew;
#ifdef DBG_UTIL
m_bSize = true;
#endif
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index aed20794146a..52db6ad3732c 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -1163,17 +1163,17 @@ void SwDrawTextInfo::Shift( sal_uInt16 nDir )
switch ( nDir )
{
case 0 :
- pPos.X() += GetSize().Width();
+ m_aPos.X() += GetSize().Width();
break;
case 900 :
- OSL_ENSURE( pPos.Y() >= GetSize().Width(), "Going underground" );
- pPos.Y() -= GetSize().Width();
+ OSL_ENSURE( m_aPos.Y() >= GetSize().Width(), "Going underground" );
+ m_aPos.Y() -= GetSize().Width();
break;
case 1800 :
- pPos.X() -= GetSize().Width();
+ m_aPos.X() -= GetSize().Width();
break;
case 2700 :
- pPos.Y() += GetSize().Width();
+ m_aPos.Y() += GetSize().Width();
break;
}
}