[Libreoffice-commits] core.git: 13 commits - basctl/source chart2/source include/svx reportdesign/source sc/source sd/source svx/source sw/inc sw/source
Noel Grandin
noel at peralex.com
Fri Aug 19 06:19:26 UTC 2016
basctl/source/dlged/dlgedfunc.cxx | 2
chart2/source/controller/main/ChartController.cxx | 2
chart2/source/controller/main/ChartController_Window.cxx | 18 -
include/svx/svdedtv.hxx | 2
include/svx/svdmodel.hxx | 2
include/svx/svdmrkv.hxx | 2
include/svx/svdobj.hxx | 30 +-
include/svx/svdotable.hxx | 12
include/svx/svdpage.hxx | 12
include/svx/svdpntv.hxx | 21 -
include/svx/svdsnpv.hxx | 12
include/svx/svdtypes.hxx | 100 ++++----
include/svx/svdundo.hxx | 8
include/svx/svdview.hxx | 64 ++---
reportdesign/source/ui/report/ReportSection.cxx | 2
reportdesign/source/ui/report/dlgedfunc.cxx | 2
sc/source/ui/drawfunc/drawsh2.cxx | 4
sc/source/ui/drawfunc/drawsh5.cxx | 20 -
sc/source/ui/drawfunc/fuconarc.cxx | 2
sc/source/ui/drawfunc/fuconcustomshape.cxx | 2
sc/source/ui/drawfunc/fuconpol.cxx | 6
sc/source/ui/drawfunc/fuconrec.cxx | 2
sc/source/ui/drawfunc/fuconuno.cxx | 2
sc/source/ui/drawfunc/fudraw.cxx | 2
sc/source/ui/drawfunc/fusel.cxx | 2
sc/source/ui/drawfunc/futext.cxx | 6
sc/source/ui/drawfunc/graphsh.cxx | 2
sc/source/ui/view/gridwin5.cxx | 2
sc/source/ui/view/tabview5.cxx | 2
sd/source/core/sdpage.cxx | 8
sd/source/ui/animations/motionpathtag.cxx | 2
sd/source/ui/func/fucon3d.cxx | 2
sd/source/ui/func/fuconarc.cxx | 2
sd/source/ui/func/fuconbez.cxx | 8
sd/source/ui/func/fuconcs.cxx | 2
sd/source/ui/func/fuconrec.cxx | 2
sd/source/ui/func/fuconstr.cxx | 6
sd/source/ui/func/fuconuno.cxx | 2
sd/source/ui/func/fudraw.cxx | 2
sd/source/ui/func/fupoor.cxx | 2
sd/source/ui/func/fusel.cxx | 40 +--
sd/source/ui/func/futext.cxx | 10
sd/source/ui/view/ToolBarManager.cxx | 10
sd/source/ui/view/drviewsa.cxx | 2
sd/source/ui/view/sdview.cxx | 2
sd/source/ui/view/sdview2.cxx | 4
svx/source/accessibility/AccessibleTextEventQueue.cxx | 4
svx/source/accessibility/AccessibleTextEventQueue.hxx | 4
svx/source/accessibility/AccessibleTextHelper.cxx | 15 -
svx/source/dialog/graphctl.cxx | 8
svx/source/engine3d/obj3d.cxx | 4
svx/source/engine3d/scene3d.cxx | 2
svx/source/engine3d/view3d.cxx | 16 -
svx/source/form/fmobj.cxx | 2
svx/source/form/fmpage.cxx | 2
svx/source/sdr/properties/attributeproperties.cxx | 2
svx/source/sdr/properties/properties.cxx | 2
svx/source/svdraw/svdcrtv.cxx | 6
svx/source/svdraw/svddrgmt.cxx | 20 -
svx/source/svdraw/svddrgv.cxx | 28 +-
svx/source/svdraw/svdedtv.cxx | 8
svx/source/svdraw/svdedtv1.cxx | 36 +-
svx/source/svdraw/svdedtv2.cxx | 40 +--
svx/source/svdraw/svdfmtf.cxx | 2
svx/source/svdraw/svdglev.cxx | 8
svx/source/svdraw/svdmrkv.cxx | 42 +--
svx/source/svdraw/svdoashp.cxx | 10
svx/source/svdraw/svdoattr.cxx | 2
svx/source/svdraw/svdobj.cxx | 84 +++---
svx/source/svdraw/svdocapt.cxx | 4
svx/source/svdraw/svdocirc.cxx | 2
svx/source/svdraw/svdoedge.cxx | 6
svx/source/svdraw/svdogrp.cxx | 16 -
svx/source/svdraw/svdomeas.cxx | 4
svx/source/svdraw/svdopath.cxx | 22 -
svx/source/svdraw/svdotext.cxx | 6
svx/source/svdraw/svdotxat.cxx | 2
svx/source/svdraw/svdotxdr.cxx | 2
svx/source/svdraw/svdovirt.cxx | 16 -
svx/source/svdraw/svdpage.cxx | 12
svx/source/svdraw/svdpntv.cxx | 9
svx/source/svdraw/svdpoev.cxx | 10
svx/source/svdraw/svdsnpv.cxx | 2
svx/source/svdraw/svdundo.cxx | 88 +++----
svx/source/svdraw/svdview.cxx | 186 +++++++--------
svx/source/svdraw/svdxcgv.cxx | 6
svx/source/table/svdotable.cxx | 22 -
svx/source/table/tablecontroller.cxx | 14 -
svx/source/unodraw/unopage.cxx | 2
svx/source/unodraw/unoshape.cxx | 6
svx/source/unodraw/unoshtxt.cxx | 11
sw/inc/fesh.hxx | 6
sw/source/core/doc/docdraw.cxx | 4
sw/source/core/draw/dcontact.cxx | 66 ++---
sw/source/core/draw/dflyobj.cxx | 4
sw/source/core/draw/dview.cxx | 2
sw/source/core/frmedt/feshview.cxx | 19 -
sw/source/core/undo/undraw.cxx | 14 -
sw/source/uibase/docvw/edtwin.cxx | 8
sw/source/uibase/ribbar/conarc.cxx | 2
sw/source/uibase/ribbar/conform.cxx | 2
sw/source/uibase/ribbar/conpoly.cxx | 2
sw/source/uibase/ribbar/drawbase.cxx | 4
sw/source/uibase/shells/drawsh.cxx | 6
sw/source/uibase/shells/drwbassh.cxx | 2
sw/source/uibase/shells/grfsh.cxx | 2
sw/source/uibase/shells/textdrw.cxx | 2
sw/source/uibase/uiview/viewdraw.cxx | 2
sw/source/uibase/wrtsh/wrtsh1.cxx | 2
109 files changed, 695 insertions(+), 700 deletions(-)
New commits:
commit 178153e8220aa3bf29078f6df4ed6acd0b2f61e4
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 18 14:32:13 2016 +0200
convert SdrUserCallType to scoped enum
Change-Id: I0121b17242faee4238d82836453cec695f508db0
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index b17dc91..7ac2c7a 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -141,20 +141,22 @@ enum SdrObjKind {
OBJ_MAXI
};
-enum SdrUserCallType {SDRUSERCALL_MOVEONLY, // only moved, size unchanged
- SDRUSERCALL_RESIZE, // size and maybe position changed
- SDRUSERCALL_CHGATTR, // attribute changed. Eventually new size, because of line width
- SDRUSERCALL_DELETE, // object is going to be deleted soon, no attributes anymore
- SDRUSERCALL_COPY, // assign operator called, everything can be changed
- SDRUSERCALL_INSERTED, // inserted into an object list (e.g. Page)
- SDRUSERCALL_REMOVED, // removed from an object list
- SDRUSERCALL_CHILD_MOVEONLY, // a child within a group has changed
- SDRUSERCALL_CHILD_RESIZE, // a child within a group has changed
- SDRUSERCALL_CHILD_CHGATTR, // a child within a group has changed
- SDRUSERCALL_CHILD_DELETE, // a child within a group has changed
- SDRUSERCALL_CHILD_COPY, // a child within a group has changed
- SDRUSERCALL_CHILD_INSERTED, // a child within a group has changed
- SDRUSERCALL_CHILD_REMOVED}; // a child within a group has changed
+enum class SdrUserCallType {
+ MoveOnly, // only moved, size unchanged
+ Resize, // size and maybe position changed
+ ChangeAttr, // attribute changed. Eventually new size, because of line width
+ Delete, // object is going to be deleted soon, no attributes anymore
+ Copy, // assign operator called, everything can be changed
+ Inserted, // inserted into an object list (e.g. Page)
+ Removed, // removed from an object list
+ ChildMoveOnly, // a child within a group has changed
+ ChildResize, // a child within a group has changed
+ ChildChangeAttr, // a child within a group has changed
+ ChildDelete, // a child within a group has changed
+ ChildCopy, // a child within a group has changed
+ ChildInserted, // a child within a group has changed
+ ChildRemoved // a child within a group has changed
+};
class SVX_DLLPUBLIC SdrObjUserCall
{
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 34391d6..34dd2ef 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -691,8 +691,8 @@ void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectang
{
switch (eType)
{
- case SDRUSERCALL_MOVEONLY:
- case SDRUSERCALL_RESIZE:
+ case SdrUserCallType::MoveOnly:
+ case SdrUserCallType::Resize:
{
if (!pModel || pModel->isLocked())
break;
@@ -737,8 +737,8 @@ void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectang
}
break;
- case SDRUSERCALL_DELETE:
- case SDRUSERCALL_REMOVED:
+ case SdrUserCallType::Delete:
+ case SdrUserCallType::Removed:
default:
break;
}
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index b4e7a8c..135fcf8 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -40,12 +40,12 @@ void GraphCtrlUserCall::Changed( const SdrObject& rObj, SdrUserCallType eType, c
{
switch( eType )
{
- case SDRUSERCALL_MOVEONLY:
- case SDRUSERCALL_RESIZE:
+ case SdrUserCallType::MoveOnly:
+ case SdrUserCallType::Resize:
rWin.SdrObjChanged( rObj );
break;
- case SDRUSERCALL_INSERTED:
+ case SdrUserCallType::Inserted:
rWin.SdrObjCreated( rObj );
break;
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 390afa2..fe4fb5c 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -652,7 +652,7 @@ void E3dObject::SetTransform(const basegfx::B3DHomMatrix& rMatrix)
NbcSetTransform(rMatrix);
SetChanged();
BroadcastObjectChange();
- if (pUserCall != nullptr) pUserCall->Changed(*this, SDRUSERCALL_RESIZE, Rectangle());
+ if (pUserCall != nullptr) pUserCall->Changed(*this, SdrUserCallType::Resize, Rectangle());
}
}
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 8e52663..9507d4e0 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -591,7 +591,7 @@ namespace sdr
// rObj.BroadcastObjectChange();
//}
- rObj.SendUserCall(SDRUSERCALL_CHGATTR, aBoundRect);
+ rObj.SendUserCall(SdrUserCallType::ChangeAttr, aBoundRect);
bHintUsed = true;
}
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index 5c2029f..a78aea4 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -162,7 +162,7 @@ namespace sdr
// also send the user calls
for(sal_uInt32 a(0L); a < nCount; a++)
{
- GetSdrObject().SendUserCall(SDRUSERCALL_CHGATTR, rChange.GetRectangle(a));
+ GetSdrObject().SendUserCall(SdrUserCallType::ChangeAttr, rChange.GetRectangle(a));
}
}
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 4361a47..776925d 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1409,7 +1409,7 @@ bool SdrDragObjOwn::EndSdrDrag(bool /*bCopy*/)
{
pObj->SetChanged();
pObj->BroadcastObjectChange();
- pObj->SendUserCall( SDRUSERCALL_RESIZE, aBoundRect0 );
+ pObj->SendUserCall( SdrUserCallType::Resize, aBoundRect0 );
}
if(bRet)
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 176be90..68074a8 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -1144,7 +1144,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll)
pTextObj->SetChanged();
pTextObj->BroadcastObjectChange();
- pTextObj->SendUserCall(SDRUSERCALL_CHGATTR, aOldBoundRect);
+ pTextObj->SendUserCall(SdrUserCallType::ChangeAttr, aOldBoundRect);
}
}
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 6e08225..603bc14 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1487,7 +1487,7 @@ void SdrObjCustomShape::SetSnapRect( const Rectangle& rRect )
aBoundRect0 = GetLastBoundRect();
NbcSetSnapRect( rRect );
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
void SdrObjCustomShape::NbcSetLogicRect( const Rectangle& rRect )
@@ -1509,7 +1509,7 @@ void SdrObjCustomShape::SetLogicRect( const Rectangle& rRect )
aBoundRect0 = GetLastBoundRect();
NbcSetLogicRect(rRect);
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
void SdrObjCustomShape::Move( const Size& rSiz )
@@ -1522,7 +1522,7 @@ void SdrObjCustomShape::Move( const Size& rSiz )
NbcMove(rSiz);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_MOVEONLY,aBoundRect0);
+ SendUserCall(SdrUserCallType::MoveOnly,aBoundRect0);
}
}
void SdrObjCustomShape::NbcMove( const Size& rSiz )
@@ -2533,7 +2533,7 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight()
InvalidateRenderGeometry();
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
return bRet;
}
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index ffcb005..2caab92 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -133,7 +133,7 @@ void SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
// This may have led to object change
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_CHGATTR, aBoundRect);
+ SendUserCall(SdrUserCallType::ChangeAttr, aBoundRect);
}
}
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 3af193c..ba81a6d 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -361,7 +361,7 @@ SdrObject::~SdrObject()
DBG_UNHANDLED_EXCEPTION();
}
- SendUserCall(SDRUSERCALL_DELETE, GetLastBoundRect());
+ SendUserCall(SdrUserCallType::Delete, GetLastBoundRect());
delete pPlusData;
delete pGrabBagItem;
@@ -1483,7 +1483,7 @@ void SdrObject::Move(const Size& rSiz)
NbcMove(rSiz);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_MOVEONLY,aBoundRect0);
+ SendUserCall(SdrUserCallType::MoveOnly,aBoundRect0);
}
}
@@ -1505,7 +1505,7 @@ void SdrObject::Resize(const Point& rRef, const Fraction& xFact, const Fraction&
NbcResize(rRef,xFact,yFact);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
@@ -1515,7 +1515,7 @@ void SdrObject::Crop(const Point& rRef, const Fraction& xFact, const Fraction& y
NbcCrop(rRef, xFact, yFact);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
void SdrObject::Rotate(const Point& rRef, long nAngle, double sn, double cs)
@@ -1525,7 +1525,7 @@ void SdrObject::Rotate(const Point& rRef, long nAngle, double sn, double cs)
NbcRotate(rRef,nAngle,sn,cs);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
@@ -1535,7 +1535,7 @@ void SdrObject::Mirror(const Point& rRef1, const Point& rRef2)
NbcMirror(rRef1,rRef2);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
void SdrObject::Shear(const Point& rRef, long nAngle, double tn, bool bVShear)
@@ -1545,7 +1545,7 @@ void SdrObject::Shear(const Point& rRef, long nAngle, double tn, bool bVShear)
NbcShear(rRef,nAngle,tn,bVShear);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
@@ -1563,7 +1563,7 @@ void SdrObject::SetRelativePos(const Point& rPnt)
NbcSetRelativePos(rPnt);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_MOVEONLY,aBoundRect0);
+ SendUserCall(SdrUserCallType::MoveOnly,aBoundRect0);
}
}
@@ -1591,7 +1591,7 @@ void SdrObject::SetAnchorPos(const Point& rPnt)
NbcSetAnchorPos(rPnt);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_MOVEONLY,aBoundRect0);
+ SendUserCall(SdrUserCallType::MoveOnly,aBoundRect0);
}
}
@@ -1635,7 +1635,7 @@ void SdrObject::SetSnapRect(const Rectangle& rRect)
NbcSetSnapRect(rRect);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
void SdrObject::SetLogicRect(const Rectangle& rRect)
@@ -1644,7 +1644,7 @@ void SdrObject::SetLogicRect(const Rectangle& rRect)
NbcSetLogicRect(rRect);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
long SdrObject::GetRotateAngle() const
@@ -1688,7 +1688,7 @@ void SdrObject::SetPoint(const Point& rPnt, sal_uInt32 i)
NbcSetPoint(rPnt, i);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
void SdrObject::NbcSetPoint(const Point& /*rPnt*/, sal_uInt32 /*i*/)
@@ -1766,7 +1766,7 @@ void SdrObject::SetOutlinerParaObject(OutlinerParaObject* pTextObject)
SetChanged();
BroadcastObjectChange();
if (GetCurrentBoundRect()!=aBoundRect0) {
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
@@ -1790,7 +1790,7 @@ void SdrObject::ReformatText()
SetChanged();
BroadcastObjectChange();
if (GetCurrentBoundRect()!=aBoundRect0) {
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
@@ -1925,7 +1925,7 @@ void SdrObject::SetGeoData(const SdrObjGeoData& rGeo)
RestGeoData(rGeo);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
@@ -1992,7 +1992,7 @@ void SdrObject::ApplyNotPersistAttr(const SfxItemSet& rAttr)
NbcApplyNotPersistAttr(rAttr);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
@@ -2217,7 +2217,7 @@ void SdrObject::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHar
NbcSetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_CHGATTR, aBoundRect0);
+ SendUserCall(SdrUserCallType::ChangeAttr, aBoundRect0);
}
void SdrObject::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
@@ -2624,8 +2624,8 @@ void SdrObject::SetInserted(bool bIns)
if (bIns!=IsInserted()) {
bInserted=bIns;
Rectangle aBoundRect0(GetLastBoundRect());
- if (bIns) SendUserCall(SDRUSERCALL_INSERTED,aBoundRect0);
- else SendUserCall(SDRUSERCALL_REMOVED,aBoundRect0);
+ if (bIns) SendUserCall(SdrUserCallType::Inserted,aBoundRect0);
+ else SendUserCall(SdrUserCallType::Removed,aBoundRect0);
if (pPlusData!=nullptr && pPlusData->pBroadcast!=nullptr) {
SdrHint aHint(*this);
@@ -2750,36 +2750,36 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundR
// broadcast to group
if( pGroup->GetUserCall() )
{
- SdrUserCallType eChildUserType = SDRUSERCALL_CHILD_CHGATTR;
+ SdrUserCallType eChildUserType = SdrUserCallType::ChildChangeAttr;
switch( eUserCall )
{
- case SDRUSERCALL_MOVEONLY:
- eChildUserType = SDRUSERCALL_CHILD_MOVEONLY;
+ case SdrUserCallType::MoveOnly:
+ eChildUserType = SdrUserCallType::ChildMoveOnly;
break;
- case SDRUSERCALL_RESIZE:
- eChildUserType = SDRUSERCALL_CHILD_RESIZE;
+ case SdrUserCallType::Resize:
+ eChildUserType = SdrUserCallType::ChildResize;
break;
- case SDRUSERCALL_CHGATTR:
- eChildUserType = SDRUSERCALL_CHILD_CHGATTR;
+ case SdrUserCallType::ChangeAttr:
+ eChildUserType = SdrUserCallType::ChildChangeAttr;
break;
- case SDRUSERCALL_DELETE:
- eChildUserType = SDRUSERCALL_CHILD_DELETE;
+ case SdrUserCallType::Delete:
+ eChildUserType = SdrUserCallType::ChildDelete;
break;
- case SDRUSERCALL_COPY:
- eChildUserType = SDRUSERCALL_CHILD_COPY;
+ case SdrUserCallType::Copy:
+ eChildUserType = SdrUserCallType::ChildCopy;
break;
- case SDRUSERCALL_INSERTED:
- eChildUserType = SDRUSERCALL_CHILD_INSERTED;
+ case SdrUserCallType::Inserted:
+ eChildUserType = SdrUserCallType::ChildInserted;
break;
- case SDRUSERCALL_REMOVED:
- eChildUserType = SDRUSERCALL_CHILD_REMOVED;
+ case SdrUserCallType::Removed:
+ eChildUserType = SdrUserCallType::ChildRemoved;
break;
default: break;
@@ -2799,10 +2799,10 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundR
// notify our UNO shape listeners
switch ( eUserCall )
{
- case SDRUSERCALL_RESIZE:
+ case SdrUserCallType::Resize:
notifyShapePropertyChange( svx::eShapeSize );
SAL_FALLTHROUGH; // RESIZE might also imply a change of the position
- case SDRUSERCALL_MOVEONLY:
+ case SdrUserCallType::MoveOnly:
notifyShapePropertyChange( svx::eShapePosition );
break;
default:
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 7b71798..effea5d 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -667,7 +667,7 @@ void SdrCaptionObj::SetTailPos(const Point& rPos)
NbcSetTailPos(rPos);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 792138a..1a8f1a2 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -581,7 +581,7 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
// Only redraw here, no object change
ActionChanged();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
mbBoundRectCalculationRunning = false;
}
@@ -1595,7 +1595,7 @@ void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
// only redraw here, object hasn't actually changed
ActionChanged();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
nNotifyingCount--;
}
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 62b8d6c..9eff848 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -525,7 +525,7 @@ void SdrObjGroup::SetSnapRect(const Rectangle& rRect)
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
@@ -559,7 +559,7 @@ void SdrObjGroup::Move(const Size& rSiz)
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_MOVEONLY,aBoundRect0);
+ SendUserCall(SdrUserCallType::MoveOnly,aBoundRect0);
}
}
@@ -603,7 +603,7 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
@@ -629,7 +629,7 @@ void SdrObjGroup::Rotate(const Point& rRef, long nAngle, double sn, double cs)
SetGlueReallyAbsolute(false);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
@@ -654,7 +654,7 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
SetGlueReallyAbsolute(false);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
@@ -679,7 +679,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nAngle, double tn, bool bVShear)
SetGlueReallyAbsolute(false);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
@@ -705,7 +705,7 @@ void SdrObjGroup::SetAnchorPos(const Point& rPnt)
if (bChg) {
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_MOVEONLY,aBoundRect0);
+ SendUserCall(SdrUserCallType::MoveOnly,aBoundRect0);
}
}
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index a78dbdf..1f8880c 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -1478,7 +1478,7 @@ void SdrMeasureObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, cons
ActionChanged();
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_MOVEONLY,aBoundRect0);
+ SendUserCall(SdrUserCallType::MoveOnly,aBoundRect0);
}
}
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 4c3ba94..7379ecd 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -2805,7 +2805,7 @@ void SdrPathObj::SetPathPoly(const basegfx::B2DPolyPolygon& rPathPoly)
NbcSetPathPoly(rPathPoly);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
@@ -2819,7 +2819,7 @@ void SdrPathObj::ToggleClosed()
SetRectsDirty();
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE, aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize, aBoundRect0);
}
// for friend class SdrPolyEditView in some compilers:
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 42e3d63..952a732 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -233,7 +233,7 @@ void SdrTextObj::SetText(const OUString& rStr)
NbcSetText(rStr);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
void SdrTextObj::NbcSetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat)
@@ -256,7 +256,7 @@ void SdrTextObj::SetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt16
NbcSetText(rInput,rBaseURL,eFormat);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
const Size& SdrTextObj::GetTextSize() const
@@ -1453,7 +1453,7 @@ void SdrTextObj::ReformatText()
NbcReformatText();
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index f78499f..653e843 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -290,7 +290,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight()
}
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
return bRet;
}
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index d8d5949..6b65fcf 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -372,7 +372,7 @@ void SdrVirtObj::Move(const Size& rSiz)
NbcMove(rSiz);
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_MOVEONLY,aBoundRect0);
+ SendUserCall(SdrUserCallType::MoveOnly,aBoundRect0);
}
}
@@ -382,7 +382,7 @@ void SdrVirtObj::Resize(const Point& rRef, const Fraction& xFact, const Fraction
Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
rRefObj.Resize(rRef-aAnchor,xFact,yFact, bUnsetRelative);
SetRectsDirty();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
@@ -392,7 +392,7 @@ void SdrVirtObj::Rotate(const Point& rRef, long nAngle, double sn, double cs)
Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
rRefObj.Rotate(rRef-aAnchor,nAngle,sn,cs);
SetRectsDirty();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
@@ -401,7 +401,7 @@ void SdrVirtObj::Mirror(const Point& rRef1, const Point& rRef2)
Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
rRefObj.Mirror(rRef1-aAnchor,rRef2-aAnchor);
SetRectsDirty();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
void SdrVirtObj::Shear(const Point& rRef, long nAngle, double tn, bool bVShear)
@@ -410,7 +410,7 @@ void SdrVirtObj::Shear(const Point& rRef, long nAngle, double tn, bool bVShear)
Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
rRefObj.Shear(rRef-aAnchor,nAngle,tn,bVShear);
SetRectsDirty();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
@@ -436,7 +436,7 @@ void SdrVirtObj::SetSnapRect(const Rectangle& rRect)
aR-=aAnchor;
rRefObj.SetSnapRect(aR);
SetRectsDirty();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
@@ -463,7 +463,7 @@ void SdrVirtObj::SetLogicRect(const Rectangle& rRect)
aR-=aAnchor;
rRefObj.SetLogicRect(aR);
SetRectsDirty();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
void SdrVirtObj::NbcSetLogicRect(const Rectangle& rRect)
@@ -549,7 +549,7 @@ void SdrVirtObj::SetGeoData(const SdrObjGeoData& rGeo)
Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
rRefObj.SetGeoData(rGeo);
SetRectsDirty();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 028ce8c..6fe8733 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1324,7 +1324,7 @@ void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
ActionChanged();
BroadcastObjectChange();
if (aRect0 != maRect)
- SendUserCall(SDRUSERCALL_RESIZE,aRect0);
+ SendUserCall(SdrUserCallType::Resize,aRect0);
}
}
@@ -1943,7 +1943,7 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight()
SetRectsDirty();
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
return bRet;
}
@@ -1983,7 +1983,7 @@ void SdrTableObj::ReformatText()
NbcReformatText();
SetChanged();
BroadcastObjectChange();
- SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 403b46b..00ddcb8 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -237,7 +237,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
pFormat = static_cast<SwDrawFrameFormat*>(pContact->GetFormat());
// Deletes itself!
- pContact->Changed(*pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
+ pContact->Changed(*pObj, SdrUserCallType::Delete, pObj->GetLastBoundRect() );
pObj->SetUserCall( nullptr );
if( pUndo )
@@ -453,7 +453,7 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
OSL_FAIL( "<SwDrawVirtObj> is still marked for delete. application will crash!" );
}
// Deletes itself!
- pContact->Changed(*pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
+ pContact->Changed(*pObj, SdrUserCallType::Delete, pObj->GetLastBoundRect() );
pObj->SetUserCall( nullptr );
if( pUndo )
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index b9ef741..f4c58c4 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -575,7 +575,7 @@ SwDrawContact::SwDrawContact( SwFrameFormat* pToRegisterIn, SdrObject* pObj ) :
mbUserCallActive( false ),
// Note: value of <meEventTypeOfCurrentUserCall> isn't of relevance, because
// <mbUserCallActive> is false.
- meEventTypeOfCurrentUserCall( SDRUSERCALL_MOVEONLY )
+ meEventTypeOfCurrentUserCall( SdrUserCallType::MoveOnly )
{
// clear list containing 'virtual' drawing objects.
maDrawVirtObjs.clear();
@@ -1043,8 +1043,8 @@ void SwDrawContact::Changed( const SdrObject& rObj,
// #i44339#
// no event handling, if document is in destruction.
- // Exception: It's the SDRUSERCALL_DELETE event
- if ( pDoc->IsInDtor() && eType != SDRUSERCALL_DELETE )
+ // Exception: It's the SdrUserCallType::Delete event
+ if ( pDoc->IsInDtor() && eType != SdrUserCallType::Delete )
{
return;
}
@@ -1121,21 +1121,21 @@ class NestedUserCallHdl
if ( IsNestedUserCall() )
{
bool bTmpAssert( true );
- // Currently its known, that a nested event SDRUSERCALL_RESIZE
- // could occur during parent user call SDRUSERCALL_INSERTED,
- // SDRUSERCALL_DELETE and SDRUSERCALL_RESIZE for edge objects.
- // Also possible are nested SDRUSERCALL_CHILD_RESIZE events for
+ // Currently its known, that a nested event SdrUserCallType::Resize
+ // could occur during parent user call SdrUserCallType::Inserted,
+ // SdrUserCallType::Delete and SdrUserCallType::Resize for edge objects.
+ // Also possible are nested SdrUserCallType::ChildResize events for
// edge objects
// Thus, assert all other combinations
- if ( ( meParentUserCallEventType == SDRUSERCALL_INSERTED ||
- meParentUserCallEventType == SDRUSERCALL_DELETE ||
- meParentUserCallEventType == SDRUSERCALL_RESIZE ) &&
- mpDrawContact->meEventTypeOfCurrentUserCall == SDRUSERCALL_RESIZE )
+ if ( ( meParentUserCallEventType == SdrUserCallType::Inserted ||
+ meParentUserCallEventType == SdrUserCallType::Delete ||
+ meParentUserCallEventType == SdrUserCallType::Resize ) &&
+ mpDrawContact->meEventTypeOfCurrentUserCall == SdrUserCallType::Resize )
{
bTmpAssert = false;
}
- else if ( meParentUserCallEventType == SDRUSERCALL_CHILD_RESIZE &&
- mpDrawContact->meEventTypeOfCurrentUserCall == SDRUSERCALL_CHILD_RESIZE )
+ else if ( meParentUserCallEventType == SdrUserCallType::ChildResize &&
+ mpDrawContact->meEventTypeOfCurrentUserCall == SdrUserCallType::ChildResize )
{
bTmpAssert = false;
}
@@ -1185,7 +1185,7 @@ void SwDrawContact::Changed_( const SdrObject& rObj,
!bAnchoredAsChar;
switch( eType )
{
- case SDRUSERCALL_DELETE:
+ case SdrUserCallType::Delete:
{
if ( bNotify )
{
@@ -1201,7 +1201,7 @@ void SwDrawContact::Changed_( const SdrObject& rObj,
aNestedUserCallHdl.DrawContactDeleted();
break;
}
- case SDRUSERCALL_INSERTED:
+ case SdrUserCallType::Inserted:
{
if ( mbDisconnectInProgress )
{
@@ -1217,7 +1217,7 @@ void SwDrawContact::Changed_( const SdrObject& rObj,
}
break;
}
- case SDRUSERCALL_REMOVED:
+ case SdrUserCallType::Removed:
{
if ( bNotify )
{
@@ -1226,8 +1226,8 @@ void SwDrawContact::Changed_( const SdrObject& rObj,
DisconnectFromLayout( false );
break;
}
- case SDRUSERCALL_CHILD_INSERTED :
- case SDRUSERCALL_CHILD_REMOVED :
+ case SdrUserCallType::ChildInserted :
+ case SdrUserCallType::ChildRemoved :
{
// --> #i113730#
// force layer of controls for group objects containing control objects
@@ -1256,13 +1256,13 @@ void SwDrawContact::Changed_( const SdrObject& rObj,
}
SAL_FALLTHROUGH;
}
- case SDRUSERCALL_MOVEONLY:
- case SDRUSERCALL_RESIZE:
- case SDRUSERCALL_CHILD_MOVEONLY :
- case SDRUSERCALL_CHILD_RESIZE :
- case SDRUSERCALL_CHILD_CHGATTR :
- case SDRUSERCALL_CHILD_DELETE :
- case SDRUSERCALL_CHILD_COPY :
+ case SdrUserCallType::MoveOnly:
+ case SdrUserCallType::Resize:
+ case SdrUserCallType::ChildMoveOnly :
+ case SdrUserCallType::ChildResize :
+ case SdrUserCallType::ChildChangeAttr :
+ case SdrUserCallType::ChildDelete :
+ case SdrUserCallType::ChildCopy :
{
// #i31698# - improvement
// get instance <SwAnchoredDrawObject> only once
@@ -1396,7 +1396,7 @@ void SwDrawContact::Changed_( const SdrObject& rObj,
lcl_textBoxSizeNotify(GetFormat());
}
- else if (eType == SDRUSERCALL_RESIZE)
+ else if (eType == SdrUserCallType::Resize)
// Even if the bounding box of the shape didn't change,
// notify about the size change, as an adjustment change
// may affect the size of the underlying textbox.
@@ -1404,7 +1404,7 @@ void SwDrawContact::Changed_( const SdrObject& rObj,
}
}
break;
- case SDRUSERCALL_CHGATTR:
+ case SdrUserCallType::ChangeAttr:
if ( bNotify )
{
lcl_NotifyBackgroundOfObj( *this, rObj, pOldBoundRect );
@@ -2380,7 +2380,7 @@ void SwDrawVirtObj::Resize(const Point& rRef, const Fraction& xFact, const Fract
Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect();
rRefObj.Resize(rRef - GetOffset(), xFact, yFact, bUnsetRelative);
SetRectsDirty();
- SendUserCall(SDRUSERCALL_RESIZE, aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize, aBoundRect0);
}
}
@@ -2391,7 +2391,7 @@ void SwDrawVirtObj::Rotate(const Point& rRef, long nAngle, double sn, double cs)
Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect();
rRefObj.Rotate(rRef - GetOffset(), nAngle, sn, cs);
SetRectsDirty();
- SendUserCall(SDRUSERCALL_RESIZE, aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize, aBoundRect0);
}
}
@@ -2400,7 +2400,7 @@ void SwDrawVirtObj::Mirror(const Point& rRef1, const Point& rRef2)
Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect();
rRefObj.Mirror(rRef1 - GetOffset(), rRef2 - GetOffset());
SetRectsDirty();
- SendUserCall(SDRUSERCALL_RESIZE, aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize, aBoundRect0);
}
void SwDrawVirtObj::Shear(const Point& rRef, long nAngle, double tn, bool bVShear)
@@ -2410,7 +2410,7 @@ void SwDrawVirtObj::Shear(const Point& rRef, long nAngle, double tn, bool bVShea
Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect();
rRefObj.Shear(rRef - GetOffset(), nAngle, tn, bVShear);
SetRectsDirty();
- SendUserCall(SDRUSERCALL_RESIZE, aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize, aBoundRect0);
}
}
@@ -2435,7 +2435,7 @@ void SwDrawVirtObj::SetSnapRect(const Rectangle& rRect)
aR -= GetOffset();
rRefObj.SetSnapRect(aR);
SetRectsDirty();
- SendUserCall(SDRUSERCALL_RESIZE, aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize, aBoundRect0);
}
void SwDrawVirtObj::NbcSetSnapRect(const Rectangle& rRect)
@@ -2461,7 +2461,7 @@ void SwDrawVirtObj::SetLogicRect(const Rectangle& rRect)
aR -= GetOffset();
rRefObj.SetLogicRect(aR);
SetRectsDirty();
- SendUserCall(SDRUSERCALL_RESIZE, aBoundRect0);
+ SendUserCall(SdrUserCallType::Resize, aBoundRect0);
}
void SwDrawVirtObj::NbcSetLogicRect(const Rectangle& rRect)
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 8451721..2c60e71 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -539,7 +539,7 @@ void SwVirtFlyDrawObj::SetSnapRect(const Rectangle& )
SetChanged();
BroadcastObjectChange();
if (pUserCall!=nullptr)
- pUserCall->Changed(*this, SDRUSERCALL_RESIZE, aTmp);
+ pUserCall->Changed(*this, SdrUserCallType::Resize, aTmp);
}
void SwVirtFlyDrawObj::NbcSetSnapRect(const Rectangle& )
@@ -560,7 +560,7 @@ void SwVirtFlyDrawObj::SetLogicRect(const Rectangle& )
SetChanged();
BroadcastObjectChange();
if (pUserCall!=nullptr)
- pUserCall->Changed(*this, SDRUSERCALL_RESIZE, aTmp);
+ pUserCall->Changed(*this, SdrUserCallType::Resize, aTmp);
}
void SwVirtFlyDrawObj::NbcSetLogicRect(const Rectangle& )
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 9dec500..3f276cf 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1032,7 +1032,7 @@ void SwFEShell::EndTextEdit()
SdrObject *pTmp = static_cast<SwContact*>(pUserCall)->GetMaster();
if( !pTmp )
pTmp = pObj;
- pUserCall->Changed( *pTmp, SDRUSERCALL_RESIZE, pTmp->GetLastBoundRect() );
+ pUserCall->Changed( *pTmp, SdrUserCallType::Resize, pTmp->GetLastBoundRect() );
}
if ( !pObj->GetUpGroup() )
{
diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index 22a9642..718e07d 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -215,7 +215,7 @@ void SwUndoDrawGroup::UndoImpl(::sw::UndoRedoContext &)
pObjArr->pObj = pObj;
// object will destroy itself
- pDrawContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
+ pDrawContact->Changed( *pObj, SdrUserCallType::Delete, pObj->GetLastBoundRect() );
pObj->SetUserCall( nullptr );
::lcl_SaveAnchor( pFormat, pObjArr->nNodeIdx );
@@ -269,7 +269,7 @@ void SwUndoDrawGroup::RedoImpl(::sw::UndoRedoContext &)
SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall(pObj));
// object will destroy itself
- pContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
+ pContact->Changed( *pObj, SdrUserCallType::Delete, pObj->GetLastBoundRect() );
pObj->SetUserCall( nullptr );
::lcl_SaveAnchor( rSave.pFormat, rSave.nNodeIdx );
@@ -333,7 +333,7 @@ SwUndoDrawUnGroup::SwUndoDrawUnGroup( SdrObjGroup* pObj, const SwDoc* pDoc )
pObjArr->pFormat = pFormat;
// object will destroy itself
- pContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
+ pContact->Changed( *pObj, SdrUserCallType::Delete, pObj->GetLastBoundRect() );
pObj->SetUserCall( nullptr );
::lcl_SaveAnchor( pFormat, pObjArr->nNodeIdx );
@@ -407,7 +407,7 @@ void SwUndoDrawUnGroup::RedoImpl(::sw::UndoRedoContext &)
SwDrawContact* pContact = static_cast<SwDrawContact*>(pFormat->FindContactObj());
// object will destroy itself
- pContact->Changed( *pObjArr->pObj, SDRUSERCALL_DELETE,
+ pContact->Changed( *pObjArr->pObj, SdrUserCallType::Delete,
pObjArr->pObj->GetLastBoundRect() );
pObjArr->pObj->SetUserCall( nullptr );
@@ -467,7 +467,7 @@ SwUndoDrawUnGroupConnectToLayout::UndoImpl(::sw::UndoRedoContext &)
{
// deletion of instance <pDrawContact> and thus disconnection from
// the Writer layout.
- pDrawContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
+ pDrawContact->Changed( *pObj, SdrUserCallType::Delete, pObj->GetLastBoundRect() );
pObj->SetUserCall( nullptr );
}
}
@@ -523,7 +523,7 @@ void SwUndoDrawDelete::UndoImpl(::sw::UndoRedoContext & rContext)
rFlyFormats.push_back( rSave.pFormat );
SdrObject *pObj = rSave.pObj;
SwDrawContact *pContact = new SwDrawContact( rSave.pFormat, pObj );
- pContact->Changed_( *pObj, SDRUSERCALL_INSERTED, nullptr );
+ pContact->Changed_( *pObj, SdrUserCallType::Inserted, nullptr );
// #i45718# - follow-up of #i35635# move object to visible layer
pContact->MoveObjToVisibleLayer( pObj );
@@ -550,7 +550,7 @@ void SwUndoDrawDelete::RedoImpl(::sw::UndoRedoContext & rContext)
SwDrawFrameFormat *pFormat = static_cast<SwDrawFrameFormat*>(pContact->GetFormat());
// object will destroy itself
- pContact->Changed( *pObj, SDRUSERCALL_DELETE, pObj->GetLastBoundRect() );
+ pContact->Changed( *pObj, SdrUserCallType::Delete, pObj->GetLastBoundRect() );
pObj->SetUserCall( nullptr );
// notify UNO objects to decouple
commit 6078d593fa27eab2035d97e7ef69872564e30f60
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 18 14:01:31 2016 +0200
convert TableHitKind to scoped enum
Change-Id: Ie9cde732a85adadc4edead9a29b456ff15b3f750
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index c627546..1fe79ee 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -48,13 +48,13 @@ struct ImplTableShadowPaintInfo;
/// SdrTableHitKind
-enum TableHitKind
+enum class TableHitKind
{
- SDRTABLEHIT_NONE,
- SDRTABLEHIT_CELL,
- SDRTABLEHIT_CELLTEXTAREA,
- SDRTABLEHIT_HORIZONTAL_BORDER,
- SDRTABLEHIT_VERTICAL_BORDER
+ NONE,
+ Cell,
+ CellTextArea,
+ HorizontalBorder,
+ VerticallBorder
};
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 447f2f5..f5b39d9 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -363,10 +363,10 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
sal_Int32 nX = 0, nY = 0;
switch( pTableObj->CheckTableHit( aLocalLogicPosition, nX, nY ) )
{
- case sdr::table::SDRTABLEHIT_CELL:
+ case sdr::table::TableHitKind::Cell:
eHit = SDRHIT_CELL;
break;
- case sdr::table::SDRTABLEHIT_CELLTEXTAREA:
+ case sdr::table::TableHitKind::CellTextArea:
eHit = SDRHIT_TEXTEDITOBJ;
break;
default:
@@ -384,10 +384,10 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
sal_Int32 nX = 0, nY = 0;
switch( pTableObj->CheckTableHit( aLocalLogicPosition, nX, nY, mnHitTolLog ) )
{
- case sdr::table::SDRTABLEHIT_CELL:
+ case sdr::table::TableHitKind::Cell:
eHit = SDRHIT_CELL;
break;
- case sdr::table::SDRTABLEHIT_CELLTEXTAREA:
+ case sdr::table::TableHitKind::CellTextArea:
eHit = SDRHIT_TEXTEDITOBJ;
break;
default:
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 768506c..028ce8c 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1054,7 +1054,7 @@ void SdrTableObj::setTableStyleSettings( const TableStyleSettings& rStyle )
TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_Int32& rnY, const sal_uInt16 aTol ) const
{
if( !mpImpl.is() || !mpImpl->mxTable.is() )
- return SDRTABLEHIT_NONE;
+ return TableHitKind::NONE;
rnX = 0;
rnY = 0;
@@ -1066,7 +1066,7 @@ TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_
sal_Int32 nY = rPos.Y() - maRect.Top();
if( (nX < 0) || (nX > maRect.GetWidth()) || (nY < 0) || (nY > maRect.GetHeight() ) )
- return SDRTABLEHIT_NONE;
+ return TableHitKind::NONE;
// get vertical edge number and check for a hit
const bool bRTL = (GetWritingMode() == WritingMode_RL_TB);
@@ -1141,10 +1141,10 @@ TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_
// rnY is now the edge number above the pointer, if it was hit bVrtHit is also true
if( bVrtHit && mpImpl->mpLayouter->isEdgeVisible( rnX, rnY, false ) )
- return SDRTABLEHIT_VERTICAL_BORDER;
+ return TableHitKind::VerticallBorder;
if( bHrzHit && mpImpl->mpLayouter->isEdgeVisible( rnX, rnY, true ) )
- return SDRTABLEHIT_HORIZONTAL_BORDER;
+ return TableHitKind::HorizontalBorder;
CellRef xCell( mpImpl->getCell( CellPos( rnX, rnY ) ) );
if( xCell.is() && xCell->isMerged() )
@@ -1166,10 +1166,10 @@ TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_
}
if( nX < xCell->GetTextLeftDistance() )
- return SDRTABLEHIT_CELL;
+ return TableHitKind::Cell;
}
- return SDRTABLEHIT_CELLTEXTAREA;
+ return TableHitKind::CellTextArea;
}
const SfxItemSet& SdrTableObj::GetActiveCellItemSet() const
@@ -1271,7 +1271,7 @@ sal_Int32 SdrTableObj::CheckTextHit(const Point& rPnt) const
if( mpImpl.is() && mpImpl->mxTable.is() )
{
CellPos aPos;
- if( CheckTableHit( rPnt, aPos.mnCol, aPos.mnRow ) == SDRTABLEHIT_CELLTEXTAREA )
+ if( CheckTableHit( rPnt, aPos.mnCol, aPos.mnRow ) == TableHitKind::CellTextArea )
return aPos.mnRow * mpImpl->mxTable->getColumnCount() + aPos.mnCol;
}
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index c27542c..fedb1aa 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -279,13 +279,13 @@ bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window*
mbLeftButtonDown = (rMEvt.GetClicks() == 1) && rMEvt.IsLeft();
- if( eHit == SDRTABLEHIT_CELL )
+ if( eHit == TableHitKind::Cell )
{
StartSelection( maMouseDownPos );
return true;
}
- if( rMEvt.IsRight() && eHit != SDRTABLEHIT_NONE )
+ if( rMEvt.IsRight() && eHit != TableHitKind::NONE )
return true; // right click will become context menu
// for cell selection with the mouse remember our first hit
@@ -303,14 +303,14 @@ bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window*
{
sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() );
- if( !pWindow || !pTableObj || eHit == SDRTABLEHIT_NONE)
+ if( !pWindow || !pTableObj || eHit == TableHitKind::NONE)
{
mbLeftButtonDown = false;
}
}
}
- if (comphelper::LibreOfficeKit::isActive() && rMEvt.GetClicks() == 2 && rMEvt.IsLeft() && eHit == SDRTABLEHIT_CELLTEXTAREA)
+ if (comphelper::LibreOfficeKit::isActive() && rMEvt.GetClicks() == 2 && rMEvt.IsLeft() && eHit == TableHitKind::CellTextArea)
{
bool bEmptyOutliner = false;
if (Outliner* pOutliner = mpView->GetTextEditOutliner())
@@ -357,7 +357,7 @@ bool SvxTableController::onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWind
SdrTableObj* pTableObj = dynamic_cast< SdrTableObj* >( mxTableObj.get() );
CellPos aPos;
- if (mbLeftButtonDown && pTableObj && pTableObj->CheckTableHit(pixelToLogic(rMEvt.GetPosPixel(), pWindow), aPos.mnCol, aPos.mnRow ) != SDRTABLEHIT_NONE)
+ if (mbLeftButtonDown && pTableObj && pTableObj->CheckTableHit(pixelToLogic(rMEvt.GetPosPixel(), pWindow), aPos.mnCol, aPos.mnRow ) != TableHitKind::NONE)
{
if(aPos != maMouseDownPos)
{
@@ -3145,7 +3145,7 @@ bool SvxTableController::setCursorLogicPosition(const Point& rPosition, bool bPo
SdrTableObj* pTableObj = static_cast<SdrTableObj*>(mxTableObj.get());
CellPos aCellPos;
- if (pTableObj->CheckTableHit(rPosition, aCellPos.mnCol, aCellPos.mnRow) != SDRTABLEHIT_NONE)
+ if (pTableObj->CheckTableHit(rPosition, aCellPos.mnCol, aCellPos.mnRow) != TableHitKind::NONE)
{
// Position is a table cell.
if (mbCellSelectionMode)
commit 1a37d46c794fd8aa5cf2dba0d74103c5c74e9ca2
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 18 13:58:49 2016 +0200
convert SdrInsertReasonKind to scoped enum
Change-Id: I225250ef296bb263bdb83c13e23412bf0204be51
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 8749e07..e5205fe 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -52,12 +52,12 @@ class Color;
class SfxStyleSheet;
class SvxUnoDrawPagesAccess;
-enum SdrInsertReasonKind {
- SDRREASON_UNKNOWN,
- SDRREASON_STREAMING, /// importing document
- SDRREASON_UNDO, /// from Undo
- SDRREASON_COPY, /// something copied...
- SDRREASON_VIEWCALL /// via SdrView::Group(), ...
+enum class SdrInsertReasonKind {
+ Unknown,
+ Streaming, /// importing document
+ Undo, /// from Undo
+ Copy, /// something copied...
+ ViewCall /// via SdrView::Group(), ...
};
class SdrInsertReason {
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 247545f..b2b2f88 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -266,7 +266,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC
pNeuObj->SetPage( m_pPage );
pNeuObj->SetModel( m_pModel.get() );
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
m_pPage->InsertObject(pNeuObj, SAL_MAX_SIZE, &aReason);
Rectangle aRet(VCLPoint((*pCopiesIter)->getPosition()),VCLSize((*pCopiesIter)->getSize()));
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index de5aa87..0c3c98d 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -133,7 +133,7 @@ void FmFormPage::InsertObject(SdrObject* pObj, size_t nPos,
const SdrInsertReason* pReason)
{
SdrPage::InsertObject( pObj, nPos, pReason );
- if (GetModel() && (!pReason || pReason->GetReason() != SDRREASON_STREAMING))
+ if (GetModel() && (!pReason || pReason->GetReason() != SdrInsertReasonKind::Streaming))
static_cast<FmFormModel*>(GetModel())->GetUndoEnv().Inserted(pObj);
}
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 657ad7d..1497fa3 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -676,7 +676,7 @@ void SdrEditView::ForceMarkedObjToAnotherPage()
if(bFnd)
{
pM->GetPageView()->GetObjList()->RemoveObject(pObj->GetOrdNum());
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
pPV->GetObjList()->InsertObject(pObj, SAL_MAX_SIZE, &aReason);
pM->SetPageView(pPV);
InvalidateAllWin(aObjRect);
@@ -906,7 +906,7 @@ void SdrEditView::CopyMarkedObj()
SdrMark* pM=aSourceObjectsForCopy.GetMark(nm);
SdrObject* pO=pM->GetMarkedSdrObj()->Clone();
if (pO!=nullptr) {
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
pM->GetPageView()->GetObjList()->InsertObject(pO, SAL_MAX_SIZE, &aReason);
if( bUndo )
@@ -969,7 +969,7 @@ bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, SdrInser
pObj->SetMergedItemSet(maDefaultAttr);
}
if (!pObj->IsInserted()) {
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
if (nOptions & SdrInsertFlags::NOBROADCAST) {
rPV.GetObjList()->NbcInsertObject(pObj, SAL_MAX_SIZE, &aReason);
} else {
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index c92a28e..7cf36ae 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1129,7 +1129,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
{
SdrPathObj* pPath = new SdrPathObj(OBJ_PATHFILL, aMergePolyPolygonA);
ImpCopyAttributes(pAttrObj, pPath);
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
pInsOL->InsertObject(pPath, nInsPos, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath));
@@ -1375,7 +1375,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly)
pPath->SetMergedItem(XLineStyleItem(drawing::LineStyle_SOLID));
}
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
pInsOL->InsertObject(pPath,nInsPos,&aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath));
@@ -1529,7 +1529,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
SdrPathObj* pPath = new SdrPathObj((SdrObjKind)pSrcPath->GetObjIdentifier(), basegfx::B2DPolyPolygon(rCandidate));
ImpCopyAttributes(pSrcPath, pPath);
pLast = pPath;
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
rOL.InsertObject(pPath, rPos, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, true));
@@ -1564,7 +1564,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
SdrPathObj* pPath = new SdrPathObj(eKind, basegfx::B2DPolyPolygon(aNewPolygon));
ImpCopyAttributes(pSrcPath, pPath);
pLast = pPath;
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
rOL.InsertObject(pPath, rPos, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, true));
@@ -1600,7 +1600,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
}
}
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
rOL.InsertObject(pCandidate, rPos, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pCandidate, true));
@@ -1785,7 +1785,7 @@ void SdrEditView::GroupMarked()
pSrcLst->RemoveObject(pObj->GetOrdNumDirect());
if (!bForeignList)
nInsPos--; // correct InsertPos
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
pDstLst->InsertObject(pObj,0,&aReason);
GetMarkedObjectListWriteAccess().DeleteMark(nm);
pSrcLst0=pSrcLst;
@@ -1795,7 +1795,7 @@ void SdrEditView::GroupMarked()
{
aNewMark.InsertEntry(SdrMark(pGrp,pPV));
const size_t nCount=pDstLst->GetObjCount();
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
pAktLst->InsertObject(pGrp,nInsPos,&aReason);
if( bUndo )
{
@@ -1871,7 +1871,7 @@ void SdrEditView::UnGroupMarked()
for (size_t no=0; no<nObjCount; ++no)
{
SdrObject* pObj=pSrcLst->RemoveObject(0);
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
pDstLst->InsertObject(pObj,nDstCnt,&aReason);
if( bUndo )
AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoInsertObject(*pObj,true));
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index f2f186e..f1bdb80 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -293,7 +293,7 @@ size_t ImpSdrGDIMetaFileImport::DoImport(
// insert all objects cached in aTmpList now into rOL from nInsPos
nInsPos = std::min(nInsPos, rOL.GetObjCount());
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
for(SdrObject* pObj : maTmpList)
{
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 6c93cce..2fa3614 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -135,7 +135,7 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
bRectsDirty =false;
size_t nCloneErrCnt = 0;
const size_t nCount = rSrcList.GetObjCount();
- SdrInsertReason aReason(SDRREASON_COPY);
+ SdrInsertReason aReason(SdrInsertReasonKind::Copy);
for (size_t no=0; no<nCount; ++no) {
SdrObject* pSO=rSrcList.GetObj(no);
@@ -740,7 +740,7 @@ void SdrObjList::UnGroupObj( size_t nObjNum )
for( size_t i=0; i<nCount; ++i )
{
SdrObject* pObj = pSrcLst->RemoveObject(0);
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
InsertObject(pObj, nInsertPos, &aReason);
++nInsertPos;
}
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 166590d..b1795f1 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -380,7 +380,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
if(pNeuObj)
{
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
pM->GetPageView()->GetObjList()->InsertObject(pNeuObj, pObj->GetOrdNum() + 1, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNeuObj));
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index e2925eee..1362de3 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -746,7 +746,7 @@ void SdrUndoRemoveObj::Undo()
}
E3DModifySceneSnapRectUpdater aUpdater(pObjList->GetOwnerObj());
- SdrInsertReason aReason(SDRREASON_UNDO);
+ SdrInsertReason aReason(SdrInsertReasonKind::Undo);
pObjList->InsertObject(pObj,nOrdNum,&aReason);
// #i11426#
@@ -805,7 +805,7 @@ void SdrUndoInsertObj::Redo()
aAnchorPos = pObj->GetAnchorPos();
}
- SdrInsertReason aReason(SDRREASON_UNDO);
+ SdrInsertReason aReason(SdrInsertReasonKind::Undo);
pObjList->InsertObject(pObj,nOrdNum,&aReason);
// Arcs lose position when grouped (#i45952#)
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 6e7cc85..3a12bd5 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -342,7 +342,7 @@ bool SdrExchangeView::Paste(
pNeuObj->SetLayer(nLayer);
}
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
pDstLst->InsertObject(pNeuObj, SAL_MAX_SIZE, &aReason);
if( bUndo )
@@ -420,7 +420,7 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po
Point aPos(rCenter.X()-xs/2,rCenter.Y()-ys/2);
Rectangle aR(aPos.X(),aPos.Y(),aPos.X()+xs,aPos.Y()+ys);
pObj->SetLogicRect(aR);
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
rLst.InsertObject(pObj, SAL_MAX_SIZE, &aReason);
if( IsUndoEnabled() )
@@ -750,7 +750,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
pNeuObj->SetModel( pNeuMod );
}
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
pNeuPag->InsertObject(pNeuObj, SAL_MAX_SIZE, &aReason);
// #i13033#
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 5aff104..c27542c 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2608,7 +2608,7 @@ bool SvxTableController::GetMarkedObjModel( SdrPage* pNewPage )
pNewTableObj->SetPage( pNewPage );
pNewTableObj->SetModel( pNewPage->GetModel() );
- SdrInsertReason aReason(SDRREASON_VIEWCALL);
+ SdrInsertReason aReason(SdrInsertReasonKind::ViewCall);
pNewPage->InsertObject(pNewTableObj, SAL_MAX_SIZE, &aReason);
return true;
commit c2238e16fd131c4e6d49960e8b3caf5ec6a3d001
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 18 13:53:12 2016 +0200
convert SdrAnimationMode to scoped enum
Change-Id: I8a88a7ee538dab020e2ee08e4dce4b100f0bfa3b
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 2683453..331f387 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -63,10 +63,10 @@ namespace sdr { namespace contact {
// Defines for AnimationMode
-enum SdrAnimationMode
+enum class SdrAnimationMode
{
- SDR_ANIMATION_ANIMATE,
- SDR_ANIMATION_DISABLE
+ Animate,
+ Disable
};
@@ -470,16 +470,16 @@ public:
/// Enable/disable animations for ::Paint
/// Is used by e.g. SdrGrafObj, if it contains an animation
/// Preventing automatic animation is needed for e.g. the presentation view
- bool IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == meAnimationMode ); }
+ bool IsAnimationEnabled() const { return ( SdrAnimationMode::Animate == meAnimationMode ); }
void SetAnimationEnabled( bool bEnable=true );
/// Set/unset pause state for animations
void SetAnimationPause( bool bSet );
/// Mode when starting an animation in the Paint Handler:
- /// 1. SDR_ANIMATION_ANIMATE (default): start animation normally
+ /// 1. SdrAnimationMode::Animate (default): start animation normally
/// 2. SDR_ANIMATION_DONT_ANIMATE: only show the replacement picture
- /// 3. SDR_ANIMATION_DISABLE: don't start and don't show any replacement
+ /// 3. SdrAnimationMode::Disable: don't start and don't show any replacement
void SetAnimationMode( const SdrAnimationMode eMode );
/// The Browser is destroyed for bShow=false
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 6e78e3e..12d946b 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -362,7 +362,7 @@ void DrawViewShell::Shutdown()
if(SlideShow::IsRunning( GetViewShellBase() ) )
{
// Turn off effects.
- GetDrawView()->SetAnimationMode(SDR_ANIMATION_DISABLE);
+ GetDrawView()->SetAnimationMode(SdrAnimationMode::Disable);
}
}
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 6da1847..04e8735 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -166,7 +166,7 @@ void SdrPaintView::ImpClearVars()
mbPrintPreview=false;
mbPreviewRenderer=false;
- meAnimationMode = SDR_ANIMATION_ANIMATE;
+ meAnimationMode = SdrAnimationMode::Animate;
mbAnimationPause = false;
mnHitTolPix=2;
@@ -1177,7 +1177,7 @@ void SdrPaintView::DoConnect(SdrOle2Obj* /*pOleObj*/)
void SdrPaintView::SetAnimationEnabled( bool bEnable )
{
- SetAnimationMode( bEnable ? SDR_ANIMATION_ANIMATE : SDR_ANIMATION_DISABLE );
+ SetAnimationMode( bEnable ? SdrAnimationMode::Animate : SdrAnimationMode::Disable );
}
#if defined DBG_UTIL
commit df418a41c1b90ab1a92eb150d01601f708856722
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 18 13:45:41 2016 +0200
drop enum SvxViewHint::HintType
and rename the containing class
Change-Id: Id81623898b9ff102fcac6c2518240213b7d22233
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 0f75ed1..2683453 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -89,15 +89,10 @@ namespace sdr
}
-class SVX_DLLPUBLIC SvxViewHint : public SfxHint
+class SVX_DLLPUBLIC SvxViewChangedHint : public SfxHint
{
public:
- enum HintType { SVX_HINT_VIEWCHANGED };
- explicit SvxViewHint(HintType eType);
- HintType GetHintType() const { return meHintType;}
-
-private:
- HintType meHintType;
+ explicit SvxViewChangedHint();
};
/// Typedefs for a list of SdrPaintWindows
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx
index 4adc293..03ed7c5 100644
--- a/svx/source/accessibility/AccessibleTextEventQueue.cxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx
@@ -56,9 +56,9 @@ namespace accessibility
maEventQueue.push_back( new TextHint( rHint ) );
}
- void AccessibleTextEventQueue::Append( const SvxViewHint& rHint )
+ void AccessibleTextEventQueue::Append( const SvxViewChangedHint& rHint )
{
- maEventQueue.push_back( new SvxViewHint( rHint ) );
+ maEventQueue.push_back( new SvxViewChangedHint( rHint ) );
}
void AccessibleTextEventQueue::Append( const SvxEditSourceHint& rHint )
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.hxx b/svx/source/accessibility/AccessibleTextEventQueue.hxx
index 76bc462..293bbfd 100644
--- a/svx/source/accessibility/AccessibleTextEventQueue.hxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.hxx
@@ -27,7 +27,7 @@
class SfxHint;
class SdrHint;
class TextHint;
-class SvxViewHint;
+class SvxViewChangedHint;
class SvxEditSourceHint;
namespace accessibility
@@ -51,7 +51,7 @@ namespace accessibility
/// Append event to end of queue
void Append( const TextHint& rHint );
/// Append event to end of queue
- void Append( const SvxViewHint& rHint );
+ void Append( const SvxViewChangedHint& rHint );
/// Append event to end of queue
void Append( const SvxEditSourceHint& rHint );
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 2d1b029..b31023ba 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -1176,7 +1176,7 @@ namespace accessibility
const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>( &rHint );
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>( &rHint );
const TextHint* pTextHint = dynamic_cast<const TextHint*>( &rHint );
- const SvxViewHint* pViewHint = dynamic_cast<const SvxViewHint*>( &rHint );
+ const SvxViewChangedHint* pViewHint = dynamic_cast<const SvxViewChangedHint*>( &rHint );
const SvxEditSourceHint* pEditSourceHint = dynamic_cast<const SvxEditSourceHint*>( &rHint );
try
@@ -1267,14 +1267,9 @@ namespace accessibility
}
else if( pViewHint )
{
- switch( pViewHint->GetHintType() )
- {
- case SvxViewHint::SVX_HINT_VIEWCHANGED:
- // just check visibility
- UpdateVisibleChildren();
- UpdateBoundRect();
- break;
- }
+ // just check visibility
+ UpdateVisibleChildren();
+ UpdateBoundRect();
}
else if( pSdrHint )
{
@@ -1356,7 +1351,7 @@ namespace accessibility
const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>( &rHint );
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>( &rHint );
const TextHint* pTextHint = dynamic_cast<const TextHint*>( &rHint );
- const SvxViewHint* pViewHint = dynamic_cast<const SvxViewHint*>( &rHint );
+ const SvxViewChangedHint* pViewHint = dynamic_cast<const SvxViewChangedHint*>( &rHint );
const SvxEditSourceHint* pEditSourceHint = dynamic_cast<const SvxEditSourceHint*>( &rHint );
try
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 9b08078..6da1847 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -115,8 +115,7 @@ OutputDevice* SdrPaintView::GetFirstOutputDevice() const
}
-SvxViewHint::SvxViewHint (HintType eHintType)
- : meHintType(eHintType)
+SvxViewChangedHint::SvxViewChangedHint()
{
}
@@ -1242,7 +1241,7 @@ void SdrPaintView::VisAreaChanged(const OutputDevice* pOut)
void SdrPaintView::VisAreaChanged(const SdrPageWindow& /*rWindow*/)
{
// notify SfxListener
- Broadcast(SvxViewHint(SvxViewHint::SVX_HINT_VIEWCHANGED));
+ Broadcast(SvxViewChangedHint());
}
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 1569807..7f84e67 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -332,14 +332,9 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
}
}
}
- else if (const SvxViewHint* pViewHint = dynamic_cast<const SvxViewHint*>(&rHint))
+ else if (const SvxViewChangedHint* pViewHint = dynamic_cast<const SvxViewChangedHint*>(&rHint))
{
- switch( pViewHint->GetHintType() )
- {
- case SvxViewHint::SVX_HINT_VIEWCHANGED:
- Broadcast( *pViewHint );
- break;
- }
+ Broadcast( *pViewHint );
}
else if (const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint))
{
@@ -358,7 +353,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
// UpdateOutliner();
// #101029# Broadcast object changes, as they might change visible attributes
- SvxViewHint aHint(SvxViewHint::SVX_HINT_VIEWCHANGED);
+ SvxViewChangedHint aHint;
Broadcast( aHint );
}
break;
commit 48c3b33d17591ff5b29f914ae5c0fdf787bf0d52
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 18 13:39:50 2016 +0200
convert SdrCrookMode to scoped enum
Change-Id: If7c62d6c6f5bfa5f4f4f7bdb1af9384f3fa7cea8
diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx
index aa5c5fd..2c484ad 100644
--- a/include/svx/svdsnpv.hxx
+++ b/include/svx/svdsnpv.hxx
@@ -79,11 +79,11 @@ namespace o3tl
template<> struct typed_flags<SdrSnap> : is_typed_flags<SdrSnap, 3> {};
}
-// SDRCROOK_STRETCH is not implemented yet!
-enum SdrCrookMode {
- SDRCROOK_ROTATE,
- SDRCROOK_SLANT,
- SDRCROOK_STRETCH
+// SdrCrookMode::Stretch is not implemented yet!
+enum class SdrCrookMode {
+ Rotate,
+ Slant,
+ Stretch
};
@@ -269,7 +269,7 @@ public:
void SetCrookNoContortion(bool bOn) { bCrookNoContortion=bOn; }
bool IsCrookNoContortion() const { return bCrookNoContortion; }
- // Crook-Mode. persistent. Default=SDRCROOK_ROTATE. (ni)
+ // Crook-Mode. persistent. Default=SdrCrookMode::Rotate. (ni)
void SetCrookMode(SdrCrookMode eMode) { eCrookMode=eMode; }
SdrCrookMode GetCrookMode() const { return eCrookMode; }
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 5ec67b4..d0c2df7 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -1078,7 +1078,7 @@ void FuSelection::Activate()
if ( mpView->GetDragMode() != eMode )
{
mpView->SetDragMode(eMode);
- mpView->SetCrookMode(SDRCROOK_ROTATE);
+ mpView->SetCrookMode(SdrCrookMode::Rotate);
}
}
break;
@@ -1090,7 +1090,7 @@ void FuSelection::Activate()
if ( mpView->GetDragMode() != eMode )
{
mpView->SetDragMode(eMode);
- mpView->SetCrookMode(SDRCROOK_SLANT);
+ mpView->SetCrookMode(SdrCrookMode::Slant);
}
}
break;
@@ -1102,7 +1102,7 @@ void FuSelection::Activate()
if ( mpView->GetDragMode() != eMode )
{
mpView->SetDragMode(eMode);
- mpView->SetCrookMode(SDRCROOK_STRETCH);
+ mpView->SetCrookMode(SdrCrookMode::Stretch);
}
}
break;
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 2e5b105..4361a47 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -2793,7 +2793,7 @@ SdrDragCrook::SdrDragCrook(SdrDragView& rNewView)
bAtCenter(false),
nAngle(0),
nMarkSize(0),
- eMode(SDRCROOK_ROTATE)
+ eMode(SdrCrookMode::Rotate)
{
}
@@ -2994,9 +2994,9 @@ void SdrDragCrook::MovAllPoints(basegfx::B2DPolyPolygon& rTarget)
switch (eMode)
{
- case SDRCROOK_ROTATE : CrookRotateXPoint (aCtr1,nullptr,nullptr,aC,aRad,nSin,nCos,bVertical); break;
- case SDRCROOK_SLANT : CrookSlantXPoint (aCtr1,nullptr,nullptr,aC,aRad,nSin,nCos,bVertical); break;
- case SDRCROOK_STRETCH: CrookStretchXPoint(aCtr1,nullptr,nullptr,aC,aRad,nSin,nCos,bVertical,aMarkRect); break;
+ case SdrCrookMode::Rotate : CrookRotateXPoint (aCtr1,nullptr,nullptr,aC,aRad,nSin,nCos,bVertical); break;
+ case SdrCrookMode::Slant : CrookSlantXPoint (aCtr1,nullptr,nullptr,aC,aRad,nSin,nCos,bVertical); break;
+ case SdrCrookMode::Stretch: CrookStretchXPoint(aCtr1,nullptr,nullptr,aC,aRad,nSin,nCos,bVertical,aMarkRect); break;
} // switch
}
@@ -3095,9 +3095,9 @@ void SdrDragCrook::MovCrookPoint(Point& rPnt, Point* pC1, Point* pC2)
switch (eMode)
{
- case SDRCROOK_ROTATE : CrookRotateXPoint (rPnt,pC1,pC2,aC,aRad,nSin,nCos,bVert); break;
- case SDRCROOK_SLANT : CrookSlantXPoint (rPnt,pC1,pC2,aC,aRad,nSin,nCos,bVert); break;
- case SDRCROOK_STRETCH: CrookStretchXPoint(rPnt,pC1,pC2,aC,aRad,nSin,nCos,bVert,aMarkRect); break;
+ case SdrCrookMode::Rotate : CrookRotateXPoint (rPnt,pC1,pC2,aC,aRad,nSin,nCos,bVert); break;
+ case SdrCrookMode::Slant : CrookSlantXPoint (rPnt,pC1,pC2,aC,aRad,nSin,nCos,bVert); break;
+ case SdrCrookMode::Stretch: CrookStretchXPoint(rPnt,pC1,pC2,aC,aRad,nSin,nCos,bVert,aMarkRect); break;
} // switch
}
}
@@ -3111,7 +3111,7 @@ void SdrDragCrook::MoveSdrDrag(const Point& rPnt)
SdrCrookMode eNeuMode=getSdrDragView().GetCrookMode();
bool bNeuContortion=!bNeuMoveOnly && ((bContortionAllowed && !getSdrDragView().IsCrookNoContortion()) || !bNoContortionAllowed);
bResize=!getSdrDragView().IsOrtho() && bResizeAllowed && !bNeuMoveOnly;
- bool bNeuRotate=bRotateAllowed && !bNeuContortion && !bNeuMoveOnly && eNeuMode==SDRCROOK_ROTATE;
+ bool bNeuRotate=bRotateAllowed && !bNeuContortion && !bNeuMoveOnly && eNeuMode==SdrCrookMode::Rotate;
Point aPnt(GetSnapPos(rPnt));
@@ -3310,7 +3310,7 @@ void SdrDragCrook::applyCurrentTransformationToSdrObject(SdrObject& rTarget)
if (bDoCrook)
{
const Rectangle aLocalMarkRect(getSdrDragView().GetMarkedObjRect());
- const bool bLocalRotate(!bContortion && eMode == SDRCROOK_ROTATE && getSdrDragView().IsRotateAllowed());
+ const bool bLocalRotate(!bContortion && eMode == SdrCrookMode::Rotate && getSdrDragView().IsRotateAllowed());
SdrEditView::ImpCrookObj(&rTarget,aCenter,aRad,eMode,bVertical,!bContortion,bLocalRotate,aLocalMarkRect);
}
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index fcb0128..176be90 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -509,9 +509,9 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
{
XPolyPolygon aXPP(pPath->GetPathPoly());
switch (eMode) {
- case SDRCROOK_ROTATE : CrookRotatePoly (aXPP,rRef,rRad,bVertical); break;
- case SDRCROOK_SLANT : CrookSlantPoly (aXPP,rRef,rRad,bVertical); break;
- case SDRCROOK_STRETCH: CrookStretchPoly(aXPP,rRef,rRad,bVertical,rMarkRect); break;
+ case SdrCrookMode::Rotate : CrookRotatePoly (aXPP,rRef,rRad,bVertical); break;
+ case SdrCrookMode::Slant : CrookSlantPoly (aXPP,rRef,rRad,bVertical); break;
+ case SdrCrookMode::Stretch: CrookStretchPoly(aXPP,rRef,rRad,bVertical,rMarkRect); break;
} // switch
pPath->SetPathPoly(aXPP.getB2DPolyPolygon());
bDone = true;
@@ -532,9 +532,9 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
switch (eMode)
{
- case SDRCROOK_ROTATE : CrookRotatePoly (aXP,rRef,rRad,bVertical); break;
- case SDRCROOK_SLANT : CrookSlantPoly (aXP,rRef,rRad,bVertical); break;
- case SDRCROOK_STRETCH: CrookStretchPoly(aXP,rRef,rRad,bVertical,rMarkRect); break;
+ case SdrCrookMode::Rotate : CrookRotatePoly (aXP,rRef,rRad,bVertical); break;
+ case SdrCrookMode::Slant : CrookSlantPoly (aXP,rRef,rRad,bVertical); break;
+ case SdrCrookMode::Stretch: CrookStretchPoly(aXP,rRef,rRad,bVertical,rMarkRect); break;
}
for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++)
@@ -562,9 +562,9 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
switch (eMode)
{
- case SDRCROOK_ROTATE : nAngle=CrookRotateXPoint (aCtr1,nullptr,nullptr,rRef,rRad,nSin,nCos,bVertical); bRotOk=bRotate; break;
- case SDRCROOK_SLANT : nAngle=CrookSlantXPoint (aCtr1,nullptr,nullptr,rRef,rRad,nSin,nCos,bVertical); break;
- case SDRCROOK_STRETCH: nAngle=CrookStretchXPoint(aCtr1,nullptr,nullptr,rRef,rRad,nSin,nCos,bVertical,rMarkRect); break;
+ case SdrCrookMode::Rotate : nAngle=CrookRotateXPoint (aCtr1,nullptr,nullptr,rRef,rRad,nSin,nCos,bVertical); bRotOk=bRotate; break;
+ case SdrCrookMode::Slant : nAngle=CrookSlantXPoint (aCtr1,nullptr,nullptr,rRef,rRad,nSin,nCos,bVertical); break;
+ case SdrCrookMode::Stretch: nAngle=CrookStretchXPoint(aCtr1,nullptr,nullptr,rRef,rRad,nSin,nCos,bVertical,rMarkRect); break;
}
}
@@ -583,7 +583,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
Rectangle aMarkRect(GetMarkedObjRect());
const bool bUndo = IsUndoEnabled();
- bool bRotate=bNoContortion && eMode==SDRCROOK_ROTATE && IsRotateAllowed();
+ bool bRotate=bNoContortion && eMode==SdrCrookMode::Rotate && IsRotateAllowed();
if( bUndo )
{
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index d335a2f..c7b34b4 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -181,7 +181,7 @@ SdrSnapView::SdrSnapView(SdrModel* pModel1, OutputDevice* pOut)
, nMagnSizPix(4)
, nSnapAngle(1500)
, nEliminatePolyPointLimitAngle(0)
- , eCrookMode(SDRCROOK_ROTATE)
+ , eCrookMode(SdrCrookMode::Rotate)
, bSnapEnab(true)
, bGridSnap(true)
, bBordSnap(true)
commit eba160af2149f2ec70b78ea60f63f1b49065bba3
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 18 13:11:03 2016 +0200
convert SdrCreateCmd to scoped enum
Change-Id: I8772032dee25c790314384750b8c7277c4879318
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index be94853..491e3c5 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -390,7 +390,7 @@ bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
// object creation active?
if ( rView.IsCreateObj() )
{
- rView.EndCreateObj(SDRCREATE_FORCEEND);
+ rView.EndCreateObj(SdrCreateCmd::ForceEnd);
if ( !rView.AreObjectsMarked() )
{
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index e575064..12b8341 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -743,7 +743,7 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
// #i12587# support for shapes in chart
if ( m_eDrawMode == CHARTDRAW_INSERT && pDrawViewWrapper->IsCreateObj() )
{
- pDrawViewWrapper->EndCreateObj( SDRCREATE_FORCEEND );
+ pDrawViewWrapper->EndCreateObj( SdrCreateCmd::ForceEnd );
{
HiddenUndoContext aUndoContext( m_xUndoManager );
// don't want the positioning Undo action to appear in the UI
diff --git a/include/svx/svdtypes.hxx b/include/svx/svdtypes.hxx
index e58a1fd..bb849c1 100644
--- a/include/svx/svdtypes.hxx
+++ b/include/svx/svdtypes.hxx
@@ -31,9 +31,12 @@ const sal_uInt32 SdrInventor=sal_uInt32('S')*0x00000001+
sal_uInt32('r')*0x01000000;
// commands for EndCreate()
-enum SdrCreateCmd {SDRCREATE_NEXTPOINT, // next traverse station, segment of a circle: next coordinate
- SDRCREATE_NEXTOBJECT, // next polygon in PolyPolygon
- SDRCREATE_FORCEEND}; // forced end
+enum class SdrCreateCmd
+{
+ NextPoint, // next traverse station, segment of a circle: next coordinate
+ NextObject, // next polygon in PolyPolygon
+ ForceEnd // forced end
+};
enum class SdrDragMode
{
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 2a7f639..b8bf38e 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -701,7 +701,7 @@ bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
return true;
}
- m_rView.EndCreateObj(SDRCREATE_FORCEEND);
+ m_rView.EndCreateObj(SdrCreateCmd::ForceEnd);
if ( !m_rView.AreObjectsMarked() )
{
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index 73e5c60..2fdbafb 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -92,7 +92,7 @@ bool FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
if ( pView->IsCreateObj() && rMEvt.IsLeft() )
{
- pView->EndCreateObj( SDRCREATE_NEXTPOINT );
+ pView->EndCreateObj( SdrCreateCmd::NextPoint );
bReturn = true;
}
return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index db31dfb..f49bc8b 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -114,7 +114,7 @@ bool FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
if ( pView->IsCreateObj() && rMEvt.IsLeft() )
{
- pView->EndCreateObj(SDRCREATE_FORCEEND);
+ pView->EndCreateObj(SdrCreateCmd::ForceEnd);
bReturn = true;
}
return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index a5b4990..c7563cd 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -107,7 +107,7 @@ bool FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
if ( pView->IsCreateObj() && rMEvt.IsLeft() )
{
- pView->EndCreateObj(SDRCREATE_FORCEEND);
+ pView->EndCreateObj(SdrCreateCmd::ForceEnd);
if (aSfxRequest.GetSlot() == SID_DRAW_CAPTION_VERTICAL)
{
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx
index 53fe19f..449b0b2 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -97,7 +97,7 @@ bool FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
if ( pView->IsCreateObj() && rMEvt.IsLeft() )
{
- pView->EndCreateObj(SDRCREATE_FORCEEND);
+ pView->EndCreateObj(SdrCreateCmd::ForceEnd);
bReturn = true;
}
return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 80800c5..bfc6f6f 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -441,7 +441,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
{
if (rMEvt.IsLeft())
{
- pView->EndCreateObj(SDRCREATE_FORCEEND);
+ pView->EndCreateObj(SdrCreateCmd::ForceEnd);
if (aSfxRequest.GetSlot() == SID_DRAW_TEXT_MARQUEE)
{
// Lauftext-Objekt erzeugen?
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index 0d96e60..0fed0a3 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -342,7 +342,7 @@ bool FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt)
if ( mpView->IsCreateObj() && rMEvt.IsLeft() )
{
- mpView->EndCreateObj(SDRCREATE_FORCEEND);
+ mpView->EndCreateObj(SdrCreateCmd::ForceEnd);
bReturn = true;
}
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index 631040a..547bcf3 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -136,7 +136,7 @@ bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt )
{
const size_t nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount();
- if (mpView->EndCreateObj(SDRCREATE_NEXTPOINT) )
+ if (mpView->EndCreateObj(SdrCreateCmd::NextPoint) )
{
if (nCount != mpView->GetSdrPageView()->GetObjList()->GetObjCount())
{
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index 2292747..46de4c0 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -131,7 +131,7 @@ bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt )
if (mpView->IsInsObjPoint())
{
- mpView->EndInsObjPoint(SDRCREATE_FORCEEND);
+ mpView->EndInsObjPoint(SdrCreateCmd::ForceEnd);
}
else
{
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index 8aba283..782ade0 100644
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -143,7 +143,7 @@ bool FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
if(mpView->IsCreateObj() && rMEvt.IsLeft())
{
SdrObject* pObj = mpView->GetCreateObj();
- if( pObj && mpView->EndCreateObj( SDRCREATE_FORCEEND ) )
+ if( pObj && mpView->EndCreateObj( SdrCreateCmd::ForceEnd ) )
{
bReturn = true;
}
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 8fd4ddf..5555593 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -223,7 +223,7 @@ bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt)
{
SdrObject* pObj = mpView->GetCreateObj();
- if(pObj && mpView->EndCreateObj(SDRCREATE_FORCEEND))
+ if(pObj && mpView->EndCreateObj(SdrCreateCmd::ForceEnd))
{
if(SID_DRAW_MEASURELINE == nSlotId)
{
diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx
index 5e772f1..8e8e29d 100644
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -100,7 +100,7 @@ bool FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
if ( mpView->IsCreateObj() && rMEvt.IsLeft() )
{
- mpView->EndCreateObj(SDRCREATE_FORCEEND);
+ mpView->EndCreateObj(SdrCreateCmd::ForceEnd);
bReturn = true;
}
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 72a882b4..5ec67b4 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -847,7 +847,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
{
if ( mpView->IsInsObjPoint() )
{
- mpView->EndInsObjPoint(SDRCREATE_FORCEEND);
+ mpView->EndInsObjPoint(SdrCreateCmd::ForceEnd);
}
else if ( mpView->IsDragObj() )
{
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 8a81a49..775f954 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -705,7 +705,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
ImpSetAttributesForNewTextObject(GetTextObj());
}
- if (!mpView->EndCreateObj(SDRCREATE_FORCEEND))
+ if (!mpView->EndCreateObj(SdrCreateCmd::ForceEnd))
{
// it was not possible to create text object
mxTextObj.reset(nullptr);
@@ -781,7 +781,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
GetTextObj()->SetDisableAutoWidthOnDragging(true);
}
- if(!mpView->EndCreateObj(SDRCREATE_FORCEEND))
+ if(!mpView->EndCreateObj(SdrCreateCmd::ForceEnd))
{
mxTextObj.reset(nullptr);
}
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 05a687f..b4e7a8c 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -679,7 +679,7 @@ void GraphCtrl::MouseButtonUp(const MouseEvent& rMEvt)
if ( bSdrMode )
{
if ( pView->IsInsObjPoint() )
- pView->EndInsObjPoint( SDRCREATE_FORCEEND );
+ pView->EndInsObjPoint( SdrCreateCmd::ForceEnd );
else
pView->MouseButtonUp( rMEvt, this );
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 7942684..b93ca3f 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -698,7 +698,7 @@ bool E3dScene::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
aRect1.Justify();
NbcSetSnapRect(aRect1);
SetRectsDirty();
- return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointCount()>=2);
+ return (eCmd==SdrCreateCmd::ForceEnd || rStat.GetPointCount()>=2);
}
bool E3dScene::BckCreate(SdrDragStat& /*rStat*/)
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index faca040..ea4e300 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -633,7 +633,7 @@ void FmFormObj::SetUnoControlModel( const Reference< css::awt::XControlModel >&
bool FmFormObj::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd )
{
bool bResult = SdrUnoObj::EndCreate(rStat, eCmd);
- if ( bResult && SDRCREATE_FORCEEND == eCmd && rStat.GetView() )
+ if ( bResult && SdrCreateCmd::ForceEnd == eCmd && rStat.GetView() )
{
if ( pPage )
{
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 7689ede..bd68921 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -232,7 +232,7 @@ void SdrCreateView::MovAction(const Point& rPnt)
void SdrCreateView::EndAction()
{
- if (pAktCreate!=nullptr) EndCreateObj(SDRCREATE_FORCEEND);
+ if (pAktCreate!=nullptr) EndCreateObj(SdrCreateCmd::ForceEnd);
SdrDragView::EndAction();
}
@@ -595,7 +595,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
{
sal_uIntPtr nCount=maDragStat.GetPointCount();
- if (nCount<=1 && eCmd==SDRCREATE_FORCEEND)
+ if (nCount<=1 && eCmd==SdrCreateCmd::ForceEnd)
{
BrkCreateObj(); // objects with only a single point don't exist (at least today)
return false; // sal_False = event not interpreted
@@ -672,7 +672,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
}
else
{ // more points
- if (eCmd==SDRCREATE_FORCEEND || // nothing there -- force ending
+ if (eCmd==SdrCreateCmd::ForceEnd || // nothing there -- force ending
nCount==0 || // no existing points (should never happen)
(nCount<=1 && !maDragStat.IsMinMoved())) { // MinMove not met
BrkCreateObj();
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 835caf1..793bedc 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -697,10 +697,10 @@ bool SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd)
sal_uInt32 nNextPnt(mnInsPointNum);
Point aPnt(maDragStat.GetNow());
bool bOk=EndDragObj();
- if (bOk && eCmd!=SDRCREATE_FORCEEND)
+ if (bOk && eCmd!=SdrCreateCmd::ForceEnd)
{
// Ret=True means: Action is over.
- bOk=!(ImpBegInsObjPoint(true, nNextPnt, aPnt, eCmd == SDRCREATE_NEXTOBJECT, mpDragWin));
+ bOk=!(ImpBegInsObjPoint(true, nNextPnt, aPnt, eCmd == SdrCreateCmd::NextObject, mpDragWin));
}
return bOk;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 799e234..6e08225 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2192,7 +2192,7 @@ bool SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd )
AdaptTextMinSize();
SetRectsDirty();
- return ( eCmd == SDRCREATE_FORCEEND || rStat.GetPointCount() >= 2 );
+ return ( eCmd == SdrCreateCmd::ForceEnd || rStat.GetPointCount() >= 2 );
}
basegfx::B2DPolyPolygon SdrObjCustomShape::TakeCreatePoly(const SdrDragStat& /*rDrag*/) const
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 830b3f4..3af193c 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1353,7 +1353,7 @@ bool SdrObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
rStat.TakeCreateRect(aOutRect);
aOutRect.Justify();
- return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointCount()>=2);
+ return (eCmd==SdrCreateCmd::ForceEnd || rStat.GetPointCount()>=2);
}
void SdrObject::BrkCreate(SdrDragStat& /*rStat*/)
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 4bcb20d..7b71798 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -572,7 +572,7 @@ bool SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
maRect.SetPos(rStat.GetNow());
ImpCalcTail(aPara,aTailPoly,maRect);
SetRectsDirty();
- return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointCount()>=2);
+ return (eCmd==SdrCreateCmd::ForceEnd || rStat.GetPointCount()>=2);
}
bool SdrCaptionObj::BckCreate(SdrDragStat& /*rStat*/)
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 3862ec0..7555116 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -712,7 +712,7 @@ bool SdrCircObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
ImpSetCreateParams(rStat);
ImpCircUser* pU=static_cast<ImpCircUser*>(rStat.GetUser());
bool bRet = false;
- if (eCmd==SDRCREATE_FORCEEND && rStat.GetPointCount()<4) meCircleKind=OBJ_CIRC;
+ if (eCmd==SdrCreateCmd::ForceEnd && rStat.GetPointCount()<4) meCircleKind=OBJ_CIRC;
if (meCircleKind==OBJ_CIRC) {
bRet=rStat.GetPointCount()>=2;
if (bRet) {
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 14b57e3..792138a 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -2048,7 +2048,7 @@ bool SdrEdgeObj::MovCreate(SdrDragStat& rDragStat)
bool SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd)
{
- bool bOk=(eCmd==SDRCREATE_FORCEEND || rDragStat.GetPointCount()>=2);
+ bool bOk=(eCmd==SdrCreateCmd::ForceEnd || rDragStat.GetPointCount()>=2);
if (bOk) {
ConnectToNode(true,aCon1.pObj);
ConnectToNode(false,aCon2.pObj);
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 6fc7985..a78dbdf 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -991,7 +991,7 @@ bool SdrMeasureObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
SetTextDirty();
SetRectsDirty();
- return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointCount()>=2);
+ return (eCmd==SdrCreateCmd::ForceEnd || rStat.GetPointCount()>=2);
}
bool SdrMeasureObj::BckCreate(SdrDragStat& /*rStat*/)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list