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 | |
| 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 'cui')
55 files changed, 275 insertions, 272 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index f5d90803fc58..0ee24f8631b1 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -725,9 +725,9 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const , m_pStringItem() , m_pFontItem() , m_pFileDlg(nullptr) - , aLoadAccelConfigStr(CUI_RES(RID_SVXSTR_LOADACCELCONFIG)) - , aSaveAccelConfigStr(CUI_RES(RID_SVXSTR_SAVEACCELCONFIG)) - , aFilterCfgStr(CUI_RES(RID_SVXSTR_FILTERNAME_CFG)) + , aLoadAccelConfigStr(CuiResId(RID_SVXSTR_LOADACCELCONFIG)) + , aSaveAccelConfigStr(CuiResId(RID_SVXSTR_SAVEACCELCONFIG)) + , aFilterCfgStr(CuiResId(RID_SVXSTR_FILTERNAME_CFG)) , m_bStylesInfoInitialized(false) , m_xGlobal() , m_xModule() diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index d01b948205b3..c28e5f4528fb 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2283,7 +2283,7 @@ IMPL_LINK_NOARG( SvxConfigPage, AsyncInfoMsg, void*, void ) { // Asynchronous msg because of D&D ScopedVclPtrInstance<MessageDialog>(this, - CUI_RES( RID_SVXSTR_MNUCFG_ALREADY_INCLUDED ), + CuiResId( RID_SVXSTR_MNUCFG_ALREADY_INCLUDED ), VclMessageType::Info)->Execute(); } @@ -2421,7 +2421,7 @@ SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, const SfxItemSet& rSe if ( !bIsMenuBar ) { - m_pTopLevel->set_label( CUI_RES( RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS ) ); + m_pTopLevel->set_label( CuiResId( RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS ) ); m_pNewTopLevelButton->Hide(); pMenu->HideItem( pMenu->GetItemId( "move" ) ); pMenu->HideItem( pMenu->GetItemId( "menuitem3" ) ); @@ -2561,7 +2561,7 @@ void SvxMenuConfigPage::DeleteSelectedContent() short SvxMenuConfigPage::QueryReset() { - OUString msg = CUI_RES( RID_SVXSTR_CONFIRM_MENU_RESET ); + OUString msg = CuiResId( RID_SVXSTR_CONFIRM_MENU_RESET ); OUString saveInName = m_pSaveInListBox->GetEntry( m_pSaveInListBox->GetSelectEntryPos() ); @@ -2617,11 +2617,11 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton, void ) SvxConfigEntry* pMenuData = GetTopLevelSelection(); OUString aNewName( stripHotKey( pMenuData->GetName() ) ); - OUString aDesc = CUI_RES( RID_SVXSTR_LABEL_NEW_NAME ); + OUString aDesc = CuiResId( RID_SVXSTR_LABEL_NEW_NAME ); VclPtrInstance< SvxNameDialog > pNameDialog( this, aNewName, aDesc ); pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU ); - pNameDialog->SetText( CUI_RES( RID_SVXSTR_RENAME_MENU ) ); + pNameDialog->SetText( CuiResId( RID_SVXSTR_RENAME_MENU ) ); if ( pNameDialog->Execute() == RET_OK ) { pNameDialog->GetName( aNewName ); @@ -2661,11 +2661,11 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton, void ) static_cast<SvxConfigEntry*>(pActEntry->GetUserData()); OUString aNewName( stripHotKey( pEntry->GetName() ) ); - OUString aDesc = CUI_RES( RID_SVXSTR_LABEL_NEW_NAME ); + OUString aDesc = CuiResId( RID_SVXSTR_LABEL_NEW_NAME ); VclPtrInstance< SvxNameDialog > pNameDialog( this, aNewName, aDesc ); pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU_ITEM ); - pNameDialog->SetText( CUI_RES( RID_SVXSTR_RENAME_MENU ) ); + pNameDialog->SetText( CuiResId( RID_SVXSTR_RENAME_MENU ) ); if ( pNameDialog->Execute() == RET_OK ) { pNameDialog->GetName(aNewName); @@ -2716,7 +2716,7 @@ IMPL_LINK_NOARG( SvxMenuConfigPage, AddCommandsHdl, Button *, void ) m_pSelectorDlg->SetAddHdl( LINK( this, SvxMenuConfigPage, AddFunctionHdl ) ); - m_pSelectorDlg->SetDialogDescription( CUI_RES( RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION ) ); + m_pSelectorDlg->SetDialogDescription( CuiResId( RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION ) ); } // Position the Script Selector over the Add button so it is @@ -2743,11 +2743,11 @@ IMPL_LINK_NOARG( SvxMenuConfigPage, AddSeparatorHdl, Button *, void ) IMPL_LINK_NOARG( SvxMenuConfigPage, AddSubmenuHdl, Button *, void ) { OUString aNewName; - OUString aDesc = CUI_RES( RID_SVXSTR_SUBMENU_NAME ); + OUString aDesc = CuiResId( RID_SVXSTR_SUBMENU_NAME ); VclPtrInstance< SvxNameDialog > pNameDialog( this, aNewName, aDesc ); pNameDialog->SetHelpId( HID_SVX_CONFIG_NAME_SUBMENU ); - pNameDialog->SetText( CUI_RES( RID_SVXSTR_ADD_SUBMENU ) ); + pNameDialog->SetText( CuiResId( RID_SVXSTR_ADD_SUBMENU ) ); if ( pNameDialog->Execute() == RET_OK ) { @@ -2828,7 +2828,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( if ( bCreateMenu ) { // Generate custom name for new menu - OUString prefix = CUI_RES( RID_SVXSTR_NEW_MENU ); + OUString prefix = CuiResId( RID_SVXSTR_NEW_MENU ); OUString newname = generateCustomName( prefix, entries ); OUString newurl = generateCustomMenuURL( mpEntries ); @@ -2859,7 +2859,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( // hide name label and textfield m_pMenuBox->Hide(); // change the title - SetText( CUI_RES( RID_SVXSTR_MOVE_MENU ) ); + SetText( CuiResId( RID_SVXSTR_MOVE_MENU ) ); } m_pMenuListBox->SetSelectHdl( @@ -3072,12 +3072,12 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(vcl::Window *pParent, const SfxItemSe m_pMoveDownButton->SetHelpId( HID_SVX_DOWN_TOOLBAR_ITEM ); m_pDescriptionField->SetHelpId ( HID_SVX_DESCFIELD ); - m_pTopLevel->set_label(CUI_RES(RID_SVXSTR_PRODUCTNAME_TOOLBARS)); + m_pTopLevel->set_label(CuiResId(RID_SVXSTR_PRODUCTNAME_TOOLBARS)); - m_pTopLevelLabel->SetText( CUI_RES( RID_SVXSTR_TOOLBAR ) ); - m_pModifyTopLevelButton->SetText( CUI_RES( RID_SVXSTR_TOOLBAR ) ); - m_pContents->set_label(CUI_RES(RID_SVXSTR_TOOLBAR_CONTENT)); - m_pContentsLabel->SetText( CUI_RES( RID_SVXSTR_COMMANDS ) ); + m_pTopLevelLabel->SetText( CuiResId( RID_SVXSTR_TOOLBAR ) ); + m_pModifyTopLevelButton->SetText( CuiResId( RID_SVXSTR_TOOLBAR ) ); + m_pContents->set_label(CuiResId(RID_SVXSTR_TOOLBAR_CONTENT)); + m_pContentsLabel->SetText( CuiResId( RID_SVXSTR_COMMANDS ) ); // The reset button will be used in the toolbar config tab m_pResetTopLevelButton->Show(); @@ -3239,7 +3239,7 @@ void SvxToolbarConfigPage::DeleteSelectedContent() GetTopLevelSelection()->IsDeletable() ) { ScopedVclPtrInstance<MessageDialog> qbox(this, - CUI_RES(RID_SXVSTR_CONFIRM_DELETE_TOOLBAR), VclMessageType::Question, VclButtonsType::YesNo); + CuiResId(RID_SXVSTR_CONFIRM_DELETE_TOOLBAR), VclMessageType::Question, VclButtonsType::YesNo); if ( qbox->Execute() == RET_YES ) { @@ -3288,11 +3288,11 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton, void ) else if (sCommand == "modtoolrename") { OUString aNewName( stripHotKey( pToolbar->GetName() ) ); - OUString aDesc = CUI_RES( RID_SVXSTR_LABEL_NEW_NAME ); + OUString aDesc = CuiResId( RID_SVXSTR_LABEL_NEW_NAME ); VclPtrInstance< SvxNameDialog > pNameDialog( this, aNewName, aDesc ); pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR ); - pNameDialog->SetText( CUI_RES( RID_SVXSTR_RENAME_TOOLBAR ) ); + pNameDialog->SetText( CuiResId( RID_SVXSTR_RENAME_TOOLBAR ) ); if ( pNameDialog->Execute() == RET_OK ) { @@ -3327,11 +3327,11 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, void ) static_cast<SvxConfigEntry*>(pActEntry->GetUserData()); OUString aNewName( stripHotKey( pEntry->GetName() ) ); - OUString aDesc = CUI_RES( RID_SVXSTR_LABEL_NEW_NAME ); + OUString aDesc = CuiResId( RID_SVXSTR_LABEL_NEW_NAME ); VclPtrInstance< SvxNameDialog > pNameDialog( this, aNewName, aDesc ); pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM ); - pNameDialog->SetText( CUI_RES( RID_SVXSTR_RENAME_TOOLBAR ) ); + pNameDialog->SetText( CuiResId( RID_SVXSTR_RENAME_TOOLBAR ) ); if ( pNameDialog->Execute() == RET_OK ) { pNameDialog->GetName(aNewName); @@ -4413,7 +4413,7 @@ void SvxToolbarConfigPage::UpdateButtonStates() short SvxToolbarConfigPage::QueryReset() { - OUString msg = CUI_RES( RID_SVXSTR_CONFIRM_TOOLBAR_RESET ); + OUString msg = CuiResId( RID_SVXSTR_CONFIRM_TOOLBAR_RESET ); OUString saveInName = m_pSaveInListBox->GetEntry( m_pSaveInListBox->GetSelectEntryPos() ); @@ -4539,7 +4539,7 @@ IMPL_LINK( SvxToolbarConfigPage, StyleChangeHdl, Button*, pButton, void ) IMPL_LINK_NOARG( SvxToolbarConfigPage, NewToolbarHdl, Button *, void ) { - OUString prefix = CUI_RES( RID_SVXSTR_NEW_TOOLBAR ); + OUString prefix = CuiResId( RID_SVXSTR_NEW_TOOLBAR ); OUString aNewName = generateCustomName( prefix, GetSaveInData()->GetEntries() ); @@ -4646,7 +4646,7 @@ IMPL_LINK_NOARG( SvxToolbarConfigPage, ResetTopLevelHdl, Button *, void ) static_cast<SvxConfigEntry*>(m_pTopLevelListBox->GetEntryData( nSelectionPos )); ScopedVclPtrInstance<MessageDialog> qbox(this, - CUI_RES(RID_SVXSTR_CONFIRM_RESTORE_DEFAULT), VclMessageType::Question, VclButtonsType::YesNo); + CuiResId(RID_SVXSTR_CONFIRM_RESTORE_DEFAULT), VclMessageType::Question, VclButtonsType::YesNo); if ( qbox->Execute() == RET_YES ) { @@ -5204,7 +5204,7 @@ IMPL_LINK_NOARG( SvxIconSelectorDialog, ImportHdl, Button *, void) IMPL_LINK_NOARG( SvxIconSelectorDialog, DeleteHdl, Button *, void ) { - OUString message = CUI_RES( RID_SVXSTR_DELETE_ICON_CONFIRM ); + OUString message = CuiResId( RID_SVXSTR_DELETE_ICON_CONFIRM ); if (ScopedVclPtrInstance<WarningBox>(this, WinBits(WB_OK_CANCEL), message)->Execute() == RET_OK) { ToolBox::ImplToolItems::size_type nCount = pTbSymbol->GetItemCount(); @@ -5492,21 +5492,21 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) SvxIconReplacementDialog::SvxIconReplacementDialog( vcl::Window *pWindow, const OUString& aMessage, bool /*bYestoAll*/ ) : -MessBox( pWindow, WB_DEF_YES, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) +MessBox( pWindow, WB_DEF_YES, CuiResId( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CuiResId( RID_SVXSTR_REPLACE_ICON_WARNING ) ) { SetImage( WarningBox::GetStandardImage() ); SetMessText( ReplaceIconName( aMessage ) ); RemoveButton( 1 ); AddButton( StandardButtonType::Yes, 2); - AddButton( CUI_RES( RID_SVXSTR_YESTOALL ), 5); + AddButton( CuiResId( RID_SVXSTR_YESTOALL ), 5); AddButton( StandardButtonType::No, 3); AddButton( StandardButtonType::Cancel, 4); } SvxIconReplacementDialog::SvxIconReplacementDialog( vcl::Window *pWindow, const OUString& aMessage ) - : MessBox( pWindow, WB_YES_NO_CANCEL, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) + : MessBox( pWindow, WB_YES_NO_CANCEL, CuiResId( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CuiResId( RID_SVXSTR_REPLACE_ICON_WARNING ) ) { SetImage( WarningBox::GetStandardImage() ); SetMessText( ReplaceIconName( aMessage )); @@ -5515,7 +5515,7 @@ SvxIconReplacementDialog::SvxIconReplacementDialog( OUString SvxIconReplacementDialog::ReplaceIconName( const OUString& rMessage ) { OUString name; - OUString message = CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ); + OUString message = CuiResId( RID_SVXSTR_REPLACE_ICON_WARNING ); OUString placeholder("%ICONNAME" ); sal_Int32 pos = message.indexOf( placeholder ); if ( pos != -1 ) diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 1d43a3182fac..93e86d1bb437 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -388,11 +388,11 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() : m_libImage(BitmapEx(RID_CUIBMP_LIB)), m_macImage(BitmapEx(RID_CUIBMP_MACRO)), m_docImage(BitmapEx(RID_CUIBMP_DOC)), - m_sMyMacros(CUI_RES(RID_SVXSTR_MYMACROS)), - m_sProdMacros(CUI_RES(RID_SVXSTR_PRODMACROS)), - m_sMacros(CUI_RES(RID_SVXSTR_BASICMACROS)), - m_sDlgMacros(CUI_RES(RID_SVXSTR_PRODMACROS)), - m_aStrGroupStyles(CUI_RES(RID_SVXSTR_GROUP_STYLES)), + m_sMyMacros(CuiResId(RID_SVXSTR_MYMACROS)), + m_sProdMacros(CuiResId(RID_SVXSTR_PRODMACROS)), + m_sMacros(CuiResId(RID_SVXSTR_BASICMACROS)), + m_sDlgMacros(CuiResId(RID_SVXSTR_PRODMACROS)), + m_aStrGroupStyles(CuiResId(RID_SVXSTR_GROUP_STYLES)), m_collapsedImage(BitmapEx(RID_CUIBMP_COLLAPSED)), m_expandedImage(BitmapEx(RID_CUIBMP_EXPANDED)) { @@ -461,7 +461,7 @@ void SfxConfigGroupListBox::InitModule() if ( c1 ) { // Add All Commands category - SvTreeListEntry* pEntry = InsertEntry( CUI_RES(RID_SVXSTR_ALLFUNCTIONS) ); + SvTreeListEntry* pEntry = InsertEntry( CuiResId(RID_SVXSTR_ALLFUNCTIONS) ); aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_ALLFUNCTIONS, 0 ) ); pEntry->SetUserData(aArr.back().get()); } @@ -1176,7 +1176,7 @@ SvxScriptSelectorDialog::SvxScriptSelectorDialog( if (m_bShowSlots) { // If we are showing Slot API commands update labels in the UI - SetText(CUI_RES(RID_SVXSTR_SELECTOR_ADD_COMMANDS)); + SetText(CuiResId(RID_SVXSTR_SELECTOR_ADD_COMMANDS)); get(m_pCancelButton, "close"); get(m_pDialogDescription, "helptoolbar"); get(m_pOKButton, "add"); @@ -1306,7 +1306,7 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton, void ) void SvxScriptSelectorDialog::SetRunLabel() { - m_pOKButton->SetText(CUI_RES(RID_SVXSTR_SELECTOR_RUN)); + m_pOKButton->SetText(CuiResId(RID_SVXSTR_SELECTOR_RUN)); } void diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 343fd5dabb10..1175bd9ec45e 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -530,7 +530,7 @@ void SvxMacroTabPage_::DisplayAppEvents( bool appEvents) } OUString eventURL = h_it->second.second; - OUString displayName(CUI_RES(displayableEvent->nEventResourceID)); + OUString displayName(CuiResId(displayableEvent->nEventResourceID)); displayName += "\t"; diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 01db8f5688e8..e88feb3fafcf 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -247,7 +247,7 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni RID_STR_SEARCH_WHOLE }; for (unsigned short nResId : nResIds) - m_plbPosition->InsertEntry( OUString( CUI_RES( nResId ) ) ); + m_plbPosition->InsertEntry( OUString( CuiResId( nResId ) ) ); m_plbPosition->SelectEntryPos(MATCHING_ANYWHERE); // the field listbox @@ -438,7 +438,7 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox&, rBox, void) // direction -> pass on and reset the checkbox-text for StartOver else if (&rBox == m_pcbBackwards) { - m_pcbStartOver->SetText( OUString( CUI_RES( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) ) ); + m_pcbStartOver->SetText( OUString( CuiResId( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) ) ); m_pSearchEngine->SetDirection(!bChecked); } // similarity-search or regular expression @@ -702,7 +702,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress, case FmSearchProgress::State::Progress: if (pProgress->bOverflow) { - OUString sHint( CUI_RES( m_pcbBackwards->IsChecked() ? RID_STR_OVERFLOW_BACKWARD : RID_STR_OVERFLOW_FORWARD ) ); + OUString sHint( CuiResId( m_pcbBackwards->IsChecked() ? RID_STR_OVERFLOW_BACKWARD : RID_STR_OVERFLOW_FORWARD ) ); m_pftHint->SetText( sHint ); m_pftHint->Invalidate(); } @@ -712,7 +712,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress, break; case FmSearchProgress::State::ProgressCounting: - m_pftHint->SetText(CUI_RES(RID_STR_SEARCH_COUNTING)); + m_pftHint->SetText(CuiResId(RID_STR_SEARCH_COUNTING)); m_pftHint->Invalidate(); m_pftRecord->SetText(OUString::number(pProgress->nCurrentRecord)); @@ -730,7 +730,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress, sal_uInt16 nErrorId = (FmSearchProgress::State::Error == pProgress->aSearchState) ? RID_STR_SEARCH_GENERAL_ERROR : RID_STR_SEARCH_NORECORD; - ScopedVclPtrInstance<MessageDialog>(this, CUI_RES(nErrorId))->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, CuiResId(nErrorId))->Execute(); SAL_FALLTHROUGH; } case FmSearchProgress::State::Canceled: diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index ff298167227d..273363e384cd 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -559,7 +559,7 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl, Button*, void) if( ( pInfo->GetId() == nId ) && ( pInfo->GetThemeName() != pThm->GetName() ) ) { - OUString aStr( CUI_RES( RID_SVXSTR_GALLERY_ID_EXISTS ) ); + OUString aStr( CuiResId( RID_SVXSTR_GALLERY_ID_EXISTS ) ); aStr += " (" + pInfo->GetThemeName() + ")"; @@ -592,7 +592,7 @@ GalleryThemeProperties::GalleryThemeProperties(vcl::Window* pParent, OUString aText = GetText() + pData->pTheme->GetName(); if( pData->pTheme->IsReadOnly() ) - aText += CUI_RES( RID_SVXSTR_GALLERY_READONLY ); + aText += CuiResId( RID_SVXSTR_GALLERY_READONLY ); SetText( aText ); } @@ -645,9 +645,9 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) GalleryTheme* pThm = pData->pTheme; OUString aOutStr( OUString::number(pThm->GetObjectCount()) ); - OUString aObjStr( CUI_RES( RID_SVXSTR_GALLERYPROPS_OBJECT ) ); + OUString aObjStr( CuiResId( RID_SVXSTR_GALLERYPROPS_OBJECT ) ); OUString aAccess; - OUString aType( SVX_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ); + OUString aType( SvxResId( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ); bool bReadOnly = pThm->IsReadOnly(); m_pEdtMSName->SetText( pThm->GetName() ); @@ -659,7 +659,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) m_pEdtMSName->Enable(); if( pThm->IsReadOnly() ) - aType += CUI_RES( RID_SVXSTR_GALLERY_READONLY ); + aType += CuiResId( RID_SVXSTR_GALLERY_READONLY ); m_pFtMSShowType->SetText( aType ); m_pFtMSShowPath->SetText( pThm->GetSdgURL().GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ) ); @@ -748,7 +748,7 @@ void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData ) m_pCbbFileType->EnableDDAutoWidth( false ); m_pLbxFound->SetDoubleClickHdl(LINK(this, TPGalleryThemeProperties, DClickFoundHdl)); m_pLbxFound->SetSelectHdl(LINK(this, TPGalleryThemeProperties, SelectFoundHdl)); - m_pLbxFound->InsertEntry(OUString(CUI_RES(RID_SVXSTR_GALLERY_NOFILES))); + m_pLbxFound->InsertEntry(OUString(CuiResId(RID_SVXSTR_GALLERY_NOFILES))); m_pLbxFound->Show(); FillFilterList(); @@ -947,7 +947,7 @@ void TPGalleryThemeProperties::FillFilterList() #endif pFilterEntry = new FilterEntry; - pFilterEntry->aFilterName = CUI_RES(RID_SVXSTR_GALLERY_ALLFILES); + pFilterEntry->aFilterName = CuiResId(RID_SVXSTR_GALLERY_ALLFILES); pFilterEntry->aFilterName = addExtension( pFilterEntry->aFilterName, aExtensions ); size_t pos = m_pCbbFileType->InsertEntry( pFilterEntry->aFilterName, 0 ); if ( pos < aFilterEntryList.size() ) { @@ -1182,7 +1182,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl, Dialog&, void) } else { - m_pLbxFound->InsertEntry( OUString( CUI_RES( RID_SVXSTR_GALLERY_NOFILES ) ) ); + m_pLbxFound->InsertEntry( OUString( CuiResId( RID_SVXSTR_GALLERY_NOFILES ) ) ); m_pBtnTakeAll->Disable(); m_pCbxPreview->Disable(); bEntriesFound = false; diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 9f9e01406f89..6830ff7b320b 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -98,21 +98,21 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings) aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality); aImage = Image(aBitmap); } - aStrTitle = CUI_RES( RID_SVXSTR_HYPERDLG_HLINETTP ); + aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLINETTP ); pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_INTERNET, aStrTitle, imgVector[0], SvxHyperlinkInternetTp::Create ); - pEntry->SetQuickHelpText( CUI_RES( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) ); - aStrTitle = CUI_RES( RID_SVXSTR_HYPERDLG_HLMAILTP ); + pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) ); + aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLMAILTP ); pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_MAIL, aStrTitle, imgVector[1], SvxHyperlinkMailTp::Create ); - pEntry->SetQuickHelpText( CUI_RES( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) ); - aStrTitle = CUI_RES( RID_SVXSTR_HYPERDLG_HLDOCTP ); + pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) ); + aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP ); pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_DOCUMENT, aStrTitle, imgVector[2], SvxHyperlinkDocTp::Create ); - pEntry->SetQuickHelpText( CUI_RES( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) ); - aStrTitle = CUI_RES( RID_SVXSTR_HYPERDLG_HLDOCNTP ); + pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) ); + aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP ); pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, imgVector[3], SvxHyperlinkNewDocTp::Create ); - pEntry->SetQuickHelpText( CUI_RES( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) ); + pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) ); // set OK/Cancel - button - GetCancelButton().SetText ( CUI_RES(RID_SVXSTR_HYPDLG_CLOSEBUT) ); + GetCancelButton().SetText ( CuiResId(RID_SVXSTR_HYPDLG_CLOSEBUT) ); // create itemset for tabpages mpItemSet = new SfxItemSet( SfxGetpApp()->GetPool(), SID_HYPERLINK_GETLINK, diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index cb959b327987..dc33da086b0b 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -574,8 +574,8 @@ namespace svx m_pSuggestions->set_height_request( m_pSuggestions->GetTextHeight() * 5 ); m_pSuggestions->set_width_request( m_pSuggestions->approximate_char_width() * 48 ); - const OUString sHangul(CUI_RES(RID_SVXSTR_HANGUL)); - const OUString sHanja(CUI_RES(RID_SVXSTR_HANJA)); + const OUString sHangul(CuiResId(RID_SVXSTR_HANGUL)); + const OUString sHanja(CuiResId(RID_SVXSTR_HANJA)); m_pHanjaAbove->init( sHangul, sHanja, PseudoRubyText::eAbove ); m_pHanjaBelow->init( sHangul, sHanja, PseudoRubyText::eBelow ); m_pHangulAbove->init( sHanja, sHangul, PseudoRubyText::eAbove ); @@ -1730,7 +1730,7 @@ namespace svx HangulHanjaEditDictDialog::HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ) :ModalDialog ( _pParent, "HangulHanjaEditDictDialog", "cui/ui/hangulhanjaeditdictdialog.ui" ) - ,m_aEditHintText ( CUI_RES(RID_SVXSTR_EDITHINT) ) + ,m_aEditHintText ( CuiResId(RID_SVXSTR_EDITHINT) ) ,m_rDictList ( _rDictList ) ,m_nCurrentDict ( 0xFFFFFFFF ) ,m_pSuggestions ( nullptr ) diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 112c27359e82..d37c5991ce80 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -275,7 +275,7 @@ bool SvxHyperlinkNewDocTp::AskApply() bool bRet = ImplGetURLObject( m_pCbbPath->GetText(), m_pCbbPath->GetBaseURL(), aINetURLObject ); if ( !bRet ) { - ScopedVclPtrInstance< WarningBox > aWarning( this, WB_OK, CUI_RES(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) ); + ScopedVclPtrInstance< WarningBox > aWarning( this, WB_OK, CuiResId(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) ); aWarning->Execute(); } return bRet; @@ -323,7 +323,7 @@ void SvxHyperlinkNewDocTp::DoApply () if( bOk ) { - ScopedVclPtrInstance<WarningBox> aWarning( this, WB_YES_NO, CUI_RES(RID_SVXSTR_HYPERDLG_QUERYOVERWRITE) ); + ScopedVclPtrInstance<WarningBox> aWarning( this, WB_YES_NO, CuiResId(RID_SVXSTR_HYPERDLG_QUERYOVERWRITE) ); bCreate = aWarning->Execute() == RET_YES; } } diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index db14236bfa33..a055a0a243ad 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -109,10 +109,10 @@ void SvxHlmarkTreeLBox::Paint(vcl::RenderContext& rRenderContext, const ::tools: switch (mpParentWnd->mnError) { case LERR_NOENTRIES : - aStrMessage = CUI_RES( RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES ); + aStrMessage = CuiResId( RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES ); break; case LERR_DOCNOTOPEN : - aStrMessage = CUI_RES( RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN ); + aStrMessage = CuiResId( RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN ); break; } diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index bc4172da4c4b..15e43da019e7 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -246,8 +246,8 @@ void SvxHyperlinkTabPageBase::FillStandardDlgFields ( const SvxHyperlinkItem* pH mpCbbFrame->SetText ( pHyperlinkItem->GetTargetFrame() ); // Form - OUString aStrFormText = CUI_RES( RID_SVXSTR_HYPERDLG_FROM_TEXT ); - OUString aStrFormButton = CUI_RES( RID_SVXSTR_HYPERDLG_FORM_BUTTON ); + OUString aStrFormText = CuiResId( RID_SVXSTR_HYPERDLG_FROM_TEXT ); + OUString aStrFormButton = CuiResId( RID_SVXSTR_HYPERDLG_FORM_BUTTON ); if( pHyperlinkItem->GetInsertMode() & HLINK_HTMLMODE ) { @@ -340,13 +340,13 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, Button*, void) SfxMacroTabPage *pMacroPage = static_cast<SfxMacroTabPage*>( aDlg->GetTabPage() ); if ( pHyperlinkItem->GetMacroEvents() & HyperDialogEvent::MouseOverObject ) - pMacroPage->AddEvent( OUString( CUI_RES(RID_SVXSTR_HYPDLG_MACROACT1) ), + pMacroPage->AddEvent( OUString( CuiResId(RID_SVXSTR_HYPDLG_MACROACT1) ), SFX_EVENT_MOUSEOVER_OBJECT ); if ( pHyperlinkItem->GetMacroEvents() & HyperDialogEvent::MouseClickObject ) - pMacroPage->AddEvent( OUString( CUI_RES(RID_SVXSTR_HYPDLG_MACROACT2) ), + pMacroPage->AddEvent( OUString( CuiResId(RID_SVXSTR_HYPDLG_MACROACT2) ), SFX_EVENT_MOUSECLICK_OBJECT); if ( pHyperlinkItem->GetMacroEvents() & HyperDialogEvent::MouseOutObject ) - pMacroPage->AddEvent( OUString( CUI_RES(RID_SVXSTR_HYPDLG_MACROACT3) ), + pMacroPage->AddEvent( OUString( CuiResId(RID_SVXSTR_HYPDLG_MACROACT3) ), SFX_EVENT_MOUSEOUT_OBJECT); if ( bIsInputEnabled ) diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 7f64b780fee7..a5f16c8f6b0d 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -637,7 +637,7 @@ IMPL_LINK_NOARG( SfxInsertFloatingFrameDialog, OpenHdl, Button*, void) ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, FileDialogFlags::NONE, OUString() ); // set the title - aFileDlg.SetTitle(CUI_RES(RID_SVXSTR_SELECT_FILE_IFRAME)); + aFileDlg.SetTitle(CuiResId(RID_SVXSTR_SELECT_FILE_IFRAME)); // show the dialog if ( aFileDlg.Execute() == ERRCODE_NONE ) diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 4c907d34635f..1f32977a0eb1 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -34,8 +34,8 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const SvxInsRowColDlg::SvxInsRowColDlg(vcl::Window* pParent, bool bCol, const OString& sHelpId ) : m_pDialog(VclPtr<ModalDialog>::Create(pParent, "InsertRowColumnDialog", "cui/ui/insertrowcolumn.ui")) - , aRow(CUI_RES(RID_SVXSTR_ROW)) - , aCol(CUI_RES(RID_SVXSTR_COL)) + , aRow(CuiResId(RID_SVXSTR_ROW)) + , aCol(CuiResId(RID_SVXSTR_COL)) , bColumn(bCol) { m_pDialog->get(m_pCountEdit, "insert_number"); diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 7e758c4bbbc1..da9c08262ec0 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -88,12 +88,12 @@ static long nTabs[] = SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool bHtml ) : ModalDialog( pParent, "BaseLinksDialog", "cui/ui/baselinksdialog.ui"), - aStrAutolink( CUI_RES( STR_AUTOLINK ) ), - aStrManuallink( CUI_RES( STR_MANUALLINK ) ), - aStrBrokenlink( CUI_RES( STR_BROKENLINK ) ), - aStrCloselinkmsg( CUI_RES( STR_CLOSELINKMSG ) ), - aStrCloselinkmsgMulti( CUI_RES( STR_CLOSELINKMSG_MULTI ) ), - aStrWaitinglink( CUI_RES( STR_WAITINGLINK ) ), + aStrAutolink( CuiResId( STR_AUTOLINK ) ), + aStrManuallink( CuiResId( STR_MANUALLINK ) ), + aStrBrokenlink( CuiResId( STR_BROKENLINK ) ), + aStrCloselinkmsg( CuiResId( STR_CLOSELINKMSG ) ), + aStrCloselinkmsgMulti( CuiResId( STR_CLOSELINKMSG_MULTI ) ), + aStrWaitinglink( CuiResId( STR_WAITINGLINK ) ), pLinkMgr( nullptr ), bHtmlMode(bHtml), aUpdateIdle("cui SvBaseLinksDlg UpdateIdle") diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 145077bd5c89..0bdc805d7381 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -90,7 +90,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl, Button*, void) } else { - OUString sMsg( CUI_RES( RID_MULTIPATH_DBL_ERR ) ); + OUString sMsg( CuiResId( RID_MULTIPATH_DBL_ERR ) ); sMsg = sMsg.replaceFirst( "%1", sInsPath ); ScopedVclPtrInstance<InfoBox>(this, sMsg)->Execute(); } @@ -114,7 +114,7 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, AddHdl_Impl, Button*, void) if ( LISTBOX_ENTRY_NOTFOUND != m_pPathLB->GetEntryPos( sInsPath ) ) { - OUString sMsg( CUI_RES( RID_MULTIPATH_DBL_ERR ) ); + OUString sMsg( CuiResId( RID_MULTIPATH_DBL_ERR ) ); sMsg = sMsg.replaceFirst( "%1", sInsPath ); ScopedVclPtrInstance<InfoBox>(this, sMsg)->Execute(); } diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index 92866f30d842..8db8d4f633d3 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -61,10 +61,10 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) : m_pParent( pParent ) - , m_aOneMismatch( CUI_RES( RID_SVXSTR_ONE_PASSWORD_MISMATCH ) ) - , m_aTwoMismatch( CUI_RES( RID_SVXSTR_TWO_PASSWORDS_MISMATCH ) ) - , m_aInvalidStateForOkButton( CUI_RES( RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON ) ) - , m_aInvalidStateForOkButton_v2( CUI_RES( RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2 ) ) + , m_aOneMismatch( CuiResId( RID_SVXSTR_ONE_PASSWORD_MISMATCH ) ) + , m_aTwoMismatch( CuiResId( RID_SVXSTR_TWO_PASSWORDS_MISMATCH ) ) + , m_aInvalidStateForOkButton( CuiResId( RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON ) ) + , m_aInvalidStateForOkButton_v2( CuiResId( RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2 ) ) , m_bIsPasswordToModify( bIsPasswordToModify ) { pParent->get(m_pPasswdToOpenED, "newpassEntry"); diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index 5b02b861473a..b1922cbc4573 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/cui/source/dialogs/screenshotannotationdlg.cxx @@ -204,7 +204,7 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl( mpPicture(nullptr), mpText(nullptr), mpSave(nullptr), - maSaveAsText(CUI_RES(RID_SVXSTR_SAVE_SCREENSHOT_AS)) + maSaveAsText(CuiResId(RID_SVXSTR_SAVE_SCREENSHOT_AS)) { // image ain't empty assert(!maParentDialogBitmap.IsEmpty()); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 9b5b753c2e9a..bc625d315003 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -82,8 +82,8 @@ SFTreeListBox::SFTreeListBox(vcl::Window* pParent) , m_libImage(BitmapEx(RID_CUIBMP_LIB)) , m_macImage(BitmapEx(RID_CUIBMP_MACRO)) , m_docImage(BitmapEx(RID_CUIBMP_DOC)) - , m_sMyMacros(CUI_RES(RID_SVXSTR_MYMACROS)) - , m_sProdMacros(CUI_RES(RID_SVXSTR_PRODMACROS)) + , m_sMyMacros(CuiResId(RID_SVXSTR_MYMACROS)) + , m_sProdMacros(CuiResId(RID_SVXSTR_PRODMACROS)) { SetSelectionMode( SelectionMode::Single ); @@ -451,15 +451,15 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( vcl::Window* pParent, const OUString& la : SfxModalDialog(pParent, "ScriptOrganizerDialog", "cui/ui/scriptorganizer.ui") , m_sLanguage(language) - , m_delErrStr(CUI_RES(RID_SVXSTR_DELFAILED)) - , m_delErrTitleStr(CUI_RES(RID_SVXSTR_DELFAILED_TITLE)) - , m_delQueryStr(CUI_RES(RID_SVXSTR_DELQUERY)) - , m_delQueryTitleStr(CUI_RES(RID_SVXSTR_DELQUERY_TITLE)) - , m_createErrStr(CUI_RES(RID_SVXSTR_CREATEFAILED)) - , m_createDupStr(CUI_RES(RID_SVXSTR_CREATEFAILEDDUP)) - , m_createErrTitleStr(CUI_RES(RID_SVXSTR_CREATEFAILED_TITLE)) - , m_renameErrStr(CUI_RES(RID_SVXSTR_RENAMEFAILED)) - , m_renameErrTitleStr(CUI_RES(RID_SVXSTR_RENAMEFAILED_TITLE)) + , m_delErrStr(CuiResId(RID_SVXSTR_DELFAILED)) + , m_delErrTitleStr(CuiResId(RID_SVXSTR_DELFAILED_TITLE)) + , m_delQueryStr(CuiResId(RID_SVXSTR_DELQUERY)) + , m_delQueryTitleStr(CuiResId(RID_SVXSTR_DELQUERY_TITLE)) + , m_createErrStr(CuiResId(RID_SVXSTR_CREATEFAILED)) + , m_createDupStr(CuiResId(RID_SVXSTR_CREATEFAILEDDUP)) + , m_createErrTitleStr(CuiResId(RID_SVXSTR_CREATEFAILED_TITLE)) + , m_renameErrStr(CuiResId(RID_SVXSTR_RENAMEFAILED)) + , m_renameErrTitleStr(CuiResId(RID_SVXSTR_RENAMEFAILED_TITLE)) { get(m_pScriptsBox, "scripts"); get(m_pRunButton, "run"); @@ -1227,12 +1227,12 @@ OUString FormatErrorString( if ( !type.isEmpty() ) { - result += "\n\n" + OUString(CUI_RES(RID_SVXSTR_ERROR_TYPE_LABEL)) + " " + type; + result += "\n\n" + OUString(CuiResId(RID_SVXSTR_ERROR_TYPE_LABEL)) + " " + type; } if ( !message.isEmpty() ) { - result += "\n\n" + OUString(CUI_RES(RID_SVXSTR_ERROR_MESSAGE_LABEL)) + " " + message; + result += "\n\n" + OUString(CuiResId(RID_SVXSTR_ERROR_MESSAGE_LABEL)) + " " + message; } return result; @@ -1241,7 +1241,7 @@ OUString FormatErrorString( OUString GetErrorMessage( const provider::ScriptErrorRaisedException& eScriptError ) { - OUString unformatted = CUI_RES( RID_SVXSTR_ERROR_AT_LINE ); + OUString unformatted = CuiResId( RID_SVXSTR_ERROR_AT_LINE ); OUString unknown("UNKNOWN"); OUString language = unknown; @@ -1267,11 +1267,11 @@ OUString GetErrorMessage( if ( eScriptError.lineNum != -1 ) { line = OUString::number( eScriptError.lineNum ); - unformatted = CUI_RES( RID_SVXSTR_ERROR_AT_LINE ); + unformatted = CuiResId( RID_SVXSTR_ERROR_AT_LINE ); } else { - unformatted = CUI_RES( RID_SVXSTR_ERROR_RUNNING ); + unformatted = CuiResId( RID_SVXSTR_ERROR_RUNNING ); } return FormatErrorString( @@ -1281,7 +1281,7 @@ OUString GetErrorMessage( OUString GetErrorMessage( const provider::ScriptExceptionRaisedException& eScriptException ) { - OUString unformatted = CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE ); + OUString unformatted = CuiResId( RID_SVXSTR_EXCEPTION_AT_LINE ); OUString unknown("UNKNOWN"); OUString language = unknown; @@ -1307,11 +1307,11 @@ OUString GetErrorMessage( if ( eScriptException.lineNum != -1 ) { line = OUString::number( eScriptException.lineNum ); - unformatted = CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE ); + unformatted = CuiResId( RID_SVXSTR_EXCEPTION_AT_LINE ); } else { - unformatted = CUI_RES( RID_SVXSTR_EXCEPTION_RUNNING ); + unformatted = CuiResId( RID_SVXSTR_EXCEPTION_RUNNING ); } if ( !eScriptException.exceptionType.isEmpty() ) @@ -1326,7 +1326,7 @@ OUString GetErrorMessage( OUString GetErrorMessage( const provider::ScriptFrameworkErrorException& sError ) { - OUString unformatted = CUI_RES( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING ); + OUString unformatted = CuiResId( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING ); OUString language("UNKNOWN"); @@ -1345,7 +1345,7 @@ OUString GetErrorMessage( if ( sError.errorType == provider::ScriptFrameworkErrorType::NOTSUPPORTED ) { message = OUString( - CUI_RES( RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) ); + CuiResId( RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) ); message = ReplaceString(message, "%LANGUAGENAME", language ); } @@ -1440,11 +1440,11 @@ IMPL_STATIC_LINK( SvxScriptErrorDialog, ShowDialog, void*, p, void ) } else { - message = OUString( CUI_RES( RID_SVXSTR_ERROR_TITLE ) ); + message = OUString( CuiResId( RID_SVXSTR_ERROR_TITLE ) ); } ScopedVclPtrInstance<MessageDialog> pBox( nullptr, message, VclMessageType::Warning ); - pBox->SetText( CUI_RES( RID_SVXSTR_ERROR_TITLE ) ); + pBox->SetText( CuiResId( RID_SVXSTR_ERROR_TITLE ) ); pBox->Execute(); delete pMessage; diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 23342dd3c3fc..ea01bcb7a1cc 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -137,7 +137,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent, SfxObjectShell* pSh = SfxObjectShell::Current(); DBG_ASSERT( pSh, "No DocShell" ); - ResStringArray aAttrNames( SVX_RES( RID_ATTR_NAMES ) ); + ResStringArray aAttrNames(ResId(RID_ATTR_NAMES, DIALOG_MGR())); SfxItemPool& rPool = pSh->GetPool(); SfxItemSet aSet( rPool, pWhRanges ); SfxWhichIter aIter( aSet ); diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index f0ebda71297a..51fae3d5ceea 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -443,7 +443,7 @@ SvxThesaurusDialog::SvxThesaurusDialog( const OUString &rWord, LanguageType nLanguage) : SvxStandardDialog(pParent, "ThesaurusDialog", "cui/ui/thesaurus.ui") - , m_aErrStr(CUI_RES(RID_SVXSTR_ERR_TEXTNOTFOUND)) + , m_aErrStr(CuiResId(RID_SVXSTR_ERR_TEXTNOTFOUND)) , xThesaurus(nullptr) , aLookUpText() , nLookUpLanguage(LANGUAGE_NONE) diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx index 07226a0063e3..e323ba987c7e 100644 --- a/cui/source/inc/dialmgr.hxx +++ b/cui/source/inc/dialmgr.hxx @@ -24,14 +24,17 @@ // forward --------------------------------------------------------------- #define CUI_MGR() (*CuiResMgr::GetResMgr()) -#define CUI_RES(i) ResId(i,CUI_MGR()) -class ResMgr; struct CuiResMgr { static ResMgr* GetResMgr(); }; +inline OUString CuiResId(sal_uInt16 nId) +{ + return ResId(nId, CUI_MGR()); +} + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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())) { } diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 8a16acd0b546..2586a454f71e 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -212,9 +212,9 @@ AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCor // Asian vertical mode m_pCbAsianMode->Show( SvtCJKOptions().IsVerticalTextEnabled() ); - m_pLbFrameDir->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_LTR ), SvxFrameDirection::Horizontal_LR_TB ); - m_pLbFrameDir->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_RTL ), SvxFrameDirection::Horizontal_RL_TB ); - m_pLbFrameDir->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_SUPER ), SvxFrameDirection::Environment ); + m_pLbFrameDir->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_LTR ), SvxFrameDirection::Horizontal_LR_TB ); + m_pLbFrameDir->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_RTL ), SvxFrameDirection::Horizontal_RL_TB ); + m_pLbFrameDir->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_SUPER ), SvxFrameDirection::Environment ); // This page needs ExchangeSupport. SetExchangeSupport(); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 96445f32a1b3..758859897bf9 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -193,14 +193,14 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox&, rBox, void) OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "AutocorrectOptionsPage", "cui/ui/acoroptionspage.ui", &rSet) - , m_sInput(CUI_RES(RID_SVXSTR_USE_REPLACE)) - , m_sDoubleCaps(CUI_RES(RID_SVXSTR_CPTL_STT_WORD)) - , m_sStartCap(CUI_RES(RID_SVXSTR_CPTL_STT_SENT)) - , m_sBoldUnderline(CUI_RES(RID_SVXSTR_BOLD_UNDER)) - , m_sURL(CUI_RES(RID_SVXSTR_DETECT_URL)) - , m_sNoDblSpaces(CUI_RES(RID_SVXSTR_NO_DBL_SPACES)) - , m_sDash(CUI_RES(RID_SVXSTR_DASH)) - , m_sAccidentalCaps(CUI_RES(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK)) + , m_sInput(CuiResId(RID_SVXSTR_USE_REPLACE)) + , m_sDoubleCaps(CuiResId(RID_SVXSTR_CPTL_STT_WORD)) + , m_sStartCap(CuiResId(RID_SVXSTR_CPTL_STT_SENT)) + , m_sBoldUnderline(CuiResId(RID_SVXSTR_BOLD_UNDER)) + , m_sURL(CuiResId(RID_SVXSTR_DETECT_URL)) + , m_sNoDblSpaces(CuiResId(RID_SVXSTR_NO_DBL_SPACES)) + , m_sDash(CuiResId(RID_SVXSTR_DASH)) + , m_sAccidentalCaps(CuiResId(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK)) { get(m_pCheckLB, "checklist"); } @@ -413,24 +413,24 @@ enum OfaAutoFmtOptions OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "ApplyAutoFmtPage", "cui/ui/applyautofmtpage.ui", &rSet) - , sDeleteEmptyPara(CUI_RES(RID_SVXSTR_DEL_EMPTY_PARA)) - , sUseReplaceTbl(CUI_RES(RID_SVXSTR_USE_REPLACE)) - , sCapitalStartWord(CUI_RES(RID_SVXSTR_CPTL_STT_WORD)) - , sCapitalStartSentence(CUI_RES(RID_SVXSTR_CPTL_STT_SENT)) - , sUserStyle(CUI_RES(RID_SVXSTR_USER_STYLE)) - , sBullet(CUI_RES(RID_SVXSTR_BULLET)) - , sBoldUnder(CUI_RES(RID_SVXSTR_BOLD_UNDER)) - , sNoDblSpaces(CUI_RES(RID_SVXSTR_NO_DBL_SPACES)) - , sCorrectCapsLock(CUI_RES(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK)) - , sDetectURL(CUI_RES(RID_SVXSTR_DETECT_URL)) - , sDash(CUI_RES(RID_SVXSTR_DASH)) - , sRightMargin(CUI_RES(RID_SVXSTR_RIGHT_MARGIN)) - , sNum(CUI_RES(RID_SVXSTR_NUM)) - , sBorder(CUI_RES(RID_SVXSTR_BORDER)) - , sTable(CUI_RES(RID_SVXSTR_CREATE_TABLE)) - , sReplaceTemplates(CUI_RES(RID_SVXSTR_REPLACE_TEMPLATES)) - , sDelSpaceAtSttEnd(CUI_RES(RID_SVXSTR_DEL_SPACES_AT_STT_END)) - , sDelSpaceBetweenLines(CUI_RES(RID_SVXSTR_DEL_SPACES_BETWEEN_LINES)) + , sDeleteEmptyPara(CuiResId(RID_SVXSTR_DEL_EMPTY_PARA)) + , sUseReplaceTbl(CuiResId(RID_SVXSTR_USE_REPLACE)) + , sCapitalStartWord(CuiResId(RID_SVXSTR_CPTL_STT_WORD)) + , sCapitalStartSentence(CuiResId(RID_SVXSTR_CPTL_STT_SENT)) + , sUserStyle(CuiResId(RID_SVXSTR_USER_STYLE)) + , sBullet(CuiResId(RID_SVXSTR_BULLET)) + , sBoldUnder(CuiResId(RID_SVXSTR_BOLD_UNDER)) + , sNoDblSpaces(CuiResId(RID_SVXSTR_NO_DBL_SPACES)) + , sCorrectCapsLock(CuiResId(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK)) + , sDetectURL(CuiResId(RID_SVXSTR_DETECT_URL)) + , sDash(CuiResId(RID_SVXSTR_DASH)) + , sRightMargin(CuiResId(RID_SVXSTR_RIGHT_MARGIN)) + , sNum(CuiResId(RID_SVXSTR_NUM)) + , sBorder(CuiResId(RID_SVXSTR_BORDER)) + , sTable(CuiResId(RID_SVXSTR_CREATE_TABLE)) + , sReplaceTemplates(CuiResId(RID_SVXSTR_REPLACE_TEMPLATES)) + , sDelSpaceAtSttEnd(CuiResId(RID_SVXSTR_DEL_SPACES_AT_STT_END)) + , sDelSpaceBetweenLines(CuiResId(RID_SVXSTR_DEL_SPACES_BETWEEN_LINES)) , nPercent(50) , pCheckButtonData(nullptr) { @@ -1812,8 +1812,8 @@ SvTreeListEntry* OfaQuoteTabPage::CreateEntry(OUString& rTxt, sal_uInt16 nCol) OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "ApplyLocalizedPage", "cui/ui/applylocalizedpage.ui", &rSet) - , sNonBrkSpace(CUI_RES(RID_SVXSTR_NON_BREAK_SPACE)) - , sOrdinal(CUI_RES(RID_SVXSTR_ORDINAL)) + , sNonBrkSpace(CuiResId(RID_SVXSTR_NON_BREAK_SPACE)) + , sOrdinal(CuiResId(RID_SVXSTR_ORDINAL)) , pCheckButtonData(nullptr) , cSglStartQuote(0) , cSglEndQuote(0) @@ -2060,7 +2060,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void ) ScopedVclPtrInstance< SvxCharacterMap > pMap( this, true ); pMap->SetCharFont( OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT, LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne )); - pMap->SetText(nMode < SGL_END ? CUI_RES(RID_SVXSTR_STARTQUOTE) : CUI_RES(RID_SVXSTR_ENDQUOTE) ); + pMap->SetText(nMode < SGL_END ? CuiResId(RID_SVXSTR_STARTQUOTE) : CuiResId(RID_SVXSTR_ENDQUOTE) ); sal_UCS4 cDlg; SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); LanguageType eLang = Application::GetSettings().GetLanguageTag().getLanguageType(); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 2f332aee4232..407550d2bf3f 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -382,7 +382,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSe m_pBackgroundColorSet->SetSelectHdl( HDL(BackgroundColorHdl_Impl) ); m_pBackgroundColorSet->SetStyle(m_pBackgroundColorSet->GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD); - m_pBackgroundColorSet->SetText(SVX_RESSTR(RID_SVXSTR_NOFILL)); + m_pBackgroundColorSet->SetText(SvxResId(RID_SVXSTR_NOFILL)); } SvxBackgroundTabPage::~SvxBackgroundTabPage() @@ -1528,7 +1528,7 @@ void SvxBackgroundTabPage::PageCreated(const SfxAllItemSet& aSet) } if ( nFlags & SvxBackgroundTabFlags::SHOW_HIGHLIGHTING ) { - m_pBackGroundColorLabelFT->SetText(CUI_RES(RID_SVXSTR_CHARNAME_HIGHLIGHTING)); + m_pBackGroundColorLabelFT->SetText(CuiResId(RID_SVXSTR_CHARNAME_HIGHLIGHTING)); bHighlighting = true; } } diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 73c912d15d0a..606e66309205 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -1014,7 +1014,7 @@ void SvxBorderTabPage::FillPresetVS() { m_pWndPresets->InsertItem( nVSIdx ); m_pWndPresets->SetItemImage(nVSIdx, Image(m_aBorderImgVec[nVSIdx-1])); - m_pWndPresets->SetItemText( nVSIdx, CUI_RES( GetPresetStringId( nVSIdx ) ) ); + m_pWndPresets->SetItemText( nVSIdx, CuiResId( GetPresetStringId( nVSIdx ) ) ); } // show the control @@ -1037,7 +1037,7 @@ void SvxBorderTabPage::FillShadowVS() { m_pWndShadows->InsertItem( nVSIdx ); m_pWndShadows->SetItemImage(nVSIdx, Image(m_aShadowImgVec[nVSIdx-1])); - m_pWndShadows->SetItemText( nVSIdx, CUI_RES( pnStrIds[ nVSIdx - 1 ] ) ); + m_pWndShadows->SetItemText( nVSIdx, CuiResId( pnStrIds[ nVSIdx - 1 ] ) ); } // show the control @@ -1096,7 +1096,7 @@ void SvxBorderTabPage::FillLineListBox_Impl() m_pLbLineStyle->SetSourceUnit( FUNIT_TWIP ); - m_pLbLineStyle->SetNone( SVX_RESSTR( RID_SVXSTR_NONE ) ); + m_pLbLineStyle->SetNone( SvxResId( RID_SVXSTR_NONE ) ); for (size_t i = 0, n = SAL_N_ELEMENTS(aLines); i < n; ++i) { diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index ae83f627e6f3..667e09955298 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -254,7 +254,7 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet : SvxCharBasePage(pParent, "CharNamePage", "cui/ui/charnamepage.ui", rInSet) , m_pImpl(new SvxCharNamePage_Impl) { - m_pImpl->m_aNoStyleText = CUI_RES( RID_SVXSTR_CHARNAME_NOSTYLE ); + m_pImpl->m_aNoStyleText = CuiResId( RID_SVXSTR_CHARNAME_NOSTYLE ); SvtLanguageOptions aLanguageOptions; bool bShowCJK = aLanguageOptions.IsCJKFontEnabled(); @@ -319,18 +319,18 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet //In Windows the standard dialogs name font-name, font-style as //Font, Style #ifdef _WIN32 - OUString sFontFamilyString(CUI_RES(RID_SVXSTR_CHARNAME_FONT)); + OUString sFontFamilyString(CuiResId(RID_SVXSTR_CHARNAME_FONT)); #else - OUString sFontFamilyString(CUI_RES(RID_SVXSTR_CHARNAME_FAMILY)); + OUString sFontFamilyString(CuiResId(RID_SVXSTR_CHARNAME_FAMILY)); #endif m_pWestFontNameFT->SetText(sFontFamilyString); m_pEastFontNameFT->SetText(sFontFamilyString); m_pCTLFontNameFT->SetText(sFontFamilyString); #ifdef MACOSX - OUString sFontStyleString(CUI_RES(RID_SVXSTR_CHARNAME_TYPEFACE)); + OUString sFontStyleString(CuiResId(RID_SVXSTR_CHARNAME_TYPEFACE)); #else - OUString sFontStyleString(CUI_RES(RID_SVXSTR_CHARNAME_STYLE)); + OUString sFontStyleString(CuiResId(RID_SVXSTR_CHARNAME_STYLE)); #endif m_pWestFontStyleFT->SetText(sFontStyleString); m_pEastFontStyleFT->SetText(sFontStyleString); diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index ed1d7e6dfecd..f4d566875385 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -59,7 +59,7 @@ SvxConnectionDialog::SvxConnectionDialog( vcl::Window* pParent, const SfxItemSet _pPage->Construct(); SetTabPage( _pPage ); - SetText(CUI_RES( RID_SVXSTR_CONNECTOR )); + SetText(CuiResId( RID_SVXSTR_CONNECTOR )); } /************************************************************************* diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 9df84cd66d4e..b0e0325e8995 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -708,7 +708,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound ) sal_Int32 ay = sal_Int32(floor((float)aOrigPixelSize.Height() / ((float)aOrigSize.Height()/TWIP_TO_INCH)+0.5)); sTemp += " "; - sTemp += CUI_RES( RID_SVXSTR_PPI ); + sTemp += CuiResId( RID_SVXSTR_PPI ); OUString sPPI = OUString::number(ax); if (abs(ax - ay) > 1) { sPPI += OUStringLiteral1(0x00D7) + OUString::number(ay); diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index e6466fb640c2..8f90eac08a6d 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -69,7 +69,7 @@ SvxMeasureDialog::SvxMeasureDialog( vcl::Window* pParent, const SfxItemSet& rInA _pPage->Construct(); SetTabPage(_pPage ); - SetText(CUI_RES(RID_SVXSTR_DIMENSION_LINE)); + SetText(CuiResId(RID_SVXSTR_DIMENSION_LINE)); } /************************************************************************* @@ -804,7 +804,7 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p ) void SvxMeasurePage::FillUnitLB() { // fill ListBox with metrics - SvxStringArray aMetricArr( SVX_RES( RID_SVXSTR_FIELDUNIT_TABLE ) ); + SvxStringArray aMetricArr(ResId(RID_SVXSTR_FIELDUNIT_TABLE, DIALOG_MGR())); sal_IntPtr nUnit = FUNIT_NONE; OUString aStrMetric( m_pFtAutomatic->GetText()); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 6a48ae3316d1..8e7944d5c625 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -237,7 +237,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(vcl::Window* pParent, , pNumItem(nullptr) , pNumFmtShell(nullptr) , nInitFormat(ULONG_MAX) - , sAutomaticEntry(CUI_RES(RID_SVXSTR_AUTO_ENTRY)) + , sAutomaticEntry(CuiResId(RID_SVXSTR_AUTO_ENTRY)) , pLastActivWindow(nullptr) { get(m_pFtCategory, "categoryft"); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index e6d35cf4e517..0c3d313c8686 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -990,7 +990,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, Button*, void) { sfx2::FileDialogHelper aFileDialog(0); - aFileDialog.SetTitle(CUI_RES(RID_SVXSTR_ADD_IMAGE)); + aFileDialog.SetTitle(CuiResId(RID_SVXSTR_ADD_IMAGE)); if ( aFileDialog.Execute() != ERRCODE_NONE ) return; @@ -1178,7 +1178,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent, eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE)); // Fill ListBox with predefined / translated numbering types. - ResStringArray aNames( SVX_RES( RID_SVXSTRARY_NUMBERINGTYPE )); + ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR())); sal_uInt32 nCount = aNames.Count(); for (sal_uInt32 i = 0; i < nCount; ++i) { @@ -1950,7 +1950,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, void ) OUString aGrfName; Size aSize; bool bSucc(false); - SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_SVXSTR_EDIT_GRAPHIC) ); + SvxOpenGraphicDialog aGrfDlg( CuiResId(RID_SVXSTR_EDIT_GRAPHIC) ); if(MN_GALLERY_ENTRY <= nItemId ) { diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index e0f701220d48..16100cc46413 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -218,11 +218,11 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr // fill text flow listbox with valid entries - m_pTextFlowBox->InsertEntryValue( CUI_RES( RID_SVXSTR_PAGEDIR_LTR_HORI ), SvxFrameDirection::Horizontal_LR_TB ); + m_pTextFlowBox->InsertEntryValue( CuiResId( RID_SVXSTR_PAGEDIR_LTR_HORI ), SvxFrameDirection::Horizontal_LR_TB ); if( bCTL ) - m_pTextFlowBox->InsertEntryValue( CUI_RES( RID_SVXSTR_PAGEDIR_RTL_HORI ), SvxFrameDirection::Horizontal_RL_TB ); + m_pTextFlowBox->InsertEntryValue( CuiResId( RID_SVXSTR_PAGEDIR_RTL_HORI ), SvxFrameDirection::Horizontal_RL_TB ); // #109989# do not show vertical directions in Writer/Web @@ -230,8 +230,8 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr { if( bCJK ) { - m_pTextFlowBox->InsertEntryValue( CUI_RES( RID_SVXSTR_PAGEDIR_RTL_VERT ), SvxFrameDirection::Vertical_RL_TB ); - m_pTextFlowBox->InsertEntryValue( CUI_RES( RID_SVXSTR_PAGEDIR_LTR_VERT ), SvxFrameDirection::Vertical_LR_TB ); + m_pTextFlowBox->InsertEntryValue( CuiResId( RID_SVXSTR_PAGEDIR_RTL_VERT ), SvxFrameDirection::Vertical_RL_TB ); + m_pTextFlowBox->InsertEntryValue( CuiResId( RID_SVXSTR_PAGEDIR_LTR_VERT ), SvxFrameDirection::Vertical_LR_TB ); } } diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index fece2c82efe8..986f433852e0 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -1044,9 +1044,9 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet m_pLastLineLB->SetSelectHdl( LINK( this, SvxParaAlignTabPage, LastLineHdl_Impl ) ); m_pTextDirectionLB->SetSelectHdl( LINK( this, SvxParaAlignTabPage, TextDirectionHdl_Impl ) ); - m_pTextDirectionLB->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_SUPER ), SvxFrameDirection::Environment ); - m_pTextDirectionLB->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_LTR ), SvxFrameDirection::Horizontal_LR_TB ); - m_pTextDirectionLB->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_RTL ), SvxFrameDirection::Horizontal_RL_TB ); + m_pTextDirectionLB->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_SUPER ), SvxFrameDirection::Environment ); + m_pTextDirectionLB->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_LTR ), SvxFrameDirection::Horizontal_LR_TB ); + m_pTextDirectionLB->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_RTL ), SvxFrameDirection::Horizontal_RL_TB ); setPreviewsToSamePlace(pParent, this); } diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 1bdbe8ac7752..d4f2513d8b98 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -557,7 +557,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickRenameHdl, SvxPresetListBox*, void) if( nPos != VALUESET_ITEM_NOTFOUND ) { - OUString aDesc( CUI_RES( RID_SVXSTR_DESC_NEW_BITMAP ) ); + OUString aDesc( CuiResId( RID_SVXSTR_DESC_NEW_BITMAP ) ); OUString aName( m_pBitmapList->GetBitmap( nPos )->GetName() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 848e476313cd..232dc45e2f64 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -352,8 +352,8 @@ IMPL_LINK(SvxColorTabPage, ModifiedHdl_Impl, Edit&, rEdit, void) IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) { - OUString aNewName( SVX_RES( RID_SVXSTR_COLOR ) ); - OUString aDesc( CUI_RES( RID_SVXSTR_DESC_COLOR ) ); + OUString aNewName( SvxResId( RID_SVXSTR_COLOR ) ); + OUString aDesc( CuiResId( RID_SVXSTR_DESC_COLOR ) ); OUString aName; long j = 1; diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index c82d4bf4b5f7..f7f2de67e2ae 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -187,7 +187,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& rSet ) // determining (and possibly cutting) the name and // displaying it in the GroupBox - OUString aString( CUI_RES( RID_SVXSTR_TABLE ) ); + OUString aString( CuiResId( RID_SVXSTR_TABLE ) ); aString += ": "; INetURLObject aURL( m_pGradientList->GetPath() ); @@ -360,8 +360,8 @@ void SvxGradientTabPage::ModifiedHdl_Impl( void* pControl ) IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) { - OUString aNewName( SVX_RES( RID_SVXSTR_GRADIENT ) ); - OUString aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) ); + OUString aNewName( SvxResId( RID_SVXSTR_GRADIENT ) ); + OUString aDesc( CuiResId( RID_SVXSTR_DESC_GRADIENT ) ); OUString aName; long nCount = m_pGradientList->Count(); @@ -501,7 +501,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void if ( nPos != VALUESET_ITEM_NOTFOUND ) { - OUString aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) ); + OUString aDesc( CuiResId( RID_SVXSTR_DESC_GRADIENT ) ); OUString aName( m_pGradientList->GetGradient( nPos )->GetName() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 377400f56ce7..42e7c6e39231 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -174,7 +174,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) // determining (possibly cutting) the name // and displaying it in the GroupBox - OUString aString( CUI_RES( RID_SVXSTR_TABLE ) ); + OUString aString( CuiResId( RID_SVXSTR_TABLE ) ); aString += ": "; INetURLObject aURL( m_pHatchingList->GetPath() ); @@ -431,8 +431,8 @@ void SvxHatchTabPage::ChangeHatchHdl_Impl() IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) { - OUString aNewName( SVX_RES( RID_SVXSTR_HATCH ) ); - OUString aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) ); + OUString aNewName( SvxResId( RID_SVXSTR_HATCH ) ); + OUString aDesc( CuiResId( RID_SVXSTR_DESC_HATCH ) ); OUString aName; long nCount = m_pHatchingList->Count(); @@ -563,7 +563,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void ) if( nPos != VALUESET_ITEM_NOTFOUND ) { - OUString aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) ); + OUString aDesc( CuiResId( RID_SVXSTR_DESC_HATCH ) ); OUString aName( m_pHatchingList->GetHatch( nPos )->GetName() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 437cda7f6cd6..52830e93919f 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -463,7 +463,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton) break; default: { - SvxOpenGraphicDialog aGrfDlg(CUI_RES(RID_SVXSTR_EDIT_GRAPHIC)); + SvxOpenGraphicDialog aGrfDlg(CuiResId(RID_SVXSTR_EDIT_GRAPHIC)); aGrfDlg.EnableLink(false); aGrfDlg.AsLink(false); if( !aGrfDlg.Execute() ) @@ -525,7 +525,7 @@ void SvxLineTabPage::FillListboxes() m_pLbLineStyle->SelectEntryPos( nOldSelect ); // Line end style - OUString sNone( SVX_RES( RID_SVXSTR_NONE ) ); + OUString sNone( SvxResId( RID_SVXSTR_NONE ) ); nOldSelect = m_pLbStartStyle->GetSelectEntryPos(); m_pLbStartStyle->Clear(); m_pLbStartStyle->InsertEntry( sNone ); @@ -562,8 +562,8 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) nPos = m_pLbLineStyle->GetSelectEntryPos(); m_pLbLineStyle->Clear(); - m_pLbLineStyle->InsertEntry( SVX_RESSTR( RID_SVXSTR_INVISIBLE ) ); - m_pLbLineStyle->InsertEntry( SVX_RESSTR( RID_SVXSTR_SOLID ) ); + m_pLbLineStyle->InsertEntry( SvxResId( RID_SVXSTR_INVISIBLE ) ); + m_pLbLineStyle->InsertEntry( SvxResId( RID_SVXSTR_SOLID ) ); m_pLbLineStyle->Fill( m_pDashList ); nCount = m_pLbLineStyle->GetEntryCount(); @@ -589,7 +589,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) *m_pnLineEndListState = ChangeType::NONE; nPos = m_pLbLineStyle->GetSelectEntryPos(); - OUString sNone( SVX_RES( RID_SVXSTR_NONE ) ); + OUString sNone( SvxResId( RID_SVXSTR_NONE ) ); m_pLbStartStyle->Clear(); m_pLbStartStyle->InsertEntry( sNone ); diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 1708ed4bf7d3..12aaf3c9c964 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -203,7 +203,7 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& ) // determining (and possibly cutting) the name // and displaying it in the GroupBox -// OUString aString( CUI_RES( RID_SVXSTR_TABLE ) ); +// OUString aString( CuiResId( RID_SVXSTR_TABLE ) ); // aString += ": "; INetURLObject aURL( pDashList->GetPath() ); @@ -244,7 +244,7 @@ void SvxLineDefTabPage::CheckChanges_Impl() ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); ScopedVclPtrInstance<SvxMessDialog> aMessDlg( GetParentDialog(), - SVX_RESSTR( RID_SVXSTR_LINESTYLE ), + SvxResId( RID_SVXSTR_LINESTYLE ), OUString( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ), &aWarningBoxImage ); DBG_ASSERT(aMessDlg, "Dialog creation failed!"); @@ -534,7 +534,7 @@ void SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p) IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) { ResMgr& rMgr = CUI_MGR(); - OUString aNewName( SVX_RES( RID_SVXSTR_LINESTYLE ) ); + OUString aNewName( SvxResId( RID_SVXSTR_LINESTYLE ) ); OUString aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) ); OUString aName; diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 2eaac554ff91..924a9895dc70 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -419,7 +419,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) SdrObject::Free( pConvPolyObj ); ResMgr& rMgr = CUI_MGR(); - OUString aNewName( SVX_RES( RID_SVXSTR_LINEEND ) ); + OUString aNewName( SvxResId( RID_SVXSTR_LINEEND ) ); OUString aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) ); OUString aName; diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 5bed8420105b..df6a58249fec 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -176,7 +176,7 @@ void SvxPatternTabPage::ActivatePage( const SfxItemSet& rSet ) // determining (possibly cutting) the name and // displaying it in the GroupBox - OUString aString( CUI_RES( RID_SVXSTR_TABLE ) ); + OUString aString( CuiResId( RID_SVXSTR_TABLE ) ); aString += ": "; INetURLObject aURL( m_pPatternList->GetPath() ); @@ -350,8 +350,8 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl, ValueSet*, void) IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl, Button*, void) { - OUString aNewName( SVX_RES( RID_SVXSTR_PATTERN_UNTITLED ) ); - OUString aDesc( CUI_RES( RID_SVXSTR_DESC_NEW_PATTERN ) ); + OUString aNewName( SvxResId( RID_SVXSTR_PATTERN_UNTITLED ) ); + OUString aDesc( CuiResId( RID_SVXSTR_DESC_NEW_PATTERN ) ); OUString aName; long nCount = m_pPatternList->Count(); |