diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2017-03-17 16:09:35 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2017-03-18 00:35:05 +0000 |
| commit | c16a4380fe6bdf6782ef706f4f92d904e0413820 (patch) | |
| tree | 1dd34f4e640f8cbdc3d381d98e18ea1f8000e383 /svx | |
| parent | 93412700af6a6f6b6caa645434b7f40c92a7615b (diff) | |
remove EE_RESSTR preprocessor abuse
Change-Id: I83b35c4e2d4275ac76a36bec03807be69a605c58
Reviewed-on: https://gerrit.libreoffice.org/35370
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/items/algitem.cxx | 8 | ||||
| -rw-r--r-- | svx/source/xoutdev/xattr.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index e98c77d40564..4fb7c0453f27 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -224,19 +224,19 @@ bool SvxMarginItem::GetPresentation { rText = SVX_RESSTR(RID_SVXITEMS_MARGIN_LEFT) + GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)) + + " " + EditResId::GetString(GetMetricId(ePresUnit)) + cpDelimTmp + SVX_RESSTR(RID_SVXITEMS_MARGIN_TOP) + GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)) + + " " + EditResId::GetString(GetMetricId(ePresUnit)) + cpDelimTmp + SVX_RESSTR(RID_SVXITEMS_MARGIN_RIGHT) + GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)) + + " " + EditResId::GetString(GetMetricId(ePresUnit)) + cpDelimTmp + SVX_RESSTR(RID_SVXITEMS_MARGIN_BOTTOM) + GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ) + - " " + EE_RESSTR(GetMetricId(ePresUnit)); + " " + EditResId::GetString(GetMetricId(ePresUnit)); return true; } default: ; //prevent warning diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index de6dac451146..f03453c8670e 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -1044,7 +1044,7 @@ bool XLineWidthItem::GetPresentation { rText = GetMetricText( (long) GetValue(), eCoreUnit, ePresUnit, pIntl) + - " " + EE_RESSTR( GetMetricId( ePresUnit) ); + " " + EditResId::GetString( GetMetricId( ePresUnit) ); return true; } @@ -1935,7 +1935,7 @@ bool XLineStartWidthItem::GetPresentation { rText = GetMetricText( (long) GetValue(), eCoreUnit, ePresUnit, pIntl) + - " " + EE_RESSTR( GetMetricId( ePresUnit) ); + " " + EditResId::GetString( GetMetricId( ePresUnit) ); return true; } @@ -1983,7 +1983,7 @@ bool XLineEndWidthItem::GetPresentation { rText = GetMetricText( (long) GetValue(), eCoreUnit, ePresUnit, pIntl) + - " " + EE_RESSTR( GetMetricId( ePresUnit) ); + " " + EditResId::GetString( GetMetricId( ePresUnit) ); return true; } |