[Libreoffice-commits] core.git: include/svx svx/source
Miklos Vajna
vmiklos at collabora.co.uk
Fri Jun 12 00:12:53 PDT 2015
include/svx/svddrgmt.hxx | 8 -
include/svx/svddrgv.hxx | 4
include/svx/svdmrkv.hxx | 84 +++++++++---------
svx/source/engine3d/view3d.cxx | 12 +-
svx/source/svdraw/svdcrtv.cxx | 6 -
svx/source/svdraw/svddrgmt.cxx | 4
svx/source/svdraw/svddrgv.cxx | 46 +++++-----
svx/source/svdraw/svdedtv1.cxx | 20 ++--
svx/source/svdraw/svdmrkv.cxx | 184 ++++++++++++++++++++---------------------
svx/source/svdraw/svdmrkv1.cxx | 32 +++----
svx/source/svdraw/svdview.cxx | 8 -
11 files changed, 204 insertions(+), 204 deletions(-)
New commits:
commit 0e7aa546642426c2bbadacf061ff5695498393e9
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Jun 12 09:08:20 2015 +0200
svx: prefix remaining SdrMarkView members
Change-Id: Ia1b65264fea95077c9dc2fb1288a20c6df0ef84c
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index 3a89ca0..e8e09b6 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -161,15 +161,15 @@ protected:
SdrHdlKind GetDragHdlKind() const { return getSdrDragView().meDragHdl; }
SdrDragStat& DragStat() { return getSdrDragView().aDragStat; }
const SdrDragStat& DragStat() const { return getSdrDragView().aDragStat; }
- Point& Ref1() const { return mrSdrDragView.aRef1; }
- Point& Ref2() const { return mrSdrDragView.aRef2; }
+ Point& Ref1() const { return mrSdrDragView.maRef1; }
+ Point& Ref2() const { return mrSdrDragView.maRef2; }
const SdrHdlList& GetHdlList() const { return getSdrDragView().GetHdlList(); }
void AddUndo(SdrUndoAction* pUndo) { getSdrDragView().AddUndo(pUndo); }
bool IsDragLimit() { return getSdrDragView().mbDragLimit; }
const Rectangle& GetDragLimitRect() { return getSdrDragView().maDragLimit; }
const SdrMarkList& GetMarkedObjectList() { return getSdrDragView().GetMarkedObjectList(); }
- Point GetSnapPos(const Point& rPt) const { return getSdrDragView().GetSnapPos(rPt,getSdrDragView().pMarkedPV); }
- SdrSnap SnapPos(Point& rPt) const { return getSdrDragView().SnapPos(rPt,getSdrDragView().pMarkedPV); }
+ Point GetSnapPos(const Point& rPt) const { return getSdrDragView().GetSnapPos(rPt,getSdrDragView().mpMarkedPV); }
+ SdrSnap SnapPos(Point& rPt) const { return getSdrDragView().SnapPos(rPt,getSdrDragView().mpMarkedPV); }
inline const Rectangle& GetMarkedRect() const;
SdrPageView* GetDragPV() const;
SdrObject* GetDragObj() const;
diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx
index 286cf0d..4bd3037 100644
--- a/include/svx/svddrgv.hxx
+++ b/include/svx/svddrgv.hxx
@@ -105,7 +105,7 @@ public:
void MovDragObj(const Point& rPnt);
bool EndDragObj(bool bCopy=false);
void BrkDragObj();
- bool IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !mbInsGluePoint; }
+ bool IsDragObj() const { return mpCurrentSdrDragMethod && !mbInsPolyPoint && !mbInsGluePoint; }
SdrHdl* GetDragHdl() const { return mpDragHdl; }
SdrDragMethod* GetDragMethod() const { return mpCurrentSdrDragMethod; }
bool IsDraggingPoints() const { return meDragHdl==HDL_POLY; }
@@ -126,7 +126,7 @@ public:
void MovInsObjPoint(const Point& rPnt) { MovDragObj(rPnt); }
bool EndInsObjPoint(SdrCreateCmd eCmd);
void BrkInsObjPoint() { BrkDragObj(); }
- bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; }
+ bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && mbInsPolyPoint; }
// For the app to manage the status. GetPreferredPointer() is
// possibly going to deliver a matching pointer for it.
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 8219c50..8a16568 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -103,39 +103,39 @@ class SVX_DLLPUBLIC SdrMarkView : public SdrSnapView
ImplMarkingOverlay* mpMarkGluePointsOverlay;
protected:
- SdrObject* pMarkedObj; // If not just one object ( i.e. More than one object ) is marked.
- SdrPageView* pMarkedPV; // If all marked obects are situated on the same PageView.
+ SdrObject* mpMarkedObj; // If not just one object ( i.e. More than one object ) is marked.
+ SdrPageView* mpMarkedPV; // If all marked obects are situated on the same PageView.
- Point aRef1; // Persistent - Rotation center / axis of reflection
- Point aRef2; // Persistent
- Point aLastCrookCenter; // Persistent
+ Point maRef1; // Persistent - Rotation center / axis of reflection
+ Point maRef2; // Persistent
+ Point maLastCrookCenter; // Persistent
SdrHdlList maHdlList;
sdr::ViewSelection* mpSdrViewSelection;
- Rectangle aMarkedObjRect;
- Rectangle aMarkedObjRectNoOffset;
- Rectangle aMarkedPointsRect;
- Rectangle aMarkedGluePointsRect;
+ Rectangle maMarkedObjRect;
+ Rectangle maMarkedObjRectNoOffset;
+ Rectangle maMarkedPointsRect;
+ Rectangle maMarkedGluePointsRect;
- sal_uInt16 nFrameHandlesLimit;
+ sal_uInt16 mnFrameHandlesLimit;
sal_uIntPtr mnInsPointNum; // Number of the InsPoint
- sal_uIntPtr nMarkableObjCount;
+ sal_uIntPtr mnMarkableObjCount;
- SdrDragMode eDragMode; // Persistent
- SdrViewEditMode eEditMode; // Persistent
- SdrViewEditMode eEditMode0; // Persistent
+ SdrDragMode meDragMode; // Persistent
+ SdrViewEditMode meEditMode; // Persistent
+ SdrViewEditMode meEditMode0; // Persistent
//HMHbool bHdlShown : 1;
- bool bRefHdlShownOnly : 1; // Axis of reflextion during dragging (ni)
- bool bDesignMode : 1; // DesignMode for SdrUnoObj
- bool bForceFrameHandles : 1; // Persistent - FrameDrag auch bei Einzelobjekten
- bool bPlusHdlAlways : 1; // Persistent
- bool bMarkHdlWhenTextEdit : 1; // Persistent, default=FALSE
- bool bInsPolyPoint : 1; // at this time InsPolyPointDragging
- bool bMarkedObjRectDirty : 1;
- bool bMrkPntDirty : 1;
- bool bMarkedPointsRectsDirty : 1;
- bool bMarkableObjCountDirty : 1;
+ bool mbRefHdlShownOnly : 1; // Axis of reflextion during dragging (ni)
+ bool mbDesignMode : 1; // DesignMode for SdrUnoObj
+ bool mbForceFrameHandles : 1; // Persistent - FrameDrag auch bei Einzelobjekten
+ bool mbPlusHdlAlways : 1; // Persistent
+ bool mbMarkHdlWhenTextEdit : 1; // Persistent, default=FALSE
+ bool mbInsPolyPoint : 1; // at this time InsPolyPointDragging
+ bool mbMarkedObjRectDirty : 1;
+ bool mbMrkPntDirty : 1;
+ bool mbMarkedPointsRectsDirty : 1;
+ bool mbMarkableObjCountDirty : 1;
// flag to completely disable handles at the view
bool mbMarkHandlesHidden : 1;
@@ -158,7 +158,7 @@ protected:
virtual void AddCustomHdl();
void ForceRefToMarked();
- void ForceUndirtyMrkPnt() const { if (bMrkPntDirty) UndirtyMrkPnt(); }
+ void ForceUndirtyMrkPnt() const { if (mbMrkPntDirty) UndirtyMrkPnt(); }
//HMHvoid ImpShowMarkHdl(bool bNoRefHdl);
virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, SdrSearchOptions nOptions, const SetOfByte* pMVisLay) const;
@@ -206,29 +206,29 @@ public:
// Move==Resize
// The interface might maybe be changed in the future because of Ortho-Drag
void SetDragMode(SdrDragMode eMode);
- SdrDragMode GetDragMode() const { return eDragMode; }
+ SdrDragMode GetDragMode() const { return meDragMode; }
bool ChkDragMode(SdrDragMode eMode) const;
void SetFrameHandles(bool bOn);
- bool IsFrameHandles() const { return bForceFrameHandles; }
+ bool IsFrameHandles() const { return mbForceFrameHandles; }
sal_uIntPtr GetMarkableObjCount() const;
// Limit. Exceeding the limit causes an implicite switch to FrameHandles. default=50.
- void SetFrameHandlesLimit(sal_uInt16 nCount) { nFrameHandlesLimit=nCount; }
- sal_uInt16 GetFrameHandlesLimit() const { return nFrameHandlesLimit; }
+ void SetFrameHandlesLimit(sal_uInt16 nCount) { mnFrameHandlesLimit=nCount; }
+ sal_uInt16 GetFrameHandlesLimit() const { return mnFrameHandlesLimit; }
void SetEditMode(SdrViewEditMode eMode);
- SdrViewEditMode GetEditMode() const { return eEditMode; }
+ SdrViewEditMode GetEditMode() const { return meEditMode; }
void SetEditMode(bool bOn=true) { SetEditMode(bOn?SDREDITMODE_EDIT:SDREDITMODE_CREATE); }
- bool IsEditMode() const { return eEditMode==SDREDITMODE_EDIT; }
+ bool IsEditMode() const { return meEditMode==SDREDITMODE_EDIT; }
void SetCreateMode(bool bOn=true) { SetEditMode(bOn?SDREDITMODE_CREATE:SDREDITMODE_EDIT); }
- bool IsCreateMode() const { return eEditMode==SDREDITMODE_CREATE; }
- void SetGluePointEditMode(bool bOn=true) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); }
- bool IsGluePointEditMode() const { return eEditMode==SDREDITMODE_GLUEPOINTEDIT; }
+ bool IsCreateMode() const { return meEditMode==SDREDITMODE_CREATE; }
+ void SetGluePointEditMode(bool bOn=true) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:meEditMode0); }
+ bool IsGluePointEditMode() const { return meEditMode==SDREDITMODE_GLUEPOINTEDIT; }
void SetDesignMode(bool bOn = true);
- bool IsDesignMode() const { return bDesignMode; }
+ bool IsDesignMode() const { return mbDesignMode; }
void SetFrameDragSingles(bool bOn=true) { SetFrameHandles(bOn); }
bool IsFrameDragSingles() const { return IsFrameHandles(); }
@@ -369,12 +369,12 @@ public:
// Select that additional handles are displayed permanently.
void SetPlusHandlesAlwaysVisible(bool bOn);
- bool IsPlusHandlesAlwaysVisible() const { return bPlusHdlAlways; }
+ bool IsPlusHandlesAlwaysVisible() const { return mbPlusHdlAlways; }
// Are Handles visible during TextEdit (in double size)?
// Persistent, default=FALSE
- void SetMarkHdlWhenTextEdit(bool bOn) { bMarkHdlWhenTextEdit=bOn; }
- bool IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; }
+ void SetMarkHdlWhenTextEdit(bool bOn) { mbMarkHdlWhenTextEdit=bOn; }
+ bool IsMarkHdlWhenTextEdit() const { return mbMarkHdlWhenTextEdit; }
bool HasMarkableGluePoints() const;
bool HasMarkedGluePoints() const;
@@ -453,17 +453,17 @@ public:
// Get the center point of the last Crook-Dragging. Den kann man
// bei einem anschliessenden Rotate sinnvoll als Drehmittelpunkt setzen.
- const Point& GetLastCrookCenter() const { return aLastCrookCenter; }
+ const Point& GetLastCrookCenter() const { return maLastCrookCenter; }
// Is set by DragView automatically when finishing a Crook-Drag.
- void SetLastCrookCenter(const Point& rPt) { aLastCrookCenter=rPt; }
+ void SetLastCrookCenter(const Point& rPt) { maLastCrookCenter=rPt; }
// Rotation center point and start point of the axis of reflextion, respecively
- const Point& GetRef1() const { return aRef1; }
+ const Point& GetRef1() const { return maRef1; }
void SetRef1(const Point& rPt);
// End point of the axis of reflextion
- const Point& GetRef2() const { return aRef1; }
+ const Point& GetRef2() const { return maRef1; }
void SetRef2(const Point& rPt);
void UnmarkObj(SdrObject* pObj);
};
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 18ff215..422cd83 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -1192,7 +1192,7 @@ bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
if(Is3DRotationCreationActive() && GetMarkedObjectCount())
{
// Determine all selected polygons and return the mirrored helper overlay
- mpMirrorOverlay->SetMirrorAxis(aRef1, aRef2);
+ mpMirrorOverlay->SetMirrorAxis(maRef1, maRef2);
}
else
{
@@ -1230,7 +1230,7 @@ bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
if( bThereAre3DObjects )
{
meDragHdl = ( pHdl == NULL ? HDL_MOVE : pHdl->GetKind() );
- switch ( eDragMode )
+ switch ( meDragMode )
{
case SDRDRAG_ROTATE:
case SDRDRAG_SHEAR:
@@ -1408,10 +1408,10 @@ void E3dView::Start3DCreation()
}
}
- aRef1.X() = basegfx::fround(aR.getMinX()); // Initial move axis 2/100mm to the left
- aRef1.Y() = nY1;
- aRef2.X() = aRef1.X();
- aRef2.Y() = nY2;
+ maRef1.X() = basegfx::fround(aR.getMinX()); // Initial move axis 2/100mm to the left
+ maRef1.Y() = nY1;
+ maRef2.X() = maRef1.X();
+ maRef2.Y() = nY2;
// Turn on marks
SetMarkHandles();
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index b5c0d58..5f6cbeb 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -341,17 +341,17 @@ bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin)
bool SdrCreateView::IsTextTool() const
{
- return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_TEXT || nAktIdent==OBJ_TEXTEXT || nAktIdent==OBJ_TITLETEXT || nAktIdent==OBJ_OUTLINETEXT);
+ return meEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_TEXT || nAktIdent==OBJ_TEXTEXT || nAktIdent==OBJ_TITLETEXT || nAktIdent==OBJ_OUTLINETEXT);
}
bool SdrCreateView::IsEdgeTool() const
{
- return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_EDGE);
+ return meEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_EDGE);
}
bool SdrCreateView::IsMeasureTool() const
{
- return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_MEASURE);
+ return meEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_MEASURE);
}
void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent)
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 69d34bf..5d79b68 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -576,7 +576,7 @@ SdrObject* SdrDragMethod::GetDragObj() const
{
SdrObject* pObj=NULL;
if (getSdrDragView().mpDragHdl!=NULL) pObj=getSdrDragView().mpDragHdl->GetObj();
- if (pObj==NULL) pObj=getSdrDragView().pMarkedObj;
+ if (pObj==NULL) pObj=getSdrDragView().mpMarkedObj;
return pObj;
}
@@ -584,7 +584,7 @@ SdrPageView* SdrDragMethod::GetDragPV() const
{
SdrPageView* pPV=NULL;
if (getSdrDragView().mpDragHdl!=NULL) pPV=getSdrDragView().mpDragHdl->GetPageView();
- if (pPV==NULL) pPV=getSdrDragView().pMarkedPV;
+ if (pPV==NULL) pPV=getSdrDragView().mpMarkedPV;
return pPV;
}
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 5bab606..dbde52d 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -52,7 +52,7 @@ using namespace sdr;
void SdrDragView::ImpClearVars()
{
mbFramDrag=false;
- eDragMode=SDRDRAG_MOVE;
+ meDragMode=SDRDRAG_MOVE;
mbDragLimit=false;
mbMarkedHitMovesAlways=false;
meDragHdl=HDL_MOVE;
@@ -217,14 +217,14 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
mpCurrentSdrDragMethod=NULL;
mbDragSpecial=false;
mbDragLimit=false;
- SdrDragMode eTmpMode=eDragMode;
+ SdrDragMode eTmpMode=meDragMode;
if (eTmpMode==SDRDRAG_MOVE && pHdl!=NULL && pHdl->GetKind()!=HDL_MOVE) {
eTmpMode=SDRDRAG_RESIZE;
}
mbDragLimit=TakeDragLimit(eTmpMode,maDragLimit);
mbFramDrag=ImpIsFrameHandles();
if (!mbFramDrag &&
- (pMarkedObj==NULL || !pMarkedObj->hasSpecialDrag()) &&
+ (mpMarkedObj==NULL || !mpMarkedObj->hasSpecialDrag()) &&
(pHdl==NULL || pHdl->GetObj()==NULL)) {
mbFramDrag=true;
}
@@ -244,7 +244,7 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
}
aDragStat.SetView(static_cast<SdrView*>(this));
- aDragStat.SetPageView(pMarkedPV); // <<-- DragPV has to go here!!!
+ aDragStat.SetPageView(mpMarkedPV); // <<-- DragPV has to go here!!!
aDragStat.SetMinMove(ImpGetMinMovLogic(nMinMov,pOut));
aDragStat.SetHdl(pHdl);
aDragStat.NextPoint();
@@ -266,7 +266,7 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
}
else if(!bNotDraggable)
{
- switch (eDragMode)
+ switch (meDragMode)
{
case SDRDRAG_ROTATE: case SDRDRAG_SHEAR: case SDRDRAG_DISTORT:
{
@@ -287,12 +287,12 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
// because 3D objects are limited rotations
if (!b3DObjSelected && !IsShearAllowed())
return false;
- mpCurrentSdrDragMethod = new SdrDragShear(*this,eDragMode==SDRDRAG_ROTATE);
+ mpCurrentSdrDragMethod = new SdrDragShear(*this,meDragMode==SDRDRAG_ROTATE);
} break;
case HDL_UPLFT: case HDL_UPRGT:
case HDL_LWLFT: case HDL_LWRGT:
{
- if (eDragMode==SDRDRAG_SHEAR || eDragMode==SDRDRAG_DISTORT)
+ if (meDragMode==SDRDRAG_SHEAR || meDragMode==SDRDRAG_DISTORT)
{
if (!IsDistortAllowed(true) && !IsDistortAllowed(false)) return false;
mpCurrentSdrDragMethod = new SdrDragDistort(*this);
@@ -427,10 +427,10 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
bool bSingleTextObjMark = false; // SJ: #i100490#
if ( GetMarkedObjectCount() == 1 )
{
- pMarkedObj=GetMarkedObjectByIndex(0);
- if ( pMarkedObj &&
- pMarkedObj->ISA( SdrTextObj ) &&
- static_cast<SdrTextObj*>(pMarkedObj)->IsTextFrame() )
+ mpMarkedObj=GetMarkedObjectByIndex(0);
+ if ( mpMarkedObj &&
+ mpMarkedObj->ISA( SdrTextObj ) &&
+ static_cast<SdrTextObj*>(mpMarkedObj)->IsTextFrame() )
bSingleTextObjMark = true;
}
if ( bSingleTextObjMark )
@@ -565,10 +565,10 @@ bool SdrDragView::EndDragObj(bool bCopy)
}
}
- if (bInsPolyPoint)
+ if (mbInsPolyPoint)
{
SetMarkHandles();
- bInsPolyPoint=false;
+ mbInsPolyPoint=false;
if( bUndo )
{
BegUndo(maInsPointUndoStr);
@@ -594,7 +594,7 @@ bool SdrDragView::EndDragObj(bool bCopy)
BrkDragObj();
}
- bInsPolyPoint=false;
+ mbInsPolyPoint=false;
SetInsertGluePoint(false);
return bRet;
@@ -609,13 +609,13 @@ void SdrDragView::BrkDragObj()
delete mpCurrentSdrDragMethod;
mpCurrentSdrDragMethod = 0;
- if (bInsPolyPoint)
+ if (mbInsPolyPoint)
{
mpInsPointUndo->Undo(); // delete inserted point again
delete mpInsPointUndo;
mpInsPointUndo=NULL;
SetMarkHandles();
- bInsPolyPoint=false;
+ mbInsPolyPoint=false;
}
if (IsInsertGluePoint())
@@ -633,28 +633,28 @@ void SdrDragView::BrkDragObj()
bool SdrDragView::IsInsObjPointPossible() const
{
- return pMarkedObj!=NULL && pMarkedObj->IsPolyObj();
+ return mpMarkedObj!=NULL && mpMarkedObj->IsPolyObj();
}
bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point& rPnt, bool bNewObj, OutputDevice* pOut)
{
bool bRet(false);
- if(pMarkedObj && pMarkedObj->ISA(SdrPathObj))
+ if(mpMarkedObj && mpMarkedObj->ISA(SdrPathObj))
{
- SdrPathObj* pMarkedPath = static_cast<SdrPathObj*>(pMarkedObj);
+ SdrPathObj* pMarkedPath = static_cast<SdrPathObj*>(mpMarkedObj);
BrkAction();
- mpInsPointUndo = dynamic_cast< SdrUndoGeoObj* >( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pMarkedObj) );
+ mpInsPointUndo = dynamic_cast< SdrUndoGeoObj* >( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*mpMarkedObj) );
DBG_ASSERT( mpInsPointUndo, "svx::SdrDragView::BegInsObjPoint(), could not create correct undo object!" );
OUString aStr(ImpGetResStr(STR_DragInsertPoint));
- maInsPointUndoStr = aStr.replaceFirst("%1", pMarkedObj->TakeObjNameSingul() );
+ maInsPointUndoStr = aStr.replaceFirst("%1", mpMarkedObj->TakeObjNameSingul() );
Point aPt(rPnt);
if(bNewObj)
- aPt = GetSnapPos(aPt,pMarkedPV);
+ aPt = GetSnapPos(aPt,mpMarkedPV);
bool bClosed0 = pMarkedPath->IsClosedObj();
@@ -677,7 +677,7 @@ bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point
if(0xffffffff != mnInsPointNum)
{
- bInsPolyPoint = true;
+ mbInsPolyPoint = true;
UnmarkAllPoints();
AdjustMarkHdl();
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 8b5e0f3..e9979ad6 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -895,13 +895,13 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, bool /*bOnlyH
rAttr.Put(SdrVertShearAllItem());
}
- if(eDragMode == SDRDRAG_ROTATE || eDragMode == SDRDRAG_MIRROR)
+ if(meDragMode == SDRDRAG_ROTATE || meDragMode == SDRDRAG_MIRROR)
{
rAttr.Put(SdrTransformRef1XItem(GetRef1().X()));
rAttr.Put(SdrTransformRef1YItem(GetRef1().Y()));
}
- if(eDragMode == SDRDRAG_MIRROR)
+ if(meDragMode == SDRDRAG_MIRROR)
{
rAttr.Put(SdrTransformRef2XItem(GetRef2().X()));
rAttr.Put(SdrTransformRef2YItem(GetRef2().Y()));
@@ -1311,16 +1311,16 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
// size
long nResizeRefX=aRect.Left();
long nResizeRefY=aRect.Top();
- if (eDragMode==SDRDRAG_ROTATE) { // use rotation axis as a reference for resizing, too
- nResizeRefX=aRef1.X();
- nResizeRefY=aRef1.Y();
+ if (meDragMode==SDRDRAG_ROTATE) { // use rotation axis as a reference for resizing, too
+ nResizeRefX=maRef1.X();
+ nResizeRefY=maRef1.Y();
}
aRetSet.Put(SfxUInt32Item(SID_ATTR_TRANSFORM_WIDTH,aRect.Right()-aRect.Left()));
aRetSet.Put(SfxUInt32Item(SID_ATTR_TRANSFORM_HEIGHT,aRect.Bottom()-aRect.Top()));
aRetSet.Put(SfxInt32Item(SID_ATTR_TRANSFORM_RESIZE_REF_X,nResizeRefX));
aRetSet.Put(SfxInt32Item(SID_ATTR_TRANSFORM_RESIZE_REF_Y,nResizeRefY));
- Point aRotateAxe(aRef1);
+ Point aRotateAxe(maRef1);
if(GetSdrPageView())
{
@@ -1330,7 +1330,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
// rotation
long nRotateRefX=aRect.Center().X();
long nRotateRefY=aRect.Center().Y();
- if (eDragMode==SDRDRAG_ROTATE) {
+ if (meDragMode==SDRDRAG_ROTATE) {
nRotateRefX=aRotateAxe.X();
nRotateRefY=aRotateAxe.Y();
}
@@ -1341,7 +1341,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
// shearing
long nShearRefX=aRect.Left();
long nShearRefY=aRect.Bottom();
- if (eDragMode==SDRDRAG_ROTATE) { // use rotation axis as a reference for shearing, too
+ if (meDragMode==SDRDRAG_ROTATE) { // use rotation axis as a reference for shearing, too
nShearRefX=aRotateAxe.X();
nShearRefY=aRotateAxe.Y();
}
@@ -1483,14 +1483,14 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
long nSizY=0;
long nRotateAngle=0;
- bool bModeIsRotate(eDragMode == SDRDRAG_ROTATE);
+ bool bModeIsRotate(meDragMode == SDRDRAG_ROTATE);
long nRotateX(0);
long nRotateY(0);
long nOldRotateX(0);
long nOldRotateY(0);
if(bModeIsRotate)
{
- Point aRotateAxe(aRef1);
+ Point aRotateAxe(maRef1);
if(GetSdrPageView())
{
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index d6c95ed..f58f88b 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -127,25 +127,25 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition
void SdrMarkView::ImpClearVars()
{
- eDragMode=SDRDRAG_MOVE;
- bRefHdlShownOnly=false;
- eEditMode=SDREDITMODE_EDIT;
- eEditMode0=SDREDITMODE_EDIT;
- bDesignMode=false;
- pMarkedObj=NULL;
- pMarkedPV=NULL;
- bForceFrameHandles=false;
- bPlusHdlAlways=false;
- nFrameHandlesLimit=50;
- bInsPolyPoint=false;
+ meDragMode=SDRDRAG_MOVE;
+ mbRefHdlShownOnly=false;
+ meEditMode=SDREDITMODE_EDIT;
+ meEditMode0=SDREDITMODE_EDIT;
+ mbDesignMode=false;
+ mpMarkedObj=NULL;
+ mpMarkedPV=NULL;
+ mbForceFrameHandles=false;
+ mbPlusHdlAlways=false;
+ mnFrameHandlesLimit=50;
+ mbInsPolyPoint=false;
mnInsPointNum = 0L;
- bMarkedObjRectDirty=false;
- bMarkedPointsRectsDirty=false;
+ mbMarkedObjRectDirty=false;
+ mbMarkedPointsRectsDirty=false;
mbMarkHandlesHidden = false;
- bMrkPntDirty=false;
- bMarkHdlWhenTextEdit=false;
- bMarkableObjCountDirty=false; // not yet implemented
- nMarkableObjCount=0; // not yet implemented
+ mbMrkPntDirty=false;
+ mbMarkHdlWhenTextEdit=false;
+ mbMarkableObjCountDirty=false; // not yet implemented
+ mnMarkableObjCount=0; // not yet implemented
// Migrate selections
BrkMarkObj();
@@ -183,8 +183,8 @@ void SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED)
{
- bMarkedObjRectDirty=true;
- bMarkedPointsRectsDirty=true;
+ mbMarkedObjRectDirty=true;
+ mbMarkedPointsRectsDirty=true;
}
}
SdrSnapView::Notify(rBC,rHint);
@@ -194,14 +194,14 @@ void SdrMarkView::ModelHasChanged()
{
SdrPaintView::ModelHasChanged();
GetMarkedObjectListWriteAccess().SetNameDirty();
- bMarkedObjRectDirty=true;
- bMarkedPointsRectsDirty=true;
+ mbMarkedObjRectDirty=true;
+ mbMarkedPointsRectsDirty=true;
// Example: Obj is selected and maMarkedObjectList is sorted.
// In another View 2, the ObjOrder is changed (e. g. MovToTop())
// Then we need to re-sort MarkList.
GetMarkedObjectListWriteAccess().SetUnsorted();
SortMarkedObjects();
- bMrkPntDirty=true;
+ mbMrkPntDirty=true;
UndirtyMrkPnt();
SdrView* pV=static_cast<SdrView*>(this);
if (pV!=NULL && !pV->IsDragObj() && !pV->IsInsObjPoint()) {
@@ -559,8 +559,8 @@ void SdrMarkView::showMarkHandles()
bool SdrMarkView::ImpIsFrameHandles() const
{
const size_t nMarkCount=GetMarkedObjectCount();
- bool bFrmHdl=nMarkCount>static_cast<size_t>(nFrameHandlesLimit) || bForceFrameHandles;
- bool bStdDrag=eDragMode==SDRDRAG_MOVE;
+ bool bFrmHdl=nMarkCount>static_cast<size_t>(mnFrameHandlesLimit) || mbForceFrameHandles;
+ bool bStdDrag=meDragMode==SDRDRAG_MOVE;
if (nMarkCount==1 && bStdDrag && bFrmHdl)
{
const SdrObject* pObj=GetMarkedObjectByIndex(0);
@@ -576,7 +576,7 @@ bool SdrMarkView::ImpIsFrameHandles() const
if (!bStdDrag && !bFrmHdl) {
// all other drag modes only with FrameHandles
bFrmHdl=true;
- if (eDragMode==SDRDRAG_ROTATE) {
+ if (meDragMode==SDRDRAG_ROTATE) {
// when rotating, use ObjOwn drag, if there's at least 1 PolyObj
for (size_t nMarkNum=0; nMarkNum<nMarkCount && bFrmHdl; ++nMarkNum) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
@@ -595,7 +595,7 @@ bool SdrMarkView::ImpIsFrameHandles() const
}
// no FrameHdl for crop
- if(bFrmHdl && SDRDRAG_CROP == eDragMode)
+ if(bFrmHdl && SDRDRAG_CROP == meDragMode)
{
bFrmHdl = false;
}
@@ -626,40 +626,40 @@ void SdrMarkView::SetMarkHandles()
// delete/clear all handles. This will always be done, even with areMarkHandlesHidden()
maHdlList.Clear();
- maHdlList.SetRotateShear(eDragMode==SDRDRAG_ROTATE);
- maHdlList.SetDistortShear(eDragMode==SDRDRAG_SHEAR);
- pMarkedObj=NULL;
- pMarkedPV=NULL;
+ maHdlList.SetRotateShear(meDragMode==SDRDRAG_ROTATE);
+ maHdlList.SetDistortShear(meDragMode==SDRDRAG_SHEAR);
+ mpMarkedObj=NULL;
+ mpMarkedPV=NULL;
// are handles enabled at all? Create only then
if(!areMarkHandlesHidden())
{
const size_t nMarkCount=GetMarkedObjectCount();
- bool bStdDrag=eDragMode==SDRDRAG_MOVE;
+ bool bStdDrag=meDragMode==SDRDRAG_MOVE;
bool bSingleTextObjMark=false;
if (nMarkCount==1)
{
- pMarkedObj=GetMarkedObjectByIndex(0);
+ mpMarkedObj=GetMarkedObjectByIndex(0);
bSingleTextObjMark =
- pMarkedObj &&
- pMarkedObj->ISA(SdrTextObj) &&
- static_cast<SdrTextObj*>(pMarkedObj)->IsTextFrame();
+ mpMarkedObj &&
+ mpMarkedObj->ISA(SdrTextObj) &&
+ static_cast<SdrTextObj*>(mpMarkedObj)->IsTextFrame();
}
bool bFrmHdl=ImpIsFrameHandles();
if (nMarkCount>0)
{
- pMarkedPV=GetSdrPageViewOfMarkedByIndex(0);
+ mpMarkedPV=GetSdrPageViewOfMarkedByIndex(0);
- for (size_t nMarkNum=0; nMarkNum<nMarkCount && (pMarkedPV!=NULL || !bFrmHdl); ++nMarkNum)
+ for (size_t nMarkNum=0; nMarkNum<nMarkCount && (mpMarkedPV!=NULL || !bFrmHdl); ++nMarkNum)
{
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
- if (pMarkedPV!=pM->GetPageView())
+ if (mpMarkedPV!=pM->GetPageView())
{
- pMarkedPV=NULL;
+ mpMarkedPV=NULL;
}
}
}
@@ -675,7 +675,7 @@ void SdrMarkView::SetMarkHandles()
// check if text edit or ole is active and handles need to be suppressed. This may be the case
// when a single object is selected
// Using a strict return statement is okay here; no handles means *no* handles.
- if(pMarkedObj)
+ if(mpMarkedObj)
{
// formally #i33755#: If TextEdit is active the EditEngine will directly paint
// to the window, so suppress Overlay and handles completely; a text frame for
@@ -685,7 +685,7 @@ void SdrMarkView::SetMarkHandles()
// Also formally #122142#: Pretty much the same for SdrCaptionObj's in calc.
if(static_cast<SdrView*>(this)->IsTextEdit())
{
- const SdrTextObj* pSdrTextObj = dynamic_cast< const SdrTextObj* >(pMarkedObj);
+ const SdrTextObj* pSdrTextObj = dynamic_cast< const SdrTextObj* >(mpMarkedObj);
if(pSdrTextObj && pSdrTextObj->IsInEditMode())
{
@@ -697,14 +697,14 @@ void SdrMarkView::SetMarkHandles()
}
// formally #i118524#: if inplace activated OLE is selected, suppress handles
- const SdrOle2Obj* pSdrOle2Obj = dynamic_cast< const SdrOle2Obj* >(pMarkedObj);
+ const SdrOle2Obj* pSdrOle2Obj = dynamic_cast< const SdrOle2Obj* >(mpMarkedObj);
if(pSdrOle2Obj && (pSdrOle2Obj->isInplaceActive() || pSdrOle2Obj->isUiActive()))
{
return;
}
- if (bTiledRendering && pMarkedObj->GetObjIdentifier() == OBJ_TABLE)
+ if (bTiledRendering && mpMarkedObj->GetObjIdentifier() == OBJ_TABLE)
{
rtl::Reference<sdr::SelectionController> xController = static_cast<SdrView*>(this)->getSelectionController();
if (xController.is() && xController->hasSelectedCells())
@@ -727,9 +727,9 @@ void SdrMarkView::SetMarkHandles()
else
{
// In case the map mode is in 100th MM, then need to convert the coordinates over to twips for LOK.
- if (pMarkedPV)
+ if (mpMarkedPV)
{
- if (OutputDevice* pOutputDevice = pMarkedPV->GetView().GetFirstOutputDevice())
+ if (OutputDevice* pOutputDevice = mpMarkedPV->GetView().GetFirstOutputDevice())
{
if (pOutputDevice->GetMapMode().GetMapUnit() == MAP_100TH_MM)
aSelection = OutputDevice::LogicToLogic(aSelection, MAP_100TH_MM, MAP_TWIP);
@@ -751,14 +751,14 @@ void SdrMarkView::SetMarkHandles()
if( bSingleTextObjMark )
{
const size_t nSiz0=maHdlList.GetHdlCount();
- pMarkedObj->AddToHdlList(maHdlList);
+ mpMarkedObj->AddToHdlList(maHdlList);
const size_t nSiz1=maHdlList.GetHdlCount();
for (size_t i=nSiz0; i<nSiz1; ++i)
{
SdrHdl* pHdl=maHdlList.GetHdl(i);
- pHdl->SetObj(pMarkedObj);
+ pHdl->SetObj(mpMarkedObj);
pHdl->SetPos( pHdl->GetPos() + aGridOff );
- pHdl->SetPageView(pMarkedPV);
+ pHdl->SetPageView(mpMarkedPV);
pHdl->SetObjHdlNum(sal_uInt16(i-nSiz0));
}
}
@@ -794,12 +794,12 @@ void SdrMarkView::SetMarkHandles()
bool bDone(false);
// moved crop handling to non-frame part and the handle creation to SdrGrafObj
- if(1 == nMarkCount && pMarkedObj && SDRDRAG_CROP == eDragMode)
+ if(1 == nMarkCount && mpMarkedObj && SDRDRAG_CROP == meDragMode)
{
// Default addCropHandles from SdrObject does nothing. When pMarkedObj is SdrGrafObj, previous
// behaviour occurs (code in svx/source/svdraw/svdograf.cxx). When pMarkedObj is SwVirtFlyDrawObj
// writer takes the responsibility of adding handles (code in sw/source/core/draw/dflyobj.cxx)
- pMarkedObj->addCropHandles(maHdlList);
+ mpMarkedObj->addCropHandles(maHdlList);
bDone = true;
}
@@ -828,7 +828,7 @@ void SdrMarkView::SetMarkHandles()
bool bSelected=pMrkPnts!=NULL
&& pMrkPnts->find( sal_uInt16(i-nSiz0) ) != pMrkPnts->end();
pHdl->SetSelected(bSelected);
- if (bPlusHdlAlways || bSelected)
+ if (mbPlusHdlAlways || bSelected)
{
sal_uInt32 nPlusAnz=pObj->GetPlusHdlCount(*pHdl);
for (sal_uInt32 nPlusNum=0; nPlusNum<nPlusAnz; nPlusNum++)
@@ -882,7 +882,7 @@ void SdrMarkView::SetMarkHandles()
}
// rotation point/axis of reflection
- AddDragModeHdl(eDragMode);
+ AddDragModeHdl(meDragMode);
// sort handles
maHdlList.Sort();
@@ -918,10 +918,10 @@ void SdrMarkView::AddCustomHdl()
void SdrMarkView::SetDragMode(SdrDragMode eMode)
{
- SdrDragMode eMode0=eDragMode;
- eDragMode=eMode;
- if (eDragMode==SDRDRAG_RESIZE) eDragMode=SDRDRAG_MOVE;
- if (eDragMode!=eMode0) {
+ SdrDragMode eMode0=meDragMode;
+ meDragMode=eMode;
+ if (meDragMode==SDRDRAG_RESIZE) meDragMode=SDRDRAG_MOVE;
+ if (meDragMode!=eMode0) {
ForceRefToMarked();
SetMarkHandles();
{
@@ -937,7 +937,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
case SDRDRAG_ROTATE:
{
// add rotation center
- SdrHdl* pHdl = new SdrHdl(aRef1, HDL_REF1);
+ SdrHdl* pHdl = new SdrHdl(maRef1, HDL_REF1);
maHdlList.AddHdl(pHdl);
@@ -946,8 +946,8 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
case SDRDRAG_MIRROR:
{
// add axis of reflection
- SdrHdl* pHdl3 = new SdrHdl(aRef2, HDL_REF2);
- SdrHdl* pHdl2 = new SdrHdl(aRef1, HDL_REF1);
+ SdrHdl* pHdl3 = new SdrHdl(maRef2, HDL_REF2);
+ SdrHdl* pHdl2 = new SdrHdl(maRef1, HDL_REF1);
SdrHdl* pHdl1 = new SdrHdlLine(*pHdl2, *pHdl3, HDL_MIRX);
pHdl1->SetObjHdlNum(1); // for sorting
@@ -1117,12 +1117,12 @@ bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin)
void SdrMarkView::ForceRefToMarked()
{
- switch(eDragMode)
+ switch(meDragMode)
{
case SDRDRAG_ROTATE:
{
Rectangle aR(GetMarkedObjRect());
- aRef1 = aR.Center();
+ maRef1 = aR.Center();
break;
}
@@ -1183,10 +1183,10 @@ void SdrMarkView::ForceRefToMarked()
}
}
- aRef1.X()=aCenter.X();
- aRef1.Y()=nY1;
- aRef2.X()=aCenter.X();
- aRef2.Y()=nY2;
+ maRef1.X()=aCenter.X();
+ maRef1.Y()=nY1;
+ maRef2.X()=aCenter.X();
+ maRef2.Y()=nY2;
break;
}
@@ -1196,8 +1196,8 @@ void SdrMarkView::ForceRefToMarked()
case SDRDRAG_CROP:
{
Rectangle aRect(GetMarkedObjBoundRect());
- aRef1 = aRect.TopLeft();
- aRef2 = aRect.BottomRight();
+ maRef1 = aRect.TopLeft();
+ maRef2 = aRect.BottomRight();
break;
}
default: break;
@@ -1206,9 +1206,9 @@ void SdrMarkView::ForceRefToMarked()
void SdrMarkView::SetRef1(const Point& rPt)
{
- if(eDragMode == SDRDRAG_ROTATE || eDragMode == SDRDRAG_MIRROR)
+ if(meDragMode == SDRDRAG_ROTATE || meDragMode == SDRDRAG_MIRROR)
{
- aRef1 = rPt;
+ maRef1 = rPt;
SdrHdl* pH = maHdlList.GetHdl(HDL_REF1);
if(pH)
pH->SetPos(rPt);
@@ -1217,9 +1217,9 @@ void SdrMarkView::SetRef1(const Point& rPt)
void SdrMarkView::SetRef2(const Point& rPt)
{
- if(eDragMode == SDRDRAG_MIRROR)
+ if(meDragMode == SDRDRAG_MIRROR)
{
- aRef2 = rPt;
+ maRef2 = rPt;
SdrHdl* pH = maHdlList.GetHdl(HDL_REF2);
if(pH)
pH->SetPos(rPt);
@@ -1273,7 +1273,7 @@ void SdrMarkView::CheckMarked()
// at least reset the remembered BoundRect to prevent handle
// generation if bForceFrameHandles is TRUE.
- bMarkedObjRectDirty = true;
+ mbMarkedObjRectDirty = true;
}
void SdrMarkView::SetMarkRects()
@@ -1289,9 +1289,9 @@ void SdrMarkView::SetMarkRects()
void SdrMarkView::SetFrameHandles(bool bOn)
{
- if (bOn!=bForceFrameHandles) {
+ if (bOn!=mbForceFrameHandles) {
bool bOld=ImpIsFrameHandles();
- bForceFrameHandles=bOn;
+ mbForceFrameHandles=bOn;
bool bNew=ImpIsFrameHandles();
if (bNew!=bOld) {
AdjustMarkHdl();
@@ -1302,12 +1302,12 @@ void SdrMarkView::SetFrameHandles(bool bOn)
void SdrMarkView::SetEditMode(SdrViewEditMode eMode)
{
- if (eMode!=eEditMode) {
- bool bGlue0=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
+ if (eMode!=meEditMode) {
+ bool bGlue0=meEditMode==SDREDITMODE_GLUEPOINTEDIT;
bool bEdge0=static_cast<SdrCreateView*>(this)->IsEdgeTool();
- eEditMode0=eEditMode;
- eEditMode=eMode;
- bool bGlue1=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
+ meEditMode0=meEditMode;
+ meEditMode=eMode;
+ bool bGlue1=meEditMode==SDREDITMODE_GLUEPOINTEDIT;
bool bEdge1=static_cast<SdrCreateView*>(this)->IsEdgeTool();
// avoid flickering when switching between GlueEdit and EdgeTool
if (bGlue1 && !bGlue0) ImpSetGlueVisible2(bGlue1);
@@ -1324,7 +1324,7 @@ bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
if (pObj)
{
if (pObj->IsMarkProtect() ||
- (!bDesignMode && pObj->IsUnoObj()))
+ (!mbDesignMode && pObj->IsUnoObj()))
{
// object not selectable or
// SdrUnoObj not in DesignMode
@@ -1926,8 +1926,8 @@ void SdrMarkView::UnmarkAllObj(SdrPageView* pPV)
{
GetMarkedObjectListWriteAccess().Clear();
}
- pMarkedObj=NULL;
- pMarkedPV=NULL;
+ mpMarkedObj=NULL;
+ mpMarkedPV=NULL;
MarkListHasChanged();
AdjustMarkHdl();
}
@@ -1990,14 +1990,14 @@ Point SdrMarkView::GetGridOffset() const
// ( synced to grid ) and compare to the same unsynced area to calculate
// the offset. Hopefully that's the sensible thing to do
const Rectangle& aGroupSyncedRect = GetMarkedObjRect();
- aOffset = aGroupSyncedRect.TopLeft() - aMarkedObjRectNoOffset.TopLeft();
+ aOffset = aGroupSyncedRect.TopLeft() - maMarkedObjRectNoOffset.TopLeft();
return aOffset;
}
const Rectangle& SdrMarkView::GetMarkedObjRect() const
{
- if (bMarkedObjRectDirty) {
- const_cast<SdrMarkView*>(this)->bMarkedObjRectDirty=false;
+ if (mbMarkedObjRectDirty) {
+ const_cast<SdrMarkView*>(this)->mbMarkedObjRectDirty=false;
Rectangle aRect;
Rectangle aRect2;
for (size_t nm=0; nm<GetMarkedObjectCount(); ++nm) {
@@ -2013,10 +2013,10 @@ const Rectangle& SdrMarkView::GetMarkedObjRect() const
if (aRect.IsEmpty()) aRect=aR1;
else aRect.Union(aR1);
}
- const_cast<SdrMarkView*>(this)->aMarkedObjRect=aRect;
- const_cast<SdrMarkView*>(this)->aMarkedObjRectNoOffset=aRect2;
+ const_cast<SdrMarkView*>(this)->maMarkedObjRect=aRect;
+ const_cast<SdrMarkView*>(this)->maMarkedObjRectNoOffset=aRect2;
}
- return aMarkedObjRect;
+ return maMarkedObjRect;
}
@@ -2083,8 +2083,8 @@ void SdrMarkView::MarkListHasChanged()
GetMarkedObjectListWriteAccess().SetNameDirty();
SetEdgesOfMarkedNodesDirty();
- bMarkedObjRectDirty=true;
- bMarkedPointsRectsDirty=true;
+ mbMarkedObjRectDirty=true;
+ mbMarkedPointsRectsDirty=true;
#ifdef DBG_UTIL
if (pItemBrowser!=nullptr) pItemBrowser->SetDirty();
#endif
@@ -2108,9 +2108,9 @@ void SdrMarkView::SetMoveOutside(bool bOn)
void SdrMarkView::SetDesignMode( bool _bOn )
{
- if ( bDesignMode != _bOn )
+ if ( mbDesignMode != _bOn )
{
- bDesignMode = _bOn;
+ mbDesignMode = _bOn;
SdrPageView* pPageView = GetSdrPageView();
if ( pPageView )
pPageView->SetDesignMode( _bOn );
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 7935072..87f1630 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -36,7 +36,7 @@ bool SdrMarkView::HasMarkablePoints() const
bool bRet=false;
if (!ImpIsFrameHandles()) {
const size_t nMarkCount=GetMarkedObjectCount();
- if (nMarkCount<=static_cast<size_t>(nFrameHandlesLimit)) {
+ if (nMarkCount<=static_cast<size_t>(mnFrameHandlesLimit)) {
for (size_t nMarkNum=0; nMarkNum<nMarkCount && !bRet; ++nMarkNum) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -53,7 +53,7 @@ sal_uIntPtr SdrMarkView::GetMarkablePointCount() const
sal_uIntPtr nCount=0;
if (!ImpIsFrameHandles()) {
const size_t nMarkCount=GetMarkedObjectCount();
- if (nMarkCount<=static_cast<size_t>(nFrameHandlesLimit)) {
+ if (nMarkCount<=static_cast<size_t>(mnFrameHandlesLimit)) {
for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -72,7 +72,7 @@ bool SdrMarkView::HasMarkedPoints() const
bool bRet=false;
if (!ImpIsFrameHandles()) {
const size_t nMarkCount=GetMarkedObjectCount();
- if (nMarkCount<=static_cast<size_t>(nFrameHandlesLimit)) {
+ if (nMarkCount<=static_cast<size_t>(mnFrameHandlesLimit)) {
for (size_t nMarkNum=0; nMarkNum<nMarkCount && !bRet; ++nMarkNum) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrUShortCont* pPts=pM->GetMarkedPoints();
@@ -89,7 +89,7 @@ sal_uIntPtr SdrMarkView::GetMarkedPointCount() const
sal_uIntPtr nCount=0;
if (!ImpIsFrameHandles()) {
size_t nMarkCount=GetMarkedObjectCount();
- if (nMarkCount<=static_cast<size_t>(nFrameHandlesLimit)) {
+ if (nMarkCount<=static_cast<size_t>(mnFrameHandlesLimit)) {
for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrUShortCont* pPts=pM->GetMarkedPoints();
@@ -149,7 +149,7 @@ bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark)
}
pHdl->SetSelected(!bUnmark);
- if (!bPlusHdlAlways)
+ if (!mbPlusHdlAlways)
{
if (!bUnmark)
{
@@ -262,15 +262,15 @@ bool SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, bool /*bPrev*/)
const Rectangle& SdrMarkView::GetMarkedPointsRect() const
{
ForceUndirtyMrkPnt();
- if (bMarkedPointsRectsDirty) ImpSetPointsRects();
- return aMarkedPointsRect;
+ if (mbMarkedPointsRectsDirty) ImpSetPointsRects();
+ return maMarkedPointsRect;
}
void SdrMarkView::SetPlusHandlesAlwaysVisible(bool bOn)
{ // TODO: Optimize HandlePaint!
ForceUndirtyMrkPnt();
- if (bOn!=bPlusHdlAlways) {
- bPlusHdlAlways=bOn;
+ if (bOn!=mbPlusHdlAlways) {
+ mbPlusHdlAlways=bOn;
SetMarkHandles();
MarkListHasChanged();
}
@@ -301,9 +301,9 @@ void SdrMarkView::ImpSetPointsRects() const
}
}
}
- const_cast<SdrMarkView*>(this)->aMarkedPointsRect=aPnts;
- const_cast<SdrMarkView*>(this)->aMarkedGluePointsRect=aGlue;
- const_cast<SdrMarkView*>(this)->bMarkedPointsRectsDirty=false;
+ const_cast<SdrMarkView*>(this)->maMarkedPointsRect=aPnts;
+ const_cast<SdrMarkView*>(this)->maMarkedGluePointsRect=aGlue;
+ const_cast<SdrMarkView*>(this)->mbMarkedPointsRectsDirty=false;
}
@@ -369,8 +369,8 @@ void SdrMarkView::UndirtyMrkPnt() const
}
}
}
- if (bChg) const_cast<SdrMarkView*>(this)->bMarkedPointsRectsDirty=true;
- const_cast<SdrMarkView*>(this)->bMrkPntDirty=false;
+ if (bChg) const_cast<SdrMarkView*>(this)->mbMarkedPointsRectsDirty=true;
+ const_cast<SdrMarkView*>(this)->mbMrkPntDirty=false;
}
@@ -584,8 +584,8 @@ bool SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, bool /*bPrev*/)
const Rectangle& SdrMarkView::GetMarkedGluePointsRect() const
{
ForceUndirtyMrkPnt();
- if (bMarkedPointsRectsDirty) ImpSetPointsRects();
- return aMarkedGluePointsRect;
+ if (mbMarkedPointsRectsDirty) ImpSetPointsRects();
+ return maMarkedGluePointsRect;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index bf80995..33d22cf 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1067,11 +1067,11 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
bool bCorner=pHdl!=NULL && pHdl->IsCornerHdl();
bool bVertex=pHdl!=NULL && pHdl->IsVertexHdl();
bool bMov=eHdl==HDL_MOVE;
- if (bMov && (eDragMode==SDRDRAG_MOVE || eDragMode==SDRDRAG_RESIZE || mbMarkedHitMovesAlways)) {
+ if (bMov && (meDragMode==SDRDRAG_MOVE || meDragMode==SDRDRAG_RESIZE || mbMarkedHitMovesAlways)) {
if (!IsMoveAllowed()) return Pointer(PointerStyle::Arrow); // because double click or drag & drop is possible
return Pointer(PointerStyle::Move);
}
- switch (eDragMode) {
+ switch (meDragMode) {
case SDRDRAG_ROTATE: {
if ((bCorner || bMov) && !IsRotateAllowed(true))
return Pointer(PointerStyle::NotAllowed);
@@ -1163,7 +1163,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
return Pointer(PointerStyle::Move);
}
}
- if (eEditMode==SDREDITMODE_CREATE) return aAktCreatePointer;
+ if (meEditMode==SDREDITMODE_CREATE) return aAktCreatePointer;
return Pointer(PointerStyle::Arrow);
}
@@ -1187,7 +1187,7 @@ OUString SdrView::GetStatusText()
}
else if (mpCurrentSdrDragMethod)
{
- if (bInsPolyPoint || IsInsertGluePoint())
+ if (mbInsPolyPoint || IsInsertGluePoint())
{
aStr=maInsPointUndoStr;
}
More information about the Libreoffice-commits
mailing list