CWS gnumake: resync to m91; conflicts unresolved

19 files changed, 695 insertions, 153 deletions

diff --git a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx
index e2a5a3bff5da..6902bc7b5042 100644
--- a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx
+++ b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx
@@ -53,17 +53,20 @@ public:
     virtual void SAL_CALL setScreenUpdating(sal_Bool bUpdate) throw (css::uno::RuntimeException);
     virtual sal_Bool SAL_CALL getDisplayStatusBar() throw (css::uno::RuntimeException);
     virtual void SAL_CALL setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (css::uno::RuntimeException);
-    virtual ::sal_Bool SAL_CALL getInteractive() throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setInteractive( ::sal_Bool bInteractive ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL getInteractive() throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setInteractive( ::sal_Bool bInteractive ) throw (css::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setVisible( ::sal_Bool bVisible ) throw (css::uno::RuntimeException);
     virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getVersion() throw (css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getVBE() throw (css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getVBProjects() throw (css::uno::RuntimeException);
+
     virtual void SAL_CALL Run( const ::rtl::OUString& MacroName, const css::uno::Any& varg1, const css::uno::Any& varg2, const css::uno::Any& varg3, const css::uno::Any& varg4, const css::uno::Any& varg5, const css::uno::Any& varg6, const css::uno::Any& varg7, const css::uno::Any& varg8, const css::uno::Any& varg9, const css::uno::Any& varg10, const css::uno::Any& varg11, const css::uno::Any& varg12, const css::uno::Any& varg13, const css::uno::Any& varg14, const css::uno::Any& varg15, const css::uno::Any& varg16, const css::uno::Any& varg17, const css::uno::Any& varg18, const css::uno::Any& varg19, const css::uno::Any& varg20, const css::uno::Any& varg21, const css::uno::Any& varg22, const css::uno::Any& varg23, const css::uno::Any& varg24, const css::uno::Any& varg25, const css::uno::Any& varg26, const css::uno::Any& varg27, const css::uno::Any& varg28, const css::uno::Any& varg29, const css::uno::Any& varg30 ) throw (css::uno::RuntimeException);
-    virtual void SAL_CALL OnTime( const ::com::sun::star::uno::Any& aEarliestTime, const ::rtl::OUString& aFunction, const ::com::sun::star::uno::Any& aLatestTime, const ::com::sun::star::uno::Any& aSchedule ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL OnTime( const css::uno::Any& aEarliestTime, const ::rtl::OUString& aFunction, const css::uno::Any& aLatestTime, const css::uno::Any& aSchedule ) throw (css::uno::RuntimeException);
     virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException);
-    virtual void SAL_CALL Undo(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL Quit(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual css::uno::Any  SAL_CALL getVBE() throw (css::uno::RuntimeException);
-    virtual css::uno::Any  SAL_CALL SAL_CALL getVBProjects() throw (css::uno::RuntimeException);
+    virtual void SAL_CALL Undo() throw (css::uno::RuntimeException);
+    virtual void SAL_CALL Quit() throw (css::uno::RuntimeException);
 
     // XHelperInterface
     virtual rtl::OUString& getServiceImplName();
diff --git a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
index 36102116c7b3..5bd58b44adaf 100644
--- a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
+++ b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
@@ -133,11 +133,12 @@ protected:
 class VBAHELPER_DLLPUBLIC EnumerationHelperImpl : public EnumerationHelper_BASE
 {
 protected:
+    css::uno::WeakReference< ov::XHelperInterface > m_xParent;
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
     css::uno::Reference< css::container::XEnumeration > m_xEnumeration;
 public:
 
-    EnumerationHelperImpl( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XEnumeration >& xEnumeration ) throw ( css::uno::RuntimeException ) : m_xContext( xContext ),  m_xEnumeration( xEnumeration ) { }
+    EnumerationHelperImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XEnumeration >& xEnumeration ) throw ( css::uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ),  m_xEnumeration( xEnumeration ) { }
     virtual ::sal_Bool SAL_CALL hasMoreElements(  ) throw (css::uno::RuntimeException) { return m_xEnumeration->hasMoreElements(); }
 };
 
diff --git a/vbahelper/inc/vbahelper/vbadocumentbase.hxx b/vbahelper/inc/vbahelper/vbadocumentbase.hxx
index 7131e1963b26..2588b7da1720 100644
--- a/vbahelper/inc/vbahelper/vbadocumentbase.hxx
+++ b/vbahelper/inc/vbahelper/vbadocumentbase.hxx
@@ -52,9 +52,7 @@ public:
     virtual ::rtl::OUString SAL_CALL getFullName() throw (css::uno::RuntimeException);
     virtual sal_Bool SAL_CALL getSaved() throw (css::uno::RuntimeException);
     virtual void SAL_CALL setSaved( sal_Bool bSave ) throw (css::uno::RuntimeException);
-
-    virtual css::uno::Any SAL_CALL getVBProject() throw (css::uno::RuntimeException); // Michhael E. Bohn
-
+    virtual css::uno::Any SAL_CALL getVBProject() throw (css::uno::RuntimeException);
 
     // Methods
     virtual void SAL_CALL Close( const css::uno::Any &bSaveChanges,
diff --git a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
new file mode 100755
index 000000000000..89d355db71f9
--- /dev/null
+++ b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
@@ -0,0 +1,162 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef VBAHELPER_VBAEVENTSHELPERBASE_HXX
+#define VBAHELPER_VBAEVENTSHELPERBASE_HXX
+
+#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
+#include <cppuhelper/implbase2.hxx>
+#include <map>
+#include <deque>
+#include "vbahelper/vbahelper.hxx"
+
+namespace com { namespace sun { namespace star {
+    namespace uno { class XComponentContext; }
+} } }
+
+// ============================================================================
+
+typedef ::cppu::WeakImplHelper2< css::script::vba::XVBAEventProcessor, css::lang::XEventListener > VbaEventsHelperBase_BASE;
+
+class VBAHELPER_DLLPUBLIC VbaEventsHelperBase : public VbaEventsHelperBase_BASE
+{
+public:
+    VbaEventsHelperBase(
+        const css::uno::Sequence< css::uno::Any >& rArgs,
+        const css::uno::Reference< css::uno::XComponentContext >& xContext );
+    virtual ~VbaEventsHelperBase();
+
+    // XVBAEventProcessor
+    virtual sal_Bool SAL_CALL hasVbaEventHandler( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    virtual void SAL_CALL processVbaEvent( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::script::provider::ScriptFrameworkErrorException, css::util::VetoException, css::uno::RuntimeException);
+
+    // XEventListener
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aSource ) throw (css::uno::RuntimeException);
+
+protected:
+    // ------------------------------------------------------------------------
+
+    enum EventHandlerType { EVENTHANDLER_GLOBAL, EVENTHANDLER_DOCUMENT };
+    struct EventHandlerInfo
+    {
+        sal_Int32 mnEventId;
+        ::rtl::OUString maMacroName;
+        EventHandlerType meType;
+        sal_Int32 mnCancelIndex;
+        css::uno::Any maUserData;
+    };
+
+    /** Registers a supported event handler.
+
+        @param nEventId  Event identifier from com.sun.star.script.vba.EventIdentifier.
+        @param pcMacroName  Name of the associated VBA event handler macro.
+        @param eType  Document event or global event.
+        @param nCancelIndex  0-based index of Cancel parameter, or -1.
+        @param rUserData  User data for free usage in derived implementations. */
+    void registerEventHandler(
+            sal_Int32 nEventId,
+            const sal_Char* pcMacroName,
+            EventHandlerType eType = EVENTHANDLER_DOCUMENT,
+            sal_Int32 nCancelIndex = -1,
+            const css::uno::Any& rUserData = css::uno::Any() );
+
+    /** Throws, if the passed sequence does not contain a value at the specified index. */
+    static inline void checkArgument( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
+        { if( rArgs.getLength() <= nIndex ) throw css::lang::IllegalArgumentException(); }
+
+    /** Throws, if the passed sequence does not contain a value of a specific at the specified index. */
+    template< typename Type >
+    static inline void checkArgumentType( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
+        { if( (rArgs.getLength() <= nIndex) || !rArgs[ nIndex ].has< Type >() ) throw css::lang::IllegalArgumentException(); }
+
+    // ------------------------------------------------------------------------
+
+    struct EventQueueEntry
+    {
+        sal_Int32 mnEventId;
+        css::uno::Sequence< css::uno::Any > maArgs;
+        inline /*implicit*/ EventQueueEntry( sal_Int32 nEventId ) : mnEventId( nEventId ) {}
+        inline EventQueueEntry( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) : mnEventId( nEventId ), maArgs( rArgs ) {}
+    };
+    typedef ::std::deque< EventQueueEntry > EventQueue;
+
+    /** Derived classes return whether event processing is enabled. Throws if
+        the instance is in an invalid state. */
+    virtual bool implEventsEnabled() throw (css::uno::RuntimeException) = 0;
+
+    /** Derived classes do additional prpeparations and return whether the
+        event handler has to be called. */
+    virtual bool implPrepareEvent(
+        EventQueue& rEventQueue,
+        const EventHandlerInfo& rInfo,
+        const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException) = 0;
+
+    /** Derived classes have to return the argument list for the specified VBA event handler. */
+    virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList(
+        const EventHandlerInfo& rInfo,
+        const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException) = 0;
+
+    /** Derived classes may do additional postprocessing. Called even if the
+        event handler does not exist, or if an error occured during execution. */
+    virtual void implPostProcessEvent(
+        EventQueue& rEventQueue,
+        const EventHandlerInfo& rInfo,
+        bool bSuccess,
+        bool bCancel ) throw (css::uno::RuntimeException) = 0;
+
+    /** Derived classes have to return the name of the Basic document module. */
+    virtual ::rtl::OUString implGetDocumentModuleName(
+        const EventHandlerInfo& rInfo,
+        const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException) = 0;
+
+private:
+    /** Returns the event handler info struct for the specified event, or throws. */
+    const EventHandlerInfo& getEventHandlerInfo( sal_Int32 nEventId ) const throw (css::lang::IllegalArgumentException);
+
+    /** Searches the event handler in the document and returns its full script path. */
+    ::rtl::OUString getEventHandlerPath(
+        const EventHandlerInfo& rInfo,
+        const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException);
+
+    /** Removes this instance from all broadcasters. */
+    void stopListening();
+
+protected:
+    css::uno::Reference< css::frame::XModel > mxModel;
+    SfxObjectShell* mpShell;
+
+private:
+    typedef ::std::map< sal_Int32, EventHandlerInfo > EventHandlerMap;
+
+    EventHandlerMap maEvents;
+    bool mbDisposed;
+};
+
+// ============================================================================
+
+#endif
diff --git a/vbahelper/inc/vbahelper/vbaglobalbase.hxx b/vbahelper/inc/vbahelper/vbaglobalbase.hxx
index e75cbb7e7af8..61aaa1d65657 100644
--- a/vbahelper/inc/vbahelper/vbaglobalbase.hxx
+++ b/vbahelper/inc/vbahelper/vbaglobalbase.hxx
@@ -32,16 +32,16 @@
 
 typedef InheritedHelperInterfaceImpl1< ov::XGlobalsBase > Globals_BASE;
 class VBAHELPER_DLLPUBLIC VbaGlobalsBase : public Globals_BASE
-
 {
 protected:
+    rtl::OUString msDocCtxName;
 
     bool hasServiceName( const rtl::OUString& serviceName );
     void init(  const css::uno::Sequence< css::beans::PropertyValue >& aInitArgs );
 
 public:
     VbaGlobalsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sDocCtxName );
-    virtual ~VbaGlobalsBase(){};
+    virtual ~VbaGlobalsBase();
     // XMultiServiceFactory
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException);
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException);
diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx
index 33613bb76091..ccabb9114f2d 100644
--- a/vbahelper/inc/vbahelper/vbahelper.hxx
+++ b/vbahelper/inc/vbahelper/vbahelper.hxx
@@ -63,6 +63,7 @@ namespace ooo
                 throw css::lang::IllegalArgumentException();
             return aSomething;
         }
+        VBAHELPER_DLLPUBLIC css::uno::Reference<  css::uno::XInterface > getUnoDocModule( const String& aModName, SfxObjectShell* pShell );
         VBAHELPER_DLLPUBLIC SfxObjectShell* getSfxObjShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException);
         VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIService( SfxObjectShell* pShell,  const sal_Char* _pAsciiName ) throw (css::uno::RuntimeException);
 
@@ -89,6 +90,13 @@ namespace ooo
         VBAHELPER_DLLPUBLIC void PrintOutHelper( SfxViewShell* pViewShell, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, sal_Bool bSelection  );
         VBAHELPER_DLLPUBLIC void PrintPreviewHelper( const css::uno::Any& EnableChanges,  SfxViewShell* );
 
+        /** Extracts a boolean value from the passed Any, which may contain sal_Bool or an integer or floating-point value.
+            Returns false, if the Any is empty or contains an incompatible type. */
+        VBAHELPER_DLLPUBLIC bool extractBoolFromAny( bool& rbValue, const css::uno::Any& rAny );
+        /** Extracts a boolean value from the passed Any, which may contain sal_Bool or an integer or floating-point value.
+            Throws, if the Any is empty or contains an incompatible type. */
+        VBAHELPER_DLLPUBLIC bool extractBoolFromAny( const css::uno::Any& rAny ) throw (css::uno::RuntimeException);
+
         VBAHELPER_DLLPUBLIC rtl::OUString getAnyAsString( const css::uno::Any& pvargItem ) throw ( css::uno::RuntimeException );
         VBAHELPER_DLLPUBLIC rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike = false); // needs to be in an uno service ( already this code is duplicated in basic )
         VBAHELPER_DLLPUBLIC double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical);
diff --git a/vbahelper/inc/vbahelper/vbahelperinterface.hxx b/vbahelper/inc/vbahelper/vbahelperinterface.hxx
index 21339631e1ed..b095b5cd2823 100644
--- a/vbahelper/inc/vbahelper/vbahelperinterface.hxx
+++ b/vbahelper/inc/vbahelper/vbahelperinterface.hxx
@@ -28,6 +28,8 @@
 #define OOVBAAPI_VBA_HELPERINTERFACE_HXX
 
 #include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase3.hxx>
 #include <ooo/vba/XHelperInterface.hpp>
 #include <vbahelper/vbahelper.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -68,6 +70,7 @@ protected:
     css::uno::Reference< css::uno::XComponentContext > mxContext;
 public:
     InheritedHelperInterfaceImpl() {}
+    InheritedHelperInterfaceImpl( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : mxContext( xContext ) {}
     InheritedHelperInterfaceImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : mxParent( xParent ), mxContext( xContext ) {}
     virtual rtl::OUString& getServiceImplName() = 0;
     virtual css::uno::Sequence<rtl::OUString> getServiceNames() = 0;
@@ -86,7 +89,6 @@ public:
             return xNameAccess->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Application" ) ) );
     }
 
-
     // XServiceInfo Methods
     virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) { return getServiceImplName(); }
     virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException)
@@ -101,19 +103,39 @@ public:
     }
     virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException)
     {
-        css::uno::Sequence< rtl::OUString > aNames = getServiceNames();;
+        css::uno::Sequence< rtl::OUString > aNames = getServiceNames();
         return aNames;
     }
  };
 
 template< typename Ifc1 >
 class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl1 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > >
+{
+    typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > > Base;
+public:
+    InheritedHelperInterfaceImpl1< Ifc1 >() {}
+    InheritedHelperInterfaceImpl1< Ifc1 >( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xContext ) {}
+    InheritedHelperInterfaceImpl1< Ifc1 >( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}
+};
 
+template< typename Ifc1, typename Ifc2 >
+class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl2 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper2< Ifc1, Ifc2 > >
 {
-typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > > Base;
+    typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper2< Ifc1, Ifc2 > > Base;
 public:
-    InheritedHelperInterfaceImpl1< Ifc1 > ( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}
+    InheritedHelperInterfaceImpl2< Ifc1, Ifc2 >() {}
+    InheritedHelperInterfaceImpl2< Ifc1, Ifc2 >( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xContext ) {}
+    InheritedHelperInterfaceImpl2< Ifc1, Ifc2 >( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}
+};
 
+template< typename Ifc1, typename Ifc2, typename Ifc3 >
+class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl3 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper3< Ifc1, Ifc2, Ifc3 > >
+{
+    typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper3< Ifc1, Ifc2, Ifc3 > > Base;
+public:
+    InheritedHelperInterfaceImpl3< Ifc1, Ifc2, Ifc3 >() {}
+    InheritedHelperInterfaceImpl3< Ifc1, Ifc2, Ifc3 >( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xContext ) {}
+    InheritedHelperInterfaceImpl3< Ifc1, Ifc2, Ifc3 >( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}
 };
 
 // ============================================================================
