Get rid of a superfluous directory level

Change-Id: I79e065f0c68b149d2ef69f428d31e36e97a6098b

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,\

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:

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