CWS-TOOLING: integrate CWS odficonsso1

3 files changed, 49 insertions, 34 deletions

diff --git a/desktop/source/pkgchk/unopkg/makefile.mk b/desktop/source/pkgchk/unopkg/makefile.mk
index 3562fad961d9..4a1f409f4564 100644
--- a/desktop/source/pkgchk/unopkg/makefile.mk
+++ b/desktop/source/pkgchk/unopkg/makefile.mk
@@ -49,6 +49,7 @@ PRJINC += ..$/..$/deployment ..$/..
 CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
 .ENDIF
 
+.IF "$(LINK_SO)"!=""
 APP1TARGET = so$/unopkg
 APP1OBJS = $(OBJFILES)
 APP1STDLIBS = $(SALLIB) $(UNOPKGAPPLIB)
@@ -59,6 +60,7 @@ APP1RPATH = BRAND
 APP1ICON = $(SOLARRESDIR)$/icons/so9_main_app.ico
 APP1LINKRES = $(MISC)$/$(TARGET)1.res
 .ENDIF
+.ENDIF			# "$(LINK_SO)"!=""
 
 APP2TARGET = unopkg
 APP2OBJS = $(OBJFILES)
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index 05f129b3c5fc..78305523c493 100644
--- a/desktop/util/makefile.mk
+++ b/desktop/util/makefile.mk
@@ -79,6 +79,7 @@ RESLIB1SRSFILES=	$(SRS)$/desktop.srs \
                     $(SRS)$/wizard.srs
 
 .IF "$(L10N_framework)"==""
+.IF "$(LINK_SO)"=="TRUE"
 .IF "$(GUI)" != "OS2"
 APP1TARGET=so$/$(TARGET)
 APP1NOSAL=TRUE
@@ -143,6 +144,8 @@ APP1STACK=10000000
 
 .ENDIF # "$(GUI)" != "OS2"
 
+.ENDIF # "$(LINK_SO)"=="TRUE"
+
 APP5TARGET=soffice
 APP5NOSAL=TRUE
 APP5RPATH=BRAND
@@ -206,6 +209,7 @@ APP5LINKRES=$(MISC)$/ooffice.res
 .ENDIF # OS2
 
 .IF "$(GUI)" == "WNT"
+.IF "$(LINK_SO)"=="TRUE"
 APP6TARGET=so$/officeloader
 APP6RES=$(RES)$/soloader.res
 APP6NOSAL=TRUE
@@ -218,6 +222,7 @@ APP6OBJS = \
     $(OBJ)$/officeloader.obj \
     $(SOLARLIBDIR)$/pathutils-obj.obj
 STDLIB6=$(ADVAPI32LIB) $(SHELL32LIB) $(SHLWAPILIB)
+.ENDIF # "$(LINK_SO)"=="TRUE"
 
 APP7TARGET=officeloader
 APP7RES=$(RES)$/ooloader.res
@@ -265,7 +270,9 @@ $(APP6TARGETN) :  $(MISC)$/binso_created.flg
 ALLTAR: $(MISC)$/$(TARGET).exe.manifest
 ALLTAR: $(MISC)$/$(TARGET).bin.manifest
 ALLTAR: $(BIN)$/$(TARGET).bin
+.IF "$(LINK_SO)"=="TRUE"
 ALLTAR: $(BIN)$/so$/$(TARGET).bin
+.ENDIF # "$(LINK_SO)"=="TRUE"
 .ENDIF # WNT
 
 .IF "$(GUI)" == "OS2"
@@ -276,23 +283,29 @@ $(BIN)$/soffice_oo$(EXECPOST) : $(APP5TARGETN)
     $(COPY) $< $@
 
 .IF "$(GUI)" != "OS2"
+.IF "$(LINK_SO)"=="TRUE"
 $(BIN)$/so$/soffice_so$(EXECPOST) : $(APP1TARGETN)
     $(COPY) $< $@
 
-ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST) $(BIN)$/soffice_oo$(EXECPOST)
-
+ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST)
+.ENDIF # "$(LINK_SO)"=="TRUE"
+ALLTAR : $(BIN)$/soffice_oo$(EXECPOST)
 .ENDIF
 
 .IF "$(OS)" == "MACOSX"
+.IF "$(LINK_SO)"=="TRUE"
 $(BIN)$/so$/soffice_mac$(EXECPOST) : $(APP1TARGETN)
     $(COPY) $< $@
     
+ALLTAR : $(BIN)$/so$/soffice_mac$(EXECPOST)
+.ENDIF # "$(LINK_SO)"=="TRUE"
+
 $(BIN)$/soffice_mac$(EXECPOST) : $(APP5TARGETN)
     $(COPY) $< $@
 
-ALLTAR : $(BIN)$/so$/soffice_mac$(EXECPOST) $(BIN)$/soffice_mac$(EXECPOST)
+ALLTAR : $(BIN)$/soffice_mac$(EXECPOST)
 
-.ENDIF
+.ENDIF # "$(OS)" == "MACOSX"
 
 .IF "$(GUI)" == "WNT"
 
diff --git a/desktop/util/verinfo.rc b/desktop/util/verinfo.rc
index 8f1840afbed9..105933ff130d 100644
--- a/desktop/util/verinfo.rc
+++ b/desktop/util/verinfo.rc
@@ -101,42 +101,42 @@ VS_VERSION_INFO versioninfo
 		}
 	}
 
-2 ICON "icons\\so9_writer_doc.ico"
-3 ICON "icons\\so9_writer_tem.ico"
-4 ICON "icons\\so9_calc_doc.ico"
-5 ICON "icons\\so9_calc_tem.ico"
-6 ICON "icons\\so9_draw_doc.ico"
-7 ICON "icons\\so9_draw_tem.ico"
-8 ICON "icons\\so9_impress_doc.ico"
-9 ICON "icons\\so9_impress_tem.ico"
-10 ICON "icons\\so9_impress_doc.ico"
-11 ICON "icons\\so9_global_doc.ico"
-12 ICON "icons\\so9_html_doc.ico"
-13 ICON "icons\\so9_chart_doc.ico"
-14 ICON "icons\\so9_base_doc.ico"
-15 ICON "icons\\so9_math_doc.ico"
-16 ICON "icons\\so9_empty_tem.ico"
-17 ICON "icons\\so9_macro_doc.ico"
+2 ICON "icons\\oasis-text.ico"
+3 ICON "icons\\oasis-text-template.ico"
+4 ICON "icons\\oasis-spreadsheet.ico"
+5 ICON "icons\\oasis-spreadsheet-template.ico"
+6 ICON "icons\\oasis-drawing.ico"
+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\\empty-template.ico"
+17 ICON "icons\\empty-document.ico"
 18 ICON "icons\\so8-configuration.ico"
 19 ICON "icons\\so8-open.ico"
-20 ICON "icons\\so8-image-doc.ico"
+20 ICON "icons\\empty-document.ico"
 21 ICON "icons\\so9_writer_app.ico"
 22 ICON "icons\\so9_calc_app.ico"
 23 ICON "icons\\so9_draw_app.ico"
 24 ICON "icons\\so9_impress_app.ico"
 25 ICON "icons\\so9_math_app.ico"
 26 ICON "icons\\so9_base_app.ico"
-27 ICON "icons\\so9_empty_doc.ico"
-28 ICON "icons\\so7-writer-doc.ico"
-29 ICON "icons\\so7-writer-tem.ico"
-30 ICON "icons\\so7-calc-doc.ico"
-31 ICON "icons\\so7-calc-tem.ico"
-32 ICON "icons\\so7-draw-doc.ico"
-33 ICON "icons\\so7-draw-tem.ico"
-34 ICON "icons\\so7-impress-doc.ico"
-35 ICON "icons\\so7-impress-tem.ico"
-36 ICON "icons\\so7-master-doc.ico"
-37 ICON "icons\\so7-chart-doc.ico"
-38 ICON "icons\\so7-base-doc.ico"
-39 ICON "icons\\so7-math-doc.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"