diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-07-27 17:01:36 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-28 16:45:48 +0100 |
commit | 5efc15f0006866ac4c422c1b2bde173ded47893f (patch) | |
tree | 119b46339aae67b9a5b1a76ea2a955a548e5016e /extensions/source/abpilot | |
parent | e39a959429234aef5348a8b5800b27c29de02a6f (diff) |
reduce use of UniString from ResID ctor
Change-Id: I8d7619e7807ff2d400ec5c7fd181375130245728
Diffstat (limited to 'extensions/source/abpilot')
-rw-r--r-- | extensions/source/abpilot/abspilot.cxx | 4 | ||||
-rw-r--r-- | extensions/source/abpilot/admininvokationimpl.cxx | 4 | ||||
-rw-r--r-- | extensions/source/abpilot/datasourcehandling.cxx | 4 | ||||
-rw-r--r-- | extensions/source/abpilot/fieldmappingimpl.cxx | 2 | ||||
-rw-r--r-- | extensions/source/abpilot/fieldmappingpage.cxx | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 96f1b59f484e..c213b7b1dd8b 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -116,7 +116,7 @@ namespace abp #else m_aSettings.eType = AST_OTHER; #endif - m_aSettings.sDataSourceName = String(ModuleRes(RID_STR_DEFAULT_NAME)); + m_aSettings.sDataSourceName = ModuleRes(RID_STR_DEFAULT_NAME).toString(); m_aSettings.bRegisterDataSource = false; m_aSettings.bIgnoreNoTable = false; @@ -150,7 +150,7 @@ namespace abp if ( nResId ) { svt::OLocalResourceAccess aAccess( ModuleRes( RID_DLG_ADDRESSBOOKSOURCEPILOT ), RSC_MODALDIALOG ); - sDisplayName = String( ModuleRes( nResId ) ); + sDisplayName = ModuleRes(nResId).toString(); } return sDisplayName; diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index 7339d1420b45..db24269e2cf5 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -79,8 +79,8 @@ namespace abp *pArguments++ <<= PropertyValue(OUString("ParentWindow"), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE); // the title of the dialog - String sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE)); - *pArguments++ <<= PropertyValue(OUString("Title"), -1, makeAny(OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE); + OUString sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE).toString()); + *pArguments++ <<= PropertyValue(OUString("Title"), -1, makeAny(sAdminDialogTitle), PropertyState_DIRECT_VALUE); // the name of the new data source *pArguments++ <<= PropertyValue(OUString("InitialSelection"), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE); diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index bc0f78eb63a0..68ba6fe5e5f0 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -566,8 +566,8 @@ namespace abp { // prepend some context info SQLContext aDetailedError; - aDetailedError.Message = String( ModuleRes( RID_STR_NOCONNECTION ) ); - aDetailedError.Details = String( ModuleRes( RID_STR_PLEASECHECKSETTINGS ) ); + aDetailedError.Message = ModuleRes(RID_STR_NOCONNECTION).toString(); + aDetailedError.Details = ModuleRes(RID_STR_PLEASECHECKSETTINGS).toString(); aDetailedError.NextException = aError; // handle (aka display) the new context info xInteractions->handle( new OInteractionRequest( makeAny( aDetailedError ) ) ); diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index 2f482e6575f1..f220fd0b078c 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -84,7 +84,7 @@ namespace abp // ........................................................ // create an instance of the dialog service Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface( _pParent ); - OUString sTitle = String( ModuleRes( RID_STR_FIELDDIALOGTITLE ) ); + OUString sTitle(ModuleRes(RID_STR_FIELDDIALOGTITLE).toString()); Reference< XExecutableDialog > xDialog = AddressBookSourceDialog::createWithDataSource(_rxORB, // the parent window xDialogParent, diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx index 12a51bd5985c..8776d5d1e063 100644 --- a/extensions/source/abpilot/fieldmappingpage.cxx +++ b/extensions/source/abpilot/fieldmappingpage.cxx @@ -80,9 +80,9 @@ namespace abp void FieldMappingPage::implUpdateHint() { const AddressSettings& rSettings = getSettings(); - String sHint; + OUString sHint; if ( 0 == rSettings.aFieldMapping.size() ) - sHint = String( ModuleRes( RID_STR_NOFIELDSASSIGNED ) ); + sHint = ModuleRes(RID_STR_NOFIELDSASSIGNED).toString(); m_aHint.SetText( sHint ); } |