diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-10 15:36:48 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-13 08:17:42 +0200 |
commit | 80d2fa87fdaf67615d7b8128f3c05b239a1f1c05 (patch) | |
tree | 86fbf89631b4c82228e48ffd04da9ba776c07cb0 /sw/inc/crsrsh.hxx | |
parent | f0c57266709509ae24cfb1615d136263fb1e8d60 (diff) |
convert IsAttrAtPos to scoped o3tl::typed_flags
Change-Id: Ie3a361a96201cb1a0ab446bcf77b7c0e79e05e89
Diffstat (limited to 'sw/inc/crsrsh.hxx')
-rw-r--r-- | sw/inc/crsrsh.hxx | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 66718855192c..bcb9eb4a7357 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -24,6 +24,7 @@ #include <rtl/ustring.hxx> #include <tools/link.hxx> #include <vcl/keycod.hxx> +#include <o3tl/typed_flags_set.hxx> #include <IShellCursorSupplier.hxx> #include "swdllapi.h" @@ -80,29 +81,34 @@ namespace com { namespace sun { namespace star { namespace container { // enum and struct to get information via the Doc-Position -struct SwContentAtPos +enum class IsAttrAtPos { - enum IsAttrAtPos - { - SW_NOTHING = 0x0000, - SW_FIELD = 0x0001, - SW_CLICKFIELD = 0x0002, - SW_FTN = 0x0004, - SW_INETATTR = 0x0008, - SW_TABLEBOXFML = 0x0010, - SW_REDLINE = 0x0020, - SW_OUTLINE = 0x0040, - SW_TOXMARK = 0x0080, - SW_REFMARK = 0x0100, - SW_NUMLABEL = 0x0200, - SW_CONTENT_CHECK = 0x0400, - SW_SMARTTAG = 0x0800, - SW_FORMCTRL = 0x1000 + NONE = 0x0000, + Field = 0x0001, + ClickField = 0x0002, + Ftn = 0x0004, + InetAttr = 0x0008, + TableBoxFml = 0x0010, + Redline = 0x0020, + Outline = 0x0040, + ToxMark = 0x0080, + RefMark = 0x0100, + NumLabel = 0x0200, + ContentCheck = 0x0400, + SmartTag = 0x0800, + FormControl = 0x1000 #ifdef DBG_UTIL - ,SW_CURR_ATTRS = 0x4000 ///< only for debugging - ,SW_TABLEBOXVALUE = 0x8000 ///< only for debugging + ,CurrAttrs = 0x2000 ///< only for debugging + ,TableBoxValue = 0x4000 ///< only for debugging #endif - } eContentAtPos; +}; +namespace o3tl { + template<> struct typed_flags<IsAttrAtPos> : is_typed_flags<IsAttrAtPos, 0x7fff> {}; +} + +struct SwContentAtPos +{ + IsAttrAtPos eContentAtPos; union { const SwField* pField; @@ -117,8 +123,8 @@ struct SwContentAtPos OUString sStr; const SwTextAttr* pFndTextAttr; - SwContentAtPos( int eGetAtPos ) - : eContentAtPos( (IsAttrAtPos)eGetAtPos ) + SwContentAtPos( IsAttrAtPos eGetAtPos ) + : eContentAtPos( eGetAtPos ) { aFnd.pField = nullptr; pFndTextAttr = nullptr; @@ -126,7 +132,7 @@ struct SwContentAtPos } bool IsInProtectSect() const; - bool IsInRTLText()const; + bool IsInRTLText() const; }; // return values of SetCursor (can be combined via ||) |