diff options
| author | Rimas Kudelis <rq@akl.lt> | 2015-03-07 16:51:12 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2015-03-07 20:04:49 +0000 |
| commit | 62b245e4b09f7efc98bc2c8bca4e5bb804b97d21 (patch) | |
| tree | 2b2f64dd4dc89294e0967a7bf5c2cfee7199ac49 /vcl | |
| parent | 63050dccbc50f148cd788730faa53d822d37e54f (diff) | |
Dropped old black&white hsizebar, hsplit, vsizebar and vsplit cursors in
favor of IDC_SIZENS and IDC_SIZEWE provided by windows.
Change-Id: I44b96ad2d6a27f0b49806b0bed8f6f7b7739122b
Reviewed-on: https://gerrit.libreoffice.org/14784
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/WinResTarget_vcl.mk | 4 | ||||
| -rw-r--r-- | vcl/win/source/src/hsizebar.cur | bin | 326 -> 0 bytes | |||
| -rw-r--r-- | vcl/win/source/src/hsplit.cur | bin | 326 -> 0 bytes | |||
| -rw-r--r-- | vcl/win/source/src/salsrc.rc | 4 | ||||
| -rw-r--r-- | vcl/win/source/src/vsizebar.cur | bin | 326 -> 0 bytes | |||
| -rw-r--r-- | vcl/win/source/src/vsplit.cur | bin | 326 -> 0 bytes | |||
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 8 |
7 files changed, 4 insertions, 12 deletions
diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk index 0416db7ad416..7d357726e32d 100644 --- a/vcl/WinResTarget_vcl.mk +++ b/vcl/WinResTarget_vcl.mk @@ -69,11 +69,9 @@ $(eval $(call gb_WinResTarget_add_dependencies,vcl/salsrc,\ vcl/win/source/src/timemove.cur \ vcl/win/source/src/ass.cur \ vcl/win/source/src/dbezier.cur \ - vcl/win/source/src/hsizebar.cur \ vcl/win/source/src/timesize.cur \ vcl/win/source/src/asse.cur \ vcl/win/source/src/dcapt.cur \ - vcl/win/source/src/hsplit.cur \ vcl/win/source/src/vshear.cur \ vcl/win/source/src/assw.cur \ vcl/win/source/src/dcirccut.cur \ @@ -83,12 +81,10 @@ $(eval $(call gb_WinResTarget_add_dependencies,vcl/salsrc,\ vcl/win/source/src/dconnect.cur \ vcl/win/source/src/linkf.cur \ vcl/win/source/src/pivotdel.cur \ - vcl/win/source/src/vsizebar.cur \ vcl/win/source/src/aswe.cur \ vcl/win/source/src/dellipse.cur \ vcl/win/source/src/magnify.cur \ vcl/win/source/src/pivotfld.cur \ - vcl/win/source/src/vsplit.cur \ vcl/win/source/src/chain.cur \ vcl/win/source/src/detectiv.cur \ vcl/win/source/src/mirror.cur \ diff --git a/vcl/win/source/src/hsizebar.cur b/vcl/win/source/src/hsizebar.cur Binary files differdeleted file mode 100644 index dda3483bb5d4..000000000000 --- a/vcl/win/source/src/hsizebar.cur +++ /dev/null diff --git a/vcl/win/source/src/hsplit.cur b/vcl/win/source/src/hsplit.cur Binary files differdeleted file mode 100644 index f2f0be363d3a..000000000000 --- a/vcl/win/source/src/hsplit.cur +++ /dev/null diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc index 5b6ca6551044..2084bc13609f 100644 --- a/vcl/win/source/src/salsrc.rc +++ b/vcl/win/source/src/salsrc.rc @@ -20,10 +20,6 @@ #include <win/salids.hrc> SAL_RESID_POINTER_NULL CURSOR nullptr.cur -SAL_RESID_POINTER_HSPLIT CURSOR hsplit.cur -SAL_RESID_POINTER_VSPLIT CURSOR vsplit.cur -SAL_RESID_POINTER_HSIZEBAR CURSOR hsizebar.cur -SAL_RESID_POINTER_VSIZEBAR CURSOR vsizebar.cur SAL_RESID_POINTER_MAGNIFY CURSOR magnify.cur SAL_RESID_POINTER_FILL CURSOR fill.cur SAL_RESID_POINTER_ROTATE CURSOR rotate.cur diff --git a/vcl/win/source/src/vsizebar.cur b/vcl/win/source/src/vsizebar.cur Binary files differdeleted file mode 100644 index a87811cb474d..000000000000 --- a/vcl/win/source/src/vsizebar.cur +++ /dev/null diff --git a/vcl/win/source/src/vsplit.cur b/vcl/win/source/src/vsplit.cur Binary files differdeleted file mode 100644 index a4260808fadc..000000000000 --- a/vcl/win/source/src/vsplit.cur +++ /dev/null diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index e99a651d578f..fbd82f03e314 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -2086,10 +2086,10 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) { 0, IDC_SIZENESW, 0 }, // POINTER_WINDOW_NESIZE { 0, IDC_SIZENESW, 0 }, // POINTER_WINDOW_SWSIZE { 0, IDC_SIZENWSE, 0 }, // POINTER_WINDOW_SESIZE - { 0, 0, SAL_RESID_POINTER_HSPLIT }, // POINTER_HSPLIT - { 0, 0, SAL_RESID_POINTER_VSPLIT }, // POINTER_VSPLIT - { 0, 0, SAL_RESID_POINTER_HSIZEBAR }, // POINTER_HSIZEBAR - { 0, 0, SAL_RESID_POINTER_VSIZEBAR }, // POINTER_VSIZEBAR + { 0, IDC_SIZEWE, 0 }, // POINTER_HSPLIT + { 0, IDC_SIZENS, 0 }, // POINTER_VSPLIT + { 0, IDC_SIZEWE, 0 }, // POINTER_HSIZEBAR + { 0, IDC_SIZENS, 0 }, // POINTER_VSIZEBAR { 0, IDC_HAND, 0 }, // POINTER_HAND { 0, IDC_HAND, 0 }, // POINTER_REFHAND { 0, IDC_PEN, 0 }, // POINTER_PEN |