[Libreoffice-commits] core.git: editeng/source include/editeng sw/source

[Gabor Kelemen]

 editeng/source/items/itemtype.cxx   |    5 -----
 include/editeng/itemtype.hxx        |    1 -
 sw/source/uibase/utlui/attrdesc.cxx |    9 +++++----
 sw/source/uibase/utlui/uiitems.cxx  |    4 +++-
 4 files changed, 8 insertions(+), 11 deletions(-)

New commits:
commit ef7f8c263fcb2bac596aa0247f1e54ff375c3146
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Thu Apr 19 00:12:33 2018 +0200

    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 at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx
index 1fd3d600933b..78b31841869a 100644
--- a/editeng/source/items/itemtype.cxx
+++ b/editeng/source/items/itemtype.cxx
@@ -134,11 +134,6 @@ OUString GetMetricText( long nVal, MapUnit eSrcUnit, MapUnit eDestUnit, const In
     return sRet.makeStringAndClear();
 }
 
-OUString GetSvxString(const char* pId)
-{
-    return EditResId(pId);
-}
-
 OUString GetColorString( const Color& rCol )
 {
     if (rCol == COL_AUTO)
diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx
index 586e29a6361c..25525490ca69 100644
--- a/include/editeng/itemtype.hxx
+++ b/include/editeng/itemtype.hxx
@@ -31,7 +31,6 @@ class IntlWrapper;
 
 static const sal_Unicode cpDelim[] = { ',' , ' ', '\0' };
 
-EDITENG_DLLPUBLIC OUString GetSvxString(const char* pId);
 EDITENG_DLLPUBLIC OUString GetMetricText( long nVal, MapUnit eSrcUnit, MapUnit eDestUnit, const IntlWrapper * pIntl );
 OUString GetColorString( const Color& rCol );
 EDITENG_DLLPUBLIC const char* GetMetricId(MapUnit eUnit);
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;
 }