diff --git a/vbahelper/prj/d.lst b/vbahelper/prj/d.lst
index d683e97c8b90..a5457b730409 100644
--- a/vbahelper/prj/d.lst
+++ b/vbahelper/prj/d.lst
@@ -26,3 +26,5 @@ mkdir: %_DEST%\inc%_EXT%\basic
 ..\inc\vbahelper\vbatextframe.hxx %_DEST%\inc%_EXT%\vbahelper\vbatextframe.hxx
 ..\inc\vbahelper\vbashaperange.hxx %_DEST%\inc%_EXT%\vbahelper\vbashaperange.hxx
 ..\inc\vbahelper\vbapagesetupbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbapagesetupbase.hxx
+..\%__SRC%\misc\msforms.component %_DEST%\xml%_EXT%\msforms.component
+..\inc\vbahelper\vbaeventshelperbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaeventshelperbase.hxx
diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx
index 8e6cf29e8ec5..152517be3958 100644
--- a/vbahelper/source/msforms/service.cxx
+++ b/vbahelper/source/msforms/service.cxx
@@ -57,16 +57,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/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx
index 1284b36be463..8d01687ef905 100644
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@@ -74,12 +74,20 @@ private:
 public:
     ControlArrayWrapper( const uno::Reference< awt::XControl >& xDialog )
     {
-        mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
-        uno::Sequence< uno::Reference< awt::XControl > > sXControls = mxDialog->getControls();
+        try
+        {
+            mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
+            uno::Sequence< uno::Reference< awt::XControl > > sXControls = mxDialog->getControls();
 
-        msNames.realloc( sXControls.getLength() );
-        for ( sal_Int32 i = 0; i < sXControls.getLength(); ++i )
-            SetArrayElementTo( sXControls[ i ], i );
+            msNames.realloc( sXControls.getLength() );
+            for ( sal_Int32 i = 0; i < sXControls.getLength(); ++i )
+                SetArrayElementTo( sXControls[ i ], i );
+        }
+        catch( uno::Exception& )
+        {
+            // accept the case when the dialog already does not exist
+            // in this case the wrapper should work in dummy mode
+        }
     }
 
     static rtl::OUString getControlName( const uno::Reference< awt::XControl >& xCtrl )
