diff options
author | Mikhail Voytenko <mav@openoffice.org> | 2010-04-27 12:15:15 +0200 |
---|---|---|
committer | Mikhail Voytenko <mav@openoffice.org> | 2010-04-27 12:15:15 +0200 |
commit | e95f57d0e1414ae1ef91c67d98f8a656e7345e62 (patch) | |
tree | 9e84a9c603c52ad948ca6e08237214e8136cd15f /extensions/source/abpilot | |
parent | 6bfa05212ad958a16170267d51ffce2e61b97d96 (diff) | |
parent | eed1a4cbf0088d8ceb45a1eabfe166226bf17695 (diff) |
Merge to DEV300_m77
Diffstat (limited to 'extensions/source/abpilot')
-rw-r--r-- | extensions/source/abpilot/abp.map | 8 | ||||
-rw-r--r-- | extensions/source/abpilot/datasourcehandling.cxx | 2 | ||||
-rw-r--r-- | extensions/source/abpilot/makefile.mk | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/extensions/source/abpilot/abp.map b/extensions/source/abpilot/abp.map deleted file mode 100644 index 2b4747c38ff9..000000000000 --- a/extensions/source/abpilot/abp.map +++ /dev/null @@ -1,8 +0,0 @@ -EXTABP_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 253e7d9e2d6e..178948ae0d3a 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -523,7 +523,7 @@ namespace abp // ................................................................ // create the interaction handler (needed for authentication and error handling) - static ::rtl::OUString s_sInteractionHandlerServiceName = ::rtl::OUString::createFromAscii("com.sun.star.sdb.InteractionHandler"); + static ::rtl::OUString s_sInteractionHandlerServiceName = ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler"); Reference< XInteractionHandler > xInteractions; try { diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk index c5b25fc733f7..19477e1b6b2b 100644 --- a/extensions/source/abpilot/makefile.mk +++ b/extensions/source/abpilot/makefile.mk @@ -76,7 +76,7 @@ RESLIB1IMAGES=$(PRJ)$/res RESLIB1SRSFILES= $(SRS)$/abp.srs SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -SHL1VERSIONMAP= $(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1STDLIBS= \ $(VCLLIB) \ |