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 /sw | |
| 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 'sw')
153 files changed, 719 insertions, 716 deletions
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 9c40203b5402..5ad4445bebdc 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SW_INC_SWTYPES_HXX #define INCLUDED_SW_INC_SWTYPES_HXX #include <rtl/ustring.hxx> +#include <tools/resid.hxx> #include <tools/solar.h> #include <tools/mapunit.hxx> #include <SwGetPoolIdFromName.hxx> @@ -132,10 +133,12 @@ const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm #define INIT_SEQ_FLDTYPES 4 extern ResMgr* pSwResMgr; - // defined in sw/source/uibase/app/swmodule.cxx for the sw library and in - // sw/source/ui/dialog/swdialmgr.cxx for the swui library -#define SW_RES(i) ResId(i,*pSwResMgr) -#define SW_RESSTR(i) SW_RES(i).toString() +// defined in sw/source/uibase/app/swmodule.cxx for the sw library and in +// sw/source/ui/dialog/swdialmgr.cxx for the swui library +inline OUString SwResId(sal_uInt16 nId) +{ + return ResId(nId, *pSwResMgr); +} css::uno::Reference< css::linguistic2::XSpellChecker1 > GetSpellChecker(); css::uno::Reference< css::linguistic2::XHyphenator > GetHyphenator(); diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 4f728e38c36e..5bd02d5966ca 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -1415,7 +1415,7 @@ OUString SwAccessibleContext::GetResource( sal_uInt16 nResId, { SolarMutexGuard aGuard; - sStr = SW_RESSTR( nResId ); + sStr = SwResId( nResId ); } if( pArg1 ) diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index e3494ff9ef8b..d88d76272a56 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -3338,7 +3338,7 @@ OUString SwCursorShell::GetCursorDescr() const OUString aResult; if (IsMultiSelection()) - aResult += SW_RES(STR_MULTISEL); + aResult += SwResId(STR_MULTISEL); else aResult = SwDoc::GetPaMDescr(*GetCursor()); diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx index cfba274b6c94..d4ffd65bed88 100644 --- a/sw/source/core/crsr/findcoll.cxx +++ b/sw/source/core/crsr/findcoll.cxx @@ -77,7 +77,7 @@ sal_uLong SwCursor::Find( const SwTextFormatColl& rFormatColl, SwDocPositions nS { SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, rFormatColl.GetName()); - aRewriter.AddRule(UndoArg2, SW_RES(STR_YIELDS)); + aRewriter.AddRule(UndoArg2, SwResId(STR_YIELDS)); aRewriter.AddRule(UndoArg3, pReplFormatColl->GetName()); pDoc->GetIDocumentUndoRedo().StartUndo( SwUndoId::UI_REPLACE_STYLE, diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index 7fa153a04e4d..65238ea36193 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -1646,13 +1646,13 @@ void DocumentFieldsManager::InitFieldTypes() // is being called by the CTO // MIB 14.04.95: In Sw3StringPool::Setup (sw3imp.cxx) and // lcl_sw3io_InSetExpField (sw3field.cxx) now also mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc, - SW_RESSTR(STR_POOLCOLL_LABEL_ABB), nsSwGetSetExpType::GSE_SEQ) ); + SwResId(STR_POOLCOLL_LABEL_ABB), nsSwGetSetExpType::GSE_SEQ) ); mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc, - SW_RESSTR(STR_POOLCOLL_LABEL_TABLE), nsSwGetSetExpType::GSE_SEQ) ); + SwResId(STR_POOLCOLL_LABEL_TABLE), nsSwGetSetExpType::GSE_SEQ) ); mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc, - SW_RESSTR(STR_POOLCOLL_LABEL_FRAME), nsSwGetSetExpType::GSE_SEQ) ); + SwResId(STR_POOLCOLL_LABEL_FRAME), nsSwGetSetExpType::GSE_SEQ) ); mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc, - SW_RESSTR(STR_POOLCOLL_LABEL_DRAWING), nsSwGetSetExpType::GSE_SEQ) ); + SwResId(STR_POOLCOLL_LABEL_DRAWING), nsSwGetSetExpType::GSE_SEQ) ); assert( mpFieldTypes->size() == INIT_FLDTYPES ); } diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index b9e6b39e5025..fd8e3c21488f 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -2198,7 +2198,7 @@ bool DocumentRedlineManager::AcceptRedline( const SwPaM& rPam, bool bCallDelete { SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, OUString::number(nRet)); - aTmpStr = aRewriter.Apply(OUString(SW_RES(STR_N_REDLINES))); + aTmpStr = aRewriter.Apply(SwResId(STR_N_REDLINES)); } SwRewriter aRewriter; @@ -2312,7 +2312,7 @@ bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete { SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, OUString::number(nRet)); - aTmpStr = aRewriter.Apply(OUString(SW_RES(STR_N_REDLINES))); + aTmpStr = aRewriter.Apply(SwResId(STR_N_REDLINES)); } SwRewriter aRewriter; diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 6cc69f7818ec..8ad76e78e847 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -1688,16 +1688,16 @@ OUString SwDoc::GetPaMDescr(const SwPaM & rPam) const sal_Int32 nStart = rPam.Start()->nContent.GetIndex(); const sal_Int32 nEnd = rPam.End()->nContent.GetIndex(); - return SW_RESSTR(STR_START_QUOTE) + return SwResId(STR_START_QUOTE) + ShortenString(pTextNode->GetText().copy(nStart, nEnd - nStart), nUndoStringLength, - SW_RESSTR(STR_LDOTS)) - + SW_RESSTR(STR_END_QUOTE); + SwResId(STR_LDOTS)) + + SwResId(STR_END_QUOTE); } } else { - return SW_RESSTR(STR_PARAGRAPHS); + return SwResId(STR_PARAGRAPHS); } return OUString("??"); diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 9c11f2ae2f0b..afaf60bfa94d 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -2224,7 +2224,7 @@ OUString SwDoc::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoNum ) c else { pChkStr = nullptr; - aName = SW_RESSTR( STR_NUMRULE_DEFNAME ); + aName = SwResId( STR_NUMRULE_DEFNAME ); } sal_uInt16 nNum(0), nTmp, nFlagSize = ( mpNumRuleTable->size() / 8 ) +2; diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 0490bd63ff7e..2a2272dc1fcf 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -976,7 +976,7 @@ void SwRedlineData::SetExtraData( const SwRedlineExtraData* pData ) OUString SwRedlineData::GetDescr() const { - return SW_RES(STR_REDLINE_INSERT + GetType()); + return SwResId(STR_REDLINE_INSERT + GetType()); } sal_uInt32 SwRangeRedline::m_nLastId = 1; @@ -1761,9 +1761,9 @@ OUString SwRangeRedline::GetDescr() } // replace $1 in description by description of the redlines text - const OUString aTmpStr = SW_RESSTR(STR_START_QUOTE) - + ShortenString(pPaM->GetText(), nUndoStringLength, SW_RESSTR(STR_LDOTS)) - + SW_RESSTR(STR_END_QUOTE); + const OUString aTmpStr = SwResId(STR_START_QUOTE) + + ShortenString(pPaM->GetText(), nUndoStringLength, SwResId(STR_LDOTS)) + + SwResId(STR_END_QUOTE); SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, aTmpStr); diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 75cb237c5f36..87a7b43c9055 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -975,7 +975,7 @@ void SwNoTextFrame::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfAr nResId = STR_COMCORE_READERROR; } if ( nResId ) - aText = SW_RESSTR( nResId ); + aText = SwResId( nResId ); ::lcl_PaintReplacement( aAlignedGrfArea, aText, *pShell, this, true ); } diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx index d19f7eac6545..2f9fde22e263 100644 --- a/sw/source/core/edit/eddel.cxx +++ b/sw/source/core/edit/eddel.cxx @@ -124,7 +124,7 @@ long SwEditShell::Delete() if( bUndo ) // more than one selection? { SwRewriter aRewriter; - aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_MULTISEL)); + aRewriter.AddRule(UndoArg1, SwResId(STR_MULTISEL)); GetDoc()->GetIDocumentUndoRedo().StartUndo(SwUndoId::DELETE, &aRewriter); } diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index f217f00467a0..6b458fe418c7 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -593,7 +593,7 @@ void SwAuthorityField::SetPar1(const OUString& rStr) OUString SwAuthorityField::GetDescription() const { - return SW_RES(STR_AUTHORITY_ENTRY); + return SwResId(STR_AUTHORITY_ENTRY); } const char* const aFieldNames[] = diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 38cc39218c16..a3ec6e1034ec 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -1671,7 +1671,7 @@ OUString SwPostItField::Expand() const OUString SwPostItField::GetDescription() const { - return SW_RES(STR_NOTE); + return SwResId(STR_NOTE); } SwField* SwPostItField::Copy() const diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 4dcb10a43843..4a7ff47dd136 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -743,7 +743,7 @@ OUString SwFormulaField::GetExpandedFormula() const OUString SwField::GetDescription() const { - return SW_RES(STR_FIELD); + return SwResId(STR_FIELD); } bool SwField::IsClickable() const diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 4dc9f4eacb4a..6d5367f88004 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -213,7 +213,7 @@ SwGetRefField::~SwGetRefField() OUString SwGetRefField::GetDescription() const { - return SW_RES(STR_REFERENCE); + return SwResId(STR_REFERENCE); } sal_uInt16 SwGetRefField::GetSubType() const @@ -773,7 +773,7 @@ void SwGetRefField::ConvertProgrammaticToUIName() break; } if( nResId != USHRT_MAX ) - SetPar1(SW_RESSTR( nResId )); + SetPar1(SwResId( nResId )); } } } diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx index 8585d8b2bdc2..b31e2705d9bc 100644 --- a/sw/source/core/fields/scrptfld.cxx +++ b/sw/source/core/fields/scrptfld.cxx @@ -43,7 +43,7 @@ SwScriptField::SwScriptField( SwScriptFieldType* pInitType, OUString SwScriptField::GetDescription() const { - return SW_RES(STR_SCRIPT); + return SwResId(STR_SCRIPT); } OUString SwScriptField::Expand() const diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index edf4cb9dff26..aa9ee085049b 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -117,7 +117,7 @@ namespace { if( pLineEndList.is() ) { - OUString aArrowName( SVX_RES(nResId) ); + OUString aArrowName( SvxResId(nResId) ); long nCount = pLineEndList->Count(); long nIndex; for( nIndex = 0L; nIndex < nCount; nIndex++ ) @@ -955,9 +955,9 @@ void SwFEShell::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt16 nSlot case SID_LINE_ARROWS: { // connector with arrow ends - rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow)); + rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW), aArrow)); rAttr.Put(XLineStartWidthItem(nWidth)); - rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow)); + rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_ARROW), aArrow)); rAttr.Put(XLineEndWidthItem(nWidth)); } break; @@ -967,7 +967,7 @@ void SwFEShell::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt16 nSlot case SID_LINE_ARROW_SQUARE: { // connector with arrow start - rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow)); + rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW), aArrow)); rAttr.Put(XLineStartWidthItem(nWidth)); } break; @@ -977,7 +977,7 @@ void SwFEShell::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt16 nSlot case SID_LINE_SQUARE_ARROW: { // connector with arrow end - rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow)); + rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_ARROW), aArrow)); rAttr.Put(XLineEndWidthItem(nWidth)); } break; @@ -989,7 +989,7 @@ void SwFEShell::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt16 nSlot case SID_LINE_ARROW_CIRCLE: { // circle end - rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle)); + rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle)); rAttr.Put(XLineEndWidthItem(nWidth)); } break; @@ -997,7 +997,7 @@ void SwFEShell::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt16 nSlot case SID_LINE_CIRCLE_ARROW: { // circle start - rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle)); + rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle)); rAttr.Put(XLineStartWidthItem(nWidth)); } break; @@ -1005,7 +1005,7 @@ void SwFEShell::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt16 nSlot case SID_LINE_ARROW_SQUARE: { // square end - rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_SQUARE), aSquare)); + rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_SQUARE), aSquare)); rAttr.Put(XLineEndWidthItem(nWidth)); } break; @@ -1013,7 +1013,7 @@ void SwFEShell::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt16 nSlot case SID_LINE_SQUARE_ARROW: { // square start - rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_SQUARE), aSquare)); + rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_SQUARE), aSquare)); rAttr.Put(XLineStartWidthItem(nWidth)); } break; diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index e135c78f9c13..2f6516d4f22a 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -2794,7 +2794,7 @@ void SwFrameFormat::SetPositionLayoutDir( const sal_Int16 ) OUString SwFrameFormat::GetDescription() const { - return SW_RES(STR_FRAME); + return SwResId(STR_FRAME); } void SwFrameFormat::dumpAsXml(xmlTextWriterPtr pWriter) const @@ -3368,7 +3368,7 @@ OUString SwDrawFrameFormat::GetDescription() const aResult = m_sSdrObjectCachedComment; } else - aResult = SW_RESSTR(STR_GRAPHIC); + aResult = SwResId(STR_GRAPHIC); return aResult; } diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index 7ce20eadb2cf..a122bd5958d1 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -364,7 +364,7 @@ SwPageDesc* SwPageDesc::GetByName(SwDoc& rDoc, const OUString& rName) for( sal_Int32 i = RC_POOLPAGEDESC_BEGIN; i <= STR_POOLPAGE_LANDSCAPE; ++i) { - if (rName==SW_RESSTR(i)) + if (rName==SwResId(i)) { return rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool( static_cast< sal_uInt16 >( i - RC_POOLPAGEDESC_BEGIN + RES_POOLPAGE_BEGIN) ); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 61ffad926305..1dca9545f9d6 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3467,7 +3467,7 @@ void SwRootFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, const vcl::Font aOldFont( pSh->GetOut()->GetFont() ); pSh->GetOut()->SetFont( rEmptyPageFont ); - pSh->GetOut()->DrawText( aEmptyPageRect.SVRect(), SW_RESSTR( STR_EMPTYPAGE ), + pSh->GetOut()->DrawText( aEmptyPageRect.SVRect(), SwResId( STR_EMPTYPAGE ), DrawTextFlags::VCenter | DrawTextFlags::Center | DrawTextFlags::Clip ); @@ -3822,7 +3822,7 @@ void SwColumnFrame::PaintBreak( ) const aSeq.resize( aSeq.size( ) + 1 ); // Add the text above - OUString aBreakText = SW_RESSTR(STR_COLUMN_BREAK); + OUString aBreakText = SwResId(STR_COLUMN_BREAK); basegfx::B2DVector aFontSize; OutputDevice* pOut = gProp.pSGlobalShell->GetOut(); diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 154b7105e1c2..aa7449a6a1ec 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -1000,12 +1000,12 @@ OUString SwOLEObj::GetDescription() SvGlobalName aClassID( xEmbObj->getClassID() ); if ( SotExchange::IsMath( aClassID ) ) - return SW_RESSTR(STR_MATH_FORMULA); + return SwResId(STR_MATH_FORMULA); if ( SotExchange::IsChart( aClassID ) ) - return SW_RESSTR(STR_CHART); + return SwResId(STR_CHART); - return SW_RESSTR(STR_OLE); + return SwResId(STR_OLE); } drawinglayer::primitive2d::Primitive2DContainer const & SwOLEObj::tryToGetChartContentAsPrimitive2DSequence( diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index e53f07aa1ee6..b6baa1366d96 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -245,7 +245,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# if (TOX_CONTENT == m_eType || TOX_ILLUSTRATIONS == m_eType ) { SwFormToken aLinkStt (TOKEN_LINK_START); - aLinkStt.sCharStyleName = SW_RES(STR_POOLCHR_TOXJUMP); + aLinkStt.sCharStyleName = SwResId(STR_POOLCHR_TOXJUMP); aTokens.push_back(aLinkStt); } @@ -273,7 +273,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# if (TOX_CONTENT == m_eType || TOX_ILLUSTRATIONS == m_eType) aTokens.push_back(SwFormToken(TOKEN_LINK_END)); - SetTemplate( 0, SW_RESSTR( nPoolId++ )); + SetTemplate( 0, SwResId( nPoolId++ )); if(TOX_INDEX == m_eType) { @@ -286,12 +286,12 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# aTmpTokens.push_back(aTmpToken); SetPattern( i, aTmpTokens ); - SetTemplate( i, SW_RESSTR( STR_POOLCOLL_TOX_IDXBREAK )); + SetTemplate( i, SwResId( STR_POOLCOLL_TOX_IDXBREAK )); } else { SetPattern( i, aTokens ); - SetTemplate( i, SW_RESSTR( STR_POOLCOLL_TOX_IDX1 + i - 2 )); + SetTemplate( i, SwResId( STR_POOLCOLL_TOX_IDX1 + i - 2 )); } } } @@ -313,7 +313,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# nPoolId = STR_POOLCOLL_TOX_USER6; else if( TOX_AUTHORITIES == m_eType ) nPoolId = STR_POOLCOLL_TOX_AUTHORITIES1; - SetTemplate( i, SW_RESSTR( nPoolId ) ); + SetTemplate( i, SwResId( nPoolId ) ); } } diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index c8f1a3592fcd..2a5d0b5d5b54 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -523,7 +523,7 @@ TextAndReading SwTOXPara::GetText_Impl() const : SwTOXElement::Graphic == eType ? STR_GRAPHIC_DEFNAME : STR_FRAME_DEFNAME; - return TextAndReading(SW_RESSTR( nId ), OUString()); + return TextAndReading(SwResId( nId ), OUString()); } break; default: break; @@ -633,7 +633,7 @@ TextAndReading SwTOXTable::GetText_Impl() const } OSL_ENSURE( false, "Where's my table?" ); - return TextAndReading(SW_RESSTR( STR_TABLE_DEFNAME ), OUString()); + return TextAndReading(SwResId( STR_TABLE_DEFNAME ), OUString()); } sal_uInt16 SwTOXTable::GetLevel() const diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 8b0b6c960c75..8617a3b80db4 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -81,7 +81,7 @@ long EvalGridWidthAdd( const SwTextGridItem *const pGrid, const SwDrawTextInfo & SwDocShell* pDocShell = rInf.GetShell()->GetDoc()->GetDocShell(); SfxStyleSheetBasePool* pBasePool = pDocShell->GetStyleSheetPool(); - OUString sString(SW_RESSTR(STR_POOLCOLL_STANDARD)); + OUString sString(SwResId(STR_POOLCOLL_STANDARD)); SfxStyleSheetBase* pStyle = pBasePool->Find(sString, SfxStyleFamily::Para); SfxItemSet& aTmpSet = pStyle->GetItemSet(); diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx index 773fe42295cc..aa599a7258cc 100644 --- a/sw/source/core/undo/SwUndoFmt.cxx +++ b/sw/source/core/undo/SwUndoFmt.cxx @@ -184,7 +184,7 @@ SwRewriter SwUndoRenameFormat::GetRewriter() const SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, sOldName); - aRewriter.AddRule(UndoArg2, SW_RES(STR_YIELDS)); + aRewriter.AddRule(UndoArg2, SwResId(STR_YIELDS)); aRewriter.AddRule(UndoArg3, sNewName); return aRewriter; @@ -460,7 +460,7 @@ SwRewriter SwUndoNumruleRename::GetRewriter() const SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, aOldName); - aRewriter.AddRule(UndoArg2, SW_RESSTR(STR_YIELDS)); + aRewriter.AddRule(UndoArg2, SwResId(STR_YIELDS)); aRewriter.AddRule(UndoArg3, aNewName); return aRewriter; diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx index 258eb5e4ac03..1b847bd2a336 100644 --- a/sw/source/core/undo/SwUndoPageDesc.cxx +++ b/sw/source/core/undo/SwUndoPageDesc.cxx @@ -364,7 +364,7 @@ SwRewriter SwUndoPageDesc::GetRewriter() const SwRewriter aResult; aResult.AddRule(UndoArg1, aOld.GetName()); - aResult.AddRule(UndoArg2, SW_RESSTR(STR_YIELDS)); + aResult.AddRule(UndoArg2, SwResId(STR_YIELDS)); aResult.AddRule(UndoArg3, aNew.GetName()); return aResult; diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index a9f107cb1170..63cff9f61230 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -276,7 +276,7 @@ UndoManager::StartUndo(SwUndoId const i_eUndoId, assert(SwUndoId::END != eUndoId); OUString comment( (SwUndoId::START == eUndoId) ? OUString("??") - : OUString(SW_RES(UNDO_BASE + (int)eUndoId)) ); + : SwResId(UNDO_BASE + (int)eUndoId) ); if (pRewriter) { assert(SwUndoId::START != eUndoId); @@ -324,7 +324,7 @@ UndoManager::EndUndo(SwUndoId eUndoId, SwRewriter const*const pRewriter) OSL_ENSURE((SwUndoId)pListAction->GetId() == eUndoId, "EndUndo(): given ID different from StartUndo()"); // comment set by caller of EndUndo - OUString comment = SW_RES(UNDO_BASE + (int)eUndoId); + OUString comment = SwResId(UNDO_BASE + (int)eUndoId); if (pRewriter) { comment = pRewriter->Apply(comment); diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index 93c25f85bc5c..1ac8829b1bf9 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -115,13 +115,13 @@ OUString SwHistorySetFormat::GetDescription() const case SvxBreak::PageBefore: case SvxBreak::PageAfter: case SvxBreak::PageBoth: - aResult = SW_RESSTR(STR_UNDO_PAGEBREAKS); + aResult = SwResId(STR_UNDO_PAGEBREAKS); break; case SvxBreak::ColumnBefore: case SvxBreak::ColumnAfter: case SvxBreak::ColumnBoth: - aResult = SW_RESSTR(STR_UNDO_COLBRKS); + aResult = SwResId(STR_UNDO_COLBRKS); break; default: @@ -449,7 +449,7 @@ SwHistorySetFootnote::SwHistorySetFootnote( const SwTextFootnote &rTextFootnote OUString SwHistorySetFootnote::GetDescription() const { - return SW_RES(STR_FOOTNOTE); + return SwResId(STR_FOOTNOTE); } SwHistorySetFootnote::~SwHistorySetFootnote() diff --git a/sw/source/core/undo/unbkmk.cxx b/sw/source/core/undo/unbkmk.cxx index d30d78e82dd0..7308e998070b 100644 --- a/sw/source/core/undo/unbkmk.cxx +++ b/sw/source/core/undo/unbkmk.cxx @@ -114,8 +114,8 @@ SwUndoRenameBookmark::~SwUndoRenameBookmark() static OUString lcl_QuoteName(const OUString& rName) { - static const OUString sStart = SW_RES(STR_START_QUOTE); - static const OUString sEnd = SW_RES(STR_END_QUOTE); + static const OUString sStart = SwResId(STR_START_QUOTE); + static const OUString sEnd = SwResId(STR_END_QUOTE); return sStart + rName + sEnd; } @@ -123,7 +123,7 @@ SwRewriter SwUndoRenameBookmark::GetRewriter() const { SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, lcl_QuoteName(m_sOldName)); - aRewriter.AddRule(UndoArg2, SW_RES(STR_YIELDS)); + aRewriter.AddRule(UndoArg2, SwResId(STR_YIELDS)); aRewriter.AddRule(UndoArg3, lcl_QuoteName(m_sNewName)); return aRewriter; } diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index 565405c1bcab..dfae9e8e779a 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -550,7 +550,7 @@ static SwRewriter lcl_RewriterFromHistory(SwHistory & rHistory) if (! bDone) { - aRewriter.AddRule(UndoArg2, SW_RESSTR(STR_FIELD)); + aRewriter.AddRule(UndoArg2, SwResId(STR_FIELD)); } return aRewriter; @@ -585,11 +585,11 @@ static OUString lcl_DenotedPortion(const OUString& rStr, sal_Int32 nStart, sal_I switch(cLast) { case CH_TXTATR_TAB: - aResult = SW_RESSTR(STR_UNDO_TABS); + aResult = SwResId(STR_UNDO_TABS); break; case CH_TXTATR_NEWLINE: - aResult = SW_RESSTR(STR_UNDO_NLS); + aResult = SwResId(STR_UNDO_NLS); break; @@ -606,9 +606,9 @@ static OUString lcl_DenotedPortion(const OUString& rStr, sal_Int32 nStart, sal_I } else { - aResult = SW_RESSTR(STR_START_QUOTE); + aResult = SwResId(STR_START_QUOTE); aResult += rStr.copy(nStart, nEnd - nStart); - aResult += SW_RESSTR(STR_END_QUOTE); + aResult += SwResId(STR_END_QUOTE); } } @@ -668,15 +668,15 @@ SwRewriter SwUndoDelete::GetRewriter() const { SwRewriter aRewriter; - aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_START_QUOTE)); + aRewriter.AddRule(UndoArg1, SwResId(STR_START_QUOTE)); aRewriter.AddRule(UndoArg2, m_sTableName); - aRewriter.AddRule(UndoArg3, SW_RESSTR(STR_END_QUOTE)); + aRewriter.AddRule(UndoArg3, SwResId(STR_END_QUOTE)); - OUString sTmp = aRewriter.Apply(SW_RES(STR_TABLE_NAME)); + OUString sTmp = aRewriter.Apply(SwResId(STR_TABLE_NAME)); aResult.AddRule(UndoArg1, sTmp); } else - aResult.AddRule(UndoArg1, SW_RESSTR(STR_PARAGRAPHS)); + aResult.AddRule(UndoArg1, SwResId(STR_PARAGRAPHS)); } else { @@ -685,7 +685,7 @@ SwRewriter SwUndoDelete::GetRewriter() const if (m_pSttStr != nullptr && m_pEndStr != nullptr && m_pSttStr->isEmpty() && m_pEndStr->isEmpty()) { - aStr = SW_RESSTR(STR_PARAGRAPH_UNDO); + aStr = SwResId(STR_PARAGRAPH_UNDO); } else { @@ -705,7 +705,7 @@ SwRewriter SwUndoDelete::GetRewriter() const } } - aStr = ShortenString(aStr, nUndoStringLength, OUString(SW_RES(STR_LDOTS))); + aStr = ShortenString(aStr, nUndoStringLength, SwResId(STR_LDOTS)); if (pHistory) { SwRewriter aRewriter = lcl_RewriterFromHistory(*pHistory); diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 2ad6df159422..4b178c130776 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -271,7 +271,7 @@ OUString SwUndo::GetComment() const { if (! pComment) { - pComment.reset( new OUString(SW_RES(UNDO_BASE + (int)GetId())) ); + pComment.reset( new OUString(SwResId(UNDO_BASE + (int)GetId())) ); SwRewriter aRewriter = GetRewriter(); @@ -282,7 +282,7 @@ OUString SwUndo::GetComment() const } else { - aResult = SW_RES(UNDO_BASE + (int)GetId()); + aResult = SwResId(UNDO_BASE + (int)GetId()); SwRewriter aRewriter = GetRewriter(); diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index 78528a4a7f31..b407bbd69491 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -468,7 +468,7 @@ SwRewriter SwUndoInsert::GetRewriter() const { OUString aString = ShortenString(DenoteSpecialCharacters(*pStr), nUndoStringLength, - OUString(SW_RES(STR_LDOTS))); + SwResId(STR_LDOTS)); aResult.AddRule(UndoArg1, aString); @@ -541,13 +541,13 @@ MakeUndoReplaceRewriter(sal_uLong const occurrences, if (1 < occurrences) { aResult.AddRule(UndoArg1, OUString::number(occurrences)); - aResult.AddRule(UndoArg2, OUString(SW_RES(STR_OCCURRENCES_OF))); + aResult.AddRule(UndoArg2, SwResId(STR_OCCURRENCES_OF)); OUString aTmpStr; - aTmpStr += SW_RES(STR_START_QUOTE); + aTmpStr += SwResId(STR_START_QUOTE); aTmpStr += ShortenString(sOld, nUndoStringLength, - SW_RES(STR_LDOTS)); - aTmpStr += SW_RES(STR_END_QUOTE); + SwResId(STR_LDOTS)); + aTmpStr += SwResId(STR_END_QUOTE); aResult.AddRule(UndoArg3, aTmpStr); } else if (1 == occurrences) @@ -555,24 +555,24 @@ MakeUndoReplaceRewriter(sal_uLong const occurrences, { OUString aTmpStr; - aTmpStr += SW_RES(STR_START_QUOTE); + aTmpStr += SwResId(STR_START_QUOTE); // #i33488 # aTmpStr += ShortenString(sOld, nUndoStringLength, - SW_RES(STR_LDOTS)); - aTmpStr += SW_RES(STR_END_QUOTE); + SwResId(STR_LDOTS)); + aTmpStr += SwResId(STR_END_QUOTE); aResult.AddRule(UndoArg1, aTmpStr); } - aResult.AddRule(UndoArg2, OUString(SW_RES(STR_YIELDS))); + aResult.AddRule(UndoArg2, SwResId(STR_YIELDS)); { OUString aTmpStr; - aTmpStr += SW_RES(STR_START_QUOTE); + aTmpStr += SwResId(STR_START_QUOTE); // #i33488 # aTmpStr += ShortenString(sNew, nUndoStringLength, - SW_RES(STR_LDOTS)); - aTmpStr += SW_RES(STR_END_QUOTE); + SwResId(STR_LDOTS)); + aTmpStr += SwResId(STR_END_QUOTE); aResult.AddRule(UndoArg3, aTmpStr); } } @@ -1031,10 +1031,10 @@ SwRewriter SwUndoInsertLabel::CreateRewriter(const OUString &rStr) if (!rStr.isEmpty()) { - aTmpStr += SW_RES(STR_START_QUOTE); + aTmpStr += SwResId(STR_START_QUOTE); aTmpStr += ShortenString(rStr, nUndoStringLength, - OUString(SW_RES(STR_LDOTS))); - aTmpStr += SW_RES(STR_END_QUOTE); + SwResId(STR_LDOTS)); + aTmpStr += SwResId(STR_END_QUOTE); } aRewriter.AddRule(UndoArg1, aTmpStr); diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx index b73bc2a150f1..fe420faec1f6 100644 --- a/sw/source/core/undo/unovwr.cxx +++ b/sw/source/core/undo/unovwr.cxx @@ -311,10 +311,10 @@ SwRewriter SwUndoOverwrite::GetRewriter() const OUString aString; - aString += SW_RES(STR_START_QUOTE); + aString += SwResId(STR_START_QUOTE); aString += ShortenString(aInsStr, nUndoStringLength, - OUString(SW_RES(STR_LDOTS))); - aString += SW_RES(STR_END_QUOTE); + SwResId(STR_LDOTS)); + aString += SwResId(STR_END_QUOTE); aResult.AddRule(UndoArg1, aString); diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 7d6c81349aa0..f2c01ae7bd55 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -347,9 +347,9 @@ SwRewriter SwUndoInsTable::GetRewriter() const { SwRewriter aRewriter; - aRewriter.AddRule(UndoArg1, SW_RES(STR_START_QUOTE)); + aRewriter.AddRule(UndoArg1, SwResId(STR_START_QUOTE)); aRewriter.AddRule(UndoArg2, sTableNm); - aRewriter.AddRule(UndoArg3, SW_RES(STR_END_QUOTE)); + aRewriter.AddRule(UndoArg3, SwResId(STR_END_QUOTE)); return aRewriter; } diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index a5589b23885e..85bfea52418c 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -1860,8 +1860,8 @@ SwChartDataSequence::SwChartDataSequence( SwClient( &rTableFormat ), m_aEvtListeners( GetChartMutex() ), m_aModifyListeners( GetChartMutex() ), - m_aRowLabelText( SW_RES( STR_CHART2_ROW_LABEL_TEXT ) ), - m_aColLabelText( SW_RES( STR_CHART2_COL_LABEL_TEXT ) ), + m_aRowLabelText( SwResId( STR_CHART2_ROW_LABEL_TEXT ) ), + m_aColLabelText( SwResId( STR_CHART2_COL_LABEL_TEXT ) ), m_xDataProvider( &rProvider ), m_pTableCursor( pTableCursor ), m_pPropSet( aSwMapProvider.GetPropertySet( PROPERTY_MAP_CHART2_DATA_SEQUENCE ) ) @@ -1907,8 +1907,8 @@ SwChartDataSequence::SwChartDataSequence( const SwChartDataSequence &rObj ) : m_aEvtListeners( GetChartMutex() ), m_aModifyListeners( GetChartMutex() ), m_aRole( rObj.m_aRole ), - m_aRowLabelText( SW_RES(STR_CHART2_ROW_LABEL_TEXT) ), - m_aColLabelText( SW_RES(STR_CHART2_COL_LABEL_TEXT) ), + m_aRowLabelText( SwResId(STR_CHART2_ROW_LABEL_TEXT) ), + m_aColLabelText( SwResId(STR_CHART2_COL_LABEL_TEXT) ), m_xDataProvider( rObj.m_xDataProvider ), m_pTableCursor( rObj.m_pTableCursor ), m_pPropSet( rObj.m_pPropSet ) diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 90b75e4f3af3..dff3a9a53971 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -636,10 +636,10 @@ void SAL_CALL SwXFieldMaster::setPropertyValue( if(pType2 || (SwFieldIds::SetExp == m_pImpl->m_nResTypeId && - ( sTypeName == SW_RESSTR(STR_POOLCOLL_LABEL_TABLE) || - sTypeName == SW_RESSTR(STR_POOLCOLL_LABEL_DRAWING) || - sTypeName == SW_RESSTR(STR_POOLCOLL_LABEL_FRAME) || - sTypeName == SW_RESSTR(STR_POOLCOLL_LABEL_ABB) ))) + ( sTypeName == SwResId(STR_POOLCOLL_LABEL_TABLE) || + sTypeName == SwResId(STR_POOLCOLL_LABEL_DRAWING) || + sTypeName == SwResId(STR_POOLCOLL_LABEL_FRAME) || + sTypeName == SwResId(STR_POOLCOLL_LABEL_ABB) ))) { throw lang::IllegalArgumentException(); } diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 4b595d814ac0..80268724eb62 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -194,7 +194,7 @@ static SwCharFormat* lcl_getCharFormat(SwDoc* pDoc, const uno::Any& aValue) aValue >>= uTmp; OUString sCharFormat; SwStyleNameMapper::FillUIName(uTmp, sCharFormat, SwGetPoolIdFromName::ChrFmt, true); - if (sCharFormat != SW_RESSTR(STR_POOLCOLL_STANDARD)) + if (sCharFormat != SwResId(STR_POOLCOLL_STANDARD)) { pRet = pDoc->FindCharFormatByName( sCharFormat ); } @@ -1295,7 +1295,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( if (pDocShell) // -> Chapter Numbering { // template name - OUString sValue(SW_RES(STR_POOLCOLL_HEADLINE1 + nIndex)); + OUString sValue(SwResId(STR_POOLCOLL_HEADLINE1 + nIndex)); const SwTextFormatColls* pColls = pDocShell->GetDoc()->GetTextFormatColls(); const size_t nCount = pColls->size(); for(size_t i = 0; i < nCount; ++i) diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 3f5175724ce9..7d83d0b147f4 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1045,7 +1045,7 @@ uno::Any SAL_CALL XStyleFamily::getPropertyValue( const OUString& sPropertyName if(sPropertyName != "DisplayName") throw beans::UnknownPropertyException( "unknown property: " + sPropertyName, static_cast<OWeakObject *>(this) ); SolarMutexGuard aGuard; - return uno::makeAny(SW_RESSTR(m_rEntry.m_nResId)); + return uno::makeAny(SwResId(m_rEntry.m_nResId)); } @@ -1527,7 +1527,7 @@ const SwPageDesc* SwStyleBase_Impl::GetOldPageDesc() { for(sal_uInt16 i = RC_POOLPAGEDESC_BEGIN; i <= STR_POOLPAGE_LANDSCAPE; ++i) { - if(SW_RESSTR(i) == m_rStyleName) + if(SwResId(i) == m_rStyleName) { m_pOldPageDesc = m_rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool( static_cast<sal_uInt16>(RES_POOLPAGE_BEGIN + i - RC_POOLPAGEDESC_BEGIN)); break; diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index 272ce8955a6c..e6801bb79984 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -1096,7 +1096,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const tools: // paint empty page text vcl::Font aOldFont( pOutputDev->GetFont() ); pOutputDev->SetFont( rEmptyPgFont ); - pOutputDev->DrawText( aPageRect, SW_RESSTR( STR_EMPTYPAGE ), + pOutputDev->DrawText( aPageRect, SwResId( STR_EMPTYPAGE ), DrawTextFlags::VCenter | DrawTextFlags::Center | DrawTextFlags::Clip ); diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index b238094e2cdc..ff77f21dbd01 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -184,23 +184,23 @@ SwPrintUIOptions::SwPrintUIOptions( // create "writer" section (new tab page in dialog) SvtModuleOptions aModOpt; - OUString aAppGroupname( SW_RES( STR_PRINTOPTUI_PRODUCTNAME) ); + OUString aAppGroupname( SwResId( STR_PRINTOPTUI_PRODUCTNAME) ); aAppGroupname = aAppGroupname.replaceFirst( "%s", aModOpt.GetModuleName( SvtModuleOptions::EModule::WRITER ) ); m_aUIProperties[ nIdx++ ].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage"); // create sub section for Contents - m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("contents", SW_RES( STR_PRINTOPTUI_CONTENTS), OUString()); + m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("contents", SwResId( STR_PRINTOPTUI_CONTENTS), OUString()); // create a bool option for background bool bDefaultVal = rDefaultPrintData.IsPrintPageBackground(); - m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("pagebackground", SW_RES( STR_PRINTOPTUI_PAGE_BACKGROUND), + m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("pagebackground", SwResId( STR_PRINTOPTUI_PAGE_BACKGROUND), ".HelpID:vcl:PrintDialog:PrintPageBackground:CheckBox", "PrintPageBackground", bDefaultVal); // create a bool option for pictures/graphics AND OLE and drawing objects as well bDefaultVal = rDefaultPrintData.IsPrintGraphic() || rDefaultPrintData.IsPrintDraw(); - m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("pictures", SW_RES( STR_PRINTOPTUI_PICTURES), + m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("pictures", SwResId( STR_PRINTOPTUI_PICTURES), ".HelpID:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox", "PrintPicturesAndObjects", bDefaultVal); @@ -208,14 +208,14 @@ SwPrintUIOptions::SwPrintUIOptions( { // create a bool option for hidden text bDefaultVal = rDefaultPrintData.IsPrintHiddenText(); - m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("hiddentext", SW_RES( STR_PRINTOPTUI_HIDDEN), + m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("hiddentext", SwResId( STR_PRINTOPTUI_HIDDEN), ".HelpID:vcl:PrintDialog:PrintHiddenText:CheckBox", "PrintHiddenText", bDefaultVal); // create a bool option for place holder bDefaultVal = rDefaultPrintData.IsPrintTextPlaceholder(); - m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("placeholders", SW_RES( STR_PRINTOPTUI_TEXT_PLACEHOLDERS), + m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("placeholders", SwResId( STR_PRINTOPTUI_TEXT_PLACEHOLDERS), ".HelpID:vcl:PrintDialog:PrintTextPlaceholder:CheckBox", "PrintTextPlaceholder", bDefaultVal); @@ -223,17 +223,17 @@ SwPrintUIOptions::SwPrintUIOptions( // create a bool option for controls bDefaultVal = rDefaultPrintData.IsPrintControl(); - m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("formcontrols", SW_RES( STR_PRINTOPTUI_FORM_CONTROLS), + m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("formcontrols", SwResId( STR_PRINTOPTUI_FORM_CONTROLS), ".HelpID:vcl:PrintDialog:PrintControls:CheckBox", "PrintControls", bDefaultVal); // create sub section for Color - m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("color", SW_RES( STR_PRINTOPTUI_COLOR), OUString()); + m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("color", SwResId( STR_PRINTOPTUI_COLOR), OUString()); // create a bool option for printing text with black font color bDefaultVal = rDefaultPrintData.IsPrintBlackFont(); - m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("textinblack", SW_RES( STR_PRINTOPTUI_PRINT_BLACK), + m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("textinblack", SwResId( STR_PRINTOPTUI_PRINT_BLACK), ".HelpID:vcl:PrintDialog:PrintBlackFonts:CheckBox", "PrintBlackFonts", bDefaultVal); @@ -241,11 +241,11 @@ SwPrintUIOptions::SwPrintUIOptions( if (!bWeb) { // create subgroup for misc options - m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("pages", SW_RES( STR_PRINTOPTUI_PAGES_TEXT), OUString()); + m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("pages", SwResId( STR_PRINTOPTUI_PAGES_TEXT), OUString()); // create a bool option for printing automatically inserted blank pages bDefaultVal = rDefaultPrintData.IsPrintEmptyPages(); - m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("autoblankpages", SW_RES( STR_PRINTOPTUI_PRINT_BLANK), + m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("autoblankpages", SwResId( STR_PRINTOPTUI_PRINT_BLANK), ".HelpID:vcl:PrintDialog:PrintEmptyPages:CheckBox", "PrintEmptyPages", bDefaultVal); @@ -255,7 +255,7 @@ SwPrintUIOptions::SwPrintUIOptions( bDefaultVal = rDefaultPrintData.IsPaperFromSetup(); vcl::PrinterOptionsHelper::UIControlOptions aPaperTrayOpt; aPaperTrayOpt.maGroupHint = "OptionsPageOptGroup"; - m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("printpaperfromsetup", SW_RES( STR_PRINTOPTUI_ONLY_PAPER), + m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("printpaperfromsetup", SwResId( STR_PRINTOPTUI_ONLY_PAPER), ".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox", "PrintPaperFromSetup", bDefaultVal, @@ -265,7 +265,7 @@ SwPrintUIOptions::SwPrintUIOptions( vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; aPrintRangeOpt.maGroupHint = "PrintRange"; aPrintRangeOpt.mbInternalOnly = true; - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", SW_RES( STR_PRINTOPTUI_RANGE_COPIES), + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", SwResId( STR_PRINTOPTUI_RANGE_COPIES), OUString(), aPrintRangeOpt); @@ -275,15 +275,15 @@ SwPrintUIOptions::SwPrintUIOptions( uno::Sequence< sal_Bool > aChoicesDisabled( 3 ); uno::Sequence< OUString > aHelpIds( 3 ); uno::Sequence< OUString > aWidgetIds( 3 ); - aChoices[0] = SW_RES( STR_PRINTOPTUI_ALLPAGES); + aChoices[0] = SwResId( STR_PRINTOPTUI_ALLPAGES); aChoicesDisabled[0] = false; aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0"; aWidgetIds[0] = "printallpages"; - aChoices[1] = SW_RES( STR_PRINTOPTUI_SOMEPAGES); + aChoices[1] = SwResId( STR_PRINTOPTUI_SOMEPAGES); aChoicesDisabled[1] = false; aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1"; aWidgetIds[1] = "printpages"; - aChoices[2] = SW_RES( STR_PRINTOPTUI_SELECTION); + aChoices[2] = SwResId( STR_PRINTOPTUI_SELECTION); aChoicesDisabled[2] = ! bHasSelection; aHelpIds[2] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2"; aWidgetIds[2] = "printselection"; @@ -302,23 +302,23 @@ SwPrintUIOptions::SwPrintUIOptions( vcl::PrinterOptionsHelper::UIControlOptions aContentsOpt; aContentsOpt.maGroupHint = "JobPage"; m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("extrawriterprintoptions", - SW_RES( STR_PRINTOPTUI_PRINT), + SwResId( STR_PRINTOPTUI_PRINT), OUString(), aContentsOpt); // create a list box for notes content const SwPostItMode nPrintPostIts = rDefaultPrintData.GetPrintPostIts(); aChoices.realloc( 5 ); - aChoices[0] = SW_RES( STR_PRINTOPTUI_NONE); - aChoices[1] = SW_RES( STR_PRINTOPTUI_COMMENTS_ONLY); - aChoices[2] = SW_RES( STR_PRINTOPTUI_PLACE_END); - aChoices[3] = SW_RES( STR_PRINTOPTUI_PLACE_PAGE); - aChoices[4] = SW_RES( STR_PRINTOPTUI_PLACE_MARGINS); + aChoices[0] = SwResId( STR_PRINTOPTUI_NONE); + aChoices[1] = SwResId( STR_PRINTOPTUI_COMMENTS_ONLY); + aChoices[2] = SwResId( STR_PRINTOPTUI_PLACE_END); + aChoices[3] = SwResId( STR_PRINTOPTUI_PLACE_PAGE); + aChoices[4] = SwResId( STR_PRINTOPTUI_PLACE_MARGINS); aHelpIds.realloc( 2 ); aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText"; aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox"; vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( "PrintProspect", 0, false ); aAnnotOpt.mbEnabled = bHasPostIts; m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("writercomments", - SW_RES( STR_PRINTOPTUI_COMMENTS), + SwResId( STR_PRINTOPTUI_COMMENTS), aHelpIds, "PrintAnnotationMode", aChoices, @@ -333,12 +333,12 @@ SwPrintUIOptions::SwPrintUIOptions( if (!bWeb) { m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pagesides", - SW_RES( STR_PRINTOPTUI_PAGE_SIDES), + SwResId( STR_PRINTOPTUI_PAGE_SIDES), OUString(), aPageSetOpt); uno::Sequence< OUString > aRLChoices( 3 ); - aRLChoices[0] = SW_RES( STR_PRINTOPTUI_ALL_PAGES); - aRLChoices[1] = SW_RES( STR_PRINTOPTUI_BACK_PAGES); - aRLChoices[2] = SW_RES( STR_PRINTOPTUI_FONT_PAGES); + aRLChoices[0] = SwResId( STR_PRINTOPTUI_ALL_PAGES); + aRLChoices[1] = SwResId( STR_PRINTOPTUI_BACK_PAGES); + aRLChoices[2] = SwResId( STR_PRINTOPTUI_FONT_PAGES); uno::Sequence<OUString> aRLHelp { ".HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox" }; // create a choice option for all/left/right pages // 0 : all pages (left & right) @@ -352,7 +352,7 @@ SwPrintUIOptions::SwPrintUIOptions( else if (!rDefaultPrintData.IsPrintLeftPage() && rDefaultPrintData.IsPrintRightPage()) nPagesChoice = 2; m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("brochureinclude", - SW_RES( STR_PRINTOPTUI_INCLUDE), + SwResId( STR_PRINTOPTUI_INCLUDE), aRLHelp, "PrintLeftRightPages", aRLChoices, @@ -362,7 +362,7 @@ SwPrintUIOptions::SwPrintUIOptions( // create a bool option for brochure bDefaultVal = rDefaultPrintData.IsPrintProspect(); const OUString aBrochurePropertyName( "PrintProspect" ); - m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("brochure", SW_RES( STR_PRINTOPTUI_BROCHURE), + m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("brochure", SwResId( STR_PRINTOPTUI_BROCHURE), ".HelpID:vcl:PrintDialog:PrintProspect:CheckBox", aBrochurePropertyName, bDefaultVal, @@ -372,8 +372,8 @@ SwPrintUIOptions::SwPrintUIOptions( { // create a bool option for brochure RTL dependent on brochure uno::Sequence< OUString > aBRTLChoices( 2 ); - aBRTLChoices[0] = SW_RES( STR_PRINTOPTUI_LEFT_SCRIPT); - aBRTLChoices[1] = SW_RES( STR_PRINTOPTUI_RIGHT_SCRIPT); + aBRTLChoices[0] = SwResId( STR_PRINTOPTUI_LEFT_SCRIPT); + aBRTLChoices[1] = SwResId( STR_PRINTOPTUI_RIGHT_SCRIPT); vcl::PrinterOptionsHelper::UIControlOptions aBrochureRTLOpt( aBrochurePropertyName, -1, true ); uno::Sequence<OUString> aBRTLHelpIds { ".HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox" }; aBrochureRTLOpt.maGroupHint = "LayoutPage"; diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 1c507b99a57f..a288f7949f4b 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -662,7 +662,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c sal_Int32 nProgressRange(1000000); if (xStatusIndicator.is()) { - xStatusIndicator->start(SW_RESSTR(STR_STATSTR_SWGREAD), nProgressRange); + xStatusIndicator->start(SwResId(STR_STATSTR_SWGREAD), nProgressRange); } uno::Any aProgRange; aProgRange <<= nProgressRange; diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index ee70db8fc751..f49af4ffeae3 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -166,7 +166,7 @@ sal_uInt32 SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& sal_Int32 nProgressRange(1000000); if (xStatusIndicator.is()) { - xStatusIndicator->start(SW_RESSTR( STR_STATSTR_SWGWRITE), + xStatusIndicator->start(SwResId( STR_STATSTR_SWGWRITE), nProgressRange); } xInfoSet->setPropertyValue("ProgressRange", Any(nProgressRange)); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 0208a60a13cd..10332ef1db08 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -139,7 +139,7 @@ SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport, // into the file since it's not really a style but "no style" // (hence referencing it actually makes no sense except for hyperlinks // which default to something other than "Default") - OUString const sDefault(SW_RES(STR_POOLCOLL_STANDARD)); + OUString const sDefault(SwResId(STR_POOLCOLL_STANDARD)); uno::Reference<container::XNameContainer> const& xStyles( rImport.GetTextImport()->GetTextStyles()); if (!xStyles->hasByName("Default")) 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); diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx index ec4bfc0a4187..9d24de198036 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -165,7 +165,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) pNewView->AttrChangedNotify( &pNewView->GetWrtShell() ); // so that SelectShell is being called pSh = pNewView->GetWrtShellPtr(); - OUString aTmp( SW_RES(STR_ENV_TITLE) ); + OUString aTmp( SwResId(STR_ENV_TITLE) ); aTmp += OUString::number( ++nTitleNo ); xDocSh->SetTitle( aTmp ); diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index 8fe5e3493e4c..a55e3962592d 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -209,7 +209,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel) OUString aTmp; if(bLabel) { - aTmp = SW_RES( STR_LAB_TITLE); + aTmp = SwResId( STR_LAB_TITLE); aTmp += OUString::number(++nLabelTitleNo ); } else diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 4d1b3d9c1d31..2f1815ab6598 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -176,7 +176,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, { if(!bAPICall) { - ScopedVclPtrInstance<InfoBox>(nullptr, SW_RESSTR(STR_CANTOPEN))->Execute(); + ScopedVclPtrInstance<InfoBox>(nullptr, SwResId(STR_CANTOPEN))->Execute(); } return nullptr; } @@ -536,7 +536,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) SwReaderWriter::GetWriter( pFlt->GetUserData(), rMedium.GetBaseURL( true ), xWriter ); if( !xWriter.is() ) { // Filter not available - ScopedVclPtrInstance<InfoBox>(nullptr, SW_RESSTR(STR_DLLNOTFOUND))->Execute(); + ScopedVclPtrInstance<InfoBox>(nullptr, SwResId(STR_DLLNOTFOUND))->Execute(); return false; } diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 5348175ffc58..767ddcff9929 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -151,7 +151,7 @@ VclPtr<SfxDocumentInfoDialog> SwDocShell::CreateDocumentInfoDialog(const SfxItem SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); pDlg->AddFontTabPage(); - pDlg->AddTabPage(TP_DOC_STAT, SW_RESSTR(STR_DOC_STAT),pFact->GetTabPageCreatorFunc( TP_DOC_STAT ),nullptr); + pDlg->AddTabPage(TP_DOC_STAT, SwResId(STR_DOC_STAT),pFact->GetTabPageCreatorFunc( TP_DOC_STAT ),nullptr); } } return pDlg; @@ -751,7 +751,7 @@ void SwDocShell::Execute(SfxRequest& rReq) SwView *pCurrView = static_cast<SwView*>( pFrame->GetViewShell()); // Set document's title - OUString aTmp( SW_RES(STR_ABSTRACT_TITLE) ); + OUString aTmp( SwResId(STR_ABSTRACT_TITLE) ); aTmp += GetTitle(); xDocSh->SetTitle( aTmp ); pCurrView->GetWrtShell().SetNewDoc(); @@ -972,14 +972,14 @@ void SwDocShell::Execute(SfxRequest& rReq) OUString* pEntries = aListBoxEntries.getArray(); sal_Int32 nIdx = 0 ; - OUString sOutline( SW_RESSTR(STR_FDLG_OUTLINE_LEVEL) ); + OUString sOutline( SwResId(STR_FDLG_OUTLINE_LEVEL) ); for( sal_uInt16 i = 0; i < MAXLEVEL; ++i ) { if( bOutline[i] ) pEntries[nIdx++] = sOutline + OUString::number( i+1 ); } - OUString sStyle( SW_RESSTR(STR_FDLG_STYLE) ); + OUString sStyle( SwResId(STR_FDLG_STYLE) ); for(sal_uInt16 i = 0; i < nStyleCount; ++i) { SwTextFormatColl &rTextColl = *(*m_pDoc->GetTextFormatColls())[ i ]; @@ -1002,14 +1002,14 @@ void SwDocShell::Execute(SfxRequest& rReq) xCtrlAcc->setValue( ExtendedFilePickerElementIds::LISTBOX_TEMPLATE, ListboxControlActions::SET_SELECT_ITEM, aSelectPos ); xCtrlAcc->setLabel( ExtendedFilePickerElementIds::LISTBOX_TEMPLATE, - SW_RES( STR_FDLG_TEMPLATE_NAME )); + SwResId( STR_FDLG_TEMPLATE_NAME )); } catch (const Exception&) { OSL_FAIL("control access failed"); } - xFP->setTitle( SW_RESSTR( nStrId )); + xFP->setTitle( SwResId( nStrId )); SvtPathOptions aPathOpt; xFP->setDisplayDirectory( aPathOpt.GetWorkPath() ); if( ERRCODE_NONE == aDlgHelper.Execute()) @@ -1088,7 +1088,7 @@ void SwDocShell::Execute(SfxRequest& rReq) } if( !bDone && !rReq.IsAPI() ) { - ScopedVclPtrInstance<InfoBox>(nullptr, SW_RESSTR( STR_CANTCREATE))->Execute(); + ScopedVclPtrInstance<InfoBox>(nullptr, SwResId( STR_CANTCREATE))->Execute(); } } } @@ -1237,13 +1237,13 @@ void SwDocShell::FillClass( SvGlobalName * pClassName, { *pClassName = SvGlobalName( SO3_SW_CLASSID_60 ); *pClipFormat = SotClipboardFormatId::STARWRITER_60; - *pLongUserName = SW_RESSTR(STR_WRITER_DOCUMENT_FULLTYPE); + *pLongUserName = SwResId(STR_WRITER_DOCUMENT_FULLTYPE); } else if (nVersion == SOFFICE_FILEFORMAT_8) { *pClassName = SvGlobalName( SO3_SW_CLASSID_60 ); *pClipFormat = bTemplate ? SotClipboardFormatId::STARWRITER_8_TEMPLATE : SotClipboardFormatId::STARWRITER_8; - *pLongUserName = SW_RESSTR(STR_WRITER_DOCUMENT_FULLTYPE); + *pLongUserName = SwResId(STR_WRITER_DOCUMENT_FULLTYPE); } // #FIXME check with new Event handling #if 0 @@ -1252,7 +1252,7 @@ void SwDocShell::FillClass( SvGlobalName * pClassName, lcl_processCompatibleSfxHint( xVbaEventsHelper, rHint ); #endif - *pUserName = SW_RESSTR(STR_HUMAN_SWDOC_NAME); + *pUserName = SwResId(STR_HUMAN_SWDOC_NAME); } void SwDocShell::SetModified( bool bSet ) diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 18fe13698f7d..b694ca7f0a51 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -978,7 +978,7 @@ OUString SwDocStyleSheet::GetDescription(MapUnit eUnit) bIsDefault = true; if(!bHasCJKFontPrefix) { - aItemPresentation = SW_RESSTR(STR_CJK_FONT) + aItemPresentation; + aItemPresentation = SwResId(STR_CJK_FONT) + aItemPresentation; bHasCJKFontPrefix = true; } break; @@ -989,7 +989,7 @@ OUString SwDocStyleSheet::GetDescription(MapUnit eUnit) case RES_CHRATR_WEIGHT: if(!bHasWesternFontPrefix) { - aItemPresentation = SW_RESSTR(STR_WESTERN_FONT) + aItemPresentation; + aItemPresentation = SwResId(STR_WESTERN_FONT) + aItemPresentation; bHasWesternFontPrefix = true; } SAL_FALLTHROUGH; @@ -1012,10 +1012,10 @@ OUString SwDocStyleSheet::GetDescription(MapUnit eUnit) { if (!aDesc.isEmpty()) aDesc += sPlus; - aDesc += SW_RESSTR(STR_PAGEBREAK) + sPlus + sModel; + aDesc += SwResId(STR_PAGEBREAK) + sPlus + sModel; if (sPageNum != "0") { - aDesc += sPlus + SW_RESSTR(STR_PAGEOFFSET) + sPageNum; + aDesc += sPlus + SwResId(STR_PAGEOFFSET) + sPageNum; } } else if (!sBreak.isEmpty()) // Break can be valid only when NO Model diff --git a/sw/source/uibase/app/mainwn.cxx b/sw/source/uibase/app/mainwn.cxx index e37faf434c24..44e4b9b1c036 100644 --- a/sw/source/uibase/app/mainwn.cxx +++ b/sw/source/uibase/app/mainwn.cxx @@ -64,7 +64,7 @@ void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue, { pProgress = new SwProgress; pProgress->pProgress = new SfxProgress( pDocShell, - SW_RESSTR(nMessResId), + SwResId(nMessResId), nEndValue - nStartValue ); pProgress->nStartCount = 1; pProgress->pDocShell = pDocShell; @@ -123,7 +123,7 @@ void SetProgressText( sal_uInt16 nId, SwDocShell *pDocShell ) { SwProgress *pProgress = lcl_SwFindProgress( pDocShell ); if ( pProgress ) - pProgress->pProgress->SetStateText( 0, SW_RESSTR(nId) ); + pProgress->pProgress->SetStateText( 0, SwResId(nId) ); } } diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx index 28437f6e7d5e..4d03053de05e 100644 --- a/sw/source/uibase/app/swmodul1.cxx +++ b/sw/source/uibase/app/swmodul1.cxx @@ -403,7 +403,7 @@ std::size_t SwModule::GetRedlineAuthor() { m_sActAuthor = rOpt.GetID(); if (m_sActAuthor.isEmpty()) - m_sActAuthor = SW_RESSTR( STR_REDLINE_UNKNOWN_AUTHOR ); + m_sActAuthor = SwResId( STR_REDLINE_UNKNOWN_AUTHOR ); } m_bAuthorInitialised = true; } diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 0b7734ac5f7a..9296b29096df 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -403,34 +403,34 @@ SfxStyleFamilies* SwModule::CreateStyleFamilies() SfxStyleFamilies *pStyleFamilies = new SfxStyleFamilies; pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para, - SW_RESSTR(STR_PARAGRAPHSTYLEFAMILY), + SwResId(STR_PARAGRAPHSTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_PARA)), - SW_RES(RID_PARAGRAPHSTYLEFAMILY))); + ResId(RID_PARAGRAPHSTYLEFAMILY, *pSwResMgr))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Char, - SW_RESSTR(STR_CHARACTERSTYLEFAMILY), + SwResId(STR_CHARACTERSTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_CHAR)), - SW_RES(RID_CHARACTERSTYLEFAMILY))); + ResId(RID_CHARACTERSTYLEFAMILY, *pSwResMgr))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Frame, - SW_RESSTR(STR_FRAMESTYLEFAMILY), + SwResId(STR_FRAMESTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_FRAME)), - SW_RES(RID_FRAMESTYLEFAMILY))); + ResId(RID_FRAMESTYLEFAMILY, *pSwResMgr))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page, - SW_RESSTR(STR_PAGESTYLEFAMILY), + SwResId(STR_PAGESTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_PAGE)), - SW_RES(RID_PAGESTYLEFAMILY))); + ResId(RID_PAGESTYLEFAMILY, *pSwResMgr))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo, - SW_RESSTR(STR_LISTSTYLEFAMILY), + SwResId(STR_LISTSTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_LIST)), - SW_RES(RID_LISTSTYLEFAMILY))); + ResId(RID_LISTSTYLEFAMILY, *pSwResMgr))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Table, - SW_RESSTR(STR_TABLESTYLEFAMILY), + SwResId(STR_TABLESTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_TABLE)), - SW_RES(RID_TABLESTYLEFAMILY))); + ResId(RID_TABLESTYLEFAMILY, *pSwResMgr))); return pStyleFamilies; } diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 05f541ecc730..421ed22c59c9 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1395,7 +1395,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, PrintMonitor *pPrintMonDlg = static_cast<PrintMonitor*>( pProgressDlg.get() ); pPrintMonDlg->m_pPrinter->SetText( bNeedsTempFiles ? aTempFileURL->GetBase() : pSourceDocSh->GetTitle( 22 ) ); - OUString sStat( SW_RES(STR_STATSTR_LETTER) ); + OUString sStat( SwResId(STR_STATSTR_LETTER) ); sStat += " " + OUString::number( nDocNo ); pPrintMonDlg->m_pPrintInfo->SetText( sStat ); } @@ -2563,17 +2563,17 @@ OUString SwDBManager::LoadAndRegisterDataSource(SwDocShell* pDocShell) uno::Reference<ui::dialogs::XFilterManager> xFltMgr(xFP, uno::UNO_QUERY); - OUString sFilterAll(SW_RES(STR_FILTER_ALL)); - OUString sFilterAllData(SW_RES(STR_FILTER_ALL_DATA)); - OUString sFilterSXB(SW_RES(STR_FILTER_SXB)); - OUString sFilterSXC(SW_RES(STR_FILTER_SXC)); - OUString sFilterDBF(SW_RES(STR_FILTER_DBF)); - OUString sFilterXLS(SW_RES(STR_FILTER_XLS)); - OUString sFilterTXT(SW_RES(STR_FILTER_TXT)); - OUString sFilterCSV(SW_RES(STR_FILTER_CSV)); + OUString sFilterAll(SwResId(STR_FILTER_ALL)); + OUString sFilterAllData(SwResId(STR_FILTER_ALL_DATA)); + OUString sFilterSXB(SwResId(STR_FILTER_SXB)); + OUString sFilterSXC(SwResId(STR_FILTER_SXC)); + OUString sFilterDBF(SwResId(STR_FILTER_DBF)); + OUString sFilterXLS(SwResId(STR_FILTER_XLS)); + OUString sFilterTXT(SwResId(STR_FILTER_TXT)); + OUString sFilterCSV(SwResId(STR_FILTER_CSV)); #ifdef _WIN32 - OUString sFilterMDB(SW_RES(STR_FILTER_MDB)); - OUString sFilterACCDB(SW_RES(STR_FILTER_ACCDB)); + OUString sFilterMDB(SwResId(STR_FILTER_MDB)); + OUString sFilterACCDB(SwResId(STR_FILTER_ACCDB)); #endif xFltMgr->appendFilter( sFilterAll, "*" ); xFltMgr->appendFilter( sFilterAllData, "*.ods;*.sxc;*.dbf;*.xls;*.txt;*.csv"); diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 54dde02de306..1bbbfc5d76c5 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -465,7 +465,7 @@ OUString SwAddressPreview::FillData( const OUString* pAssignment = aAssignment.getConstArray(); const ResStringArray& rDefHeaders = rConfigItem.GetDefaultAddressHeaders(); OUString sAddress(rAddress); - OUString sNotAssigned = "<" + OUString(SW_RES(STR_NOTASSIGNED)) + ">"; + OUString sNotAssigned = "<" + SwResId(STR_NOTASSIGNED) + ">"; bool bIncludeCountry = rConfigItem.IsIncludeCountry(); const OUString rExcludeCountry = rConfigItem.GetExcludeCountry(); diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index 5aa6e0d88f15..8a4a10f7a2eb 100644 --- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx +++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx @@ -245,7 +245,7 @@ uno::Reference<awt::XWindow> MMExcludeEntryController::createItemWindow(const un { // make it visible m_pExcludeCheckbox = VclPtr<CheckBox>::Create(pToolbar); - m_pExcludeCheckbox->SetText(SW_RES(ST_EXCLUDE)); + m_pExcludeCheckbox->SetText(SwResId(ST_EXCLUDE)); m_pExcludeCheckbox->SetSizePixel(m_pExcludeCheckbox->GetOptimalSize()); m_pExcludeCheckbox->SetToggleHdl(LINK(this, MMExcludeEntryController, ExcludeHdl)); diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 9747e192fc9c..cabe4be6bbb0 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -200,7 +200,7 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() : m_bIsAuthentication(false), m_bIsEMailSupported(false), - m_AddressHeaderSA( SW_RES( SA_ADDRESS_HEADER )), + m_AddressHeaderSA(ResId(SA_ADDRESS_HEADER, *pSwResMgr)), m_bUserSettingWereOverwritten(false), m_bIsAddressBlock_LastUserSetting(false), m_bIsGreetingLineInMail_LastUserSetting(false), diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index 7221ba49a545..52aeec2e47a3 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -389,7 +389,7 @@ The code below would only be part of the solution. if(m_pSpellState->m_xStartRange.is()) { LockFocusNotification( true ); - sal_uInt16 nRet = ScopedVclPtrInstance<MessageDialog>(GetWindow(), SW_RES(STR_QUERY_SPELL_CONTINUE), + sal_uInt16 nRet = ScopedVclPtrInstance<MessageDialog>(GetWindow(), SwResId(STR_QUERY_SPELL_CONTINUE), VclMessageType::Question, VclButtonsType::YesNo)->Execute(); if(RET_YES == nRet) { @@ -416,7 +416,7 @@ The code below would only be part of the solution. if(bCloseMessage) { LockFocusNotification( true ); - OUString sInfo(SW_RES(STR_SPELLING_COMPLETED)); + OUString sInfo(SwResId(STR_SPELLING_COMPLETED)); // #i84610# vcl::Window* pTemp = GetWindow(); // temporary needed for g++ 3.3.5 ScopedVclPtrInstance<MessageDialog>(pTemp, sInfo, VclMessageType::Info)->Execute(); diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 8add26e4fb38..78293eca2a4d 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -322,7 +322,7 @@ bool SwGlossaryHdl::NewGlossary(const OUString& rName, const OUString& rShortNam rCfg.IsSaveRelFile(), pOnlyText ); if(nSuccess == (sal_uInt16) -1 ) { - ScopedVclPtrInstance<MessageDialog>(pWrtShell->GetView().GetWindow(), SW_RES(STR_ERR_INSERT_GLOS), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(pWrtShell->GetView().GetWindow(), SwResId(STR_ERR_INSERT_GLOS), VclMessageType::Info)->Execute(); } if( !pCurGrp ) delete pTmp; @@ -474,7 +474,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName, { aShortName = aShortName.copy(0, nMaxLen) + " ..."; } - OUString aTmp( SW_RES(STR_NOGLOS)); + OUString aTmp( SwResId(STR_NOGLOS)); aTmp = aTmp.replaceFirst("%1", aShortName); ScopedVclPtrInstance<InfoBox>(pWrtShell->GetView().GetWindow(), aTmp)->Execute(); } diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 897bd01281ae..4615824bccc3 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -1706,7 +1706,7 @@ bool SwTransferable::PasteFileContent( TransferableDataHelper& rData, if( bMsg && nResId ) { - ScopedVclPtrInstance<MessageDialog>(nullptr, SW_RES(nResId), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(nullptr, SwResId(nResId), VclMessageType::Info)->Execute(); } return bRet; } @@ -1780,7 +1780,7 @@ bool SwTransferable::PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, if( !IsError( aReader.Read( *pRead )) ) bRet = true; else if( bMsg ) - ScopedVclPtrInstance<MessageDialog>(nullptr, SW_RES(STR_ERROR_CLPBRD_READ), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(nullptr, SwResId(STR_ERROR_CLPBRD_READ), VclMessageType::Info)->Execute(); } else { @@ -2159,7 +2159,7 @@ bool SwTransferable::PasteDDE( TransferableDataHelper& rData, if (nRows > USHRT_MAX || nCols > USHRT_MAX) { if( bMsg ) - ScopedVclPtrInstance<MessageDialog>(nullptr, SW_RESSTR(STR_TABLE_TOO_LARGE), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(nullptr, SwResId(STR_TABLE_TOO_LARGE), VclMessageType::Info)->Execute(); pDDETyp = nullptr; break; } @@ -2168,7 +2168,7 @@ bool SwTransferable::PasteDDE( TransferableDataHelper& rData, if( !nRows || !nCols ) { if( bMsg ) - ScopedVclPtrInstance<MessageDialog>(nullptr, SW_RESSTR(STR_NO_TABLE), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(nullptr, SwResId(STR_NO_TABLE), VclMessageType::Info)->Execute(); pDDETyp = nullptr; break; } @@ -2714,7 +2714,7 @@ bool SwTransferable::PasteDBData( TransferableDataHelper& rData, } else if( bMsg ) { - ScopedVclPtrInstance<MessageDialog>(nullptr, SW_RES(STR_CLPBRD_FORMAT_ERROR), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(nullptr, SwResId(STR_CLPBRD_FORMAT_ERROR), VclMessageType::Info)->Execute(); } return bRet; } @@ -2753,7 +2753,7 @@ bool SwTransferable::PasteFileList( TransferableDataHelper& rData, } else if( bMsg ) { - ScopedVclPtrInstance<MessageDialog>(nullptr, SW_RES(STR_CLPBRD_FORMAT_ERROR), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(nullptr, SwResId(STR_CLPBRD_FORMAT_ERROR), VclMessageType::Info)->Execute(); } return bRet; } @@ -2919,7 +2919,7 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat aFormats.insert( aFormats.begin(), aFlavorEx ); } pDlg->SetObjName( pClipboard->m_aObjDesc.maClassName, - SW_RES( nResId ) ); + SwResId( nResId ) ); pDlg->Insert( SotClipboardFormatId::EMBED_SOURCE, aEmptyOUStr ); } } @@ -2938,7 +2938,7 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat } if( SwTransferable::TestAllowedFormat( rData, SotClipboardFormatId::LINK, nDest )) - pDlg->Insert( SotClipboardFormatId::LINK, SW_RES(STR_DDEFORMAT) ); + pDlg->Insert( SotClipboardFormatId::LINK, SwResId(STR_DDEFORMAT) ); for( SotClipboardFormatId* pIds = aPasteSpecialIds; *pIds != SotClipboardFormatId::NONE; ++pIds ) if( SwTransferable::TestAllowedFormat( rData, *pIds, nDest )) @@ -2976,7 +2976,7 @@ void SwTransferable::FillClipFormatItem( const SwWrtShell& rSh, if( nResId ) rToFill.AddClipbrdFormat( SotClipboardFormatId::EMBED_SOURCE, - SW_RESSTR( nResId ) ); + SwResId( nResId ) ); } else { @@ -3003,7 +3003,7 @@ void SwTransferable::FillClipFormatItem( const SwWrtShell& rSh, } if( SwTransferable::TestAllowedFormat( rData, SotClipboardFormatId::LINK, nDest )) - rToFill.AddClipbrdFormat( SotClipboardFormatId::LINK, SW_RESSTR(STR_DDEFORMAT) ); + rToFill.AddClipbrdFormat( SotClipboardFormatId::LINK, SwResId(STR_DDEFORMAT) ); for( SotClipboardFormatId* pIds = aPasteSpecialIds; *pIds != SotClipboardFormatId::NONE; ++pIds ) if( SwTransferable::TestAllowedFormat( rData, *pIds, nDest )) diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx index f0cf0645608c..1969ce7f9128 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx @@ -49,8 +49,8 @@ AnnotationMenuButton::AnnotationMenuButton(sw::annotation::SwAnnotationWin& rSid { AddEventListener(LINK(&mrSidebarWin, sw::annotation::SwAnnotationWin, WindowEventListener)); - SetAccessibleName(SW_RES(STR_ACCESS_ANNOTATION_BUTTON_NAME)); - SetAccessibleDescription(SW_RES(STR_ACCESS_ANNOTATION_BUTTON_DESC)); + SetAccessibleName(SwResId(STR_ACCESS_ANNOTATION_BUTTON_NAME)); + SetAccessibleDescription(SwResId(STR_ACCESS_ANNOTATION_BUTTON_DESC)); SetQuickHelpText(GetAccessibleDescription()); } @@ -111,7 +111,7 @@ void AnnotationMenuButton::MouseButtonDown( const MouseEvent& rMEvt ) { if ((sAuthor = aUserOpt.GetID()).isEmpty()) { - sAuthor = SW_RES(STR_REDLINE_UNKNOWN_AUTHOR); + sAuthor = SwResId(STR_REDLINE_UNKNOWN_AUTHOR); } } // do not allow to reply to ourself and no answer possible if this note is in a protected section diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index 8bbb502c5ce6..a55764f4434d 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -368,7 +368,7 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText) const LocaleDataWrapper& rLocalData = aSysLocale.GetLocaleData(); SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, pWin->GetAuthor()); - const OUString aText = aRewriter.Apply(SW_RESSTR(STR_REPLY)) + const OUString aText = aRewriter.Apply(SwResId(STR_REPLY)) + " (" + rLocalData.getDate( pWin->GetDate()) + ", " + rLocalData.getTime( pWin->GetTime(), false) + "): \""; diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index c61b7a82f45d..e4360ab085ea 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -448,7 +448,7 @@ void SwAnnotationWin::InitControls() // window controls for author and date mpMetadataAuthor = VclPtr<Edit>::Create( this, 0 ); - mpMetadataAuthor->SetAccessibleName( SW_RES( STR_ACCESS_ANNOTATION_AUTHOR_NAME ) ); + mpMetadataAuthor->SetAccessibleName( SwResId( STR_ACCESS_ANNOTATION_AUTHOR_NAME ) ); mpMetadataAuthor->EnableRTL(AllSettings::GetLayoutRTL()); mpMetadataAuthor->SetReadOnly(); mpMetadataAuthor->AlwaysDisableInput(true); @@ -467,7 +467,7 @@ void SwAnnotationWin::InitControls() } mpMetadataDate = VclPtr<Edit>::Create( this, 0 ); - mpMetadataDate->SetAccessibleName( SW_RES( STR_ACCESS_ANNOTATION_DATE_NAME ) ); + mpMetadataDate->SetAccessibleName( SwResId( STR_ACCESS_ANNOTATION_DATE_NAME ) ); mpMetadataDate->EnableRTL(AllSettings::GetLayoutRTL()); mpMetadataDate->SetReadOnly(); mpMetadataDate->AlwaysDisableInput(true); @@ -554,7 +554,7 @@ void SwAnnotationWin::CheckMetaText() OUString sMeta = GetAuthor(); if (sMeta.isEmpty()) { - sMeta = SW_RESSTR(STR_NOAUTHOR); + sMeta = SwResId(STR_NOAUTHOR); } else if (sMeta.getLength() > 23) { @@ -572,7 +572,7 @@ void SwAnnotationWin::CheckMetaText() } else { - sMeta = SW_RESSTR(STR_NODATE); + sMeta = SwResId(STR_NODATE); } if (GetTime()!=0) { diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index e83b876c2a5a..f0097c6f2931 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -147,13 +147,13 @@ SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, const SwFrame *pFrame // Rewrite the menu entries' text if (m_bIsHeader) { - m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("edit"), SW_RESSTR(STR_FORMAT_HEADER)); - m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("delete"), SW_RESSTR(STR_DELETE_HEADER)); + m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("edit"), SwResId(STR_FORMAT_HEADER)); + m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("delete"), SwResId(STR_DELETE_HEADER)); } else { - m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("edit"), SW_RESSTR(STR_FORMAT_FOOTER)); - m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("delete"), SW_RESSTR(STR_DELETE_FOOTER)); + m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("edit"), SwResId(STR_FORMAT_FOOTER)); + m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("delete"), SwResId(STR_DELETE_FOOTER)); } SetPopupMenu(m_pPopupMenu); @@ -182,17 +182,17 @@ void SwHeaderFooterWin::SetOffset(Point aOffset, long nXLineStart, long nXLineEn bool bIsFirst = !pDesc->IsFirstShared() && GetPageFrame()->OnFirstPage(); bool bIsLeft = !pDesc->IsHeaderShared() && !GetPageFrame()->OnRightPage(); bool bIsRight = !pDesc->IsHeaderShared() && GetPageFrame()->OnRightPage(); - m_sLabel = SW_RESSTR(STR_HEADER_TITLE); + m_sLabel = SwResId(STR_HEADER_TITLE); if (!m_bIsHeader) - m_sLabel = bIsFirst ? SW_RESSTR(STR_FIRST_FOOTER_TITLE) - : bIsLeft ? SW_RESSTR(STR_LEFT_FOOTER_TITLE) - : bIsRight ? SW_RESSTR(STR_RIGHT_FOOTER_TITLE) - : SW_RESSTR(STR_FOOTER_TITLE ); + m_sLabel = bIsFirst ? SwResId(STR_FIRST_FOOTER_TITLE) + : bIsLeft ? SwResId(STR_LEFT_FOOTER_TITLE) + : bIsRight ? SwResId(STR_RIGHT_FOOTER_TITLE) + : SwResId(STR_FOOTER_TITLE ); else - m_sLabel = bIsFirst ? SW_RESSTR(STR_FIRST_HEADER_TITLE) - : bIsLeft ? SW_RESSTR(STR_LEFT_HEADER_TITLE) - : bIsRight ? SW_RESSTR(STR_RIGHT_HEADER_TITLE) - : SW_RESSTR(STR_HEADER_TITLE); + m_sLabel = bIsFirst ? SwResId(STR_FIRST_HEADER_TITLE) + : bIsLeft ? SwResId(STR_LEFT_HEADER_TITLE) + : bIsRight ? SwResId(STR_RIGHT_HEADER_TITLE) + : SwResId(STR_HEADER_TITLE); sal_Int32 nPos = m_sLabel.lastIndexOf("%1"); m_sLabel = m_sLabel.replaceAt(nPos, 2, pDesc->GetName()); diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 2651538f6f82..55b4ea914d4a 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -1491,7 +1491,7 @@ void SwPostItMgr::Delete(const OUString& rAuthor) SetActiveSidebarWin(nullptr); } SwRewriter aRewriter; - aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_DELETE_AUTHOR_NOTES) + rAuthor); + aRewriter.AddRule(UndoArg1, SwResId(STR_DELETE_AUTHOR_NOTES) + rAuthor); mpWrtShell->StartUndo( SwUndoId::DELETE, &aRewriter ); IsPostitFieldWithAuthorOf aFilter(rAuthor); @@ -1518,7 +1518,7 @@ void SwPostItMgr::Delete(sal_uInt32 nPostItId) SetActiveSidebarWin(nullptr); } SwRewriter aRewriter; - aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_CONTENT_TYPE_SINGLE_POSTIT)); + aRewriter.AddRule(UndoArg1, SwResId(STR_CONTENT_TYPE_SINGLE_POSTIT)); mpWrtShell->StartUndo( SwUndoId::DELETE, &aRewriter ); IsPostitFieldWithPostitId aFilter(nPostItId); @@ -1539,7 +1539,7 @@ void SwPostItMgr::Delete() mpWrtShell->StartAllAction(); SetActiveSidebarWin(nullptr); SwRewriter aRewriter; - aRewriter.AddRule(UndoArg1, SW_RES(STR_DELETE_ALL_NOTES) ); + aRewriter.AddRule(UndoArg1, SwResId(STR_DELETE_ALL_NOTES) ); mpWrtShell->StartUndo( SwUndoId::DELETE, &aRewriter ); IsPostitField aFilter; @@ -1598,7 +1598,7 @@ void SwPostItMgr::FormatAll(const SfxItemSet &rNewAttr) { mpWrtShell->StartAllAction(); SwRewriter aRewriter; - aRewriter.AddRule(UndoArg1, SW_RES(STR_FORMAT_ALL_NOTES) ); + aRewriter.AddRule(UndoArg1, SwResId(STR_FORMAT_ALL_NOTES) ); mpWrtShell->StartUndo( SwUndoId::INSATTR, &aRewriter ); for(SwSidebarItem_iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i) diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx index 0d4cf9f0a41b..c38b243a5880 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx @@ -123,7 +123,7 @@ void SidebarTextControl::RequestHelp(const HelpEvent &rEvt) if ( nResId && mrDocView.GetWrtShell().GetContentAtPos( mrSidebarWin.GetAnchorPos(), aContentAtPos ) ) { - OUString sText = SW_RESSTR( nResId ) + ": " + + OUString sText = SwResId( nResId ) + ": " + aContentAtPos.aFnd.pRedl->GetAuthorString() + " - " + GetAppLangDateTimeString( aContentAtPos.aFnd.pRedl->GetTimeStamp() ); Help::ShowQuickHelp( this,PixelToLogic(tools::Rectangle(rEvt.GetMousePosPixel(),Size(50,10))),sText); diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx index 21b5d2484011..1a5e1dd0243b 100644 --- a/sw/source/uibase/docvw/edtwin2.cxx +++ b/sw/source/uibase/docvw/edtwin2.cxx @@ -80,7 +80,7 @@ static OUString lcl_GetRedlineHelp( const SwRangeRedline& rRedl, bool bBalloon ) OUStringBuffer sBuf; if( nResId ) { - sBuf.append(SW_RESSTR(nResId)); + sBuf.append(SwResId(nResId)); sBuf.append(": "); sBuf.append(rRedl.GetAuthorString()); sBuf.append(" - "); @@ -237,7 +237,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) OUString aModStr( aModifiedCode.GetName() ); aModStr = aModStr.replaceFirst(aCode.GetName(), ""); aModStr = aModStr.replaceAll("+", ""); - sText = SW_RESSTR(STR_SMARTTAG_CLICK).replaceAll("%s", aModStr); + sText = SwResId(STR_SMARTTAG_CLICK).replaceAll("%s", aModStr); } break; @@ -247,7 +247,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) const SwFormatFootnote* pFootnote = static_cast<const SwFormatFootnote*>(aContentAtPos.aFnd.pAttr); OUString sTmp; pFootnote->GetFootnoteText( sTmp ); - sText = SW_RESSTR( pFootnote->IsEndNote() + sText = SwResId( pFootnote->IsEndNote() ? STR_ENDNOTE : STR_FTNNOTE ) + sTmp; bBalloon = true; if( aContentAtPos.IsInRTLText() ) @@ -275,7 +275,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) case IsAttrAtPos::RefMark: if(aContentAtPos.aFnd.pAttr) { - sText = SW_RESSTR(STR_CONTENT_TYPE_SINGLE_REFERENCE); + sText = SwResId(STR_CONTENT_TYPE_SINGLE_REFERENCE); sText += ": "; sText += static_cast<const SwFormatRefMark*>(aContentAtPos.aFnd.pAttr)->GetRefName(); } @@ -418,7 +418,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) } if(nTabRes) { - sText = SW_RESSTR(nTabRes); + sText = SwResId(nTabRes); Size aTextSize( GetTextWidth(sText), GetTextHeight()); tools::Rectangle aRect(rEvt.GetMousePosPixel(), aTextSize); OUString sDisplayText(ClipLongToolTip(sText)); diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx index 9a443fc65297..56fbc75cae0e 100644 --- a/sw/source/uibase/envelp/envimg.cxx +++ b/sw/source/uibase/envelp/envimg.cxx @@ -52,7 +52,7 @@ OUString MakeSender() SvtUserOptions& rUserOpt = SW_MOD()->GetUserOptions(); OUString sRet; - OUString sSenderToken(SW_RES(STR_SENDER_TOKENS)); + OUString sSenderToken(SwResId(STR_SENDER_TOKENS)); sal_Int32 nTokenCount = comphelper::string::getTokenCount(sSenderToken, ';'); sal_Int32 nSttPos = 0; bool bLastLength = true; diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 14870351d835..98657f7b69d6 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -388,12 +388,12 @@ OUString SwFieldMgr::GetTypeStr(sal_uInt16 nPos) // special treatment for date/time fields (without var/fix) if( TYP_DATEFLD == nFieldWh ) { - static OUString g_aDate( SW_RES( STR_DATEFLD ) ); + static OUString g_aDate( SwResId( STR_DATEFLD ) ); return g_aDate; } if( TYP_TIMEFLD == nFieldWh ) { - static OUString g_aTime( SW_RES( STR_TIMEFLD ) ); + static OUString g_aTime( SwResId( STR_TIMEFLD ) ); return g_aTime; } @@ -442,7 +442,7 @@ void SwFieldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill) } case TYP_INPUTFLD: { - rToFill.push_back(SW_RES(aSwFields[nPos].nSubTypeStart)); + rToFill.push_back(SwResId(aSwFields[nPos].nSubTypeStart)); SAL_FALLTHROUGH; // move on at generic types } case TYP_DDEFLD: @@ -505,12 +505,12 @@ void SwFieldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill) if (nTypeId == TYP_DOCINFOFLD) { if ( i == DI_CUSTOM ) - sNew = SW_RES( STR_CUSTOM ); + sNew = SwResId( STR_CUSTOM ); else sNew = SwViewShell::GetShellRes()->aDocInfoLst[i]; } else - sNew = SW_RES(aSwFields[nPos].nSubTypeStart + i); + sNew = SwResId(aSwFields[nPos].nSubTypeStart + i); rToFill.push_back(sNew); } @@ -587,14 +587,14 @@ OUString SwFieldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const nFormatId &= ~FF_FIXED; // mask out Fixed-Flag if((nStart + nFormatId) < aSwFields[nPos].nFormatEnd) - return SW_RES((sal_uInt16)(nStart + nFormatId)); + return SwResId((sal_uInt16)(nStart + nFormatId)); OUString aRet; if( FMT_NUM_BEGIN == nStart) { if(xNumberingInfo.is()) { - ResStringArray aNames( SVX_RES( RID_SVXSTRARY_NUMBERINGTYPE )); + ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, *pSwResMgr)); Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes(); const sal_Int16* pTypes = aTypes.getConstArray(); @@ -1610,7 +1610,7 @@ void SwFieldType::GetFieldName_() SwFieldType::s_pFieldNames->reserve(SAL_N_ELEMENTS(coFieldNms)); for(sal_uInt16 i : coFieldNms) { - const OUString aTmp(SW_RES( i )); + const OUString aTmp(SwResId( i )); SwFieldType::s_pFieldNames->push_back(MnemonicGenerator::EraseAllMnemonicChars( aTmp )); } } diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx index 40f60b8ac26d..f18c6c367e99 100644 --- a/sw/source/uibase/globdoc/globdoc.cxx +++ b/sw/source/uibase/globdoc/globdoc.cxx @@ -54,17 +54,17 @@ void SwGlobalDocShell::FillClass( SvGlobalName * pClassName, { *pClassName = SvGlobalName( SO3_SWGLOB_CLASSID_60 ); *pClipFormat = SotClipboardFormatId::STARWRITERGLOB_60; - *pLongUserName = SW_RESSTR(STR_WRITER_GLOBALDOC_FULLTYPE); + *pLongUserName = SwResId(STR_WRITER_GLOBALDOC_FULLTYPE); OSL_ENSURE( !bTemplate, "No template for Writer Global" ); } else if (nVersion == SOFFICE_FILEFORMAT_8) { *pClassName = SvGlobalName( SO3_SWGLOB_CLASSID_60 ); *pClipFormat = bTemplate ? SotClipboardFormatId::STARWRITERGLOB_8_TEMPLATE : SotClipboardFormatId::STARWRITERGLOB_8; - *pLongUserName = SW_RESSTR(STR_WRITER_GLOBALDOC_FULLTYPE); + *pLongUserName = SwResId(STR_WRITER_GLOBALDOC_FULLTYPE); } - *pUserName = SW_RESSTR(STR_HUMAN_SWGLOBDOC_NAME); + *pUserName = SwResId(STR_HUMAN_SWGLOBDOC_NAME); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx index 8f96c7fa9481..a86628f57d44 100644 --- a/sw/source/uibase/lingu/hyp.cxx +++ b/sw/source/uibase/lingu/hyp.cxx @@ -119,7 +119,7 @@ SwHyphWrapper::~SwHyphWrapper() if( nPageCount ) ::EndProgress( pView->GetDocShell() ); if( bInfoBox && !Application::IsHeadlessModeEnabled() ) - ScopedVclPtrInstance<InfoBox>(&pView->GetEditWin(), SW_RESSTR(STR_HYP_OK))->Execute(); + ScopedVclPtrInstance<InfoBox>(&pView->GetEditWin(), SwResId(STR_HYP_OK))->Execute(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index a00ddc42404e..dc336015eb51 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -207,12 +207,12 @@ void SwSpellPopup::fillLangPopupMenu( } } - pPopupMenu->InsertItem( nLangItemIdStart + MN_NONE_OFFSET, OUString(SW_RES( STR_LANGSTATUS_NONE )), MenuItemBits::RADIOCHECK ); + pPopupMenu->InsertItem( nLangItemIdStart + MN_NONE_OFFSET, SwResId( STR_LANGSTATUS_NONE ), MenuItemBits::RADIOCHECK ); if ( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) == aCurLang ) pPopupMenu->CheckItem( nLangItemIdStart + MN_NONE_OFFSET ); - pPopupMenu->InsertItem( nLangItemIdStart + MN_RESET_OFFSET, OUString(SW_RES( STR_RESET_TO_DEFAULT_LANGUAGE )) ); - pPopupMenu->InsertItem( nLangItemIdStart + MN_MORE_OFFSET, OUString(SW_RES( STR_LANGSTATUS_MORE )) ); + pPopupMenu->InsertItem( nLangItemIdStart + MN_RESET_OFFSET, SwResId( STR_RESET_TO_DEFAULT_LANGUAGE ) ); + pPopupMenu->InsertItem( nLangItemIdStart + MN_MORE_OFFSET, SwResId( STR_LANGSTATUS_MORE ) ); } SwSpellPopup::SwSpellPopup( @@ -294,7 +294,7 @@ SwSpellPopup::SwSpellPopup( uno::Reference< frame::XFrame > xFrame = pWrtSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface(); OUString aModuleName(vcl::CommandInfoProvider::GetModuleIdentifier(xFrame)); - OUString aIgnoreSelection( SW_RES( STR_IGNORE_SELECTION ) ); + OUString aIgnoreSelection( SwResId( STR_IGNORE_SELECTION ) ); m_xPopupMenu->SetItemText(m_nSpellDialogId, vcl::CommandInfoProvider::GetPopupLabelForCommand(".uno:SpellingAndGrammarDialog", aModuleName)); m_xPopupMenu->SetItemText(m_nCorrectDialogId, @@ -473,7 +473,7 @@ SwSpellPopup::SwSpellPopup( if ( !m_sExplanationLink.isEmpty( ) ) { - m_xPopupMenu->InsertItem(MN_EXPLANATION_LINK, SW_RESSTR(STR_EXPLANATION_LINK), MenuItemBits::TEXT | MenuItemBits::HELP, OString(), nPos++); + m_xPopupMenu->InsertItem(MN_EXPLANATION_LINK, SwResId(STR_EXPLANATION_LINK), MenuItemBits::TEXT | MenuItemBits::HELP, OString(), nPos++); } m_xPopupMenu->SetMenuFlags(MenuFlags::NoAutoMnemonics); @@ -512,7 +512,7 @@ SwSpellPopup::SwSpellPopup( uno::Reference< frame::XFrame > xFrame = pWrtSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface(); OUString aModuleName(vcl::CommandInfoProvider::GetModuleIdentifier(xFrame)); - OUString aIgnoreSelection( SW_RES( STR_IGNORE_SELECTION ) ); + OUString aIgnoreSelection( SwResId( STR_IGNORE_SELECTION ) ); m_xPopupMenu->SetItemText(m_nSpellDialogId, vcl::CommandInfoProvider::GetPopupLabelForCommand(".uno:SpellingAndGrammarDialog", aModuleName)); sal_uInt16 nItemPos = m_xPopupMenu->GetItemPos(m_nIgnoreWordId); @@ -661,11 +661,11 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, m_pSh->GetCursorDescr()); - aRewriter.AddRule(UndoArg2, OUString(SW_RES(STR_YIELDS))); + aRewriter.AddRule(UndoArg2, SwResId(STR_YIELDS)); - OUString aTmpStr( SW_RES(STR_START_QUOTE) ); + OUString aTmpStr( SwResId(STR_START_QUOTE) ); aTmpStr += aTmp; - aTmpStr += OUString(SW_RES(STR_END_QUOTE)); + aTmpStr += SwResId(STR_END_QUOTE); aRewriter.AddRule(UndoArg3, aTmpStr); m_pSh->StartUndo(SwUndoId::UI_REPLACE, &aRewriter); diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx index 8dbf06f4d057..e3e6273a9fb5 100644 --- a/sw/source/uibase/misc/glshell.cxx +++ b/sw/source/uibase/misc/glshell.cxx @@ -95,7 +95,7 @@ static void lcl_GetState( SwDocShell& rSh, SfxItemSet& rSet ) if( !rSh.GetDoc()->getIDocumentState().IsModified() ) rSet.DisableItem( SID_SAVEDOC ); else - rSet.Put( SfxStringItem( SID_SAVEDOC, SW_RESSTR(STR_SAVE_GLOSSARY))); + rSet.Put( SfxStringItem( SID_SAVEDOC, SwResId(STR_SAVE_GLOSSARY))); } } @@ -228,7 +228,7 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const OUString& rGroup, const OUString // set document title SfxViewFrame* pFrame = bShow ? SfxViewFrame::LoadDocument( *xDocSh, nViewId ) : SfxViewFrame::LoadHiddenDocument( *xDocSh, nViewId ); - const OUString aDocTitle(SW_RESSTR( STR_GLOSSARY ) + " " + sLongName); + const OUString aDocTitle(SwResId( STR_GLOSSARY ) + " " + sLongName); bool const bDoesUndo = xDocSh->GetDoc()->GetIDocumentUndoRedo().DoesUndo(); diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index bfd69cd51aa9..6f87678ab0a9 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -90,7 +90,7 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags) pTypes = aTypes.getConstArray(); } } - ResStringArray aNames( SVX_RES( RID_SVXSTRARY_NUMBERINGTYPE )); + ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, *pSwResMgr)); for(size_t i = 0; i < aNames.Count(); i++) { sal_IntPtr nValue = aNames.GetValue(i); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index d2474432d08c..71306a2d9432 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -151,12 +151,12 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer : m_pParentDlg(pParent) , m_aTabPagesCTRL(VclPtr<SvxAcceptChgCtr>::Create(pContentArea, pBuilder)) , m_xPopup(pBuilder->get_menu("writermenu")) - , m_sInserted(SW_RES(STR_REDLINE_INSERTED)) - , m_sDeleted(SW_RES(STR_REDLINE_DELETED)) - , m_sFormated(SW_RES(STR_REDLINE_FORMATED)) - , m_sTableChgd(SW_RES(STR_REDLINE_TABLECHG)) - , m_sFormatCollSet(SW_RES(STR_REDLINE_FMTCOLLSET)) - , m_sAutoFormat(SW_RES(STR_REDLINE_AUTOFMT)) + , m_sInserted(SwResId(STR_REDLINE_INSERTED)) + , m_sDeleted(SwResId(STR_REDLINE_DELETED)) + , m_sFormated(SwResId(STR_REDLINE_FORMATED)) + , m_sTableChgd(SwResId(STR_REDLINE_TABLECHG)) + , m_sFormatCollSet(SwResId(STR_REDLINE_FMTCOLLSET)) + , m_sAutoFormat(SwResId(STR_REDLINE_AUTOFMT)) , m_bOnlyFormatedRedlines(false) , m_bRedlnAutoFormat(bAutoFormat) , m_bInhibitActivate(false) @@ -819,7 +819,7 @@ void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect, bool bAccept ) SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, OUString::number(aRedlines.size())); - aTmpStr = aRewriter.Apply(OUString(SW_RES(STR_N_REDLINES))); + aTmpStr = aRewriter.Apply(SwResId(STR_N_REDLINES)); } SwRewriter aRewriter; @@ -1111,9 +1111,9 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl, SvSimpleTable*, void) break; default:;//prevent warning } - OUString sTitle(SW_RES(STR_REDLINE_COMMENT)); + OUString sTitle(SwResId(STR_REDLINE_COMMENT)); if( nResId ) - sTitle += SW_RESSTR( nResId ); + sTitle += SwResId( nResId ); pDlg->SetText(sTitle); SwViewShell::SetCareWin(pDlg->GetWindow()); diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 1a1c1ef5dee9..c2be3f05de94 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -128,7 +128,7 @@ void SwCommentRuler::DrawCommentControl(vcl::RenderContext& rRenderContext) maVirDev->DrawRect( tools::Rectangle( Point(), aControlRect.GetSize() ) ); // Label and arrow tip - OUString aLabel( SW_RESSTR ( STR_COMMENTS_LABEL ) ); + OUString aLabel( SwResId ( STR_COMMENTS_LABEL ) ); // Get label and arrow coordinates Point aLabelPos; Point aArrowPos; @@ -261,7 +261,7 @@ void SwCommentRuler::UpdateCommentHelpText() nTooltipResId = STR_HIDE_COMMENTS; else nTooltipResId = STR_SHOW_COMMENTS; - SetQuickHelpText( OUString( SW_RESSTR( nTooltipResId ) ) ); + SetQuickHelpText( OUString( SwResId( nTooltipResId ) ) ); } // TODO Make Ruler return its central rectangle instead of margins. diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx index d2b2eff39099..5c02f9b3c32f 100644 --- a/sw/source/uibase/ribbar/drawbase.cxx +++ b/sw/source/uibase/ribbar/drawbase.cxx @@ -264,7 +264,7 @@ bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt) { SwRewriter aRewriter; - aRewriter.AddRule(UndoArg1, SW_RES(STR_FRAME)); + aRewriter.AddRule(UndoArg1, SwResId(STR_FRAME)); m_pSh->StartUndo(SwUndoId::INSERT, &aRewriter); } diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index 3a037220b255..488cd6ac3b1f 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -78,11 +78,11 @@ SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher* pDispatcher) aPos->SetSizePixel(aPos->LogicToPixel(Size(45, 11), MapMode(MapUnit::MapAppFont))); InsertItem(FN_FORMULA_CALC, Image(BitmapEx(RID_BMP_FORMULA_CALC)), - SW_RESSTR(STR_FORMULA_CALC)); + SwResId(STR_FORMULA_CALC)); InsertItem(FN_FORMULA_CANCEL, Image(BitmapEx(RID_BMP_FORMULA_CANCEL)), - SW_RESSTR(STR_FORMULA_CANCEL)); + SwResId(STR_FORMULA_CANCEL)); InsertItem(FN_FORMULA_APPLY, Image(BitmapEx(RID_BMP_FORMULA_APPLY)), - SW_RESSTR(STR_FORMULA_APPLY)); + SwResId(STR_FORMULA_APPLY)); SetHelpId(FN_FORMULA_CALC, HID_TBX_FORMULA_CALC); SetHelpId(FN_FORMULA_CANCEL, HID_TBX_FORMULA_CANCEL); @@ -95,14 +95,14 @@ SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher* pDispatcher) pWrtShell = pView ? pView->GetWrtShellPtr() : nullptr; InsertWindow(ED_POS, aPos.get(), ToolBoxItemBits::NONE, 0); - SetItemText(ED_POS, SW_RESSTR(STR_ACCESS_FORMULA_TYPE)); - aPos->SetAccessibleName(SW_RESSTR(STR_ACCESS_FORMULA_TYPE)); - SetAccessibleName(SW_RESSTR(STR_ACCESS_FORMULA_TOOLBAR)); + SetItemText(ED_POS, SwResId(STR_ACCESS_FORMULA_TYPE)); + aPos->SetAccessibleName(SwResId(STR_ACCESS_FORMULA_TYPE)); + SetAccessibleName(SwResId(STR_ACCESS_FORMULA_TOOLBAR)); InsertSeparator ( 1 ); InsertSeparator (); InsertWindow(ED_FORMULA, aEdit.get()); - SetItemText(ED_FORMULA, SW_RESSTR(STR_ACCESS_FORMULA_TEXT)); - aEdit->SetAccessibleName(SW_RESSTR(STR_ACCESS_FORMULA_TEXT)); + SetItemText(ED_FORMULA, SwResId(STR_ACCESS_FORMULA_TEXT)); + aEdit->SetAccessibleName(SwResId(STR_ACCESS_FORMULA_TEXT)); SetHelpId(ED_FORMULA, HID_EDIT_FORMULA); SetItemBits( FN_FORMULA_CALC, GetItemBits( FN_FORMULA_CALC ) | ToolBoxItemBits::DROPDOWNONLY ); @@ -211,7 +211,7 @@ void SwInputWindow::ShowWin() aAktTableName = pWrtShell->GetTableFormat()->GetName(); } else - aPos->SetText(SW_RESSTR(STR_TBL_FORMULA)); + aPos->SetText(SwResId(STR_TBL_FORMULA)); // Edit current field OSL_ENSURE(pMgr == nullptr, "FieldManager not deleted"); diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 4474108a87db..c9090674893b 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -255,15 +255,15 @@ SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& { // -2, there's no string for Next/Prev sal_uInt16 nResStr = ST_TBL - 2 + nNaviId - NID_START; - sText = SW_RESSTR(nResStr); + sText = SwResId(nResStr); nTbxBits = ToolBoxItemBits::CHECKABLE; } else { if (nNaviId == NID_PREV) - sText = SW_RESSTR(STR_IMGBTN_PGE_UP); + sText = SwResId(STR_IMGBTN_PGE_UP); else if (nNaviId == NID_NEXT) - sText = SW_RESSTR(STR_IMGBTN_PGE_DOWN); + sText = SwResId(STR_IMGBTN_PGE_DOWN); } m_pToolBox->InsertItem(nNaviId, Image(BitmapEx(aNavigationImgIds[i])), @@ -276,7 +276,7 @@ SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& // these are global strings for( i = 0; i < 2 * NID_COUNT; i++) { - sQuickHelp[i] = SW_RESSTR(STR_IMGBTN_START + i); + sQuickHelp[i] = SwResId(STR_IMGBTN_START + i); } sal_uInt16 nItemId = SwView::GetMoveType(); @@ -358,7 +358,7 @@ OUString SwScrollNaviPopup::GetToolTip(bool bNext) nResId += SwView::GetMoveType() - NID_START; if(!bNext) nResId += NID_COUNT; - return SW_RESSTR(nResId); + return SwResId(nResId); } class SwZoomBox_Impl : public ComboBox @@ -395,7 +395,7 @@ SwZoomBox_Impl::SwZoomBox_Impl(vcl::Window* pParent, sal_uInt16 nSlot) RID_SVXSTR_ZOOM_OPTIMAL_VIEW }; for(sal_uInt16 aZoomValue : aZoomValues) { - OUString sEntry = SVX_RESSTR( aZoomValue ); + OUString sEntry = SvxResId( aZoomValue ); InsertEntry(sEntry); } @@ -407,11 +407,11 @@ void SwZoomBox_Impl::Select() { OUString sEntry = GetText().replaceAll("%", ""); SvxZoomItem aZoom(SvxZoomType::PERCENT,100); - if(sEntry == SVX_RESSTR( RID_SVXSTR_ZOOM_PAGE_WIDTH ) ) + if(sEntry == SvxResId( RID_SVXSTR_ZOOM_PAGE_WIDTH ) ) aZoom.SetType(SvxZoomType::PAGEWIDTH); - else if(sEntry == SVX_RESSTR( RID_SVXSTR_ZOOM_OPTIMAL_VIEW ) ) + else if(sEntry == SvxResId( RID_SVXSTR_ZOOM_OPTIMAL_VIEW ) ) aZoom.SetType(SvxZoomType::OPTIMAL); - else if(sEntry == SVX_RESSTR( RID_SVXSTR_ZOOM_WHOLE_PAGE) ) + else if(sEntry == SvxResId( RID_SVXSTR_ZOOM_WHOLE_PAGE) ) aZoom.SetType(SvxZoomType::WHOLEPAGE); else { diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 1de04845a67c..d3cb2063951b 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -1186,7 +1186,7 @@ void SwAnnotationShell::GetNoteState(SfxItemSet &rSet) else { OUString aText( nSlotId == FN_DELETE_NOTE_AUTHOR ? - SW_RES( STR_DELETE_NOTE_AUTHOR ) : SW_RES( STR_HIDE_NOTE_AUTHOR ) ); + SwResId( STR_DELETE_NOTE_AUTHOR ) : SwResId( STR_HIDE_NOTE_AUTHOR ) ); SwRewriter aRewriter; aRewriter.AddRule( UndoArg1, pPostItMgr->GetActiveSidebarWin()->GetAuthor() ); aText = aRewriter.Apply( aText ); @@ -1208,7 +1208,7 @@ void SwAnnotationShell::GetNoteState(SfxItemSet &rSet) OUString sAuthor; if( (sAuthor = aUserOpt.GetFullName()).isEmpty() && (sAuthor = aUserOpt.GetID()).isEmpty() ) - sAuthor = SW_RES( STR_REDLINE_UNKNOWN_AUTHOR ); + sAuthor = SwResId( STR_REDLINE_UNKNOWN_AUTHOR ); if (sAuthor == pPostItMgr->GetActiveSidebarWin()->GetAuthor()) rSet.DisableItem(nWhich); } diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 027ec78151a8..48c4a0d0d7ca 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -2702,9 +2702,9 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest ) if (rSh.GetTableFormat()) { - aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_START_QUOTE)); + aRewriter.AddRule(UndoArg1, SwResId(STR_START_QUOTE)); aRewriter.AddRule(UndoArg2, rSh.GetTableFormat()->GetName()); - aRewriter.AddRule(UndoArg3, SW_RESSTR(STR_END_QUOTE)); + aRewriter.AddRule(UndoArg3, SwResId(STR_END_QUOTE)); } rSh.EndUndo(SwUndoId::INSTABLE, &aRewriter); // If possible change the Shell @@ -2728,7 +2728,7 @@ void SwBaseShell::GetGalleryState( SfxItemSet &rSet ) nTableRowPos = nTableCellPos = nPagePos = nHeaderPos = nFooterPos = 0; sal_uInt8 nPos = 1; - rLst.push_back( SW_RESSTR( STR_SWBG_PAGE ) ); + rLst.push_back( SwResId( STR_SWBG_PAGE ) ); nPagePos = nPos++; sal_uInt16 nHtmlMode = ::GetHtmlMode(GetView().GetDocShell()); bool bHtmlMode = 0 != (nHtmlMode & HTMLMODE_ON); @@ -2736,50 +2736,50 @@ void SwBaseShell::GetGalleryState( SfxItemSet &rSet ) if ( (!bHtmlMode || (nHtmlMode & HTMLMODE_FULL_STYLES)) && (nSel & SelectionType::Text) ) { - rLst.push_back( SW_RESSTR( STR_SWBG_PARAGRAPH ) ); + rLst.push_back( SwResId( STR_SWBG_PARAGRAPH ) ); nParagraphPos = nPos++; } if ( (!bHtmlMode || (nHtmlMode & HTMLMODE_SOME_STYLES)) && nSel & (SelectionType::Table|SelectionType::TableCell) ) { - rLst.push_back( SW_RESSTR( STR_SWBG_TABLE ) ); + rLst.push_back( SwResId( STR_SWBG_TABLE ) ); nTablePos = nPos++; if(!bHtmlMode) { - rLst.push_back( SW_RESSTR( STR_SWBG_TABLE_ROW ) ); + rLst.push_back( SwResId( STR_SWBG_TABLE_ROW ) ); nTableRowPos = nPos++; } - rLst.push_back( SW_RESSTR( STR_SWBG_TABLE_CELL) ); + rLst.push_back( SwResId( STR_SWBG_TABLE_CELL) ); nTableCellPos = nPos++; } if(!bHtmlMode) { if ( nSel & SelectionType::Frame ) { - rLst.push_back( SW_RESSTR( STR_SWBG_FRAME ) ); + rLst.push_back( SwResId( STR_SWBG_FRAME ) ); nFramePos = nPos++; } if ( nSel & SelectionType::Graphic ) { - rLst.push_back( SW_RESSTR( STR_SWBG_GRAPHIC ) ); + rLst.push_back( SwResId( STR_SWBG_GRAPHIC ) ); nGraphicPos = nPos++; } if ( nSel & SelectionType::Ole ) { - rLst.push_back( SW_RESSTR( STR_SWBG_OLE ) ); + rLst.push_back( SwResId( STR_SWBG_OLE ) ); nOlePos = nPos++; } const FrameTypeFlags nType = rSh.GetFrameType(nullptr,true); if ( nType & FrameTypeFlags::HEADER ) { - rLst.push_back( SW_RESSTR( STR_SWBG_HEADER ) ); + rLst.push_back( SwResId( STR_SWBG_HEADER ) ); nHeaderPos = nPos++; } if ( nType & FrameTypeFlags::FOOTER ) { - rLst.push_back( SW_RESSTR( STR_SWBG_FOOTER ) ); + rLst.push_back( SwResId( STR_SWBG_FOOTER ) ); nFooterPos = nPos; } } diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index 6f2ee322b88e..4adf956213ab 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -124,7 +124,7 @@ void SwDrawShell::InsertPictureFromFile(SdrObject& rObject) if(pSdrView) { - SvxOpenGraphicDialog aDlg(SW_RESSTR(STR_INSERT_GRAPHIC)); + SvxOpenGraphicDialog aDlg(SwResId(STR_INSERT_GRAPHIC)); if(GRFILTER_OK == aDlg.Execute()) { diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index 31778367ac9e..b617d3fa9970 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -771,16 +771,16 @@ void SwFrameShell::GetState(SfxItemSet& rSet) { case SID_OBJECT_ALIGN_UP : case FN_FRAME_ALIGN_VERT_TOP: - sNewLabel = SW_RES(STR_TOP_BASE); + sNewLabel = SwResId(STR_TOP_BASE); break; case SID_OBJECT_ALIGN_MIDDLE : case FN_FRAME_ALIGN_VERT_CENTER: - sNewLabel = SW_RES(STR_CENTER_BASE); + sNewLabel = SwResId(STR_CENTER_BASE); break; case SID_OBJECT_ALIGN_DOWN : case FN_FRAME_ALIGN_VERT_BOTTOM: if(!bHtmlMode) - sNewLabel = SW_RES(STR_BOTTOM_BASE); + sNewLabel = SwResId(STR_BOTTOM_BASE); else rSet.DisableItem( nWhich ); break; diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 6327ef785d55..84bc4a39fba5 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -760,7 +760,7 @@ void SwTableShell::Execute(SfxRequest &rReq) case TableMergeErr::TooComplex: { ScopedVclPtrInstance<MessageDialog> aInfoBox( GetView().GetWindow(), - SW_RES( STR_ERR_TABLE_MERGE ), VclMessageType::Info ); + SwResId( STR_ERR_TABLE_MERGE ), VclMessageType::Info ); aInfoBox->Execute(); break; } diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index 12cf61076926..1fe73b0478ff 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -78,7 +78,7 @@ using namespace nsSwDocInfoSubType; static OUString lcl_BuildTitleWithRedline( const SwRangeRedline *pRedline ) { - const OUString sTitle(SW_RESSTR(STR_REDLINE_COMMENT)); + const OUString sTitle(SwResId(STR_REDLINE_COMMENT)); sal_uInt16 nResId = 0; switch( pRedline->GetType() ) @@ -103,7 +103,7 @@ static OUString lcl_BuildTitleWithRedline( const SwRangeRedline *pRedline ) return sTitle; } - return sTitle + SW_RESSTR( nResId ); + return sTitle + SwResId( nResId ); } void SwTextShell::ExecField(SfxRequest &rReq) diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 4647ca0edcd7..613a008ad967 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -515,7 +515,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) { SwRewriter aRewriter; - aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_FRAME)); + aRewriter.AddRule(UndoArg1, SwResId(STR_FRAME)); rShell.EndUndo(SwUndoId::INSERT, &aRewriter); } @@ -967,7 +967,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) // Delete selected content. SwRewriter aRewriter; - aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_SPECIALCHAR)); + aRewriter.AddRule(UndoArg1, SwResId(STR_SPECIALCHAR)); rSh.StartUndo( SwUndoId::INSERT, &aRewriter ); if ( rSh.HasSelection() ) diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 1cbbff3dcf25..bc71aad799b6 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -257,18 +257,18 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const static short lcl_AskRedlineFlags(vcl::Window *pWin) { ScopedVclPtrInstance<MessBox> aQBox( pWin, 0, - OUString( SW_RES( STR_REDLINE_TITLE ) ), - OUString( SW_RES( STR_REDLINE_MSG ) ) ); + OUString( SwResId( STR_REDLINE_TITLE ) ), + OUString( SwResId( STR_REDLINE_MSG ) ) ); aQBox->SetImage( QueryBox::GetStandardImage() ); const ButtonDialogFlags nBtnFlags = ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus; - aQBox->AddButton(OUString(SW_RES(STR_REDLINE_ACCEPT_ALL)), RET_OK, nBtnFlags); + aQBox->AddButton(SwResId(STR_REDLINE_ACCEPT_ALL), RET_OK, nBtnFlags); aQBox->GetPushButton( RET_OK )->SetHelpId(HID_AUTOFORMAT_ACCEPT); - aQBox->AddButton(OUString(SW_RES(STR_REDLINE_REJECT_ALL)), RET_CANCEL, ButtonDialogFlags::Cancel); + aQBox->AddButton(SwResId(STR_REDLINE_REJECT_ALL), RET_CANCEL, ButtonDialogFlags::Cancel); aQBox->GetPushButton( RET_CANCEL )->SetHelpId(HID_AUTOFORMAT_REJECT ); - aQBox->AddButton(OUString(SW_RES(STR_REDLINE_EDIT)), 2); + aQBox->AddButton(SwResId(STR_REDLINE_EDIT), 2); aQBox->GetPushButton( 2 )->SetHelpId(HID_AUTOFORMAT_EDIT_CHG); aQBox->SetButtonHelpText( RET_OK, OUString() ); @@ -303,7 +303,7 @@ void SwTextShell::Execute(SfxRequest &rReq) { SwRewriter aRewriter; aRewriter.AddRule( UndoArg1, aToggle.StringToReplace() ); - aRewriter.AddRule( UndoArg2, SW_RES(STR_YIELDS) ); + aRewriter.AddRule( UndoArg2, SwResId(STR_YIELDS) ); aRewriter.AddRule( UndoArg3, sReplacement ); rWrtSh.StartUndo(SwUndoId::REPLACE, &aRewriter); rWrtSh.GetCursor()->Normalize(false); diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index 080ebcfba28f..ec6a18a66948 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -284,10 +284,10 @@ void PageMarginControl::SetMetricFieldMaxValues( const Size& rPageSize ) void PageMarginControl::FillHelpText( const bool bUserCustomValuesAvailable ) { - const OUString aLeft = SW_RESSTR( STR_MARGIN_TOOLTIP_LEFT ); - const OUString aRight = SW_RESSTR( STR_MARGIN_TOOLTIP_RIGHT ); - const OUString aTop = SW_RESSTR( STR_MARGIN_TOOLTIP_TOP ); - const OUString aBottom = SW_RESSTR( STR_MARGIN_TOOLTIP_BOT ); + const OUString aLeft = SwResId( STR_MARGIN_TOOLTIP_LEFT ); + const OUString aRight = SwResId( STR_MARGIN_TOOLTIP_RIGHT ); + const OUString aTop = SwResId( STR_MARGIN_TOOLTIP_TOP ); + const OUString aBottom = SwResId( STR_MARGIN_TOOLTIP_BOT ); SetMetricValue( *m_pWidthHeightField.get(), SWPAGE_NARROW_VALUE, m_eUnit ); const OUString aNarrowValText = m_pWidthHeightField->GetText(); @@ -327,8 +327,8 @@ void PageMarginControl::FillHelpText( const bool bUserCustomValuesAvailable ) aHelpText += aWide1ValText; m_pWide->SetQuickHelpText( aHelpText ); - const OUString aInner = SW_RESSTR( STR_MARGIN_TOOLTIP_INNER ); - const OUString aOuter = SW_RESSTR( STR_MARGIN_TOOLTIP_OUTER ); + const OUString aInner = SwResId( STR_MARGIN_TOOLTIP_INNER ); + const OUString aOuter = SwResId( STR_MARGIN_TOOLTIP_OUTER ); SetMetricValue( *m_pWidthHeightField.get(), SWPAGE_WIDE_VALUE3, m_eUnit ); const OUString aWide3ValText = m_pWidthHeightField->GetText(); diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 0610d9b104f6..4327342947f9 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -1180,7 +1180,7 @@ SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh): SfxViewShell( pViewFrame, SWVIEWFLAGS ), m_pViewWin( VclPtr<SwPagePreviewWin>::Create(&(GetViewFrame())->GetWindow(), *this ) ), m_nNewPage(USHRT_MAX), - m_sPageStr(SW_RES(STR_PAGE)), + m_sPageStr(SwResId(STR_PAGE)), m_pHScrollbar(nullptr), m_pVScrollbar(nullptr), m_pScrollFill(VclPtr<ScrollBarBox>::Create( &pViewFrame->GetWindow(), WB_SIZEABLE )), diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 6c1629bb9205..d1c10735e3b7 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -160,7 +160,7 @@ static void lcl_PrintHeader( vcl::RenderContext &rOutDev, sal_Int32 nPages, sal_ aFont.SetWeight( WEIGHT_NORMAL ); rOutDev.SetFont( aFont ); OUString aPageStr( " [" ); - aPageStr += SW_RES( STR_PAGE ); + aPageStr += SwResId( STR_PAGE ); aPageStr += " "; aPageStr += OUString::number( nCurPage ); aPageStr += "]"; @@ -426,10 +426,10 @@ void SwSrcView::GetState(SfxItemSet& rSet) switch(nWhich) { case SID_SAVEASDOC: - rSet.Put(SfxStringItem(nWhich, OUString(SW_RES(STR_SAVEAS_SRC)))); + rSet.Put(SfxStringItem(nWhich, SwResId(STR_SAVEAS_SRC))); break; case SID_SAVEACOPY: - rSet.Put(SfxStringItem(nWhich, OUString(SW_RES(STR_SAVEACOPY_SRC)))); + rSet.Put(SfxStringItem(nWhich, SwResId(STR_SAVEACOPY_SRC))); break; case SID_SAVEDOC: { @@ -443,11 +443,11 @@ void SwSrcView::GetState(SfxItemSet& rSet) break; case SID_TABLE_CELL: { - OUString aPos( SW_RES(STR_SRCVIEW_ROW) ); + OUString aPos( SwResId(STR_SRCVIEW_ROW) ); TextSelection aSel = pTextView->GetSelection(); aPos += OUString::number( aSel.GetEnd().GetPara()+1 ); aPos += " : "; - aPos += SW_RES(STR_SRCVIEW_COL); + aPos += SwResId(STR_SRCVIEW_COL); aPos += OUString::number( aSel.GetEnd().GetIndex()+1 ); SfxStringItem aItem( nWhich, aPos ); rSet.Put( aItem ); @@ -807,7 +807,7 @@ void SwSrcView::Load(SwDocShell* pDocShell) else { vcl::Window *pTmpWindow = &GetViewFrame()->GetWindow(); - ScopedVclPtrInstance<MessageDialog>(pTmpWindow, SW_RES(STR_ERR_SRCSTREAM), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(pTmpWindow, SwResId(STR_ERR_SRCSTREAM), VclMessageType::Info)->Execute(); } } else diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx index 0584ffffd7c1..8b6818ccd7ca 100644 --- a/sw/source/uibase/uiview/uivwimp.cxx +++ b/sw/source/uibase/uiview/uivwimp.cxx @@ -174,7 +174,7 @@ void SwView_Impl::ExecuteScan( SfxRequest& rReq ) if( !bDone ) { - ScopedVclPtrInstance<MessageDialog>(nullptr, SW_RES(STR_SCAN_NOSOURCE), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(nullptr, SwResId(STR_SCAN_NOSOURCE), VclMessageType::Info)->Execute(); rReq.Ignore(); } else diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 447b6b134c22..5b767c76297c 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -205,7 +205,7 @@ OUString SwView::GetPageStr(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const OUStr else if (nPhyNum != nVirtNum) extra = OUString::number(nVirtNum); - OUString aStr(extra.isEmpty() ? SW_RES(STR_PAGE_COUNT) : SW_RES(STR_PAGE_COUNT_CUSTOM)); + OUString aStr(extra.isEmpty() ? SwResId(STR_PAGE_COUNT) : SwResId(STR_PAGE_COUNT_CUSTOM)); aStr = aStr.replaceFirst("%1", OUString::number(nPhyNum)); aStr = aStr.replaceFirst("%2", OUString::number(GetWrtShell().GetPageCnt())); aStr = aStr.replaceFirst("%3", extra); @@ -293,7 +293,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq ) std::unique_ptr<FileDialogHelper> pFileDlg(new FileDialogHelper( ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE, FileDialogFlags::Graphic )); - pFileDlg->SetTitle(SW_RESSTR(STR_INSERT_GRAPHIC )); + pFileDlg->SetTitle(SwResId(STR_INSERT_GRAPHIC )); pFileDlg->SetContext( FileDialogHelper::SW_INSERT_GRAPHIC ); uno::Reference < XFilePicker2 > xFP = pFileDlg->GetFilePicker(); uno::Reference < XFilePickerControlAccess > xCtrlAcc(xFP, UNO_QUERY); @@ -329,7 +329,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq ) Sequence<OUString> aListBoxEntries(aFormats.size()); OUString* pEntries = aListBoxEntries.getArray(); sal_Int16 nSelect = 0; - OUString sGraphicFormat = SW_RESSTR(STR_POOLFRM_GRAPHIC); + OUString sGraphicFormat = SwResId(STR_POOLFRM_GRAPHIC); for( size_t i = 0; i < aFormats.size(); ++i ) { pEntries[i] = aFormats[i]; @@ -442,7 +442,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq ) rSh.StartAction(); SwRewriter aRewriter; - aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_GRAPHIC_DEFNAME)); + aRewriter.AddRule(UndoArg1, SwResId(STR_GRAPHIC_DEFNAME)); // #i123922# determine if we really want to insert or replace the graphic at a selected object const bool bReplaceMode(rSh.HasSelection() && SelectionType::Frame == rSh.GetSelectionType()); @@ -496,7 +496,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq ) { if( bShowError ) { - ScopedVclPtrInstance< MessageDialog > aInfoBox( GetWindow(), SW_RESSTR( nResId ), VclMessageType::Info); + ScopedVclPtrInstance< MessageDialog > aInfoBox( GetWindow(), SwResId( nResId ), VclMessageType::Info); aInfoBox->Execute(); } rReq.Ignore(); @@ -1337,7 +1337,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) sal_uLong nWord = selectionStats.nWord ? selectionStats.nWord : documentStats.nWord; sal_uLong nChar = selectionStats.nChar ? selectionStats.nChar : documentStats.nChar; - OUString aWordCount( SW_RES( selectionStats.nWord ? STR_STATUSBAR_WORDCOUNT : STR_STATUSBAR_WORDCOUNT_NO_SELECTION ) ); + OUString aWordCount( SwResId( selectionStats.nWord ? STR_STATUSBAR_WORDCOUNT : STR_STATUSBAR_WORDCOUNT_NO_SELECTION ) ); const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetUILocaleDataWrapper(); aWordCount = aWordCount.replaceFirst( "%1", rLocaleData.getNum( nWord, 0 ) ); aWordCount = aWordCount.replaceFirst( "%2", rLocaleData.getNum( nChar, 0 ) ); @@ -1547,7 +1547,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) } if (!sStr.isEmpty()) sStr += sStatusDelim; - sStr += SW_RESSTR(STR_NUM_LEVEL); + sStr += SwResId(STR_NUM_LEVEL); sStr += OUString::number( nNumLevel + 1 ); } @@ -1559,12 +1559,12 @@ void SwView::StateStatusLine(SfxItemSet &rSet) sStr += " , "; if( bOutlineNum ) { - sStr += SW_RESSTR(STR_OUTLINE_NUMBERING); + sStr += SwResId(STR_OUTLINE_NUMBERING); sStr += sStatusDelim; - sStr += SW_RESSTR(STR_NUM_LEVEL); + sStr += SwResId(STR_NUM_LEVEL); } else - sStr += SW_RESSTR(STR_NUM_OUTLINE); + sStr += SwResId(STR_NUM_OUTLINE); sStr += OUString::number( nOutlineLevel); } @@ -1572,7 +1572,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) { if (!sStr.isEmpty()) sStr = sStatusDelim + sStr; - sStr = SW_RESSTR(SW_STR_READONLY) + sStr; + sStr = SwResId(SW_STR_READONLY) + sStr; } if (!sStr.isEmpty()) rSet.Put( SfxStringItem( SID_TABLE_CELL, sStr )); @@ -2258,7 +2258,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe if (!bCompare && !nFound) { vcl::Window* pWin = &GetEditWin(); - ScopedVclPtrInstance<MessageDialog>(pWin, SW_RES(STR_NO_MERGE_ENTRY), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(pWin, SwResId(STR_NO_MERGE_ENTRY), VclMessageType::Info)->Execute(); } if( nRet==2 && xDocSh.is() ) xDocSh->DoClose(); diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx index a01e2d864ace..1c632ad6793a 100644 --- a/sw/source/uibase/uiview/viewdlg2.cxx +++ b/sw/source/uibase/uiview/viewdlg2.cxx @@ -71,7 +71,7 @@ void SwView::ExecDlgExt(SfxRequest &rReq) assert(pDlg && "Dialog creation failed!"); pDlg->SetHelpId(GetStaticInterface()->GetSlot(FN_EDIT_FOOTNOTE)->GetCommand()); - pDlg->SetText( SW_RESSTR(STR_EDIT_FOOTNOTE) ); + pDlg->SetText( SwResId(STR_EDIT_FOOTNOTE) ); pDlg->Execute(); break; } diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 69a4c5e6252f..650a42416892 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -420,8 +420,8 @@ void SwView::HyphenateDocument() // do not hyphenate if interactive hyphenation is active elsewhere if (SwEditShell::HasHyphIter()) { - ScopedVclPtrInstance<MessBox>( nullptr, WB_OK, OUString( SW_RES( STR_HYPH_TITLE ) ), - OUString( SW_RES( STR_MULT_INTERACT_HYPH_WARN ) ) )->Execute(); + ScopedVclPtrInstance<MessBox>( nullptr, WB_OK, OUString( SwResId( STR_HYPH_TITLE ) ), + OUString( SwResId( STR_MULT_INTERACT_HYPH_WARN ) ) )->Execute(); return; } @@ -460,7 +460,7 @@ void SwView::HyphenateDocument() // turned on no special area { // I want also in special areas hyphenation - ScopedVclPtrInstance< MessageDialog > aBox(&GetEditWin(), SW_RES(STR_QUERY_SPECIAL_FORCED), VclMessageType::Question, VclButtonsType::YesNo); + ScopedVclPtrInstance< MessageDialog > aBox(&GetEditWin(), SwResId(STR_QUERY_SPECIAL_FORCED), VclMessageType::Question, VclButtonsType::YesNo); if( aBox->Execute() == RET_YES ) { bOther = true; diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index 429a1eaa6b27..448f192377bd 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -176,9 +176,9 @@ void SwView::ExecutePrint(SfxRequest& rReq) } else { - ScopedVclPtrInstance< MessageDialog > aInfoBox(&GetEditWin(), SW_RES(STR_ERR_NO_FAX), VclMessageType::Info); + ScopedVclPtrInstance< MessageDialog > aInfoBox(&GetEditWin(), SwResId(STR_ERR_NO_FAX), VclMessageType::Info); sal_uInt16 nResNo = bWeb ? STR_WEBOPTIONS : STR_TEXTOPTIONS; - aInfoBox->set_primary_text(aInfoBox->get_primary_text().replaceFirst("%1", OUString(SW_RES(nResNo)))); + aInfoBox->set_primary_text(aInfoBox->get_primary_text().replaceFirst("%1", SwResId(nResNo))); aInfoBox->Execute(); SfxUInt16Item aDefPage(SID_SW_EDITOPTIONS, TP_OPTPRINT_PAGE); GetViewFrame()->GetDispatcher()->ExecuteList(SID_SW_EDITOPTIONS, diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index f2f0277d77be..3b3ff0ba371e 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -402,7 +402,7 @@ void SwView::ExecSearch(SfxRequest& rReq) if( !bQuiet && ULONG_MAX != nFound) { - OUString sText( SW_RES( STR_NB_REPLACED ) ); + OUString sText( SwResId( STR_NB_REPLACED ) ); sText = sText.replaceFirst("XX", OUString::number( nFound )); SvxSearchDialogWrapper::SetSearchLabel(sText); } @@ -684,7 +684,7 @@ void SwView::Replace() { SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, m_pSrchItem->GetSearchString()); - aRewriter.AddRule(UndoArg2, SW_RESSTR(STR_YIELDS)); + aRewriter.AddRule(UndoArg2, SwResId(STR_YIELDS)); aRewriter.AddRule(UndoArg3, m_pSrchItem->GetReplaceString()); m_pWrtShell->StartUndo(SwUndoId::UI_REPLACE_STYLE, &aRewriter); diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 719db274fac0..45606c4193f9 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3288,13 +3288,13 @@ OUString SwXTextDocument::getPartName(int nPart) { SolarMutexGuard aGuard; - return OUString(SW_RES(STR_PAGE)) + OUString::number(nPart + 1); + return SwResId(STR_PAGE) + OUString::number(nPart + 1); } OUString SwXTextDocument::getPartHash(int nPart) { SolarMutexGuard aGuard; - OUString sPart(OUString(SW_RES(STR_PAGE)) + OUString::number(nPart + 1)); + OUString sPart(SwResId(STR_PAGE) + OUString::number(nPart + 1)); return OUString::number(sPart.hashCode()); } @@ -3769,13 +3769,13 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages( SwXLinkTargetSupplier::SwXLinkTargetSupplier(SwXTextDocument& rxDoc) : pxDoc(&rxDoc) { - sTables = SW_RES(STR_CONTENT_TYPE_TABLE); - sFrames = SW_RES(STR_CONTENT_TYPE_FRAME); - sGraphics = SW_RES(STR_CONTENT_TYPE_GRAPHIC); - sOLEs = SW_RES(STR_CONTENT_TYPE_OLE); - sSections = SW_RES(STR_CONTENT_TYPE_REGION); - sOutlines = SW_RES(STR_CONTENT_TYPE_OUTLINE); - sBookmarks = SW_RES(STR_CONTENT_TYPE_BOOKMARK); + sTables = SwResId(STR_CONTENT_TYPE_TABLE); + sFrames = SwResId(STR_CONTENT_TYPE_FRAME); + sGraphics = SwResId(STR_CONTENT_TYPE_GRAPHIC); + sOLEs = SwResId(STR_CONTENT_TYPE_OLE); + sSections = SwResId(STR_CONTENT_TYPE_REGION); + sOutlines = SwResId(STR_CONTENT_TYPE_OUTLINE); + sBookmarks = SwResId(STR_CONTENT_TYPE_BOOKMARK); } SwXLinkTargetSupplier::~SwXLinkTargetSupplier() diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx index 4e327f4768d5..bf179022f7e7 100644 --- a/sw/source/uibase/utlui/attrdesc.cxx +++ b/sw/source/uibase/utlui/attrdesc.cxx @@ -102,12 +102,12 @@ bool SwFormatCharFormat::GetPresentation if ( pCharFormat ) { OUString aStr; - rText = OUString( SW_RESSTR( STR_CHARFMT ) ); + rText = OUString( SwResId( STR_CHARFMT ) ); pCharFormat->GetPresentation( ePres, eCoreUnit, ePresUnit, aStr ); rText = rText + "(" + aStr + ")"; } else - rText = OUString( SW_RESSTR( STR_NO_CHARFMT ) ); + rText = OUString( SwResId( STR_NO_CHARFMT ) ); return true; } @@ -162,14 +162,14 @@ bool SwFormatDrop::GetPresentation rText = OUString::number( GetChars() ) + " "; } rText = rText + - OUString( SW_RESSTR( STR_DROP_OVER ) ) + + OUString( SwResId( STR_DROP_OVER ) ) + " " + OUString::number( GetLines() ) + " " + - OUString( SW_RESSTR( STR_DROP_LINES ) ); + OUString( SwResId( STR_DROP_LINES ) ); } else - rText = SW_RESSTR( STR_NO_DROP_LINES ); + rText = SwResId( STR_NO_DROP_LINES ); return true; } @@ -183,7 +183,7 @@ bool SwRegisterItem::GetPresentation ) const { const sal_uInt16 nId = GetValue() ? STR_REGISTER_ON : STR_REGISTER_OFF; - rText = SW_RESSTR( nId ); + rText = SwResId( nId ); return true; } @@ -197,10 +197,10 @@ bool SwNumRuleItem::GetPresentation ) const { if( !GetValue().isEmpty() ) - rText = SW_RESSTR( STR_NUMRULE_ON ) + + rText = SwResId( STR_NUMRULE_ON ) + "(" + GetValue() + ")"; else - rText = SW_RESSTR( STR_NUMRULE_OFF ); + rText = SwResId( STR_NUMRULE_OFF ); return true; } @@ -214,7 +214,7 @@ bool SwParaConnectBorderItem::GetPresentation ) const { const sal_uInt16 nId = GetValue() ? STR_CONNECT_BORDER_ON : STR_CONNECT_BORDER_OFF; - rText = SW_RESSTR( nId ); + rText = SwResId( nId ); return true; } @@ -229,7 +229,7 @@ bool SwFormatFrameSize::GetPresentation const IntlWrapper* pIntl ) const { - rText = SW_RESSTR( STR_FRM_WIDTH ) + " "; + rText = SwResId( STR_FRM_WIDTH ) + " "; if ( GetWidthPercent() ) { rText = rText + unicode::formatPercent(GetWidthPercent(), @@ -244,7 +244,7 @@ bool SwFormatFrameSize::GetPresentation { const sal_uInt16 nId = ATT_FIX_SIZE == m_eFrameHeightType ? STR_FRM_FIXEDHEIGHT : STR_FRM_MINHEIGHT; - rText = rText + ", " + SW_RESSTR( nId ) + " "; + rText = rText + ", " + SwResId( nId ) + " "; if ( GetHeightPercent() ) { rText = rText + unicode::formatPercent(GetHeightPercent(), @@ -272,7 +272,7 @@ bool SwFormatHeader::GetPresentation ) const { const sal_uInt16 nId = GetHeaderFormat() ? STR_HEADER : STR_NO_HEADER; - rText = SW_RESSTR( nId ); + rText = SwResId( nId ); return true; } @@ -289,7 +289,7 @@ bool SwFormatFooter::GetPresentation ) const { const sal_uInt16 nId = GetFooterFormat() ? STR_FOOTER : STR_NO_FOOTER; - rText = SW_RESSTR( nId ); + rText = SwResId( nId ); return true; } @@ -326,11 +326,11 @@ bool SwFormatSurround::GetPresentation default:;//prevent warning } if ( nId ) - rText = SW_RESSTR( nId ); + rText = SwResId( nId ); if ( IsAnchorOnly() ) { - rText = rText + " " + SW_RESSTR( STR_SURROUND_ANCHORONLY ); + rText = rText + " " + SwResId( STR_SURROUND_ANCHORONLY ); } return true; } @@ -351,7 +351,7 @@ bool SwFormatVertOrient::GetPresentation { case text::VertOrientation::NONE: { - rText = rText + SW_RESSTR( STR_POS_Y ) + " " + + rText = rText + SwResId( STR_POS_Y ) + " " + ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, pIntl ) + " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } @@ -377,7 +377,7 @@ bool SwFormatVertOrient::GetPresentation default:;//prevent warning } if ( nId ) - rText += SW_RESSTR( nId ); + rText += SwResId( nId ); return true; } @@ -397,7 +397,7 @@ bool SwFormatHoriOrient::GetPresentation { case text::HoriOrientation::NONE: { - rText = rText + SW_RESSTR( STR_POS_X ) + " " + + rText = rText + SwResId( STR_POS_X ) + " " + ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, pIntl ) + " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } @@ -423,7 +423,7 @@ bool SwFormatHoriOrient::GetPresentation default:;//prevent warning } if ( nId ) - rText += SW_RESSTR( nId ); + rText += SwResId( nId ); return true; } @@ -453,7 +453,7 @@ bool SwFormatAnchor::GetPresentation default:;//prevent warning } if ( nId ) - rText += SW_RESSTR( nId ); + rText += SwResId( nId ); return true; } @@ -470,7 +470,7 @@ bool SwFormatPageDesc::GetPresentation if ( pPageDesc ) rText = pPageDesc->GetName(); else - rText = SW_RESSTR( STR_NO_PAGEDESC ); + rText = SwResId( STR_NO_PAGEDESC ); return true; } @@ -488,11 +488,11 @@ bool SwFormatCol::GetPresentation sal_uInt16 nCnt = GetNumCols(); if ( nCnt > 1 ) { - rText = OUString::number(nCnt) + " " + SW_RESSTR( STR_COLUMNS ); + rText = OUString::number(nCnt) + " " + SwResId( STR_COLUMNS ); if ( COLADJ_NONE != GetLineAdj() ) { const long nWdth = static_cast<long>(GetLineWidth()); - rText = rText + " " + SW_RESSTR( STR_LINE_WIDTH ) + " " + + rText = rText + " " + SwResId( STR_LINE_WIDTH ) + " " + ::GetMetricText( nWdth, eCoreUnit, MapUnit::MapPoint, pIntl ); } @@ -542,7 +542,7 @@ bool SwFormatEditInReadonly::GetPresentation { rText.clear(); if ( GetValue() ) - rText = SW_RESSTR(STR_EDIT_IN_READONLY); + rText = SwResId(STR_EDIT_IN_READONLY); return true; } @@ -564,7 +564,7 @@ bool SwFormatLayoutSplit::GetPresentation ) const { if ( GetValue() ) - rText = SW_RESSTR(STR_LAYOUT_SPLIT); + rText = SwResId(STR_LAYOUT_SPLIT); return true; } @@ -603,12 +603,12 @@ bool SwFormatChain::GetPresentation { if ( GetPrev() || GetNext() ) { - rText = SW_RESSTR(STR_CONNECT1); + rText = SwResId(STR_CONNECT1); if ( GetPrev() ) { rText += GetPrev()->GetName(); if ( GetNext() ) - rText += SW_RESSTR(STR_CONNECT2); + rText += SwResId(STR_CONNECT2); } if ( GetNext() ) rText += GetNext()->GetName(); @@ -626,12 +626,12 @@ bool SwFormatLineNumber::GetPresentation ) const { if ( IsCount() ) - rText += SW_RESSTR(STR_LINECOUNT); + rText += SwResId(STR_LINECOUNT); else - rText += SW_RESSTR(STR_DONTLINECOUNT); + rText += SwResId(STR_DONTLINECOUNT); if ( GetStartValue() ) { - rText = rText + " " + SW_RESSTR(STR_LINCOUNT_START) + + rText = rText + " " + SwResId(STR_LINCOUNT_START) + OUString::number( GetStartValue() ); } return true; @@ -661,7 +661,7 @@ bool SwTextGridItem::GetPresentation break; } if ( nId ) - rText += SW_RESSTR( nId ); + rText += SwResId( nId ); return true; } @@ -694,9 +694,9 @@ bool SwMirrorGrf::GetPresentation( } if ( nId ) { - rText = SW_RESSTR( nId ); + rText = SwResId( nId ); if (bGrfToggle) - rText += SW_RESSTR( STR_MIRROR_TOGGLE ); + rText += SwResId( STR_MIRROR_TOGGLE ); } return true; } @@ -706,7 +706,7 @@ bool SwRotationGrf::GetPresentation( OUString &rText, const IntlWrapper* /*pIntl*/) const { if( SfxItemPresentation::Complete == ePres ) - rText = SW_RESSTR( STR_ROTATION ); + rText = SwResId( STR_ROTATION ); else if( rText.getLength() ) rText.clear(); rText = rText + OUString::number( GetValue() ) + "\xB0"; @@ -718,7 +718,7 @@ bool SwLuminanceGrf::GetPresentation( OUString &rText, const IntlWrapper* /*pIntl*/) const { if( SfxItemPresentation::Complete == ePres ) - rText = SW_RESSTR( STR_LUMINANCE ); + rText = SwResId( STR_LUMINANCE ); else if( rText.getLength() ) rText.clear(); rText = rText + unicode::formatPercent(GetValue(), @@ -731,7 +731,7 @@ bool SwContrastGrf::GetPresentation( OUString &rText, const IntlWrapper* /*pIntl*/) const { if( SfxItemPresentation::Complete == ePres ) - rText = SW_RESSTR( STR_CONTRAST ); + rText = SwResId( STR_CONTRAST ); else if( rText.getLength() ) rText.clear(); rText = rText + unicode::formatPercent(GetValue(), @@ -754,7 +754,7 @@ bool SwChannelGrf::GetPresentation( default: nId = 0; break; } if( nId ) - rText = SW_RESSTR( nId ); + rText = SwResId( nId ); else if( rText.getLength() ) rText.clear(); } @@ -771,7 +771,7 @@ bool SwGammaGrf::GetPresentation( { OUStringBuffer aText; if( SfxItemPresentation::Complete == ePres ) - aText.append(SW_RESSTR(STR_GAMMA)); + aText.append(SwResId(STR_GAMMA)); aText.append(unicode::formatPercent(GetValue(), Application::GetSettings().GetUILanguageTag())); rText = aText.makeStringAndClear(); @@ -786,7 +786,7 @@ bool SwInvertGrf::GetPresentation( if( SfxItemPresentation::Complete == ePres ) { const sal_uInt16 nId = GetValue() ? STR_INVERT : STR_INVERT_NOT; - rText = SW_RESSTR( nId ); + rText = SwResId( nId ); } return true; } @@ -796,7 +796,7 @@ bool SwTransparencyGrf::GetPresentation( OUString &rText, const IntlWrapper* /*pIntl*/) const { if( SfxItemPresentation::Complete == ePres ) - rText = SW_RESSTR( STR_TRANSPARENCY ); + rText = SwResId( STR_TRANSPARENCY ); else if( rText.getLength() ) rText.clear(); rText = rText + unicode::formatPercent(GetValue(), @@ -820,7 +820,7 @@ bool SwDrawModeGrf::GetPresentation( case GraphicDrawMode::Watermark: nId = STR_DRAWMODE_WATERMARK; break; default: nId = STR_DRAWMODE_STD; break; } - rText = SW_RESSTR( STR_DRAWMODE ) + SW_RESSTR( nId ); + rText = SwResId( STR_DRAWMODE ) + SwResId( nId ); } return true; } @@ -835,7 +835,7 @@ bool SwFormatFollowTextFlow::GetPresentation( SfxItemPresentation ePres, if( SfxItemPresentation::Complete == ePres ) { const sal_uInt16 nId = GetValue() ? STR_FOLLOW_TEXT_FLOW : STR_DONT_FOLLOW_TEXT_FLOW; - rText = SW_RESSTR( nId ); + rText = SwResId( nId ); } return true; } diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx index d7b51a6e4946..73bababd218a 100644 --- a/sw/source/uibase/utlui/bookctrl.cxx +++ b/sw/source/uibase/utlui/bookctrl.cxx @@ -84,9 +84,9 @@ void SwBookmarkControl::StateChanged( else if (const SfxBoolItem* pBoolItem = dynamic_cast<const SfxBoolItem*>(pState)) { if (pBoolItem->GetValue()) // Indicates whether to show extended tooltip - GetStatusBar().SetQuickHelpText(GetId(), SW_RESSTR(STR_BOOKCTRL_HINT_EXTENDED)); + GetStatusBar().SetQuickHelpText(GetId(), SwResId(STR_BOOKCTRL_HINT_EXTENDED)); else - GetStatusBar().SetQuickHelpText(GetId(), SW_RESSTR(STR_BOOKCTRL_HINT)); + GetStatusBar().SetQuickHelpText(GetId(), SwResId(STR_BOOKCTRL_HINT)); } } diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 38bbb54996de..6a6d5c96c894 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -219,8 +219,8 @@ SwContentType::SwContentType(SwWrtShell* pShell, ContentTypeId nType, sal_uInt8 SwTypeNumber(CTYPE_CTT), pWrtShell(pShell), pMember(nullptr), - sContentTypeName(SW_RES(STR_CONTENT_TYPE_FIRST + (int)nType)), - sSingleContentTypeName(SW_RES(STR_CONTENT_TYPE_SINGLE_FIRST + (int)nType)), + sContentTypeName(SwResId(STR_CONTENT_TYPE_FIRST + (int)nType)), + sSingleContentTypeName(SwResId(STR_CONTENT_TYPE_SINGLE_FIRST + (int)nType)), nMemberCount(0), nContentType(nType), nOutlineLevel(nLevel), @@ -771,15 +771,15 @@ SwContentTree::SwContentTree(vcl::Window* pParent, SwNavigationPI* pDialog) : SvTreeListBox(pParent) , m_xDialog(pDialog) , m_sSpace(OUString(" ")) - , m_sRemoveIdx(SW_RES(STR_REMOVE_INDEX)) - , m_sUpdateIdx(SW_RES(STR_UPDATE)) - , m_sUnprotTable(SW_RES(STR_REMOVE_TBL_PROTECTION)) - , m_sRename(SW_RES(STR_RENAME)) - , m_sReadonlyIdx(SW_RES(STR_READONLY_IDX)) - , m_sInvisible(SW_RES(STR_INVISIBLE)) - , m_sPostItShow(SW_RES(STR_POSTIT_SHOW)) - , m_sPostItHide(SW_RES(STR_POSTIT_HIDE)) - , m_sPostItDelete(SW_RES(STR_POSTIT_DELETE)) + , m_sRemoveIdx(SwResId(STR_REMOVE_INDEX)) + , m_sUpdateIdx(SwResId(STR_UPDATE)) + , m_sUnprotTable(SwResId(STR_REMOVE_TBL_PROTECTION)) + , m_sRename(SwResId(STR_RENAME)) + , m_sReadonlyIdx(SwResId(STR_READONLY_IDX)) + , m_sInvisible(SwResId(STR_INVISIBLE)) + , m_sPostItShow(SwResId(STR_POSTIT_SHOW)) + , m_sPostItHide(SwResId(STR_POSTIT_HIDE)) + , m_sPostItDelete(SwResId(STR_POSTIT_DELETE)) , m_pHiddenShell(nullptr) , m_pActiveShell(nullptr) , m_pConfig(SW_MOD()->GetNavigationConfig()) @@ -810,7 +810,7 @@ SwContentTree::SwContentTree(vcl::Window* pParent, SwNavigationPI* pDialog) } for (int i = 0; i < CONTEXT_COUNT; ++i) { - m_aContextStrings[i] = SW_RESSTR(i+STR_CONTEXT_FIRST); + m_aContextStrings[i] = SwResId(i+STR_CONTEXT_FIRST); } m_nActiveBlock = m_pConfig->GetActiveBlock(); m_aUpdTimer.SetInvokeHandler(LINK(this, SwContentTree, TimerUpdate)); @@ -3167,11 +3167,11 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, EditEntryMode nMode) else if(nMode == EditEntryMode::DELETE) { m_pActiveShell->StartAction(); - OUString sTable = SW_RES(STR_TABLE_NAME); + OUString sTable = SwResId(STR_TABLE_NAME); SwRewriter aRewriterTableName; - aRewriterTableName.AddRule(UndoArg1, SW_RES(STR_START_QUOTE)); + aRewriterTableName.AddRule(UndoArg1, SwResId(STR_START_QUOTE)); aRewriterTableName.AddRule(UndoArg2, pCnt->GetName()); - aRewriterTableName.AddRule(UndoArg3, SW_RES(STR_END_QUOTE)); + aRewriterTableName.AddRule(UndoArg3, SwResId(STR_END_QUOTE)); sTable = aRewriterTableName.Apply(sTable); SwRewriter aRewriter; diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 6fb38442b128..a3095d534d74 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -155,7 +155,7 @@ SwGlobalTree::SwGlobalTree(vcl::Window* pParent, SwNavigationPI* pDialog) m_aUpdateTimer.Start(); for(sal_uInt16 i = 0; i < GLOBAL_CONTEXT_COUNT; i++) { - m_aContextStrings[i] = SW_RESSTR(i+ STR_GLOBAL_CONTEXT_FIRST); + m_aContextStrings[i] = SwResId(i+ STR_GLOBAL_CONTEXT_FIRST); } SetHelpId(HID_NAVIGATOR_GLOB_TREELIST); SelectHdl(); diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx index 73265b6aeb75..a64892fea6bf 100644 --- a/sw/source/uibase/utlui/initui.cxx +++ b/sw/source/uibase/utlui/initui.cxx @@ -174,38 +174,38 @@ void InitUI() } ShellResource::ShellResource() - : aPostItAuthor( SW_RES( STR_POSTIT_AUTHOR ) ), - aPostItPage( SW_RES( STR_POSTIT_PAGE ) ), - aPostItLine( SW_RES( STR_POSTIT_LINE ) ), - - aCalc_Syntax( SW_RES( STR_CALC_SYNTAX ) ), - aCalc_ZeroDiv( SW_RES( STR_CALC_ZERODIV ) ), - aCalc_Brack( SW_RES( STR_CALC_BRACK ) ), - aCalc_Pow( SW_RES( STR_CALC_POW ) ), - aCalc_Overflow( SW_RES( STR_CALC_OVERFLOW ) ), - aCalc_Default( SW_RES( STR_CALC_DEFAULT ) ), - aCalc_Error( SW_RES( STR_CALC_ERROR ) ), + : aPostItAuthor( SwResId( STR_POSTIT_AUTHOR ) ), + aPostItPage( SwResId( STR_POSTIT_PAGE ) ), + aPostItLine( SwResId( STR_POSTIT_LINE ) ), + + aCalc_Syntax( SwResId( STR_CALC_SYNTAX ) ), + aCalc_ZeroDiv( SwResId( STR_CALC_ZERODIV ) ), + aCalc_Brack( SwResId( STR_CALC_BRACK ) ), + aCalc_Pow( SwResId( STR_CALC_POW ) ), + aCalc_Overflow( SwResId( STR_CALC_OVERFLOW ) ), + aCalc_Default( SwResId( STR_CALC_DEFAULT ) ), + aCalc_Error( SwResId( STR_CALC_ERROR ) ), // #i81002# - aGetRefField_RefItemNotFound( SW_RES( STR_GETREFFLD_REFITEMNOTFOUND ) ), - aStrNone( SW_RES( STR_TEMPLATE_NONE )), - aFixedStr( SW_RES( STR_FIELD_FIXED )), - sDurationFormat( SW_RES( STR_DURATION_FORMAT )), - - aTOXIndexName( SW_RES(STR_TOI)), - aTOXUserName( SW_RES(STR_TOU)), - aTOXContentName( SW_RES(STR_TOC)), - aTOXIllustrationsName( SW_RES(STR_TOX_ILL)), - aTOXObjectsName( SW_RES(STR_TOX_OBJ)), - aTOXTablesName( SW_RES(STR_TOX_TBL)), - aTOXAuthoritiesName( SW_RES(STR_TOX_AUTH)), - aTOXCitationName( SW_RES(STR_TOX_CITATION)), - aLinkCtrlClick(SW_RESSTR(STR_LINK_CTRL_CLICK)), - aLinkClick(SW_RESSTR(STR_LINK_CLICK)), + aGetRefField_RefItemNotFound( SwResId( STR_GETREFFLD_REFITEMNOTFOUND ) ), + aStrNone( SwResId( STR_TEMPLATE_NONE )), + aFixedStr( SwResId( STR_FIELD_FIXED )), + sDurationFormat( SwResId( STR_DURATION_FORMAT )), + + aTOXIndexName( SwResId(STR_TOI)), + aTOXUserName( SwResId(STR_TOU)), + aTOXContentName( SwResId(STR_TOC)), + aTOXIllustrationsName( SwResId(STR_TOX_ILL)), + aTOXObjectsName( SwResId(STR_TOX_OBJ)), + aTOXTablesName( SwResId(STR_TOX_TBL)), + aTOXAuthoritiesName( SwResId(STR_TOX_AUTH)), + aTOXCitationName( SwResId(STR_TOX_CITATION)), + aLinkCtrlClick(SwResId(STR_LINK_CTRL_CLICK)), + aLinkClick(SwResId(STR_LINK_CLICK)), pAutoFormatNameLst(nullptr), - sPageDescFirstName( SW_RES(STR_PAGEDESC_FIRSTNAME)), - sPageDescFollowName( SW_RES(STR_PAGEDESC_FOLLOWNAME)), - sPageDescName( SW_RES(STR_PAGEDESC_NAME)) + sPageDescFirstName( SwResId(STR_PAGEDESC_FIRSTNAME)), + sPageDescFollowName( SwResId(STR_PAGEDESC_FOLLOWNAME)), + sPageDescName( SwResId(STR_PAGEDESC_NAME)) { const sal_uInt16 nCount = FLD_DOCINFO_END - FLD_DOCINFO_BEGIN; @@ -217,7 +217,7 @@ ShellResource::ShellResource() aLinkCtrlClick = aLinkCtrlClick.replaceAll("%s", aModStr); for(sal_uInt16 i = 0; i < nCount; ++i) - aDocInfoLst.push_back(OUString(SW_RESSTR(FLD_DOCINFO_BEGIN + i))); + aDocInfoLst.push_back(SwResId(FLD_DOCINFO_BEGIN + i)); } OUString ShellResource::GetPageDescName(sal_uInt16 nNo, PageNameMode eMode) @@ -289,7 +289,7 @@ OUString SwAuthorityFieldType::GetAuthFieldName(ToxAuthorityField eType) pAuthFieldNameList = new std::vector<OUString>; pAuthFieldNameList->reserve(AUTH_FIELD_END); for(sal_uInt16 i = 0; i < AUTH_FIELD_END; ++i) - pAuthFieldNameList->push_back(SW_RES(STR_AUTH_FIELD_START + i)); + pAuthFieldNameList->push_back(SwResId(STR_AUTH_FIELD_START + i)); } return (*pAuthFieldNameList)[static_cast< sal_uInt16 >(eType)]; } @@ -301,7 +301,7 @@ OUString SwAuthorityFieldType::GetAuthTypeName(ToxAuthorityType eType) pAuthFieldTypeList = new std::vector<OUString>; pAuthFieldTypeList->reserve(AUTH_TYPE_END); for(sal_uInt16 i = 0; i < AUTH_TYPE_END; ++i) - pAuthFieldTypeList->push_back(SW_RES(STR_AUTH_TYPE_START + i)); + pAuthFieldTypeList->push_back(SwResId(STR_AUTH_TYPE_START + i)); } return (*pAuthFieldTypeList)[static_cast< sal_uInt16 >(eType)]; } diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 0a4cca1220e5..29fcbb1d791a 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -656,11 +656,11 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings, for (sal_uInt16 i = 0; i <= static_cast<sal_uInt16>(RegionMode::EMBEDDED); ++i) { - m_aContextArr[i] = SW_RESSTR(STR_HYPERLINK + i); - m_aStatusArr[i] = SW_RESSTR(STR_STATUS_FIRST + i); + m_aContextArr[i] = SwResId(STR_HYPERLINK + i); + m_aStatusArr[i] = SwResId(STR_STATUS_FIRST + i); } - m_aStatusArr[3] = SW_RESSTR(STR_ACTIVE_VIEW); + m_aStatusArr[3] = SwResId(STR_ACTIVE_VIEW); m_aContentTree->SetStyle(m_aContentTree->GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT| WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); @@ -724,8 +724,8 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings, m_aPageChgIdle.SetInvokeHandler(LINK(this, SwNavigationPI, ChangePageHdl)); m_aPageChgIdle.SetPriority(TaskPriority::LOWEST); - m_aContentTree->SetAccessibleName(SW_RESSTR(STR_ACCESS_TL_CONTENT)); - m_aGlobalTree->SetAccessibleName(SW_RESSTR(STR_ACCESS_TL_GLOBAL)); + m_aContentTree->SetAccessibleName(SwResId(STR_ACCESS_TL_CONTENT)); + m_aGlobalTree->SetAccessibleName(SwResId(STR_ACCESS_TL_GLOBAL)); m_aDocListBox->SetAccessibleName(m_aStatusArr[3]); m_aExpandedSize = GetOptimalSize(); diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index 6550e51f4caf..3ce361976004 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -251,7 +251,7 @@ void NumFormatListBox::SetFormatType(const short nFormatType) if (!pOwnFormatter) { - const sal_Int32 nPos = InsertEntry(SW_RESSTR( STR_DEFINE_NUMBERFORMAT )); + const sal_Int32 nPos = InsertEntry(SwResId( STR_DEFINE_NUMBERFORMAT )); SetEntryData( nPos, nullptr ); } @@ -341,7 +341,7 @@ void NumFormatListBox::SetDefFormat(const sal_uLong nDefaultFormat) ) ) { - sValue += SW_RES(RID_STR_SYSTEM); + sValue += SwResId(RID_STR_SYSTEM); } nPos = InsertEntry(sValue, nPos); // Insert as first numeric entry @@ -360,7 +360,7 @@ sal_uLong NumFormatListBox::GetFormat() const IMPL_LINK( NumFormatListBox, SelectHdl, ListBox&, rBox, void ) { const sal_Int32 nPos = rBox.GetSelectEntryPos(); - OUString sDefine(SW_RES( STR_DEFINE_NUMBERFORMAT )); + OUString sDefine(SwResId( STR_DEFINE_NUMBERFORMAT )); SwView *pView = GetView(); if( pView && nPos == rBox.GetEntryCount() - 1 && diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx index 112535907939..f0ba0f192bd6 100644 --- a/sw/source/uibase/utlui/tmplctrl.cxx +++ b/sw/source/uibase/utlui/tmplctrl.cxx @@ -64,7 +64,7 @@ SwTemplateControl::SwTemplateControl( sal_uInt16 _nSlotId, StatusBar& rStb ) : SfxStatusBarControl( _nSlotId, _nId, rStb ) { - GetStatusBar().SetQuickHelpText(GetId(), SW_RESSTR(STR_TMPLCTRL_HINT)); + GetStatusBar().SetQuickHelpText(GetId(), SwResId(STR_TMPLCTRL_HINT)); } SwTemplateControl::~SwTemplateControl() diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index 2f4ec2022413..e7656572ed60 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -71,7 +71,7 @@ bool SwPageFootnoteInfoItem::GetPresentation const SwTwips nHght = GetPageFootnoteInfo().GetHeight(); if ( nHght ) { - rText = SW_RESSTR( STR_MAX_FTN_HEIGHT ) + " " + + rText = SwResId( STR_MAX_FTN_HEIGHT ) + " " + ::GetMetricText( nHght, eCoreUnit, ePresUnit, pIntl ) + " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 37dec64bbce5..186085a3c617 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -66,7 +66,7 @@ SwOneExampleFrame::SwOneExampleFrame( vcl::Window& rWin, const OUString* pURL ) : m_aTopWindow(VclPtr<SwFrameCtrlWindow>::Create(&rWin, this)), m_aLoadedIdle("sw uibase SwOneExampleFrame Loaded"), - m_aMenuRes(SW_RES(RES_FRMEX_MENU)), + m_aMenuRes(ResId(RES_FRMEX_MENU, *pSwResMgr)), m_pModuleView(SW_MOD()->GetView()), m_nStyleFlags(nFlags), m_bIsInitialized(false), @@ -93,7 +93,7 @@ void SwOneExampleFrame::CreateErrorMessage() { if(SwOneExampleFrame::bShowServiceNotAvailableMessage) { - OUString sInfo(SW_RES(STR_SERVICE_UNAVAILABLE)); + OUString sInfo(SwResId(STR_SERVICE_UNAVAILABLE)); sInfo += "com.sun.star.frame.FrameControl"; ScopedVclPtrInstance<InfoBox>(nullptr, sInfo)->Execute(); SwOneExampleFrame::bShowServiceNotAvailableMessage = false; @@ -294,35 +294,35 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer, void ) { if (pSh->GetCurWord() == "HEADING1") { - pSh->Overwrite(SW_RESSTR(STR_IDXEXAMPLE_IDXTXT_HEADING1)); + pSh->Overwrite(SwResId(STR_IDXEXAMPLE_IDXTXT_HEADING1)); } else if (pSh->GetCurWord() == "ENTRY1") { - pSh->Overwrite(SW_RESSTR(STR_IDXEXAMPLE_IDXTXT_ENTRY1)); + pSh->Overwrite(SwResId(STR_IDXEXAMPLE_IDXTXT_ENTRY1)); } else if (pSh->GetCurWord() == "HEADING11") { - pSh->Overwrite(SW_RESSTR(STR_IDXEXAMPLE_IDXTXT_HEADING11)); + pSh->Overwrite(SwResId(STR_IDXEXAMPLE_IDXTXT_HEADING11)); } else if (pSh->GetCurWord() == "ENTRY11") { - pSh->Overwrite(SW_RESSTR(STR_IDXEXAMPLE_IDXTXT_ENTRY11)); + pSh->Overwrite(SwResId(STR_IDXEXAMPLE_IDXTXT_ENTRY11)); } else if (pSh->GetCurWord() == "HEADING12") { - pSh->Overwrite(SW_RESSTR(STR_IDXEXAMPLE_IDXTXT_HEADING12)); + pSh->Overwrite(SwResId(STR_IDXEXAMPLE_IDXTXT_HEADING12)); } else if (pSh->GetCurWord() == "ENTRY12") { - pSh->Overwrite(SW_RESSTR(STR_IDXEXAMPLE_IDXTXT_ENTRY12)); + pSh->Overwrite(SwResId(STR_IDXEXAMPLE_IDXTXT_ENTRY12)); } else if (pSh->GetCurWord() == "TABLE1") { - pSh->Overwrite(SW_RESSTR(STR_IDXEXAMPLE_IDXTXT_TABLE1)); + pSh->Overwrite(SwResId(STR_IDXEXAMPLE_IDXTXT_TABLE1)); } else if (pSh->GetCurWord() == "IMAGE1") { - pSh->Overwrite(SW_RESSTR(STR_IDXEXAMPLE_IDXTXT_IMAGE1)); + pSh->Overwrite(SwResId(STR_IDXEXAMPLE_IDXTXT_IMAGE1)); } else {} diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx index 4be0f652fe73..95f4196f2aa0 100644 --- a/sw/source/uibase/utlui/viewlayoutctrl.cxx +++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx @@ -181,15 +181,15 @@ bool SwViewLayoutControl::MouseMove( const MouseEvent & rEvt ) if ( nXDiff < nXOffset + nImageWidthSingle ) { - GetStatusBar().SetQuickHelpText(GetId(), SW_RESSTR(STR_VIEWLAYOUT_ONE)); + GetStatusBar().SetQuickHelpText(GetId(), SwResId(STR_VIEWLAYOUT_ONE)); } else if ( nXDiff < nXOffset + nImageWidthSingle + nImageWidthAuto ) { - GetStatusBar().SetQuickHelpText(GetId(), SW_RESSTR(STR_VIEWLAYOUT_MULTI)); + GetStatusBar().SetQuickHelpText(GetId(), SwResId(STR_VIEWLAYOUT_MULTI)); } else { - GetStatusBar().SetQuickHelpText(GetId(), SW_RESSTR(STR_VIEWLAYOUT_BOOK)); + GetStatusBar().SetQuickHelpText(GetId(), SwResId(STR_VIEWLAYOUT_BOOK)); } return true; } diff --git a/sw/source/uibase/utlui/wordcountctrl.cxx b/sw/source/uibase/utlui/wordcountctrl.cxx index 1ca297ba67fa..559fded1dcfa 100644 --- a/sw/source/uibase/utlui/wordcountctrl.cxx +++ b/sw/source/uibase/utlui/wordcountctrl.cxx @@ -32,7 +32,7 @@ void SwWordCountStatusBarControl::StateChanged( if (eState == SfxItemState::DEFAULT) // Can access pState GetStatusBar().SetItemText( GetId(), static_cast<const SfxStringItem*>(pState)->GetValue() ); - GetStatusBar().SetQuickHelpText(GetId(), SW_RESSTR(STR_WORDCOUNT_HINT)); + GetStatusBar().SetQuickHelpText(GetId(), SwResId(STR_WORDCOUNT_HINT)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx index dfccc65eef63..73ac730d7299 100644 --- a/sw/source/uibase/web/wdocsh.cxx +++ b/sw/source/uibase/web/wdocsh.cxx @@ -75,15 +75,15 @@ void SwWebDocShell::FillClass( SvGlobalName * pClassName, { *pClassName = SvGlobalName( SO3_SWWEB_CLASSID_60 ); *pClipFormat = SotClipboardFormatId::STARWRITERWEB_60; - *pLongUserName = SW_RESSTR(STR_WRITER_WEBDOC_FULLTYPE); + *pLongUserName = SwResId(STR_WRITER_WEBDOC_FULLTYPE); } else if (nVersion == SOFFICE_FILEFORMAT_8) { *pClassName = SvGlobalName( SO3_SWWEB_CLASSID_60 ); *pClipFormat = SotClipboardFormatId::STARWRITERWEB_8; - *pLongUserName = SW_RESSTR(STR_WRITER_WEBDOC_FULLTYPE); + *pLongUserName = SwResId(STR_WRITER_WEBDOC_FULLTYPE); } - *pUserName = SW_RESSTR(STR_HUMAN_SWWEBDOC_NAME); + *pUserName = SwResId(STR_HUMAN_SWWEBDOC_NAME); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index eaff182e80f7..1fa40eb160d7 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -209,12 +209,12 @@ void SwWrtShell::Insert( const OUString &rStr ) SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, GetCursorDescr()); - aRewriter.AddRule(UndoArg2, OUString(SW_RES(STR_YIELDS))); + aRewriter.AddRule(UndoArg2, OUString(SwResId(STR_YIELDS))); { OUString aTmpStr; - aTmpStr += SW_RES(STR_START_QUOTE); + aTmpStr += SwResId(STR_START_QUOTE); aTmpStr += rStr; - aTmpStr += SW_RES(STR_END_QUOTE); + aTmpStr += SwResId(STR_END_QUOTE); aRewriter.AddRule(UndoArg3, rStr); } @@ -248,7 +248,7 @@ void SwWrtShell::Insert( const OUString &rPath, const OUString &rFilter, StartAllAction(); SwRewriter aRewriter; - aRewriter.AddRule(UndoArg1, SW_RES(STR_GRAPHIC)); + aRewriter.AddRule(UndoArg1, SwResId(STR_GRAPHIC)); StartUndo(SwUndoId::INSERT, &aRewriter); @@ -554,11 +554,11 @@ bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrame SwRewriter aRewriter; if ( bStarMath ) - aRewriter.AddRule(UndoArg1, SW_RES(STR_MATH_FORMULA)); + aRewriter.AddRule(UndoArg1, SwResId(STR_MATH_FORMULA)); else if ( SotExchange::IsChart( aCLSID ) ) - aRewriter.AddRule(UndoArg1, SW_RES(STR_CHART)); + aRewriter.AddRule(UndoArg1, SwResId(STR_CHART)); else - aRewriter.AddRule(UndoArg1, SW_RES(STR_OLE)); + aRewriter.AddRule(UndoArg1, SwResId(STR_OLE)); EndUndo(SwUndoId::INSERT, &aRewriter); @@ -1598,15 +1598,15 @@ void SwWrtShell::AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar ) StartAllAction(); OUString aTmpStr1; - aTmpStr1 += SW_RES(STR_START_QUOTE); + aTmpStr1 += SwResId(STR_START_QUOTE); aTmpStr1 += GetSelText(); - aTmpStr1 += SW_RES(STR_END_QUOTE); + aTmpStr1 += SwResId(STR_END_QUOTE); OUString aTmpStr3; - aTmpStr3 += SW_RES(STR_START_QUOTE); + aTmpStr3 += SwResId(STR_START_QUOTE); aTmpStr3 += OUStringLiteral1(cChar); - aTmpStr3 += SW_RES(STR_END_QUOTE); + aTmpStr3 += SwResId(STR_END_QUOTE); aRewriter.AddRule( UndoArg1, aTmpStr1 ); - aRewriter.AddRule( UndoArg2, SW_RES(STR_YIELDS) ); + aRewriter.AddRule( UndoArg2, SwResId(STR_YIELDS) ); aRewriter.AddRule( UndoArg3, aTmpStr3 ); StartUndo( SwUndoId::REPLACE, &aRewriter ); @@ -1720,7 +1720,7 @@ OUString SwWrtShell::GetSelDescr() const switch (nSelType) { case SelectionType::Graphic: - aResult = SW_RESSTR(STR_GRAPHIC); + aResult = SwResId(STR_GRAPHIC); break; case SelectionType::Frame: @@ -1733,7 +1733,7 @@ OUString SwWrtShell::GetSelDescr() const break; case SelectionType::DrawObject: { - aResult = SW_RESSTR(STR_DRAWING_OBJECTS); + aResult = SwResId(STR_DRAWING_OBJECTS); } break; default: diff --git a/sw/source/uibase/wrtsh/wrtundo.cxx b/sw/source/uibase/wrtsh/wrtundo.cxx index 0e437bac5760..2b904b5858f0 100644 --- a/sw/source/uibase/wrtsh/wrtundo.cxx +++ b/sw/source/uibase/wrtsh/wrtundo.cxx @@ -111,7 +111,7 @@ OUString SwWrtShell::GetDoString( DoType eDoType ) const default:;//prevent warning } - return SvtResId( nResStr ).toString() + aUndoStr; + return SvtResId(nResStr) + aUndoStr; } void SwWrtShell::GetDoStrings( DoType eDoType, SfxStringListItem& rStrs ) const @@ -147,7 +147,7 @@ OUString SwWrtShell::GetRepeatString() const return str; } - return SvtResId(STR_REPEAT).toString() + str; + return SvtResId(STR_REPEAT) + str; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |