[Libreoffice-commits] .: vbahelper/source

[Noel Power]

 vbahelper/source/msforms/vbamultipage.cxx |    1 -
 vbahelper/source/msforms/vbamultipage.hxx |    1 -
 vbahelper/source/msforms/vbauserform.cxx  |    2 ++
 3 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4e0691b9b36703ab4bf6497c403e0ceacd0b8477
Author: Noel Power <noel.power at novell.com>
Date:   Tue Aug 23 12:59:03 2011 +0100

    merge foobars? fix broken MultiPage api, also fix broken api change events

diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx
index 26555f0..902aeba 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 26070a8..aa22922 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 2691238..2800403 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()