summaryrefslogtreecommitdiff
path: root/extensions/source/abpilot/fieldmappingimpl.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-01-07 15:15:57 +0200
committerNoel Grandin <noel@peralex.com>2013-01-15 09:56:00 +0200
commit1e618a8df61fd585d9e546148790b3856bf9c68d (patch)
treea2f06f5862bed03ea723ee85182c400389c0590a /extensions/source/abpilot/fieldmappingimpl.cxx
parentb920a2a8682b21f29c63a269e6383647025cf635 (diff)
fdo#46808, Adapt ui::AddressBookSourceDialog UNO service to new style
The service already existed, it just did not have an IDL file. Change-Id: I34f9c29b7d5c91735cf1763b74d02516466bc78c
Diffstat (limited to 'extensions/source/abpilot/fieldmappingimpl.cxx')
-rw-r--r--extensions/source/abpilot/fieldmappingimpl.cxx42
1 files changed, 12 insertions, 30 deletions
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index e4e20f84dbd2..c872943400d6 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <com/sun/star/ui/AddressBookSourceDialog.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <tools/debug.hxx>
@@ -45,6 +46,7 @@ namespace abp
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdb;
+ using namespace ::com::sun::star::ui;
using namespace ::com::sun::star::ui::dialogs;
//---------------------------------------------------------------------
@@ -67,7 +69,7 @@ namespace abp
//.....................................................................
//-----------------------------------------------------------------
- sal_Bool invokeDialog( const Reference< XMultiServiceFactory >& _rxORB, class Window* _pParent,
+ sal_Bool invokeDialog( const Reference< XComponentContext >& _rxORB, class Window* _pParent,
const Reference< XPropertySet >& _rxDataSource, AddressSettings& _rSettings ) SAL_THROW ( ( ) )
{
_rSettings.aFieldMapping.clear();
@@ -80,37 +82,17 @@ namespace abp
try
{
// ........................................................
- // the parameters for creating the dialog
- Sequence< Any > aArguments(5);
- Any* pArguments = aArguments.getArray();
-
- // the parent window
+ // create an instance of the dialog service
Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface( _pParent );
- *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" )), -1, makeAny( xDialogParent ), PropertyState_DIRECT_VALUE);
-
- // the data source to use
- *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSource" )), -1, makeAny( _rxDataSource ), PropertyState_DIRECT_VALUE);
- *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceName" )), -1, makeAny( (sal_Bool)_rSettings.bRegisterDataSource ? _rSettings.sRegisteredDataSourceName : _rSettings.sDataSourceName ), PropertyState_DIRECT_VALUE);
-
- // the table to use
- *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Command" )), -1, makeAny( _rSettings.sSelectedTable ), PropertyState_DIRECT_VALUE);
-
- // the title
::rtl::OUString sTitle = String( ModuleRes( RID_STR_FIELDDIALOGTITLE ) );
- *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" )), -1, makeAny( sTitle ), PropertyState_DIRECT_VALUE);
-
- // ........................................................
- // create an instance of the dialog service
- static ::rtl::OUString s_sAdressBookFieldAssignmentServiceName(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.AddressBookSourceDialog" ));
- Reference< XExecutableDialog > xDialog(
- _rxORB->createInstanceWithArguments( s_sAdressBookFieldAssignmentServiceName, aArguments ),
- UNO_QUERY
- );
- if ( !xDialog.is( ) )
- {
- ShowServiceNotAvailableError( _pParent, s_sAdressBookFieldAssignmentServiceName, sal_True );
- return sal_False;
- }
+ Reference< XExecutableDialog > xDialog = AddressBookSourceDialog::createWithDataSource(_rxORB,
+ // the parent window
+ xDialogParent,
+ _rxDataSource,
+ (sal_Bool)_rSettings.bRegisterDataSource ? _rSettings.sRegisteredDataSourceName : _rSettings.sDataSourceName,
+ // the table to use
+ _rSettings.sSelectedTable,
+ sTitle);
// execute the dialog
if ( xDialog->execute() )