[Libreoffice-commits] .: Branch 'integration/dev300_m98' - vbahelper/source

[Michael Meeks]

 vbahelper/source/msforms/service.cxx   |   10 ----------
 vbahelper/source/vbahelper/makefile.mk |    2 ++
 2 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit bd096100632c0d98dd255ba85007e9f3e100166d
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Mar 4 21:21:16 2011 +0000

    fix more misc. merge issues

diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx
index 4325522..3388051 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 de84d8c..22e8d90 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"