mib17: #111144# Enable calls to module function via Sheet object

4 files changed, 43 insertions, 7 deletions

diff --git a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
index 20b220c1f5..27ffa25eeb 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/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx
index 024b0d3aa8..538360899e 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);
 
diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx
index adb0738a13..4d4d29dadd 100644
--- a/vbahelper/source/vbahelper/vbaglobalbase.cxx
+++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx
@@ -35,6 +35,9 @@ 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 ) 
@@ -74,19 +77,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 8654e6cb6a..86d8e478cd 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -1403,7 +1403,27 @@ void UserFormGeometryHelper::setHeight( double nHeight )
         double points = double( static_cast<double>(_hmm) / factor);
         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;