diff options
| author | Noel Grandin <noel@peralex.com> | 2013-01-18 09:18:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-11 08:02:12 +0200 |
| commit | bed621572c397c7a2c6dac934801c947e45c83da (patch) | |
| tree | f59fd8c762704d09138f906f21943971c3421d80 /basic | |
| parent | e5fdaec54a54e42b487c37e6b01493bcdfc30b4c (diff) | |
fdo#46808, Use service constructor for awt::DialogProvider
Change-Id: I5d0a3e66afeadafa6d53ff0a255d036b7e3d528d
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/sbxmod.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 33abb260f1b3..3c3ded97bc65 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -85,7 +85,7 @@ using namespace com::sun::star::script; #include <com/sun/star/script/XLibraryContainer.hpp> -#include <com/sun/star/awt/XDialogProvider.hpp> +#include <com/sun/star/awt/DialogProvider.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XControl.hpp> @@ -2680,11 +2680,8 @@ void SbUserFormModule::InitObject() // broadcast INITIALIZE_USERFORM script event before the dialog is created Reference< script::vba::XVBACompatibility > xVBACompat( getVBACompatibility( m_xModel ), uno::UNO_SET_THROW ); xVBACompat->broadcastVBAScriptEvent( script::vba::VBAScriptEventId::INITIALIZE_USERFORM, GetName() ); - uno::Reference< lang::XMultiServiceFactory > xVBAFactory( pGlobs->getUnoAny(), uno::UNO_QUERY_THROW ); - uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); - uno::Sequence< uno::Any > aArgs(1); - aArgs[ 0 ] <<= m_xModel; + uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); OUString sDialogUrl( "vnd.sun.star.script:" ); OUString sProjectName( "Standard" ); @@ -2698,11 +2695,11 @@ void SbUserFormModule::InitObject() sDialogUrl = sDialogUrl + sProjectName + "." + GetName() + "?location=document"; - uno::Reference< awt::XDialogProvider > xProvider( xFactory->createInstanceWithArguments( "com.sun.star.awt.DialogProvider", aArgs ), uno::UNO_QUERY_THROW ); + uno::Reference< awt::XDialogProvider > xProvider = awt::DialogProvider::createWithModel( xContext, m_xModel ); m_xDialog = xProvider->createDialog( sDialogUrl ); // create vba api object - aArgs.realloc( 4 ); + uno::Sequence< uno::Any > aArgs(4); aArgs[ 0 ] = uno::Any(); aArgs[ 1 ] <<= m_xDialog; aArgs[ 2 ] <<= m_xModel; |