remove unused OOo Windows icons

11 files changed, 28 insertions, 28 deletions

diff --git a/desktop/WinResTarget_quickstart.mk b/desktop/WinResTarget_quickstart.mk
index 9c3ec145289f..0c28ecea09a2 100644
--- a/desktop/WinResTarget_quickstart.mk
+++ b/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))
diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk
index 506bb64b7ef3..fe519bfc1b8e 100644
--- a/desktop/WinResTarget_sbase.mk
+++ b/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))
diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk
index 4113746d0c77..bd710ea031ed 100644
--- a/desktop/WinResTarget_scalc.mk
+++ b/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))
diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk
index 694c7daacc1a..b96a420af31e 100644
--- a/desktop/WinResTarget_sdraw.mk
+++ b/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))
diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk
index 9a4b08fd08fe..a0a5a38f3dbb 100644
--- a/desktop/WinResTarget_simpress.mk
+++ b/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))
diff --git a/desktop/WinResTarget_smath.mk b/desktop/WinResTarget_smath.mk
index d531ae605961..ac6ae36475b6 100644
--- a/desktop/WinResTarget_smath.mk
+++ b/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))
diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk
index 2359f50502d0..5441a2864157 100644
--- a/desktop/WinResTarget_soffice.mk
+++ b/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))
diff --git a/desktop/WinResTarget_sweb.mk b/desktop/WinResTarget_sweb.mk
index 2a0d74d9aae8..424390fddc24 100644
--- a/desktop/WinResTarget_sweb.mk
+++ b/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))
diff --git a/desktop/WinResTarget_swriter.mk b/desktop/WinResTarget_swriter.mk
index 26bc441faacb..71e518413f3c 100644
--- a/desktop/WinResTarget_swriter.mk
+++ b/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))
diff --git a/desktop/util/officeloader.rc b/desktop/util/officeloader.rc
index fb25b7deb610..f968f8ad84d7 100644
--- a/desktop/util/officeloader.rc
+++ b/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"
diff --git a/desktop/win32/source/QuickStart/OOQuickStart.rc b/desktop/win32/source/QuickStart/OOQuickStart.rc
index 9baf7e864f5f..2fdfa7d1357c 100644
--- a/desktop/win32/source/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     "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"
 
 
 /////////////////////////////////////////////////////////////////////////////