2 files changed, 54 insertions, 17 deletions
diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx
index 2a4cecfc2338..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
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index 7cd82dff9536..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();