loplugin:expandablemethodds in include/basic..comphelper

Change-Id: I1aa9c12e8839325a9fd98530abc89a3d586ff62e
Reviewed-on: https://gerrit.libreoffice.org/30120
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 6 insertions, 12 deletions

diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index d541d448df3b..e34daa01fb75 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1420,7 +1420,7 @@ SbMethod* StarBASIC::GetActiveMethod( sal_uInt16 nLevel )
 
 SbModule* StarBASIC::GetActiveModule()
 {
-    if( GetSbData()->pInst && !IsCompilerError() )
+    if( GetSbData()->pInst && !GetSbData()->bCompilerError )
     {
         return GetSbData()->pInst->GetActiveModule();
     }
@@ -1471,7 +1471,6 @@ sal_uInt16 StarBASIC::GetCol2()     { return GetSbData()->nCol2; }
 // Specific to error handler
 SbError StarBASIC::GetErrorCode()       { return GetSbData()->nCode; }
 const OUString& StarBASIC::GetErrorText() { return GetSbData()->aErrMsg; }
-bool StarBASIC::IsCompilerError()       { return GetSbData()->bCompiler; }
 
 // From 1996-03-29:
 // The mapping between the old and the new error codes take place by searching
@@ -1667,7 +1666,7 @@ bool StarBASIC::CError( SbError code, const OUString& rMsg,
         code = (SbError)*new StringErrorInfo( code, rMsg );
     }
     SetErrorData( code, l, c1, c2 );
-    GetSbData()->bCompiler = true;
+    GetSbData()->bCompilerError = true;
     bool bRet;
     if( GetSbData()->aErrHdl.IsSet() )
     {
@@ -1677,7 +1676,7 @@ bool StarBASIC::CError( SbError code, const OUString& rMsg,
     {
         bRet = ErrorHdl();
     }
-    GetSbData()->bCompiler = false;     // only true for error handler
+    GetSbData()->bCompilerError = false;     // only true for error handler
     return bRet;
 }
 
diff --git a/basic/source/classes/sbintern.cxx b/basic/source/classes/sbintern.cxx
index 26b02161d2bf..20cbf6f9db6a 100644
--- a/basic/source/classes/sbintern.cxx
+++ b/basic/source/classes/sbintern.cxx
@@ -49,7 +49,7 @@ SbiGlobals::SbiGlobals()
     nCode = 0;
     nLine = 0;
     nCol1 = nCol2 = 0;
-    bCompiler = false;
+    bCompilerError = false;
     bGlobalInitErr = false;
     bRunInit = false;
     pTransliterationWrapper = nullptr;
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index a0ebd19a6c33..03ce05a3b2ac 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -94,7 +94,7 @@ struct SbiGlobals
     SbError         nCode;
     sal_Int32       nLine;
     sal_Int32       nCol1,nCol2;    // from... to...
-    bool            bCompiler;      // flag for compiler error
+    bool            bCompilerError; // flag for compiler error
     bool            bGlobalInitErr;
     bool            bRunInit;       // true, if RunInit active from the Basic
     OUString        aErrMsg;        // buffer for GetErrorText()
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 2183d16ad38e..1c9352368517 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -192,11 +192,6 @@ void SbxValue::Broadcast( sal_uInt32 )
 // If the variable contain a variable or an object, this will be
 // addressed.
 
-SbxValue* SbxValue::TheRealValue() const
-{
-    return TheRealValue( true );
-}
-
 SbxValue* SbxValue::TheRealValue( bool bObjInObjError ) const
 {
     SbxValue* p = const_cast<SbxValue*>(this);
@@ -286,7 +281,7 @@ bool SbxValue::Get( SbxValues& rRes ) const
         // If an object or a VARIANT is requested, don't search the real values
         SbxValue* p = const_cast<SbxValue*>(this);
         if( rRes.eType != SbxOBJECT && rRes.eType != SbxVARIANT )
-            p = TheRealValue();
+            p = TheRealValue( true );
         if( p )
         {
             p->Broadcast( SBX_HINT_DATAWANTED );