CWS-TOOLING: integrate CWS fwk166

81 files changed, 33 insertions, 84 deletions

diff --git a/desktop/os2/source/applauncher/makefile.mk b/desktop/os2/source/applauncher/makefile.mk
index bf71b57c2fdf..7eec8aee9c23 100644
--- a/desktop/os2/source/applauncher/makefile.mk
+++ b/desktop/os2/source/applauncher/makefile.mk
@@ -47,7 +47,7 @@ OBJFILES= \
     $(OBJ)$/sbase.obj \
     $(OBJ)$/smath.obj \
     $(OBJ)$/officeloader.obj \
-    $(OBJ)$/quickstart.obj
+    $(OBJ)$/os2quickstart.obj
 
 APP1TARGET=swriter
 APP1NOSAL=TRUE
@@ -106,13 +106,13 @@ APP7OBJS = \
         $(OBJ)$/launcher.obj\
         $(OBJ)$/officeloader.obj
 
-APP8TARGET=quickstart
+APP8TARGET=os2quickstart
 APP8NOSAL=TRUE
 APP8LINKRES=$(MISC)$/$(TARGET)8.res
 APP8ICON=$(SOLARRESDIR)$/icons$/ooo-main-app.ico
 APP8OBJS = \
         $(OBJ)$/launcher.obj\
-        $(OBJ)$/quickstart.obj
+        $(OBJ)$/os2quickstart.obj
 
 # --- Targets ------------------------------------------------------
 
diff --git a/desktop/os2/source/applauncher/quickstart.cxx b/desktop/os2/source/applauncher/os2quickstart.cxx
index 63585434bb50..63585434bb50 100644
--- a/desktop/os2/source/applauncher/quickstart.cxx
+++ b/desktop/os2/source/applauncher/os2quickstart.cxx
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index fc782c35a71b..f1dee0761ccd 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -17,6 +17,9 @@ dt  desktop\win32\source\guistdio           nmake   -   w   dt_guistdio dt_inc N
 dt	desktop\win32\source\applauncher		nmake	-	w	dt_applauncher dt_inc NULL
 dt	desktop\win32\source\applauncher\ooo	nmake	-	w	dt_applauncher_ooo dt_applauncher.w dt_inc NULL
 dt	desktop\win32\source\rebase				nmake	-	w	dt_rebase dt_inc NULL
+dt	desktop\win32\source\QuickStart		nmake	-	w	dt_win32_quickstart NULL
+dt	desktop\win32\source\QuickStart\so	nmake	-	w	dt_win32_quickstart_so dt_win32_quickstart.w NULL
+
 dt	desktop\os2\source\applauncher			nmake	-	p	dt_applauncher dt_inc NULL
 dt	desktop\unx\source\officeloader		nmake	-	u	dt_officeloader_unx dt_inc NULL
 dt	desktop\source\pagein					nmake	-	u	dt_pagein dt_inc NULL
@@ -35,7 +38,7 @@ dt	desktop\source\deployment\registry\configuration	nmake	-	all	dt_dp_registry_c
 dt	desktop\source\deployment\registry\help			nmake	-	all	dt_dp_registry_help dt_inc NULL
 dt	desktop\source\deployment\registry\executable		nmake	-	all	dt_dp_registry_executable dt_inc NULL
 dt	desktop\scripts 						nmake	-	u	dt_scripts dt_inc NULL
-dt	desktop\util							nmake	-	all	dt_util dt_app dt_pagein.u dt_so_comp dt_spl dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w NULL
+dt	desktop\util							nmake	-	all	dt_util dt_app dt_pagein.u dt_so_comp dt_spl dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w dt_win32_quickstart_so.w NULL
 dt	desktop\zipintro							nmake	-	all	dt_zipintro NULL
 dt  desktop\registry\data\org\openoffice\Office                     nmake   -  all sn_regconfig NULL
 dt  desktop\source\registration\com\sun\star\servicetag\resources   get     -  all sn_svctagres NULL
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index b6e14a5ce722..be7b77388763 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -31,7 +31,7 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
 ..\%__SRC%\bin\swriter.exe %_DEST%\bin%_EXT%\swriter.exe
 ..\%__SRC%\bin\sbase.exe %_DEST%\bin%_EXT%\sbase.exe
 ..\%__SRC%\bin\sweb.exe %_DEST%\bin%_EXT%\sweb.exe
