summaryrefslogtreecommitdiff
path: root/framework/util
diff options
context:
space:
mode:
authorThomas Lange [tl] <tl@openoffice.org>2010-04-29 14:17:32 +0200
committerThomas Lange [tl] <tl@openoffice.org>2010-04-29 14:17:32 +0200
commit007c3c9991b5d404a605e5d016ac101ce7aad2dd (patch)
treef2a1aff3400565d1473fe51517ac10e41ddddc9f /framework/util
parente0986b3290e9c73116d86f9ae3b8e35f94aadc2b (diff)
parent515792c312abc929b4616c757b8eaced67718d10 (diff)
cws tl78: merge with DEV300 m77
Diffstat (limited to 'framework/util')
-rw-r--r--framework/util/exports.map10
-rw-r--r--framework/util/makefile.mk7
2 files changed, 3 insertions, 14 deletions
diff --git a/framework/util/exports.map b/framework/util/exports.map
deleted file mode 100644
index 85610ad80888..000000000000
--- a/framework/util/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
- global:
- GetVersionInfo;
- component_getImplementationEnvironment;
- component_getFactory;
- component_writeInfo;
-
- local:
- *;
-};
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index 4a94edae92b0..82dfaf502ac2 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -219,7 +219,7 @@ SHL3DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2TARGETN)
DEF3NAME= $(SHL3TARGET)
-SHL3VERSIONMAP= exports.map
+SHL3VERSIONMAP= $(SOLARENV)/src/component.map
# --- services library ----------------------------------------------------
@@ -277,7 +277,6 @@ SHL4OBJS= \
$(SLO)$/langselectionstatusbarcontroller.obj \
$(SLO)$/layoutmanager.obj \
$(SLO)$/loaddispatcher.obj \
- $(SLO)$/loaddispatchlistener.obj \
$(SLO)$/loadenv.obj \
$(SLO)$/menubarfactory.obj \
$(SLO)$/menubarmanager.obj \
@@ -360,7 +359,7 @@ SHL4DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2IMPLIBN) $(SHL2TARGETN)
DEF4NAME= $(SHL4TARGET)
-SHL4VERSIONMAP= exports.map
+SHL4VERSIONMAP= $(SOLARENV)/src/component.map
# --- services library ----------------------------------------------------
@@ -391,7 +390,7 @@ SHL5DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN)
DEF5NAME= $(SHL5TARGET)
-SHL5VERSIONMAP= exports.map
+SHL5VERSIONMAP= $(SOLARENV)/src/component.map
RESLIB1NAME= fwe
RESLIB1IMAGES= $(PRJ)$/res