@@ -186,7 +194,7 @@ ScVbaControls::ScVbaControls( const uno::Reference< XHelperInterface >& xParent,
                 const css::uno::Reference< awt::XControl >& xDialog )
             : ControlsImpl_BASE( xParent, xContext, lcl_controlsWrapper( xDialog  ) )
 {
-    mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
+    mxDialog.set( xDialog, uno::UNO_QUERY );
 }
 
 uno::Reference< container::XEnumeration >
@@ -349,13 +357,16 @@ void SAL_CALL ScVbaControls::Remove( const uno::Any& StringKeyOrIndex )
     }
     catch( uno::RuntimeException& )
     {
-        throw;
+        // the exceptions are not rethrown, impossibility to find or remove the control is currently not reported
+        // since in most cases it means just that the controls is already not there, the VBA seems to do it in the same way
+
+        // throw;
     }
     catch( uno::Exception& e )
     {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not create AXControl!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
+        // throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not create AXControl!" ) ),
+        //         uno::Reference< uno::XInterface >(),
+        //         uno::makeAny( e ) );
     }
 }
 
diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx
index 1ce403fc19c3..a1333e0a655b 100644
--- a/vbahelper/source/msforms/vbauserform.cxx
+++ b/vbahelper/source/msforms/vbauserform.cxx
@@ -153,28 +153,41 @@ void SAL_CALL
 ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
 {
     uno::Any aObject = getValue( aPropertyName );
-    // The Object *must* support XDefaultProperty here because getValue will
-    // only return properties that are Objects ( e.g. controls )
-    // e.g. Userform1.aControl = something
-    // 'aControl' has to support XDefaultProperty to make sense here
-    uno::Reference< script::XDefaultProperty > xDfltProp( aObject, uno::UNO_QUERY_THROW );
-    rtl::OUString aDfltPropName = xDfltProp->getDefaultPropertyName();
-    uno::Reference< beans::XIntrospectionAccess > xUnoAccess( getIntrospectionAccess( aObject ) );
-    uno::Reference< beans::XPropertySet > xPropSet( xUnoAccess->queryAdapter( ::getCppuType( (const uno::Reference< beans::XPropertySet > *)0 ) ), uno::UNO_QUERY_THROW );
-    xPropSet->setPropertyValue( aDfltPropName, aValue );
+
+    // in case the dialog is already closed the VBA implementation should not throw exceptions
+    if ( aObject.hasValue() )
+    {
+        // The Object *must* support XDefaultProperty here because getValue will
+        // only return properties that are Objects ( e.g. controls )
+        // e.g. Userform1.aControl = something
+        // 'aControl' has to support XDefaultProperty to make sense here
+        uno::Reference< script::XDefaultProperty > xDfltProp( aObject, uno::UNO_QUERY_THROW );
+        rtl::OUString aDfltPropName = xDfltProp->getDefaultPropertyName();
+        uno::Reference< beans::XIntrospectionAccess > xUnoAccess( getIntrospectionAccess( aObject ) );
+        uno::Reference< beans::XPropertySet > xPropSet( xUnoAccess->queryAdapter( ::getCppuType( (const uno::Reference< beans::XPropertySet > *)0 ) ), uno::UNO_QUERY_THROW );
+        xPropSet->setPropertyValue( aDfltPropName, aValue );
+    }
 }
 
 uno::Any SAL_CALL
 ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
-    uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
-    uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW );
-    uno::Reference< awt::XControl > xControl = xContainer->getControl( aPropertyName );
-    ScVbaControlFactory aFac( mxContext, xControl, m_xModel );
-        uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
-        ScVbaControl* pControl  = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
-        pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) );
-    return uno::makeAny( xVBAControl );
+    uno::Any aResult;
+
+    // in case the dialog is already closed the VBA implementation should not throw exceptions
+    if ( m_xDialog.is() )
+    {
+        uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
+        uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW );
+        uno::Reference< awt::XControl > xControl = xContainer->getControl( aPropertyName );
+        ScVbaControlFactory aFac( mxContext, xControl, m_xModel );
+            uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
+            ScVbaControl* pControl  = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
+            pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) );
+        aResult = uno::makeAny( xVBAControl );
+    }
+
+    return aResult;
 }
 
 ::sal_Bool SAL_CALL
@@ -185,7 +198,9 @@ ScVbaUserForm::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::Runtime
 uno::Any SAL_CALL
 ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException)
 {
-    uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
+    // if the dialog already closed we should do nothing, but the VBA will call methods of the Controls objects
+    // thus we have to provide a dummy object in this case
+    uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY );
     uno::Reference< XCollection > xControls( new ScVbaControls( this, mxContext, xDialogControl ) );
     if ( index.hasValue() )
         return uno::makeAny( xControls->Item( index, uno::Any() ) );
diff --git a/vbahelper/source/vbahelper/makefile.mk b/vbahelper/source/vbahelper/makefile.mk
index 0b300953722e..51fa5b449d23 100644
--- a/vbahelper/source/vbahelper/makefile.mk
+++ b/vbahelper/source/vbahelper/makefile.mk
@@ -65,6 +65,8 @@ SLOFILES=\
     $(SLO)$/vbashaperange.obj \
     $(SLO)$/vbatextframe.obj \
     $(SLO)$/vbapagesetupbase.obj \
+    $(SLO)$/vbaeventshelperbase.obj
+
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 6d2c51066ca2..326c150edade 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -24,39 +24,37 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #include "vbahelper/vbaapplicationbase.hxx"
+
 #include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp> //Michael E. Bohn
-#include <com/sun/star/lang/XMultiComponentFactory.hpp> //Michael E. Bohn
-#include <com/sun/star/lang/XComponent.hpp> //Michael E. Bohn
-#include <com/sun/star/container/XEnumeration.hpp> //Michael E. Bohn
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/document/XDocumentInfoSupplier.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-#include <com/sun/star/document/XEmbeddedScripts.hpp> //Michael E. Bohn
-#include <ooo/vba/XVBAAppService.hpp> //Michael E. Bohn
+#include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
 
