CWS-TOOLING: integrate CWS os2port04

2008-11-27 13:22:38 +0100 ydario  r264480 : #i96439#: fix build for unix platforms.
2008-11-26 18:32:42 +0100 ydario  r264433 : #i96439#: os2 systemshell code (dummy code).
2008-11-26 16:33:48 +0100 ydario  r264421 : #i96439#: vcl fix for pdf export of truetype fonts.
2008-11-26 15:04:44 +0100 ydario  r264399 : #i96439#: build macros fix scripts, gcc specific flags.
2008-11-26 15:00:15 +0100 ydario  r264398 : #i96439#: vcl source code updates.
2008-11-26 13:21:37 +0100 ydario  r264378 : #i96439#: os2 build system fixes.
2008-11-26 13:20:27 +0100 ydario  r264377 : #i96439#: configuration and build macros updates.
2008-11-26 13:16:35 +0100 ydario  r264375 : #i96439#: new launcher code, build system updates.
2008-11-26 13:12:49 +0100 ydario  r264373 : #i96439#: use OSL endian macro.
2008-11-26 12:54:50 +0100 ydario  r264371 : #i96439#: os2 build system fixes.
2008-11-26 12:30:46 +0100 ydario  r264367 : #i96439#: os2 build system fixes.
2008-11-26 12:09:33 +0100 ydario  r264365 : #i96439#: _Export is a reserved keyword under gcc for os2.
2008-11-26 12:08:12 +0100 ydario  r264364 : #i96439#: new libpath handling.
2008-11-26 11:57:51 +0100 ydario  r264363 : #i96439#: use C call, generates proper stabs; fix rtti names.

2 files changed, 24 insertions, 24 deletions

diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index 0b85d7d246..5c8b8f6810 100644
--- a/desktop/util/makefile.mk
+++ b/desktop/util/makefile.mk
@@ -131,7 +131,7 @@ APP5STACK=10000000
 .IF "$(GUI)" == "OS2"
 APP5DEF= # automatic
 APP5RES=    $(RES)$/oodesktop.res
-APP5ICON=$(SOLARRESDIR)$/icons/ooo3_main_app.ico
+APP5ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico
 APP5VERINFO=ooverinfo2.rc
 APP5LINKRES=$(MISC)$/ooffice.res
 .ENDIF # OS2
diff --git a/desktop/util/ooverinfo2.rc b/desktop/util/ooverinfo2.rc
index 342e1fab72..ac60d07016 100644
--- a/desktop/util/ooverinfo2.rc
+++ b/desktop/util/ooverinfo2.rc
@@ -51,32 +51,32 @@
 // -----------------------------------------------------------------------
 
 
-ICON 2 "icons/ooo3_writer_doc.ico"
-ICON 3 "icons/ooo3_writer_tem.ico"
-ICON 4 "icons/ooo3_calc_doc.ico"
-ICON 5  "icons/ooo3_calc_tem.ico"
-ICON 6 "icons/ooo3_draw_doc.ico"
-ICON 7 "icons/ooo3_draw_tem.ico"
-ICON 8 "icons/ooo3_impress_doc.ico"
-ICON 9 "icons/ooo3_impress_tem.ico"
-ICON 10 "icons/ooo3_impress_doc.ico"
-ICON 11 "icons/ooo3_global_doc.ico"
-ICON 12 "icons/ooo3_html_doc.ico"
-ICON 13 "icons/ooo3_chart_doc.ico"
-ICON 14 "icons/ooo3_base_doc.ico"
-ICON 15 "icons/ooo3_math_doc.ico"
-ICON 16 "icons/ooo3_empty_tem.ico"
-ICON 17 "icons/ooo3_macro_doc.ico"
+ICON 2 "icons/ooo-writer-doc.ico"
+ICON 3 "icons/ooo-writer-tem.ico"
+ICON 4 "icons/ooo-calc-doc.ico"
+ICON 5  "icons/ooo-calc-tem.ico"
+ICON 6 "icons/ooo-draw-doc.ico"
+ICON 7 "icons/ooo-draw-tem.ico"
+ICON 8 "icons/ooo-impress-doc.ico"
+ICON 9 "icons/ooo-impress-tem.ico"
+ICON 10 "icons/ooo-impress-doc.ico"
+//ICON 11 "icons/ooo-global-doc.ico"
+//ICON 12 "icons/ooo-html-doc.ico"
+ICON 13 "icons/ooo-chart-doc.ico"
+ICON 14 "icons/ooo-base-doc.ico"
+ICON 15 "icons/ooo-math-doc.ico"
+ICON 16 "icons/ooo-empty-tem.ico"
+ICON 17 "icons/ooo-macro-doc.ico"
 ICON 18 "icons/ooo-configuration.ico"
 ICON 19 "icons/ooo-open.ico"
 ICON 20 "icons/ooo-image-doc.ico"
-ICON 21 "icons/ooo3_writer_app.ico"
-ICON 22 "icons/ooo3_calc_app.ico"
-ICON 23 "icons/ooo3_draw_app.ico"
-ICON 24 "icons/ooo3_impress_app.ico"
-ICON 25 "icons/ooo3_math_app.ico"
-ICON 26 "icons/ooo3_base_app.ico"
-ICON 27 "icons/ooo3_empty_doc.ico"
+ICON 21 "icons/ooo-writer-app.ico"
+ICON 22 "icons/ooo-calc-app.ico"
+ICON 23 "icons/ooo-draw-app.ico"
+ICON 24 "icons/ooo-impress-app.ico"
+ICON 25 "icons/ooo-math-app.ico"
+ICON 26 "icons/ooo-base-app.ico"
+ICON 27 "icons/ooo-empty-doc.ico"
 ICON 28 "icons/ooo11-writer-doc.ico"
 ICON 29 "icons/ooo11-writer-tem.ico"
 ICON 30 "icons/ooo11-calc-doc.ico"