diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-20 14:05:50 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-05-29 20:16:52 +0200 |
| commit | 118da1a52a74c602ecacec9ffb163b93589cf6e1 (patch) | |
| tree | 9fc08877a716ce679440eae63a5e7a59a6c465eb /vcl/win | |
| parent | 66b8dfdc4d1f689d98652cdb52902a2582e801ee (diff) | |
convert POINTER constants to scoped enum
Change-Id: Iea29ce5fd6c620535197d3ca8538335078430e19
Reviewed-on: https://gerrit.libreoffice.org/15825
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Signed-off-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 79f4e6ee0dd6..25058c5d2edd 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -39,6 +39,7 @@ #include <osl/module.h> #include <tools/debug.hxx> +#include <o3tl/enumarray.hxx> #include <vcl/sysdata.hxx> #include <vcl/timer.hxx> @@ -2061,9 +2062,9 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) UINT mnOwnId; }; - static ImplPtrData aImplPtrTab[POINTER_COUNT] = + static o3tl::enumarray<PointerStyle, ImplPtrData> aImplPtrTab = { - { 0, IDC_ARROW, 0 }, // POINTER_ARROW + ImplPtrData{ 0, IDC_ARROW, 0 }, // POINTER_ARROW { 0, 0, SAL_RESID_POINTER_NULL }, // POINTER_NULL { 0, IDC_WAIT, 0 }, // POINTER_WAIT { 0, IDC_IBEAM, 0 }, // POINTER_TEXT @@ -2152,22 +2153,18 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) { 0, 0, SAL_RESID_POINTER_TEXT_VERTICAL }, // POINTER_TEXT_VERTICAL { 0, 0, SAL_RESID_POINTER_PIVOT_DELETE }, // POINTER_PIVOT_DELETE - // #i32329# + // #i32329# { 0, 0, SAL_RESID_POINTER_TAB_SELECT_S }, // POINTER_TAB_SELECT_S { 0, 0, SAL_RESID_POINTER_TAB_SELECT_E }, // POINTER_TAB_SELECT_E { 0, 0, SAL_RESID_POINTER_TAB_SELECT_SE }, // POINTER_TAB_SELECT_SE { 0, 0, SAL_RESID_POINTER_TAB_SELECT_W }, // POINTER_TAB_SELECT_W { 0, 0, SAL_RESID_POINTER_TAB_SELECT_SW }, // POINTER_TAB_SELECT_SW - // #i20119# + // #i20119# { 0, 0, SAL_RESID_POINTER_PAINTBRUSH } // POINTER_PAINTBRUSH }; -#if POINTER_COUNT != 94 -#error New Pointer must be defined! -#endif - // Mousepointer loaded ? if ( !aImplPtrTab[ePointerStyle].mhCursor ) { |