-
-#include "vbacommandbars.hxx"
+#include <hash_map>
 #include <filter/msfilter/msvbahelper.hxx>
 #include <tools/datetime.hxx>
 
-// start basic includes
 #include <basic/sbx.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sbuno.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbmod.hxx>
-// end basic includes
 
-#include <hash_map>
+#include "vbacommandbars.hxx"
 
-using namespace com::sun::star;
-using namespace ooo::vba;
+using namespace ::com::sun::star;
+using namespace ::ooo::vba;
 
 #define OFFICEVERSION "11.0"
 
@@ -162,6 +160,9 @@ typedef ::std::hash_map< VbaTimerInfo, VbaTimer*, VbaTimerInfoHash, ::std::equal
 struct VbaApplicationBase_Impl
 {
     VbaTimerHashMap m_aTimerHash;
+    sal_Bool mbVisible;
+
+    inline VbaApplicationBase_Impl() : mbVisible( sal_True ) {}
 
     virtual ~VbaApplicationBase_Impl()
     {
@@ -185,7 +186,6 @@ VbaApplicationBase::VbaApplicationBase( const uno::Reference< uno::XComponentCon
 
 VbaApplicationBase::~VbaApplicationBase()
 {
-    m_pImpl = 0;
     delete m_pImpl;
 }
 
@@ -268,6 +268,16 @@ void SAL_CALL VbaApplicationBase::setInteractive( ::sal_Bool bInteractive )
     xWindow->setEnable( bInteractive );
 }
 
+sal_Bool SAL_CALL VbaApplicationBase::getVisible() throw (uno::RuntimeException)
+{
+    return m_pImpl->mbVisible;    // dummy implementation
+}
+
+void SAL_CALL VbaApplicationBase::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException)
+{
+    m_pImpl->mbVisible = bVisible;  // dummy implementation
+}
+
 uno::Any SAL_CALL
 VbaApplicationBase::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
 {
@@ -407,63 +417,50 @@ float SAL_CALL VbaApplicationBase::CentimetersToPoints( float _Centimeters ) thr
     return ( _Centimeters * rate );
 }
 
-// inserted by Michael E. Bohn
 uno::Any SAL_CALL VbaApplicationBase::getVBE() throw (uno::RuntimeException)
 {
-    uno::Any aAny;
-    uno::Reference< ::lang::XMultiComponentFactory > xServiceManager = mxContext->getServiceManager();
-    try
-      {
-        uno::Reference < ::uno::XInterface > xInterface =  xServiceManager->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAAppService" )),mxContext);
-        uno::Reference < ::ooo::vba::XVBAAppService > xVBAAppService (xInterface, ::uno::UNO_QUERY_THROW );
-        if (xVBAAppService.is()){
-            uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-            return xVBAAppService->getVBE( this, mxContext, xModel);
-          }
-
-        }catch(uno::Exception* e)
-        {
-        }
-    return aAny;
+    try // return empty object on error
+    {
+        uno::Sequence< uno::Any > aArgs( 2 );
+        aArgs[ 0 ] <<= uno::Reference< XHelperInterface >( this );
+        aArgs[ 1 ] <<= getCurrentDocument();
+        uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW );
+        uno::Reference< uno::XInterface > xVBE = xServiceManager->createInstanceWithArgumentsAndContext(
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBE" ) ), aArgs, mxContext );
+        return uno::Any( xVBE );
+    }
+    catch( uno::Exception& )
+    {
+    }
+    return uno::Any();
 }
 
 uno::Any SAL_CALL
 VbaApplicationBase::getVBProjects() throw (uno::RuntimeException)
 {
-    uno::Any aAny;
-    uno::Reference< ::lang::XMultiComponentFactory > xServiceManager = mxContext->getServiceManager();
-    try
-      {
-        uno::Reference < ::uno::XInterface > xInterface =  xServiceManager->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAAppService" )),mxContext);
-        uno::Reference < ::ooo::vba::XVBAAppService > xVBAAppService (xInterface, ::uno::UNO_QUERY_THROW );
-        if (xVBAAppService.is()){
-            uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-            uno::Reference< document::XEmbeddedScripts > xEnbeddedScripts ( xModel, uno::UNO_QUERY_THROW );
-            uno::Reference< script::XStorageBasedLibraryContainer >  xMacroStorageBasedLibraryContainer =  xEnbeddedScripts->getBasicLibraries();
-            uno::Reference< script::XStorageBasedLibraryContainer >  xDialogStorageBasedLibraryContainer = xEnbeddedScripts->getDialogLibraries();
-            uno::Reference< script::XLibraryContainer > xMacroLibraryContainer ( xMacroStorageBasedLibraryContainer, uno::UNO_QUERY_THROW );
-            uno::Reference< script::XLibraryContainer > xDialogLibraryContainer( xDialogStorageBasedLibraryContainer, uno::UNO_QUERY_THROW );
-            return xVBAAppService->getVBProjects(this, mxContext, xModel, xMacroLibraryContainer, xDialogLibraryContainer);
-          }
-
-        }catch(uno::Exception* e)
-        {
-        }
-    return aAny;
-
-
-
+    try // return empty object on error
+    {
+        uno::Sequence< uno::Any > aArgs( 2 );
+        aArgs[ 0 ] <<= uno::Reference< XHelperInterface >( this );
+        aArgs[ 1 ] <<= getCurrentDocument();
+        uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW );
+        uno::Reference< uno::XInterface > xVBProjects = xServiceManager->createInstanceWithArgumentsAndContext(
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBProjects" ) ), aArgs, mxContext );
+        return uno::Any( xVBProjects );
+    }
+    catch( uno::Exception& )
+    {
+    }
+    return uno::Any();
 }
 
-
-
-
 rtl::OUString&
 VbaApplicationBase::getServiceImplName()
 {
     static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaApplicationBase") );
     return sImplName;
 }
+
 uno::Sequence<rtl::OUString>
 VbaApplicationBase::getServiceNames()
 {
diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx
index f27f2de53c8a..65f7f4bcfbeb 100644
--- a/vbahelper/source/vbahelper/vbadocumentbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx
@@ -24,9 +24,9 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <vbahelper/vbadocumentbase.hxx>
-#include <vbahelper/helperdecl.hxx>
-#include <comphelper/unwrapargs.hxx>
+
+#include "vbahelper/vbadocumentbase.hxx"
+#include "vbahelper/helperdecl.hxx"
 
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XProtectable.hpp>
@@ -35,8 +35,8 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp> //Michael E. Bohn
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <ooo/vba/XVBADocService.hpp>
 
+#include <comphelper/unwrapargs.hxx>
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
 
@@ -206,40 +206,25 @@ VbaDocumentBase::Activate() throw (uno::RuntimeException)
     xFrame->activate();
 }
 
-// ---- Michael E.Bohn  Start-----
-
 uno::Any SAL_CALL
 VbaDocumentBase::getVBProject() throw (uno::RuntimeException)
-
 {
-    uno::Any aAny;
-    uno::Reference< ::lang::XMultiComponentFactory > xServiceManager = mxContext->getServiceManager();
-    try
-      {
-        uno::Reference < ::uno::XInterface > xInterface =  xServiceManager->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBADocService" )),mxContext);
-        uno::Reference < ::ooo::vba::XVBADocService > xVBADocService (xInterface, ::uno::UNO_QUERY_THROW );
-        if (xVBADocService.is()){
-            uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
-            uno::Reference< document::XEmbeddedScripts > xEnbeddedScripts ( xModel, uno::UNO_QUERY_THROW );
-            uno::Reference< script::XStorageBasedLibraryContainer >  xMacroStorageBasedLibraryContainer =  xEnbeddedScripts->getBasicLibraries();
-            uno::Reference< script::XStorageBasedLibraryContainer >  xDialogStorageBasedLibraryContainer = xEnbeddedScripts->getDialogLibraries();
-            uno::Reference< script::XLibraryContainer > xMacroLibraryContainer ( xMacroStorageBasedLibraryContainer, uno::UNO_QUERY_THROW );
-            uno::Reference< script::XLibraryContainer > xDialogLibraryContainer( xDialogStorageBasedLibraryContainer, uno::UNO_QUERY_THROW );
-
-            return xVBADocService->getVBProject( this, mxContext, xModel, xMacroLibraryContainer, xDialogLibraryContainer );
-          }
-
-        }catch(uno::Exception* e)
-        {
-        }
-    return aAny;
-
+    try // return empty object on error
+    {
+        uno::Sequence< uno::Any > aArgs( 2 );
+        aArgs[ 0 ] <<= uno::Reference< XHelperInterface >( this );
+        aArgs[ 1 ] <<= mxModel;
+        uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW );
+        uno::Reference< uno::XInterface > xVBProjects = xServiceManager->createInstanceWithArgumentsAndContext(
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBProject" ) ), aArgs, mxContext );
+        return uno::Any( xVBProjects );
+    }
+    catch( uno::Exception& )
+    {
+    }
+    return uno::Any();
 }
 
-
-// ---- Michael E.Bohn  End -----
-
-
 rtl::OUString&
 VbaDocumentBase::getServiceImplName()
 {
diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
new file mode 100755
index 000000000000..16a8671df601
--- /dev/null
+++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
@@ -0,0 +1,218 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "vbahelper/vbaeventshelperbase.hxx"
+#include <filter/msfilter/msvbahelper.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::ooo::vba;
+
+// ============================================================================
+
+VbaEventsHelperBase::VbaEventsHelperBase( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& /*xContext*/ ) :
+    mpShell( 0 ),
+    mbDisposed( false )
+{
+    try
+    {
+        mxModel = getXSomethingFromArgs< frame::XModel >( rArgs, 0, false );
+        mpShell = getSfxObjShell( mxModel );
+
+        // add dispose listener
+        uno::Reference< lang::XComponent > xComponent( mxModel, uno::UNO_QUERY_THROW );
+        xComponent->addEventListener( this );
+    }
+    catch( uno::Exception& )
+    {
+    }
+}
+
+VbaEventsHelperBase::~VbaEventsHelperBase()
+{
+    stopListening();
+}
+
+sal_Bool SAL_CALL VbaEventsHelperBase::hasVbaEventHandler( sal_Int32 nEventId, const uno::Sequence< uno::Any >& rArgs )
+        throw (lang::IllegalArgumentException, uno::RuntimeException)
+{
+    // getEventHandlerInfo() throws, if unknown event dentifier has been passed
+    const EventHandlerInfo& rInfo = getEventHandlerInfo( nEventId );
+    // getEventHandlerPath() searches for the macro in the document
+    return getEventHandlerPath( rInfo, rArgs ).getLength() > 0;
+}
+
+void SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, const uno::Sequence< uno::Any >& rArgs )
+        throw (lang::IllegalArgumentException, script::provider::ScriptFrameworkErrorException, util::VetoException, uno::RuntimeException)
+{
+    /*  Derived classes may add new event identifiers to be processed while
+        processing the original event. All unprocessed events are collected in
+        a queue. First element in the queue is the next event to be processed. */
+    EventQueue aEventQueue;
+    aEventQueue.push_back( EventQueueEntry( nEventId, rArgs ) );
+
+    /*  bEnabled will track if event processing is enabled. Every event handler
+        may disable handling of other events. */
+    bool bEnabled = true;
+
+    /*  bCancel will contain the current Cancel value. It is possible that
+        multiple events will try to modify the Cancel value. Every event
+        handler receives the Cancel value of the previous event handler. */
+    bool bCancel = false;
+
+    /*  bSuccess will change to true if at least one event handler has been
+        executed successfully. */
+    bool bSuccess = false;
+
+    /*  Loop as long as there are more events to be processed, and as event
+        handling is still enabled. Derived classes may add new events to be
+        processed in the virtual implPrepareEvent() function. */
+    while( bEnabled && !aEventQueue.empty() )
+    {
+        /*  Check that all class members are available, and that we are not
+            disposed (this may have happened at any time during execution of
+            the last event handler). */
+        if( mbDisposed || !mxModel.is() || !mpShell )
+            throw uno::RuntimeException();
+
+        // get info for next event
+        const EventHandlerInfo& rInfo = getEventHandlerInfo( aEventQueue.front().mnEventId );
+        uno::Sequence< uno::Any > aEventArgs = aEventQueue.front().maArgs;
+        aEventQueue.pop_front();
+
+        // let derived classes decide whether event processing is still enabled
+        bEnabled = implEventsEnabled();
+        // let derived classes prepare the event, they may add new events for next iteration
+        if( bEnabled && implPrepareEvent( aEventQueue, rInfo, aEventArgs ) )
+        {
+            // search the event handler macro in the document
+            ::rtl::OUString aMacroPath = getEventHandlerPath( rInfo, aEventArgs );
+            bool bEventSuccess = false;
+            if( aMacroPath.getLength() > 0 )
+            {
+                // build the argument list
+                uno::Sequence< uno::Any > aVbaArgs = implBuildArgumentList( rInfo, aEventArgs );
+                // insert current cancel value
+                if( rInfo.mnCancelIndex >= 0 )
+                {
+                    if( rInfo.mnCancelIndex >= aVbaArgs.getLength() )
+                        throw lang::IllegalArgumentException();
+                    aVbaArgs[ rInfo.mnCancelIndex ] <<= bCancel;
+                }
+                // execute the event handler
+                uno::Any aRet, aCaller;
+                bEventSuccess = executeMacro( mpShell, aMacroPath, aVbaArgs, aRet, aCaller );
+                // extract new cancel value
+                if( rInfo.mnCancelIndex >= 0 )
+                {
+                    if( rInfo.mnCancelIndex >= aVbaArgs.getLength() )
+                        throw lang::IllegalArgumentException();
+                    // cancel value may be boolean or any integer type, Any(bool) does not extract to sal_Int32
+                    bool bNewCancel = false;
+                    sal_Int32 nNewCancel = 0;
+                    if( aVbaArgs[ rInfo.mnCancelIndex ] >>= bNewCancel )
+                        bCancel = bNewCancel;
+                    else if( aVbaArgs[ rInfo.mnCancelIndex ] >>= nNewCancel )
+                        bCancel = nNewCancel != 0;
+                }
+            }
+            // post processing (also, if event handler does not exist, or on error
+            implPostProcessEvent( aEventQueue, rInfo, bEventSuccess, bCancel );
+            // global success, if at least one event handler succeeded
+            bSuccess |= bEventSuccess;
+        }
+    }
+
+    // if event handlers want to cancel the event, do so regardless of any errors
+    if( bCancel )
+        throw util::VetoException();
+
+    // if no event handler finished successfully, throw
+    if( !bSuccess )
+        throw script::provider::ScriptFrameworkErrorException();
+}
+
+void SAL_CALL VbaEventsHelperBase::disposing( const lang::EventObject& /*aSource*/ ) throw (uno::RuntimeException)
+{
+    OSL_TRACE( "VbaEventsHelperBase::disposing" );
+    stopListening();
+    mbDisposed = true;
+}
+
+// protected ------------------------------------------------------------------
+
+void VbaEventsHelperBase::registerEventHandler( sal_Int32 nEventId,
+        const sal_Char* pcMacroName, EventHandlerType eType, sal_Int32 nCancelIndex, const uno::Any& rUserData )
+{
+    EventHandlerInfo& rInfo = maEvents[ nEventId ];
+    rInfo.mnEventId = nEventId;
+    rInfo.maMacroName = ::rtl::OUString::createFromAscii( pcMacroName );
+    rInfo.meType = eType;
+    rInfo.mnCancelIndex = nCancelIndex;
+    rInfo.maUserData = rUserData;
+}
+
+// private --------------------------------------------------------------------
+
+const VbaEventsHelperBase::EventHandlerInfo& VbaEventsHelperBase::getEventHandlerInfo(
+        sal_Int32 nEventId ) const throw (lang::IllegalArgumentException)
+{
+    EventHandlerMap::const_iterator aIt = maEvents.find( nEventId );
+    if( aIt == maEvents.end() )
+        throw lang::IllegalArgumentException();
+    return aIt->second;
+}
+
+::rtl::OUString VbaEventsHelperBase::getEventHandlerPath( const EventHandlerInfo& rInfo,
+        const uno::Sequence< uno::Any >& rArgs ) const throw (lang::IllegalArgumentException)
+{
+    ::rtl::OUString aMacroName;
+    switch( rInfo.meType )
+    {
+        case EVENTHANDLER_GLOBAL:
+            aMacroName = rInfo.maMacroName;
+        break;
+        case EVENTHANDLER_DOCUMENT:
+            aMacroName = ::rtl::OUStringBuffer( implGetDocumentModuleName( rInfo, rArgs ) ).
+                append( sal_Unicode( '.' ) ).append( rInfo.maMacroName ).makeStringAndClear();
+        break;
+    }
+    return resolveVBAMacro( mpShell, aMacroName ).ResolvedMacro();
+}
+
+void VbaEventsHelperBase::stopListening()
+{
+    if( !mbDisposed ) try
+    {
+        uno::Reference< lang::XComponent > xComponent( mxModel, uno::UNO_QUERY_THROW );
+        xComponent->removeEventListener( this );
+    }
+    catch( uno::Exception& )
+    {
+    }
+}
+
+// ============================================================================
diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx
index c7c33b93b1a3..e0df37583df5 100644
--- a/vbahelper/source/vbahelper/vbaglobalbase.cxx
+++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx
@@ -35,22 +35,50 @@ using namespace ooo::vba;
 
 rtl::OUString sApplication( RTL_CONSTASCII_USTRINGPARAM("Application") );
 
+// special key to return the Application
+rtl::OUString sAppService( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.Application") );
+
 VbaGlobalsBase::VbaGlobalsBase(
 const uno::Reference< ov::XHelperInterface >& xParent,
 const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sDocCtxName )
-:  Globals_BASE( xParent, xContext )
+:  Globals_BASE( xParent, xContext ), msDocCtxName( sDocCtxName )
 {
     // overwrite context with custom one ( that contains the application )
+    // wrap the service manager as we don't want the disposing context to tear down the 'normal' ServiceManager ( or at least thats what the code appears like it wants to do )
+    uno::Any aSrvMgr;
+    if ( xContext.is() && xContext->getServiceManager().is() )
+    {
+        aSrvMgr = uno::makeAny( xContext->getServiceManager()->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.OServiceManagerWrapper") ), xContext ) );
+    }
+
     ::cppu::ContextEntry_Init aHandlerContextInfo[] =
     {
         ::cppu::ContextEntry_Init( sApplication, uno::Any() ),
         ::cppu::ContextEntry_Init( sDocCtxName, uno::Any() ),
+        ::cppu::ContextEntry_Init( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.lang.theServiceManager" ) ), aSrvMgr )
     };
-
-    mxContext = ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), xContext );
-
+    // don't pass a delegate, this seems to introduce yet another cyclic dependency ( and
+    // some strange behavior
+    mxContext = ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), NULL );
 }
 
