From bd096100632c0d98dd255ba85007e9f3e100166d Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 4 Mar 2011 21:21:16 +0000 Subject: fix more misc. merge issues --- vbahelper/source/msforms/service.cxx | 10 ---------- vbahelper/source/vbahelper/makefile.mk | 2 ++ 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" -- cgit v1.2.3