summaryrefslogtreecommitdiff
path: root/sw/source/uibase/utlui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/utlui')
-rw-r--r--sw/source/uibase/utlui/attrdesc.cxx84
-rw-r--r--sw/source/uibase/utlui/bookctrl.cxx4
-rw-r--r--sw/source/uibase/utlui/content.cxx30
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx2
-rw-r--r--sw/source/uibase/utlui/initui.cxx64
-rw-r--r--sw/source/uibase/utlui/navipi.cxx10
-rw-r--r--sw/source/uibase/utlui/numfmtlb.cxx6
-rw-r--r--sw/source/uibase/utlui/tmplctrl.cxx2
-rw-r--r--sw/source/uibase/utlui/uiitems.cxx2
-rw-r--r--sw/source/uibase/utlui/unotools.cxx20
-rw-r--r--sw/source/uibase/utlui/viewlayoutctrl.cxx6
-rw-r--r--sw/source/uibase/utlui/wordcountctrl.cxx2
12 files changed, 116 insertions, 116 deletions
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: */
generated by cgit (git 2.34.1) at 2024-07-15 10:54:05 +0000