+VbaGlobalsBase::~VbaGlobalsBase()
+{
+    try
+    {
+        uno::Reference< container::XNameContainer > xNameContainer( mxContext, uno::UNO_QUERY );
+        if ( xNameContainer.is() )
+        {
+            // release document reference ( we don't wan't the component context trying to dispose that )
+            xNameContainer->removeByName( msDocCtxName );
+            // release application reference, as it is holding onto the context
+            xNameContainer->removeByName( sApplication );
+        }
+    }
+    catch ( const uno::Exception& )
+    {
+    }
+}
 
 void
 VbaGlobalsBase::init(  const uno::Sequence< beans::PropertyValue >& aInitArgs )
@@ -74,19 +102,30 @@ uno::Reference< uno::XInterface > SAL_CALL
 VbaGlobalsBase::createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (uno::Exception, uno::RuntimeException)
 {
     uno::Reference< uno::XInterface > xReturn;
-
-    if ( hasServiceName( aServiceSpecifier ) )
+    if ( aServiceSpecifier.equals( sAppService ) )
+    {
+        // try to extract the Application from the context
+        uno::Reference< container::XNameContainer > xNameContainer( mxContext, uno::UNO_QUERY );
+        xNameContainer->getByName( sApplication ) >>= xReturn;
+    }
+    else if ( hasServiceName( aServiceSpecifier ) )
         xReturn = mxContext->getServiceManager()->createInstanceWithContext( aServiceSpecifier, mxContext );
     return xReturn;
 }
 
 uno::Reference< uno::XInterface > SAL_CALL
