SdrMarkView: aHdl -> maHdlList

aHdl is an SdrHdlList, so reading aHdl.GetHdl() as "get the handle of the
handle" was confusing.

Change-Id: Ib21fa74cc1daa4b6d2034f07715147a8fb0cf934
Reviewed-on: https://gerrit.libreoffice.org/14779Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

chart2/source/controller/drawinglayer/DrawViewWrapper.cxx

@@ -166,7 +166,7 @@ SdrPageView* DrawViewWrapper::GetPageView() const
 
 void DrawViewWrapper::SetMarkHandles()
 {
-    if( m_pMarkHandleProvider && m_pMarkHandleProvider->getMarkHandles( aHdl ) )
+    if( m_pMarkHandleProvider && m_pMarkHandleProvider->getMarkHandles( maHdlList ) )
         return;
     else
         SdrView::SetMarkHandles();

include/svx/svddrgmt.hxx

@@ -163,7 +163,7 @@ protected:
     const SdrDragStat& DragStat() const                { return getSdrDragView().aDragStat; }
     Point&             Ref1() const                    { return mrSdrDragView.aRef1; }
     Point&             Ref2() const                    { return mrSdrDragView.aRef2; }
-    const SdrHdlList&  GetHdlList() const              { return getSdrDragView().aHdl; }
+    const SdrHdlList&  GetHdlList() const              { return getSdrDragView().GetHdlList(); }
     void               AddUndo(SdrUndoAction* pUndo)   { getSdrDragView().AddUndo(pUndo); }
     bool               IsDragLimit()                   { return getSdrDragView().bDragLimit; }
     const Rectangle&   GetDragLimitRect()              { return getSdrDragView().aDragLimit; }

include/svx/svdmrkv.hxx

@@ -101,7 +101,7 @@ protected:
     Point                       aRef1;            // Persistent - Rotation center / axis of reflection
     Point                       aRef2;            // Persistent
     Point                       aLastCrookCenter; // Persistent
-    SdrHdlList                  aHdl;
+    SdrHdlList                  maHdlList;
     sdr::ViewSelection*         mpSdrViewSelection;
 
     Rectangle                   aMarkedObjRect;
@@ -140,7 +140,7 @@ private:
 protected:
     virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE;
     virtual void ModelHasChanged() SAL_OVERRIDE; // Is called by the PaintView
-    virtual void SetMarkHandles();                                           // aHdl - fill (List of handles)
+    virtual void SetMarkHandles();                                           // maHdlList - fill (List of handles)
     void         SetMarkRects();                                             // Rects at the PageViews
     void         CheckMarked();                                              // Scan MarkList after Del and Lock Layer ...
     void         AddDragModeHdl(SdrDragMode eMode);
@@ -347,9 +347,9 @@ public:
 
     // Search for the number of the suitable handle. In case of empty search result,
     // SAL_MAX_SIZE is returned.
-    size_t GetHdlNum(SdrHdl* pHdl) const { return aHdl.GetHdlNum(pHdl); }
-    SdrHdl* GetHdl(size_t nHdlNum)  const { return aHdl.GetHdl(nHdlNum); }
-    const SdrHdlList& GetHdlList() const { return aHdl; }
+    size_t GetHdlNum(SdrHdl* pHdl) const { return maHdlList.GetHdlNum(pHdl); }
+    SdrHdl* GetHdl(size_t nHdlNum)  const { return maHdlList.GetHdl(nHdlNum); }
+    const SdrHdlList& GetHdlList() const { return maHdlList; }
 
     // Draw a selection frame for marking of points.
     // This routine will just be started in case that HasMarkablePoints() returns sal_True.

sc/source/ui/view/drawvie3.cxx

@@ -69,8 +69,8 @@ void ScDrawView::SetPageAnchored()
             pViewData->GetDocShell()->SetDrawModified();
 
         // Remove the anchor object.
-        aHdl.RemoveAllByKind(HDL_ANCHOR);
-        aHdl.RemoveAllByKind(HDL_ANCHOR_TR);
+        maHdlList.RemoveAllByKind(HDL_ANCHOR);
+        maHdlList.RemoveAllByKind(HDL_ANCHOR_TR);
     }
 }
 

sc/source/ui/view/drawview.cxx

@@ -142,7 +142,7 @@ void ScDrawView::AddCustomHdl()
         if (ScDrawObjData *pAnchor = ScDrawLayer::GetObjDataTab(pObj, nTab))
         {
             if (ScTabView* pView = pViewData->GetView())
-                pView->CreateAnchorHandles(aHdl, pAnchor->maStart);
+                pView->CreateAnchorHandles(maHdlList, pAnchor->maStart);
         }
     }
 }