-..\%__SRC%\bin\quickstart.exe %_DEST%\bin%_EXT%\quickstart.exe
+..\%__SRC%\bin\os2quickstart.exe %_DEST%\bin%_EXT%\quickstart.exe
 ..\%__SRC%\bin\so\scalc.exe %_DEST%\bin%_EXT%\so\scalc.exe
 ..\%__SRC%\bin\so\sdraw.exe %_DEST%\bin%_EXT%\so\sdraw.exe
 ..\%__SRC%\bin\so\simpress.exe %_DEST%\bin%_EXT%\so\simpress.exe
@@ -40,6 +40,11 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
 ..\%__SRC%\bin\so\sbase.exe %_DEST%\bin%_EXT%\so\sbase.exe
 ..\%__SRC%\bin\so\sweb.exe %_DEST%\bin%_EXT%\so\sweb.exe
 
+..\%__SRC%\bin\quickstart.exe %_DEST%\bin%_EXT%\quickstart.exe
+..\%__SRC%\bin\quickstart.exe %_DEST%\bin%_EXT%\install_quickstart.exe
+..\%__SRC%\bin\soquickstart.exe %_DEST%\bin%_EXT%\so\quickstart.exe
+..\%__SRC%\bin\soquickstart.exe %_DEST%\bin%_EXT%\so\install_quickstart.exe
+
 ..\%__SRC%\misc\soffice.exe.manifest %_DEST%\bin%_EXT%\soffice.exe.manifest
 ..\%__SRC%\misc\soffice.bin.manifest %_DEST%\bin%_EXT%\soffice.bin.manifest
 ..\%__SRC%\bin\wrp*.dll %_DEST%\bin%_EXT%\wrp*.dll
diff --git a/desktop/util/verinfo.rc b/desktop/util/verinfo.rc
index 7d589956ec83..96b96b530d2c 100755..100644
--- a/desktop/util/verinfo.rc
+++ b/desktop/util/verinfo.rc
@@ -118,7 +118,7 @@ VS_VERSION_INFO versioninfo
 16 ICON "icons\\oasis-web-template.ico"
 17 ICON "icons\\empty-document.ico"
 18 ICON "icons\\so8-configuration.ico"
-19 ICON "icons\\so9_open.ico"
+19 ICON "icons\\so9_main_app.ico"
 20 ICON "icons\\empty-document.ico"
 21 ICON "icons\\so9_writer_app.ico"
 22 ICON "icons\\so9_calc_app.ico"
