fdo#37740 remove duplicate icons from soffice.bin/soffice.exe

5 files changed, 57 insertions, 33 deletions

diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index 8815432d1457..00fb0057925e 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -103,6 +103,6 @@ $(eval $(call gb_Executable_set_ldflags,\
 
 endif
 
-$(eval $(call gb_Executable_add_nativeres,$(sofficebin),soffice/src)) 
+$(eval $(call gb_Executable_add_nativeres,$(sofficebin),sofficebin/src))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 3d0045c1e821..eb83f82242db 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
     WinResTarget_sdraw \
     WinResTarget_simpress \
     WinResTarget_soffice \
+    WinResTarget_sofficebin \
     WinResTarget_smath \
     WinResTarget_sweb \
     WinResTarget_swriter \
diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk
index b1333355a802..fe66aa59059a 100644
--- a/desktop/WinResTarget_soffice.mk
+++ b/desktop/WinResTarget_soffice.mk
@@ -44,6 +44,6 @@ $(eval $(call gb_WinResTarget_add_dependency,soffice/src,\
     sysui/desktop/icons/main_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_add_file,soffice/src,desktop/util/officeloader))
+$(eval $(call gb_WinResTarget_add_file,soffice/src,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_sofficebin.mk b/desktop/WinResTarget_sofficebin.mk
new file mode 100644
index 000000000000..334c9b780834
--- /dev/null
+++ b/desktop/WinResTarget_sofficebin.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_WinResTarget_WinResTarget,sofficebin/src))
+
+$(eval $(call gb_WinResTarget_set_include,sofficebin/src,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sysui/desktop \
+))
+
+$(eval $(call gb_WinResTarget_set_defs,sofficebin/src,\
+    $$(DEFS) \
+    -DRES_APP_NAME=soffice \
+    -DRES_APP_ICON=icons/main_app.ico \
+    -DVERVARIANT=$(BUILD) \
+    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
+))
+
+$(eval $(call gb_WinResTarget_add_dependency,sofficebin/src,\
+    sysui/desktop/icons/main_app.ico \
+))
+
+$(eval $(call gb_WinResTarget_add_file,sofficebin/src,desktop/util/officeloader))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/util/officeloader.rc b/desktop/util/officeloader.rc
index 69710f2ceaab..14ee1c028984 100644
--- a/desktop/util/officeloader.rc
+++ b/desktop/util/officeloader.rc
@@ -78,34 +78,8 @@ VS_VERSION_INFO VERSIONINFO
 7 ICON "icons/oasis-drawing-template.ico"
 8 ICON "icons/oasis-presentation.ico"
 9 ICON "icons/oasis-presentation-template.ico"
-10 ICON "icons/oasis-presentation-template.ico"
-11 ICON "icons/oasis-master-document.ico"
-12 ICON "icons/oasis-web-template.ico"
-13 ICON "icons/oasis-empty-document.ico"
-14 ICON "icons/oasis-database.ico"
-15 ICON "icons/oasis-formula.ico"
-16 ICON "icons/oasis-web-template.ico"
-17 ICON "icons/empty-document.ico"
-18 ICON "icons/empty-document.ico"
-19 ICON "icons/open.ico"
-20 ICON "icons/empty-document.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"
-30 ICON "icons/spreadsheet.ico"
-31 ICON "icons/spreadsheet-template.ico"
-32 ICON "icons/drawing.ico"
-33 ICON "icons/drawing-template.ico"
-34 ICON "icons/presentation.ico"
-35 ICON "icons/presentation-template.ico"
-36 ICON "icons/master-document.ico"
-37 ICON "icons/empty-document.ico"
-38 ICON "icons/database.ico"
-39 ICON "icons/formula.ico"
-40 ICON "icons/oxt-extension.ico"
+10 ICON "icons/oasis-master-document.ico"
+11 ICON "icons/oasis-web-template.ico"
+12 ICON "icons/oasis-database.ico"
+13 ICON "icons/oasis-formula.ico"
+14 ICON "icons/oxt-extension.ico"