sd/source/ui/view/sdview.cxx

@@ -1121,7 +1121,7 @@ bool View::isRecordingUndo() const
 
 void View::AddCustomHdl()
 {
-    maSmartTags.addCustomHandles( aHdl );
+    maSmartTags.addCustomHandles( maHdlList );
 }
 
 void View::updateHandles()

svx/source/svdraw/svddrgv.cxx

@@ -674,7 +674,7 @@ bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point
             UnmarkAllPoints();
             AdjustMarkHdl();
 
-            bRet = BegDragObj(rPnt, pOut, aHdl.GetHdl(mnInsPointNum), 0);
+            bRet = BegDragObj(rPnt, pOut, maHdlList.GetHdl(mnInsPointNum), 0);
 
             if (bRet)
             {

svx/source/svdraw/svdedtv.cxx

@@ -842,7 +842,7 @@ void SdrEditView::DeleteMarkedObj()
         // do something only once
         DeleteMarkedList(GetMarkedObjectList());
         GetMarkedObjectListWriteAccess().Clear();
-        aHdl.Clear();
+        maHdlList.Clear();
 
         while(aParents.size() && !GetMarkedObjectCount())
         {

svx/source/svdraw/svdedxv.cxx

@@ -440,7 +440,7 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(vcl::Window* pWin, bool /*bNoP
     // AutoViewSize only if not ContourFrame.
     if (!bContourFrame) nStat|=EV_CNTRL_AUTOSIZE;
     if (bTextFrame) {
-        sal_uInt16 nPixSiz=aHdl.GetHdlSize()*2+1;
+        sal_uInt16 nPixSiz=maHdlList.GetHdlSize()*2+1;
         nStat|=EV_CNTRL_INVONEMORE;
         pOutlView->SetInvalidateMore(nPixSiz);
     }
@@ -671,7 +671,7 @@ bool SdrObjEditView::SdrBeginTextEdit(
             aMinTextEditArea.Move(aPvOfs.X(),aPvOfs.Y());
             pTextEditCursorMerker=pWin->GetCursor();
 
-            aHdl.SetMoveOutside(true);
+            maHdlList.SetMoveOutside(true);
 
             // #i72757#
             // Since IsMarkHdlWhenTextEdit() is ignored, it is necessary
@@ -691,8 +691,8 @@ bool SdrObjEditView::SdrBeginTextEdit(
             if( i2 == nCount )
                 pTextEditOutliner->InsertView(pTextEditOutlinerView,0);
 
-            aHdl.SetMoveOutside(false);
-            aHdl.SetMoveOutside(true);
+            maHdlList.SetMoveOutside(false);
+            maHdlList.SetMoveOutside(true);
 
             // register all windows as OutlinerViews with the Outliner
             if(!bOnlyOneView)
@@ -798,7 +798,7 @@ bool SdrObjEditView::SdrBeginTextEdit(
     mxTextEditObj.reset(0);
     pTextEditPV=NULL;
     pTextEditWin=NULL;
-    aHdl.SetMoveOutside(false);
+    maHdlList.SetMoveOutside(false);
 
     return false;
 }
@@ -1024,7 +1024,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
         if (pTEWin!=NULL) {
             pTEWin->SetCursor(pTECursorMerker);
         }
-        aHdl.SetMoveOutside(false);
+        maHdlList.SetMoveOutside(false);
         if (eRet!=SDRENDTEXTEDIT_UNCHANGED)
         {
             GetMarkedObjectListWriteAccess().SetNameDirty();

svx/source/svdraw/svdmrkv1.cxx

@@ -162,26 +162,26 @@ bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark)
                     pPlusHdl->SetObj(pObj);
                     pPlusHdl->SetPageView(pMark->GetPageView());
                     pPlusHdl->SetPlusHdl(true);
-                    aHdl.AddHdl(pPlusHdl);
+                    maHdlList.AddHdl(pPlusHdl);
                 }
             }
         }
         else
         {
-            for (size_t i = aHdl.GetHdlCount(); i>0;)
+            for (size_t i = maHdlList.GetHdlCount(); i>0;)
             {
                 --i;
-                SdrHdl* pPlusHdl=aHdl.GetHdl(i);
+                SdrHdl* pPlusHdl=maHdlList.GetHdl(i);
                 if (pPlusHdl->IsPlusHdl() && pPlusHdl->GetSourceHdlNum()==nHdlNum)
                 {
-                    aHdl.RemoveHdl(i);
+                    maHdlList.RemoveHdl(i);
                     delete pPlusHdl;
                 }
             }
         }
     }
 
-    aHdl.Sort();
+    maHdlList.Sort();
 
     return true;
 }
@@ -215,11 +215,11 @@ bool SdrMarkView::MarkPoints(const Rectangle* pRect, bool bUnmark)
     const SdrObject* pObj0=NULL;
     const SdrPageView* pPV0=NULL;
     SdrMark* pM=NULL;
-    aHdl.Sort();
-    const size_t nHdlAnz=aHdl.GetHdlCount();
+    maHdlList.Sort();
+    const size_t nHdlAnz=maHdlList.GetHdlCount();
     for (size_t nHdlNum=nHdlAnz; nHdlNum>0;) {
         --nHdlNum;
-        SdrHdl* pHdl=aHdl.GetHdl(nHdlNum);
+        SdrHdl* pHdl=maHdlList.GetHdl(nHdlNum);
         if (IsPointMarkable(*pHdl) && pHdl->IsSelected()==bUnmark) {
             const SdrObject* pObj=pHdl->GetObj();
             const SdrPageView* pPV=pHdl->GetPageView();
@@ -284,9 +284,9 @@ void SdrMarkView::ImpSetPointsRects() const
 {
     Rectangle aPnts;
     Rectangle aGlue;
-    const size_t nHdlAnz=aHdl.GetHdlCount();
+    const size_t nHdlAnz=maHdlList.GetHdlCount();
     for (size_t nHdlNum=0; nHdlNum<nHdlAnz; ++nHdlNum) {
-        const SdrHdl* pHdl=aHdl.GetHdl(nHdlNum);
+        const SdrHdl* pHdl=maHdlList.GetHdl(nHdlNum);
         SdrHdlKind eKind=pHdl->GetKind();
         if ((eKind==HDL_POLY && pHdl->IsSelected()) || eKind==HDL_GLUE) {
             Point aPt(pHdl->GetPos());
@@ -564,9 +564,9 @@ bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const
 SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const
 {
     ForceUndirtyMrkPnt();
-    const size_t nHdlAnz=aHdl.GetHdlCount();
+    const size_t nHdlAnz=maHdlList.GetHdlCount();
     for (size_t nHdlNum=0; nHdlNum<nHdlAnz; ++nHdlNum) {
-        SdrHdl* pHdl=aHdl.GetHdl(nHdlNum);
+        SdrHdl* pHdl=maHdlList.GetHdl(nHdlNum);
         if (pHdl->GetObj()==pObj &&
             pHdl->GetKind()==HDL_GLUE &&
             pHdl->GetObjHdlNum()==nId ) return pHdl;

svx/source/svdraw/svdview.cxx

@@ -1103,8 +1103,8 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
             } break;
             case SDRDRAG_MIRROR: {
                 if (bCorner || bVertex || bMov) {
-                    SdrHdl* pH1=aHdl.GetHdl(HDL_REF1);
-                    SdrHdl* pH2=aHdl.GetHdl(HDL_REF2);
+                    SdrHdl* pH1=maHdlList.GetHdl(HDL_REF1);
+                    SdrHdl* pH2=maHdlList.GetHdl(HDL_REF2);
                     bool b90=false;
                     bool b45=false;
                     Point aDif;

sw/source/core/draw/dview.cxx

@@ -239,7 +239,7 @@ void SwDrawView::AddCustomHdl()
     }
 
     // add anchor handle:
-    aHdl.AddHdl( new SwSdrHdl( aPos, ( pAnch->IsVertical() && !pAnch->IsVertLR() ) ||
+    maHdlList.AddHdl( new SwSdrHdl( aPos, ( pAnch->IsVertical() && !pAnch->IsVertLR() ) ||
                                      pAnch->IsRightToLeft() ) );
 }
 
@@ -745,9 +745,9 @@ const SwFrm* SwDrawView::CalcAnchor()
 
 void SwDrawView::ShowDragAnchor()
 {
-    SdrHdl* pHdl = aHdl.GetHdl(HDL_ANCHOR);
+    SdrHdl* pHdl = maHdlList.GetHdl(HDL_ANCHOR);
     if ( ! pHdl )
-        pHdl = aHdl.GetHdl(HDL_ANCHOR_TR);
+        pHdl = maHdlList.GetHdl(HDL_ANCHOR_TR);
 
     if(pHdl)
     {