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/dbpilots | |
parent | e39a959429234aef5348a8b5800b27c29de02a6f (diff) |
reduce use of UniString from ResID ctor
Change-Id: I8d7619e7807ff2d400ec5c7fd181375130245728
Diffstat (limited to 'extensions/source/dbpilots')
-rw-r--r-- | extensions/source/dbpilots/controlwizard.cxx | 4 | ||||
-rw-r--r-- | extensions/source/dbpilots/gridwizard.cxx | 4 | ||||
-rw-r--r-- | extensions/source/dbpilots/groupboxwiz.cxx | 2 | ||||
-rw-r--r-- | extensions/source/dbpilots/listcombowizard.cxx | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 507525ce80a4..f1e4aef9ea60 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -262,7 +262,7 @@ namespace dbp nCommandTypeResourceId = RID_STR_TYPE_COMMAND; break; } - m_pFormContentType->SetText(String(ModuleRes(nCommandTypeResourceId))); + m_pFormContentType->SetText(ModuleRes(nCommandTypeResourceId).toString()); } OControlWizardPage_Base::initializePage(); @@ -653,7 +653,7 @@ namespace dbp // prepend an extra SQLContext explaining what we were doing SQLContext aContext; - aContext.Message = String(ModuleRes(RID_STR_COULDNOTOPENTABLE)); + aContext.Message = ModuleRes(RID_STR_COULDNOTOPENTABLE).toString(); aContext.NextException = aSQLException; // create an interaction handler to display this exception diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index d0885644cedd..4df071e8000b 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -166,11 +166,11 @@ namespace dbp case DataType::TIMESTAMP: aColumnServiceNames.push_back(OUString("DateField")); - aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_DATEPOSTFIX))); + aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_DATEPOSTFIX).toString()); aFormFieldNames.push_back(*pSelectedFields); aColumnServiceNames.push_back(OUString("TimeField")); - aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_TIMEPOSTFIX))); + aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_TIMEPOSTFIX).toString()); break; default: diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 597e73943c6f..3097b8eba621 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -490,7 +490,7 @@ namespace dbp OOptionDBFieldPage::OOptionDBFieldPage( OControlWizard* _pParent ) :ODBFieldPage(_pParent) { - setDescriptionText(String(ModuleRes(RID_STR_GROUPWIZ_DBFIELD))); + setDescriptionText(ModuleRes(RID_STR_GROUPWIZ_DBFIELD).toString()); } //--------------------------------------------------------------------- diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 20eae70f083e..ca189c3410ab 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -77,11 +77,11 @@ namespace dbp { case FormComponentType::LISTBOX: m_bListBox = sal_True; - setTitleBase(String(ModuleRes(RID_STR_LISTWIZARD_TITLE))); + setTitleBase(ModuleRes(RID_STR_LISTWIZARD_TITLE).toString()); return sal_True; case FormComponentType::COMBOBOX: m_bListBox = sal_False; - setTitleBase(String(ModuleRes(RID_STR_COMBOWIZARD_TITLE))); + setTitleBase(ModuleRes(RID_STR_COMBOWIZARD_TITLE).toString()); return sal_True; } return sal_False; @@ -370,7 +370,7 @@ namespace dbp ,m_aDisplayedField (this, ModuleRes(ET_DISPLAYEDFIELD)) ,m_aInfo (this, ModuleRes(FT_CONTENTFIELD_INFO)) { - m_aInfo.SetText(String(ModuleRes( isListBox() ? STR_FIELDINFO_LISTBOX : STR_FIELDINFO_COMBOBOX))); + m_aInfo.SetText(ModuleRes( isListBox() ? STR_FIELDINFO_LISTBOX : STR_FIELDINFO_COMBOBOX).toString()); FreeResource(); m_aSelectTableField.SetSelectHdl(LINK(this, OContentFieldSelection, OnFieldSelected)); m_aSelectTableField.SetDoubleClickHdl(LINK(this, OContentFieldSelection, OnTableDoubleClicked)); @@ -517,7 +517,7 @@ namespace dbp OComboDBFieldPage::OComboDBFieldPage( OControlWizard* _pParent ) :ODBFieldPage(_pParent) { - setDescriptionText(String(ModuleRes(RID_STR_COMBOWIZ_DBFIELD))); + setDescriptionText(ModuleRes(RID_STR_COMBOWIZ_DBFIELD).toString()); } //--------------------------------------------------------------------- |