summaryrefslogtreecommitdiff
path: root/sw/inc/swcrsr.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-11-29 10:07:28 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-11-29 10:49:40 +0000
commit3c9c5214a331041f4d19275c707e29a6aff89fa6 (patch)
tree3c5e12cfb90f991d3e44628b0ed9980fdafb4b94 /sw/inc/swcrsr.hxx
parent5bda4c35c2224946ad3a224b09f82b0013bf887f (diff)
convert SwCursorSelOverFlags to o3tl::typed_flags
Change-Id: I399db07f508e5aeba005c8c6746cf5adc42702d2 Reviewed-on: https://gerrit.libreoffice.org/31350 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/inc/swcrsr.hxx')
-rw-r--r--sw/inc/swcrsr.hxx28
1 files changed, 15 insertions, 13 deletions
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 0f9ab9fb3f7a..84267374f050 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -46,14 +46,16 @@ protected:
~SwFindParas() {}
};
-typedef sal_uInt16 SwCursorSelOverFlags;
-namespace nsSwCursorSelOverFlags
+enum class SwCursorSelOverFlags : sal_uInt16
{
- const SwCursorSelOverFlags SELOVER_NONE = 0x00;
- const SwCursorSelOverFlags SELOVER_CHECKNODESSECTION = 0x01;
- const SwCursorSelOverFlags SELOVER_TOGGLE = 0x02;
- const SwCursorSelOverFlags SELOVER_ENABLEREVDIREKTION = 0x04;
- const SwCursorSelOverFlags SELOVER_CHANGEPOS = 0x08;
+ NONE = 0x00,
+ CheckNodeSection = 0x01,
+ Toggle = 0x02,
+ EnableRevDirection = 0x04,
+ ChangePos = 0x08
+};
+namespace o3tl {
+ template<> struct typed_flags<SwCursorSelOverFlags> : is_typed_flags<SwCursorSelOverFlags, 0x0f> {};
}
// define for cursor travelling normally in western text cells and chars do
@@ -89,7 +91,7 @@ protected:
virtual const SwContentFrame* DoSetBidiLevelLeftRight(
bool & io_rbLeft, bool bVisualAllowed, bool bInsertCursor);
virtual void DoSetBidiLevelUpDown();
- virtual bool IsSelOvrCheck(int eFlags);
+ virtual bool IsSelOvrCheck(SwCursorSelOverFlags eFlags);
public:
// single argument ctors shall be explicit.
@@ -191,10 +193,10 @@ public:
// Is there a selection of content in table?
// Return value indicates if cursor remains at its old position.
- virtual bool IsSelOvr( int eFlags =
- ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
- nsSwCursorSelOverFlags::SELOVER_TOGGLE |
- nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ));
+ virtual bool IsSelOvr( SwCursorSelOverFlags eFlags =
+ ( SwCursorSelOverFlags::CheckNodeSection |
+ SwCursorSelOverFlags::Toggle |
+ SwCursorSelOverFlags::ChangePos ));
bool IsInProtectTable( bool bMove = false,
bool bChgCursor = true );
bool IsNoContent() const;
@@ -267,7 +269,7 @@ protected:
bool m_bChanged : 1;
bool m_bParked : 1; // Table-cursor was parked.
- virtual bool IsSelOvrCheck(int eFlags) override;
+ virtual bool IsSelOvrCheck(SwCursorSelOverFlags eFlags) override;
public:
SwTableCursor( const SwPosition &rPos );