summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2011-03-04 21:21:16 +0000
committerMichael Meeks <michael.meeks@novell.com>2011-03-04 21:21:16 +0000
commitbd096100632c0d98dd255ba85007e9f3e100166d (patch)
tree75a52c50fae640b177b44adb6490478bf917655d
parented4bd6cd739f372ab49897b7a038fae6ed0ff1f7 (diff)
fix more misc. merge issues
-rw-r--r--vbahelper/source/msforms/service.cxx10
-rw-r--r--vbahelper/source/vbahelper/makefile.mk2
2 files changed, 2 insertions, 10 deletions
diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx
index 432552254b..3388051eae 100644
--- a/vbahelper/source/msforms/service.cxx
+++ b/vbahelper/source/msforms/service.cxx
@@ -58,16 +58,6 @@ extern "C"
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
- SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
- {
- OSL_TRACE("In component_writeInfo");
-
- // Component registration
- return component_writeInfoHelper( pServiceManager, pRegistryKey,
- controlprovider::serviceDecl, userform::serviceDecl );
- }
-
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
diff --git a/vbahelper/source/vbahelper/makefile.mk b/vbahelper/source/vbahelper/makefile.mk
index de84d8cd56..22e8d90c5e 100644
--- a/vbahelper/source/vbahelper/makefile.mk
+++ b/vbahelper/source/vbahelper/makefile.mk
@@ -33,6 +33,8 @@ ENABLE_EXCEPTIONS := TRUE
VISIBILITY_HIDDEN=TRUE
# --- Settings -----------------------------------------------------
+.INCLUDE : settings.mk
+
.IF "$(ENABLE_VBA)" == "NO"
dummy:
@echo "Nothing to build"