diff options
| author | Noel Grandin <noel@peralex.com> | 2014-10-12 18:42:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-13 06:54:23 +0000 |
| commit | edb6783c14a9303af000b54ce63f55967289a7a6 (patch) | |
| tree | dfb843caf6019b7c9922c7122d3becea75832b17 /sw/inc | |
| parent | eadc132d5fa339b6fe5b2f8bb482ed30dbd23147 (diff) | |
convert SW_TAB #defines to enum
Change-Id: I8f2c63dc381416af1eb74794a1bbc3417eb272d6
Reviewed-on: https://gerrit.libreoffice.org/11936
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/authratr.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/fesh.hxx | 33 |
2 files changed, 19 insertions, 16 deletions
diff --git a/sw/inc/authratr.hxx b/sw/inc/authratr.hxx index 3bd8bde98858..188da163ac90 100644 --- a/sw/inc/authratr.hxx +++ b/sw/inc/authratr.hxx @@ -24,7 +24,7 @@ #include <tools/color.hxx> #include "swdllapi.h" -#define COL_NONE TRGB_COLORDATA( 0x80, 0xFF, 0xFF, 0xFF ) +#define COL_NONE_COLOR TRGB_COLORDATA( 0x80, 0xFF, 0xFF, 0xFF ) class SW_DLLPUBLIC AuthorCharAttr { diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index f01e2d5c4722..4896406e76a4 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -151,20 +151,23 @@ enum class SwMove RIGHT = 3 }; -#define SW_TABCOL_NONE 0 -#define SW_TABCOL_HORI 1 -#define SW_TABCOL_VERT 2 -#define SW_TABROW_HORI 3 -#define SW_TABROW_VERT 4 - -#define SW_TABSEL_HORI 5 -#define SW_TABSEL_HORI_RTL 6 -#define SW_TABROWSEL_HORI 7 -#define SW_TABROWSEL_HORI_RTL 8 -#define SW_TABCOLSEL_HORI 9 -#define SW_TABSEL_VERT 10 -#define SW_TABROWSEL_VERT 11 -#define SW_TABCOLSEL_VERT 12 +// return values for WhichMouseTabCol +enum class SwTab +{ + COL_NONE = 0, + COL_HORI = 1, + COL_VERT = 2, + ROW_HORI = 3, + ROW_VERT = 4, + SEL_HORI = 5, + SEL_HORI_RTL = 6, + ROWSEL_HORI = 7, + ROWSEL_HORI_RTL = 8, + COLSEL_HORI = 9, + SEL_VERT = 10, + ROWSEL_VERT = 11, + COLSEL_VERT = 12 +}; class SdrDropMarkerOverlay; @@ -633,7 +636,7 @@ public: void SetRowBackground( const SvxBrushItem &rNew ); bool GetRowBackground( SvxBrushItem &rToFill ) const; ///< FALSE ambiguous. - sal_uInt8 WhichMouseTabCol( const Point &rPt ) const; + SwTab WhichMouseTabCol( const Point &rPt ) const; void GetTabCols( SwTabCols &rToFill ) const; ///< Info about columns and margins. void SetTabCols( const SwTabCols &rNew, bool bCurRowOnly = true ); void GetMouseTabCols( SwTabCols &rToFill, const Point &rPt ) const; |