diff options
| author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-04-19 00:12:33 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-04-20 17:24:24 +0200 |
| commit | ef7f8c263fcb2bac596aa0247f1e54ff375c3146 (patch) | |
| tree | b3adb7d84db920eb3b92cfbdc9448cee3489251a /sw | |
| parent | 40d38c2140ddd172433e68e3fa59bc184597ac15 (diff) | |
Drop GetSvxString l10n wrapper from editeng
This was a wrapper above the usual EditResId call
without any added value.
Change-Id: I685788e23ca24eca8f023d796f181178d3a6273b
Reviewed-on: https://gerrit.libreoffice.org/53133
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/utlui/attrdesc.cxx | 9 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/uiitems.cxx | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx index a329e5a280fd..2295146d2db2 100644 --- a/sw/source/uibase/utlui/attrdesc.cxx +++ b/sw/source/uibase/utlui/attrdesc.cxx @@ -24,6 +24,7 @@ #include <vcl/GraphicObject.hxx> #include <editeng/itemtype.hxx> +#include <editeng/eerdll.hxx> #include <unotools/intlwrapper.hxx> #include <rtl/ustrbuf.hxx> #include <fmtanchr.hxx> @@ -236,7 +237,7 @@ bool SwFormatFrameSize::GetPresentation else { rText = rText + ::GetMetricText( GetWidth(), eCoreUnit, ePresUnit, &rIntl ) + - " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); + " " + ::EditResId( ::GetMetricId( ePresUnit ) ); } if ( ATT_VAR_SIZE != GetHeightSizeType() ) { @@ -251,7 +252,7 @@ bool SwFormatFrameSize::GetPresentation else { rText = ::GetMetricText( GetHeight(), eCoreUnit, ePresUnit, &rIntl ) + - " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); + " " + EditResId( ::GetMetricId( ePresUnit ) ); } } return true; @@ -351,7 +352,7 @@ bool SwFormatVertOrient::GetPresentation { rText = rText + SwResId( STR_POS_Y ) + " " + ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, &rIntl ) + - " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); + " " + EditResId( ::GetMetricId( ePresUnit ) ); } break; case text::VertOrientation::TOP: @@ -397,7 +398,7 @@ bool SwFormatHoriOrient::GetPresentation { rText = rText + SwResId( STR_POS_X ) + " " + ::GetMetricText( GetPos(), eCoreUnit, ePresUnit, &rIntl ) + - " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); + " " + EditResId( ::GetMetricId( ePresUnit ) ); } break; case text::HoriOrientation::RIGHT: diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index 1e370d9d26be..8c7c515796af 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -28,6 +28,8 @@ #include <unomid.h> #include <numrule.hxx> +#include <editeng/eerdll.hxx> + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -66,7 +68,7 @@ bool SwPageFootnoteInfoItem::GetPresentation { rText = SwResId( STR_MAX_FTN_HEIGHT ) + " " + ::GetMetricText( nHght, eCoreUnit, ePresUnit, &rIntl ) + " " + - ::GetSvxString( ::GetMetricId( ePresUnit ) ); + EditResId( ::GetMetricId( ePresUnit ) ); } return true; } |