summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorIngo Schmidt <is@openoffice.org>2010-07-12 18:24:42 +0200
committerIngo Schmidt <is@openoffice.org>2010-07-12 18:24:42 +0200
commitf51ed65827e68e8bd549cfedf1d499d3dc226065 (patch)
tree8a165a4d8feaa9ef211fa0ead645c8d605c383da /setup_native
parent00d5cdc080f6381c0b42f231763195298bbca5ba (diff)
jl154 #162868# unopkg is back in packaging and installation
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/source/win32/customactions/languagepacks/exports.dxp3
-rw-r--r--setup_native/source/win32/customactions/languagepacks/makefile.mk1
-rw-r--r--setup_native/source/win32/customactions/shellextensions/exports.dxp3
-rw-r--r--setup_native/source/win32/customactions/shellextensions/makefile.mk1
4 files changed, 8 insertions, 0 deletions
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 69526077c509..8da47ab1cc4f 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -77,6 +77,7 @@ STDSHL+= \
#SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1OBJS = $(SLOFILES) \
+ $(SLO)$/registerextensions.obj \
$(SLO)$/seterror.obj
SHL1TARGET = $(TARGET)
diff --git a/setup_native/source/win32/customactions/shellextensions/exports.dxp b/setup_native/source/win32/customactions/shellextensions/exports.dxp
index 0e53492e460f..cafa011057c9 100644
--- a/setup_native/source/win32/customactions/shellextensions/exports.dxp
+++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp
@@ -6,6 +6,9 @@ SetProductInstallMode
RebuildShellIconCache
ExecutePostUninstallScript
MigrateInstallPath
+RegisterExtensions
+DeregisterExtensions
+RemoveExtensions
CheckInstallDirectory
SetAdminInstallProperty
CreateLayerLinks
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index 9eef136a82a4..220ac727b774 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -62,6 +62,7 @@ SLOFILES = \
$(SLO)$/setadmininstall.obj \
$(SLO)$/layerlinks.obj \
$(SLO)$/dotnetcheck.obj \
+ $(SLO)$/registerextensions.obj \
$(SLO)$/copyeditiondata.obj \
$(SLO)$/vistaspecial.obj \
$(SLO)$/checkrunningoffice.obj \