summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Voytenko <mav@openoffice.org>2011-02-17 17:59:41 +0100
committerMikhail Voytenko <mav@openoffice.org>2011-02-17 17:59:41 +0100
commit04a687ac5b83ce75e1912108bbe4cc305f8b31dd (patch)
tree1a59e35334b21fb87b660a9d1cd5f73c5c973665
parent1200bd6e41f7b071d3a911818f96143aa644d182 (diff)
fwk166: #164409# remove unused icons
-rw-r--r--desktop/os2/source/applauncher/makefile.mk6
-rw-r--r--desktop/os2/source/applauncher/os2quickstart.cxx (renamed from desktop/os2/source/applauncher/quickstart.cxx)0
-rw-r--r--desktop/prj/build.lst5
-rw-r--r--desktop/prj/d.lst7
-rw-r--r--desktop/win32/source/QuickStart/OOQuickStart.rc (renamed from sysui/source/win32/QuickStart/OOQuickStart.rc)8
-rw-r--r--desktop/win32/source/QuickStart/QuickStart.cpp (renamed from sysui/source/win32/QuickStart/QuickStart.cpp)0
-rw-r--r--desktop/win32/source/QuickStart/QuickStart.h (renamed from sysui/source/win32/QuickStart/QuickStart.h)0
-rw-r--r--desktop/win32/source/QuickStart/StdAfx.h (renamed from sysui/source/win32/QuickStart/StdAfx.h)0
-rw-r--r--desktop/win32/source/QuickStart/makefile.mk (renamed from sysui/source/win32/QuickStart/makefile.mk)0
-rw-r--r--desktop/win32/source/QuickStart/resource.h (renamed from sysui/source/win32/QuickStart/resource.h)0
-rw-r--r--desktop/win32/source/QuickStart/so/QuickStart.rc (renamed from sysui/source/win32/QuickStart/so/QuickStart.rc)8
-rw-r--r--desktop/win32/source/QuickStart/so/makefile.mk (renamed from sysui/source/win32/QuickStart/so/makefile.mk)4
-rw-r--r--sysui/prj/build.lst4
-rw-r--r--sysui/prj/d.lst4
14 files changed, 26 insertions, 20 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 146579cab8bc..20ce12a574c8 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/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..e2845de98f2f 100644
--- a/sysui/source/win32/QuickStart/so/makefile.mk
+++ b/desktop/win32/source/QuickStart/so/makefile.mk
@@ -46,6 +46,8 @@ INCPRE=..
# --- Files --------------------------------------------------------
+.IF "$(LINK_SO)"=="TRUE"
+
OBJFILES=$(OBJ)$/QuickStart.obj
APP1OBJS=$(OBJFILES)
@@ -68,6 +70,8 @@ APP1STDLIBS+=$(SHELL32LIB)\
APP1NOSVRES=$(RES)$/$(TARGET).res
+.ENDIF # "$(LINK_SO)"=="TRUE"
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sysui/prj/build.lst b/sysui/prj/build.lst
index 1530997a3ec3..96419b4b44a2 100644
--- a/sysui/prj/build.lst
+++ b/sysui/prj/build.lst
@@ -1,6 +1,4 @@
su sysui : l10n offapi xml2cmp rdbmaker l10ntools setup_native NULL
-su sysui\source\win32\QuickStart nmake - w su_win32_quickstart NULL
-su sysui\source\win32\QuickStart\so nmake - w su_win32_quickstart_so su_win32_quickstart.w NULL
su sysui\desktop\icons nmake - w su_iconsw NULL
su sysui\desktop\os2 nmake - p su_iconsw NULL
su sysui\desktop\macosx nmake - u su_dtmacosx su_dtshare.u NULL
@@ -16,4 +14,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