diff options
Diffstat (limited to 'svx/source/items')
| -rw-r--r-- | svx/source/items/algitem.cxx | 10 | ||||
| -rw-r--r-- | svx/source/items/pageitem.cxx | 22 | ||||
| -rw-r--r-- | svx/source/items/postattr.cxx | 6 |
3 files changed, 19 insertions, 19 deletions
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index fb36f4fcdb1d..e05a1348ebe4 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -118,7 +118,7 @@ bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ OUString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) { DBG_ASSERT( nVal <= SVX_ORIENTATION_STACKED, "enum overflow!" ); - return SVX_RESSTR(RID_SVXITEMS_ORI_STANDARD + nVal); + return SvxResId(RID_SVXITEMS_ORI_STANDARD + nVal); } @@ -222,19 +222,19 @@ bool SvxMarginItem::GetPresentation } case SfxItemPresentation::Complete: { - rText = SVX_RESSTR(RID_SVXITEMS_MARGIN_LEFT) + + rText = SvxResId(RID_SVXITEMS_MARGIN_LEFT) + GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) + " " + EditResId::GetString(GetMetricId(ePresUnit)) + cpDelimTmp + - SVX_RESSTR(RID_SVXITEMS_MARGIN_TOP) + + SvxResId(RID_SVXITEMS_MARGIN_TOP) + GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, pIntl ) + " " + EditResId::GetString(GetMetricId(ePresUnit)) + cpDelimTmp + - SVX_RESSTR(RID_SVXITEMS_MARGIN_RIGHT) + + SvxResId(RID_SVXITEMS_MARGIN_RIGHT) + GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) + " " + EditResId::GetString(GetMetricId(ePresUnit)) + cpDelimTmp + - SVX_RESSTR(RID_SVXITEMS_MARGIN_BOTTOM) + + SvxResId(RID_SVXITEMS_MARGIN_BOTTOM) + GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ) + " " + EditResId::GetString(GetMetricId(ePresUnit)); return true; diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 2796103f1138..7d256e4db7a9 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -74,10 +74,10 @@ inline OUString GetUsageText( const SvxPageUsage eU ) { switch( eU ) { - case SvxPageUsage::Left : return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_LEFT); - case SvxPageUsage::Right : return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_RIGHT); - case SvxPageUsage::All : return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_ALL); - case SvxPageUsage::Mirror: return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_MIRROR); + case SvxPageUsage::Left : return SvxResId(RID_SVXITEMS_PAGE_USAGE_LEFT); + case SvxPageUsage::Right : return SvxResId(RID_SVXITEMS_PAGE_USAGE_RIGHT); + case SvxPageUsage::All : return SvxResId(RID_SVXITEMS_PAGE_USAGE_ALL); + case SvxPageUsage::Mirror: return SvxResId(RID_SVXITEMS_PAGE_USAGE_MIRROR); default: return OUString(); } } @@ -103,11 +103,11 @@ bool SvxPageItem::GetPresentation rText = aDescName + cpDelimTmp; } DBG_ASSERT( eNumType <= css::style::NumberingType::NUMBER_NONE, "enum overflow" ); - rText += SVX_RESSTR(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType) + cpDelimTmp; + rText += SvxResId(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType) + cpDelimTmp; if ( bLandscape ) - rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_TRUE); + rText += SvxResId(RID_SVXITEMS_PAGE_LAND_TRUE); else - rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_FALSE); + rText += SvxResId(RID_SVXITEMS_PAGE_LAND_FALSE); OUString aUsageText = GetUsageText( eUse ); if (!aUsageText.isEmpty()) { @@ -117,17 +117,17 @@ bool SvxPageItem::GetPresentation } case SfxItemPresentation::Complete: { - rText += SVX_RESSTR(RID_SVXITEMS_PAGE_COMPLETE); + rText += SvxResId(RID_SVXITEMS_PAGE_COMPLETE); if ( !aDescName.isEmpty() ) { rText += aDescName + cpDelimTmp; } DBG_ASSERT( eNumType <= css::style::NumberingType::NUMBER_NONE, "enum overflow" ); - rText += SVX_RESSTR(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType) + cpDelimTmp; + rText += SvxResId(RID_SVXITEMS_PAGE_NUM_BEGIN + eNumType) + cpDelimTmp; if ( bLandscape ) - rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_TRUE); + rText += SvxResId(RID_SVXITEMS_PAGE_LAND_TRUE); else - rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_FALSE); + rText += SvxResId(RID_SVXITEMS_PAGE_LAND_FALSE); OUString aUsageText = GetUsageText( eUse ); if (!aUsageText.isEmpty()) { diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index a31d6e33e785..056a9e13dba9 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -55,7 +55,7 @@ bool SvxPostItAuthorItem::GetPresentation rText = GetValue(); return true; case SfxItemPresentation::Complete: - rText = SVX_RESSTR(RID_SVXITEMS_AUTHOR_COMPLETE) + GetValue(); + rText = SvxResId(RID_SVXITEMS_AUTHOR_COMPLETE) + GetValue(); return true; default: ;//prevent warning } @@ -95,7 +95,7 @@ bool SvxPostItDateItem::GetPresentation rText = GetValue(); return true; case SfxItemPresentation::Complete: - rText = SVX_RESSTR(RID_SVXITEMS_DATE_COMPLETE) + GetValue(); + rText = SvxResId(RID_SVXITEMS_DATE_COMPLETE) + GetValue(); return true; default: ;//prevent warning } @@ -133,7 +133,7 @@ bool SvxPostItTextItem::GetPresentation rText = GetValue(); return true; case SfxItemPresentation::Complete: - rText = SVX_RESSTR(RID_SVXITEMS_TEXT_COMPLETE) + GetValue(); + rText = SvxResId(RID_SVXITEMS_TEXT_COMPLETE) + GetValue(); return true; default: ;//prevent warning } |