Author: mseidel
Date: Thu Jul 12 10:46:06 2018
New Revision: 1835717
URL: http://svn.apache.org/viewvc?rev=1835717&view=rev
Log:
Replacing sd.ico (StarDesktop?) with OpenOffice icon
Added:
openoffice/trunk/main/vcl/win/source/src/oo.ico (with props)
Removed:
openoffice/trunk/main/vcl/win/source/src/sd.ico
Modified:
openoffice/trunk/main/vcl/WinResTarget_vcl.mk
openoffice/trunk/main/vcl/win/source/src/salsrc.rc
Modified: openoffice/trunk/main/vcl/WinResTarget_vcl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/WinResTarget_vcl.mk?rev=1835717&r1=1835716&r2=1835717&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/WinResTarget_vcl.mk (original)
+++ openoffice/trunk/main/vcl/WinResTarget_vcl.mk Thu Jul 12 10:46:06 2018
@@ -24,8 +24,8 @@
$(eval $(call gb_WinResTarget_WinResTarget,vcl/src))
$(eval $(call gb_WinResTarget_set_include,vcl/src,\
- $$(INCLUDE) \
- -I$(SRCDIR)/vcl/inc \
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
))
ifeq ($(OS),WNT)
@@ -35,89 +35,89 @@ $(eval $(call gb_WinResTarget_add_file,v
))
$(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
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/sd.ico \
- 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/hand.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/help.cur \
- vcl/win/source/src/neswsize.cur \
- vcl/win/source/src/tblselsw.cur \
- vcl/win/source/src/asnswe.cur \
- vcl/win/source/src/cross.cur \
- vcl/win/source/src/hshear.cur \
- vcl/win/source/src/notallow.cur \
- vcl/win/source/src/tblselw.cur \
- vcl/win/source/src/asnw.cur \
- vcl/win/source/src/darc.cur \
- vcl/win/source/src/hsize.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/hsizebar.cur \
- vcl/win/source/src/nwsesize.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/pen.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/vsize.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/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 \
- 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/move.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/source/src/refhand.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/oo.ico \
+ 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/hand.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/help.cur \
+ vcl/win/source/src/neswsize.cur \
+ vcl/win/source/src/tblselsw.cur \
+ vcl/win/source/src/asnswe.cur \
+ vcl/win/source/src/cross.cur \
+ vcl/win/source/src/hshear.cur \
+ vcl/win/source/src/notallow.cur \
+ vcl/win/source/src/tblselw.cur \
+ vcl/win/source/src/asnw.cur \
+ vcl/win/source/src/darc.cur \
+ vcl/win/source/src/hsize.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/hsizebar.cur \
+ vcl/win/source/src/nwsesize.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/pen.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/vsize.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/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 \
+ 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/move.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/source/src/refhand.cur \
))
else
@@ -127,8 +127,8 @@ $(eval $(call gb_WinResTarget_add_file,v
))
$(eval $(call gb_WinResTarget_set_include,vcl/src,\
- $$(INCLUDE) \
- -I$(SRCDIR)/vcl/os2/source/src \
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/os2/source/src \
))
endif
Added: openoffice/trunk/main/vcl/win/source/src/oo.ico
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/win/source/src/oo.ico?rev=1835717&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/trunk/main/vcl/win/source/src/oo.ico
------------------------------------------------------------------------------
svn:mime-type = image/x-icon
Modified: openoffice/trunk/main/vcl/win/source/src/salsrc.rc
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/win/source/src/salsrc.rc?rev=1835717&r1=1835716&r2=1835717&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/win/source/src/salsrc.rc (original)
+++ openoffice/trunk/main/vcl/win/source/src/salsrc.rc Thu Jul 12 10:46:06 2018
@@ -28,67 +28,67 @@
#include <win/salids.hrc>
#endif
-SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR
+SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR
#if ( WINVER < 0x0400 )
-SAL_RESID_POINTER_HELP CURSOR HELP.CUR
+SAL_RESID_POINTER_HELP CURSOR HELP.CUR
#endif
#ifndef WNT
-SAL_RESID_POINTER_HSIZE CURSOR HSIZE.CUR
-SAL_RESID_POINTER_VSIZE CURSOR VSIZE.CUR
-SAL_RESID_POINTER_NESWSIZE CURSOR NESWSIZE.CUR
-SAL_RESID_POINTER_NWSESIZE CURSOR NWSESIZE.CUR
+SAL_RESID_POINTER_HSIZE CURSOR HSIZE.CUR
+SAL_RESID_POINTER_VSIZ CURSOR VSIZE.CUR
+SAL_RESID_POINTER_NESWSIZE CURSOR NESWSIZE.CUR
+SAL_RESID_POINTER_NWSESIZE CURSOR NWSESIZE.CUR
#endif
-SAL_RESID_POINTER_CROSS CURSOR CROSS.CUR
-SAL_RESID_POINTER_MOVE CURSOR MOVE.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_HAND CURSOR HAND.CUR
-SAL_RESID_POINTER_REFHAND CURSOR REFHAND.CUR
-SAL_RESID_POINTER_PEN CURSOR PEN.CUR
-SAL_RESID_POINTER_MAGNIFY CURSOR MAGNIFY.CUR
-SAL_RESID_POINTER_FILL CURSOR FILL.CUR
-SAL_RESID_POINTER_ROTATE CURSOR ROTATE.CUR
-SAL_RESID_POINTER_HSHEAR CURSOR HSHEAR.CUR
-SAL_RESID_POINTER_VSHEAR CURSOR VSHEAR.CUR
-SAL_RESID_POINTER_MIRROR CURSOR MIRROR.CUR
-SAL_RESID_POINTER_CROOK CURSOR CROOK.CUR
-SAL_RESID_POINTER_CROP CURSOR CROP.CUR
-SAL_RESID_POINTER_MOVEPOINT CURSOR MOVEPT.CUR
+SAL_RESID_POINTER_CROSS CURSOR CROSS.CUR
+SAL_RESID_POINTER_MOVE CURSOR MOVE.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_HAND CURSOR HAND.CUR
+SAL_RESID_POINTER_REFHAND CURSOR REFHAND.CUR
+SAL_RESID_POINTER_PEN CURSOR PEN.CUR
+SAL_RESID_POINTER_MAGNIFY CURSOR MAGNIFY.CUR
+SAL_RESID_POINTER_FILL CURSOR FILL.CUR
+SAL_RESID_POINTER_ROTATE CURSOR ROTATE.CUR
+SAL_RESID_POINTER_HSHEAR CURSOR HSHEAR.CUR
+SAL_RESID_POINTER_VSHEAR CURSOR VSHEAR.CUR
+SAL_RESID_POINTER_MIRROR CURSOR MIRROR.CUR
+SAL_RESID_POINTER_CROOK CURSOR CROOK.CUR
+SAL_RESID_POINTER_CROP CURSOR CROP.CUR
+SAL_RESID_POINTER_MOVEPOINT CURSOR MOVEPT.CUR
SAL_RESID_POINTER_MOVEBEZIERWEIGHT CURSOR MOVEBW.CUR
-SAL_RESID_POINTER_MOVEDATA CURSOR MOVEDATA.CUR
-SAL_RESID_POINTER_COPYDATA CURSOR COPYDATA.CUR
-SAL_RESID_POINTER_LINKDATA CURSOR LINKDATA.CUR
+SAL_RESID_POINTER_MOVEDATA CURSOR MOVEDATA.CUR
+SAL_RESID_POINTER_COPYDATA CURSOR COPYDATA.CUR
+SAL_RESID_POINTER_LINKDATA CURSOR LINKDATA.CUR
SAL_RESID_POINTER_MOVEDATALINK CURSOR MOVEDLNK.CUR
SAL_RESID_POINTER_COPYDATALINK CURSOR COPYDLNK.CUR
-SAL_RESID_POINTER_MOVEFILE CURSOR MOVEF.CUR
-SAL_RESID_POINTER_COPYFILE CURSOR COPYF.CUR
-SAL_RESID_POINTER_LINKFILE CURSOR LINKF.CUR
+SAL_RESID_POINTER_MOVEFILE CURSOR MOVEF.CUR
+SAL_RESID_POINTER_COPYFILE CURSOR COPYF.CUR
+SAL_RESID_POINTER_LINKFILE CURSOR LINKF.CUR
SAL_RESID_POINTER_MOVEFILELINK CURSOR MOVEFLNK.CUR
SAL_RESID_POINTER_COPYFILELINK CURSOR COPYFLNK.CUR
-SAL_RESID_POINTER_MOVEFILES CURSOR MOVEF2.CUR
-SAL_RESID_POINTER_COPYFILES CURSOR COPYF2.CUR
+SAL_RESID_POINTER_MOVEFILES CURSOR MOVEF2.CUR
+SAL_RESID_POINTER_COPYFILES CURSOR COPYF2.CUR
SAL_RESID_POINTER_NOTALLOWED CURSOR NOTALLOW.CUR
-SAL_RESID_POINTER_DRAW_LINE CURSOR DLINE.CUR
-SAL_RESID_POINTER_DRAW_RECT CURSOR DRECT.CUR
+SAL_RESID_POINTER_DRAW_LINE CURSOR DLINE.CUR
+SAL_RESID_POINTER_DRAW_RECT CURSOR DRECT.CUR
SAL_RESID_POINTER_DRAW_POLYGON CURSOR DPOLYGON.CUR
SAL_RESID_POINTER_DRAW_BEZIER CURSOR DBEZIER.CUR
-SAL_RESID_POINTER_DRAW_ARC CURSOR DARC.CUR
-SAL_RESID_POINTER_DRAW_PIE CURSOR DPIE.CUR
+SAL_RESID_POINTER_DRAW_ARC CURSOR DARC.CUR
+SAL_RESID_POINTER_DRAW_PIE CURSOR DPIE.CUR
SAL_RESID_POINTER_DRAW_CIRCLECUT CURSOR DCIRCCUT.CUR
SAL_RESID_POINTER_DRAW_ELLIPSE CURSOR DELLIPSE.CUR
-SAL_RESID_POINTER_DRAW_FREEHAND CURSOR DFREE.CUR
+SAL_RESID_POINTER_DRAW_FREEHAND CURSOR DFREE.CUR
SAL_RESID_POINTER_DRAW_CONNECT CURSOR DCONNECT.CUR
-SAL_RESID_POINTER_DRAW_TEXT CURSOR DTEXT.CUR
+SAL_RESID_POINTER_DRAW_TEXT CURSOR DTEXT.CUR
SAL_RESID_POINTER_DRAW_CAPTION CURSOR DCAPT.CUR
-SAL_RESID_POINTER_CHART CURSOR CHART.CUR
-SAL_RESID_POINTER_DETECTIVE CURSOR DETECTIV.CUR
-SAL_RESID_POINTER_PIVOT_COL CURSOR PIVOTCOL.CUR
-SAL_RESID_POINTER_PIVOT_ROW CURSOR PIVOTROW.CUR
+SAL_RESID_POINTER_CHART CURSOR CHART.CUR
+SAL_RESID_POINTER_DETECTIVE CURSOR DETECTIV.CUR
+SAL_RESID_POINTER_PIVOT_COL CURSOR PIVOTCOL.CUR
+SAL_RESID_POINTER_PIVOT_ROW CURSOR PIVOTROW.CUR
SAL_RESID_POINTER_PIVOT_FIELD CURSOR PIVOTFLD.CUR
SAL_RESID_POINTER_PIVOT_DELETE CURSOR PIVOTDEL.CUR
-SAL_RESID_POINTER_CHAIN CURSOR CHAIN.CUR
+SAL_RESID_POINTER_CHAIN CURSOR CHAIN.CUR
SAL_RESID_POINTER_CHAIN_NOTALLOWED CURSOR CHAINNOT.CUR
SAL_RESID_POINTER_TIMEEVENT_MOVE CURSOR TIMEMOVE.CUR
SAL_RESID_POINTER_TIMEEVENT_SIZE CURSOR TIMESIZE.CUR
@@ -96,22 +96,23 @@ SAL_RESID_POINTER_AUTOSCROLL_N CURSOR
SAL_RESID_POINTER_AUTOSCROLL_S CURSOR ASS.CUR
SAL_RESID_POINTER_AUTOSCROLL_W CURSOR ASW.CUR
SAL_RESID_POINTER_AUTOSCROLL_E CURSOR ASE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_NW CURSOR ASNW.CUR
-SAL_RESID_POINTER_AUTOSCROLL_NE CURSOR ASNE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_SW CURSOR ASSW.CUR
-SAL_RESID_POINTER_AUTOSCROLL_SE CURSOR ASSE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_NS CURSOR ASNS.CUR
-SAL_RESID_POINTER_AUTOSCROLL_WE CURSOR ASWE.CUR
+SAL_RESID_POINTER_AUTOSCROLL_NW CURSOR ASNW.CUR
+SAL_RESID_POINTER_AUTOSCROLL_NE CURSOR ASNE.CUR
+SAL_RESID_POINTER_AUTOSCROLL_SW CURSOR ASSW.CUR
+SAL_RESID_POINTER_AUTOSCROLL_SE CURSOR ASSE.CUR
+SAL_RESID_POINTER_AUTOSCROLL_NS CURSOR ASNS.CUR
+SAL_RESID_POINTER_AUTOSCROLL_WE CURSOR ASWE.CUR
SAL_RESID_POINTER_AUTOSCROLL_NSWE CURSOR ASNSWE.CUR
-SAL_RESID_POINTER_AIRBRUSH CURSOR AIRBRUSH.CUR
-SAL_RESID_POINTER_TEXT_VERTICAL CURSOR VTEXT.CUR
-SAL_RESID_POINTER_TAB_SELECT_S CURSOR TBLSELS.CUR
-SAL_RESID_POINTER_TAB_SELECT_E CURSOR TBLSELE.CUR
-SAL_RESID_POINTER_TAB_SELECT_SE CURSOR TBLSELSE.CUR
-SAL_RESID_POINTER_TAB_SELECT_W CURSOR TBLSELW.CUR
-SAL_RESID_POINTER_TAB_SELECT_SW CURSOR TBLSELSW.CUR
-SAL_RESID_POINTER_PAINTBRUSH CURSOR PNTBRSH.CUR
+SAL_RESID_POINTER_AIRBRUSH CURSOR AIRBRUSH.CUR
+SAL_RESID_POINTER_TEXT_VERTICAL CURSOR VTEXT.CUR
+SAL_RESID_POINTER_TAB_SELECT_S CURSOR TBLSELS.CUR
+SAL_RESID_POINTER_TAB_SELECT_E CURSOR TBLSELE.CUR
+SAL_RESID_POINTER_TAB_SELECT_SE CURSOR TBLSELSE.CUR
+SAL_RESID_POINTER_TAB_SELECT_W CURSOR TBLSELW.CUR
+SAL_RESID_POINTER_TAB_SELECT_SW CURSOR TBLSELSW.CUR
+SAL_RESID_POINTER_PAINTBRUSH CURSOR PNTBRSH.CUR
-SAL_RESID_BITMAP_50 BITMAP 50.BMP
+SAL_RESID_BITMAP_50 BITMAP 50.BMP
+
+SAL_RESID_ICON_DEFAULT ICON OO.ICO
-SAL_RESID_ICON_DEFAULT ICON SD.ICO
