Get rid of a superfluous directory level

Change-Id: I79e065f0c68b149d2ef69f428d31e36e97a6098b

95 files changed, 90 insertions, 90 deletions

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 25f2d855c46f..8e55cdcdbf11 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -692,26 +692,26 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 	vcl/opengl/win/gdiimpl \
 	vcl/opengl/win/WinDeviceInfo \
 	vcl/opengl/win/blocklist_parser \
-    vcl/win/source/app/saldata \
-    vcl/win/source/app/salinfo \
-    vcl/win/source/app/salinst \
-    vcl/win/source/app/salshl \
-    vcl/win/source/app/saltimer \
-    vcl/win/source/gdi/gdiimpl \
-    vcl/win/source/gdi/salbmp \
-    vcl/win/source/gdi/salgdi \
-    vcl/win/source/gdi/salgdi2 \
-    vcl/win/source/gdi/salgdi3 \
-    vcl/win/source/gdi/salgdi_gdiplus \
-    vcl/win/source/gdi/salnativewidgets-luna \
-    vcl/win/source/gdi/salprn \
-    vcl/win/source/gdi/salvd \
-    vcl/win/source/gdi/winlayout \
-    vcl/win/source/gdi/wntgdi \
-    vcl/win/source/window/salframe \
-    vcl/win/source/window/keynames \
-    vcl/win/source/window/salmenu \
-    vcl/win/source/window/salobj \
+    vcl/win/app/saldata \
+    vcl/win/app/salinfo \
+    vcl/win/app/salinst \
+    vcl/win/app/salshl \
+    vcl/win/app/saltimer \
+    vcl/win/gdi/gdiimpl \
+    vcl/win/gdi/salbmp \
+    vcl/win/gdi/salgdi \
+    vcl/win/gdi/salgdi2 \
+    vcl/win/gdi/salgdi3 \
+    vcl/win/gdi/salgdi_gdiplus \
+    vcl/win/gdi/salnativewidgets-luna \
+    vcl/win/gdi/salprn \
+    vcl/win/gdi/salvd \
+    vcl/win/gdi/winlayout \
+    vcl/win/gdi/wntgdi \
+    vcl/win/window/salframe \
+    vcl/win/window/keynames \
+    vcl/win/window/salmenu \
+    vcl/win/window/salobj \
 ))
 
 $(eval $(call gb_Library_use_system_win32_libs,vcl,\
diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
index 7d357726e32d..b3ad34fd63f6 100644
--- a/vcl/WinResTarget_vcl.mk
+++ b/vcl/WinResTarget_vcl.mk
@@ -25,77 +25,77 @@ $(eval $(call gb_WinResTarget_set_include,vcl/salsrc,\
 ))
 
 $(eval $(call gb_WinResTarget_set_rcfile,vcl/salsrc,\
-    vcl/win/source/src/salsrc \
+    vcl/win/src/salsrc \
 ))
 $(eval $(call gb_WinResTarget_add_dependencies,vcl/salsrc,\
-    vcl/win/source/src/dtext.cur \
-    vcl/win/source/src/50.bmp \
-    vcl/win/source/src/copydata.cur \
-    vcl/win/source/src/dpie.cur \
-    vcl/win/source/src/movedata.cur \
-    vcl/win/source/src/rotate.cur \
-    vcl/win/source/src/50.png \
-    vcl/win/source/src/copydlnk.cur \
-    vcl/win/source/src/dpolygon.cur \
-    vcl/win/source/src/movedlnk.cur \
-    vcl/win/source/src/salsrc.rc \
-    vcl/win/source/src/airbrush.cur \
-    vcl/win/source/src/copyf.cur \
-    vcl/win/source/src/drect.cur \
-    vcl/win/source/src/movef.cur \
-    vcl/win/source/src/ase.cur \
-    vcl/win/source/src/copyf2.cur \
-    vcl/win/source/src/dtext.cur \
-    vcl/win/source/src/movef2.cur \
-    vcl/win/source/src/tblsele.cur \
-    vcl/win/source/src/asn.cur \
-    vcl/win/source/src/copyflnk.cur \
-    vcl/win/source/src/fill.cur \
-    vcl/win/source/src/moveflnk.cur \
-    vcl/win/source/src/tblsels.cur \
-    vcl/win/source/src/asne.cur \
-    vcl/win/source/src/crook.cur \
-    vcl/win/source/src/movept.cur \
-    vcl/win/source/src/tblselse.cur \
-    vcl/win/source/src/asns.cur \
-    vcl/win/source/src/crop.cur \
-    vcl/win/source/src/tblselsw.cur \
-    vcl/win/source/src/asnswe.cur \
-    vcl/win/source/src/hshear.cur \
-    vcl/win/source/src/tblselw.cur \
-    vcl/win/source/src/asnw.cur \
-    vcl/win/source/src/darc.cur \
-    vcl/win/source/src/nullptr.cur \
-    vcl/win/source/src/timemove.cur \
-    vcl/win/source/src/ass.cur \
-    vcl/win/source/src/dbezier.cur \
-    vcl/win/source/src/timesize.cur \
-    vcl/win/source/src/asse.cur \
-    vcl/win/source/src/dcapt.cur \
-    vcl/win/source/src/vshear.cur \
-    vcl/win/source/src/assw.cur \
-    vcl/win/source/src/dcirccut.cur \
-    vcl/win/source/src/linkdata.cur \
-    vcl/win/source/src/pivotcol.cur \
-    vcl/win/source/src/asw.cur \
-    vcl/win/source/src/dconnect.cur \
-    vcl/win/source/src/linkf.cur \
-    vcl/win/source/src/pivotdel.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/chain.cur \
-    vcl/win/source/src/detectiv.cur \
-    vcl/win/source/src/mirror.cur \
-    vcl/win/source/src/pivotrow.cur \
-    vcl/win/source/src/vtext.cur \
-    vcl/win/source/src/chainnot.cur \
-    vcl/win/source/src/dfree.cur \
-    vcl/win/source/src/pntbrsh.cur \
-    vcl/win/source/src/chart.cur \
-    vcl/win/source/src/dline.cur \
-    vcl/win/source/src/movebw.cur \
+    vcl/win/src/dtext.cur \
+    vcl/win/src/50.bmp \
+    vcl/win/src/copydata.cur \
+    vcl/win/src/dpie.cur \
+    vcl/win/src/movedata.cur \
+    vcl/win/src/rotate.cur \
+    vcl/win/src/50.png \
+    vcl/win/src/copydlnk.cur \
+    vcl/win/src/dpolygon.cur \
+    vcl/win/src/movedlnk.cur \
+    vcl/win/src/salsrc.rc \
+    vcl/win/src/airbrush.cur \
+    vcl/win/src/copyf.cur \
+    vcl/win/src/drect.cur \
+    vcl/win/src/movef.cur \
+    vcl/win/src/ase.cur \
+    vcl/win/src/copyf2.cur \
+    vcl/win/src/dtext.cur \
+    vcl/win/src/movef2.cur \
+    vcl/win/src/tblsele.cur \
+    vcl/win/src/asn.cur \
+    vcl/win/src/copyflnk.cur \
+    vcl/win/src/fill.cur \
+    vcl/win/src/moveflnk.cur \
+    vcl/win/src/tblsels.cur \
+    vcl/win/src/asne.cur \
+    vcl/win/src/crook.cur \
+    vcl/win/src/movept.cur \
+    vcl/win/src/tblselse.cur \
+    vcl/win/src/asns.cur \
+    vcl/win/src/crop.cur \
+    vcl/win/src/tblselsw.cur \
+    vcl/win/src/asnswe.cur \
+    vcl/win/src/hshear.cur \
+    vcl/win/src/tblselw.cur \
+    vcl/win/src/asnw.cur \
+    vcl/win/src/darc.cur \
+    vcl/win/src/nullptr.cur \
+    vcl/win/src/timemove.cur \
+    vcl/win/src/ass.cur \
+    vcl/win/src/dbezier.cur \
+    vcl/win/src/timesize.cur \
+    vcl/win/src/asse.cur \
+    vcl/win/src/dcapt.cur \
+    vcl/win/src/vshear.cur \
+    vcl/win/src/assw.cur \
+    vcl/win/src/dcirccut.cur \
+    vcl/win/src/linkdata.cur \
+    vcl/win/src/pivotcol.cur \
+    vcl/win/src/asw.cur \
+    vcl/win/src/dconnect.cur \
+    vcl/win/src/linkf.cur \
+    vcl/win/src/pivotdel.cur \
+    vcl/win/src/aswe.cur \
+    vcl/win/src/dellipse.cur \
+    vcl/win/src/magnify.cur \
+    vcl/win/src/pivotfld.cur \
+    vcl/win/src/chain.cur \
+    vcl/win/src/detectiv.cur \
+    vcl/win/src/mirror.cur \
+    vcl/win/src/pivotrow.cur \
+    vcl/win/src/vtext.cur \
+    vcl/win/src/chainnot.cur \
+    vcl/win/src/dfree.cur \
+    vcl/win/src/pntbrsh.cur \
+    vcl/win/src/chart.cur \
+    vcl/win/src/dline.cur \
+    vcl/win/src/movebw.cur \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/inc/salglyphid.hxx b/vcl/inc/salglyphid.hxx
index fa9f59379e4a..055bd73b85eb 100644
--- a/vcl/inc/salglyphid.hxx
+++ b/vcl/inc/salglyphid.hxx
@@ -31,7 +31,7 @@ typedef sal_uInt32 sal_GlyphId;
 // caution !!!
 #define GF_VERT     0x02000000
 // GF_VERT is only for windows implementation
-// (win/source/gdi/salgdi3.cxx, win/source/gdi/winlayout.cxx)
+// (win/gdi/salgdi3.cxx, win/gdi/winlayout.cxx)
 // don't use this elsewhere !!!
 #define GF_ROTR     0x03000000
 #define GF_ROTMASK  0x03000000
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/app/saldata.cxx
index 18256ee8ccd7..18256ee8ccd7 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/app/saldata.cxx
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/app/salinfo.cxx
index 2e30910f821d..2e30910f821d 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/app/salinfo.cxx
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 5cf6c3dd58ba..5cf6c3dd58ba 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/app/salshl.cxx
index c418063eaf45..c418063eaf45 100644
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/app/salshl.cxx
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/app/saltimer.cxx
index c6f04be986fe..c6f04be986fe 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/app/saltimer.cxx
diff --git a/vcl/win/source/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 89093bb4e288..89093bb4e288 100644
--- a/vcl/win/source/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
diff --git a/vcl/win/source/gdi/gdiimpl.hxx b/vcl/win/gdi/gdiimpl.hxx
index c36052cc955f..c36052cc955f 100644
--- a/vcl/win/source/gdi/gdiimpl.hxx
+++ b/vcl/win/gdi/gdiimpl.hxx
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index 3e10ab9fafe0..3e10ab9fafe0 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/gdi/salgdi.cxx
index 366b81c8d459..366b81c8d459 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/gdi/salgdi.cxx
diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/gdi/salgdi2.cxx
index 64516c248569..64516c248569 100644
--- a/vcl/win/source/gdi/salgdi2.cxx
+++ b/vcl/win/gdi/salgdi2.cxx
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/gdi/salgdi3.cxx
index 732118689fef..732118689fef 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/gdi/salgdi3.cxx
diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/gdi/salgdi_gdiplus.cxx
index b07186550132..b07186550132 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/gdi/salgdi_gdiplus.cxx
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/gdi/salnativewidgets-luna.cxx
index e10de37da9c4..e10de37da9c4 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index b0aca3c25a27..b0aca3c25a27 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/gdi/salvd.cxx
index 2cfef6f5f770..2cfef6f5f770 100644
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/gdi/salvd.cxx
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index b5ce57e51bfb..b5ce57e51bfb 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
diff --git a/vcl/win/source/gdi/winlayout.hxx b/vcl/win/gdi/winlayout.hxx
index 545d26735907..545d26735907 100644
--- a/vcl/win/source/gdi/winlayout.hxx
+++ b/vcl/win/gdi/winlayout.hxx
diff --git a/vcl/win/source/gdi/wntgdi.cxx b/vcl/win/gdi/wntgdi.cxx
index bf0ad25fe860..bf0ad25fe860 100644
--- a/vcl/win/source/gdi/wntgdi.cxx
+++ b/vcl/win/gdi/wntgdi.cxx
diff --git a/vcl/win/source/src/50.bmp b/vcl/win/src/50.bmp
index b9d56fcd14c1..b9d56fcd14c1 100644
--- a/vcl/win/source/src/50.bmp
+++ b/vcl/win/src/50.bmp
diff --git a/vcl/win/source/src/50.png b/vcl/win/src/50.png
index 8517d965f0b9..8517d965f0b9 100644
--- a/vcl/win/source/src/50.png
+++ b/vcl/win/src/50.png
diff --git a/vcl/win/source/src/airbrush.cur b/vcl/win/src/airbrush.cur
index f6a684e6fcbd..f6a684e6fcbd 100644
--- a/vcl/win/source/src/airbrush.cur
+++ b/vcl/win/src/airbrush.cur
diff --git a/vcl/win/source/src/ase.cur b/vcl/win/src/ase.cur
index 7634a7d34a7b..7634a7d34a7b 100644
--- a/vcl/win/source/src/ase.cur
+++ b/vcl/win/src/ase.cur
diff --git a/vcl/win/source/src/asn.cur b/vcl/win/src/asn.cur
index e444e42bf37e..e444e42bf37e 100644
--- a/vcl/win/source/src/asn.cur
+++ b/vcl/win/src/asn.cur
diff --git a/vcl/win/source/src/asne.cur b/vcl/win/src/asne.cur
index e92cc65e7eb1..e92cc65e7eb1 100644
--- a/vcl/win/source/src/asne.cur
+++ b/vcl/win/src/asne.cur
diff --git a/vcl/win/source/src/asns.cur b/vcl/win/src/asns.cur
index 04d0b09c353e..04d0b09c353e 100644
--- a/vcl/win/source/src/asns.cur
+++ b/vcl/win/src/asns.cur
diff --git a/vcl/win/source/src/asnswe.cur b/vcl/win/src/asnswe.cur
index a0e25b16de1f..a0e25b16de1f 100644
--- a/vcl/win/source/src/asnswe.cur
+++ b/vcl/win/src/asnswe.cur
diff --git a/vcl/win/source/src/asnw.cur b/vcl/win/src/asnw.cur
index 20322bc97b16..20322bc97b16 100644
--- a/vcl/win/source/src/asnw.cur
+++ b/vcl/win/src/asnw.cur
diff --git a/vcl/win/source/src/ass.cur b/vcl/win/src/ass.cur
index 7166636a1a77..7166636a1a77 100644
--- a/vcl/win/source/src/ass.cur
+++ b/vcl/win/src/ass.cur
diff --git a/vcl/win/source/src/asse.cur b/vcl/win/src/asse.cur
index 8cb71234b0a9..8cb71234b0a9 100644
--- a/vcl/win/source/src/asse.cur
+++ b/vcl/win/src/asse.cur
diff --git a/vcl/win/source/src/assw.cur b/vcl/win/src/assw.cur
index fddaf3f57cbf..fddaf3f57cbf 100644
--- a/vcl/win/source/src/assw.cur
+++ b/vcl/win/src/assw.cur
diff --git a/vcl/win/source/src/asw.cur b/vcl/win/src/asw.cur
index 0ccac50f4596..0ccac50f4596 100644
--- a/vcl/win/source/src/asw.cur
+++ b/vcl/win/src/asw.cur
diff --git a/vcl/win/source/src/aswe.cur b/vcl/win/src/aswe.cur
index c238b7e10aef..c238b7e10aef 100644
--- a/vcl/win/source/src/aswe.cur
+++ b/vcl/win/src/aswe.cur
diff --git a/vcl/win/source/src/chain.cur b/vcl/win/src/chain.cur
index 02abb7ab714f..02abb7ab714f 100644
--- a/vcl/win/source/src/chain.cur
+++ b/vcl/win/src/chain.cur
diff --git a/vcl/win/source/src/chainnot.cur b/vcl/win/src/chainnot.cur
index 938ece03f329..938ece03f329 100644
--- a/vcl/win/source/src/chainnot.cur
+++ b/vcl/win/src/chainnot.cur
diff --git a/vcl/win/source/src/chart.cur b/vcl/win/src/chart.cur
index 25fe85b76039..25fe85b76039 100644
--- a/vcl/win/source/src/chart.cur
+++ b/vcl/win/src/chart.cur
diff --git a/vcl/win/source/src/copydata.cur b/vcl/win/src/copydata.cur
index d3c4bc93afd5..d3c4bc93afd5 100644
--- a/vcl/win/source/src/copydata.cur
+++ b/vcl/win/src/copydata.cur
diff --git a/vcl/win/source/src/copydlnk.cur b/vcl/win/src/copydlnk.cur
index 495fd5e17776..495fd5e17776 100644
--- a/vcl/win/source/src/copydlnk.cur
+++ b/vcl/win/src/copydlnk.cur
diff --git a/vcl/win/source/src/copyf.cur b/vcl/win/src/copyf.cur
index 450c09443a84..450c09443a84 100644
--- a/vcl/win/source/src/copyf.cur
+++ b/vcl/win/src/copyf.cur
diff --git a/vcl/win/source/src/copyf2.cur b/vcl/win/src/copyf2.cur
index ac8de5da6ba5..ac8de5da6ba5 100644
--- a/vcl/win/source/src/copyf2.cur
+++ b/vcl/win/src/copyf2.cur
diff --git a/vcl/win/source/src/copyflnk.cur b/vcl/win/src/copyflnk.cur
index e67f0539fa43..e67f0539fa43 100644
--- a/vcl/win/source/src/copyflnk.cur
+++ b/vcl/win/src/copyflnk.cur
diff --git a/vcl/win/source/src/crook.cur b/vcl/win/src/crook.cur
index c40cf591e261..c40cf591e261 100644
--- a/vcl/win/source/src/crook.cur
+++ b/vcl/win/src/crook.cur
diff --git a/vcl/win/source/src/crop.cur b/vcl/win/src/crop.cur
index 327fb06976c2..327fb06976c2 100644
--- a/vcl/win/source/src/crop.cur
+++ b/vcl/win/src/crop.cur
diff --git a/vcl/win/source/src/darc.cur b/vcl/win/src/darc.cur
index 38504fa23c4a..38504fa23c4a 100644
--- a/vcl/win/source/src/darc.cur
+++ b/vcl/win/src/darc.cur
diff --git a/vcl/win/source/src/dbezier.cur b/vcl/win/src/dbezier.cur
index f630b837ddf8..f630b837ddf8 100644
--- a/vcl/win/source/src/dbezier.cur
+++ b/vcl/win/src/dbezier.cur
diff --git a/vcl/win/source/src/dcapt.cur b/vcl/win/src/dcapt.cur
index 10dd5ba0d676..10dd5ba0d676 100644
--- a/vcl/win/source/src/dcapt.cur
+++ b/vcl/win/src/dcapt.cur
diff --git a/vcl/win/source/src/dcirccut.cur b/vcl/win/src/dcirccut.cur
index b19d3f8257f4..b19d3f8257f4 100644
--- a/vcl/win/source/src/dcirccut.cur
+++ b/vcl/win/src/dcirccut.cur
diff --git a/vcl/win/source/src/dconnect.cur b/vcl/win/src/dconnect.cur
index 5318d8f22d8b..5318d8f22d8b 100644
--- a/vcl/win/source/src/dconnect.cur
+++ b/vcl/win/src/dconnect.cur
diff --git a/vcl/win/source/src/dellipse.cur b/vcl/win/src/dellipse.cur
index c489a640335e..c489a640335e 100644
--- a/vcl/win/source/src/dellipse.cur
+++ b/vcl/win/src/dellipse.cur
diff --git a/vcl/win/source/src/detectiv.cur b/vcl/win/src/detectiv.cur
index 30e5685b64b2..30e5685b64b2 100644
--- a/vcl/win/source/src/detectiv.cur
+++ b/vcl/win/src/detectiv.cur
diff --git a/vcl/win/source/src/dfree.cur b/vcl/win/src/dfree.cur
index 3ff56d007648..3ff56d007648 100644
--- a/vcl/win/source/src/dfree.cur
+++ b/vcl/win/src/dfree.cur
diff --git a/vcl/win/source/src/dline.cur b/vcl/win/src/dline.cur
index 623c33ac2351..623c33ac2351 100644
--- a/vcl/win/source/src/dline.cur
+++ b/vcl/win/src/dline.cur
diff --git a/vcl/win/source/src/dpie.cur b/vcl/win/src/dpie.cur
index 3b911cd01e43..3b911cd01e43 100644
--- a/vcl/win/source/src/dpie.cur
+++ b/vcl/win/src/dpie.cur
diff --git a/vcl/win/source/src/dpolygon.cur b/vcl/win/src/dpolygon.cur
index 9467f1e286aa..9467f1e286aa 100644
--- a/vcl/win/source/src/dpolygon.cur
+++ b/vcl/win/src/dpolygon.cur
diff --git a/vcl/win/source/src/drect.cur b/vcl/win/src/drect.cur
index 60a5242c203c..60a5242c203c 100644
--- a/vcl/win/source/src/drect.cur
+++ b/vcl/win/src/drect.cur
diff --git a/vcl/win/source/src/dtext.cur b/vcl/win/src/dtext.cur
index 01e7d31eae7e..01e7d31eae7e 100644
--- a/vcl/win/source/src/dtext.cur
+++ b/vcl/win/src/dtext.cur
diff --git a/vcl/win/source/src/fill.cur b/vcl/win/src/fill.cur
index 78f5fad87ad0..78f5fad87ad0 100644
--- a/vcl/win/source/src/fill.cur
+++ b/vcl/win/src/fill.cur
diff --git a/vcl/win/source/src/hshear.cur b/vcl/win/src/hshear.cur
index 5cf2211458c3..5cf2211458c3 100644
--- a/vcl/win/source/src/hshear.cur
+++ b/vcl/win/src/hshear.cur
diff --git a/vcl/win/source/src/linkdata.cur b/vcl/win/src/linkdata.cur
index e47c1dea2cec..e47c1dea2cec 100644
--- a/vcl/win/source/src/linkdata.cur
+++ b/vcl/win/src/linkdata.cur
diff --git a/vcl/win/source/src/linkf.cur b/vcl/win/src/linkf.cur
index 6cc498a02610..6cc498a02610 100644
--- a/vcl/win/source/src/linkf.cur
+++ b/vcl/win/src/linkf.cur
diff --git a/vcl/win/source/src/magnify.cur b/vcl/win/src/magnify.cur
index 1e32b92351af..1e32b92351af 100644
--- a/vcl/win/source/src/magnify.cur
+++ b/vcl/win/src/magnify.cur
diff --git a/vcl/win/source/src/mirror.cur b/vcl/win/src/mirror.cur
index e05eb836eb5d..e05eb836eb5d 100644
--- a/vcl/win/source/src/mirror.cur
+++ b/vcl/win/src/mirror.cur
diff --git a/vcl/win/source/src/movebw.cur b/vcl/win/src/movebw.cur
index d079eb9fe20d..d079eb9fe20d 100644
--- a/vcl/win/source/src/movebw.cur
+++ b/vcl/win/src/movebw.cur
diff --git a/vcl/win/source/src/movedata.cur b/vcl/win/src/movedata.cur
index 4d67cbe47149..4d67cbe47149 100644
--- a/vcl/win/source/src/movedata.cur
+++ b/vcl/win/src/movedata.cur
diff --git a/vcl/win/source/src/movedlnk.cur b/vcl/win/src/movedlnk.cur
index 1bb7b0306406..1bb7b0306406 100644
--- a/vcl/win/source/src/movedlnk.cur
+++ b/vcl/win/src/movedlnk.cur
diff --git a/vcl/win/source/src/movef.cur b/vcl/win/src/movef.cur
index 6abee2381dcf..6abee2381dcf 100644
--- a/vcl/win/source/src/movef.cur
+++ b/vcl/win/src/movef.cur
diff --git a/vcl/win/source/src/movef2.cur b/vcl/win/src/movef2.cur
index d044981a3ffd..d044981a3ffd 100644
--- a/vcl/win/source/src/movef2.cur
+++ b/vcl/win/src/movef2.cur
diff --git a/vcl/win/source/src/moveflnk.cur b/vcl/win/src/moveflnk.cur
index 630fa1bc3e4e..630fa1bc3e4e 100644
--- a/vcl/win/source/src/moveflnk.cur
+++ b/vcl/win/src/moveflnk.cur
diff --git a/vcl/win/source/src/movept.cur b/vcl/win/src/movept.cur
index 81d3af5a05c4..81d3af5a05c4 100644
--- a/vcl/win/source/src/movept.cur
+++ b/vcl/win/src/movept.cur
diff --git a/vcl/win/source/src/nullptr.cur b/vcl/win/src/nullptr.cur
index 28dbb2a903f2..28dbb2a903f2 100644
--- a/vcl/win/source/src/nullptr.cur
+++ b/vcl/win/src/nullptr.cur
diff --git a/vcl/win/source/src/pivotcol.cur b/vcl/win/src/pivotcol.cur
index 061b3ba92644..061b3ba92644 100644
--- a/vcl/win/source/src/pivotcol.cur
+++ b/vcl/win/src/pivotcol.cur
diff --git a/vcl/win/source/src/pivotdel.cur b/vcl/win/src/pivotdel.cur
index 4497dacd9983..4497dacd9983 100644
--- a/vcl/win/source/src/pivotdel.cur
+++ b/vcl/win/src/pivotdel.cur
diff --git a/vcl/win/source/src/pivotfld.cur b/vcl/win/src/pivotfld.cur
index efbbead8930c..efbbead8930c 100644
--- a/vcl/win/source/src/pivotfld.cur
+++ b/vcl/win/src/pivotfld.cur
diff --git a/vcl/win/source/src/pivotrow.cur b/vcl/win/src/pivotrow.cur
index 649444e9e132..649444e9e132 100644
--- a/vcl/win/source/src/pivotrow.cur
+++ b/vcl/win/src/pivotrow.cur
diff --git a/vcl/win/source/src/pntbrsh.cur b/vcl/win/src/pntbrsh.cur
index 517d114237c1..517d114237c1 100644
--- a/vcl/win/source/src/pntbrsh.cur
+++ b/vcl/win/src/pntbrsh.cur
diff --git a/vcl/win/source/src/rotate.cur b/vcl/win/src/rotate.cur
index 43c2a54a10ac..43c2a54a10ac 100644
--- a/vcl/win/source/src/rotate.cur
+++ b/vcl/win/src/rotate.cur
diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/src/salsrc.rc
index c45935c59594..c45935c59594 100644
--- a/vcl/win/source/src/salsrc.rc
+++ b/vcl/win/src/salsrc.rc
diff --git a/vcl/win/source/src/sd.ico b/vcl/win/src/sd.ico
index b2a0a07a67c3..b2a0a07a67c3 100644
--- a/vcl/win/source/src/sd.ico
+++ b/vcl/win/src/sd.ico
diff --git a/vcl/win/source/src/tblsele.cur b/vcl/win/src/tblsele.cur
index 3683e20df112..3683e20df112 100644
--- a/vcl/win/source/src/tblsele.cur
+++ b/vcl/win/src/tblsele.cur
diff --git a/vcl/win/source/src/tblsels.cur b/vcl/win/src/tblsels.cur
index 007182d734de..007182d734de 100644
--- a/vcl/win/source/src/tblsels.cur
+++ b/vcl/win/src/tblsels.cur
diff --git a/vcl/win/source/src/tblselse.cur b/vcl/win/src/tblselse.cur
index 986f0139501a..986f0139501a 100644
--- a/vcl/win/source/src/tblselse.cur
+++ b/vcl/win/src/tblselse.cur
diff --git a/vcl/win/source/src/tblselsw.cur b/vcl/win/src/tblselsw.cur
index adabba1a2adc..adabba1a2adc 100644
--- a/vcl/win/source/src/tblselsw.cur
+++ b/vcl/win/src/tblselsw.cur
diff --git a/vcl/win/source/src/tblselw.cur b/vcl/win/src/tblselw.cur
index a95eb85af49a..a95eb85af49a 100644
--- a/vcl/win/source/src/tblselw.cur
+++ b/vcl/win/src/tblselw.cur
diff --git a/vcl/win/source/src/timemove.cur b/vcl/win/src/timemove.cur
index 319b6edc5774..319b6edc5774 100644
--- a/vcl/win/source/src/timemove.cur
+++ b/vcl/win/src/timemove.cur
diff --git a/vcl/win/source/src/timesize.cur b/vcl/win/src/timesize.cur
index 1ec23de05b71..1ec23de05b71 100644
--- a/vcl/win/source/src/timesize.cur
+++ b/vcl/win/src/timesize.cur
diff --git a/vcl/win/source/src/vshear.cur b/vcl/win/src/vshear.cur
index a4bbf7e8eb00..a4bbf7e8eb00 100644
--- a/vcl/win/source/src/vshear.cur
+++ b/vcl/win/src/vshear.cur
diff --git a/vcl/win/source/src/vtext.cur b/vcl/win/src/vtext.cur
index 776177901e11..776177901e11 100644
--- a/vcl/win/source/src/vtext.cur
+++ b/vcl/win/src/vtext.cur
diff --git a/vcl/win/source/src/wshide.cur b/vcl/win/src/wshide.cur
index bfa8fdfdbac0..bfa8fdfdbac0 100644
--- a/vcl/win/source/src/wshide.cur
+++ b/vcl/win/src/wshide.cur
diff --git a/vcl/win/source/src/wsshow.cur b/vcl/win/src/wsshow.cur
index e0c21060344d..e0c21060344d 100644
--- a/vcl/win/source/src/wsshow.cur
+++ b/vcl/win/src/wsshow.cur
diff --git a/vcl/win/source/window/keynames.cxx b/vcl/win/window/keynames.cxx
index 0038ae9dc211..0038ae9dc211 100644
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/window/keynames.cxx
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 763d4430e5b4..763d4430e5b4 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/window/salmenu.cxx
index 0b623e25b1b4..0b623e25b1b4 100644
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/window/salmenu.cxx
diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/window/salobj.cxx
index 033c79822e71..033c79822e71 100644
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/window/salobj.cxx