diff --git a/sysui/source/win32/QuickStart/OOQuickStart.rc b/desktop/win32/source/QuickStart/OOQuickStart.rc
index 0dc4dab256b6..9baf7e864f5f 100644
--- a/sysui/source/win32/QuickStart/OOQuickStart.rc
+++ b/desktop/win32/source/QuickStart/OOQuickStart.rc
@@ -31,10 +31,10 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-ICON_ACTIVE             ICON    DISCARDABLE     "../../desktop/icons/ooo3_main_app.ico"
-IDI_QUICKSTART          ICON    DISCARDABLE     "../../desktop/icons/ooo3_main_app.ico"
-IDI_SMALL               ICON    DISCARDABLE     "../../desktop/icons/ooo3_main_app.ico"
-ICON_INACTIVE           ICON    DISCARDABLE     "../../desktop/icons/ooo3_main_app.ico"
+ICON_ACTIVE             ICON    DISCARDABLE     "icons/ooo3_main_app.ico"
+IDI_QUICKSTART          ICON    DISCARDABLE     "icons/ooo3_main_app.ico"
+IDI_SMALL               ICON    DISCARDABLE     "icons/ooo3_main_app.ico"
+ICON_INACTIVE           ICON    DISCARDABLE     "icons/ooo3_main_app.ico"
 
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/sysui/source/win32/QuickStart/QuickStart.cpp b/desktop/win32/source/QuickStart/QuickStart.cpp
index 3467e35524f8..3467e35524f8 100644
--- a/sysui/source/win32/QuickStart/QuickStart.cpp
+++ b/desktop/win32/source/QuickStart/QuickStart.cpp
diff --git a/sysui/source/win32/QuickStart/QuickStart.h b/desktop/win32/source/QuickStart/QuickStart.h
index d0afd98ec430..d0afd98ec430 100644
--- a/sysui/source/win32/QuickStart/QuickStart.h
+++ b/desktop/win32/source/QuickStart/QuickStart.h
diff --git a/sysui/source/win32/QuickStart/StdAfx.h b/desktop/win32/source/QuickStart/StdAfx.h
index a4bdd66f630c..a4bdd66f630c 100644
--- a/sysui/source/win32/QuickStart/StdAfx.h
+++ b/desktop/win32/source/QuickStart/StdAfx.h
diff --git a/sysui/source/win32/QuickStart/makefile.mk b/desktop/win32/source/QuickStart/makefile.mk
index 41242d849dfb..41242d849dfb 100644
--- a/sysui/source/win32/QuickStart/makefile.mk
+++ b/desktop/win32/source/QuickStart/makefile.mk
diff --git a/sysui/source/win32/QuickStart/resource.h b/desktop/win32/source/QuickStart/resource.h
index d34beb00c5c9..d34beb00c5c9 100644
--- a/sysui/source/win32/QuickStart/resource.h
+++ b/desktop/win32/source/QuickStart/resource.h
diff --git a/sysui/source/win32/QuickStart/so/QuickStart.rc b/desktop/win32/source/QuickStart/so/QuickStart.rc
index c48dc2358d0d..732904dc745a 100644
--- a/sysui/source/win32/QuickStart/so/QuickStart.rc
+++ b/desktop/win32/source/QuickStart/so/QuickStart.rc
@@ -31,10 +31,10 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-ICON_ACTIVE             ICON    DISCARDABLE     "../../../desktop/icons/so9_main_app.ico"
-IDI_QUICKSTART          ICON    DISCARDABLE     "../../../desktop/icons/so9_main_app.ico"
-IDI_SMALL               ICON    DISCARDABLE     "../../../desktop/icons/so9_main_app.ico"
-ICON_INACTIVE           ICON    DISCARDABLE     "../../../desktop/icons/so9_main_app.ico"
+ICON_ACTIVE             ICON    DISCARDABLE     "icons/so9_main_app.ico"
+IDI_QUICKSTART          ICON    DISCARDABLE     "icons/so9_main_app.ico"
+IDI_SMALL               ICON    DISCARDABLE     "icons/so9_main_app.ico"
+ICON_INACTIVE           ICON    DISCARDABLE     "icons/so9_main_app.ico"
 
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/sysui/source/win32/QuickStart/so/makefile.mk b/desktop/win32/source/QuickStart/so/makefile.mk
index 6c7897232576..50154c7d50b2 100644
--- a/sysui/source/win32/QuickStart/so/makefile.mk
+++ b/desktop/win32/source/QuickStart/so/makefile.mk
@@ -41,6 +41,8 @@ UWINAPILIB =
 
 # --- Resources ----------------------------------------------------
 
+.IF "$(LINK_SO)"=="TRUE"
+
 RCFILES=QuickStart.rc
 INCPRE=..
 
@@ -68,6 +70,8 @@ APP1STDLIBS+=$(SHELL32LIB)\
 
 APP1NOSVRES=$(RES)$/$(TARGET).res
 
+.ENDIF # "$(LINK_SO)"=="TRUE"
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
diff --git a/desktop/win32/source/applauncher/makefile.mk b/desktop/win32/source/applauncher/makefile.mk
index f0f5743f38a1..d08309bbed24 100644
--- a/desktop/win32/source/applauncher/makefile.mk
+++ b/desktop/win32/source/applauncher/makefile.mk
@@ -53,6 +53,7 @@ OBJFILES= \
     $(OBJ)$/sweb.obj
 
 # SO launcher
+.IF "$(LINK_SO)"=="TRUE"
 .IF "$(BUILD_SPECIAL)"!=""
 APP1DEPN= $(APP1RES) verinfo.rc
 APP1TARGET=so$/swriter
