Author: mseidel
Date: Wed Sep 12 14:46:35 2018
New Revision: 1840695
URL: http://svn.apache.org/viewvc?rev=1840695&view=rev
Log:
Reverting to sd.ico (StarDesktop?)
Added:
openoffice/trunk/main/vcl/win/source/src/sd.ico (with props)
Removed:
openoffice/trunk/main/vcl/win/source/src/oo.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=1840695&r1=1840694&r2=1840695&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/WinResTarget_vcl.mk (original)
+++ openoffice/trunk/main/vcl/WinResTarget_vcl.mk Wed Sep 12 14:46:35 2018
@@ -49,7 +49,7 @@ $(eval $(call gb_WinResTarget_add_depend
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/sd.ico \
vcl/win/source/src/ase.cur \
vcl/win/source/src/copyf2.cur \
vcl/win/source/src/dtext.cur \
@@ -127,82 +127,82 @@ $(eval $(call gb_WinResTarget_add_file,v
))
$(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
- vcl/os2/source/src/airbrush.ptr \
- vcl/os2/source/src/ase.ptr \
- vcl/os2/source/src/asn.ptr \
- vcl/os2/source/src/asne.ptr \
- vcl/os2/source/src/asns.ptr \
- vcl/os2/source/src/asnswe.ptr \
- vcl/os2/source/src/asnw.ptr \
- vcl/os2/source/src/ass.ptr \
- vcl/os2/source/src/asse.ptr \
- vcl/os2/source/src/assw.ptr \
- vcl/os2/source/src/asw.ptr \
- vcl/os2/source/src/aswe.ptr \
- vcl/os2/source/src/chain.ptr \
- vcl/os2/source/src/chainnot.ptr \
- vcl/os2/source/src/chart.ptr \
- vcl/os2/source/src/copydata.ptr \
- vcl/os2/source/src/copydlnk.ptr \
- vcl/os2/source/src/copyf.ptr \
- vcl/os2/source/src/copyf2.ptr \
- vcl/os2/source/src/copyflnk.ptr \
- vcl/os2/source/src/crook.ptr \
- vcl/os2/source/src/crop.ptr \
- vcl/os2/source/src/cross.ptr \
- vcl/os2/source/src/darc.ptr \
- vcl/os2/source/src/dbezier.ptr \
- vcl/os2/source/src/dcapt.ptr \
- vcl/os2/source/src/dcirccut.ptr \
- vcl/os2/source/src/dconnect.ptr \
- vcl/os2/source/src/dellipse.ptr \
- vcl/os2/source/src/detectiv.ptr \
- vcl/os2/source/src/dfree.ptr \
- vcl/os2/source/src/dline.ptr \
- vcl/os2/source/src/dpie.ptr \
- vcl/os2/source/src/dpolygon.ptr \
- vcl/os2/source/src/drect.ptr \
- vcl/os2/source/src/dtext.ptr \
- vcl/os2/source/src/dtext.ptr \
- vcl/os2/source/src/fill.ptr \
- vcl/os2/source/src/hand.ptr \
- vcl/os2/source/src/help.ptr \
- vcl/os2/source/src/hshear.ptr \
- vcl/os2/source/src/hsizebar.ptr \
- vcl/os2/source/src/hsplit.ptr \
- vcl/os2/source/src/linkdata.ptr \
- vcl/os2/source/src/linkf.ptr \
- vcl/os2/source/src/magnify.ptr \
- vcl/os2/source/src/mirror.ptr \
- vcl/os2/source/src/move.ptr \
- vcl/os2/source/src/movebw.ptr \
- vcl/os2/source/src/movedata.ptr \
- vcl/os2/source/src/movedlnk.ptr \
- vcl/os2/source/src/movef.ptr \
- vcl/os2/source/src/movef2.ptr \
- vcl/os2/source/src/moveflnk.ptr \
- vcl/os2/source/src/movept.ptr \
- vcl/os2/source/src/nullptr.ptr \
- vcl/os2/source/src/pen.ptr \
- vcl/os2/source/src/pivotcol.ptr \
- vcl/os2/source/src/pivotfld.ptr \
- vcl/os2/source/src/pivotrow.ptr \
- vcl/os2/source/src/pntbrsh.ptr \
- vcl/os2/source/src/refhand.ptr \
- vcl/os2/source/src/rotate.ptr \
- vcl/os2/source/src/salsrc.rc \
- vcl/os2/source/src/sd.ico \
- vcl/os2/source/src/tblsele.ptr \
- vcl/os2/source/src/tblsels.ptr \
- vcl/os2/source/src/tblselse.ptr \
- vcl/os2/source/src/tblselsw.ptr \
- vcl/os2/source/src/tblselw.ptr \
- vcl/os2/source/src/timemove.ptr \
- vcl/os2/source/src/timesize.ptr \
- vcl/os2/source/src/vshear.ptr \
- vcl/os2/source/src/vsizebar.ptr \
- vcl/os2/source/src/vsplit.ptr \
- vcl/os2/source/src/vtext.ptr \
+ vcl/os2/source/src/airbrush.ptr \
+ vcl/os2/source/src/ase.ptr \
+ vcl/os2/source/src/asn.ptr \
+ vcl/os2/source/src/asne.ptr \
+ vcl/os2/source/src/asns.ptr \
+ vcl/os2/source/src/asnswe.ptr \
+ vcl/os2/source/src/asnw.ptr \
+ vcl/os2/source/src/ass.ptr \
+ vcl/os2/source/src/asse.ptr \
+ vcl/os2/source/src/assw.ptr \
+ vcl/os2/source/src/asw.ptr \
+ vcl/os2/source/src/aswe.ptr \
+ vcl/os2/source/src/chain.ptr \
+ vcl/os2/source/src/chainnot.ptr \
+ vcl/os2/source/src/chart.ptr \
+ vcl/os2/source/src/copydata.ptr \
+ vcl/os2/source/src/copydlnk.ptr \
+ vcl/os2/source/src/copyf.ptr \
+ vcl/os2/source/src/copyf2.ptr \
+ vcl/os2/source/src/copyflnk.ptr \
+ vcl/os2/source/src/crook.ptr \
+ vcl/os2/source/src/crop.ptr \
+ vcl/os2/source/src/cross.ptr \
+ vcl/os2/source/src/darc.ptr \
+ vcl/os2/source/src/dbezier.ptr \
+ vcl/os2/source/src/dcapt.ptr \
+ vcl/os2/source/src/dcirccut.ptr \
+ vcl/os2/source/src/dconnect.ptr \
+ vcl/os2/source/src/dellipse.ptr \
+ vcl/os2/source/src/detectiv.ptr \
+ vcl/os2/source/src/dfree.ptr \
+ vcl/os2/source/src/dline.ptr \
+ vcl/os2/source/src/dpie.ptr \
+ vcl/os2/source/src/dpolygon.ptr \
+ vcl/os2/source/src/drect.ptr \
+ vcl/os2/source/src/dtext.ptr \
+ vcl/os2/source/src/dtext.ptr \
+ vcl/os2/source/src/fill.ptr \
+ vcl/os2/source/src/hand.ptr \
+ vcl/os2/source/src/help.ptr \
+ vcl/os2/source/src/hshear.ptr \
+ vcl/os2/source/src/hsizebar.ptr \
+ vcl/os2/source/src/hsplit.ptr \
+ vcl/os2/source/src/linkdata.ptr \
+ vcl/os2/source/src/linkf.ptr \
+ vcl/os2/source/src/magnify.ptr \
+ vcl/os2/source/src/mirror.ptr \
+ vcl/os2/source/src/move.ptr \
+ vcl/os2/source/src/movebw.ptr \
+ vcl/os2/source/src/movedata.ptr \
+ vcl/os2/source/src/movedlnk.ptr \
+ vcl/os2/source/src/movef.ptr \
+ vcl/os2/source/src/movef2.ptr \
+ vcl/os2/source/src/moveflnk.ptr \
+ vcl/os2/source/src/movept.ptr \
+ vcl/os2/source/src/nullptr.ptr \
+ vcl/os2/source/src/pen.ptr \
+ vcl/os2/source/src/pivotcol.ptr \
+ vcl/os2/source/src/pivotfld.ptr \
+ vcl/os2/source/src/pivotrow.ptr \
+ vcl/os2/source/src/pntbrsh.ptr \
+ vcl/os2/source/src/refhand.ptr \
+ vcl/os2/source/src/rotate.ptr \
+ vcl/os2/source/src/salsrc.rc \
+ vcl/os2/source/src/sd.ico \
+ vcl/os2/source/src/tblsele.ptr \
+ vcl/os2/source/src/tblsels.ptr \
+ vcl/os2/source/src/tblselse.ptr \
+ vcl/os2/source/src/tblselsw.ptr \
+ vcl/os2/source/src/tblselw.ptr \
+ vcl/os2/source/src/timemove.ptr \
+ vcl/os2/source/src/timesize.ptr \
+ vcl/os2/source/src/vshear.ptr \
+ vcl/os2/source/src/vsizebar.ptr \
+ vcl/os2/source/src/vsplit.ptr \
+ vcl/os2/source/src/vtext.ptr \
))
$(eval $(call gb_WinResTarget_set_include,vcl/src,\
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=1840695&r1=1840694&r2=1840695&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/win/source/src/salsrc.rc (original)
+++ openoffice/trunk/main/vcl/win/source/src/salsrc.rc Wed Sep 12 14:46:35 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_VSIZ 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_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
@@ -103,7 +103,7 @@ SAL_RESID_POINTER_AUTOSCROLL_SE CURSOR
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_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
@@ -112,7 +112,7 @@ SAL_RESID_POINTER_TAB_SELECT_W CURSOR
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
Added: openoffice/trunk/main/vcl/win/source/src/sd.ico
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/win/source/src/sd.ico?rev=1840695&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/trunk/main/vcl/win/source/src/sd.ico
------------------------------------------------------------------------------
svn:mime-type = image/x-icon