-VbaGlobalsBase::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) throw (uno::Exception, uno::RuntimeException)
+VbaGlobalsBase::createInstanceWithArguments( const ::rtl::OUString& aServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) throw (uno::Exception, uno::RuntimeException)
 {
 
     uno::Reference< uno::XInterface > xReturn;
-    if ( hasServiceName( ServiceSpecifier ) )
-        xReturn = mxContext->getServiceManager()->createInstanceWithArgumentsAndContext( ServiceSpecifier, Arguments, mxContext );
+    if ( aServiceSpecifier.equals( sAppService ) )
+    {
+        // try to extract the Application from the context
+        uno::Reference< container::XNameContainer > xNameContainer( mxContext, uno::UNO_QUERY );
+        xNameContainer->getByName( sApplication ) >>= xReturn;
+    }
+    else if ( hasServiceName( aServiceSpecifier ) )
+        xReturn = mxContext->getServiceManager()->createInstanceWithArgumentsAndContext( aServiceSpecifier, Arguments, mxContext );
     return xReturn;
 }
 
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index 1953d0772f3c..14f4e3ff1363 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -625,6 +625,30 @@ void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno::
     dispatchExecute( pViewShell, SID_VIEWSHELL1 );
 }
 
+bool extractBoolFromAny( bool& rbValue, const uno::Any& rAny )
+{
+    if( rAny >>= rbValue ) return true;
+
+    sal_Int64 nSigned = 0;
+    if( rAny >>= nSigned ) { rbValue = nSigned != 0; return true; }
+
+    sal_uInt64 nUnsigned = 0;
+    if( rAny >>= nUnsigned ) { rbValue = nUnsigned > 0; return true; }
+
+    double fDouble = 0.0;
+    if( rAny >>= fDouble ) { rbValue = fDouble != 0.0; return true; }
+
+    return false;
+}
+
+bool extractBoolFromAny( const uno::Any& rAny ) throw (uno::RuntimeException)
+{
+    bool bValue = false;
+    if( extractBoolFromAny( bValue, rAny ) )
+        return bValue;
+    throw uno::RuntimeException();
+}
+
 rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeException )
 {
     uno::Type aType = pvargItem.getValueType();
@@ -1404,6 +1428,26 @@ void UserFormGeometryHelper::setHeight( double nHeight )
         return points;
     }
 
