diff options
Diffstat (limited to 'sw/source/ui')
43 files changed, 216 insertions, 216 deletions
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 46641a942f78..446524cbac0e 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -114,7 +114,7 @@ IMPL_LINK_NOARG(SwBreakDlg, OkHdl, Button*, void) default:; //prevent warning } if(!bOk) { - ScopedVclPtrInstance<MessageDialog>(this, SW_RES(STR_ILLEGAL_PAGENUM), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, SwResId(STR_ILLEGAL_PAGENUM), VclMessageType::Info)->Execute(); m_pPageNumEdit->GrabFocus(); return; } diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 4973803d2149..c66be6d84d56 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -69,7 +69,7 @@ SwCharDlg::SwCharDlg(vcl::Window* pParent, SwView& rVw, const SfxItemSet& rCoreS { if(pStr) { - SetText(GetText() + SW_RESSTR(STR_TEXTCOLL_HEADER) + *pStr + ")"); + SetText(GetText() + SwResId(STR_TEXTCOLL_HEADER) + *pStr + ")"); } SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialog creation failed!"); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 99578d72c177..c2112d8fd994 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -651,7 +651,7 @@ void SwDropCapsPage::Reset(const SfxItemSet *rSet) ::FillCharStyleListBox(*m_pTemplateBox, rSh.GetView().GetDocShell(), true); - m_pTemplateBox->InsertEntry(SW_RESSTR(SW_STR_NONE), 0); + m_pTemplateBox->InsertEntry(SwResId(SW_STR_NONE), 0); // Reset format m_pTemplateBox->SelectEntryPos(0); diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index df2f530b7c88..19cb6729e59e 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -45,7 +45,7 @@ const sal_uInt16 SwParagraphNumTabPage::aPageRg[] = { SwParagraphNumTabPage::SwParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage(pParent, "NumParaPage", "modules/swriter/ui/numparapage.ui", &rAttr), - msOutlineNumbering( SW_RES( STR_OUTLINE_NUMBERING ) ), + msOutlineNumbering( SwResId( STR_OUTLINE_NUMBERING ) ), bModified(false), bCurNumrule(false) { diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 93c22f92cfd6..96616838f5bd 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -73,7 +73,7 @@ SwParaDlg::SwParaDlg(vcl::Window *pParent, if(pTitle) { // Update title - SetText(GetText() + SW_RESSTR(STR_TEXTCOLL_HEADER) + *pTitle + ")"); + SetText(GetText() + SwResId(STR_TEXTCOLL_HEADER) + *pTitle + ")"); } // tabs common to paragraph and draw paragraphs (paragraphs inside a text box) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index caa0b5a51f1b..ff98cdd0cf58 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -82,7 +82,7 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet) get(m_pShowStandardizedPageCount, "standardizedpageshow"); get(m_pStandardizedPageSizeNF, "standardpagesize"); - SvxStringArray aMetricArr( SW_RES( STR_ARR_METRIC ) ); + SvxStringArray aMetricArr(ResId(STR_ARR_METRIC, *pSwResMgr)); for ( sal_uInt32 i = 0; i < aMetricArr.Count(); ++i ) { const OUString sMetric = aMetricArr.GetStringByPos( i ); @@ -433,15 +433,15 @@ void SwCaptionPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Re SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptCaptionPage", "modules/swriter/ui/optcaptionpage.ui", &rSet) - , m_sSWTable(SW_RESSTR(STR_CAPTION_TABLE)) - , m_sSWFrame(SW_RESSTR(STR_CAPTION_FRAME)) - , m_sSWGraphic(SW_RESSTR(STR_CAPTION_GRAPHIC)) - , m_sOLE(SW_RESSTR(STR_CAPTION_OLE)) - , m_sBegin(SW_RESSTR(STR_CAPTION_BEGINNING)) - , m_sEnd(SW_RESSTR(STR_CAPTION_END)) - , m_sAbove(SW_RESSTR(STR_CAPTION_ABOVE)) - , m_sBelow(SW_RESSTR(STR_CAPTION_BELOW)) - , m_sNone(SW_RESSTR(SW_STR_NONE)) + , m_sSWTable(SwResId(STR_CAPTION_TABLE)) + , m_sSWFrame(SwResId(STR_CAPTION_FRAME)) + , m_sSWGraphic(SwResId(STR_CAPTION_GRAPHIC)) + , m_sOLE(SwResId(STR_CAPTION_OLE)) + , m_sBegin(SwResId(STR_CAPTION_BEGINNING)) + , m_sEnd(SwResId(STR_CAPTION_END)) + , m_sAbove(SwResId(STR_CAPTION_ABOVE)) + , m_sBelow(SwResId(STR_CAPTION_BELOW)) + , m_sNone(SwResId(SW_STR_NONE)) , pMgr(new SwFieldMgr()) , bHTMLMode(false) { diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index b5f2add08eba..b78e70fc5936 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -123,7 +123,7 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent, m_pVRulerRightCBox->Hide(); m_pVRulerCBox->SetClickHdl(LINK(this, SwContentOptPage, VertRulerHdl )); - SvxStringArray aMetricArr( SW_RES( STR_ARR_METRIC ) ); + SvxStringArray aMetricArr(ResId(STR_ARR_METRIC, *pSwResMgr)); for ( size_t i = 0; i < aMetricArr.Count(); ++i ) { const OUString sMetric = aMetricArr.GetStringByPos( i ); @@ -297,7 +297,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "PrintOptionsPage", "modules/swriter/ui/printoptionspage.ui", &rCoreSet) - , sNone(SW_RESSTR(SW_STR_NONE)) + , sNone(SwResId(SW_STR_NONE)) , bAttrModified(false) , bPreview(false) { @@ -559,9 +559,9 @@ SwStdFontTabPage::SwStdFontTabPage( vcl::Window* pParent, m_nFontGroup(FONT_GROUP_DEFAULT), - m_sScriptWestern(SW_RES(ST_SCRIPT_WESTERN)), - m_sScriptAsian(SW_RES(ST_SCRIPT_ASIAN)), - m_sScriptComplex(SW_RES(ST_SCRIPT_CTL)) + m_sScriptWestern(SwResId(ST_SCRIPT_WESTERN)), + m_sScriptAsian(SwResId(ST_SCRIPT_ASIAN)), + m_sScriptComplex(SwResId(ST_SCRIPT_CTL)) { get(m_pLabelFT,"label1"); get(m_pStandardBox,"standardbox"); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index f5b74e4b9e5e..403594c84add 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -395,7 +395,7 @@ void SwAddressControl_Impl::Resize() SwCreateAddressListDialog::SwCreateAddressListDialog( vcl::Window* pParent, const OUString& rURL, SwMailMergeConfigItem& rConfig) : SfxModalDialog(pParent, "CreateAddressList", "modules/swriter/ui/createaddresslist.ui"), - m_sAddressListFilterName( SW_RES( ST_FILTERNAME)), + m_sAddressListFilterName( SwResId( ST_FILTERNAME)), m_sURL(rURL), m_pCSVData( new SwCSVData ), m_pFindDlg(nullptr) diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 5bfc7a99c50e..7d40cd07d598 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -191,7 +191,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, , ConfigItem("Office.Writer/InsertData/DataSet", ConfigItemMode::DelayedUpdate) , aDBData(rData) - , sNoTmpl(SW_RESSTR(SW_STR_NONE)) + , sNoTmpl(SwResId(SW_STR_NONE)) , pView(&rView) , pTAutoFormat(nullptr) , pTableSet(nullptr) diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 927a09825e0c..cc6ba7230bf7 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -43,19 +43,19 @@ SwMailMergeWizard::SwMailMergeWizard(SwView& rView, std::shared_ptr<SwMailMergeC m_pSwView(&rView), m_bDocumentLoad( false ), m_xConfigItem(rItem), - m_sStarting( SW_RES( ST_STARTING )), - m_sDocumentType( SW_RES( ST_DOCUMENTTYPE )), - m_sAddressBlock( SW_RES( ST_ADDRESSBLOCK )), - m_sAddressList( SW_RES( ST_ADDRESSLIST )), - m_sGreetingsLine( SW_RES( ST_GREETINGSLINE )), - m_sLayout( SW_RES( ST_LAYOUT )), - m_sFinish( SW_RES( ST_FINISH )), + m_sStarting( SwResId( ST_STARTING )), + m_sDocumentType( SwResId( ST_DOCUMENTTYPE )), + m_sAddressBlock( SwResId( ST_ADDRESSBLOCK )), + m_sAddressList( SwResId( ST_ADDRESSLIST )), + m_sGreetingsLine( SwResId( ST_GREETINGSLINE )), + m_sLayout( SwResId( ST_LAYOUT )), + m_sFinish( SwResId( ST_FINISH )), m_nRestartPage( MM_DOCUMENTSELECTPAGE ) { defaultButton(WizardButtonFlags::NEXT); enableButtons(WizardButtonFlags::FINISH, false); - setTitleBase(SW_RESSTR( ST_MMWTITLE ) ); + setTitleBase(SwResId( ST_MMWTITLE ) ); m_pFinish->SetText(m_sFinish); m_pNextPage->SetHelpId(HID_MM_NEXT_PAGE); diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 96ab523f636b..6c9c69e81774 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -511,29 +511,29 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( { m_pFieldFT->Show(); m_pFieldCB->Show(); - SvTreeListEntry* pEntry = m_pAddressElementsLB->InsertEntry(SW_RESSTR(ST_SALUTATION)); + SvTreeListEntry* pEntry = m_pAddressElementsLB->InsertEntry(SwResId(ST_SALUTATION)); pEntry->SetUserData(reinterpret_cast<void*>((sal_Int32)USER_DATA_SALUTATION) ); - pEntry = m_pAddressElementsLB->InsertEntry(SW_RESSTR(ST_PUNCTUATION)); + pEntry = m_pAddressElementsLB->InsertEntry(SwResId(ST_PUNCTUATION)); pEntry->SetUserData(reinterpret_cast<void*>((sal_Int32)USER_DATA_PUNCTUATION) ); - pEntry = m_pAddressElementsLB->InsertEntry(SW_RESSTR(ST_TEXT)); + pEntry = m_pAddressElementsLB->InsertEntry(SwResId(ST_TEXT)); pEntry->SetUserData(reinterpret_cast<void*>((sal_Int32)USER_DATA_TEXT) ); - ResStringArray aSalutArr(SW_RES(RA_SALUTATION)); + ResStringArray aSalutArr(ResId(RA_SALUTATION, *pSwResMgr)); for(sal_uInt32 i = 0; i < aSalutArr.Count(); ++i) m_aSalutations.push_back(aSalutArr.GetString(i)); - ResStringArray aPunctArr(SW_RES(RA_PUNCTUATION)); + ResStringArray aPunctArr(ResId(RA_PUNCTUATION, *pSwResMgr)); for(sal_uInt32 i = 0; i < aPunctArr.Count(); ++i) m_aPunctuations.push_back(aPunctArr.GetString(i)); m_pDragED->SetText(" "); - SetText(SW_RESSTR(eType == GREETING_MALE ? ST_TITLE_MALE : ST_TITLE_FEMALE)); - m_pAddressElementsFT->SetText(SW_RESSTR(ST_SALUTATIONELEMENTS)); - m_pInsertFieldIB->SetQuickHelpText(SW_RESSTR(ST_INSERTSALUTATIONFIELD)); - m_pRemoveFieldIB->SetQuickHelpText(SW_RESSTR(ST_REMOVESALUTATIONFIELD)); - m_pDragFT->SetText(SW_RESSTR(ST_DRAGSALUTATION)); + SetText(SwResId(eType == GREETING_MALE ? ST_TITLE_MALE : ST_TITLE_FEMALE)); + m_pAddressElementsFT->SetText(SwResId(ST_SALUTATIONELEMENTS)); + m_pInsertFieldIB->SetQuickHelpText(SwResId(ST_INSERTSALUTATIONFIELD)); + m_pRemoveFieldIB->SetQuickHelpText(SwResId(ST_REMOVESALUTATIONFIELD)); + m_pDragFT->SetText(SwResId(ST_DRAGSALUTATION)); } else { if(eType == ADDRESSBLOCK_EDIT) - SetText(SW_RESSTR(ST_TITLE_EDIT)); + SetText(SwResId(ST_TITLE_EDIT)); m_pDragED->SetText("\n\n\n\n\n"); } @@ -894,7 +894,7 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem) pNewText->SetText("<" + rHeader + ">"); VclPtr<ListBox> pNewLB = VclPtr<ListBox>::Create(m_aWindow.get(), WB_DROPDOWN | WB_VCENTER | WB_TABSTOP); pNewText->set_mnemonic_widget(pNewLB); - pNewLB->InsertEntry(SW_RESSTR(SW_STR_NONE)); + pNewLB->InsertEntry(SwResId(SW_STR_NONE)); pNewLB->SelectEntryPos(0); pNewLB->SetDropDownLineCount(5); @@ -1154,7 +1154,7 @@ SwAssignFieldsDialog::SwAssignFieldsDialog( const OUString& rPreview, bool bIsAddressBlock) : SfxModalDialog(pParent, "AssignFieldsDialog", "modules/swriter/ui/assignfieldsdialog.ui"), - m_sNone(SW_RESSTR(SW_STR_NONE)), + m_sNone(SwResId(SW_STR_NONE)), m_rPreviewString(rPreview), m_rConfigItem(rConfigItem) { @@ -1168,14 +1168,14 @@ SwAssignFieldsDialog::SwAssignFieldsDialog( get(m_pFieldsControl, "FIELDS"); m_pFieldsControl->Init(rConfigItem); //resize the HeaderBar - OUString sAddressElement( SW_RESSTR(ST_ADDRESSELEMENT) ); - const OUString sMatchesTo( SW_RESSTR(ST_MATCHESTO) ); - const OUString sPreview( SW_RESSTR(ST_PREVIEW) ); + OUString sAddressElement( SwResId(ST_ADDRESSELEMENT) ); + const OUString sMatchesTo( SwResId(ST_MATCHESTO) ); + const OUString sPreview( SwResId(ST_PREVIEW) ); if(!bIsAddressBlock) { - m_pPreviewFI->SetText(SW_RESSTR(ST_SALUTATIONPREVIEW)); - m_pMatchingFI->SetText(SW_RESSTR(ST_SALUTATIONMATCHING)); - sAddressElement = SW_RESSTR(ST_SALUTATIONELEMENT); + m_pPreviewFI->SetText(SwResId(ST_SALUTATIONPREVIEW)); + m_pMatchingFI->SetText(SwResId(ST_SALUTATIONMATCHING)); + sAddressElement = SwResId(ST_SALUTATIONELEMENT); } Size aOutputSize(m_pFieldsControl->m_aHeaderHB->GetSizePixel()); diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index c1b3ce71cfa6..6ba3cbe9486c 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -252,13 +252,13 @@ SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent, SwMailMergeConfigItem& m_pContainer(get<SvSimpleTableContainer>("container")), m_pStop(get<PushButton>("stop")), m_pClose(get<PushButton>("close")), - m_sContinue(SW_RES( ST_CONTINUE )), + m_sContinue(SwResId( ST_CONTINUE )), m_sStop(m_pStop->GetText()), m_sTransferStatus(m_pTransferStatus->GetText()), m_sErrorStatus( m_pErrorStatus->GetText()), - m_sSendingTo( SW_RES(ST_SENDINGTO )), - m_sCompleted( SW_RES(ST_COMPLETED )), - m_sFailed( SW_RES(ST_FAILED )), + m_sSendingTo( SwResId(ST_SENDINGTO )), + m_sCompleted( SwResId(ST_COMPLETED )), + m_sFailed( SwResId(ST_FAILED )), m_bCancel(false), m_bDesctructionEnabled(false), m_pImpl(new SwSendMailDialog_Impl), @@ -273,8 +273,8 @@ SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent, SwMailMergeConfigItem& m_pStatusHB = &(m_pStatus->GetTheHeaderBar()); m_nStatusHeight = m_pContainer->get_height_request(); - OUString sTask(SW_RES(ST_TASK)); - OUString sStatus(SW_RES(ST_STATUS)); + OUString sTask(SwResId(ST_TASK)); + OUString sStatus(SwResId(ST_STATUS)); m_pStop->SetClickHdl(LINK( this, SwSendMailDialog, StopHdl_Impl)); m_pClose->SetClickHdl(LINK( this, SwSendMailDialog, CloseHdl_Impl)); diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index 5493126901cb..f1d27c661786 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -316,7 +316,7 @@ void SwMMResultPrintDialog::dispose() SwMMResultEmailDialog::SwMMResultEmailDialog() : SfxModalDialog(nullptr, "MMResultEmailDialog", "modules/swriter/ui/mmresultemaildialog.ui"), - m_sConfigureMail(SW_RES(ST_CONFIGUREMAIL)) + m_sConfigureMail(SwResId(ST_CONFIGUREMAIL)) { get(m_pMailToFT, "mailtoft"); get(m_pMailToLB, "mailto"); @@ -687,7 +687,7 @@ IMPL_LINK(SwMMResultSaveDialog, SaveOutputHdl_Impl, Button*, pButton, void) sExtension = pSfxFlt->GetWildcard().getGlob().getToken(1, '.'); sPath += "." + sExtension; } - OUString sStat = OUString(SW_RES(STR_STATSTR_LETTER)) + " " + OUString::number( nDoc ); + OUString sStat = SwResId(STR_STATSTR_LETTER) + " " + OUString::number( nDoc ); aSaveMonitor->m_pPrintInfo->SetText(sStat); //now extract a document from the target document diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 66f01dc07bdd..7da94798041f 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -92,10 +92,10 @@ void SwAddressTable::setColSizes() SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent, const uno::Reference< sdbc::XConnection>& rConnection) : SfxModalDialog(pParent, "SelectTableDialog", "modules/swriter/ui/selecttabledialog.ui") - , m_sName(SW_RES(ST_NAME)) - , m_sType(SW_RES(ST_TYPE)) - , m_sTable(SW_RES(ST_TABLE)) - , m_sQuery(SW_RES(ST_QUERY)) + , m_sName(SwResId(ST_NAME)) + , m_sType(SwResId(ST_TYPE)) + , m_sTable(SwResId(ST_TABLE)) + , m_sQuery(SwResId(ST_QUERY)) , m_xConnection(rConnection) { get(m_pPreviewPB, "preview"); diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx index 2c324045c02e..8dce604e6229 100644 --- a/sw/source/ui/dialog/macassgn.cxx +++ b/sw/source/ui/dialog/macassgn.cxx @@ -49,20 +49,20 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) switch( eType ) { case MACASSGN_AUTOTEXT: - aItem.AddEvent( OUString( SW_RES(STR_EVENT_START_INS_GLOSSARY) ), OUString(), + aItem.AddEvent( OUString( SwResId(STR_EVENT_START_INS_GLOSSARY) ), OUString(), SW_EVENT_START_INS_GLOSSARY ); - aItem.AddEvent( OUString( SW_RES(STR_EVENT_END_INS_GLOSSARY) ), OUString(), + aItem.AddEvent( OUString( SwResId(STR_EVENT_END_INS_GLOSSARY) ), OUString(), SW_EVENT_END_INS_GLOSSARY); // in order for the new handler to become active! break; case MACASSGN_ALLFRM: case MACASSGN_GRAPHIC: // graphics { - aItem.AddEvent( OUString( SW_RES(STR_EVENT_IMAGE_ERROR) ), OUString(), + aItem.AddEvent( OUString( SwResId(STR_EVENT_IMAGE_ERROR) ), OUString(), SVX_EVENT_IMAGE_ERROR); - aItem.AddEvent( OUString( SW_RES(STR_EVENT_IMAGE_ABORT) ), OUString(), + aItem.AddEvent( OUString( SwResId(STR_EVENT_IMAGE_ABORT) ), OUString(), SVX_EVENT_IMAGE_ABORT); - aItem.AddEvent( OUString( SW_RES(STR_EVENT_IMAGE_LOAD) ), OUString(), + aItem.AddEvent( OUString( SwResId(STR_EVENT_IMAGE_LOAD) ), OUString(), SVX_EVENT_IMAGE_LOAD); } SAL_FALLTHROUGH; @@ -71,13 +71,13 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) if( !bHtmlMode && (MACASSGN_FRMURL == eType || MACASSGN_ALLFRM == eType)) { - aItem.AddEvent( OUString( SW_RES( STR_EVENT_FRM_KEYINPUT_A ) ), OUString(), + aItem.AddEvent( OUString( SwResId( STR_EVENT_FRM_KEYINPUT_A ) ), OUString(), SW_EVENT_FRM_KEYINPUT_ALPHA ); - aItem.AddEvent( OUString( SW_RES( STR_EVENT_FRM_KEYINPUT_NOA ) ), OUString(), + aItem.AddEvent( OUString( SwResId( STR_EVENT_FRM_KEYINPUT_NOA ) ), OUString(), SW_EVENT_FRM_KEYINPUT_NOALPHA ); - aItem.AddEvent( OUString( SW_RES( STR_EVENT_FRM_RESIZE ) ), OUString(), + aItem.AddEvent( OUString( SwResId( STR_EVENT_FRM_RESIZE ) ), OUString(), SW_EVENT_FRM_RESIZE ); - aItem.AddEvent( OUString( SW_RES( STR_EVENT_FRM_MOVE ) ), OUString(), + aItem.AddEvent( OUString( SwResId( STR_EVENT_FRM_MOVE ) ), OUString(), SW_EVENT_FRM_MOVE ); } } @@ -85,17 +85,17 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) case MACASSGN_OLE: // OLE { if( !bHtmlMode ) - aItem.AddEvent( OUString( SW_RES(STR_EVENT_OBJECT_SELECT) ), OUString(), + aItem.AddEvent( OUString( SwResId(STR_EVENT_OBJECT_SELECT) ), OUString(), SW_EVENT_OBJECT_SELECT ); } SAL_FALLTHROUGH; case MACASSGN_INETFMT: // INetFormat-Attributes { - aItem.AddEvent( OUString( SW_RES(STR_EVENT_MOUSEOVER_OBJECT) ), OUString(), + aItem.AddEvent( OUString( SwResId(STR_EVENT_MOUSEOVER_OBJECT) ), OUString(), SFX_EVENT_MOUSEOVER_OBJECT ); - aItem.AddEvent( OUString( SW_RES(STR_EVENT_MOUSECLICK_OBJECT) ), OUString(), + aItem.AddEvent( OUString( SwResId(STR_EVENT_MOUSECLICK_OBJECT) ), OUString(), SFX_EVENT_MOUSECLICK_OBJECT); - aItem.AddEvent( OUString( SW_RES(STR_EVENT_MOUSEOUT_OBJECT) ), OUString(), + aItem.AddEvent( OUString( SwResId(STR_EVENT_MOUSEOUT_OBJECT) ), OUString(), SFX_EVENT_MOUSEOUT_OBJECT); } break; diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 71f88cc83e6d..ec7da6517db6 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -424,7 +424,7 @@ bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox) } else { - ScopedVclPtrInstance<MessageDialog>(this, SW_RES(STR_WRONG_PASSWORD), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, SwResId(STR_WRONG_PASSWORD), VclMessageType::Info)->Execute(); } } } @@ -989,7 +989,7 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, Button *, pButton, void ) bool bContent = pSectRepr->IsContent(); if( pBox->IsChecked() && bContent && rSh.HasSelection() ) { - if (RET_NO == ScopedVclPtrInstance<MessageDialog>(this, SW_RES(STR_QUERY_CONNECT), VclMessageType::Question, VclButtonsType::YesNo)->Execute()) + if (RET_NO == ScopedVclPtrInstance<MessageDialog>(this, SwResId(STR_QUERY_CONNECT), VclMessageType::Question, VclButtonsType::YesNo)->Execute()) pBox->Check( false ); } if( bFile ) @@ -1265,7 +1265,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox, void ) } else { - ScopedVclPtrInstance<MessageDialog>(pBox, SW_RES(STR_WRONG_PASSWD_REPEAT), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(pBox, SwResId(STR_WRONG_PASSWD_REPEAT), VclMessageType::Info)->Execute(); ChangePasswdHdl(pBox); break; } @@ -1702,7 +1702,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton, void ) } else { - ScopedVclPtrInstance<MessageDialog>(pButton, SW_RES(STR_WRONG_PASSWD_REPEAT), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(pButton, SwResId(STR_WRONG_PASSWD_REPEAT), VclMessageType::Info)->Execute(); } } else if(!bChange) @@ -1726,7 +1726,7 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, Button *, pButton, void ) if( pBox->IsChecked() ) { if( m_pWrtSh->HasSelection() && - RET_NO == ScopedVclPtrInstance<MessageDialog>(this, SW_RES(STR_QUERY_CONNECT), VclMessageType::Question, VclButtonsType::YesNo)->Execute()) + RET_NO == ScopedVclPtrInstance<MessageDialog>(this, SwResId(STR_QUERY_CONNECT), VclMessageType::Question, VclButtonsType::YesNo)->Execute()) pBox->Check( false ); } diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 34b00493b67f..a1fc7fa5655b 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -133,7 +133,7 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet, // Read user label from writer.cfg SwLabItem aItem(static_cast<const SwLabItem&>(rSet.Get( FN_LABEL ))); std::unique_ptr<SwLabRec> pRec(new SwLabRec); - pRec->aMake = pRec->aType = SW_RESSTR( STR_CUSTOM ); + pRec->aMake = pRec->aType = SwResId( STR_CUSTOM ); pRec->SetFromItem( aItem ); bool bDouble = false; @@ -204,7 +204,7 @@ SwLabRec* SwLabDlg::GetRecord(const OUString &rRecName, bool bCont) { SwLabRec* pRec = nullptr; bool bFound = false; - const OUString sCustom(SW_RES(STR_CUSTOM)); + const OUString sCustom(SwResId(STR_CUSTOM)); const size_t nCount = Recs().size(); for (size_t i = 0; i < nCount; ++i) @@ -380,7 +380,7 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl, ListBox&, void) const size_t nCount = GetParentSwLabDlg()->Recs().size(); size_t nLstType = 0; - const OUString sCustom(SW_RES(STR_CUSTOM)); + const OUString sCustom(SwResId(STR_CUSTOM)); //insert the entries into the sorted list box for ( size_t i = 0; i < nCount; ++i ) { diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index d272566ca190..937cfb59bd31 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -101,16 +101,16 @@ void DrawArrow(vcl::RenderContext& rRenderContext, const Point &rP1, const Point SwLabPreview::SwLabPreview(vcl::Window* pParent) : Window(pParent, 0) , m_aGrayColor(COL_LIGHTGRAY) - , m_aHDistStr(SW_RESSTR(STR_HDIST)) - , m_aVDistStr(SW_RESSTR(STR_VDIST)) - , m_aWidthStr(SW_RESSTR(STR_WIDTH)) - , m_aHeightStr(SW_RESSTR(STR_HEIGHT)) - , m_aLeftStr(SW_RESSTR(STR_LEFT)) - , m_aUpperStr(SW_RESSTR(STR_UPPER)) - , m_aColsStr(SW_RESSTR(STR_COLS)) - , m_aRowsStr(SW_RESSTR(STR_ROWS)) - , m_aPWidthStr(SW_RESSTR(STR_PWIDTH)) - , m_aPHeightStr(SW_RESSTR(STR_PHEIGHT)) + , m_aHDistStr(SwResId(STR_HDIST)) + , m_aVDistStr(SwResId(STR_VDIST)) + , m_aWidthStr(SwResId(STR_WIDTH)) + , m_aHeightStr(SwResId(STR_HEIGHT)) + , m_aLeftStr(SwResId(STR_LEFT)) + , m_aUpperStr(SwResId(STR_UPPER)) + , m_aColsStr(SwResId(STR_COLS)) + , m_aRowsStr(SwResId(STR_ROWS)) + , m_aPWidthStr(SwResId(STR_PWIDTH)) + , m_aPHeightStr(SwResId(STR_PHEIGHT)) { SetMapMode(MapUnit::MapPixel); @@ -507,7 +507,7 @@ void SwLabFormatPage::FillItem(SwLabItem& rItem) { if (bModified) { - rItem.m_aMake = rItem.m_aType = SW_RESSTR(STR_CUSTOM); + rItem.m_aMake = rItem.m_aType = SwResId(STR_CUSTOM); SwLabRec& rRec = *GetParentSwLabDlg()->Recs()[0]; rItem.m_lHDist = rRec.lHDist = static_cast< long >(GETFLDVAL(*m_pHDistField )); diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index ab5457c89b81..c72019ece137 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -247,7 +247,7 @@ void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData) { if (rDBData.sDataSource.isEmpty() && rDBData.sCommand.isEmpty()) { - m_pDocDBNameFT->SetText(SW_RESSTR(SW_STR_NONE)); + m_pDocDBNameFT->SetText(SwResId(SW_STR_NONE)); } else { diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index e556eb1f7a44..0295644857f3 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -160,7 +160,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* ) if( rProperties.getLength() ) { - pInfo = m_pTypeTLB->InsertEntry( OUString(SW_RES( STR_CUSTOM )) ); + pInfo = m_pTypeTLB->InsertEntry( SwResId( STR_CUSTOM ) ); pInfo->SetUserData(reinterpret_cast<void*>(USHRT_MAX)); for (sal_Int32 n=0; n < rProperties.getLength(); n++) diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index df89661bcc2f..35c7df610a71 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -131,7 +131,7 @@ void SwFieldDokPage::Reset(const SfxItemSet* ) case TYP_PAGENUMBERFLD: if (!bPage) { - nPos = m_pTypeLB->InsertEntry(SW_RESSTR(FMT_REF_PAGE)); + nPos = m_pTypeLB->InsertEntry(SwResId(FMT_REF_PAGE)); m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(USHRT_MAX)); bPage = true; } @@ -384,14 +384,14 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void) break; case TYP_CHAPTERFLD: - m_pValueFT->SetText(SW_RESSTR(STR_LEVEL)); + m_pValueFT->SetText(SwResId(STR_LEVEL)); if (IsFieldEdit()) m_pLevelED->SetText(OUString::number(static_cast<SwChapterField*>(GetCurField())->GetLevel() + 1)); bLevel = true; break; case TYP_PAGENUMBERFLD: - m_pValueFT->SetText( SW_RESSTR( STR_OFFSET )); + m_pValueFT->SetText( SwResId( STR_OFFSET )); if (IsFieldEdit()) m_pValueED->SetText(GetCurField()->GetPar2()); bValue = true; @@ -487,7 +487,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, ListBox&, void) } if( nTextRes ) - m_pValueFT->SetText( SW_RESSTR( nTextRes )); + m_pValueFT->SetText( SwResId( nTextRes )); } sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId) @@ -511,10 +511,10 @@ sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId) if( nSize && !m_pFormatLB->GetSelectEntryCount() ) { - m_pFormatLB->SelectEntry( SW_RESSTR(FMT_NUM_PAGEDESC) ); + m_pFormatLB->SelectEntry( SwResId(FMT_NUM_PAGEDESC) ); if( !m_pFormatLB->GetSelectEntryCount() ) { - m_pFormatLB->SelectEntry( SW_RESSTR(FMT_NUM_ARABIC) ); + m_pFormatLB->SelectEntry( SwResId(FMT_NUM_ARABIC) ); if( !m_pFormatLB->GetSelectEntryCount() ) m_pFormatLB->SelectEntryPos( 0 ); } @@ -544,7 +544,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl, ListBox&, void) sal_uInt16 nTmp = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData( m_pFormatLB->GetSelectEntryPos() )); const OUString sOldText( m_pValueFT->GetText() ); - const OUString sNewText( SW_RES( SVX_NUM_CHAR_SPECIAL == nTmp ? STR_VALUE + const OUString sNewText( SwResId( SVX_NUM_CHAR_SPECIAL == nTmp ? STR_VALUE : STR_OFFSET )); if( sOldText != sNewText ) diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index b06f044c4cd9..5b5a1a3b280f 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -245,7 +245,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void) if (nSize) { if (IsFieldEdit() && nTypeId == TYP_JUMPEDITFLD) - m_pFormatLB->SelectEntry(SW_RESSTR(FMT_MARK_BEGIN + GetCurField()->GetFormat())); + m_pFormatLB->SelectEntry(SwResId(FMT_MARK_BEGIN + GetCurField()->GetFormat())); if (!m_pFormatLB->GetSelectEntryCount()) m_pFormatLB->SelectEntryPos(0); @@ -314,15 +314,15 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void) else bInsert = false; - m_pNameFT->SetText(SW_RESSTR(STR_MACNAME)); - m_pValueFT->SetText(SW_RESSTR(STR_PROMPT)); + m_pNameFT->SetText(SwResId(STR_MACNAME)); + m_pValueFT->SetText(SwResId(STR_PROMPT)); m_pNameED->SetText(GetFieldMgr().GetMacroName()); m_pNameED->SetAccessibleName(m_pNameFT->GetText()); m_pValueED->SetAccessibleName(m_pValueFT->GetText()); break; case TYP_HIDDENPARAFLD: - m_pNameFT->SetText(SW_RESSTR(STR_COND)); + m_pNameFT->SetText(SwResId(STR_COND)); m_pNameED->SetDropEnable(true); bName = true; m_pNameED->SetAccessibleName(m_pNameFT->GetText()); @@ -331,9 +331,9 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void) case TYP_HIDDENTXTFLD: { - m_pNameFT->SetText(SW_RESSTR(STR_COND)); + m_pNameFT->SetText(SwResId(STR_COND)); m_pNameED->SetDropEnable(true); - m_pValueFT->SetText(SW_RESSTR(STR_INSTEXT)); + m_pValueFT->SetText(SwResId(STR_INSTEXT)); SwWrtShell* pSh = GetActiveWrtShell(); if (!IsFieldEdit() && pSh ) m_pValueED->SetText(pSh->GetSelText()); @@ -344,7 +344,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void) break; case TYP_CONDTXTFLD: - m_pNameFT->SetText(SW_RESSTR(STR_COND)); + m_pNameFT->SetText(SwResId(STR_COND)); m_pNameED->SetDropEnable(true); if (IsFieldEdit()) { @@ -358,15 +358,15 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void) break; case TYP_JUMPEDITFLD: - m_pNameFT->SetText(SW_RESSTR(STR_JUMPEDITFLD)); - m_pValueFT->SetText(SW_RESSTR(STR_PROMPT)); + m_pNameFT->SetText(SwResId(STR_JUMPEDITFLD)); + m_pValueFT->SetText(SwResId(STR_PROMPT)); bName = bValue = true; m_pNameED->SetAccessibleName(m_pNameFT->GetText()); m_pValueED->SetAccessibleName(m_pValueFT->GetText()); break; case TYP_INPUTFLD: - m_pValueFT->SetText(SW_RESSTR(STR_PROMPT)); + m_pValueFT->SetText(SwResId(STR_PROMPT)); bValue = true; m_pNameED->SetAccessibleName(m_pNameFT->GetText()); m_pValueED->SetAccessibleName(m_pValueFT->GetText()); @@ -374,7 +374,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void) case TYP_COMBINED_CHARS: { - m_pNameFT->SetText(SW_RESSTR(STR_COMBCHRS_FT)); + m_pNameFT->SetText(SwResId(STR_COMBCHRS_FT)); m_pNameED->SetDropEnable(true); bName = true; diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 38664a2a285a..bf4e837362ad 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -352,7 +352,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void) break; case REF_SETREFATTR: - sName = SW_RESSTR(STR_GETREFFLD); + sName = SwResId(STR_GETREFFLD); nFlag = REF_SETREFATTR; break; @@ -811,7 +811,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId) if (!IsFieldEdit()) m_pFormatLB->SelectEntry(sOldSel); else - m_pFormatLB->SelectEntry(SW_RESSTR(FMT_REF_BEGIN + GetCurField()->GetFormat())); + m_pFormatLB->SelectEntry(SwResId(FMT_REF_BEGIN + GetCurField()->GetFormat())); if (!m_pFormatLB->GetSelectEntryCount()) { diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 409c484e0090..b9dbc7541054 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -326,7 +326,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox) else { m_pNumFormatLB->Clear(); - sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SW_RESSTR(FMT_SETVAR_TEXT), 0); + sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SwResId(FMT_SETVAR_TEXT), 0); m_pNumFormatLB->SetEntryData(nPos, reinterpret_cast<void *>(ULONG_MAX)); m_pNumFormatLB->SelectEntryPos(0); } @@ -370,7 +370,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox) { bValue = true; bNumFormat = true; - m_pValueFT->SetText(SW_RESSTR(STR_FORMULA)); + m_pValueFT->SetText(SwResId(STR_FORMULA)); m_pValueED->SetDropEnable(true); } break; @@ -415,7 +415,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox) break; case TYP_INPUTFLD: - m_pValueFT->SetText(SW_RESSTR(STR_PROMPT)); + m_pValueFT->SetText(SwResId(STR_PROMPT)); if (nSelPos != LISTBOX_ENTRY_NOTFOUND) { @@ -442,7 +442,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox) { m_pNumFormatLB->Clear(); - sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SW_RESSTR(FMT_USERVAR_TEXT), 0); + sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SwResId(FMT_USERVAR_TEXT), 0); m_pNumFormatLB->SetEntryData(nPos, reinterpret_cast<void *>(ULONG_MAX)); m_pNumFormatLB->SelectEntryPos(0); } @@ -456,7 +456,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox) break; case TYP_DDEFLD: - m_pValueFT->SetText(SW_RESSTR(STR_DDE_CMD)); + m_pValueFT->SetText(SwResId(STR_DDE_CMD)); if (IsFieldEdit() || pBox) // only when interacting via mouse { @@ -525,7 +525,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox) case TYP_SETREFPAGEFLD: { bValue = false; - m_pValueFT->SetText( SW_RESSTR( STR_OFFSET )); + m_pValueFT->SetText( SwResId( STR_OFFSET )); if (IsFieldEdit() || pBox) // only when interacting via mouse m_pNameED->SetText(OUString()); @@ -752,9 +752,9 @@ void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId) { if (!IsFieldEdit() || bSpecialFormat) { - sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SW_RESSTR(FMT_MARK_TEXT), 0); + sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SwResId(FMT_MARK_TEXT), 0); m_pNumFormatLB->SetEntryData(nPos, reinterpret_cast<void *>(ULONG_MAX)); - nPos = m_pNumFormatLB->InsertEntry(SW_RESSTR(FMT_USERVAR_CMD), 1); + nPos = m_pNumFormatLB->InsertEntry(SwResId(FMT_USERVAR_CMD), 1); m_pNumFormatLB->SetEntryData(nPos, reinterpret_cast<void *>(ULONG_MAX)); } } @@ -764,7 +764,7 @@ void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId) { if (!IsFieldEdit() || bSpecialFormat) { - sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SW_RESSTR(FMT_SETVAR_TEXT), 0); + sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SwResId(FMT_SETVAR_TEXT), 0); m_pNumFormatLB->SetEntryData(nPos, reinterpret_cast<void *>(ULONG_MAX)); } } @@ -772,14 +772,14 @@ void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId) case TYP_FORMELFLD: { - sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SW_RESSTR(FMT_GETVAR_NAME), 0); + sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SwResId(FMT_GETVAR_NAME), 0); m_pNumFormatLB->SetEntryData(nPos, reinterpret_cast<void *>(ULONG_MAX)); } break; case TYP_GETFLD: { - sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SW_RESSTR(FMT_GETVAR_NAME), 0); + sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SwResId(FMT_GETVAR_NAME), 0); m_pNumFormatLB->SetEntryData(nPos, reinterpret_cast<void *>(ULONG_MAX)); } break; @@ -817,10 +817,10 @@ void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId) if (!m_pFormatLB->GetSelectEntryCount()) { - m_pFormatLB->SelectEntry(SW_RESSTR(FMT_NUM_PAGEDESC)); + m_pFormatLB->SelectEntry(SwResId(FMT_NUM_PAGEDESC)); if (!m_pFormatLB->GetSelectEntryCount()) { - m_pFormatLB->SelectEntry(SW_RESSTR(FMT_NUM_ARABIC)); + m_pFormatLB->SelectEntry(SwResId(FMT_NUM_ARABIC)); if (!m_pFormatLB->GetSelectEntryCount()) m_pFormatLB->SelectEntryPos(0); } @@ -1159,7 +1159,7 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* ) { nSubType = (nFormat == ULONG_MAX) ? nsSwGetSetExpType::GSE_STRING : nsSwGetSetExpType::GSE_EXPR; - if (nFormat == ULONG_MAX && m_pNumFormatLB->GetSelectEntry() == SW_RESSTR(FMT_USERVAR_CMD)) + if (nFormat == ULONG_MAX && m_pNumFormatLB->GetSelectEntry() == SwResId(FMT_USERVAR_CMD)) nSubType |= nsSwExtendedSubType::SUB_CMD; if (m_pInvisibleCB->IsChecked()) diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index f409f253da17..6f0076ded866 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -80,7 +80,7 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) : CheckTravel(); if( !bNew ) - SetText( SW_RES( STR_JAVA_EDIT ) ); + SetText( SwResId( STR_JAVA_EDIT ) ); RadioButtonHdl(nullptr); } diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 602227c588a3..61ffc364c731 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -447,19 +447,19 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet) switch( i ) { case 0: - aItemText = SW_RESSTR( STR_COLUMN_VALUESET_ITEM0 ) ; + aItemText = SwResId( STR_COLUMN_VALUESET_ITEM0 ) ; break; case 1: - aItemText = SW_RESSTR( STR_COLUMN_VALUESET_ITEM1 ) ; + aItemText = SwResId( STR_COLUMN_VALUESET_ITEM1 ) ; break; case 2: - aItemText = SW_RESSTR( STR_COLUMN_VALUESET_ITEM2 ) ; + aItemText = SwResId( STR_COLUMN_VALUESET_ITEM2 ) ; break; case 3: - aItemText = SW_RESSTR( STR_COLUMN_VALUESET_ITEM3 ); + aItemText = SwResId( STR_COLUMN_VALUESET_ITEM3 ); break; default: - aItemText = SW_RESSTR( STR_COLUMN_VALUESET_ITEM4 ); + aItemText = SwResId( STR_COLUMN_VALUESET_ITEM4 ); break; } m_pDefaultVS->InsertItem( i + 1, aItemText, i ); @@ -497,7 +497,7 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet) m_pLineTypeDLB->SetSourceUnit( FUNIT_TWIP ); // Fill the line styles listbox - m_pLineTypeDLB->SetNone( SVX_RESSTR( RID_SVXSTR_NONE ) ); + m_pLineTypeDLB->SetNone( SvxResId( RID_SVXSTR_NONE ) ); m_pLineTypeDLB->InsertEntry( ::editeng::SvxBorderLine::getWidthImpl(SvxBorderLineStyle::SOLID), SvxBorderLineStyle::SOLID ); @@ -926,12 +926,12 @@ void SwColumnPage::SetLabels( sal_uInt16 nVis ) const OUString sLbl3(OUString::number( nVis + 3 )); m_pLbl3->SetText(sLbl3.replaceAt(sLbl3.getLength()-1, 0, sLbl)); - const OUString sColumnWidth = SW_RESSTR( STR_ACCESS_COLUMN_WIDTH ) ; + const OUString sColumnWidth = SwResId( STR_ACCESS_COLUMN_WIDTH ) ; m_aEd1.SetAccessibleName(sColumnWidth.replaceFirst("%1", sLbl1)); m_aEd2.SetAccessibleName(sColumnWidth.replaceFirst("%1", sLbl2)); m_aEd3.SetAccessibleName(sColumnWidth.replaceFirst("%1", sLbl3)); - const OUString sDist = SW_RESSTR( STR_ACCESS_PAGESETUP_SPACING ) ; + const OUString sDist = SwResId( STR_ACCESS_PAGESETUP_SPACING ) ; m_aDistEd1.SetAccessibleName( sDist.replaceFirst("%1", sLbl1).replaceFirst("%2", sLbl2)); diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index d44ecc9e6624..5eae4234f373 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -94,7 +94,7 @@ OUString TextFilterAutoConvert::filter(const OUString &rText) SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) : SvxStandardDialog( pParent, "InsertCaptionDialog", "modules/swriter/ui/insertcaption.ui" ), - m_sNone( SW_RESSTR(SW_STR_NONE) ), + m_sNone( SwResId(SW_STR_NONE) ), m_aTextFilter(m_sNone), rView( rV ), pMgr( new SwFieldMgr(rView.GetWrtShellPtr()) ), @@ -234,14 +234,14 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) : || eType == SelectionType::DrawObject || eType == (SelectionType::DrawObject | SelectionType::Ornament)) { - m_pPosBox->InsertEntry(SW_RESSTR(STR_CAPTION_ABOVE)); - m_pPosBox->InsertEntry(SW_RESSTR(STR_CAPTION_BELOW)); + m_pPosBox->InsertEntry(SwResId(STR_CAPTION_ABOVE)); + m_pPosBox->InsertEntry(SwResId(STR_CAPTION_BELOW)); } else if(eType == SelectionType::Frame || eType == SelectionType::Text) { - m_pPosBox->InsertEntry(SW_RESSTR(STR_CAPTION_BEGINNING)); - m_pPosBox->InsertEntry(SW_RESSTR(STR_CAPTION_END )); + m_pPosBox->InsertEntry(SwResId(STR_CAPTION_BEGINNING)); + m_pPosBox->InsertEntry(SwResId(STR_CAPTION_END )); } m_pPosBox->SelectEntryPos(1); @@ -440,7 +440,7 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( vcl::Window *pParent, SwView &rV SwWrtShell &rSh = rView.GetWrtShell(); - const OUString sNone(SW_RESSTR(SW_STR_NONE)); + const OUString sNone(SwResId(SW_STR_NONE)); m_pLbLevel->InsertEntry(sNone); for( sal_uInt16 n = 0; n < MAXLEVEL; ++n ) diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 3dab469a0cc1..96282d5fc67b 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -81,7 +81,7 @@ SwFrameDlg::SwFrameDlg( SfxViewFrame* pViewFrame, if(pStr) { - SetText(GetText() + SW_RESSTR(STR_COLL_HEADER) + *pStr + ")"); + SetText(GetText() + SwResId(STR_COLL_HEADER) + *pStr + ")"); } m_nStdId = AddTabPage("type", SwFramePage::Create, nullptr); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 2c78119b8932..b26dd9916e82 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -955,9 +955,9 @@ void SwFramePage::Reset( const SfxItemSet *rSet ) else { if ( m_bNew ) - SetText( SW_RESSTR(STR_OLE_INSERT)); + SetText( SwResId(STR_OLE_INSERT)); else - SetText( SW_RESSTR(STR_OLE_EDIT)); + SetText( SwResId(STR_OLE_EDIT)); } } else diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx index 17a363d88911..ca2e467ff638 100644 --- a/sw/source/ui/frmdlg/pattern.cxx +++ b/sw/source/ui/frmdlg/pattern.cxx @@ -27,7 +27,7 @@ SwBackgroundDlg::SwBackgroundDlg(vcl::Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet) { - SetText(SW_RESSTR(STR_FRMUI_PATTERN)); + SetText(SwResId(STR_FRMUI_PATTERN)); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialog creation failed!"); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ); diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx index 0b9e07793b0a..f0e95a46cd28 100644 --- a/sw/source/ui/frmdlg/uiborder.cxx +++ b/sw/source/ui/frmdlg/uiborder.cxx @@ -33,7 +33,7 @@ SwBorderDlg::SwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes n SfxSingleTabDialog(pParent, rSet) { - SetText(SW_RESSTR(STR_FRMUI_BORDER)); + SetText(SwResId(STR_FRMUI_BORDER)); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialog creation failed!"); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index a8099fb84e9a..2e450096a084 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -222,7 +222,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet& , m_rWrtShell(rShell) , m_pExampleFrame(nullptr) , m_pParamTOXBase(pCurTOX) - , m_sUserDefinedIndex(SW_RESSTR(STR_USER_DEFINED_INDEX)) + , m_sUserDefinedIndex(SwResId(STR_USER_DEFINED_INDEX)) , m_nInitialTOXType(nToxType) , m_bEditTOX(false) , m_bExampleCreated(false) @@ -438,7 +438,7 @@ SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType) } } else if(TOX_INDEX == eType.eType) - m_pDescriptionArray[nIndex]->SetMainEntryCharStyle(SW_RESSTR(STR_POOLCHR_IDX_MAIN_ENTRY)); + m_pDescriptionArray[nIndex]->SetMainEntryCharStyle(SwResId(STR_POOLCHR_IDX_MAIN_ENTRY)); } return *m_pDescriptionArray[nIndex]; @@ -485,7 +485,7 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl, Button*, void ) if(!bExist) { - OUString sInfo(SW_RESSTR(STR_FILE_NOT_FOUND)); + OUString sInfo(SwResId(STR_FILE_NOT_FOUND)); sInfo = sInfo.replaceFirst( "%1", sTemplate ); sInfo = sInfo.replaceFirst( "%2", aOpt.GetTemplatePath() ); ScopedVclPtrInstance< InfoBox > aInfo(GetParent(), sInfo); @@ -779,9 +779,9 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, Button*, pBtn, void) SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "TocIndexPage", "modules/swriter/ui/tocindexpage.ui", &rAttrSet) - , aFromNames(SW_RES(RES_SRCTYPES)) + , aFromNames(ResId(RES_SRCTYPES, *pSwResMgr)) , pIndexRes(nullptr) - , sAutoMarkType(SW_RESSTR(STR_AUTOMARK_TYPE)) + , sAutoMarkType(SwResId(STR_AUTOMARK_TYPE)) , m_bWaitingInitialSettings(true) { get(m_pTitleED, "title"); @@ -1793,9 +1793,9 @@ void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt ) SwTOXEntryTabPage::SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "TocEntriesPage", "modules/swriter/ui/tocentriespage.ui", &rAttrSet) - , sDelimStr(SW_RESSTR(STR_DELIM)) - , sNoCharStyle(SW_RESSTR(STR_NO_CHAR_STYLE)) - , sNoCharSortKey(SW_RESSTR(STR_NOSORTKEY)) + , sDelimStr(SwResId(STR_DELIM)) + , sNoCharStyle(SwResId(STR_NO_CHAR_STYLE)) + , sNoCharSortKey(SwResId(STR_NOSORTKEY)) , m_pCurrentForm(nullptr) , bInLevelHdl(false) { @@ -1919,7 +1919,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAt //fill the types in for (sal_uInt16 i = 0; i < AUTH_FIELD_END; ++i) { - sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SW_RESSTR(STR_AUTH_FIELD_START + i)); + sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_START + i)); m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast< void * >(sal::static_int_cast< sal_uIntPtr >(i))); } sal_Int32 nPos = m_pFirstKeyLB->InsertEntry(sNoCharSortKey); @@ -2255,7 +2255,7 @@ void SwTOXEntryTabPage::PreTokenButtonRemoved(const SwFormToken& rToken) { //fill it into the ListBox sal_uInt32 nData = rToken.nAuthorityField; - sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SW_RESSTR(STR_AUTH_FIELD_START + nData)); + sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_START + nData)); m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast<void*>((sal_uIntPtr)nData)); } @@ -2324,7 +2324,7 @@ IMPL_LINK(SwTOXEntryTabPage, InsertTokenHdl, Button*, pBtn, void) { sText = SwForm::GetFormLinkStt(); eTokenType = TOKEN_LINK_START; - sCharStyle = SW_RES(STR_POOLCHR_TOXJUMP); + sCharStyle = SwResId(STR_POOLCHR_TOXJUMP); } else if(pBtn == m_pTabPB) { @@ -2380,7 +2380,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox, void) m_pAuthFieldsLB->Clear(); for( sal_uInt32 i = 0; i < AUTH_FIELD_END; i++) { - sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SW_RESSTR(STR_AUTH_FIELD_START + i)); + sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_START + i)); m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast<void*>((sal_uIntPtr)i)); } @@ -2644,7 +2644,7 @@ void SwTOXEntryTabPage::SetWrtShell(SwWrtShell& rSh) { SwDocShell* pDocSh = rSh.GetView().GetDocShell(); ::FillCharStyleListBox(*m_pCharStyleLB, pDocSh, true, true); - const OUString sDefault(SW_RES(STR_POOLCOLL_STANDARD)); + const OUString sDefault(SwResId(STR_POOLCOLL_STANDARD)); for(sal_Int32 i = 0; i < m_pCharStyleLB->GetEntryCount(); i++) { const OUString sEntry = m_pCharStyleLB->GetEntry(i); @@ -2680,7 +2680,7 @@ SwTokenWindow::SwTokenWindow(vcl::Window* pParent) , m_pForm(nullptr) , m_nLevel(0) , m_bValid(false) - , m_sCharStyle(SW_RESSTR(STR_CHARSTYLE)) + , m_sCharStyle(SwResId(STR_CHARSTYLE)) , m_pActiveCtrl(nullptr) , m_pParent(nullptr) { @@ -2696,18 +2696,18 @@ SwTokenWindow::SwTokenWindow(vcl::Window* pParent) sal_uInt32 nTextId = STR_BUTTON_TEXT_START + i; if( STR_TOKEN_ENTRY_TEXT == nTextId ) nTextId = STR_TOKEN_ENTRY; - m_aButtonTexts[i] = SW_RESSTR(nTextId); + m_aButtonTexts[i] = SwResId(nTextId); sal_uInt32 nHelpId = STR_BUTTON_HELP_TEXT_START + i; if(STR_TOKEN_HELP_ENTRY_TEXT == nHelpId) nHelpId = STR_TOKEN_HELP_ENTRY; - m_aButtonHelpTexts[i] = SW_RESSTR(nHelpId); + m_aButtonHelpTexts[i] = SwResId(nHelpId); } - m_sAccessibleName = SW_RESSTR(STR_STRUCTURE); - m_sAdditionalAccnameString1 = SW_RESSTR(STR_ADDITIONAL_ACCNAME_STRING1); - m_sAdditionalAccnameString2 = SW_RESSTR(STR_ADDITIONAL_ACCNAME_STRING2); - m_sAdditionalAccnameString3 = SW_RESSTR(STR_ADDITIONAL_ACCNAME_STRING3); + m_sAccessibleName = SwResId(STR_STRUCTURE); + m_sAdditionalAccnameString1 = SwResId(STR_ADDITIONAL_ACCNAME_STRING1); + m_sAdditionalAccnameString2 = SwResId(STR_ADDITIONAL_ACCNAME_STRING2); + m_sAdditionalAccnameString3 = SwResId(STR_ADDITIONAL_ACCNAME_STRING3); Link<Button*,void> aLink(LINK(this, SwTokenWindow, ScrollHdl)); m_pLeftScrollWin->SetClickHdl(aLink); @@ -3648,7 +3648,7 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& ) // display form pattern without title // display 1st TemplateEntry - OUString aStr( SW_RES( STR_TITLE )); + OUString aStr( SwResId( STR_TITLE )); if( !m_pCurrentForm->GetTemplate( 0 ).isEmpty() ) { aStr += " " + OUStringLiteral1(aDeliStart) @@ -3662,11 +3662,11 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& ) if( TOX_INDEX == m_pCurrentForm->GetTOXType() && FORM_ALPHA_DELIMITTER == i ) { - aStr = SW_RESSTR(STR_ALPHA); + aStr = SwResId(STR_ALPHA); } else { - aStr = SW_RESSTR(STR_LEVEL) + OUString::number( + aStr = SwResId(STR_LEVEL) + OUString::number( TOX_INDEX == m_pCurrentForm->GetTOXType() ? i - 1 : i ); } if( !m_pCurrentForm->GetTemplate( i ).isEmpty() ) diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index cc5e6ee1567b..a4b817296e76 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -135,7 +135,7 @@ SwIndexMarkPane::SwIndexMarkPane(Dialog &rDialog, bool bNewDlg, m_pPhoneticED2->Show(); } - rDialog.SetText( SW_RESSTR( bNewMark ? STR_IDXMRK_INSERT : STR_IDXMRK_EDIT)); + rDialog.SetText( SwResId( bNewMark ? STR_IDXMRK_INSERT : STR_IDXMRK_EDIT)); m_pDelBT->SetClickHdl(LINK(this,SwIndexMarkPane, DelHdl)); m_pPrevBT->SetClickHdl(LINK(this,SwIndexMarkPane, PrevHdl)); @@ -1115,7 +1115,7 @@ SwAuthorMarkPane::SwAuthorMarkPane(Dialog &rDialog, bool bNewDlg) m_pFromDocContentRB->SetClickHdl(LINK(this,SwAuthorMarkPane, ChangeSourceHdl)); m_pEntryED->SetModifyHdl(LINK(this,SwAuthorMarkPane, EditModifyHdl)); - m_rDialog.SetText(SW_RESSTR( + m_rDialog.SetText(SwResId( bNewEntry ? STR_AUTHMRK_INSERT : STR_AUTHMRK_EDIT)); m_pEntryED->Show(!bNewEntry); @@ -1224,7 +1224,7 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl, Button*, void) bDifferent |= m_sFields[i] != pEntry->GetAuthorField((ToxAuthorityField)i); if(bDifferent) { - ScopedVclPtrInstance< MessageDialog > aQuery(&m_rDialog, SW_RES(STR_QUERY_CHANGE_AUTH_ENTRY), VclMessageType::Question, VclButtonsType::YesNo); + ScopedVclPtrInstance< MessageDialog > aQuery(&m_rDialog, SwResId(STR_QUERY_CHANGE_AUTH_ENTRY), VclMessageType::Question, VclButtonsType::YesNo); if(RET_YES != aQuery->Execute()) return; } @@ -1462,14 +1462,14 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent, pFixedTexts[nIndex]->set_grid_left_attach(0); pFixedTexts[nIndex]->set_grid_top_attach(bLeft ? nLeftRow : nRightRow); - pFixedTexts[nIndex]->SetText(SW_RES(STR_AUTH_FIELD_START + aCurInfo.nToxField)); + pFixedTexts[nIndex]->SetText(SwResId(STR_AUTH_FIELD_START + aCurInfo.nToxField)); pFixedTexts[nIndex]->Show(); pEdits[nIndex] = nullptr; if( AUTH_FIELD_AUTHORITY_TYPE == aCurInfo.nToxField ) { pTypeListBox = VclPtr<ListBox>::Create(bLeft ? pLeft : pRight, WB_DROPDOWN|WB_BORDER|WB_VCENTER); for(int j = 0; j < AUTH_TYPE_END; j++) - pTypeListBox->InsertEntry(SW_RESSTR(STR_AUTH_TYPE_START + j)); + pTypeListBox->InsertEntry(SwResId(STR_AUTH_TYPE_START + j)); if(!pFields[aCurInfo.nToxField].isEmpty()) { pTypeListBox->SelectEntryPos(pFields[aCurInfo.nToxField].toInt32()); diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index fdf2c1dd1b95..cf6e0786de28 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -322,7 +322,7 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg(vcl::Window* pParent, SwWrtShell& rS, S m_pEditBox->SetText(m_pBookmarksBox->GetNameProposal()); m_pEditBox->SetCursorAtLast(); - sRemoveWarning = OUString(SW_RES(STR_REMOVE_WARNING)); + sRemoveWarning = SwResId(STR_REMOVE_WARNING); } SwInsertBookmarkDlg::~SwInsertBookmarkDlg() @@ -349,9 +349,9 @@ BookmarkTable::BookmarkTable(SvSimpleTableContainer& rParent) : SetTabs(nTabs, MapUnit::MapPixel); SetSelectionMode(SelectionMode::Multiple); - InsertHeaderEntry(OUString(SW_RES(STR_PAGE))); - InsertHeaderEntry(OUString(SW_RES(STR_BOOKMARK_NAME))); - InsertHeaderEntry(OUString(SW_RES(STR_BOOKMARK_TEXT))); + InsertHeaderEntry(SwResId(STR_PAGE)); + InsertHeaderEntry(SwResId(STR_BOOKMARK_NAME)); + InsertHeaderEntry(SwResId(STR_BOOKMARK_TEXT)); rParent.SetTable(this); } @@ -428,7 +428,7 @@ void BookmarkTable::SelectByName(const OUString& sName) OUString BookmarkTable::GetNameProposal() { - OUString sDefaultBookmarkName = SW_RES(STR_BOOKMARK_DEF_NAME); + OUString sDefaultBookmarkName = SwResId(STR_BOOKMARK_DEF_NAME); sal_Int32 nHighestBookmarkId = 0; SvTreeListEntry* pEntry = First(); while (pEntry) diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index bd1ab18405e6..7eaa028790ff 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -149,9 +149,9 @@ void SwGlossaryGroupDlg::Apply() } } OUString sTitle( it->getToken(1, '\t') ); - const OUString sMsg(SW_RESSTR(STR_QUERY_DELETE_GROUP1) + const OUString sMsg(SwResId(STR_QUERY_DELETE_GROUP1) + sTitle - + SW_RESSTR(STR_QUERY_DELETE_GROUP2)); + + SwResId(STR_QUERY_DELETE_GROUP2)); ScopedVclPtrInstance< QueryBox > aQuery(this->GetParent(), WB_YES_NO|WB_DEF_NO, sMsg ); if(RET_YES == aQuery->Execute()) pGlosHdl->DelGroup( sDelGroup ); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index a19a96e61bb4..68120c772a25 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -192,7 +192,7 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl * pGlosHdl, SwWrtShell *pWrtShell) : SvxStandardDialog(&pViewFrame->GetWindow(), "AutoTextDialog", "modules/swriter/ui/autotext.ui") - , sReadonlyPath(SW_RESSTR(STR_READONLY_PATH)) + , sReadonlyPath(SwResId(STR_READONLY_PATH)) , pExampleFrame(nullptr) , pGlossaryHdl(pGlosHdl) , bResume(false) @@ -465,7 +465,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn, bool ) const OUString aShortName(m_pShortNameEdit->GetText()); if(pGlossaryHdl->HasShortName(aShortName)) { - ScopedVclPtrInstance<MessageDialog>(this, SW_RES(STR_DOUBLE_SHORTNAME), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, SwResId(STR_DOUBLE_SHORTNAME), VclMessageType::Info)->Execute(); m_pShortNameEdit->SetSelection(Selection(0, SELECTION_MAX)); m_pShortNameEdit->GrabFocus(); return true; @@ -592,7 +592,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn, bool ) Init(); else { - ScopedVclPtrInstance<MessageDialog>(this, SW_RES( STR_NO_GLOSSARIES ), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, SwResId( STR_NO_GLOSSARIES ), VclMessageType::Info)->Execute(); } } } @@ -691,7 +691,7 @@ void SwGlossaryDlg::Init() const sal_Int32 nSelPath = ::GetCurrGlosGroup().getToken(1, GLOS_DELIM).toInt32(); // #i66304# - "My AutoText" comes from mytexts.bau, but should be translated const OUString sMyAutoTextEnglish("My AutoText"); - const OUString sMyAutoTextTranslated(SW_RES(STR_MY_AUTOTEXT)); + const OUString sMyAutoTextTranslated(SwResId(STR_MY_AUTOTEXT)); for(size_t nId = 0; nId < nCnt; ++nId ) { OUString sTitle; @@ -805,7 +805,7 @@ IMPL_LINK_NOARG(SwNewGlosNameDlg, Rename, Button*, void) if( pDlg->pGlossaryHdl->HasShortName(m_pNewShort->GetText()) && sNew != m_pOldShort->GetText() ) { - ScopedVclPtrInstance<MessageDialog>(this, SW_RES(STR_DOUBLE_SHORTNAME), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, SwResId(STR_DOUBLE_SHORTNAME), VclMessageType::Info)->Execute(); m_pNewShort->GrabFocus(); } else @@ -828,7 +828,7 @@ IMPL_LINK( SwGlossaryDlg, CheckBoxHdl, Button *, pBox, void ) // TreeListBox for groups and blocks SwGlTreeListBox::SwGlTreeListBox(vcl::Window* pParent, WinBits nBits) : SvTreeListBox(pParent, nBits) - , sReadonly(SW_RESSTR(SW_STR_READONLY)), + , sReadonly(SwResId(SW_STR_READONLY)), pDragEntry(nullptr) { SetDragDropMode( DragDropMode::CTRL_MOVE|DragDropMode::CTRL_COPY ); @@ -1141,7 +1141,7 @@ void SwGlossaryDlg::DeleteEntry() const bool bExists = nullptr != pChild; const bool bIsGroup = pEntry && !pParent; - ScopedVclPtrInstance< MessageDialog > aQuery(this, SW_RES(STR_QUERY_DELETE), VclMessageType::Question, VclButtonsType::YesNo); + ScopedVclPtrInstance< MessageDialog > aQuery(this, SwResId(STR_QUERY_DELETE), VclMessageType::Question, VclButtonsType::YesNo); if (bExists && !bIsGroup && RET_YES == aQuery->Execute()) { if (!aTitle.isEmpty() && pGlossaryHdl->DelGlossary(aShortName)) diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index ae5ce7397968..b31af09f6f29 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -147,7 +147,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw) m_pNumberingOnCB->Check(rInf.IsPaintLineNumbers()); // Header/Footer Line Numbering - rtl::Reference< SwDocStyleSheet > xStyleSheet = lcl_getDocStyleSheet(SW_RESSTR(STR_POOLCOLL_FOOTER), pSh); + rtl::Reference< SwDocStyleSheet > xStyleSheet = lcl_getDocStyleSheet(SwResId(STR_POOLCOLL_FOOTER), pSh); if(xStyleSheet.is()) { SfxItemSet& rSet = xStyleSheet->GetItemSet(); @@ -244,8 +244,8 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl, Button*, void) pSh->SetLineNumberInfo(aInf); // Set LineNumber explicitly for Header and Footer - lcl_setLineNumbering(SW_RESSTR(STR_POOLCOLL_FOOTER), pSh, m_pNumberingOnFooterHeader->IsChecked()); - lcl_setLineNumbering(SW_RESSTR(STR_POOLCOLL_HEADER), pSh, m_pNumberingOnFooterHeader->IsChecked()); + lcl_setLineNumbering(SwResId(STR_POOLCOLL_FOOTER), pSh, m_pNumberingOnFooterHeader->IsChecked()); + lcl_setLineNumbering(SwResId(STR_POOLCOLL_HEADER), pSh, m_pNumberingOnFooterHeader->IsChecked()); if( m_pNumberingOnFooterHeader->IsChecked()) m_pNumberingOnFooterHeader->SetState(TRISTATE_TRUE); else diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index f58153e81672..2a8aa76ca608 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -421,7 +421,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OutlineNumberingPage", "modules/swriter/ui/outlinenumberingpage.ui", &rSet) - , aNoFormatName(SW_RESSTR(SW_STR_NONE)) + , aNoFormatName(SwResId(SW_STR_NONE)) , pSh(nullptr) , pNumRule(nullptr) , pCollNames(nullptr) diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index b89ad0779d89..65f5829dc936 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -198,7 +198,7 @@ void SwFootNotePage::Reset(const SfxItemSet *rSet) // Separator style m_pLineTypeBox->SetSourceUnit( FUNIT_TWIP ); - m_pLineTypeBox->SetNone(SW_RESSTR(SW_STR_NONE)); + m_pLineTypeBox->SetNone(SwResId(SW_STR_NONE)); m_pLineTypeBox->InsertEntry( ::editeng::SvxBorderLine::getWidthImpl(SvxBorderLineStyle::SOLID), SvxBorderLineStyle::SOLID ); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index ab338be9ce13..a6a2b11b3a50 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -108,9 +108,9 @@ static bool lcl_GetSelTable( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY ) // init list SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell) : SvxStandardDialog(pParent, "SortDialog", "modules/swriter/ui/sortdialog.ui") - , aColText(SW_RES(STR_COL)) - , aRowText(SW_RES(STR_ROW)) - , aNumericText(SW_RES(STR_NUMERIC)) + , aColText(SwResId(STR_COL)) + , aRowText(SwResId(STR_ROW)) + , aNumericText(SwResId(STR_NUMERIC)) , rSh(rShell) , pColRes(nullptr) , nX(99) @@ -365,7 +365,7 @@ void SwSortDlg::Apply() } if( !bRet ) - ScopedVclPtrInstance<MessageDialog>(this->GetParent(), SW_RES(STR_SRTERR), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(this->GetParent(), SwResId(STR_SRTERR), VclMessageType::Info)->Execute(); } IMPL_LINK( SwSortDlg, DelimHdl, Button*, pButton, void ) diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index 4c67c428076f..d37c808cce8a 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -95,7 +95,7 @@ void SwConvertTableDlg::GetValues( sal_Unicode& rDelim, SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable ) : SfxModalDialog(&rView.GetViewFrame()->GetWindow(), "ConvertTextTableDialog", "modules/swriter/ui/converttexttable.ui" ) - , sConvertTextTable(SW_RES(STR_CONVERT_TEXT_TABLE)) + , sConvertTextTable(SwResId(STR_CONVERT_TEXT_TABLE)) , pTAutoFormat(nullptr) , pShell(&rView.GetWrtShell()) { diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 603fa93c7fb5..465fdc9c4b62 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -628,7 +628,7 @@ DeactivateRC SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) OUString sTableName = m_pNameED->GetText(); if(sTableName.indexOf(' ') != -1) { - ScopedVclPtrInstance<MessageDialog>(this, SW_RES(STR_WRONG_TABLENAME), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, SwResId(STR_WRONG_TABLENAME), VclMessageType::Info)->Execute(); m_pNameED->GrabFocus(); return DeactivateRC::KeepPage; } diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 0af33923bf71..5e5701f3ce80 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -142,13 +142,13 @@ void SwStringInputDlg::dispose() SwAutoFormatDlg::SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pWrtShell, bool bAutoFormat, const SwTableAutoFormat* pSelFormat ) : SfxModalDialog(pParent, "AutoFormatTableDialog", "modules/swriter/ui/autoformattable.ui") - , aStrTitle(SW_RES(STR_ADD_AUTOFORMAT_TITLE)) - , aStrLabel(SW_RES(STR_ADD_AUTOFORMAT_LABEL)) - , aStrClose(SW_RES(STR_BTN_AUTOFORMAT_CLOSE)) - , aStrDelTitle(SW_RES(STR_DEL_AUTOFORMAT_TITLE)) - , aStrDelMsg(SW_RES(STR_DEL_AUTOFORMAT_MSG)) - , aStrRenameTitle(SW_RES(STR_RENAME_AUTOFORMAT_TITLE)) - , aStrInvalidFormat(SW_RES(STR_INVALID_AUTOFORMAT_NAME)) + , aStrTitle(SwResId(STR_ADD_AUTOFORMAT_TITLE)) + , aStrLabel(SwResId(STR_ADD_AUTOFORMAT_LABEL)) + , aStrClose(SwResId(STR_BTN_AUTOFORMAT_CLOSE)) + , aStrDelTitle(SwResId(STR_DEL_AUTOFORMAT_TITLE)) + , aStrDelMsg(SwResId(STR_DEL_AUTOFORMAT_MSG)) + , aStrRenameTitle(SwResId(STR_RENAME_AUTOFORMAT_TITLE)) + , aStrInvalidFormat(SwResId(STR_INVALID_AUTOFORMAT_NAME)) , pShell(pWrtShell) , nIndex(0) , nDfltStylePos(0) @@ -509,13 +509,13 @@ AutoFormatPreview::AutoFormatPreview(vcl::Window* pParent, WinBits nStyle) : aVD ( VclPtr<VirtualDevice>::Create(*this) ), bFitWidth ( false ), mbRTL ( false ), - aStrJan ( SW_RES( STR_JAN ) ), - aStrFeb ( SW_RES( STR_FEB ) ), - aStrMar ( SW_RES( STR_MAR ) ), - aStrNorth ( SW_RES( STR_NORTH ) ), - aStrMid ( SW_RES( STR_MID ) ), - aStrSouth ( SW_RES( STR_SOUTH ) ), - aStrSum ( SW_RES( STR_SUM ) ) + aStrJan ( SwResId( STR_JAN ) ), + aStrFeb ( SwResId( STR_FEB ) ), + aStrMar ( SwResId( STR_MAR ) ), + aStrNorth ( SwResId( STR_NORTH ) ), + aStrMid ( SwResId( STR_MID ) ), + aStrSouth ( SwResId( STR_SOUTH ) ), + aStrSum ( SwResId( STR_SUM ) ) { uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); m_xBreak = i18n::BreakIterator::create(xContext); |