@@ -139,7 +140,8 @@ APP7VERINFO=verinfo.rc
 APP7PRODUCTDEF+=-DRES_APP_NAME=sweb
 
 
-.ENDIF			# "$(BUILD_SPECIAL)"!=""
+.ENDIF # "$(BUILD_SPECIAL)"!=""
+.ENDIF # "$(LINK_SO)"=="TRUE"
 
 # --- Targets ------------------------------------------------------
 
diff --git a/desktop/win32/source/guiloader/makefile.mk b/desktop/win32/source/guiloader/makefile.mk
index 5bb1c523ff19..4db1416b7b5e 100644
--- a/desktop/win32/source/guiloader/makefile.mk
+++ b/desktop/win32/source/guiloader/makefile.mk
@@ -48,14 +48,16 @@ APP1OBJS=\
     $(SOLARLIBDIR)$/pathutils-obj.obj
 STDLIB1=$(SHLWAPILIB)
 
+.IF "$(LINK_SO)"=="TRUE"
 APP2TARGET=so$/guiloader
 APP2NOSAL=TRUE
-APP2ICON=$(SOLARRESDIR)$/icons/so8-main-app.ico
+APP2ICON=$(SOLARRESDIR)$/icons/so9-main-app.ico
 APP2OBJS=\
     $(OBJ)$/extendloaderenvironment.obj \
     $(OBJ)$/genericloader.obj \
     $(SOLARLIBDIR)$/pathutils-obj.obj
 STDLIB2=$(SHLWAPILIB)
+.ENDIF # "$(LINK_SO)"=="TRUE"
 
 # --- Targets ------------------------------------------------------
 
diff --git a/sysui/desktop/icons/makefile.mk b/sysui/desktop/icons/makefile.mk
index ac32cdbe453b..ce5b0b70b636 100644
--- a/sysui/desktop/icons/makefile.mk
+++ b/sysui/desktop/icons/makefile.mk
@@ -127,69 +127,6 @@ all: \
     $(MISC)$/ooo11-math-doc.ico \
     $(MISC)$/ooo11-writer-doc.ico \
     $(MISC)$/ooo11-writer-tem.ico \
-    $(MISC)$/so8-base-app.ico \
-    $(MISC)$/so8-base-doc.ico \
-    $(MISC)$/so8-calc-app.ico \
-    $(MISC)$/so8-calc-doc.ico \
-    $(MISC)$/so8-calc-tem.ico \
-    $(MISC)$/so8-chart-doc.ico \
-    $(MISC)$/so8-configuration.ico \
-    $(MISC)$/so8-draw-app.ico \
-    $(MISC)$/so8-draw-doc.ico \
-    $(MISC)$/so8-draw-tem.ico \
-    $(MISC)$/so8-empty-doc.ico \
-    $(MISC)$/so8-empty-tem.ico \
-    $(MISC)$/so8-image-doc.ico \
-    $(MISC)$/so8-impress-app.ico \
-    $(MISC)$/so8-impress-doc.ico \
-    $(MISC)$/so8-impress-tem.ico \
-    $(MISC)$/so8-macro-doc.ico \
-    $(MISC)$/so8-main-app.ico \
-    $(MISC)$/so8-master-doc.ico \
-    $(MISC)$/so8-math-app.ico \
-    $(MISC)$/so8-math-doc.ico \
-    $(MISC)$/so8-open.ico \
-    $(MISC)$/so8-printer.ico \
-    $(MISC)$/so8-web-doc.ico \
-    $(MISC)$/so8-writer-app.ico \
-    $(MISC)$/so8-writer-doc.ico \
-    $(MISC)$/so8-writer-tem.ico \
-    $(MISC)$/so9_empty_tem.ico \
-    $(MISC)$/so9_math_app.ico \
-    $(MISC)$/so9_global_doc.ico \
-    $(MISC)$/so9_main_app.ico \
-    $(MISC)$/so9_empty_doc.ico \
-    $(MISC)$/so9_math_doc.ico \
-    $(MISC)$/so9_base_app.ico \
-    $(MISC)$/so9_html_doc.ico \
-    $(MISC)$/so9_impress_doc.ico \
-    $(MISC)$/so9_draw_tem.ico \
-    $(MISC)$/so9_writer_tem.ico \
-    $(MISC)$/so9_impress_app.ico \
-    $(MISC)$/so9_calc_tem.ico \
-    $(MISC)$/so9_base_doc.ico \
-    $(MISC)$/so9_macro_doc.ico \
-    $(MISC)$/so9_calc_doc.ico \
-    $(MISC)$/so9_draw_doc.ico \
-    $(MISC)$/so9_writer_doc.ico \
-    $(MISC)$/so9_calc_app.ico \
-    $(MISC)$/so9_impress_tem.ico \
-    $(MISC)$/so9_chart_doc.ico \
-    $(MISC)$/so9_writer_app.ico \
-    $(MISC)$/so9_draw_app.ico \
-    $(MISC)$/so9_open.ico \
-    $(MISC)$/so7-base-doc.ico \
-    $(MISC)$/so7-calc-doc.ico \
-    $(MISC)$/so7-calc-tem.ico \
-    $(MISC)$/so7-chart-doc.ico \
-    $(MISC)$/so7-draw-doc.ico \
-    $(MISC)$/so7-draw-tem.ico \
-    $(MISC)$/so7-impress-doc.ico \
-    $(MISC)$/so7-impress-tem.ico \
-    $(MISC)$/so7-master-doc.ico \
-    $(MISC)$/so7-math-doc.ico \
-    $(MISC)$/so7-writer-doc.ico \
-    $(MISC)$/so7-writer-tem.ico \
     $(MISC)$/oxt-extension.ico
 
 $(MISC)$/%.ico: %.ico
diff --git a/sysui/desktop/icons/so7-base-doc.ico b/sysui/desktop/icons/so7-base-doc.ico
deleted file mode 100755
index e4beab7270e1..000000000000
--- a/sysui/desktop/icons/so7-base-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-calc-doc.ico b/sysui/desktop/icons/so7-calc-doc.ico
deleted file mode 100755
index 8b34fc606c5d..000000000000
--- a/sysui/desktop/icons/so7-calc-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-calc-tem.ico b/sysui/desktop/icons/so7-calc-tem.ico
deleted file mode 100755
index d074a214a90b..000000000000
--- a/sysui/desktop/icons/so7-calc-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-chart-doc.ico b/sysui/desktop/icons/so7-chart-doc.ico
deleted file mode 100755
index bdc613fb30e2..000000000000
--- a/sysui/desktop/icons/so7-chart-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-draw-doc.ico b/sysui/desktop/icons/so7-draw-doc.ico
deleted file mode 100755
index c2881862053a..000000000000
--- a/sysui/desktop/icons/so7-draw-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-draw-tem.ico b/sysui/desktop/icons/so7-draw-tem.ico
deleted file mode 100755
index 8d713d0f470e..000000000000
--- a/sysui/desktop/icons/so7-draw-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-impress-doc.ico b/sysui/desktop/icons/so7-impress-doc.ico
deleted file mode 100755
index a8f9518e624b..000000000000
--- a/sysui/desktop/icons/so7-impress-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-impress-tem.ico b/sysui/desktop/icons/so7-impress-tem.ico
deleted file mode 100755
index ac140b269242..000000000000
--- a/sysui/desktop/icons/so7-impress-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-master-doc.ico b/sysui/desktop/icons/so7-master-doc.ico
deleted file mode 100755
index 1c3068715990..000000000000
--- a/sysui/desktop/icons/so7-master-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-math-doc.ico b/sysui/desktop/icons/so7-math-doc.ico
deleted file mode 100755
index d1cd9bd4c6bd..000000000000
--- a/sysui/desktop/icons/so7-math-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-writer-doc.ico b/sysui/desktop/icons/so7-writer-doc.ico
deleted file mode 100755
index b8eb3df20564..000000000000
--- a/sysui/desktop/icons/so7-writer-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so7-writer-tem.ico b/sysui/desktop/icons/so7-writer-tem.ico
deleted file mode 100755
index 318cce4bc9a7..000000000000
--- a/sysui/desktop/icons/so7-writer-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-base-app.ico b/sysui/desktop/icons/so8-base-app.ico
deleted file mode 100755
index 4a22d3529614..000000000000
--- a/sysui/desktop/icons/so8-base-app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-base-doc.ico b/sysui/desktop/icons/so8-base-doc.ico
deleted file mode 100755
index bcddbf957630..000000000000
--- a/sysui/desktop/icons/so8-base-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-calc-app.ico b/sysui/desktop/icons/so8-calc-app.ico
deleted file mode 100755
index a28cab56157b..000000000000
--- a/sysui/desktop/icons/so8-calc-app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-calc-doc.ico b/sysui/desktop/icons/so8-calc-doc.ico
deleted file mode 100755
index 5f293dd82c30..000000000000
--- a/sysui/desktop/icons/so8-calc-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-calc-tem.ico b/sysui/desktop/icons/so8-calc-tem.ico
deleted file mode 100755
index 98bf90678573..000000000000
--- a/sysui/desktop/icons/so8-calc-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-chart-doc.ico b/sysui/desktop/icons/so8-chart-doc.ico
deleted file mode 100755
index 01ff8365434b..000000000000
--- a/sysui/desktop/icons/so8-chart-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-configuration.ico b/sysui/desktop/icons/so8-configuration.ico
deleted file mode 100755
index 57f3b6701b30..000000000000
--- a/sysui/desktop/icons/so8-configuration.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-draw-app.ico b/sysui/desktop/icons/so8-draw-app.ico
deleted file mode 100755
index 6003ccb3d7c3..000000000000
--- a/sysui/desktop/icons/so8-draw-app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-draw-doc.ico b/sysui/desktop/icons/so8-draw-doc.ico
deleted file mode 100755
index f4f169bd6fb5..000000000000
--- a/sysui/desktop/icons/so8-draw-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-draw-tem.ico b/sysui/desktop/icons/so8-draw-tem.ico
deleted file mode 100755
index d3f63c38dbe0..000000000000
--- a/sysui/desktop/icons/so8-draw-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-empty-doc.ico b/sysui/desktop/icons/so8-empty-doc.ico
deleted file mode 100755
index b71d2b939ca7..000000000000
--- a/sysui/desktop/icons/so8-empty-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-empty-tem.ico b/sysui/desktop/icons/so8-empty-tem.ico
deleted file mode 100755
index 9368b0a81aef..000000000000
--- a/sysui/desktop/icons/so8-empty-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-image-doc.ico b/sysui/desktop/icons/so8-image-doc.ico
deleted file mode 100755
index 11b4f0f6c718..000000000000
--- a/sysui/desktop/icons/so8-image-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-impress-app.ico b/sysui/desktop/icons/so8-impress-app.ico
deleted file mode 100755
index 8fae43dab26d..000000000000
--- a/sysui/desktop/icons/so8-impress-app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-impress-doc.ico b/sysui/desktop/icons/so8-impress-doc.ico
deleted file mode 100755
index 9a91f89f2900..000000000000
--- a/sysui/desktop/icons/so8-impress-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-impress-tem.ico b/sysui/desktop/icons/so8-impress-tem.ico
deleted file mode 100755
index f84f813f992c..000000000000
--- a/sysui/desktop/icons/so8-impress-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-macro-doc.ico b/sysui/desktop/icons/so8-macro-doc.ico
deleted file mode 100755
index f3742e1274e7..000000000000
--- a/sysui/desktop/icons/so8-macro-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-main-app.ico b/sysui/desktop/icons/so8-main-app.ico
deleted file mode 100755
index aa044ad9c702..000000000000
--- a/sysui/desktop/icons/so8-main-app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-master-doc.ico b/sysui/desktop/icons/so8-master-doc.ico
deleted file mode 100755
index 27a1d2f61c49..000000000000
--- a/sysui/desktop/icons/so8-master-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-math-app.ico b/sysui/desktop/icons/so8-math-app.ico
deleted file mode 100755
index 956c259c756a..000000000000
--- a/sysui/desktop/icons/so8-math-app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-math-doc.ico b/sysui/desktop/icons/so8-math-doc.ico
deleted file mode 100755
index e7b88449999f..000000000000
--- a/sysui/desktop/icons/so8-math-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-open.ico b/sysui/desktop/icons/so8-open.ico
deleted file mode 100755
index b77a741b338f..000000000000
--- a/sysui/desktop/icons/so8-open.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-printer.ico b/sysui/desktop/icons/so8-printer.ico
deleted file mode 100755
index 25e61f8de5d5..000000000000
--- a/sysui/desktop/icons/so8-printer.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-web-doc.ico b/sysui/desktop/icons/so8-web-doc.ico
deleted file mode 100755
index 12eeb63cffb2..000000000000
--- a/sysui/desktop/icons/so8-web-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-writer-app.ico b/sysui/desktop/icons/so8-writer-app.ico
deleted file mode 100755
index 15f7f92d4b45..000000000000
--- a/sysui/desktop/icons/so8-writer-app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-writer-doc.ico b/sysui/desktop/icons/so8-writer-doc.ico
deleted file mode 100755
index da774be1d3ac..000000000000
--- a/sysui/desktop/icons/so8-writer-doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so8-writer-tem.ico b/sysui/desktop/icons/so8-writer-tem.ico
deleted file mode 100755
index 1bdb86c8090f..000000000000
--- a/sysui/desktop/icons/so8-writer-tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_base_app.ico b/sysui/desktop/icons/so9_base_app.ico
deleted file mode 100755
index aa7036eb90fc..000000000000
--- a/sysui/desktop/icons/so9_base_app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_base_doc.ico b/sysui/desktop/icons/so9_base_doc.ico
deleted file mode 100755
index 8cc1d4433c2c..000000000000
--- a/sysui/desktop/icons/so9_base_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_calc_app.ico b/sysui/desktop/icons/so9_calc_app.ico
deleted file mode 100755
index d7182cad0943..000000000000
--- a/sysui/desktop/icons/so9_calc_app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_calc_doc.ico b/sysui/desktop/icons/so9_calc_doc.ico
deleted file mode 100755
index 2b9e514cb97b..000000000000
--- a/sysui/desktop/icons/so9_calc_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_calc_tem.ico b/sysui/desktop/icons/so9_calc_tem.ico
deleted file mode 100755
index 17f4823c4374..000000000000
--- a/sysui/desktop/icons/so9_calc_tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_chart_doc.ico b/sysui/desktop/icons/so9_chart_doc.ico
deleted file mode 100755
index b116c81903b3..000000000000
--- a/sysui/desktop/icons/so9_chart_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_draw_app.ico b/sysui/desktop/icons/so9_draw_app.ico
deleted file mode 100755
index a8b3c3270fc0..000000000000
--- a/sysui/desktop/icons/so9_draw_app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_draw_doc.ico b/sysui/desktop/icons/so9_draw_doc.ico
deleted file mode 100755
index 51f95046709a..000000000000
--- a/sysui/desktop/icons/so9_draw_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_draw_tem.ico b/sysui/desktop/icons/so9_draw_tem.ico
deleted file mode 100755
index e4b341175bff..000000000000
--- a/sysui/desktop/icons/so9_draw_tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_empty_doc.ico b/sysui/desktop/icons/so9_empty_doc.ico
deleted file mode 100755
index a3970775e3ed..000000000000
--- a/sysui/desktop/icons/so9_empty_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_empty_tem.ico b/sysui/desktop/icons/so9_empty_tem.ico
deleted file mode 100755
index 1b0088b80277..000000000000
--- a/sysui/desktop/icons/so9_empty_tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_global_doc.ico b/sysui/desktop/icons/so9_global_doc.ico
deleted file mode 100755
index ea4ccb383956..000000000000
--- a/sysui/desktop/icons/so9_global_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_html_doc.ico b/sysui/desktop/icons/so9_html_doc.ico
deleted file mode 100755
index 4e5b8bc99c07..000000000000
--- a/sysui/desktop/icons/so9_html_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_impress_app.ico b/sysui/desktop/icons/so9_impress_app.ico
deleted file mode 100755
index cf10331c5ff9..000000000000
--- a/sysui/desktop/icons/so9_impress_app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_impress_doc.ico b/sysui/desktop/icons/so9_impress_doc.ico
deleted file mode 100755
index 5258a8b6aa4c..000000000000
--- a/sysui/desktop/icons/so9_impress_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_impress_tem.ico b/sysui/desktop/icons/so9_impress_tem.ico
deleted file mode 100755
index dcdbddb3b654..000000000000
--- a/sysui/desktop/icons/so9_impress_tem.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_macro_doc.ico b/sysui/desktop/icons/so9_macro_doc.ico
deleted file mode 100755
index cd004015e63f..000000000000
--- a/sysui/desktop/icons/so9_macro_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_main_app.ico b/sysui/desktop/icons/so9_main_app.ico
deleted file mode 100755
index 90f193d80dd9..000000000000
--- a/sysui/desktop/icons/so9_main_app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_math_app.ico b/sysui/desktop/icons/so9_math_app.ico
deleted file mode 100755
index 11fbbf9a494a..000000000000
--- a/sysui/desktop/icons/so9_math_app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_math_doc.ico b/sysui/desktop/icons/so9_math_doc.ico
deleted file mode 100755
index 622ae939d23a..000000000000
--- a/sysui/desktop/icons/so9_math_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_open.ico b/sysui/desktop/icons/so9_open.ico
deleted file mode 100755
index 90f193d80dd9..000000000000
--- a/sysui/desktop/icons/so9_open.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_writer_app.ico b/sysui/desktop/icons/so9_writer_app.ico
deleted file mode 100755
index 10c964dba966..000000000000
--- a/sysui/desktop/icons/so9_writer_app.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_writer_doc.ico b/sysui/desktop/icons/so9_writer_doc.ico
deleted file mode 100755
index b0cf11a993c9..000000000000
--- a/sysui/desktop/icons/so9_writer_doc.ico
+++ /dev/null
diff --git a/sysui/desktop/icons/so9_writer_tem.ico b/sysui/desktop/icons/so9_writer_tem.ico
deleted file mode 100755
index 2e62a1934646..000000000000
--- a/sysui/desktop/icons/so9_writer_tem.ico
+++ /dev/null
diff --git a/sysui/prj/build.lst b/sysui/prj/build.lst
index b5f26eb936b9..b33955a2f0a4 100644
--- a/sysui/prj/build.lst
+++ b/sysui/prj/build.lst
@@ -16,4 +16,4 @@ su  sysui\desktop\debian                nmake   -   u   su_dtdebian su_dtshare.u
 su  sysui\desktop\slackware             nmake   -   u   su_dtslackware su_dtshare.u NULL
 su  sysui\desktop\solaris               nmake   -   u   su_dtsolaris su_dtshare.u NULL
 su  sysui\desktop\util                  nmake   -   u   su_desktop su_dtredhat.u su_dtsuse.u su_dtmdk.u su_dtfreedesktop.u su_dtdebian.u su_dtslackware.u NULL
