[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/uibase/inc/conarc.hxx    |    4 ++--
 sw/source/uibase/ribbar/conarc.cxx |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit da4b5fe46c0d6bdcc1c0fbdbb52b448c4dc96bca
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Feb 12 09:02:04 2016 +0100

    sw: prefix members of ConstArc
    
    Change-Id: Id717c768075abfc5652b60c7bb8b67dbd51548bf

diff --git a/sw/source/uibase/inc/conarc.hxx b/sw/source/uibase/inc/conarc.hxx
index 66825df8..b1b31ec 100644
--- a/sw/source/uibase/inc/conarc.hxx
+++ b/sw/source/uibase/inc/conarc.hxx
@@ -24,8 +24,8 @@
 // draw rectangle
 class ConstArc : public SwDrawBase
 {
-    Point aStartPnt;
-    sal_uInt16 nAnzButUp;
+    Point m_aStartPoint;
+    sal_uInt16 m_nButtonUpCount;
 
 public:
     ConstArc(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView);
diff --git a/sw/source/uibase/ribbar/conarc.cxx b/sw/source/uibase/ribbar/conarc.cxx
index d103624..ab97a70 100644
--- a/sw/source/uibase/ribbar/conarc.cxx
+++ b/sw/source/uibase/ribbar/conarc.cxx
@@ -26,7 +26,7 @@
 #include "conarc.hxx"
 
 ConstArc::ConstArc(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView)
-    : SwDrawBase(pWrtShell, pEditWin, pSwView), nAnzButUp(0)
+    : SwDrawBase(pWrtShell, pEditWin, pSwView), m_nButtonUpCount(0)
 {
 }
 
@@ -36,8 +36,8 @@ bool ConstArc::MouseButtonDown( const MouseEvent& rMEvt )
 
     if ((bReturn = SwDrawBase::MouseButtonDown(rMEvt)))
     {
-        if (!nAnzButUp)
-            aStartPnt = m_pWin->PixelToLogic(rMEvt.GetPosPixel());
+        if (!m_nButtonUpCount)
+            m_aStartPoint = m_pWin->PixelToLogic(rMEvt.GetPosPixel());
     }
     return bReturn;
 }
@@ -49,18 +49,18 @@ bool ConstArc::MouseButtonUp( const MouseEvent& rMEvt )
     if ((m_pSh->IsDrawCreate() || m_pWin->IsDrawAction()) && rMEvt.IsLeft())
     {
         Point aPnt(m_pWin->PixelToLogic(rMEvt.GetPosPixel()));
-        if (!nAnzButUp && aPnt == aStartPnt)
+        if (!m_nButtonUpCount && aPnt == m_aStartPoint)
         {
             SwDrawBase::MouseButtonUp(rMEvt);
             bReturn = true;
         }
         else
-        {   nAnzButUp++;
+        {   m_nButtonUpCount++;
 
-            if (nAnzButUp == 3)     // Generating of circular arc finished
+            if (m_nButtonUpCount == 3)     // Generating of circular arc finished
             {
                 SwDrawBase::MouseButtonUp(rMEvt);
-                nAnzButUp = 0;
+                m_nButtonUpCount = 0;
                 bReturn = true;
             }
             else
@@ -94,7 +94,7 @@ void ConstArc::Activate(const sal_uInt16 nSlotId)
 
 void ConstArc::Deactivate()
 {
-    nAnzButUp = 0;
+    m_nButtonUpCount = 0;
 
     SwDrawBase::Deactivate();
 }