remove unused OOo Windows icons

desktop/WinResTarget_quickstart.mk

@@ -32,7 +32,7 @@ $(eval $(call gb_WinResTarget_set_include,quickstart/src,\
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,quickstart/src,\
-    sysui/desktop/icons/ooo3_main_app.ico \
+    sysui/desktop/icons/main_app.ico \
 ))
 
 $(eval $(call gb_WinResTarget_add_file,quickstart/src,desktop/win32/source/QuickStart/OOQuickStart))

desktop/WinResTarget_sbase.mk

@@ -33,12 +33,12 @@ $(eval $(call gb_WinResTarget_set_include,sbase/src,\
 $(eval $(call gb_WinResTarget_set_defs,sbase/src,\
     $$(DEFS) \
     -DRES_APP_NAME=sbase \
-    -DRES_APP_ICON=icons/ooo3_base_app.ico \
+    -DRES_APP_ICON=icons/base_app.ico \
     -DVERVARIANT=$(BUILD) \
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,sbase/src,\
-    sysui/desktop/icons/ooo3_base_app.ico \
+    sysui/desktop/icons/base_app.ico \
 ))
 
 $(eval $(call gb_WinResTarget_add_file,sbase/src,desktop/win32/source/applauncher/launcher))

desktop/WinResTarget_scalc.mk

@@ -33,12 +33,12 @@ $(eval $(call gb_WinResTarget_set_include,scalc/src,\
 $(eval $(call gb_WinResTarget_set_defs,scalc/src,\
     $$(DEFS) \
     -DRES_APP_NAME=scalc \
-    -DRES_APP_ICON=icons/ooo3_calc_app.ico \
+    -DRES_APP_ICON=icons/calc_app.ico \
     -DVERVARIANT=$(BUILD) \
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,scalc/src,\
-    sysui/desktop/icons/ooo3_calc_app.ico \
+    sysui/desktop/icons/calc_app.ico \
 ))
 
 $(eval $(call gb_WinResTarget_add_file,scalc/src,desktop/win32/source/applauncher/launcher))

desktop/WinResTarget_sdraw.mk

@@ -33,12 +33,12 @@ $(eval $(call gb_WinResTarget_set_include,sdraw/src,\
 $(eval $(call gb_WinResTarget_set_defs,sdraw/src,\
     $$(DEFS) \
     -DRES_APP_NAME=sdraw \
-    -DRES_APP_ICON=icons/ooo3_draw_app.ico \
+    -DRES_APP_ICON=icons/draw_app.ico \
     -DVERVARIANT=$(BUILD) \
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,sdraw/src,\
-    sysui/desktop/icons/ooo3_draw_app.ico \
+    sysui/desktop/icons/draw_app.ico \
 ))
 
 $(eval $(call gb_WinResTarget_add_file,sdraw/src,desktop/win32/source/applauncher/launcher))

desktop/WinResTarget_simpress.mk

@@ -33,12 +33,12 @@ $(eval $(call gb_WinResTarget_set_include,simpress/src,\
 $(eval $(call gb_WinResTarget_set_defs,simpress/src,\
     $$(DEFS) \
     -DRES_APP_NAME=simpress \
-    -DRES_APP_ICON=icons/ooo3_impress_app.ico \
+    -DRES_APP_ICON=icons/impress_app.ico \
     -DVERVARIANT=$(BUILD) \
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,simpress/src,\
-    sysui/desktop/icons/ooo3_impress_app.ico \
+    sysui/desktop/icons/impress_app.ico \
 ))
 
 $(eval $(call gb_WinResTarget_add_file,simpress/src,desktop/win32/source/applauncher/launcher))

desktop/WinResTarget_smath.mk

@@ -33,12 +33,12 @@ $(eval $(call gb_WinResTarget_set_include,smath/src,\
 $(eval $(call gb_WinResTarget_set_defs,smath/src,\
     $$(DEFS) \
     -DRES_APP_NAME=smath \
-    -DRES_APP_ICON=icons/ooo3_math_app.ico \
+    -DRES_APP_ICON=icons/math_app.ico \
     -DVERVARIANT=$(BUILD) \
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,smath/src,\
-    sysui/desktop/icons/ooo3_math_app.ico \
+    sysui/desktop/icons/math_app.ico \
 ))
 
 $(eval $(call gb_WinResTarget_add_file,smath/src,desktop/win32/source/applauncher/launcher))

desktop/WinResTarget_soffice.mk

@@ -33,12 +33,12 @@ $(eval $(call gb_WinResTarget_set_include,soffice/src,\
 $(eval $(call gb_WinResTarget_set_defs,soffice/src,\
     $$(DEFS) \
     -DRES_APP_NAME=soffice \
-    -DRES_APP_ICON=icons/ooo3_main_app.ico \
+    -DRES_APP_ICON=icons/main_app.ico \
     -DVERVARIANT=$(BUILD) \
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,soffice/src,\
-    sysui/desktop/icons/ooo3_main_app.ico \
+    sysui/desktop/icons/main_app.ico \
 ))
 
 $(eval $(call gb_WinResTarget_add_file,soffice/src,desktop/util/officeloader))

desktop/WinResTarget_sweb.mk

@@ -33,12 +33,12 @@ $(eval $(call gb_WinResTarget_set_include,sweb/src,\
 $(eval $(call gb_WinResTarget_set_defs,sweb/src,\
     $$(DEFS) \
     -DRES_APP_NAME=sweb \
-    -DRES_APP_ICON=icons/ooo3_writer_app.ico \
+    -DRES_APP_ICON=icons/writer_app.ico \
     -DVERVARIANT=$(BUILD) \
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,sweb/src,\
-    sysui/desktop/icons/ooo3_writer_app.ico \
+    sysui/desktop/icons/writer_app.ico \
 ))
 
 $(eval $(call gb_WinResTarget_add_file,sweb/src,desktop/win32/source/applauncher/launcher))

desktop/WinResTarget_swriter.mk

@@ -33,12 +33,12 @@ $(eval $(call gb_WinResTarget_set_include,swriter/src,\
 $(eval $(call gb_WinResTarget_set_defs,swriter/src,\
     $$(DEFS) \
     -DRES_APP_NAME=swriter \
-    -DRES_APP_ICON=icons/ooo3_writer_app.ico \
+    -DRES_APP_ICON=icons/writer_app.ico \
     -DVERVARIANT=$(BUILD) \
 ))
 
 $(eval $(call gb_WinResTarget_add_dependency,swriter/src,\
-    sysui/desktop/icons/ooo3_writer_app.ico \
+    sysui/desktop/icons/writer_app.ico \
 ))
 
 $(eval $(call gb_WinResTarget_add_file,swriter/src,desktop/win32/source/applauncher/launcher))

desktop/util/officeloader.rc

@@ -88,14 +88,14 @@ VS_VERSION_INFO VERSIONINFO
 16 ICON "icons/oasis-web-template.ico"
 17 ICON "icons/empty-document.ico"
 18 ICON "icons/empty-document.ico"
-19 ICON "icons/ooo3_open.ico"
+19 ICON "icons/open.ico"
 20 ICON "icons/empty-document.ico"
-21 ICON "icons/ooo3_writer_app.ico"
-22 ICON "icons/ooo3_calc_app.ico"
-23 ICON "icons/ooo3_draw_app.ico"
-24 ICON "icons/ooo3_impress_app.ico"
-25 ICON "icons/ooo3_math_app.ico"
-26 ICON "icons/ooo3_base_app.ico"
+21 ICON "icons/writer_app.ico"
+22 ICON "icons/calc_app.ico"
+23 ICON "icons/draw_app.ico"
+24 ICON "icons/impress_app.ico"
+25 ICON "icons/math_app.ico"
+26 ICON "icons/base_app.ico"
 27 ICON "icons/oasis-empty-document.ico"
 28 ICON "icons/text.ico"
 29 ICON "icons/text-template.ico"

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     "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"
+ICON_ACTIVE             ICON    DISCARDABLE     "icons/main_app.ico"
+IDI_QUICKSTART          ICON    DISCARDABLE     "icons/main_app.ico"
+IDI_SMALL               ICON    DISCARDABLE     "icons/main_app.ico"
+ICON_INACTIVE           ICON    DISCARDABLE     "icons/main_app.ico"
 
 
 /////////////////////////////////////////////////////////////////////////////

sysui/desktop/icons/makefile.mk

@@ -64,69 +64,14 @@ all: \
     $(MISC)$/spreadsheet.ico \
     $(MISC)$/text-template.ico \
     $(MISC)$/text.ico \
-    $(MISC)$/ooo-base-app.ico \
-    $(MISC)$/ooo-base-doc.ico \
-    $(MISC)$/ooo-calc-app.ico \
-    $(MISC)$/ooo-calc-doc.ico \
-    $(MISC)$/ooo-calc-tem.ico \
-    $(MISC)$/ooo-chart-doc.ico \
-    $(MISC)$/ooo-configuration.ico \
-    $(MISC)$/ooo-draw-app.ico \
-    $(MISC)$/ooo-draw-doc.ico \
-    $(MISC)$/ooo-draw-tem.ico \
-    $(MISC)$/ooo-empty-doc.ico \
-    $(MISC)$/ooo-empty-tem.ico \
-    $(MISC)$/ooo-image-doc.ico \
-    $(MISC)$/ooo-impress-app.ico \
-    $(MISC)$/ooo-impress-doc.ico \
-    $(MISC)$/ooo-impress-tem.ico \
-    $(MISC)$/ooo-macro-doc.ico \
-    $(MISC)$/ooo-main-app.ico \
-    $(MISC)$/ooo-master-doc.ico \
-    $(MISC)$/ooo-math-app.ico \
-    $(MISC)$/ooo-math-doc.ico \
-    $(MISC)$/ooo-open.ico \
-    $(MISC)$/ooo-printer.ico \
-    $(MISC)$/ooo-web-doc.ico \
-    $(MISC)$/ooo-writer-app.ico \
-    $(MISC)$/ooo-writer-doc.ico \
-    $(MISC)$/ooo-writer-tem.ico \
-    $(MISC)$/ooo3_calc_doc.ico \
-    $(MISC)$/ooo3_macro_doc.ico \
-    $(MISC)$/ooo3_impress_app.ico \
-    $(MISC)$/ooo3_global_doc.ico \
-    $(MISC)$/ooo3_draw_doc.ico \
-    $(MISC)$/ooo3_chart_doc.ico \
-    $(MISC)$/ooo3_calc_app.ico \
-    $(MISC)$/ooo3_draw_app.ico \
-    $(MISC)$/ooo3_impress_doc.ico \
-    $(MISC)$/ooo3_impress_tem.ico \
-    $(MISC)$/ooo3_html_doc.ico \
-    $(MISC)$/ooo3_base_app.ico \
-    $(MISC)$/ooo3_draw_tem.ico \
-    $(MISC)$/ooo3_base_doc.ico \
-    $(MISC)$/ooo3_calc_tem.ico \
-    $(MISC)$/ooo3_writer_app.ico \
-    $(MISC)$/ooo3_math_app.ico \
-    $(MISC)$/ooo3_main_app.ico \
-    $(MISC)$/ooo3_empty_doc.ico \
-    $(MISC)$/ooo3_writer_doc.ico \
-    $(MISC)$/ooo3_math_doc.ico \
-    $(MISC)$/ooo3_writer_tem.ico \
-    $(MISC)$/ooo3_empty_tem.ico \
-    $(MISC)$/ooo3_open.ico \
-    $(MISC)$/ooo11-base-doc.ico \
-    $(MISC)$/ooo11-calc-doc.ico \
-    $(MISC)$/ooo11-calc-tem.ico \
-    $(MISC)$/ooo11-chart-doc.ico \
-    $(MISC)$/ooo11-draw-doc.ico \
-    $(MISC)$/ooo11-draw-tem.ico \
-    $(MISC)$/ooo11-impress-doc.ico \
-    $(MISC)$/ooo11-impress-tem.ico \
-    $(MISC)$/ooo11-master-doc.ico \
-    $(MISC)$/ooo11-math-doc.ico \
-    $(MISC)$/ooo11-writer-doc.ico \
-    $(MISC)$/ooo11-writer-tem.ico \
+    $(MISC)$/impress_app.ico \
+    $(MISC)$/calc_app.ico \
+    $(MISC)$/draw_app.ico \
+    $(MISC)$/base_app.ico \
+    $(MISC)$/writer_app.ico \
+    $(MISC)$/math_app.ico \
+    $(MISC)$/main_app.ico \
+    $(MISC)$/open.ico \
     $(MISC)$/oxt-extension.ico
 
 $(MISC)$/%.ico: %.ico

sysui/prj/d.lst

@@ -16,7 +16,7 @@ mkdir: %_DEST%\bin\desktop-integration\pkg
 
 ..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
 
-..\%__SRC%\misc\ooo3_main_app.ico %_DEST%\bin\soffice.ico
+..\%__SRC%\misc\main_app.ico %_DEST%\bin\soffice.ico
 
 ..\%__SRC%\misc\desktopshare\*.desktop %_DEST%\pck\*.desktop
 ..\%__SRC%\misc\PkgInfo %_DEST%\pck\PkgInfo