-su  sysui\util		                    nmake   -   all su_util su_dtsolaris.u su_desktop.u su_win32_quickstart_so.w su_iconsw.w NULL
+su  sysui\util		                    nmake   -   all su_util su_dtsolaris.u su_desktop.u su_iconsw.w NULL
diff --git a/sysui/prj/d.lst b/sysui/prj/d.lst
index c6019cea9a43..918ee8bcbc8f 100644
--- a/sysui/prj/d.lst
+++ b/sysui/prj/d.lst
@@ -15,10 +15,6 @@ mkdir: %_DEST%\bin%_EXT%\desktop-integration\pkg
 ..\%__SRC%\bin\pkg\*.tar.gz %_DEST%\bin%_EXT%\desktop-integration\pkg\*.tar.gz
 
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\bin\quickstart.exe %_DEST%\bin%_EXT%\quickstart.exe
-..\%__SRC%\bin\quickstart.exe %_DEST%\bin%_EXT%\install_quickstart.exe
-..\%__SRC%\bin\soquickstart.exe %_DEST%\bin%_EXT%\so\quickstart.exe
-..\%__SRC%\bin\soquickstart.exe %_DEST%\bin%_EXT%\so\install_quickstart.exe
 
 ..\%__SRC%\misc\ooo3_main_app.ico %_DEST%\bin%_EXT%\soffice.ico