From 1690b84015b7fa882076d6fb7d79e1959e467544 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue, 18 Oct 2016 15:27:34 +0200
Subject: loplugin:expandablemethodds in reportdesign..sal

Change-Id: Idb133e442b881d263fcb83a4858c4a08b451c0f0
Reviewed-on: https://gerrit.libreoffice.org/30032
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 rsc/inc/rscdb.hxx             | 1 -
 rsc/inc/rscdef.hxx            | 1 -
 rsc/source/parser/rscibas.cxx | 5 -----
 rsc/source/parser/rscinit.cxx | 2 +-
 rsc/source/tools/rscdef.cxx   | 2 +-
 5 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'rsc')

diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index c4663c41f1aa..715a88f2a94e 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -151,7 +151,6 @@ class RscTypCont
     inline void SETCONST( RscConst *p1, Atom p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
     inline void SETCONST( RscConst *p1, const char * p2, SfxStyleFamily p3 ) { SETCONST(p1, p2, static_cast<sal_uInt16>(p3)); }
     inline void SETCONST( RscConst *p1, const char * p2, MapUnit p3 ) { SETCONST(p1, p2, static_cast<sal_uInt16>(p3)); }
-    void        InitLangType();
     RscEnum *   InitFieldUnitsType();
     RscEnum *   InitColor();
     RscEnum *   InitMapUnit();
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index c9a2f9e6af45..a4f7708c63e2 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -136,7 +136,6 @@ protected:
     void        IncRef(){ nRefCount++; }
     void        DecRef();
     void        DefineToNumber();
-    void        SetName(const OString& rNewName) { m_aName = rNewName; }
 
     using StringNode::Search;
 public:
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index e035ea97405d..d632ebdf3187 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -165,11 +165,6 @@ Atom RscLangEnum::AddLanguage( const char* pLang, RscNameTable& rNames )
     return nResult;
 }
 
-void RscTypCont::InitLangType()
-{
-    aLangType.Init( aNmTb );
-}
-
 RscEnum * RscTypCont::InitFieldUnitsType()
 {
     RscEnum * pFieldUnits;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 78126c4d948b..735acef364fd 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -233,7 +233,7 @@ void RscTypCont::Init()
     aWinBits.SetConstant( nStdPopupId, sal::static_int_cast<sal_Int32>(WB_STDPOPUP) );
 }
 {
-    InitLangType();
+    aLangType.Init( aNmTb );
     aBaseLst.push_back( pFieldUnits      = InitFieldUnitsType() );
     aBaseLst.push_back( pColor           = InitColor() );
     aBaseLst.push_back( pMapUnit         = InitMapUnit() );
diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx
index 5bf4eae70644..9beb17e4d5f8 100644
--- a/rsc/source/tools/rscdef.cxx
+++ b/rsc/source/tools/rscdef.cxx
@@ -154,7 +154,7 @@ void RscDefine::DefineToNumber()
 {
     delete pExp;
     pExp = nullptr;
-    SetName(OString::number(lId));
+    m_aName = OString::number(lId);
 }
 
 void RscDefine::Evaluate()
-- 
cgit