[Libreoffice-commits] core.git: vcl/win vcl/WinResTarget_vcl.mk

[Rimas Kudelis]

 dev/null                           |binary
 vcl/WinResTarget_vcl.mk            |    4 ----
 vcl/win/source/src/salsrc.rc       |    4 ----
 vcl/win/source/window/salframe.cxx |    8 ++++----
 4 files changed, 4 insertions(+), 12 deletions(-)

New commits:
commit 62b245e4b09f7efc98bc2c8bca4e5bb804b97d21
Author: Rimas Kudelis <rq at akl.lt>
Date:   Sat Mar 7 16:51:12 2015 +0200

    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 at libreoffice.org>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
index 0416db7..7d35772 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
deleted file mode 100644
index dda3483..0000000
Binary files a/vcl/win/source/src/hsizebar.cur and /dev/null differ
diff --git a/vcl/win/source/src/hsplit.cur b/vcl/win/source/src/hsplit.cur
deleted file mode 100644
index f2f0be3..0000000
Binary files a/vcl/win/source/src/hsplit.cur and /dev/null differ
diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc
index 5b6ca65..2084bc1 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
deleted file mode 100644
index a87811c..0000000
Binary files a/vcl/win/source/src/vsizebar.cur and /dev/null differ
diff --git a/vcl/win/source/src/vsplit.cur b/vcl/win/source/src/vsplit.cur
deleted file mode 100644
index a426080..0000000
Binary files a/vcl/win/source/src/vsplit.cur and /dev/null differ
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index e99a651..fbd82f0 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