[Libreoffice-commits] core.git: chart2/source include/svx sc/source sd/source svx/source sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Sat Mar 7 05:10:25 PST 2015
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 2
include/svx/svddrgmt.hxx | 2
include/svx/svdmrkv.hxx | 10 -
sc/source/ui/view/drawvie3.cxx | 4
sc/source/ui/view/drawview.cxx | 2
sd/source/ui/view/sdview.cxx | 2
svx/source/svdraw/svddrgv.cxx | 2
svx/source/svdraw/svdedtv.cxx | 2
svx/source/svdraw/svdedxv.cxx | 12 -
svx/source/svdraw/svdmrkv.cxx | 100 +++++++-------
svx/source/svdraw/svdmrkv1.cxx | 24 +--
svx/source/svdraw/svdview.cxx | 4
sw/source/core/draw/dview.cxx | 6
13 files changed, 86 insertions(+), 86 deletions(-)
New commits:
commit 5ea32020e870fde6e1fa05964c343d004ed26f46
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sat Mar 7 10:50:27 2015 +0100
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/14779
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 0870786..9dc9deaeb 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/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();
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index 6e2fa4a..0e4603d 100644
--- a/include/svx/svddrgmt.hxx
+++ b/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; }
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 78d7e84..db6e3ba 100644
--- a/include/svx/svdmrkv.hxx
+++ b/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.
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index 4300413..f0b1835 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/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);
}
}
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 65e4572..4651f54 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/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);
}
}
}
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index b3db161..3eff256 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/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()
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 0500402..bdb1ecb 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/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)
{
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 3bb3f12..714552a 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/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())
{
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 5fdc177..9c82ab4 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/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();
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 954d35a..cd67b46 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -157,7 +157,7 @@ SdrMarkView::SdrMarkView(SdrModel* pModel1, OutputDevice* pOut)
mpMarkObjOverlay(0L),
mpMarkPointsOverlay(0L),
mpMarkGluePointsOverlay(0L),
- aHdl(this),
+ maHdlList(this),
mpSdrViewSelection(new sdr::ViewSelection())
{
ImpClearVars();
@@ -605,7 +605,7 @@ bool SdrMarkView::ImpIsFrameHandles() const
void SdrMarkView::SetMarkHandles()
{
// remember old focus handle values to search for it again
- const SdrHdl* pSaveOldFocusHdl = aHdl.GetFocusHdl();
+ const SdrHdl* pSaveOldFocusHdl = maHdlList.GetFocusHdl();
bool bSaveOldFocus(false);
sal_uInt32 nSavePolyNum(0L), nSavePointNum(0L);
SdrHdlKind eSaveKind(HDL_MOVE);
@@ -624,9 +624,9 @@ void SdrMarkView::SetMarkHandles()
}
// delete/clear all handles. This will always be done, even with areMarkHandlesHidden()
- aHdl.Clear();
- aHdl.SetRotateShear(eDragMode==SDRDRAG_ROTATE);
- aHdl.SetDistortShear(eDragMode==SDRDRAG_SHEAR);
+ maHdlList.Clear();
+ maHdlList.SetRotateShear(eDragMode==SDRDRAG_ROTATE);
+ maHdlList.SetDistortShear(eDragMode==SDRDRAG_SHEAR);
pMarkedObj=NULL;
pMarkedPV=NULL;
@@ -706,12 +706,12 @@ void SdrMarkView::SetMarkHandles()
{ // otherwise nothing is found
if( bSingleTextObjMark )
{
- const size_t nSiz0=aHdl.GetHdlCount();
- pMarkedObj->AddToHdlList(aHdl);
- const size_t nSiz1=aHdl.GetHdlCount();
+ const size_t nSiz0=maHdlList.GetHdlCount();
+ pMarkedObj->AddToHdlList(maHdlList);
+ const size_t nSiz1=maHdlList.GetHdlCount();
for (size_t i=nSiz0; i<nSiz1; ++i)
{
- SdrHdl* pHdl=aHdl.GetHdl(i);
+ SdrHdl* pHdl=maHdlList.GetHdl(i);
pHdl->SetObj(pMarkedObj);
pHdl->SetPos( pHdl->GetPos() + aGridOff );
pHdl->SetPageView(pMarkedPV);
@@ -724,23 +724,23 @@ void SdrMarkView::SetMarkHandles()
bool bHgt0=aRect.Top()==aRect.Bottom();
if (bWdt0 && bHgt0)
{
- aHdl.AddHdl(new SdrHdl(aRect.TopLeft(),HDL_UPLFT));
+ maHdlList.AddHdl(new SdrHdl(aRect.TopLeft(),HDL_UPLFT));
}
else if (!bStdDrag && (bWdt0 || bHgt0))
{
- aHdl.AddHdl(new SdrHdl(aRect.TopLeft() ,HDL_UPLFT));
- aHdl.AddHdl(new SdrHdl(aRect.BottomRight(),HDL_LWRGT));
+ maHdlList.AddHdl(new SdrHdl(aRect.TopLeft() ,HDL_UPLFT));
+ maHdlList.AddHdl(new SdrHdl(aRect.BottomRight(),HDL_LWRGT));
}
else
{
- if (!bWdt0 && !bHgt0) aHdl.AddHdl(new SdrHdl(aRect.TopLeft() ,HDL_UPLFT));
- if ( !bHgt0) aHdl.AddHdl(new SdrHdl(aRect.TopCenter() ,HDL_UPPER));
- if (!bWdt0 && !bHgt0) aHdl.AddHdl(new SdrHdl(aRect.TopRight() ,HDL_UPRGT));
- if (!bWdt0 ) aHdl.AddHdl(new SdrHdl(aRect.LeftCenter() ,HDL_LEFT ));
- if (!bWdt0 ) aHdl.AddHdl(new SdrHdl(aRect.RightCenter() ,HDL_RIGHT));
- if (!bWdt0 && !bHgt0) aHdl.AddHdl(new SdrHdl(aRect.BottomLeft() ,HDL_LWLFT));
- if ( !bHgt0) aHdl.AddHdl(new SdrHdl(aRect.BottomCenter(),HDL_LOWER));
- if (!bWdt0 && !bHgt0) aHdl.AddHdl(new SdrHdl(aRect.BottomRight() ,HDL_LWRGT));
+ if (!bWdt0 && !bHgt0) maHdlList.AddHdl(new SdrHdl(aRect.TopLeft() ,HDL_UPLFT));
+ if ( !bHgt0) maHdlList.AddHdl(new SdrHdl(aRect.TopCenter() ,HDL_UPPER));
+ if (!bWdt0 && !bHgt0) maHdlList.AddHdl(new SdrHdl(aRect.TopRight() ,HDL_UPRGT));
+ if (!bWdt0 ) maHdlList.AddHdl(new SdrHdl(aRect.LeftCenter() ,HDL_LEFT ));
+ if (!bWdt0 ) maHdlList.AddHdl(new SdrHdl(aRect.RightCenter() ,HDL_RIGHT));
+ if (!bWdt0 && !bHgt0) maHdlList.AddHdl(new SdrHdl(aRect.BottomLeft() ,HDL_LWLFT));
+ if ( !bHgt0) maHdlList.AddHdl(new SdrHdl(aRect.BottomCenter(),HDL_LOWER));
+ if (!bWdt0 && !bHgt0) maHdlList.AddHdl(new SdrHdl(aRect.BottomRight() ,HDL_LWRGT));
}
}
}
@@ -756,7 +756,7 @@ void SdrMarkView::SetMarkHandles()
if(pSdrGrafObj)
{
- pSdrGrafObj->addCropHandles(aHdl);
+ pSdrGrafObj->addCropHandles(maHdlList);
bDone = true;
}
}
@@ -768,14 +768,14 @@ void SdrMarkView::SetMarkHandles()
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
SdrObject* pObj=pM->GetMarkedSdrObj();
SdrPageView* pPV=pM->GetPageView();
- const size_t nSiz0=aHdl.GetHdlCount();
- pObj->AddToHdlList(aHdl);
- const size_t nSiz1=aHdl.GetHdlCount();
+ const size_t nSiz0=maHdlList.GetHdlCount();
+ pObj->AddToHdlList(maHdlList);
+ const size_t nSiz1=maHdlList.GetHdlCount();
bool bPoly=pObj->IsPolyObj();
const SdrUShortCont* pMrkPnts=pM->GetMarkedPoints();
for (size_t i=nSiz0; i<nSiz1; ++i)
{
- SdrHdl* pHdl=aHdl.GetHdl(i);
+ SdrHdl* pHdl=maHdlList.GetHdl(i);
pHdl->SetPos( pHdl->GetPos() + aGridOff );
pHdl->SetObj(pObj);
pHdl->SetPageView(pPV);
@@ -797,7 +797,7 @@ void SdrMarkView::SetMarkHandles()
pPlusHdl->SetObj(pObj);
pPlusHdl->SetPageView(pPV);
pPlusHdl->SetPlusHdl(true);
- aHdl.AddHdl(pPlusHdl);
+ maHdlList.AddHdl(pPlusHdl);
}
}
}
@@ -832,7 +832,7 @@ void SdrMarkView::SetMarkHandles()
pGlueHdl->SetObj(pObj);
pGlueHdl->SetPageView(pPV);
pGlueHdl->SetObjHdlNum(nId);
- aHdl.AddHdl(pGlueHdl);
+ maHdlList.AddHdl(pGlueHdl);
}
}
}
@@ -843,7 +843,7 @@ void SdrMarkView::SetMarkHandles()
AddDragModeHdl(eDragMode);
// sort handles
- aHdl.Sort();
+ maHdlList.Sort();
// add custom handles (used by other apps, e.g. AnchorPos)
AddCustomHdl();
@@ -851,9 +851,9 @@ void SdrMarkView::SetMarkHandles()
// try to restore focus handle index from remembered values
if(bSaveOldFocus)
{
- for(size_t a = 0; a < aHdl.GetHdlCount(); ++a)
+ for(size_t a = 0; a < maHdlList.GetHdlCount(); ++a)
{
- SdrHdl* pCandidate = aHdl.GetHdl(a);
+ SdrHdl* pCandidate = maHdlList.GetHdl(a);
if(pCandidate->GetObj()
&& pCandidate->GetObj() == pSaveObj
@@ -861,7 +861,7 @@ void SdrMarkView::SetMarkHandles()
&& pCandidate->GetPolyNum() == nSavePolyNum
&& pCandidate->GetPointNum() == nSavePointNum)
{
- aHdl.SetFocusHdl(pCandidate);
+ maHdlList.SetFocusHdl(pCandidate);
break;
}
}
@@ -897,7 +897,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
// add rotation center
SdrHdl* pHdl = new SdrHdl(aRef1, HDL_REF1);
- aHdl.AddHdl(pHdl);
+ maHdlList.AddHdl(pHdl);
break;
}
@@ -912,9 +912,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
pHdl2->SetObjHdlNum(2); // for sorting
pHdl3->SetObjHdlNum(3); // for sorting
- aHdl.AddHdl(pHdl1); // line comes first, so it is the last in HitTest
- aHdl.AddHdl(pHdl2);
- aHdl.AddHdl(pHdl3);
+ maHdlList.AddHdl(pHdl1); // line comes first, so it is the last in HitTest
+ maHdlList.AddHdl(pHdl2);
+ maHdlList.AddHdl(pHdl3);
break;
}
@@ -976,9 +976,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
pColHdl2->SetColorChangeHdl(LINK(pGradHdl, SdrHdlGradient, ColorChangeHdl));
// insert them
- aHdl.AddHdl(pColHdl1);
- aHdl.AddHdl(pColHdl2);
- aHdl.AddHdl(pGradHdl);
+ maHdlList.AddHdl(pColHdl1);
+ maHdlList.AddHdl(pColHdl2);
+ maHdlList.AddHdl(pGradHdl);
}
break;
}
@@ -1018,9 +1018,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
pColHdl2->SetColorChangeHdl(LINK(pGradHdl, SdrHdlGradient, ColorChangeHdl));
// insert them
- aHdl.AddHdl(pColHdl1);
- aHdl.AddHdl(pColHdl2);
- aHdl.AddHdl(pGradHdl);
+ maHdlList.AddHdl(pColHdl1);
+ maHdlList.AddHdl(pColHdl2);
+ maHdlList.AddHdl(pGradHdl);
}
}
break;
@@ -1037,7 +1037,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
/** handle mouse over effects for handles */
bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin)
{
- if(aHdl.GetHdlCount())
+ if(maHdlList.GetHdlCount())
{
SdrHdl* pMouseOverHdl = 0;
if( !rMEvt.IsLeaveWindow() && pWin )
@@ -1047,7 +1047,7 @@ bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin)
}
// notify last mouse over handle that he lost the mouse
- const size_t nHdlCount = aHdl.GetHdlCount();
+ const size_t nHdlCount = maHdlList.GetHdlCount();
for(size_t nHdl = 0; nHdl < nHdlCount; ++nHdl)
{
@@ -1167,7 +1167,7 @@ void SdrMarkView::SetRef1(const Point& rPt)
if(eDragMode == SDRDRAG_ROTATE || eDragMode == SDRDRAG_MIRROR)
{
aRef1 = rPt;
- SdrHdl* pH = aHdl.GetHdl(HDL_REF1);
+ SdrHdl* pH = maHdlList.GetHdl(HDL_REF1);
if(pH)
pH->SetPos(rPt);
}
@@ -1178,7 +1178,7 @@ void SdrMarkView::SetRef2(const Point& rPt)
if(eDragMode == SDRDRAG_MIRROR)
{
aRef2 = rPt;
- SdrHdl* pH = aHdl.GetHdl(HDL_REF2);
+ SdrHdl* pH = maHdlList.GetHdl(HDL_REF2);
if(pH)
pH->SetPos(rPt);
}
@@ -1312,7 +1312,7 @@ SdrHdl* SdrMarkView::PickHandle(const Point& rPnt, sal_uIntPtr nOptions, SdrHdl*
bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
bool bNext=(nOptions & SDRSEARCH_NEXT) !=0;
Point aPt(rPnt);
- return aHdl.IsHdlListHit(aPt,bBack,bNext,pHdl0);
+ return maHdlList.IsHdlListHit(aPt,bBack,bNext,pHdl0);
}
bool SdrMarkView::MarkObj(const Point& rPnt, short nTol, bool bToggle, bool bDeep)
@@ -1563,15 +1563,15 @@ bool SdrMarkView::IsObjMarked(SdrObject* pObj) const
sal_uInt16 SdrMarkView::GetMarkHdlSizePixel() const
{
- return aHdl.GetHdlSize()*2+1;
+ return maHdlList.GetHdlSize()*2+1;
}
void SdrMarkView::SetMarkHdlSizePixel(sal_uInt16 nSiz)
{
if (nSiz<3) nSiz=3;
nSiz/=2;
- if (nSiz!=aHdl.GetHdlSize()) {
- aHdl.SetHdlSize(nSiz);
+ if (nSiz!=maHdlList.GetHdlSize()) {
+ maHdlList.SetHdlSize(nSiz);
}
}
@@ -2064,7 +2064,7 @@ void SdrMarkView::MarkListHasChanged()
void SdrMarkView::SetMoveOutside(bool bOn)
{
- aHdl.SetMoveOutside(bOn);
+ maHdlList.SetMoveOutside(bOn);
}
void SdrMarkView::SetDesignMode( bool _bOn )
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 473b86d..3413d30 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/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;
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 6ecfa1f..8f18aa7 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/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;
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index a3b1490..a433f93 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/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)
{
More information about the Libreoffice-commits
mailing list