diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-18 21:14:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-19 15:40:40 +0200 |
| commit | 2155e04d6343638ca9815d394cbc4f78c2b17c3a (patch) | |
| tree | 0378142f6ce9edb63074291aed45527568e7b254 /extensions | |
| parent | cee02e81cd3b55fb46eacf5db5713e8bf4363bcd (diff) | |
make string translation loading more uniform
change various ResId classes that use conversion operator to OUString to
functions that return a OUString
drop various defines
drop unnecessary toString calls
Change-Id: Ibeccdf2b91a46a2ed5b4b74e6024e301a023bc92
Reviewed-on: https://gerrit.libreoffice.org/37817
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'extensions')
26 files changed, 90 insertions, 95 deletions
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 7859182105a6..4c56318fad8b 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -105,7 +105,7 @@ namespace abp #else m_aSettings.eType = AST_OTHER; #endif - m_aSettings.sDataSourceName = ModuleRes(RID_STR_DEFAULT_NAME).toString(); + m_aSettings.sDataSourceName = ModuleRes(RID_STR_DEFAULT_NAME); m_aSettings.bRegisterDataSource = false; m_aSettings.bEmbedDataSource = false; m_aSettings.bIgnoreNoTable = false; @@ -116,7 +116,7 @@ namespace abp typeSelectionChanged( m_aSettings.eType ); - OUString sDialogTitle = ModuleRes(RID_STR_ABSOURCEDIALOGTITLE).toString(); + OUString sDialogTitle = ModuleRes(RID_STR_ABSOURCEDIALOGTITLE); setTitleBase(sDialogTitle); SetHelpId(HID_ABSPILOT); } @@ -137,7 +137,7 @@ namespace abp OUString sDisplayName; if ( nResId ) { - sDisplayName = ModuleRes(nResId).toString(); + sDisplayName = ModuleRes(nResId); } return sDisplayName; diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index efd3b6f6265c..71c459a7b5db 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -74,7 +74,7 @@ namespace abp *pArguments++ <<= PropertyValue("ParentWindow", -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE); // the title of the dialog - OUString sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE).toString()); + OUString sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE)); *pArguments++ <<= PropertyValue("Title", -1, makeAny(sAdminDialogTitle), PropertyState_DIRECT_VALUE); // the name of the new data source diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index d8d5ec7d03b1..b7a2c3492e7c 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -584,8 +584,8 @@ namespace abp { // prepend some context info SQLContext aDetailedError; - aDetailedError.Message = ModuleRes(RID_STR_NOCONNECTION).toString(); - aDetailedError.Details = ModuleRes(RID_STR_PLEASECHECKSETTINGS).toString(); + aDetailedError.Message = ModuleRes(RID_STR_NOCONNECTION); + aDetailedError.Details = ModuleRes(RID_STR_PLEASECHECKSETTINGS); 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 a4f1c5376a8c..1aba04832332 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -73,7 +73,7 @@ namespace abp // create an instance of the dialog service Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface( _pParent ); - OUString sTitle(ModuleRes(RID_STR_FIELDDIALOGTITLE).toString()); + OUString sTitle(ModuleRes(RID_STR_FIELDDIALOGTITLE)); 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 93ebe3f22710..0c357bf8d996 100644 --- a/extensions/source/abpilot/fieldmappingpage.cxx +++ b/extensions/source/abpilot/fieldmappingpage.cxx @@ -67,7 +67,7 @@ namespace abp const AddressSettings& rSettings = getSettings(); OUString sHint; if ( rSettings.aFieldMapping.empty() ) - sHint = ModuleRes(RID_STR_NOFIELDSASSIGNED).toString(); + sHint = ModuleRes(RID_STR_NOFIELDSASSIGNED); m_pHint->SetText( sHint ); } diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index a30f9cf81bc3..86d2cf3c71af 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -233,7 +233,7 @@ void BibliographyLoader::load(const Reference< XFrame > & rFrame, const OUString if(xPrSet.is()) { Any aTitle; - aTitle <<= BibResId(RID_BIB_STR_FRAME_TITLE).toString(); + aTitle <<= BibResId(RID_BIB_STR_FRAME_TITLE); xPrSet->setPropertyValue("Title", aTitle); } if(aPartName == "View" || aPartName == "View1") diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx index 60ec774d3797..06638a88f7d1 100644 --- a/extensions/source/bibliography/bibmod.cxx +++ b/extensions/source/bibliography/bibmod.cxx @@ -60,11 +60,13 @@ void CloseBibModul(HdlBibModul ppBibModul) } } -BibResId::BibResId( sal_uInt16 nId ) : - ResId( nId, *pBibModul->GetResMgr() ) +OUString BibResId(sal_uInt16 nId) { + return ResId(nId, *pBibModul->GetResMgr()); } + BibConfig* BibModul::pBibConfig = nullptr; + BibModul::BibModul() { pResMgr = ResMgr::CreateResMgr( "bib" ); diff --git a/extensions/source/bibliography/bibresid.hxx b/extensions/source/bibliography/bibresid.hxx index f3a393c3b576..1855a8427b88 100644 --- a/extensions/source/bibliography/bibresid.hxx +++ b/extensions/source/bibliography/bibresid.hxx @@ -20,16 +20,9 @@ #ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBRESID_HXX #define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBRESID_HXX -#include <tools/resid.hxx> +#include <rtl/ustring.hxx> - -class BibResId : public ResId -{ - public: - explicit BibResId(sal_uInt16 nId); -}; - -#define BIB_RESSTR(i) BibResId(i).toString() +OUString BibResId(sal_uInt16 nId); #endif // INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBRESID_HXX diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 32739be7ce4b..ae993379c67f 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -140,7 +140,7 @@ namespace bib else if(bExecute) { sErrorString += "\n"; - sErrorString += BIB_RESSTR(RID_MAP_QUESTION); + sErrorString += BibResId(RID_MAP_QUESTION); ScopedVclPtrInstance< QueryBox > aQuery(this, WB_YES_NO, sErrorString); aQuery->SetDefaultCheckBoxText(); short nResult = aQuery->Execute(); diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index a6c5deba6924..756d488078b9 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -258,7 +258,7 @@ static sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig , MappingDialog_Impl::MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pMan) : ModalDialog(pParent, "MappingDialog", "modules/sbibliography/ui/mappingdialog.ui") , pDatMan(pMan) - , sNone(BIB_RESSTR(RID_BIB_STR_NONE)) + , sNone(BibResId(RID_BIB_STR_NONE)) , bModified(false) { get(pOKBT, "ok"); @@ -1336,28 +1336,28 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel( uno::Sequence<OUString> aValues(TYPE_COUNT + 1); OUString* pValuesArr = aValues.getArray(); - pValuesArr[0] = BIB_RESSTR(ST_TYPE_ARTICLE); - pValuesArr[1] = BIB_RESSTR(ST_TYPE_BOOK); - pValuesArr[2] = BIB_RESSTR(ST_TYPE_BOOKLET); - pValuesArr[3] = BIB_RESSTR(ST_TYPE_CONFERENCE); - pValuesArr[4] = BIB_RESSTR(ST_TYPE_INBOOK ); - pValuesArr[5] = BIB_RESSTR(ST_TYPE_INCOLLECTION); - pValuesArr[6] = BIB_RESSTR(ST_TYPE_INPROCEEDINGS); - pValuesArr[7] = BIB_RESSTR(ST_TYPE_JOURNAL ); - pValuesArr[8] = BIB_RESSTR(ST_TYPE_MANUAL ); - pValuesArr[9] = BIB_RESSTR(ST_TYPE_MASTERSTHESIS); - pValuesArr[10] = BIB_RESSTR(ST_TYPE_MISC ); - pValuesArr[11] = BIB_RESSTR(ST_TYPE_PHDTHESIS ); - pValuesArr[12] = BIB_RESSTR(ST_TYPE_PROCEEDINGS ); - pValuesArr[13] = BIB_RESSTR(ST_TYPE_TECHREPORT ); - pValuesArr[14] = BIB_RESSTR(ST_TYPE_UNPUBLISHED ); - pValuesArr[15] = BIB_RESSTR(ST_TYPE_EMAIL ); - pValuesArr[16] = BIB_RESSTR(ST_TYPE_WWW ); - pValuesArr[17] = BIB_RESSTR(ST_TYPE_CUSTOM1 ); - pValuesArr[18] = BIB_RESSTR(ST_TYPE_CUSTOM2 ); - pValuesArr[19] = BIB_RESSTR(ST_TYPE_CUSTOM3 ); - pValuesArr[20] = BIB_RESSTR(ST_TYPE_CUSTOM4 ); - pValuesArr[21] = BIB_RESSTR(ST_TYPE_CUSTOM5 ); + pValuesArr[0] = BibResId(ST_TYPE_ARTICLE); + pValuesArr[1] = BibResId(ST_TYPE_BOOK); + pValuesArr[2] = BibResId(ST_TYPE_BOOKLET); + pValuesArr[3] = BibResId(ST_TYPE_CONFERENCE); + pValuesArr[4] = BibResId(ST_TYPE_INBOOK ); + pValuesArr[5] = BibResId(ST_TYPE_INCOLLECTION); + pValuesArr[6] = BibResId(ST_TYPE_INPROCEEDINGS); + pValuesArr[7] = BibResId(ST_TYPE_JOURNAL ); + pValuesArr[8] = BibResId(ST_TYPE_MANUAL ); + pValuesArr[9] = BibResId(ST_TYPE_MASTERSTHESIS); + pValuesArr[10] = BibResId(ST_TYPE_MISC ); + pValuesArr[11] = BibResId(ST_TYPE_PHDTHESIS ); + pValuesArr[12] = BibResId(ST_TYPE_PROCEEDINGS ); + pValuesArr[13] = BibResId(ST_TYPE_TECHREPORT ); + pValuesArr[14] = BibResId(ST_TYPE_UNPUBLISHED ); + pValuesArr[15] = BibResId(ST_TYPE_EMAIL ); + pValuesArr[16] = BibResId(ST_TYPE_WWW ); + pValuesArr[17] = BibResId(ST_TYPE_CUSTOM1 ); + pValuesArr[18] = BibResId(ST_TYPE_CUSTOM2 ); + pValuesArr[19] = BibResId(ST_TYPE_CUSTOM3 ); + pValuesArr[20] = BibResId(ST_TYPE_CUSTOM4 ); + pValuesArr[21] = BibResId(ST_TYPE_CUSTOM5 ); // empty string if an invalid value no values is set pValuesArr[TYPE_COUNT].clear(); diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 9a3866c991b2..9eccfef67a0d 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -167,7 +167,7 @@ void BibPosListener::disposing(const lang::EventObject& /*Source*/) BibGeneralPage::BibGeneralPage(vcl::Window* pParent, BibDataManager* pMan): TabPage(pParent, "GeneralPage", "modules/sbibliography/ui/generalpage.ui"), BibShortCutHandler( this ), - sErrorPrefix(BIB_RESSTR(ST_ERROR_PREFIX)), + sErrorPrefix(BibResId(ST_ERROR_PREFIX)), mxBibGeneralPageFocusListener(new BibGeneralPageFocusListener(this)), pDatMan(pMan) { @@ -334,7 +334,7 @@ BibGeneralPage::BibGeneralPage(vcl::Window* pParent, BibDataManager* pMan): if(!sTableErrorString.isEmpty()) sTableErrorString = sErrorPrefix + sTableErrorString; - SetText(BIB_RESSTR(ST_TYPE_TITLE)); + SetText(BibResId(ST_TYPE_TITLE)); Size aSize(LogicToPixel(Size(0, 209), MapMode(MapUnit::MapAppFont))); set_height_request(aSize.Height()); diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 68bc88dae26a..6d4d476c173c 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -231,7 +231,7 @@ namespace dbp nCommandTypeResourceId = RID_STR_TYPE_COMMAND; break; } - m_pFormContentType->SetText(ModuleRes(nCommandTypeResourceId).toString()); + m_pFormContentType->SetText(ModuleRes(nCommandTypeResourceId)); } OControlWizardPage_Base::initializePage(); @@ -607,7 +607,7 @@ namespace dbp // prepend an extra SQLContext explaining what we were doing SQLContext aContext; - aContext.Message = ModuleRes(RID_STR_COULDNOTOPENTABLE).toString(); + aContext.Message = ModuleRes(RID_STR_COULDNOTOPENTABLE); 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 8be4a22e91e9..9db743904aa4 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -60,7 +60,7 @@ namespace dbp m_pNextPage->SetHelpId(HID_GRIDWIZARD_NEXT); m_pCancel->SetHelpId(HID_GRIDWIZARD_CANCEL); m_pFinish->SetHelpId(HID_GRIDWIZARD_FINISH); - setTitleBase(ModuleRes(RID_STR_GRIDWIZARD_TITLE).toString()); + setTitleBase(ModuleRes(RID_STR_GRIDWIZARD_TITLE)); // if we do not need the data source selection page ... if (!needDatasourceSelection()) @@ -160,11 +160,11 @@ namespace dbp case DataType::TIMESTAMP: aColumnServiceNames.push_back(OUString("DateField")); - aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_DATEPOSTFIX).toString()); + aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_DATEPOSTFIX)); aFormFieldNames.push_back(*pSelectedFields); aColumnServiceNames.push_back(OUString("TimeField")); - aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_TIMEPOSTFIX).toString()); + aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_TIMEPOSTFIX)); break; default: diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index ddb34e420b60..ab44cefe5bb1 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -55,7 +55,7 @@ namespace dbp m_pNextPage->SetHelpId(HID_GROUPWIZARD_NEXT); m_pCancel->SetHelpId(HID_GROUPWIZARD_CANCEL); m_pFinish->SetHelpId(HID_GROUPWIZARD_FINISH); - setTitleBase(ModuleRes(RID_STR_GROUPWIZARD_TITLE).toString()); + setTitleBase(ModuleRes(RID_STR_GROUPWIZARD_TITLE)); } @@ -468,7 +468,7 @@ namespace dbp OOptionDBFieldPage::OOptionDBFieldPage( OControlWizard* _pParent ) :ODBFieldPage(_pParent) { - setDescriptionText(ModuleRes(RID_STR_GROUPWIZ_DBFIELD).toString()); + setDescriptionText(ModuleRes(RID_STR_GROUPWIZ_DBFIELD)); } diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index d935d0a98b0c..b3bb2e6ffbad 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -73,11 +73,11 @@ namespace dbp { case FormComponentType::LISTBOX: m_bListBox = true; - setTitleBase(ModuleRes(RID_STR_LISTWIZARD_TITLE).toString()); + setTitleBase(ModuleRes(RID_STR_LISTWIZARD_TITLE)); return true; case FormComponentType::COMBOBOX: m_bListBox = false; - setTitleBase(ModuleRes(RID_STR_COMBOWIZARD_TITLE).toString()); + setTitleBase(ModuleRes(RID_STR_COMBOWIZARD_TITLE)); return true; } return false; @@ -354,7 +354,7 @@ namespace dbp get(m_pSelectTableField, "selectfield"); get(m_pDisplayedField, "displayfield"); get(m_pInfo, "info"); - m_pInfo->SetText(ModuleRes( isListBox() ? RID_STR_FIELDINFO_LISTBOX : RID_STR_FIELDINFO_COMBOBOX).toString()); + m_pInfo->SetText(ModuleRes( isListBox() ? RID_STR_FIELDINFO_LISTBOX : RID_STR_FIELDINFO_COMBOBOX)); m_pSelectTableField->SetSelectHdl(LINK(this, OContentFieldSelection, OnFieldSelected)); m_pSelectTableField->SetDoubleClickHdl(LINK(this, OContentFieldSelection, OnTableDoubleClicked)); } @@ -505,7 +505,7 @@ namespace dbp OComboDBFieldPage::OComboDBFieldPage( OControlWizard* _pParent ) :ODBFieldPage(_pParent) { - setDescriptionText(ModuleRes(RID_STR_COMBOWIZ_DBFIELD).toString()); + setDescriptionText(ModuleRes(RID_STR_COMBOWIZ_DBFIELD)); } diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index b08ad0843f6c..0527b1268590 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -173,7 +173,7 @@ namespace pcr for ( sal_Int32 i=0; i<nCategories; ++i, ++pReturn ) { pReturn->ProgrammaticName = OUString::createFromAscii( aCategories[i].programmaticName ); - pReturn->UIName = PcrRes( aCategories[i].uiNameResId ).toString(); + pReturn->UIName = PcrRes( aCategories[i].uiNameResId ); pReturn->HelpURL = HelpIdUrl::getHelpURL( aCategories[i].helpId ); } diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index ce25451ef572..c468edd23fa2 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -542,7 +542,7 @@ namespace pcr if ( xBinding.is() ) { // find a nice name for it - OUString sBaseName(PcrRes(RID_STR_BINDING_UI_NAME).toString()); + OUString sBaseName(PcrRes(RID_STR_BINDING_UI_NAME)); sBaseName += " "; OUString sNewName; sal_Int32 nNumber = 1; diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 025199837fbf..964c3ee1e800 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -138,7 +138,7 @@ namespace pcr EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName, const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId ) - :sDisplayName(PcrRes( _nDisplayNameResId ).toString()) + :sDisplayName(PcrRes( _nDisplayNameResId )) ,sListenerMethodName( OUString::createFromAscii( _pListenerMethodAsciiName ) ) ,sHelpId( _sHelpId ) ,sUniqueBrowseId( _sUniqueBrowseId ) diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx index 12a5d4afec70..fd01daebb8af 100644 --- a/extensions/source/propctrlr/formbrowsertools.cxx +++ b/extensions/source/propctrlr/formbrowsertools.cxx @@ -48,12 +48,12 @@ namespace pcr { Reference< XInterface > xIFace; aUnoObj >>= xIFace; - sClassName = PcrRes(RID_STR_PROPTITLE_EDIT).toString(); + sClassName = PcrRes(RID_STR_PROPTITLE_EDIT); if (xIFace.is()) { // we have a chance to check if it's a formatted field model Reference< XServiceInfo > xInfo(xIFace, UNO_QUERY); if (xInfo.is() && (xInfo->supportsService(SERVICE_COMPONENT_FORMATTEDFIELD))) - sClassName = PcrRes(RID_STR_PROPTITLE_FORMATTED).toString(); + sClassName = PcrRes(RID_STR_PROPTITLE_FORMATTED); else if (!xInfo.is()) { // couldn't distinguish between formatted and edit with the service name, so try with the properties @@ -62,7 +62,7 @@ namespace pcr { Reference< XPropertySetInfo > xPropsInfo = xProps->getPropertySetInfo(); if (xPropsInfo.is() && xPropsInfo->hasPropertyByName(PROPERTY_FORMATSSUPPLIER)) - sClassName = PcrRes(RID_STR_PROPTITLE_FORMATTED).toString(); + sClassName = PcrRes(RID_STR_PROPTITLE_FORMATTED); } } } @@ -70,44 +70,44 @@ namespace pcr break; case FormComponentType::COMMANDBUTTON: - sClassName = PcrRes(RID_STR_PROPTITLE_PUSHBUTTON).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_PUSHBUTTON); break; case FormComponentType::RADIOBUTTON: - sClassName = PcrRes(RID_STR_PROPTITLE_RADIOBUTTON).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_RADIOBUTTON); break; case FormComponentType::CHECKBOX: - sClassName = PcrRes(RID_STR_PROPTITLE_CHECKBOX).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_CHECKBOX); break; case FormComponentType::LISTBOX: - sClassName = PcrRes(RID_STR_PROPTITLE_LISTBOX).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_LISTBOX); break; case FormComponentType::COMBOBOX: - sClassName = PcrRes(RID_STR_PROPTITLE_COMBOBOX).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_COMBOBOX); break; case FormComponentType::GROUPBOX: - sClassName = PcrRes(RID_STR_PROPTITLE_GROUPBOX).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_GROUPBOX); break; case FormComponentType::IMAGEBUTTON: - sClassName = PcrRes(RID_STR_PROPTITLE_IMAGEBUTTON).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_IMAGEBUTTON); break; case FormComponentType::FIXEDTEXT: - sClassName = PcrRes(RID_STR_PROPTITLE_FIXEDTEXT).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_FIXEDTEXT); break; case FormComponentType::GRIDCONTROL: - sClassName = PcrRes(RID_STR_PROPTITLE_DBGRID).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_DBGRID); break; case FormComponentType::FILECONTROL: - sClassName = PcrRes(RID_STR_PROPTITLE_FILECONTROL).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_FILECONTROL); break; case FormComponentType::DATEFIELD: - sClassName = PcrRes(RID_STR_PROPTITLE_DATEFIELD).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_DATEFIELD); break; case FormComponentType::TIMEFIELD: - sClassName = PcrRes(RID_STR_PROPTITLE_TIMEFIELD).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_TIMEFIELD); break; case FormComponentType::NUMERICFIELD: - sClassName = PcrRes(RID_STR_PROPTITLE_NUMERICFIELD).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_NUMERICFIELD); break; case FormComponentType::CURRENCYFIELD: - sClassName = PcrRes(RID_STR_PROPTITLE_CURRENCYFIELD).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_CURRENCYFIELD); break; case FormComponentType::PATTERNFIELD: - sClassName = PcrRes(RID_STR_PROPTITLE_PATTERNFIELD).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_PATTERNFIELD); break; case FormComponentType::IMAGECONTROL: - sClassName = PcrRes(RID_STR_PROPTITLE_IMAGECONTROL).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_IMAGECONTROL); break; case FormComponentType::HIDDENCONTROL: - sClassName = PcrRes(RID_STR_PROPTITLE_HIDDENCONTROL).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_HIDDENCONTROL); break; case FormComponentType::CONTROL: default: - sClassName = PcrRes(RID_STR_PROPTITLE_UNKNOWNCONTROL).toString(); break; + sClassName = PcrRes(RID_STR_PROPTITLE_UNKNOWNCONTROL); break; } return sClassName; diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 71fb21a05f43..b3e760c447c5 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -144,7 +144,7 @@ namespace pcr FormComponentPropertyHandler::FormComponentPropertyHandler( const Reference< XComponentContext >& _rxContext ) :FormComponentPropertyHandler_Base( _rxContext ) ,::comphelper::OPropertyContainer(FormComponentPropertyHandler_Base::rBHelper) - ,m_sDefaultValueString( PcrRes(RID_STR_STANDARD).toString() ) + ,m_sDefaultValueString( PcrRes(RID_STR_STANDARD) ) ,m_eComponentClass( eUnknown ) ,m_bComponentIsSubForm( false ) ,m_bHaveListSource( false ) @@ -551,7 +551,7 @@ namespace pcr OUString sControlValue; OSL_VERIFY( _rControlValue >>= sControlValue ); // Don't convert a placeholder - if ( nPropId == PROPERTY_ID_IMAGE_URL && sControlValue.equals( PcrRes(RID_EMBED_IMAGE_PLACEHOLDER).toString() ) ) + if ( nPropId == PROPERTY_ID_IMAGE_URL && sControlValue.equals( PcrRes(RID_EMBED_IMAGE_PLACEHOLDER) ) ) aPropertyValue <<= sControlValue; else { @@ -747,7 +747,7 @@ namespace pcr OUStringBuffer displayName; if ( aFont.Name.isEmpty() ) { - displayName.append( PcrRes(RID_STR_FONT_DEFAULT).toString() ); + displayName.append( PcrRes(RID_STR_FONT_DEFAULT) ); } else { @@ -770,7 +770,7 @@ namespace pcr if ( eWeight > WEIGHT_NORMAL ) nStyleResID = RID_STR_FONTSTYLE_BOLD; } - displayName.append(PcrRes(nStyleResID).toString()); + displayName.append(PcrRes(nStyleResID)); // font size if ( aFont.Height ) @@ -2680,7 +2680,7 @@ namespace pcr SvNumberFormatter* pFormatter = pSupplier->GetNumberFormatter(); double dPreviewVal = OFormatSampleControl::getPreviewValue(pFormatter,nFormatKey); - SvxNumberInfoItem aFormatter( pFormatter, dPreviewVal, PcrRes(RID_STR_TEXT_FORMAT).toString(), SID_ATTR_NUMBERFORMAT_INFO ); + SvxNumberInfoItem aFormatter( pFormatter, dPreviewVal, PcrRes(RID_STR_TEXT_FORMAT), SID_ATTR_NUMBERFORMAT_INFO ); aCoreSet.Put( aFormatter ); // a tab dialog with a single page diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 5a1b0f71bcc7..601e4585b1d8 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -296,7 +296,7 @@ namespace pcr { if ( m_sDetailLabel.isEmpty() ) { - m_sDetailLabel = PcrRes(STR_DETAIL_FORM).toString(); + m_sDetailLabel = PcrRes(STR_DETAIL_FORM); } sDetailType = m_sDetailLabel; } @@ -308,7 +308,7 @@ namespace pcr { if ( m_sMasterLabel.isEmpty() ) { - m_sMasterLabel = PcrRes(STR_MASTER_FORM).toString(); + m_sMasterLabel = PcrRes(STR_MASTER_FORM); } sMasterType = m_sMasterLabel; } @@ -450,7 +450,7 @@ namespace pcr { OUString sErrorMessage; { - sErrorMessage = PcrRes(STR_ERROR_RETRIEVING_COLUMNS).toString(); + sErrorMessage = PcrRes(STR_ERROR_RETRIEVING_COLUMNS); sErrorMessage = sErrorMessage.replaceFirst("#", sCommand); } diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx index bb4edca2a414..d15a8190c824 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.cxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx @@ -36,7 +36,7 @@ namespace pcr { SetBackground(); SetPaintTransparent(true); - m_aSeparator->SetText( PcrRes(RID_STR_HELP_SECTION_LABEL).toString() ); + m_aSeparator->SetText( PcrRes(RID_STR_HELP_SECTION_LABEL) ); m_aSeparator->SetBackground(); m_aSeparator->Show(); diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 296bcfb2f20b..6f150c9d4622 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -1345,7 +1345,7 @@ namespace pcr { try { - OUString sPlcHolder = PcrRes(RID_EMBED_IMAGE_PLACEHOLDER).toString(); + OUString sPlcHolder = PcrRes(RID_EMBED_IMAGE_PLACEHOLDER); bool bIsPlaceHolderValue = false; if ( rName == PROPERTY_IMAGE_URL ) diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index ffec0db1ca00..36edf9b6313e 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -112,7 +112,7 @@ namespace pcr // insert the root Image aRootImage(BitmapEx(RID_EXTBMP_FORMS)); - SvTreeListEntry* pRoot = m_pControlTree->InsertEntry(PcrRes(RID_STR_FORMS).toString(), aRootImage, aRootImage); + SvTreeListEntry* pRoot = m_pControlTree->InsertEntry(PcrRes(RID_STR_FORMS), aRootImage, aRootImage); // build the tree m_pInitialSelection = nullptr; diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index c5c7c1e85ae7..b05f78860d58 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -107,7 +107,7 @@ namespace pcr const bool bIsTextFormat = ( pEntry && pEntry->IsTextFormat() ); if ( bIsTextFormat ) - getTypedControlWindow()->SetText( PcrRes( RID_STR_TEXT_FORMAT ).toString() ); + getTypedControlWindow()->SetText( PcrRes( RID_STR_TEXT_FORMAT ) ); else getTypedControlWindow()->SetValue( pEntry ? getPreviewValue( *pEntry ) : 1234.56789 ); } @@ -265,7 +265,7 @@ namespace pcr :OFileUrlControl_Base( PropertyControlType::Unknown, pParent, WB_TABSTOP | WB_BORDER | WB_DROPDOWN ) { getTypedControlWindow()->SetDropDownLineCount( 10 ); - getTypedControlWindow()->SetPlaceHolder( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ).toString() ) ; + getTypedControlWindow()->SetPlaceHolder( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ) ) ; } diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index 598f6f0bbed5..9b81f7b9dff0 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -523,7 +523,7 @@ namespace pcr } // confirmation message - OUString sConfirmation( PcrRes( RID_STR_CONFIRM_DELETE_DATA_TYPE ).toString() ); + OUString sConfirmation( PcrRes( RID_STR_CONFIRM_DELETE_DATA_TYPE ) ); sConfirmation = sConfirmation.replaceFirst( "#type#", pType->getName() ); ScopedVclPtrInstance<QueryBox> aQuery( nullptr, WB_YES_NO, sConfirmation ); // TODO/eForms: proper parent if ( aQuery->Execute() != RET_YES ) |