From c16a4380fe6bdf6782ef706f4f92d904e0413820 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 17 Mar 2017 16:09:35 +0100 Subject: remove EE_RESSTR preprocessor abuse MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I83b35c4e2d4275ac76a36bec03807be69a605c58 Reviewed-on: https://gerrit.libreoffice.org/35370 Tested-by: Jenkins Reviewed-by: Björn Michaelsen --- .../source/accessibility/AccessibleImageBullet.cxx | 4 +- editeng/source/editeng/editeng.cxx | 18 ++-- editeng/source/editeng/editview.cxx | 4 +- editeng/source/items/borderline.cxx | 4 +- editeng/source/items/charhiddenitem.cxx | 2 +- editeng/source/items/frmitems.cxx | 100 ++++++++++----------- editeng/source/items/itemtype.cxx | 4 +- editeng/source/items/justifyitem.cxx | 6 +- editeng/source/items/optitems.cxx | 4 +- editeng/source/items/paraitem.cxx | 42 ++++----- editeng/source/items/textitem.cxx | 60 ++++++------- editeng/source/items/writingmodeitem.cxx | 2 +- editeng/source/misc/unolingu.cxx | 2 +- editeng/source/outliner/outleeng.cxx | 10 +-- 14 files changed, 131 insertions(+), 131 deletions(-) (limited to 'editeng') diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 89385d14f89e..c287c5d6235d 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -139,7 +139,7 @@ namespace accessibility SolarMutexGuard aGuard; // Get the string from the resource for the specified id. - return EE_RESSTR(RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION); + return EditResId::GetString(RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION); } OUString SAL_CALL AccessibleImageBullet::getAccessibleName() @@ -148,7 +148,7 @@ namespace accessibility SolarMutexGuard aGuard; // Get the string from the resource for the specified id. - return EE_RESSTR(RID_SVXSTR_A11Y_IMAGEBULLET_NAME); + return EditResId::GetString(RID_SVXSTR_A11Y_IMAGEBULLET_NAME); } uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet() diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index ff0a5a46d841..f5956ddee4cf 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2491,12 +2491,12 @@ OUString EditEngine::GetUndoComment( sal_uInt16 nId ) const case EDITUNDO_DELCONTENT: case EDITUNDO_DELETE: case EDITUNDO_CUT: - aComment = EE_RESSTR(RID_EDITUNDO_DEL); + aComment = EditResId::GetString(RID_EDITUNDO_DEL); break; case EDITUNDO_MOVEPARAGRAPHS: case EDITUNDO_MOVEPARAS: case EDITUNDO_DRAGANDDROP: - aComment = EE_RESSTR(RID_EDITUNDO_MOVE); + aComment = EditResId::GetString(RID_EDITUNDO_MOVE); break; case EDITUNDO_INSERTFEATURE: case EDITUNDO_SPLITPARA: @@ -2504,27 +2504,27 @@ OUString EditEngine::GetUndoComment( sal_uInt16 nId ) const case EDITUNDO_PASTE: case EDITUNDO_INSERT: case EDITUNDO_READ: - aComment = EE_RESSTR(RID_EDITUNDO_INSERT); + aComment = EditResId::GetString(RID_EDITUNDO_INSERT); break; case EDITUNDO_REPLACEALL: - aComment = EE_RESSTR(RID_EDITUNDO_REPLACE); + aComment = EditResId::GetString(RID_EDITUNDO_REPLACE); break; case EDITUNDO_ATTRIBS: case EDITUNDO_PARAATTRIBS: - aComment = EE_RESSTR(RID_EDITUNDO_SETATTRIBS); + aComment = EditResId::GetString(RID_EDITUNDO_SETATTRIBS); break; case EDITUNDO_RESETATTRIBS: - aComment = EE_RESSTR(RID_EDITUNDO_RESETATTRIBS); + aComment = EditResId::GetString(RID_EDITUNDO_RESETATTRIBS); break; case EDITUNDO_STYLESHEET: - aComment = EE_RESSTR(RID_EDITUNDO_SETSTYLE); + aComment = EditResId::GetString(RID_EDITUNDO_SETSTYLE); break; case EDITUNDO_TRANSLITERATE: - aComment = EE_RESSTR(RID_EDITUNDO_TRANSLITERATE); + aComment = EditResId::GetString(RID_EDITUNDO_TRANSLITERATE); break; case EDITUNDO_INDENTBLOCK: case EDITUNDO_UNINDENTBLOCK: - aComment = EE_RESSTR(RID_EDITUNDO_INDENT); + aComment = EditResId::GetString(RID_EDITUNDO_INDENT); break; } return aComment; diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 07523d0220b9..9f55c2cf0809 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -886,9 +886,9 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, LinkInsertSeparator(); OUString aTmpWord( SvtLanguageTable::GetLanguageString( nGuessLangWord ) ); OUString aTmpPara( SvtLanguageTable::GetLanguageString( nGuessLangPara ) ); - OUString aWordStr( EE_RESSTR( RID_STR_WORD ) ); + OUString aWordStr( EditResId::GetString( RID_STR_WORD ) ); aWordStr = aWordStr.replaceFirst( "%x", aTmpWord ); - OUString aParaStr( EE_RESSTR( RID_STR_PARAGRAPH ) ); + OUString aParaStr( EditResId::GetString( RID_STR_PARAGRAPH ) ); aParaStr = aParaStr.replaceFirst( "%x", aTmpPara ); aPopupMenu->InsertItem( MN_WORDLANGUAGE, aWordStr ); aPopupMenu->SetHelpId( MN_WORDLANGUAGE, HID_EDITENG_SPELLER_WORDLANGUAGE ); diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index 6b766b4b85ab..0cb38a0f445e 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -663,11 +663,11 @@ OUString SvxBorderLine::GetValueString(MapUnit eSrcUnit, if ( (int)m_nStyle < int(SAL_N_ELEMENTS(aStyleIds)) ) { sal_uInt16 nResId = aStyleIds[(int)m_nStyle]; - aStr += EE_RESSTR(nResId); + aStr += EditResId::GetString(nResId); } else { - OUString sMetric = EE_RESSTR(GetMetricId( eDestUnit )); + OUString sMetric = EditResId::GetString(GetMetricId( eDestUnit )); aStr += GetMetricText( (long)GetInWidth(), eSrcUnit, eDestUnit, pIntl ); if ( bMetricStr ) aStr += sMetric; diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx index 60a3c7707a83..41e8e9b479d9 100644 --- a/editeng/source/items/charhiddenitem.cxx +++ b/editeng/source/items/charhiddenitem.cxx @@ -45,7 +45,7 @@ bool SvxCharHiddenItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_CHARHIDDEN_TRUE; - rText = EE_RESSTR(nId); + rText = EditResId::GetString(nId); return true; } diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 9dd99b8792e5..a17b172c523b 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -196,10 +196,10 @@ bool SvxPaperBinItem::GetPresentation sal_uInt8 nValue = GetValue(); if ( PAPERBIN_PRINTER_SETTINGS == nValue ) - rText = EE_RESSTR(RID_SVXSTR_PAPERBIN_SETTINGS); + rText = EditResId::GetString(RID_SVXSTR_PAPERBIN_SETTINGS); else { - rText = EE_RESSTR(RID_SVXSTR_PAPERBIN) + " " + OUString::number( nValue ); + rText = EditResId::GetString(RID_SVXSTR_PAPERBIN) + " " + OUString::number( nValue ); } return true; } @@ -333,13 +333,13 @@ bool SvxSizeItem::GetPresentation return true; case SfxItemPresentation::Complete: - rText = EE_RESSTR(RID_SVXITEMS_SIZE_WIDTH) + + rText = EditResId::GetString(RID_SVXITEMS_SIZE_WIDTH) + GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)) + + " " + EditResId::GetString(GetMetricId(ePresUnit)) + cpDelimTmp + - EE_RESSTR(RID_SVXITEMS_SIZE_HEIGHT) + + EditResId::GetString(RID_SVXITEMS_SIZE_HEIGHT) + GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)); + " " + EditResId::GetString(GetMetricId(ePresUnit)); return true; // no break necessary default: ; // prevent warning @@ -631,7 +631,7 @@ bool SvxLRSpaceItem::GetPresentation } case SfxItemPresentation::Complete: { - rText = EE_RESSTR(RID_SVXITEMS_LRSPACE_LEFT); + rText = EditResId::GetString(RID_SVXITEMS_LRSPACE_LEFT); if ( 100 != nPropLeftMargin ) rText += unicode::formatPercent(nPropLeftMargin, Application::GetSettings().GetUILanguageTag()); @@ -639,12 +639,12 @@ bool SvxLRSpaceItem::GetPresentation { rText = rText + GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)); + " " + EditResId::GetString(GetMetricId(ePresUnit)); } rText += OUString(cpDelim); if ( 100 != nPropFirstLineOfst || nFirstLineOfst ) { - rText += EE_RESSTR(RID_SVXITEMS_LRSPACE_FLINE); + rText += EditResId::GetString(RID_SVXITEMS_LRSPACE_FLINE); if ( 100 != nPropFirstLineOfst ) rText = rText + unicode::formatPercent(nPropFirstLineOfst, Application::GetSettings().GetUILanguageTag()); @@ -653,11 +653,11 @@ bool SvxLRSpaceItem::GetPresentation rText = rText + GetMetricText( (long)nFirstLineOfst, eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)); + " " + EditResId::GetString(GetMetricId(ePresUnit)); } rText += OUString(cpDelim); } - rText += EE_RESSTR(RID_SVXITEMS_LRSPACE_RIGHT); + rText += EditResId::GetString(RID_SVXITEMS_LRSPACE_RIGHT); if ( 100 != nPropRightMargin ) rText = rText + unicode::formatPercent(nPropRightMargin, Application::GetSettings().GetUILanguageTag()); @@ -666,7 +666,7 @@ bool SvxLRSpaceItem::GetPresentation rText = rText + GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)); + " " + EditResId::GetString(GetMetricId(ePresUnit)); } return true; } @@ -998,7 +998,7 @@ bool SvxULSpaceItem::GetPresentation } case SfxItemPresentation::Complete: { - rText = EE_RESSTR(RID_SVXITEMS_ULSPACE_UPPER); + rText = EditResId::GetString(RID_SVXITEMS_ULSPACE_UPPER); if ( 100 != nPropUpper ) { rText += unicode::formatPercent(nPropUpper, @@ -1008,9 +1008,9 @@ bool SvxULSpaceItem::GetPresentation { rText = rText + GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)); + " " + EditResId::GetString(GetMetricId(ePresUnit)); } - rText = rText + OUString(cpDelim) + EE_RESSTR(RID_SVXITEMS_ULSPACE_LOWER); + rText = rText + OUString(cpDelim) + EditResId::GetString(RID_SVXITEMS_ULSPACE_LOWER); if ( 100 != nPropLower ) { rText += unicode::formatPercent(nPropLower, @@ -1020,7 +1020,7 @@ bool SvxULSpaceItem::GetPresentation { rText = rText + GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)); + " " + EditResId::GetString(GetMetricId(ePresUnit)); } return true; } @@ -1128,7 +1128,7 @@ bool SvxPrintItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_PRINT_TRUE; - rText = EE_RESSTR(nId); + rText = EditResId::GetString(nId); return true; } @@ -1166,7 +1166,7 @@ bool SvxOpaqueItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_OPAQUE_TRUE; - rText = EE_RESSTR(nId); + rText = EditResId::GetString(nId); return true; } @@ -1236,17 +1236,17 @@ bool SvxProtectItem::GetPresentation if ( bCntnt ) nId = RID_SVXITEMS_PROT_CONTENT_TRUE; - rText = EE_RESSTR(nId) + OUString(cpDelim); + rText = EditResId::GetString(nId) + OUString(cpDelim); nId = RID_SVXITEMS_PROT_SIZE_FALSE; if ( bSize ) nId = RID_SVXITEMS_PROT_SIZE_TRUE; - rText = rText + EE_RESSTR(nId) + OUString(cpDelim); + rText = rText + EditResId::GetString(nId) + OUString(cpDelim); nId = RID_SVXITEMS_PROT_POS_FALSE; if ( bPos ) nId = RID_SVXITEMS_PROT_POS_TRUE; - rText += EE_RESSTR(nId); + rText += EditResId::GetString(nId); return true; } @@ -1468,16 +1468,16 @@ bool SvxShadowItem::GetPresentation if ( aShadowColor.GetTransparency() ) nId = RID_SVXITEMS_TRANSPARENT_TRUE; rText = rText + - EE_RESSTR(nId) + + EditResId::GetString(nId) + OUString(cpDelim) + GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ) + OUString(cpDelim) + - EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + (int)eLocation); + EditResId::GetString(RID_SVXITEMS_SHADOW_BEGIN + (int)eLocation); return true; } case SfxItemPresentation::Complete: { - rText = EE_RESSTR(RID_SVXITEMS_SHADOW_COMPLETE) + + rText = EditResId::GetString(RID_SVXITEMS_SHADOW_COMPLETE) + ::GetColorString( aShadowColor ) + OUString(cpDelim); @@ -1485,12 +1485,12 @@ bool SvxShadowItem::GetPresentation if ( aShadowColor.GetTransparency() ) nId = RID_SVXITEMS_TRANSPARENT_TRUE; rText = rText + - EE_RESSTR(nId) + + EditResId::GetString(nId) + OUString(cpDelim) + GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)) + + " " + EditResId::GetString(GetMetricId(ePresUnit)) + OUString(cpDelim) + - EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + (int)eLocation); + EditResId::GetString(RID_SVXITEMS_SHADOW_BEGIN + (int)eLocation); return true; } default: ; // prevent warning @@ -1549,7 +1549,7 @@ sal_uInt16 SvxShadowItem::GetValueCount() const OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < (sal_uInt16)SvxShadowLocation::End, "enum overflow!" ); - return EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + nPos ); + return EditResId::GetString(RID_SVXITEMS_SHADOW_BEGIN + nPos ); } @@ -1571,7 +1571,7 @@ void SvxShadowItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("aShadowColor"), BAD_CAST(aShadowColor.AsRGBHexString().toUtf8().getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nWidth"), BAD_CAST(OString::number(nWidth).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eLocation"), BAD_CAST(OString::number((int)eLocation).getStr())); - xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + (int)eLocation).toUtf8().getStr())); + xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(EditResId::GetString(RID_SVXITEMS_SHADOW_BEGIN + (int)eLocation).toUtf8().getStr())); xmlTextWriterEndElement(pWriter); } @@ -2106,11 +2106,11 @@ bool SvxBoxItem::GetPresentation { if( !(pTop || pBottom || pLeft || pRight) ) { - rText = EE_RESSTR(RID_SVXITEMS_BORDER_NONE) + cpDelimTmp; + rText = EditResId::GetString(RID_SVXITEMS_BORDER_NONE) + cpDelimTmp; } else { - rText = EE_RESSTR(RID_SVXITEMS_BORDER_COMPLETE); + rText = EditResId::GetString(RID_SVXITEMS_BORDER_COMPLETE); if( pTop && pBottom && pLeft && pRight && *pTop == *pBottom && *pTop == *pLeft && *pTop == *pRight ) { @@ -2121,65 +2121,65 @@ bool SvxBoxItem::GetPresentation if ( pTop ) { rText = rText + - EE_RESSTR(RID_SVXITEMS_BORDER_TOP) + + EditResId::GetString(RID_SVXITEMS_BORDER_TOP) + pTop->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) + cpDelimTmp; } if ( pBottom ) { rText = rText + - EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM) + + EditResId::GetString(RID_SVXITEMS_BORDER_BOTTOM) + pBottom->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) + cpDelimTmp; } if ( pLeft ) { rText = rText + - EE_RESSTR(RID_SVXITEMS_BORDER_LEFT) + + EditResId::GetString(RID_SVXITEMS_BORDER_LEFT) + pLeft->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) + cpDelimTmp; } if ( pRight ) { rText = rText + - EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT) + + EditResId::GetString(RID_SVXITEMS_BORDER_RIGHT) + pRight->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) + cpDelimTmp; } } } - rText += EE_RESSTR(RID_SVXITEMS_BORDER_DISTANCE); + rText += EditResId::GetString(RID_SVXITEMS_BORDER_DISTANCE); if( nTopDist == nBottomDist && nTopDist == nLeftDist && nTopDist == nRightDist ) { rText = rText + GetMetricText( (long)nTopDist, eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)); + " " + EditResId::GetString(GetMetricId(ePresUnit)); } else { rText = rText + - EE_RESSTR(RID_SVXITEMS_BORDER_TOP) + + EditResId::GetString(RID_SVXITEMS_BORDER_TOP) + GetMetricText( (long)nTopDist, eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)) + + " " + EditResId::GetString(GetMetricId(ePresUnit)) + cpDelimTmp + - EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM) + + EditResId::GetString(RID_SVXITEMS_BORDER_BOTTOM) + GetMetricText( (long)nBottomDist, eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)) + + " " + EditResId::GetString(GetMetricId(ePresUnit)) + cpDelimTmp + - EE_RESSTR(RID_SVXITEMS_BORDER_LEFT) + + EditResId::GetString(RID_SVXITEMS_BORDER_LEFT) + GetMetricText( (long)nLeftDist, eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)) + + " " + EditResId::GetString(GetMetricId(ePresUnit)) + cpDelimTmp + - EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT) + + EditResId::GetString(RID_SVXITEMS_BORDER_RIGHT) + GetMetricText( (long)nRightDist, eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)); + " " + EditResId::GetString(GetMetricId(ePresUnit)); } return true; } @@ -2937,7 +2937,7 @@ bool SvxFormatBreakItem::GetPresentation OUString SvxFormatBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < (sal_uInt16)SvxBreak::End, "enum overflow!" ); - return EE_RESSTR(RID_SVXITEMS_BREAK_BEGIN + nPos); + return EditResId::GetString(RID_SVXITEMS_BREAK_BEGIN + nPos); } @@ -3063,7 +3063,7 @@ bool SvxFormatKeepItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_FMTKEEP_TRUE; - rText = EE_RESSTR(nId); + rText = EditResId::GetString(nId); return true; } @@ -3669,11 +3669,11 @@ bool SvxBrushItem::GetPresentation if ( aColor.GetTransparency() ) nId = RID_SVXITEMS_TRANSPARENT_TRUE; - rText += EE_RESSTR(nId); + rText += EditResId::GetString(nId); } else { - rText = EE_RESSTR(RID_SVXITEMS_GRAPHIC); + rText = EditResId::GetString(RID_SVXITEMS_GRAPHIC); } return true; @@ -4084,7 +4084,7 @@ bool SvxFrameDirectionItem::GetPresentation( MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper *) const { - rText = EE_RESSTR( RID_SVXITEMS_FRMDIR_BEGIN + GetEnumValue() ); + rText = EditResId::GetString( RID_SVXITEMS_FRMDIR_BEGIN + GetEnumValue() ); return true; } diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx index c8ff68c37e26..7cb94d69e718 100644 --- a/editeng/source/items/itemtype.cxx +++ b/editeng/source/items/itemtype.cxx @@ -130,7 +130,7 @@ OUString GetMetricText( long nVal, MapUnit eSrcUnit, MapUnit eDestUnit, const In OUString GetSvxString( sal_uInt16 nId ) { - return EE_RESSTR( nId ); + return EditResId::GetString( nId ); } @@ -155,7 +155,7 @@ OUString GetColorString( const Color& rCol ) } if ( nColor < SAL_N_ELEMENTS(aColAry) ) - sStr = EE_RESSTR( RID_SVXITEMS_COLOR_BEGIN + nColor + 1 ); + sStr = EditResId::GetString( RID_SVXITEMS_COLOR_BEGIN + nColor + 1 ); if ( sStr.isEmpty() ) { diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index 7f37aa8f367a..107c4308e658 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -160,7 +160,7 @@ bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) OUString SvxHorJustifyItem::GetValueText( sal_uInt16 nVal ) { DBG_ASSERT( nVal <= (sal_uInt16)SvxCellHorJustify::Repeat, "enum overflow!" ); - return EE_RESSTR(RID_SVXITEMS_HORJUST_STANDARD + nVal); + return EditResId::GetString(RID_SVXITEMS_HORJUST_STANDARD + nVal); } @@ -296,7 +296,7 @@ bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) OUString SvxVerJustifyItem::GetValueText( sal_uInt16 nVal ) { DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" ); - return EE_RESSTR(RID_SVXITEMS_VERJUST_STANDARD + nVal); + return EditResId::GetString(RID_SVXITEMS_VERJUST_STANDARD + nVal); } @@ -378,7 +378,7 @@ bool SvxJustifyMethodItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId OUString SvxJustifyMethodItem::GetValueText( sal_uInt16 nVal ) { DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" ); - return EE_RESSTR(RID_SVXITEMS_JUSTMETHOD_AUTO + nVal); + return EditResId::GetString(RID_SVXITEMS_JUSTMETHOD_AUTO + nVal); } diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index f4ab203bab5c..819f1aed7454 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -120,9 +120,9 @@ bool SfxHyphenRegionItem::GetPresentation ) const { rText = rText + - EE_RESSTR(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) + + EditResId::GetString(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) + "," + - EE_RESSTR(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail)); + EditResId::GetString(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail)); return true; } diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 2a99d6efb99f..2e10733ff142 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -432,7 +432,7 @@ sal_uInt16 SvxAdjustItem::GetValueCount() const OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)SvxAdjust::BlockLine, "enum overflow!" ); - return EE_RESSTR(RID_SVXITEMS_ADJUST_BEGIN + nPos); + return EditResId::GetString(RID_SVXITEMS_ADJUST_BEGIN + nPos); } @@ -530,13 +530,13 @@ bool SvxWidowsItem::GetPresentation { case SfxItemPresentation::Nameless: { - rText = EE_RESSTR(RID_SVXITEMS_LINES); + rText = EditResId::GetString(RID_SVXITEMS_LINES); break; } case SfxItemPresentation::Complete: { - rText = EE_RESSTR(RID_SVXITEMS_WIDOWS_COMPLETE) + " " + EE_RESSTR(RID_SVXITEMS_LINES); + rText = EditResId::GetString(RID_SVXITEMS_WIDOWS_COMPLETE) + " " + EditResId::GetString(RID_SVXITEMS_LINES); break; } @@ -591,13 +591,13 @@ bool SvxOrphansItem::GetPresentation { case SfxItemPresentation::Nameless: { - rText = EE_RESSTR(RID_SVXITEMS_LINES); + rText = EditResId::GetString(RID_SVXITEMS_LINES); break; } case SfxItemPresentation::Complete: { - rText = EE_RESSTR(RID_SVXITEMS_ORPHANS_COMPLETE) + " " + EE_RESSTR(RID_SVXITEMS_LINES); + rText = EditResId::GetString(RID_SVXITEMS_ORPHANS_COMPLETE) + " " + EditResId::GetString(RID_SVXITEMS_LINES); break; } @@ -708,12 +708,12 @@ bool SvxHyphenZoneItem::GetPresentation if ( bHyphen ) nId = RID_SVXITEMS_HYPHEN_TRUE; - rText = EE_RESSTR(nId) + cpDelimTmp; + rText = EditResId::GetString(nId) + cpDelimTmp; nId = RID_SVXITEMS_PAGE_END_FALSE; if ( bPageEnd ) nId = RID_SVXITEMS_PAGE_END_TRUE; - rText = rText + EE_RESSTR(nId) + cpDelimTmp + + rText = rText + EditResId::GetString(nId) + cpDelimTmp + OUString::number( nMinLead ) + cpDelimTmp + OUString::number( nMinTrail ) + cpDelimTmp + OUString::number( nMaxHyphens ); @@ -725,19 +725,19 @@ bool SvxHyphenZoneItem::GetPresentation if ( bHyphen ) nId = RID_SVXITEMS_HYPHEN_TRUE; - rText = EE_RESSTR(nId) + cpDelimTmp; + rText = EditResId::GetString(nId) + cpDelimTmp; nId = RID_SVXITEMS_PAGE_END_FALSE; if ( bPageEnd ) nId = RID_SVXITEMS_PAGE_END_TRUE; rText = rText + - EE_RESSTR(nId) + + EditResId::GetString(nId) + cpDelimTmp + - EE_RESSTR(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) + + EditResId::GetString(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) + cpDelimTmp + - EE_RESSTR(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail)) + + EditResId::GetString(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail)) + cpDelimTmp + - EE_RESSTR(RID_SVXITEMS_HYPHEN_MAX).replaceAll("%1", OUString::number(nMaxHyphens)); + EditResId::GetString(RID_SVXITEMS_HYPHEN_MAX).replaceAll("%1", OUString::number(nMaxHyphens)); return true; } default: ;//prevent warning @@ -1038,7 +1038,7 @@ bool SvxTabStopItem::GetPresentation ((*this)[i]).GetTabPos(), eCoreUnit, ePresUnit, pIntl ); if ( SfxItemPresentation::Complete == ePres ) { - rText += " " + EE_RESSTR(GetMetricId(ePresUnit)); + rText += " " + EditResId::GetString(GetMetricId(ePresUnit)); } bComma = true; } @@ -1186,7 +1186,7 @@ bool SvxFormatSplitItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_FMTSPLIT_TRUE; - rText = EE_RESSTR(nId); + rText = EditResId::GetString(nId); return true; } @@ -1255,7 +1255,7 @@ bool SvxPageModelItem::GetPresentation case SfxItemPresentation::Complete: if ( bSet ) { - rText = EE_RESSTR(RID_SVXITEMS_PAGEMODEL_COMPLETE) + GetValue(); + rText = EditResId::GetString(RID_SVXITEMS_PAGEMODEL_COMPLETE) + GetValue(); } return true; default: ;//prevent warning @@ -1296,7 +1296,7 @@ bool SvxScriptSpaceItem::GetPresentation( MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { - rText = EE_RESSTR( !GetValue() + rText = EditResId::GetString( !GetValue() ? RID_SVXITEMS_SCRPTSPC_OFF : RID_SVXITEMS_SCRPTSPC_ON ); return true; @@ -1336,7 +1336,7 @@ bool SvxHangingPunctuationItem::GetPresentation( MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { - rText = EE_RESSTR( !GetValue() + rText = EditResId::GetString( !GetValue() ? RID_SVXITEMS_HNGPNCT_OFF : RID_SVXITEMS_HNGPNCT_ON ); return true; @@ -1376,7 +1376,7 @@ bool SvxForbiddenRuleItem::GetPresentation( MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { - rText = EE_RESSTR( !GetValue() + rText = EditResId::GetString( !GetValue() ? RID_SVXITEMS_FORBIDDEN_RULE_OFF : RID_SVXITEMS_FORBIDDEN_RULE_ON ); return true; @@ -1429,7 +1429,7 @@ bool SvxParaVertAlignItem::GetPresentation( case Align::Bottom: nTmp = RID_SVXITEMS_PARAVERTALIGN_BOTTOM; break; default: nTmp = RID_SVXITEMS_PARAVERTALIGN_BASELINE; break; } - rText = EE_RESSTR( nTmp ); + rText = EditResId::GetString( nTmp ); return true; } @@ -1493,8 +1493,8 @@ bool SvxParaGridItem::GetPresentation( OUString &rText, const IntlWrapper* /*pIntl*/ ) const { rText = GetValue() ? - EE_RESSTR( RID_SVXITEMS_PARASNAPTOGRID_ON ) : - EE_RESSTR( RID_SVXITEMS_PARASNAPTOGRID_OFF ); + EditResId::GetString( RID_SVXITEMS_PARASNAPTOGRID_ON ) : + EditResId::GetString( RID_SVXITEMS_PARASNAPTOGRID_OFF ); return true; } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 65e6965757b2..a5258e0563d8 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -501,7 +501,7 @@ OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const default: ;//prevent warning } - return nId ? EE_RESSTR(nId) : OUString(); + return nId ? EditResId::GetString(nId) : OUString(); } bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const @@ -637,7 +637,7 @@ bool SvxWeightItem::GetPresentation OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)WEIGHT_BLACK, "enum overflow!" ); - return EE_RESSTR(RID_SVXITEMS_WEIGHT_BEGIN + nPos); + return EditResId::GetString(RID_SVXITEMS_WEIGHT_BEGIN + nPos); } bool SvxWeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const @@ -1000,7 +1000,7 @@ bool SvxFontHeightItem::GetPresentation if( MapUnit::MapRelative != ePropUnit ) { rText = OUString::number( (short)nProp ) + - " " + EE_RESSTR( GetMetricId( ePropUnit ) ); + " " + EditResId::GetString( GetMetricId( ePropUnit ) ); if( 0 <= (short)nProp ) rText = "+" + rText; } @@ -1008,7 +1008,7 @@ bool SvxFontHeightItem::GetPresentation { rText = GetMetricText( (long)nHeight, eCoreUnit, MapUnit::MapPoint, pIntl ) + - " " + EE_RESSTR(GetMetricId(MapUnit::MapPoint)); + " " + EditResId::GetString(GetMetricId(MapUnit::MapPoint)); } else rText = OUString::number( nProp ) + "%"; @@ -1186,7 +1186,7 @@ bool SvxFontWidthItem::GetPresentation { rText = GetMetricText( (long)nWidth, eCoreUnit, MapUnit::MapPoint, pIntl ) + - " " + EE_RESSTR(GetMetricId(MapUnit::MapPoint)); + " " + EditResId::GetString(GetMetricId(MapUnit::MapPoint)); } else rText = OUString::number( nProp ) + "%"; @@ -1365,7 +1365,7 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE, "enum overflow!" ); - return EE_RESSTR(RID_SVXITEMS_UL_BEGIN + nPos); + return EditResId::GetString(RID_SVXITEMS_UL_BEGIN + nPos); } // class SvxOverlineItem ------------------------------------------------ @@ -1395,7 +1395,7 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE, "enum overflow!" ); - return EE_RESSTR(RID_SVXITEMS_OL_BEGIN + nPos); + return EditResId::GetString(RID_SVXITEMS_OL_BEGIN + nPos); } // class SvxCrossedOutItem ----------------------------------------------- @@ -1467,7 +1467,7 @@ bool SvxCrossedOutItem::GetPresentation OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)STRIKEOUT_X, "enum overflow!" ); - return EE_RESSTR(RID_SVXITEMS_STRIKEOUT_BEGIN + nPos); + return EditResId::GetString(RID_SVXITEMS_STRIKEOUT_BEGIN + nPos); } bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const @@ -1545,7 +1545,7 @@ bool SvxShadowedItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_SHADOWED_TRUE; - rText = EE_RESSTR(nId); + rText = EditResId::GetString(nId); return true; } @@ -1590,7 +1590,7 @@ bool SvxAutoKernItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_AUTOKERN_TRUE; - rText = EE_RESSTR(nId); + rText = EditResId::GetString(nId); return true; } @@ -1636,7 +1636,7 @@ bool SvxWordLineModeItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_WORDLINE_TRUE; - rText = EE_RESSTR(nId); + rText = EditResId::GetString(nId); return true; } @@ -1681,7 +1681,7 @@ bool SvxContourItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_CONTOUR_TRUE; - rText = EE_RESSTR(nId); + rText = EditResId::GetString(nId); return true; } @@ -2025,11 +2025,11 @@ bool SvxKerningItem::GetPresentation { case SfxItemPresentation::Nameless: rText = GetMetricText( (long)GetValue(), eCoreUnit, MapUnit::MapPoint, pIntl ) + - " " + EE_RESSTR(GetMetricId(MapUnit::MapPoint)); + " " + EditResId::GetString(GetMetricId(MapUnit::MapPoint)); return true; case SfxItemPresentation::Complete: { - rText = EE_RESSTR(RID_SVXITEMS_KERNING_COMPLETE); + rText = EditResId::GetString(RID_SVXITEMS_KERNING_COMPLETE); sal_uInt16 nId = 0; if ( GetValue() > 0 ) @@ -2038,10 +2038,10 @@ bool SvxKerningItem::GetPresentation nId = RID_SVXITEMS_KERNING_CONDENSED; if ( nId ) - rText += EE_RESSTR(nId); + rText += EditResId::GetString(nId); rText = rText + GetMetricText( (long)GetValue(), eCoreUnit, MapUnit::MapPoint, pIntl ) + - " " + EE_RESSTR(GetMetricId(MapUnit::MapPoint)); + " " + EditResId::GetString(GetMetricId(MapUnit::MapPoint)); return true; } default: ; //prevent warning @@ -2120,7 +2120,7 @@ bool SvxCaseMapItem::GetPresentation OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < (sal_uInt16)SvxCaseMap::End, "enum overflow!" ); - return EE_RESSTR(RID_SVXITEMS_CASEMAP_BEGIN + nPos); + return EditResId::GetString(RID_SVXITEMS_CASEMAP_BEGIN + nPos); } bool SvxCaseMapItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const @@ -2249,7 +2249,7 @@ bool SvxEscapementItem::GetPresentation if ( nEsc != 0 ) { if( DFLT_ESC_AUTO_SUPER == nEsc || DFLT_ESC_AUTO_SUB == nEsc ) - rText += EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_AUTO); + rText += EditResId::GetString(RID_SVXITEMS_ESCAPEMENT_AUTO); else rText = rText + OUString::number( nEsc ) + "%"; } @@ -2260,7 +2260,7 @@ bool SvxEscapementItem::GetPresentation OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < (sal_uInt16)SvxEscapement::End, "enum overflow!" ); - return EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos); + return EditResId::GetString(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos); } @@ -2597,7 +2597,7 @@ bool SvxBlinkItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_BLINK_TRUE; - rText = EE_RESSTR(nId); + rText = EditResId::GetString(nId); return true; } @@ -2642,7 +2642,7 @@ bool SvxEmphasisMarkItem::GetPresentation ) const { FontEmphasisMark nVal = GetEmphasisMark(); - rText = EE_RESSTR( RID_SVXITEMS_EMPHASIS_BEGIN_STYLE + + rText = EditResId::GetString( RID_SVXITEMS_EMPHASIS_BEGIN_STYLE + (sal_uInt16)(FontEmphasisMark)( nVal & FontEmphasisMark::Style )); sal_uInt16 nId = ( FontEmphasisMark::PosAbove & nVal ) ? RID_SVXITEMS_EMPHASIS_ABOVE_POS @@ -2650,7 +2650,7 @@ bool SvxEmphasisMarkItem::GetPresentation ? RID_SVXITEMS_EMPHASIS_BELOW_POS : 0; if( nId ) - rText += EE_RESSTR( nId ); + rText += EditResId::GetString( nId ); return true; } @@ -2828,10 +2828,10 @@ bool SvxTwoLinesItem::GetPresentation( SfxItemPresentation /*ePres*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { if( !GetValue() ) - rText = EE_RESSTR( RID_SVXITEMS_TWOLINES_OFF ); + rText = EditResId::GetString( RID_SVXITEMS_TWOLINES_OFF ); else { - rText = EE_RESSTR( RID_SVXITEMS_TWOLINES ); + rText = EditResId::GetString( RID_SVXITEMS_TWOLINES ); if( GetStartBracket() ) rText = OUStringLiteral1(GetStartBracket()) + rText; if( GetEndBracket() ) @@ -2908,14 +2908,14 @@ bool SvxCharRotateItem::GetPresentation( OUString &rText, const IntlWrapper* ) const { if( !GetValue() ) - rText = EE_RESSTR( RID_SVXITEMS_CHARROTATE_OFF ); + rText = EditResId::GetString( RID_SVXITEMS_CHARROTATE_OFF ); else { - rText = EE_RESSTR( RID_SVXITEMS_CHARROTATE ); + rText = EditResId::GetString( RID_SVXITEMS_CHARROTATE ); rText = rText.replaceFirst( "$(ARG1)", OUString::number( GetValue() / 10 )); if( IsFitToLine() ) - rText += EE_RESSTR( RID_SVXITEMS_CHARROTATE_FITLINE ); + rText += EditResId::GetString( RID_SVXITEMS_CHARROTATE_FITLINE ); } return true; } @@ -3047,10 +3047,10 @@ bool SvxCharScaleWidthItem::GetPresentation( OUString &rText, const IntlWrapper* ) const { if( !GetValue() ) - rText = EE_RESSTR( RID_SVXITEMS_CHARSCALE_OFF ); + rText = EditResId::GetString( RID_SVXITEMS_CHARSCALE_OFF ); else { - rText = EE_RESSTR( RID_SVXITEMS_CHARSCALE ); + rText = EditResId::GetString( RID_SVXITEMS_CHARSCALE ); rText = rText.replaceFirst( "$(ARG1)", OUString::number( GetValue() )); } @@ -3118,7 +3118,7 @@ OUString SvxCharReliefItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE, "enum overflow" ); - return EE_RESSTR(RID_SVXITEMS_RELIEF_BEGIN + nPos); + return EditResId::GetString(RID_SVXITEMS_RELIEF_BEGIN + nPos); } sal_uInt16 SvxCharReliefItem::GetValueCount() const diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index 7d7dd1e1464c..a753ec372c15 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -69,7 +69,7 @@ bool SvxWritingModeItem::GetPresentation( SfxItemPresentation /*ePres*/, OUString &rText, const IntlWrapper * ) const { - rText = EE_RESSTR(RID_SVXITEMS_FRMDIR_BEGIN + GetValue()); + rText = EditResId::GetString(RID_SVXITEMS_FRMDIR_BEGIN + GetValue()); return true; } diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index f0eeb4e8aa25..e306551ee4d5 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -743,7 +743,7 @@ short SvxDicError( vcl::Window *pParent, linguistic::DictionaryError nError ) nRid = RID_SVXSTR_DIC_ERR_UNKNOWN; SAL_WARN("editeng", "unexpected case"); } - nRes = ScopedVclPtrInstance(pParent, EE_RESSTR(nRid))->Execute(); + nRes = ScopedVclPtrInstance(pParent, EditResId::GetString(nRid))->Execute(); } return nRes; } diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx index 84866840157b..3863c98e5919 100644 --- a/editeng/source/outliner/outleeng.cxx +++ b/editeng/source/outliner/outleeng.cxx @@ -127,19 +127,19 @@ OUString OutlinerEditEng::GetUndoComment( sal_uInt16 nUndoId ) const switch( nUndoId ) { case OLUNDO_DEPTH: - return EE_RESSTR(RID_OUTLUNDO_DEPTH); + return EditResId::GetString(RID_OUTLUNDO_DEPTH); case OLUNDO_EXPAND: - return EE_RESSTR(RID_OUTLUNDO_EXPAND); + return EditResId::GetString(RID_OUTLUNDO_EXPAND); case OLUNDO_COLLAPSE: - return EE_RESSTR(RID_OUTLUNDO_COLLAPSE); + return EditResId::GetString(RID_OUTLUNDO_COLLAPSE); case OLUNDO_ATTR: - return EE_RESSTR(RID_OUTLUNDO_ATTR); + return EditResId::GetString(RID_OUTLUNDO_ATTR); case OLUNDO_INSERT: - return EE_RESSTR(RID_OUTLUNDO_INSERT); + return EditResId::GetString(RID_OUTLUNDO_INSERT); default: return EditEngine::GetUndoComment( nUndoId ); -- cgit