From c703f03e506d6fd8c0d8e8fde6608a8b4cbab021 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Tue, 15 Mar 2011 11:52:49 +0100 Subject: Fix build in scripting --- scripting/source/dlgprov/DialogModelProvider.cxx | 3 ++- scripting/source/dlgprov/dlgprov.cxx | 23 +++++++++++------------ scripting/source/dlgprov/dlgprov.hxx | 1 + xmlscript/inc/xmlscript/xmldlg_imexp.hxx | 2 +- xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx b/scripting/source/dlgprov/DialogModelProvider.cxx index fe8da6e511d7..462aaa1d95d7 100755 --- a/scripting/source/dlgprov/DialogModelProvider.cxx +++ b/scripting/source/dlgprov/DialogModelProvider.cxx @@ -94,7 +94,8 @@ void SAL_CALL DialogModelProvider::initialize(const css::uno::Sequence< uno::Any Any aDialogSourceURLAny; aDialogSourceURLAny <<= sURL; - m_xDialogModel.set( dlgprov::lcl_createDialogModel( m_xContext,xInput , xStringResourceManager, aDialogSourceURLAny ), UNO_QUERY_THROW); + 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); } } diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index c847a4a152db..fc2f5aab953e 100755 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -138,6 +138,7 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re } Reference< container::XNameContainer > lcl_createDialogModel( const Reference< XComponentContext >& i_xContext, const Reference< io::XInputStream >& xInput, + const Reference< frame::XModel >& xModel, const Reference< resource::XStringResourceManager >& xStringResourceManager, const Any &aDialogSourceURL) throw ( Exception ) { @@ -147,7 +148,15 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re Reference< beans::XPropertySet > xDlgPropSet( xDialogModel, UNO_QUERY ); xDlgPropSet->setPropertyValue( aDlgSrcUrlPropName, aDialogSourceURL ); - ::xmlscript::importDialogModel( xInput, xDialogModel, i_xContext ); + // #TODO we really need to detect the source of the Dialog, is it + // the dialog. E.g. if the dialog was created from basic ( then we just + // can't tell where its from ) + // If we are happy to always substitute the form model for the awt + // one then maybe the presence of a document model is enough to trigger + // swapping out the models ( or perhaps we only want to do this + // for vba mode ) there are a number of feasible and valid possibilities + ::xmlscript::importDialogModel( xInput, xDialogModel, i_xContext, xModel ); + // Set resource property if( xStringResourceManager.is() ) { @@ -266,17 +275,7 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re const Reference< resource::XStringResourceManager >& xStringResourceManager, const Any &aDialogSourceURL) throw ( Exception ) { - - - // #TODO we really need to detect the source of the Dialog, is it - // the dialog. E.g. if the dialog was created from basic ( then we just - // can't tell where its from ) - // If we are happy to always substitute the form model for the awt - // one then maybe the presence of a document model is enough to trigger - // swapping out the models ( or perhaps we only want to do this - // for vba mode ) there are a number of feasible and valid possibilities - ::xmlscript::importDialogModel( xInput, xDialogModel, m_xContext, m_xModel ); - return lcl_createDialogModel(m_xContext,xInput,xStringResourceManager,aDialogSourceURL); + return lcl_createDialogModel(m_xContext,xInput,m_xModel,xStringResourceManager,aDialogSourceURL); } Reference< XControlModel > DialogProviderImpl::createDialogModelForBasic() throw ( Exception ) diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index 2545961a3d5e..773cfe9647f4 100755 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -67,6 +67,7 @@ namespace dlgprov ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > lcl_createDialogModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInput, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel, const ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager >& xStringResourceManager, const ::com::sun::star::uno::Any &aDialogSourceURL) throw ( ::com::sun::star::uno::Exception ); diff --git a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx index 30d92bfc1bd3..47d0d17e989f 100755 --- a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx +++ b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx @@ -78,7 +78,7 @@ SAL_CALL exportDialogModel( //============================================================================== void SAL_CALL importDialogModel( ::com::sun::star::uno::Reference< - ::com::sun::star::io::XInputStream > xInput, + ::com::sun::star::io::XInputStream > const & xInput, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > const & xDialogModel, ::com::sun::star::uno::Reference< diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx index f0e8a3dfd4ea..d435883ef8d3 100755 --- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx @@ -105,7 +105,7 @@ Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel( //================================================================================================== void SAL_CALL importDialogModel( - Reference< io::XInputStream > xInput, + Reference< io::XInputStream > const & xInput, Reference< container::XNameContainer > const & xDialogModel, Reference< XComponentContext > const & xContext, Reference< XModel > const & xDocument ) -- cgit