diff options
| author | Noel Grandin <noel@peralex.com> | 2013-05-16 14:13:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-05-21 08:23:58 +0200 |
| commit | 6c61b20a8d4a6dcac28801cde82a211fb7e30654 (patch) | |
| tree | d82328eaa120b8bc822f028fa1e62bc7814c9e1b /scripting/source/dlgprov/DialogModelProvider.cxx | |
| parent | 6c53dff36ebdac7b6a6cf514ab469b2202d6aa48 (diff) | |
fdo#46808, Convert awt::UnoControlDialogModel to new style
Change-Id: I4b912034ef3f4855b87d6d6f18ff13bd1ecc8f72
Diffstat (limited to 'scripting/source/dlgprov/DialogModelProvider.cxx')
| -rw-r--r-- | scripting/source/dlgprov/DialogModelProvider.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx b/scripting/source/dlgprov/DialogModelProvider.cxx index aee0a9a16ec5..b7b5de3da34e 100644 --- a/scripting/source/dlgprov/DialogModelProvider.cxx +++ b/scripting/source/dlgprov/DialogModelProvider.cxx @@ -76,12 +76,9 @@ void SAL_CALL DialogModelProvider::initialize(const css::uno::Sequence< uno::Any if ( xInput.is() ) { xStringResourceManager = dlgprov::lcl_getStringResourceManager(m_xContext,sURL); - Any aDialogSourceURLAny; - aDialogSourceURLAny <<= sURL; Reference< frame::XModel > xModel; - m_xDialogModel.set( dlgprov::lcl_createDialogModel( m_xContext, xInput , xModel, xStringResourceManager, aDialogSourceURLAny ), UNO_QUERY_THROW); - m_xDialogModelProp.set(m_xDialogModel, UNO_QUERY_THROW); + m_xDialogModel = dlgprov::lcl_createDialogModel( m_xContext, xInput , xModel, xStringResourceManager, sURL ); } } catch( Exception& ) @@ -135,14 +132,14 @@ void SAL_CALL DialogModelProvider::removeByName(const OUString & aName) throw (c } uno::Reference< beans::XPropertySetInfo > SAL_CALL DialogModelProvider::getPropertySetInfo( ) throw (uno::RuntimeException) { - return m_xDialogModelProp->getPropertySetInfo(); + return m_xDialogModel->getPropertySetInfo(); } void SAL_CALL DialogModelProvider::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { } uno::Any SAL_CALL DialogModelProvider::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - return m_xDialogModelProp->getPropertyValue(PropertyName); + return m_xDialogModel->getPropertyValue(PropertyName); } void SAL_CALL DialogModelProvider::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { |