summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-02-26 12:25:21 +0000
committerOliver Bolte <obo@openoffice.org>2009-02-26 12:25:21 +0000
commit03ff7f6dadd9e0dea3c9647cef41601f6975b257 (patch)
treec0377d9132ae2cca4a4431cb00b653cbd9ca1b03 /setup_native
parentdd07454c9d8b58dfbc487ebb97ea5009916b75b2 (diff)
CWS-TOOLING: integrate CWS native224
2009-02-10 17:25:23 +0100 is r267565 : #i92147# spellchecker extensions into language packs 2009-02-09 18:06:03 +0100 is r267528 : #i92147# spellchecker extensions into language packs 2009-02-09 18:04:13 +0100 is r267527 : #i92147# spellchecker extensions into language packs 2009-02-09 18:03:10 +0100 is r267526 : #i92147# spellchecker extensions into language packs
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/prj/build.lst2
-rw-r--r--setup_native/source/win32/customactions/languagepacks/exports.dxp3
-rw-r--r--setup_native/source/win32/customactions/languagepacks/makefile.mk9
3 files changed, 11 insertions, 3 deletions
diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst
index dd979a014a36..7966d21533fc 100644
--- a/setup_native/prj/build.lst
+++ b/setup_native/prj/build.lst
@@ -11,7 +11,7 @@ pk setup_native\source\win32\customactions\javafilter nmake - w sn_java
pk setup_native\source\win32\customactions\quickstarter nmake - w sn_quickstarter NULL
pk setup_native\source\win32\customactions\shellextensions nmake - w sn_shellextensions sn_tools.w NULL
pk setup_native\source\win32\customactions\indexingfilter nmake - w sn_indexingfilter NULL
-pk setup_native\source\win32\customactions\languagepacks nmake - w sn_languagepacks sn_tools.w NULL
+pk setup_native\source\win32\customactions\languagepacks nmake - w sn_languagepacks sn_shellextensions.w sn_tools.w NULL
pk setup_native\source\win32\customactions\patch nmake - w sn_patch sn_languagepacks.w sn_shellextensions.w sn_quickstarter.w sn_tools.w NULL
pk setup_native\source\win32\stwrapper nmake - w sn_stwrapper NULL
pk setup_native\source\ulfconv nmake - all sn_ulfconv NULL
diff --git a/setup_native/source/win32/customactions/languagepacks/exports.dxp b/setup_native/source/win32/customactions/languagepacks/exports.dxp
index d01befd5d0d9..7461090d7233 100644
--- a/setup_native/source/win32/customactions/languagepacks/exports.dxp
+++ b/setup_native/source/win32/customactions/languagepacks/exports.dxp
@@ -2,3 +2,6 @@ SetProductInstallationPath
RegisterLanguagePack
GetUserInstallMode
IsOfficeRunning
+RegisterExtensions
+DeregisterExtensions
+RemoveExtensions
diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk
index 713c4f5e1385..5246b4717fd5 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -62,8 +62,9 @@ SLOFILES = $(SLO)$/lngpckinsthelper.obj \
$(SLO)$/checkrunningofficelanguagepack.obj
STDSHL+= \
- $(ADVAPI32LIB)\
- $(MSILIB)
+ $(ADVAPI32LIB) \
+ $(MSILIB) \
+ $(SHELL32LIB)
.IF "$(USE_SYSTEM_STL)" != "YES"
STDSHL+=$(LIBSTLPORTST)
@@ -80,6 +81,10 @@ STDSHL+= \
#SHL1LIBS = $(SLB)$/$(TARGET).lib
+SHL1OBJS = $(SLOFILES) \
+ $(SLO)$/registerextensions.obj \
+ $(SLO)$/seterror.obj
+
SHL1TARGET = $(TARGET)
SHL1IMPLIB = i$(TARGET)