summaryrefslogtreecommitdiff
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
commit698b3cb962af8618f3e884ccdf9b9edf1df3b97f (patch)
tree8bef0f0d3c8db97d4ef0ecf72b7944dc36ca99c9
parent929f5169397c101ec9fff3fb535376df3de09e2e (diff)
jl154 #162868# unopkg is back in packaging and installation
-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 d01befd5d..7461090d7 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 69526077c..8da47ab1c 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 0e53492e4..cafa01105 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 9eef136a8..220ac727b 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 \