diff options
author | Noel Grandin <noel@peralex.com> | 2016-08-18 11:06:48 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-08-19 08:18:37 +0200 |
commit | 5252d3951f2febdfc714f37ffef9f4c0794c4cec (patch) | |
tree | 9ffea1266d65c65b78d22ee60e8c830282975597 /include | |
parent | 4625dcc13cbe6d5277e7c8bc99879b1c060796c0 (diff) |
convert SdrRepeatFunc to scoped enum
Change-Id: I7702cf3696222c3e1d2422b602bb6c8394e39d7a
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/svdedtv.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdmodel.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdtypes.hxx | 46 |
3 files changed, 26 insertions, 24 deletions
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 71c1fd2ac8df..74c97f4934f4 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -180,7 +180,7 @@ public: // NotifyNewUndoAction() is not called for an empty group. void BegUndo() { mpModel->BegUndo(); } // open undo-grouping void BegUndo(const OUString& rComment) { mpModel->BegUndo(rComment); } // open undo-grouping - void BegUndo(const OUString& rComment, const OUString& rObjDescr, SdrRepeatFunc eFunc=SDRREPFUNC_OBJ_NONE) { mpModel->BegUndo(rComment,rObjDescr,eFunc); } // open undo-grouping + void BegUndo(const OUString& rComment, const OUString& rObjDescr, SdrRepeatFunc eFunc=SdrRepeatFunc::NONE) { mpModel->BegUndo(rComment,rObjDescr,eFunc); } // open undo-grouping void EndUndo(); // close undo-grouping (incl. BroadcastEdges) void AddUndo(SdrUndoAction* pUndo) { mpModel->AddUndo(pUndo); } // add action // only after first BegUndo or befor last EndUndo: diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index ac1f82f83849..30084a87c564 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -460,7 +460,7 @@ public: // Actions on the SdrView however do generate those. void BegUndo(); // open Undo group void BegUndo(const OUString& rComment); // open Undo group - void BegUndo(const OUString& rComment, const OUString& rObjDescr, SdrRepeatFunc eFunc=SDRREPFUNC_OBJ_NONE); // open Undo group + void BegUndo(const OUString& rComment, const OUString& rObjDescr, SdrRepeatFunc eFunc=SdrRepeatFunc::NONE); // open Undo group void EndUndo(); // close Undo group void AddUndo(SdrUndoAction* pUndo); sal_uInt16 GetUndoBracketLevel() const { return nUndoLevel; } diff --git a/include/svx/svdtypes.hxx b/include/svx/svdtypes.hxx index 6e801a2e2268..70f559cd335b 100644 --- a/include/svx/svdtypes.hxx +++ b/include/svx/svdtypes.hxx @@ -82,28 +82,30 @@ enum SdrObjListKind {SDROBJLIST_UNKNOWN =0x00, /* * Repeat */ -enum SdrRepeatFunc {SDRREPFUNC_OBJ_NONE, - // with parameter - SDRREPFUNC_OBJ_MOVE, // distance - SDRREPFUNC_OBJ_RESIZE, // factor, reference(%) related to MarkRect - SDRREPFUNC_OBJ_ROTATE, // rotation angle, reference(%) related to MarkRect - // Without parameter - SDRREPFUNC_OBJ_DELETE, - SDRREPFUNC_OBJ_COMBINE_POLYPOLY, - SDRREPFUNC_OBJ_COMBINE_ONEPOLY, - SDRREPFUNC_OBJ_DISMANTLE_POLYS, - SDRREPFUNC_OBJ_DISMANTLE_LINES, - SDRREPFUNC_OBJ_CONVERTTOPOLY, - SDRREPFUNC_OBJ_CONVERTTOPATH, - SDRREPFUNC_OBJ_GROUP, - SDRREPFUNC_OBJ_UNGROUP, - SDRREPFUNC_OBJ_PUTTOTOP, - SDRREPFUNC_OBJ_PUTTOBTM, - SDRREPFUNC_OBJ_MOVTOTOP, - SDRREPFUNC_OBJ_MOVTOBTM, - SDRREPFUNC_OBJ_REVORDER, - SDRREPFUNC_OBJ_IMPORTMTF, - SDRREPFUNC_LAST}; +enum class SdrRepeatFunc { + NONE, + // with parameter + Move, // distance + Resize, // factor, reference(%) related to MarkRect + Rotate, // rotation angle, reference(%) related to MarkRect + // Without parameter + Delete, + CombinePolyPoly, + CombineOnePoly, + DismantlePolys, + DismantleLines, + ConvertToPoly, + ConvertToPath, + Group, + Ungroup, + PutToTop, + PutToBottom, + MoveToTop, + MoveToBottom, + ReverseOrder, + ImportMtf, + LAST +}; #endif // INCLUDED_SVX_SVDTYPES_HXX |