diff options
| author | Noel Power <noel.power@novell.com> | 2011-08-23 12:59:03 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2011-08-23 13:18:24 +0100 |
| commit | 4e0691b9b36703ab4bf6497c403e0ceacd0b8477 (patch) | |
| tree | 1a1340e805c90a5b254766162d48b77e548d7aa6 /vbahelper | |
| parent | 041b4805c94978d37cc9741776fd0d5dbaaa5b32 (diff) | |
merge foobars? fix broken MultiPage api, also fix broken api change events
Diffstat (limited to 'vbahelper')
| -rw-r--r-- | vbahelper/source/msforms/vbamultipage.cxx | 1 | ||||
| -rw-r--r-- | vbahelper/source/msforms/vbamultipage.hxx | 1 | ||||
| -rw-r--r-- | vbahelper/source/msforms/vbauserform.cxx | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx index 26555f0bfa2c..902aeba84e71 100644 --- a/vbahelper/source/msforms/vbamultipage.cxx +++ b/vbahelper/source/msforms/vbamultipage.cxx @@ -76,7 +76,6 @@ ScVbaMultiPage::ScVbaMultiPage( const uno::Reference< awt::XControl >& xDialog ) : MultiPageImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ) { - mxDialogProps.set( xDialog, uno::UNO_QUERY_THROW ); } // Attributes diff --git a/vbahelper/source/msforms/vbamultipage.hxx b/vbahelper/source/msforms/vbamultipage.hxx index 26070a8a90d5..aa22922f8578 100644 --- a/vbahelper/source/msforms/vbamultipage.hxx +++ b/vbahelper/source/msforms/vbamultipage.hxx @@ -40,7 +40,6 @@ typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XMultiPage > Mu class ScVbaMultiPage : public MultiPageImpl_BASE { css::uno::Reference< css::container::XIndexAccess > getPages( sal_Int32 nPages ); - css::uno::Reference< css::beans::XPropertySet > mxDialogProps; public: ScVbaMultiPage( const css::uno::Reference< ov::XHelperInterface >& xParent, diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx index 26912388ad05..2800403ac338 100644 --- a/vbahelper/source/msforms/vbauserform.cxx +++ b/vbahelper/source/msforms/vbauserform.cxx @@ -58,6 +58,8 @@ ScVbaUserForm::ScVbaUserForm( uno::Sequence< uno::Any > const& aArgs, uno::Refer uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY_THROW ); m_xProps.set( xControl->getModel(), uno::UNO_QUERY_THROW ); setGeometryHelper( new UserFormGeometryHelper( xContext, xControl, 0.0, 0.0 ) ); + if ( aArgs.getLength() >= 4 ) + aArgs[ 3 ] >>= m_sLibName; } ScVbaUserForm::~ScVbaUserForm() |