[Libreoffice-commits] .: 2 commits - desktop/util desktop/win32 desktop/WinResTarget_quickstart.mk desktop/WinResTarget_sbase.mk desktop/WinResTarget_scalc.mk desktop/WinResTarget_sdraw.mk desktop/WinResTarget_simpress.mk desktop/WinResTarget_smath.mk desktop/WinResTarget_soffice.mk desktop/WinResTarget_sweb.mk desktop/WinResTarget_swriter.mk sysui/desktop sysui/prj
Andras Timar
timar at kemper.freedesktop.org
Fri Dec 2 04:43:41 PST 2011
desktop/WinResTarget_quickstart.mk | 2
desktop/WinResTarget_sbase.mk | 4 -
desktop/WinResTarget_scalc.mk | 4 -
desktop/WinResTarget_sdraw.mk | 4 -
desktop/WinResTarget_simpress.mk | 4 -
desktop/WinResTarget_smath.mk | 4 -
desktop/WinResTarget_soffice.mk | 4 -
desktop/WinResTarget_sweb.mk | 4 -
desktop/WinResTarget_swriter.mk | 4 -
desktop/util/officeloader.rc | 14 ++--
desktop/win32/source/QuickStart/OOQuickStart.rc | 8 +-
desktop/win32/source/applauncher/launcher.rc | 2
dev/null |binary
sysui/desktop/icons/makefile.mk | 71 ++----------------------
sysui/prj/d.lst | 2
15 files changed, 38 insertions(+), 93 deletions(-)
New commits:
commit da0db8b03cd19af585133691689c1d752cc8c970
Author: Andras Timar <atimar at suse.com>
Date: Fri Dec 2 13:43:18 2011 +0100
remove unused OOo Windows icons
diff --git a/desktop/WinResTarget_quickstart.mk b/desktop/WinResTarget_quickstart.mk
index 9c3ec14..0c28ece 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 506bb64..fe519bf 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 4113746..bd710ea 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 694c7da..b96a420 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 9a4b08f..a0a5a38 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 d531ae6..ac6ae36 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 2359f50..5441a28 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 2a0d74d..424390f 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 26bc441..71e5184 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 fb25b7d..f968f8a 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 9baf7e8..2fdfa7d 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"
/////////////////////////////////////////////////////////////////////////////
diff --git a/sysui/desktop/icons/makefile.mk b/sysui/desktop/icons/makefile.mk
index ce5b0b7..577bce5 100755
--- a/sysui/desktop/icons/makefile.mk
+++ b/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
diff --git a/sysui/desktop/icons/ooo-base-app.ico b/sysui/desktop/icons/ooo-base-app.ico
deleted file mode 100644
index e9af06a..0000000
Binary files a/sysui/desktop/icons/ooo-base-app.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-base-doc.ico b/sysui/desktop/icons/ooo-base-doc.ico
deleted file mode 100644
index 62411de..0000000
Binary files a/sysui/desktop/icons/ooo-base-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-calc-app.ico b/sysui/desktop/icons/ooo-calc-app.ico
deleted file mode 100644
index 8d91367..0000000
Binary files a/sysui/desktop/icons/ooo-calc-app.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-calc-doc.ico b/sysui/desktop/icons/ooo-calc-doc.ico
deleted file mode 100644
index 06c4965..0000000
Binary files a/sysui/desktop/icons/ooo-calc-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-calc-tem.ico b/sysui/desktop/icons/ooo-calc-tem.ico
deleted file mode 100644
index cb34adc..0000000
Binary files a/sysui/desktop/icons/ooo-calc-tem.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-chart-doc.ico b/sysui/desktop/icons/ooo-chart-doc.ico
deleted file mode 100644
index 4a50158..0000000
Binary files a/sysui/desktop/icons/ooo-chart-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-configuration.ico b/sysui/desktop/icons/ooo-configuration.ico
deleted file mode 100644
index 9bae70b..0000000
Binary files a/sysui/desktop/icons/ooo-configuration.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-draw-app.ico b/sysui/desktop/icons/ooo-draw-app.ico
deleted file mode 100644
index 9f4f0c3..0000000
Binary files a/sysui/desktop/icons/ooo-draw-app.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-draw-doc.ico b/sysui/desktop/icons/ooo-draw-doc.ico
deleted file mode 100644
index 96d0710..0000000
Binary files a/sysui/desktop/icons/ooo-draw-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-draw-tem.ico b/sysui/desktop/icons/ooo-draw-tem.ico
deleted file mode 100644
index 6b18169..0000000
Binary files a/sysui/desktop/icons/ooo-draw-tem.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-empty-doc.ico b/sysui/desktop/icons/ooo-empty-doc.ico
deleted file mode 100644
index bd3aa12..0000000
Binary files a/sysui/desktop/icons/ooo-empty-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-empty-tem.ico b/sysui/desktop/icons/ooo-empty-tem.ico
deleted file mode 100644
index b68f0f1..0000000
Binary files a/sysui/desktop/icons/ooo-empty-tem.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-image-doc.ico b/sysui/desktop/icons/ooo-image-doc.ico
deleted file mode 100644
index 96d0710..0000000
Binary files a/sysui/desktop/icons/ooo-image-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-impress-app.ico b/sysui/desktop/icons/ooo-impress-app.ico
deleted file mode 100644
index 7dcd17a..0000000
Binary files a/sysui/desktop/icons/ooo-impress-app.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-impress-doc.ico b/sysui/desktop/icons/ooo-impress-doc.ico
deleted file mode 100644
index 9da080c..0000000
Binary files a/sysui/desktop/icons/ooo-impress-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-impress-tem.ico b/sysui/desktop/icons/ooo-impress-tem.ico
deleted file mode 100644
index aa861d8..0000000
Binary files a/sysui/desktop/icons/ooo-impress-tem.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-macro-doc.ico b/sysui/desktop/icons/ooo-macro-doc.ico
deleted file mode 100644
index 266e35d..0000000
Binary files a/sysui/desktop/icons/ooo-macro-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-main-app.ico b/sysui/desktop/icons/ooo-main-app.ico
deleted file mode 100644
index fa01bab..0000000
Binary files a/sysui/desktop/icons/ooo-main-app.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-master-doc.ico b/sysui/desktop/icons/ooo-master-doc.ico
deleted file mode 100644
index 4a157a9..0000000
Binary files a/sysui/desktop/icons/ooo-master-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-math-app.ico b/sysui/desktop/icons/ooo-math-app.ico
deleted file mode 100644
index d182fd5..0000000
Binary files a/sysui/desktop/icons/ooo-math-app.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-math-doc.ico b/sysui/desktop/icons/ooo-math-doc.ico
deleted file mode 100644
index 786127a..0000000
Binary files a/sysui/desktop/icons/ooo-math-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-open.ico b/sysui/desktop/icons/ooo-open.ico
deleted file mode 100644
index 78987ae..0000000
Binary files a/sysui/desktop/icons/ooo-open.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-printer.ico b/sysui/desktop/icons/ooo-printer.ico
deleted file mode 100644
index 14882d1..0000000
Binary files a/sysui/desktop/icons/ooo-printer.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-web-doc.ico b/sysui/desktop/icons/ooo-web-doc.ico
deleted file mode 100644
index f03da4e..0000000
Binary files a/sysui/desktop/icons/ooo-web-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-writer-app.ico b/sysui/desktop/icons/ooo-writer-app.ico
deleted file mode 100644
index 22c9661..0000000
Binary files a/sysui/desktop/icons/ooo-writer-app.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-writer-doc.ico b/sysui/desktop/icons/ooo-writer-doc.ico
deleted file mode 100644
index 694a166..0000000
Binary files a/sysui/desktop/icons/ooo-writer-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo-writer-tem.ico b/sysui/desktop/icons/ooo-writer-tem.ico
deleted file mode 100644
index 9379f9b..0000000
Binary files a/sysui/desktop/icons/ooo-writer-tem.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo11-base-doc.ico b/sysui/desktop/icons/ooo11-base-doc.ico
deleted file mode 100644
index e2377f4..0000000
Binary files a/sysui/desktop/icons/ooo11-base-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo11-calc-doc.ico b/sysui/desktop/icons/ooo11-calc-doc.ico
deleted file mode 100644
index bce2ae3..0000000
Binary files a/sysui/desktop/icons/ooo11-calc-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo11-calc-tem.ico b/sysui/desktop/icons/ooo11-calc-tem.ico
deleted file mode 100644
index bce2ae3..0000000
Binary files a/sysui/desktop/icons/ooo11-calc-tem.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo11-chart-doc.ico b/sysui/desktop/icons/ooo11-chart-doc.ico
deleted file mode 100644
index e2377f4..0000000
Binary files a/sysui/desktop/icons/ooo11-chart-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo11-draw-doc.ico b/sysui/desktop/icons/ooo11-draw-doc.ico
deleted file mode 100644
index 2d3a088..0000000
Binary files a/sysui/desktop/icons/ooo11-draw-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo11-draw-tem.ico b/sysui/desktop/icons/ooo11-draw-tem.ico
deleted file mode 100644
index 2d3a088..0000000
Binary files a/sysui/desktop/icons/ooo11-draw-tem.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo11-impress-doc.ico b/sysui/desktop/icons/ooo11-impress-doc.ico
deleted file mode 100644
index 173db79..0000000
Binary files a/sysui/desktop/icons/ooo11-impress-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo11-impress-tem.ico b/sysui/desktop/icons/ooo11-impress-tem.ico
deleted file mode 100644
index 173db79..0000000
Binary files a/sysui/desktop/icons/ooo11-impress-tem.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo11-master-doc.ico b/sysui/desktop/icons/ooo11-master-doc.ico
deleted file mode 100644
index e2377f4..0000000
Binary files a/sysui/desktop/icons/ooo11-master-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo11-math-doc.ico b/sysui/desktop/icons/ooo11-math-doc.ico
deleted file mode 100644
index 6360ec4..0000000
Binary files a/sysui/desktop/icons/ooo11-math-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo11-writer-doc.ico b/sysui/desktop/icons/ooo11-writer-doc.ico
deleted file mode 100644
index 745a58b..0000000
Binary files a/sysui/desktop/icons/ooo11-writer-doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo11-writer-tem.ico b/sysui/desktop/icons/ooo11-writer-tem.ico
deleted file mode 100644
index 745a58b..0000000
Binary files a/sysui/desktop/icons/ooo11-writer-tem.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_base_doc.ico b/sysui/desktop/icons/ooo3_base_doc.ico
deleted file mode 100644
index 87c58e6..0000000
Binary files a/sysui/desktop/icons/ooo3_base_doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_calc_doc.ico b/sysui/desktop/icons/ooo3_calc_doc.ico
deleted file mode 100644
index 92741f3..0000000
Binary files a/sysui/desktop/icons/ooo3_calc_doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_calc_tem.ico b/sysui/desktop/icons/ooo3_calc_tem.ico
deleted file mode 100644
index 2a72a5a..0000000
Binary files a/sysui/desktop/icons/ooo3_calc_tem.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_chart_doc.ico b/sysui/desktop/icons/ooo3_chart_doc.ico
deleted file mode 100644
index 5c46bd4..0000000
Binary files a/sysui/desktop/icons/ooo3_chart_doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_draw_doc.ico b/sysui/desktop/icons/ooo3_draw_doc.ico
deleted file mode 100644
index 47ed3ef..0000000
Binary files a/sysui/desktop/icons/ooo3_draw_doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_draw_tem.ico b/sysui/desktop/icons/ooo3_draw_tem.ico
deleted file mode 100644
index 4a55c99..0000000
Binary files a/sysui/desktop/icons/ooo3_draw_tem.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_empty_doc.ico b/sysui/desktop/icons/ooo3_empty_doc.ico
deleted file mode 100644
index 67e3c34..0000000
Binary files a/sysui/desktop/icons/ooo3_empty_doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_empty_tem.ico b/sysui/desktop/icons/ooo3_empty_tem.ico
deleted file mode 100644
index eecd336..0000000
Binary files a/sysui/desktop/icons/ooo3_empty_tem.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_global_doc.ico b/sysui/desktop/icons/ooo3_global_doc.ico
deleted file mode 100644
index c7113f8..0000000
Binary files a/sysui/desktop/icons/ooo3_global_doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_html_doc.ico b/sysui/desktop/icons/ooo3_html_doc.ico
deleted file mode 100644
index 2c8b5c5..0000000
Binary files a/sysui/desktop/icons/ooo3_html_doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_impress_doc.ico b/sysui/desktop/icons/ooo3_impress_doc.ico
deleted file mode 100644
index 0e80d9b..0000000
Binary files a/sysui/desktop/icons/ooo3_impress_doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_impress_tem.ico b/sysui/desktop/icons/ooo3_impress_tem.ico
deleted file mode 100644
index 15f988d..0000000
Binary files a/sysui/desktop/icons/ooo3_impress_tem.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_macro_doc.ico b/sysui/desktop/icons/ooo3_macro_doc.ico
deleted file mode 100644
index 6c614ad..0000000
Binary files a/sysui/desktop/icons/ooo3_macro_doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_math_doc.ico b/sysui/desktop/icons/ooo3_math_doc.ico
deleted file mode 100644
index 9e349dc..0000000
Binary files a/sysui/desktop/icons/ooo3_math_doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_writer_doc.ico b/sysui/desktop/icons/ooo3_writer_doc.ico
deleted file mode 100644
index 1ed299a..0000000
Binary files a/sysui/desktop/icons/ooo3_writer_doc.ico and /dev/null differ
diff --git a/sysui/desktop/icons/ooo3_writer_tem.ico b/sysui/desktop/icons/ooo3_writer_tem.ico
deleted file mode 100644
index f609be1..0000000
Binary files a/sysui/desktop/icons/ooo3_writer_tem.ico and /dev/null differ
diff --git a/sysui/prj/d.lst b/sysui/prj/d.lst
index b62b651..ca308e8 100644
--- a/sysui/prj/d.lst
+++ b/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
commit c7ecf3c82d1e9f151488f4833786e69d8357bc9d
Author: Andras Timar <atimar at suse.com>
Date: Fri Dec 2 13:08:40 2011 +0100
A trailing 0 on an ICON line is unnecessary and causes an error
diff --git a/desktop/win32/source/applauncher/launcher.rc b/desktop/win32/source/applauncher/launcher.rc
index f9da5cc..e871534 100644
--- a/desktop/win32/source/applauncher/launcher.rc
+++ b/desktop/win32/source/applauncher/launcher.rc
@@ -70,4 +70,4 @@ VS_VERSION_INFO VERSIONINFO
}
}
-1 ICON PPS(RES_APP_ICON) "\0"
+1 ICON PPS(RES_APP_ICON)
More information about the Libreoffice-commits
mailing list