mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#46808, use DialogProvider service constructor

Browse Source 
Change-Id: I1652be5cefd00892426cf8559cadc9605ad8d439
This commit is contained in:
Noel Grandin
2013-05-14 11:58:43 +02:00
parent 8bf8a2f349
commit c75a46fbd0
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
basic/source/classes/eventatt.cxx
View File

@@ -27,7 +27,7 @@
#include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/awt/XDialog.hpp> #include <com/sun/star/awt/XDialog.hpp>
#include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/awt/XDialogProvider.hpp> #include <com/sun/star/awt/DialogProvider.hpp>
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNameContainer.hpp>
@@ -533,24 +533,17 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrit
} }
Reference< XScriptListener > xScriptListener = new BasicScriptListener_Impl( GetSbData()->pInst->GetBasic(), xModel ); Reference< XScriptListener > xScriptListener = new BasicScriptListener_Impl( GetSbData()->pInst->GetBasic(), xModel );
Sequence< Any > aArgs( 4 );
if( bDocDialog )
{
aArgs[ 0 ] <<= xModel;
}
else
{
aArgs[ 0 ] <<= uno::Reference< uno::XInterface >();
}
aArgs[ 1 ] <<= xInput;
aArgs[ 2 ] = aDlgLibAny;
aArgs[ 3 ] <<= xScriptListener;
// Create a "living" Dialog // Create a "living" Dialog
Reference< XControl > xCntrl; Reference< XControl > xCntrl;
try try
{ {
Reference< XDialogProvider > xDlgProv( xMSF->createInstanceWithArguments(OUString("com.sun.star.comp.scripting.DialogProvider" ), aArgs ), UNO_QUERY ); Reference< XDialogProvider > xDlgProv;;
xCntrl.set( xDlgProv->createDialog(OUString() ), UNO_QUERY_THROW ); if( bDocDialog )
xDlgProv = css::awt::DialogProvider::createWithModelAndListener( xContext, xModel, xInput, aDlgLibAny, xScriptListener );
else
xDlgProv = css::awt::DialogProvider::createWithModelAndListener( xContext, uno::Reference< frame::XModel >(), xInput, aDlgLibAny, xScriptListener );
xCntrl.set( xDlgProv->createDialog(OUString() ), UNO_QUERY_THROW );
// Add dialog model to dispose vector // Add dialog model to dispose vector
Reference< XComponent > xDlgComponent( xCntrl->getModel(), UNO_QUERY ); Reference< XComponent > xDlgComponent( xCntrl->getModel(), UNO_QUERY );
GetSbData()->pInst->getComponentVector().push_back( xDlgComponent ); GetSbData()->pInst->getComponentVector().push_back( xDlgComponent );

8
offapi/com/sun/star/awt/DialogProvider.idl
View File

@@ -22,6 +22,8 @@
#include <com/sun/star/awt/XDialogProvider.idl> #include <com/sun/star/awt/XDialogProvider.idl>
#include <com/sun/star/frame/XModel.idl> #include <com/sun/star/frame/XModel.idl>
#include <com/sun/star/io/XInputStream.idl>
#include <com/sun/star/script/XScriptListener.idl>
@@ -33,7 +35,13 @@ module com { module sun { module star { module awt {
*/ */
service DialogProvider : com::sun::star::awt::XDialogProvider service DialogProvider : com::sun::star::awt::XDialogProvider
{ {
createWithModel([in] com::sun::star::frame::XModel Model); createWithModel([in] com::sun::star::frame::XModel Model);
createWithModelAndListener([in] com::sun::star::frame::XModel Model,
[in] com::sun::star::io::XInputStream InStream,
[in] any DialogLib,
[in] com::sun::star::script::XScriptListener ScriptListener);
}; };