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 /cui/source/options | |
parent | ooxmlexport: roundtrip tdf#103975's unit tests (diff) | |
download | core-2155e04d6343638ca9815d394cbc4f78c2b17c3a.tar.gz core-2155e04d6343638ca9815d394cbc4f78c2b17c3a.zip |
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 'cui/source/options')
-rw-r--r-- | cui/source/options/cfgchart.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/connpooloptions.cxx | 10 | ||||
-rw-r--r-- | cui/source/options/dbregister.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/doclinkdialog.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/optcolor.cxx | 8 | ||||
-rw-r--r-- | cui/source/options/optdict.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/optfltr.cxx | 14 | ||||
-rw-r--r-- | cui/source/options/optinet2.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optjava.cxx | 14 | ||||
-rw-r--r-- | cui/source/options/optlingu.cxx | 28 | ||||
-rw-r--r-- | cui/source/options/optopencl.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optpath.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/personalization.cxx | 18 | ||||
-rw-r--r-- | cui/source/options/treeopt.cxx | 26 |
14 files changed, 73 insertions, 73 deletions
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 662ce50234f2..67ec485efaeb 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -129,7 +129,7 @@ OUString SvxChartColorTable::getDefaultName( size_t _nIndex ) if (sDefaultNamePrefix.getLength() == 0) { - OUString aResName( CUI_RES( RID_SVXSTR_DIAGRAM_ROW ) ); + OUString aResName( CuiResId( RID_SVXSTR_DIAGRAM_ROW ) ); sal_Int32 nPos = aResName.indexOf( "$(ROW)" ); if( nPos != -1 ) { @@ -217,7 +217,7 @@ bool SvxChartOptions::RetrieveOptions() Color aCol; // create strings for entry names - OUString aResName( CUI_RES( RID_SVXSTR_DIAGRAM_ROW ) ); + OUString aResName( CuiResId( RID_SVXSTR_DIAGRAM_ROW ) ); OUString aPrefix, aPostfix, aName; sal_Int32 nPos = aResName.indexOf( "$(ROW)" ); if( nPos != -1 ) diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index faaeeccfc3d8..5e8d53471b15 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -91,8 +91,8 @@ namespace offapp :EditBrowseBox(_pParent, EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT, WB_BORDER, BrowserMode::AUTO_VSCROLL | BrowserMode::AUTO_HSCROLL | BrowserMode::HIDECURSOR | BrowserMode::AUTOSIZE_LASTCOL | BrowserMode::KEEPHIGHLIGHT) ,m_aSeekRow(m_aSettings.end()) - ,m_sYes(CUI_RES(RID_SVXSTR_YES)) - ,m_sNo(CUI_RES(RID_SVXSTR_NO)) + ,m_sYes(CuiResId(RID_SVXSTR_YES)) + ,m_sNo(CuiResId(RID_SVXSTR_NO)) { SetStyle((GetStyle() & ~WB_HSCROLL) | WB_AUTOHSCROLL); } @@ -128,11 +128,11 @@ namespace offapp EditBrowseBox::Init(); Size aColWidth = LogicToPixel(Size(160, 0), MapUnit::MapAppFont); - InsertDataColumn(1, OUString(CUI_RES(RID_SVXSTR_DRIVER_NAME)), aColWidth.Width()); + InsertDataColumn(1, OUString(CuiResId(RID_SVXSTR_DRIVER_NAME)), aColWidth.Width()); aColWidth = LogicToPixel(Size(30, 0), MapUnit::MapAppFont); - InsertDataColumn(2, OUString(CUI_RES(RID_SVXSTR_POOLED_FLAG)), aColWidth.Width()); + InsertDataColumn(2, OUString(CuiResId(RID_SVXSTR_POOLED_FLAG)), aColWidth.Width()); aColWidth = LogicToPixel(Size(60, 0), MapUnit::MapAppFont); - InsertDataColumn(3, OUString(CUI_RES(RID_SVXSTR_POOL_TIMEOUT)), aColWidth.Width()); + InsertDataColumn(3, OUString(CuiResId(RID_SVXSTR_POOL_TIMEOUT)), aColWidth.Width()); // Attention: the resource of the string is local to the resource of the enclosing dialog! } diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 082b74ee7b9d..4324762b3433 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -102,8 +102,8 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons SfxTabPage( pParent, "DbRegisterPage", "cui/ui/dbregisterpage.ui", &rSet ), - m_aTypeText ( CUI_RES( RID_SVXSTR_TYPE ) ), - m_aPathText ( CUI_RES( RID_SVXSTR_PATH ) ), + m_aTypeText ( CuiResId( RID_SVXSTR_TYPE ) ), + m_aPathText ( CuiResId( RID_SVXSTR_PATH ) ), m_pPathBox ( nullptr ), m_pCurEntry ( nullptr ), m_nOldCount ( 0 ), @@ -275,7 +275,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl, Button*, void) SvTreeListEntry* pEntry = m_pPathBox->FirstSelected(); if ( pEntry ) { - ScopedVclPtrInstance< MessageDialog > aQuery(this, CUI_RES(RID_SVXSTR_QUERY_DELETE_CONFIRM), VclMessageType::Question, VclButtonsType::YesNo); + ScopedVclPtrInstance< MessageDialog > aQuery(this, CuiResId(RID_SVXSTR_QUERY_DELETE_CONFIRM), VclMessageType::Question, VclButtonsType::YesNo); if ( aQuery->Execute() == RET_YES ) m_pPathBox->GetModel()->Remove(pEntry); } diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 34b961a6e56d..4cd538b28ee7 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -124,7 +124,7 @@ namespace svx if (!bFileExists) { - OUString sMsg = CUI_RES(STR_LINKEDDOC_DOESNOTEXIST); + OUString sMsg = CuiResId(STR_LINKEDDOC_DOESNOTEXIST); sMsg = sMsg.replaceFirst("$file$", m_pURL->GetText()); ScopedVclPtrInstance< MessageDialog > aError(this, sMsg); aError->Execute(); @@ -133,7 +133,7 @@ namespace svx INetURLObject aURL( sURL ); if ( aURL.GetProtocol() != INetProtocol::File ) { - OUString sMsg = CUI_RES(STR_LINKEDDOC_NO_SYSTEM_FILE); + OUString sMsg = CuiResId(STR_LINKEDDOC_NO_SYSTEM_FILE); sMsg = sMsg.replaceFirst("$file$", m_pURL->GetText()); ScopedVclPtrInstance< MessageDialog > aError(this, sMsg); aError->Execute(); @@ -145,7 +145,7 @@ namespace svx { if ( !m_aNameValidator.Call( sCurrentText ) ) { - OUString sMsg = CUI_RES(STR_NAME_CONFLICT); + OUString sMsg = CuiResId(STR_NAME_CONFLICT); sMsg = sMsg.replaceFirst("$file$", sCurrentText); ScopedVclPtrInstance< MessageDialog > aError(this, sMsg, VclMessageType::Info); aError->Execute(); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index ec9a663100a5..27203a99ac7d 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1151,10 +1151,10 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialog creation failed!"); ScopedVclPtr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog( pButton, - sName, CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2) )); + sName, CuiResId(RID_SVXSTR_COLOR_CONFIG_SAVE2) )); DBG_ASSERT(aNameDlg, "Dialog creation failed!"); aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl)); - aNameDlg->SetText(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE1)); + aNameDlg->SetText(CuiResId(RID_SVXSTR_COLOR_CONFIG_SAVE1)); aNameDlg->SetHelpId(HID_OPTIONS_COLORCONFIG_SAVE_SCHEME); aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl)); if(RET_OK == aNameDlg->Execute()) @@ -1170,8 +1170,8 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void ) else { DBG_ASSERT(m_pColorSchemeLB->GetEntryCount() > 1, "don't delete the last scheme"); - ScopedVclPtrInstance< MessageDialog > aQuery(pButton, CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE), VclMessageType::Question, VclButtonsType::YesNo); - aQuery->SetText(CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE)); + ScopedVclPtrInstance< MessageDialog > aQuery(pButton, CuiResId(RID_SVXSTR_COLOR_CONFIG_DELETE), VclMessageType::Question, VclButtonsType::YesNo); + aQuery->SetText(CuiResId(RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE)); if(RET_YES == aQuery->Execute()) { OUString sDeleteScheme(m_pColorSchemeLB->GetSelectEntry()); diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index b09975f0a9b9..437c2cb7f97e 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -153,7 +153,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void) if ( bFound ) { // duplicate names? - ScopedVclPtrInstance<MessageDialog>(this, CUI_RES(RID_SVXSTR_OPT_DOUBLE_DICTS), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, CuiResId(RID_SVXSTR_OPT_DOUBLE_DICTS), VclMessageType::Info)->Execute(); pNameEdit->GrabFocus(); return; } @@ -217,7 +217,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( ModalDialog( pParent, "EditDictionaryDialog" ,"cui/ui/editdictionarydialog.ui" ), - sModify (CUI_RES(STR_MODIFY)), + sModify (CuiResId(STR_MODIFY)), nOld ( NOACTDICT ), bFirstSelect (true), bDoNothing (false), @@ -452,7 +452,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, void) if ( nLang != nOldLang ) { - ScopedVclPtrInstance< MessageDialog > aBox(this, CUI_RES( RID_SVXSTR_CONFIRM_SET_LANGUAGE), VclMessageType::Question, VclButtonsType::YesNo); + ScopedVclPtrInstance< MessageDialog > aBox(this, CuiResId( RID_SVXSTR_CONFIRM_SET_LANGUAGE), VclMessageType::Question, VclButtonsType::YesNo); OUString sTxt(aBox->get_primary_text()); sTxt = sTxt.replaceFirst( "%1", pAllDictsLB->GetSelectEntry() ); aBox->set_primary_text(sTxt); diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 7f997c735fd1..8723c18e77be 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -143,13 +143,13 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet* ) OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "OptFilterPage", "cui/ui/optfltrembedpage.ui", &rSet ), - sHeader1(CUI_RES(RID_SVXSTR_HEADER1)), - sHeader2(CUI_RES(RID_SVXSTR_HEADER2)), - sChgToFromMath(CUI_RES(RID_SVXSTR_CHG_MATH)), - sChgToFromWriter(CUI_RES(RID_SVXSTR_CHG_WRITER)), - sChgToFromCalc(CUI_RES(RID_SVXSTR_CHG_CALC)), - sChgToFromImpress(CUI_RES(RID_SVXSTR_CHG_IMPRESS)), - sChgToFromSmartArt(CUI_RES(RID_SVXSTR_CHG_SMARTART)), + sHeader1(CuiResId(RID_SVXSTR_HEADER1)), + sHeader2(CuiResId(RID_SVXSTR_HEADER2)), + sChgToFromMath(CuiResId(RID_SVXSTR_CHG_MATH)), + sChgToFromWriter(CuiResId(RID_SVXSTR_CHG_WRITER)), + sChgToFromCalc(CuiResId(RID_SVXSTR_CHG_CALC)), + sChgToFromImpress(CuiResId(RID_SVXSTR_CHG_IMPRESS)), + sChgToFromSmartArt(CuiResId(RID_SVXSTR_CHG_SMARTART)), pCheckButtonData(nullptr) { get(m_pCheckLBContainer, "checklbcontainer"); diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 379067fda6f0..cea8b66cdbe3 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -132,7 +132,7 @@ void SvxNoSpaceEdit::Modify() if ( !comphelper::string::isdigitAsciiString(aValue) || (long)aValue.toInt32() > USHRT_MAX ) // the maximum value of a port number is USHRT_MAX - ScopedVclPtrInstance<MessageDialog>(this, CUI_RES( RID_SVXSTR_OPT_PROXYPORTS))->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, CuiResId( RID_SVXSTR_OPT_PROXYPORTS))->Execute(); } } diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 1213b3d10a69..292558a6365d 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -545,12 +545,12 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) } else if ( JFW_E_NOT_RECOGNIZED == eErr ) { - ScopedVclPtrInstance< MessageDialog > aErrBox( this, CUI_RES( RID_SVXSTR_JRE_NOT_RECOGNIZED ) ); + ScopedVclPtrInstance< MessageDialog > aErrBox( this, CuiResId( RID_SVXSTR_JRE_NOT_RECOGNIZED ) ); aErrBox->Execute(); } else if ( JFW_E_FAILED_VERSION == eErr ) { - ScopedVclPtrInstance< MessageDialog > aErrBox( this, CUI_RES( RID_SVXSTR_JRE_FAILED_VERSION ) ); + ScopedVclPtrInstance< MessageDialog > aErrBox( this, CuiResId( RID_SVXSTR_JRE_FAILED_VERSION ) ); aErrBox->Execute(); } @@ -810,7 +810,7 @@ void SvxJavaParameterDlg::EditParameter() if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { - ScopedVclPtrInstance< InputDialog > pParamEditDlg(CUI_RES(RID_SVXSTR_JAVA_START_PARAM), this); + ScopedVclPtrInstance< InputDialog > pParamEditDlg(CuiResId(RID_SVXSTR_JAVA_START_PARAM), this); OUString editableClassPath = m_pAssignedList->GetSelectEntry(); pParamEditDlg->SetEntryText( editableClassPath ); pParamEditDlg->HideHelpBtn(); @@ -911,8 +911,8 @@ void SvxJavaClassPathDlg::dispose() IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void) { sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE ); - aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) ); - aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), "*.jar;*.zip" ); + aDlg.SetTitle( CuiResId( RID_SVXSTR_ARCHIVE_TITLE ) ); + aDlg.AddFilter( CuiResId( RID_SVXSTR_ARCHIVE_HEADLINE ), "*.jar;*.zip" ); OUString sFolder; if ( m_pPathList->GetSelectEntryCount() > 0 ) { @@ -934,7 +934,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void) } else { - OUString sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) ); + OUString sMsg( CuiResId( RID_SVXSTR_MULTIFILE_DBL_ERR ) ); sMsg = sMsg.replaceFirst( "%1", sFile ); ScopedVclPtrInstance<MessageDialog>(this, sMsg)->Execute(); } @@ -969,7 +969,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void) } else { - OUString sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) ); + OUString sMsg( CuiResId( RID_SVXSTR_MULTIFILE_DBL_ERR ) ); sMsg = sMsg.replaceFirst( "%1", sNewFolder ); ScopedVclPtrInstance<MessageDialog>(this, sMsg)->Execute(); } diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 37edc4c67692..33816f716d46 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -986,16 +986,16 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, bool bEnable SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptLinguPage", "cui/ui/optlingupage.ui", &rSet), - sCapitalWords (CUI_RES(RID_SVXSTR_CAPITAL_WORDS)), - sWordsWithDigits(CUI_RES(RID_SVXSTR_WORDS_WITH_DIGITS)), - sSpellSpecial (CUI_RES(RID_SVXSTR_SPELL_SPECIAL)), - sSpellAuto (CUI_RES(RID_SVXSTR_SPELL_AUTO)), - sGrammarAuto (CUI_RES(RID_SVXSTR_GRAMMAR_AUTO)), - sNumMinWordlen (CUI_RES(RID_SVXSTR_NUM_MIN_WORDLEN)), - sNumPreBreak (CUI_RES(RID_SVXSTR_NUM_PRE_BREAK)), - sNumPostBreak (CUI_RES(RID_SVXSTR_NUM_POST_BREAK)), - sHyphAuto (CUI_RES(RID_SVXSTR_HYPH_AUTO)), - sHyphSpecial (CUI_RES(RID_SVXSTR_HYPH_SPECIAL)), + sCapitalWords (CuiResId(RID_SVXSTR_CAPITAL_WORDS)), + sWordsWithDigits(CuiResId(RID_SVXSTR_WORDS_WITH_DIGITS)), + sSpellSpecial (CuiResId(RID_SVXSTR_SPELL_SPECIAL)), + sSpellAuto (CuiResId(RID_SVXSTR_SPELL_AUTO)), + sGrammarAuto (CuiResId(RID_SVXSTR_GRAMMAR_AUTO)), + sNumMinWordlen (CuiResId(RID_SVXSTR_NUM_MIN_WORDLEN)), + sNumPreBreak (CuiResId(RID_SVXSTR_NUM_PRE_BREAK)), + sNumPostBreak (CuiResId(RID_SVXSTR_NUM_POST_BREAK)), + sHyphAuto (CuiResId(RID_SVXSTR_HYPH_AUTO)), + sHyphSpecial (CuiResId(RID_SVXSTR_HYPH_SPECIAL)), pLinguData(nullptr) { @@ -1751,10 +1751,10 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) SvxEditModulesDlg::SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rData) : ModalDialog( pParent, "EditModulesDialog", "cui/ui/editmodulesdialog.ui") - , sSpell(CUI_RES(RID_SVXSTR_SPELL)) - , sHyph(CUI_RES(RID_SVXSTR_HYPH)) - , sThes(CUI_RES(RID_SVXSTR_THES)) - , sGrammar(CUI_RES(RID_SVXSTR_GRAMMAR)) + , sSpell(CuiResId(RID_SVXSTR_SPELL)) + , sHyph(CuiResId(RID_SVXSTR_HYPH)) + , sThes(CuiResId(RID_SVXSTR_THES)) + , sGrammar(CuiResId(RID_SVXSTR_GRAMMAR)) , rLinguData(rData) { get(m_pClosePB, "close"); diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index ecdce1d3971c..4706951f129a 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -102,7 +102,7 @@ bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* ) if (bModified) { - ScopedVclPtrInstance<MessageDialog> aWarnBox(this, CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VclMessageType::Info); + ScopedVclPtrInstance<MessageDialog> aWarnBox(this, CuiResId(RID_SVXSTR_OPTIONS_RESTART), VclMessageType::Info); aWarnBox->Execute(); batch->commit(); } diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index af910b355f37..ab292153757f 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -312,7 +312,7 @@ void SvxPathTabPage::Reset( const SfxItemSet* ) if (i == SvtPathOptions::PATH_CLASSIFICATION) // RID_SVXSTR_KEY_USERDICTIONARY_DIR already took our slot, so name the key explicitly. nId = RID_SVXSTR_KEY_CLASSIFICATION_PATH; - OUString aStr(CUI_RES(nId)); + OUString aStr(CuiResId(nId)); nWidth1 = std::max(nWidth1, pPathBox->GetTextWidth(aStr)); aStr += "\t"; diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index b07433d5985c..fa4d7f452072 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -58,7 +58,7 @@ SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent ) get( m_vSearchSuggestions[4], "suggestion5" ); get( m_vSearchSuggestions[5], "suggestion6" ); - ResStringArray aCategoriesArr(CUI_RES(RID_SVXSTR_PERSONA_CATEGORIES)); + ResStringArray aCategoriesArr(ResId(RID_SVXSTR_PERSONA_CATEGORIES, CUI_MGR())); assert(aCategoriesArr.Count() >= CATEGORYCOUNT); for(sal_uInt32 i = 0; i < CATEGORYCOUNT; ++i) { @@ -209,7 +209,7 @@ IMPL_LINK( SelectPersonaDialog, SelectPersona, Button*, pButton, void ) // get the persona name from the setting variable to show in the progress. sal_Int32 nNameIndex = m_aSelectedPersona.indexOf( ';' ); OUString aName = m_aSelectedPersona.copy( 0, nNameIndex ); - OUString aProgress = OUString(CUI_RES(RID_SVXSTR_SELECTEDPERSONA)) + aName; + OUString aProgress = OUString(CuiResId(RID_SVXSTR_SELECTEDPERSONA)) + aName; SetProgress( aProgress ); } break; @@ -676,7 +676,7 @@ void SearchAndParseThread::execute() if( m_aURL.startsWith( "https://" ) ) { m_pPersonaDialog->ClearSearchResults(); - OUString sProgress( CUI_RES( RID_SVXSTR_SEARCHING ) ), sError; + OUString sProgress( CuiResId( RID_SVXSTR_SEARCHING ) ), sError; m_pPersonaDialog->SetProgress( sProgress ); PersonasDocHandler* pHandler = new PersonasDocHandler(); @@ -703,7 +703,7 @@ void SearchAndParseThread::execute() { // in case of a returned CommandFailedException // SimpleFileAccess serves it, returning an empty stream - sError = CUI_RES(RID_SVXSTR_SEARCHERROR); + sError = CuiResId(RID_SVXSTR_SEARCHERROR); sError = sError.replaceAll("%1", m_aURL); m_pPersonaDialog->SetProgress( OUString() ); ScopedVclPtrInstance< ErrorBox > aBox( nullptr, WB_OK, sError); @@ -715,7 +715,7 @@ void SearchAndParseThread::execute() { // a catch all clause, in case the exception is not // served elsewhere - sError = CUI_RES(RID_SVXSTR_SEARCHERROR); + sError = CuiResId(RID_SVXSTR_SEARCHERROR); sError = sError.replaceAll("%1", m_aURL); m_pPersonaDialog->SetProgress( OUString() ); ScopedVclPtrInstance< ErrorBox > aBox( nullptr, WB_OK, sError ); @@ -729,7 +729,7 @@ void SearchAndParseThread::execute() if( !pHandler->hasResults() ) { - sProgress = CUI_RES( RID_SVXSTR_NORESULTS ); + sProgress = CuiResId( RID_SVXSTR_NORESULTS ); m_pPersonaDialog->SetProgress( sProgress ); return; } @@ -755,7 +755,7 @@ void SearchAndParseThread::execute() { if( m_bDirectURL ) { - sError = CUI_RES(RID_SVXSTR_SEARCHERROR); + sError = CuiResId(RID_SVXSTR_SEARCHERROR); sError = sError.replaceAll("%1", m_aURL); m_pPersonaDialog->SetProgress( OUString() ); ScopedVclPtrInstance< ErrorBox > aBox( nullptr, WB_OK, sError); @@ -789,7 +789,7 @@ void SearchAndParseThread::execute() else { - OUString sProgress( CUI_RES( RID_SVXSTR_APPLYPERSONA ) ), sError; + OUString sProgress( CuiResId( RID_SVXSTR_APPLYPERSONA ) ), sError; m_pPersonaDialog->SetProgress( sProgress ); uno::Reference< ucb::XSimpleFileAccess3 > xFileAccess( ucb::SimpleFileAccess::create( comphelper::getProcessComponentContext() ), uno::UNO_QUERY ); @@ -838,7 +838,7 @@ void SearchAndParseThread::execute() } catch ( const uno::Exception & ) { - sError = CUI_RES( RID_SVXSTR_SEARCHERROR ); + sError = CuiResId( RID_SVXSTR_SEARCHERROR ); sError = sError.replaceAll("%1", m_aURL); m_pPersonaDialog->SetProgress( OUString() ); ScopedVclPtrInstance< ErrorBox > aBox( nullptr, WB_OK, sError); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 583e930916fa..e0b799b73da8 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -484,7 +484,7 @@ struct OptionsGroupInfo #define INI_LIST() \ pCurrentPageEntry ( nullptr ),\ sTitle ( GetText() ),\ - sNotLoadedError ( CUI_RES( RID_SVXSTR_LOAD_ERROR ) ),\ + sNotLoadedError ( CuiResId( RID_SVXSTR_LOAD_ERROR ) ),\ bForgetSelection ( false ),\ bIsFromExtensionManager( false ), \ bIsForSetDocumentLanguage( false ) @@ -1102,18 +1102,18 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() } OfaPageResource::OfaPageResource() : - aGeneralDlgAry(CUI_RES(SID_GENERAL_OPTIONS)), - aInetDlgAry(CUI_RES(SID_INET_DLG)), - aLangDlgAry(CUI_RES(SID_LANGUAGE_OPTIONS)), - aTextDlgAry(CUI_RES(SID_SW_EDITOPTIONS)), - aHTMLDlgAry(CUI_RES(SID_SW_ONLINEOPTIONS)), - aCalcDlgAry(CUI_RES(SID_SC_EDITOPTIONS)), - aStarMathDlgAry(CUI_RES(SID_SM_EDITOPTIONS)), - aImpressDlgAry(CUI_RES(SID_SD_EDITOPTIONS)), - aDrawDlgAry(CUI_RES(SID_SD_GRAPHIC_OPTIONS)), - aChartDlgAry(CUI_RES(SID_SCH_EDITOPTIONS)), - aFilterDlgAry(CUI_RES(SID_FILTER_DLG)), - aDatasourcesDlgAry(CUI_RES(SID_SB_STARBASEOPTIONS)) + aGeneralDlgAry(ResId(SID_GENERAL_OPTIONS, CUI_MGR())), + aInetDlgAry(ResId(SID_INET_DLG, CUI_MGR())), + aLangDlgAry(ResId(SID_LANGUAGE_OPTIONS, CUI_MGR())), + aTextDlgAry(ResId(SID_SW_EDITOPTIONS, CUI_MGR())), + aHTMLDlgAry(ResId(SID_SW_ONLINEOPTIONS, CUI_MGR())), + aCalcDlgAry(ResId(SID_SC_EDITOPTIONS, CUI_MGR())), + aStarMathDlgAry(ResId(SID_SM_EDITOPTIONS, CUI_MGR())), + aImpressDlgAry(ResId(SID_SD_EDITOPTIONS, CUI_MGR())), + aDrawDlgAry(ResId(SID_SD_GRAPHIC_OPTIONS, CUI_MGR())), + aChartDlgAry(ResId(SID_SCH_EDITOPTIONS, CUI_MGR())), + aFilterDlgAry(ResId(SID_FILTER_DLG, CUI_MGR())), + aDatasourcesDlgAry(ResId(SID_SB_STARBASEOPTIONS, CUI_MGR())) { } |