diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-04-13 16:53:10 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-14 10:00:42 +0200 |
commit | 77d78b339133b4f8bc50a22cede661becc2b565b (patch) | |
tree | 0f9fb54b3a377a3a2f1f0294d06c9382ae8ec53c /vcl/win/window | |
parent | 222cf76001d835961537214eba38037ef40a8aa0 (diff) |
revert removal of apparently unused mouse cursors
partial revert of...
commit 65b7b6322b662785bf032e66c76abc36c9a2bb0e
Date: Wed Feb 8 10:40:28 2017 +0200
loplugin:unusedenumconstants read-only constants in vcl
because we cast the com::sun::star::awt::SystemPointer values to PointerStyle
in VCLXPointer::setType and we've at least lost the PEN as used in the
slideshow context menu's pen mode
"toolkit/source/awt/vclxpointer.cxx" 74L, 2181C
Change-Id: I5ef677f70ebc491b50403de0f92179ea4ae3bb14
Reviewed-on: https://gerrit.libreoffice.org/36526
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/win/window')
-rw-r--r-- | vcl/win/window/salframe.cxx | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 41eb6aa3d2c6..6d3f99bf3e5b 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -109,6 +109,9 @@ using namespace ::com::sun::star::beans; #ifndef WM_MOUSEHWHEEL # define WM_MOUSEHWHEEL 0x020E #endif +#ifndef IDC_PEN +# define IDC_PEN MAKEINTRESOURCE(32631) +#endif const unsigned int WM_USER_SYSTEM_WINDOW_ACTIVATED = RegisterWindowMessageA("SYSTEM_WINDOW_ACTIVATED"); @@ -2071,6 +2074,7 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) { nullptr, IDC_SIZENS, 0 }, // POINTER_VSIZEBAR { nullptr, IDC_HAND, 0 }, // POINTER_HAND { nullptr, IDC_HAND, 0 }, // POINTER_REFHAND + { nullptr, IDC_PEN, 0 }, // POINTER_PEN { nullptr, nullptr, SAL_RESID_POINTER_MAGNIFY }, // POINTER_MAGNIFY { nullptr, nullptr, SAL_RESID_POINTER_FILL }, // POINTER_FILL { nullptr, nullptr, SAL_RESID_POINTER_ROTATE }, // POINTER_ROTATE @@ -2081,9 +2085,18 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) { nullptr, nullptr, SAL_RESID_POINTER_CROP }, // POINTER_CROP { nullptr, nullptr, SAL_RESID_POINTER_MOVEPOINT }, // POINTER_MOVEPOINT { nullptr, nullptr, SAL_RESID_POINTER_MOVEBEZIERWEIGHT }, // POINTER_MOVEBEZIERWEIGHT + { nullptr, nullptr, SAL_RESID_POINTER_MOVEDATA }, // POINTER_MOVEDATA { nullptr, nullptr, SAL_RESID_POINTER_COPYDATA }, // POINTER_COPYDATA { nullptr, nullptr, SAL_RESID_POINTER_LINKDATA }, // POINTER_LINKDATA { nullptr, nullptr, SAL_RESID_POINTER_MOVEDATALINK }, // POINTER_MOVEDATALINK + { nullptr, nullptr, SAL_RESID_POINTER_COPYDATALINK }, // POINTER_COPYDATALINK + { nullptr, nullptr, SAL_RESID_POINTER_MOVEFILE }, // POINTER_MOVEFILE + { nullptr, nullptr, SAL_RESID_POINTER_COPYFILE }, // POINTER_COPYFILE + { nullptr, nullptr, SAL_RESID_POINTER_LINKFILE }, // POINTER_LINKFILE + { nullptr, nullptr, SAL_RESID_POINTER_MOVEFILELINK }, // POINTER_MOVEFILELINK + { nullptr, nullptr, SAL_RESID_POINTER_COPYFILELINK }, // POINTER_COPYFILELINK + { nullptr, nullptr, SAL_RESID_POINTER_MOVEFILES }, // POINTER_MOVEFILES + { nullptr, nullptr, SAL_RESID_POINTER_COPYFILES }, // POINTER_COPYFILES { nullptr, IDC_NO, 0 }, // POINTER_NOTALLOWED { nullptr, nullptr, SAL_RESID_POINTER_DRAW_LINE }, // POINTER_DRAW_LINE { nullptr, nullptr, SAL_RESID_POINTER_DRAW_RECT }, // POINTER_DRAW_RECT @@ -2097,12 +2110,15 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) { nullptr, nullptr, SAL_RESID_POINTER_DRAW_CONNECT }, // POINTER_DRAW_CONNECT { nullptr, nullptr, SAL_RESID_POINTER_DRAW_TEXT }, // POINTER_DRAW_TEXT { nullptr, nullptr, SAL_RESID_POINTER_DRAW_CAPTION }, // POINTER_DRAW_CAPTION + { nullptr, nullptr, SAL_RESID_POINTER_CHART }, // POINTER_CHART { nullptr, nullptr, SAL_RESID_POINTER_DETECTIVE }, // POINTER_DETECTIVE { nullptr, nullptr, SAL_RESID_POINTER_PIVOT_COL }, // POINTER_PIVOT_COL { nullptr, nullptr, SAL_RESID_POINTER_PIVOT_ROW }, // POINTER_PIVOT_ROW { nullptr, nullptr, SAL_RESID_POINTER_PIVOT_FIELD }, // POINTER_PIVOT_FIELD { nullptr, nullptr, SAL_RESID_POINTER_CHAIN }, // POINTER_CHAIN { nullptr, nullptr, SAL_RESID_POINTER_CHAIN_NOTALLOWED }, // POINTER_CHAIN_NOTALLOWED + { nullptr, nullptr, SAL_RESID_POINTER_TIMEEVENT_MOVE }, // POINTER_TIMEEVENT_MOVE + { nullptr, nullptr, SAL_RESID_POINTER_TIMEEVENT_SIZE }, // POINTER_TIMEEVENT_SIZE { nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_N }, // POINTER_AUTOSCROLL_N { nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_S }, // POINTER_AUTOSCROLL_S { nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_W }, // POINTER_AUTOSCROLL_W @@ -2114,6 +2130,7 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) { nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_NS }, // POINTER_AUTOSCROLL_NS { nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_WE }, // POINTER_AUTOSCROLL_WE { nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_NSWE }, // POINTER_AUTOSCROLL_NSWE + { nullptr, nullptr, SAL_RESID_POINTER_AIRBRUSH }, // POINTER_AIRBRUSH { nullptr, nullptr, SAL_RESID_POINTER_TEXT_VERTICAL }, // POINTER_TEXT_VERTICAL { nullptr, nullptr, SAL_RESID_POINTER_PIVOT_DELETE }, // POINTER_PIVOT_DELETE @@ -2124,6 +2141,9 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) { nullptr, nullptr, SAL_RESID_POINTER_TAB_SELECT_W }, // POINTER_TAB_SELECT_W { nullptr, nullptr, SAL_RESID_POINTER_TAB_SELECT_SW }, // POINTER_TAB_SELECT_SW + // #i20119# + { nullptr, nullptr, SAL_RESID_POINTER_PAINTBRUSH }, // POINTER_PAINTBRUSH + { nullptr, nullptr, SAL_RESID_POINTER_HIDEWHITESPACE }, // POINTER_HIDEWHITESPACE { nullptr, nullptr, SAL_RESID_POINTER_SHOWWHITESPACE } // POINTER_UNHIDEWHITESPACE }; |