+        uno::Reference< uno::XInterface > getUnoDocModule( const String& aModName, SfxObjectShell* pShell )
+        {
+            uno::Reference<  uno::XInterface > xIf;
+            if ( pShell )
+            {
+                rtl::OUString sProj( RTL_CONSTASCII_USTRINGPARAM("Standard") );
+                BasicManager* pBasMgr = pShell->GetBasicManager();
+                if ( pBasMgr && pBasMgr->GetName().Len() )
+                    sProj = pShell->GetBasicManager()->GetName();
+                StarBASIC* pBasic = pShell->GetBasicManager()->GetLib( sProj );
+                if ( pBasic )
+                {
+                    SbModule* pMod = pBasic->FindModule( aModName );
+                    if ( pMod )
+                        xIf = pMod->GetUnoModule();
+                }
+            }
+            return xIf;
+        }
+
         SfxObjectShell* getSfxObjShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
         {
             SfxObjectShell* pFoundShell = NULL;
diff --git a/vbahelper/util/makefile.mk b/vbahelper/util/makefile.mk
index dda4be0cbc81..9469df473685 100644
--- a/vbahelper/util/makefile.mk
+++ b/vbahelper/util/makefile.mk
@@ -102,3 +102,11 @@ SHL2LIBS=$(SLB)$/$(TARGET_MSFORMS).lib
 # --- Targets -----------------------------------------------------------
 
 .INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/msforms.component
+
+$(MISC)/msforms.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        msforms.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt msforms.component
diff --git a/vbahelper/util/msforms.component b/vbahelper/util/msforms.component
new file mode 100644
index 000000000000..98ce4a8451d4
--- /dev/null
+++ b/vbahelper/util/msforms.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="ControlProviderImpl">
+    <service name="ooo.vba.ControlProvider"/>
+  </implementation>
+  <implementation name="ScVbaUserForm">
+    <service name="ooo.vba.msforms.UserForm"/>
+  </implementation>
+</component>