[Libreoffice-commits] core.git: basic/qa basic/source include/basic
Noel Grandin
noel at peralex.com
Wed Jul 15 02:07:32 PDT 2015
basic/qa/cppunit/basictest.hxx | 5 -----
basic/source/classes/sbunoobj.cxx | 6 ++----
basic/source/inc/buffer.hxx | 1 -
basic/source/inc/errobject.hxx | 3 ---
basic/source/inc/expr.hxx | 6 ------
basic/source/inc/image.hxx | 1 -
basic/source/inc/parser.hxx | 2 --
basic/source/inc/runtime.hxx | 4 +---
basic/source/inc/sbunoobj.hxx | 6 +-----
basic/source/inc/scanner.hxx | 1 -
basic/source/inc/scriptcont.hxx | 3 ---
basic/source/inc/symtbl.hxx | 1 -
basic/source/runtime/dllmgr-x86.cxx | 2 +-
basic/source/sbx/sbxdec.hxx | 2 --
basic/source/uno/scriptcont.cxx | 29 -----------------------------
include/basic/basmgr.hxx | 10 ----------
include/basic/sbmeth.hxx | 1 -
include/basic/sbmod.hxx | 2 --
include/basic/sbstar.hxx | 7 -------
include/basic/sbx.hxx | 3 ---
include/basic/sbxcore.hxx | 5 -----
include/basic/sbxvar.hxx | 12 ------------
22 files changed, 5 insertions(+), 107 deletions(-)
New commits:
commit 22b094f5d8e1e82375b135abd3a6f99a9a555244
Author: Noel Grandin <noel at peralex.com>
Date: Tue Jul 14 14:50:07 2015 +0200
loplugin:unusedmethods basic
Change-Id: Iddfbde451088750f8c74f3ac72c35b5ccfbe0ab1
Reviewed-on: https://gerrit.libreoffice.org/17044
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index c3d16cf..1b9c634 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.hxx
@@ -138,11 +138,6 @@ class MacroSnippet
bool HasError() { return mbError; }
- void ResetError()
- {
- StarBASIC::SetGlobalErrorHdl( Link<StarBASIC*,bool>() );
- mbError = false;
- }
};
IMPL_LINK_TYPED( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 3d3dfbe..00f30ec 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -2537,12 +2537,10 @@ SbUnoMethod::SbUnoMethod
const OUString& aName_,
SbxDataType eSbxType,
Reference< XIdlMethod > xUnoMethod_,
- bool bInvocation,
- bool bDirect
+ bool bInvocation
)
: SbxMethod( aName_, eSbxType )
, mbInvocation( bInvocation )
- , mbDirectInvocation( bDirect )
{
m_xUnoMethod = xUnoMethod_;
pParamInfoSeq = NULL;
@@ -2760,7 +2758,7 @@ SbxVariable* SbUnoObject::Find( const OUString& rName, SbxClassType t )
Reference< XDirectInvocation > xDirectInvoke( mxInvocation, UNO_QUERY );
if ( xDirectInvoke.is() && xDirectInvoke->hasMember( aUName ) )
{
- SbxVariableRef xMethRef = new SbUnoMethod( aUName, SbxVARIANT, xDummyMethod, true, true );
+ SbxVariableRef xMethRef = new SbUnoMethod( aUName, SbxVARIANT, xDummyMethod, true );
QuickInsert( static_cast<SbxVariable*>(xMethRef) );
pRes = xMethRef;
}
diff --git a/basic/source/inc/buffer.hxx b/basic/source/inc/buffer.hxx
index 839af85..e94ba15 100644
--- a/basic/source/inc/buffer.hxx
+++ b/basic/source/inc/buffer.hxx
@@ -45,7 +45,6 @@ public:
bool operator += (sal_uInt32); // save integer
bool operator += (sal_Int32); // save integer
char* GetBuffer(); // give out buffer (delete yourself!)
- char* GetBufferPtr(){ return pBuf; }
sal_uInt32 GetSize() { return nOff; }
};
diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx
index 588a69e..e2c354e 100644
--- a/basic/source/inc/errobject.hxx
+++ b/basic/source/inc/errobject.hxx
@@ -31,9 +31,6 @@ class SbxErrObject : public SbUnoObject
SbxErrObject( const OUString& aName_, const com::sun::star::uno::Any& aUnoObj_ );
virtual ~SbxErrObject();
- class ErrObject* getImplErrObject()
- { return m_pErrObject; }
-
public:
static SbxVariableRef getErrObject();
static com::sun::star::uno::Reference< ooo::vba::XErrObject > getUnoErrObject();
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index d5fdfd5..0df0281 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -145,7 +145,6 @@ public:
const OUString& GetString() { return aStrVal; }
short GetNumber() { return (short)nVal; }
SbiExprList* GetParameters() { return aVar.pPar; }
- SbiExprListVector* GetMoreParameters() { return aVar.pvMorePar; }
void Optimize(SbiParser*); // tree matching
@@ -192,19 +191,15 @@ public:
void SetBased() { bBased = true; }
bool IsBased() { return bBased; }
void SetByVal() { bByVal = true; }
- bool IsByVal() { return bByVal; }
bool IsBracket() { return bBracket; }
bool IsValid() { return pExpr->IsValid(); }
- bool IsConstant() { return pExpr->IsConstant(); }
bool IsVariable() { return pExpr->IsVariable(); }
bool IsLvalue() { return pExpr->IsLvalue(); }
bool IsIntConstant() { return pExpr->IsIntConst(); }
const OUString& GetString() { return pExpr->GetString(); }
- SbiSymDef* GetVar() { return pExpr->GetVar(); }
SbiSymDef* GetRealVar() { return pExpr->GetRealVar(); }
SbiExprNode* GetExprNode() { return pExpr; }
SbxDataType GetType() { return pExpr->GetType(); }
- void SetType( SbxDataType eType){ pExpr->eType = eType; }
void Gen( RecursiveMode eRecMode = UNDEFINED );
};
@@ -249,7 +244,6 @@ class SbiDimList : public SbiExprList {
bool bConst; // true: everything integer constants
public:
SbiDimList( SbiParser* ); // parsing Ctor
- bool IsConstant() { return bConst; }
};
#endif
diff --git a/basic/source/inc/image.hxx b/basic/source/inc/image.hxx
index 0061a07..cc4b7de 100644
--- a/basic/source/inc/image.hxx
+++ b/basic/source/inc/image.hxx
@@ -86,7 +86,6 @@ public:
const char* GetCode() const { return pCode; }
sal_uInt32 GetCodeSize() const { return nCodeSize; }
- OUString& GetSource32() { return aOUSource; }
sal_uInt16 GetBase() const { return nDimBase; }
OUString GetString( short nId ) const;
const SbxObject* FindType (const OUString& aTypeName) const;
diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index 1d277b4..2245651 100644
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/inc/parser.hxx
@@ -99,9 +99,7 @@ public:
void Symbol( const KeywordSymbolInfo* pKeywordSymbolInfo = NULL ); // let or call
void ErrorStmnt(); // ERROR n
- void NotImp(); // not implemented
void BadBlock(); // LOOP/WEND/NEXT
- void BadSyntax(); // wrong SbiToken
void NoIf(); // ELSE/ELSE IF without IF
void Assign(); // LET
void Attribute();
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 0ab6183..8e7e884 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -346,7 +346,7 @@ class SbiRuntime
void StepLE(), StepGE(), StepIDIV(), StepAND();
void StepOR(), StepXOR(), StepEQV(), StepIMP();
void StepNOT(), StepCAT(), StepLIKE(), StepIS();
- void StepCLONE(), StepOLDBASED(), StepARGC();
+ void StepARGC();
void StepARGV(), StepINPUT(), StepLINPUT(), StepSTOP();
void StepGET(), StepSET(), StepVBASET(), StepPUT(), StepPUTC();
void StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, bool bDefaultHandling = false );
@@ -399,12 +399,10 @@ public:
void FatalError( SbError ); // error handling = standard, set error
void FatalError( SbError, const OUString& ); // error handling = standard, set error
static sal_Int32 translateErrorToVba( SbError nError, OUString& rMsg );
- void DumpPCode();
bool Step(); // single step (one opcode)
void Stop() { bRun = false; }
void block() { bBlocked = true; }
void unblock() { bBlocked = false; }
- SbMethod* GetMethod() { return pMeth; }
SbModule* GetModule() { return pMod; }
sal_uInt16 GetDebugFlags() { return nFlags; }
void SetDebugFlags( sal_uInt16 nFl ) { nFlags = nFl; }
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 879e0c0..21754c6 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -164,14 +164,12 @@ class SbUnoMethod : public SbxMethod
SbUnoMethod* pNext;
bool mbInvocation; // Method is based on invocation
- bool mbDirectInvocation; // Method should be used with XDirectInvocation interface
public:
TYPEINFO_OVERRIDE();
SbUnoMethod( const OUString& aName_, SbxDataType eSbxType, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > xUnoMethod_,
- bool bInvocation,
- bool bDirect = false );
+ bool bInvocation );
virtual ~SbUnoMethod();
virtual SbxInfo* GetInfo() SAL_OVERRIDE;
@@ -179,8 +177,6 @@ public:
bool isInvocationBased()
{ return mbInvocation; }
- bool needsDirectInvocation()
- { return mbDirectInvocation; }
};
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index 43bab7b..e499c25 100644
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -74,7 +74,6 @@ public:
bool IsCompatible() { return bCompatible; }
void SetCompatible( bool b ) { bCompatible = b; } // #118206
bool IsVBASupportOn() { return bVBASupportOn; }
- void SetVBASupportOn( bool b ) { bVBASupportOn = b; }
bool WhiteSpace() { return bSpaces; }
sal_Int32 GetErrors() { return nErrors; }
sal_Int32 GetLine() { return nLine; }
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 17f9c32..dd33cd0 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -82,9 +82,6 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas
// OldBasicPassword interface
virtual void setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword ) SAL_OVERRIDE;
- virtual OUString getLibraryPassword( const OUString& rLibraryName ) SAL_OVERRIDE;
- virtual void clearLibraryPassword( const OUString& rLibraryName ) SAL_OVERRIDE;
- virtual bool hasLibraryPassword( const OUString& rLibraryName ) SAL_OVERRIDE;
virtual const sal_Char* SAL_CALL getInfoFileName() const SAL_OVERRIDE;
virtual const sal_Char* SAL_CALL getOldInfoFileName() const SAL_OVERRIDE;
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index cc4fac5..bb8d1b7 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -122,7 +122,6 @@ public:
virtual void SetType( SbxDataType );
const OUString& GetName();
SbiSymScope GetScope() const;
- sal_uInt16 GetProcId() const{ return nProcId; }
sal_uInt32 GetAddr() const { return nChain; }
sal_uInt16 GetId() const { return nId; }
sal_uInt16 GetTypeId() const{ return nTypeId; }
diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx
index acc9cb5..0273018 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -326,7 +326,7 @@ SbError marshal(
case SbxDOUBLE:
case SbxBOOL:
case SbxBYTE:
- add(blob, variable->data(), 4, offset);
+ add(blob, variable->GetValues_Impl(), 4, offset);
break;
case SbxSTRING:
{
diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx
index 1bed80e..28d392e 100644
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -90,8 +90,6 @@ public:
bool getULong( sal_uInt32& rVal );
bool getSingle( float& rVal );
bool getDouble( double& rVal );
- bool getInt( int& rVal );
- bool getUInt( unsigned int& rVal );
bool getString( OUString& rString );
bool operator -= ( const SbxDecimal &r );
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 46620df..2142b03 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -98,35 +98,6 @@ void SfxScriptLibraryContainer::setLibraryPassword( const OUString& rLibraryName
catch(const NoSuchElementException& ) {}
}
-OUString SfxScriptLibraryContainer::getLibraryPassword( const OUString& rLibraryName )
-{
- SfxLibrary* pImplLib = getImplLib( rLibraryName );
- OUString aPassword;
- if( pImplLib->mbPasswordVerified )
- {
- aPassword = pImplLib->maPassword;
- }
- return aPassword;
-}
-
-void SfxScriptLibraryContainer::clearLibraryPassword( const OUString& rLibraryName )
-{
- try
- {
- SfxLibrary* pImplLib = getImplLib( rLibraryName );
- pImplLib->mbDoc50Password = false;
- pImplLib->mbPasswordProtected = false;
- pImplLib->maPassword.clear();
- }
- catch(const NoSuchElementException& ) {}
-}
-
-bool SfxScriptLibraryContainer::hasLibraryPassword( const OUString& rLibraryName )
-{
- SfxLibrary* pImplLib = getImplLib( rLibraryName );
- return pImplLib->mbPasswordProtected;
-}
-
// Ctor for service
SfxScriptLibraryContainer::SfxScriptLibraryContainer()
:maScriptLanguage( "StarBasic" )
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index 5f89a36..97a7e99 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -57,12 +57,6 @@ public:
BasicError( sal_uInt64 nId, BasicErrorReason nR, const OUString& rErrStr );
sal_uInt64 GetErrorId() const { return nErrorId; }
- BasicErrorReason GetReason() const { return nReason; }
- OUString GetErrorStr() { return aErrStr; }
-
- void SetErrorId( sal_uInt64 n ) { nErrorId = n; }
- void SetReason( BasicErrorReason n ) { nReason = n; }
- void SetErrorStr( const OUString& rStr) { aErrStr = rStr; }
};
class ErrorManager;
@@ -75,9 +69,6 @@ class BASIC_DLLPUBLIC OldBasicPassword
{
public:
virtual void setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword ) = 0;
- virtual OUString getLibraryPassword( const OUString& rLibraryName ) = 0;
- virtual void clearLibraryPassword( const OUString& rLibraryName ) = 0;
- virtual bool hasLibraryPassword( const OUString& rLibraryName ) = 0;
protected:
~OldBasicPassword() {}
@@ -130,7 +121,6 @@ private:
BASIC_DLLPRIVATE void Init();
protected:
- bool ImpLoadLibrary( BasicLibInfo* pLibInfo ) const;
bool ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, bool bInfosOnly = false );
void ImpCreateStdLib( StarBASIC* pParentFromStdLib );
void ImpMgrNotLoaded( const OUString& rStorageName );
diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx
index 70e61c6..2f0aab7 100644
--- a/include/basic/sbmeth.hxx
+++ b/include/basic/sbmeth.hxx
@@ -57,7 +57,6 @@ public:
SbxArray* GetStatics();
void ClearStatics();
SbModule* GetModule() { return pMod; }
- sal_uInt32 GetId() const { return nStart; }
sal_uInt16 GetDebugFlags() { return nDebugFlags; }
void SetDebugFlags( sal_uInt16 n ) { nDebugFlags = n; }
void GetLineRange( sal_uInt16&, sal_uInt16& );
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index 7b40b1f..18683b7 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -104,7 +104,6 @@ public:
const OUString& GetSource() const;
const OUString& GetSource32() const { return aOUSource;}
- const OUString& GetComment() const { return aComment; }
void SetSource32( const OUString& r );
bool Compile();
@@ -120,7 +119,6 @@ public:
// Store only image, no source (needed for new password protection)
bool StoreBinaryData( SvStream& );
bool StoreBinaryData( SvStream&, sal_uInt16 nVer );
- bool LoadBinaryData( SvStream&, sal_uInt16 nVer );
bool LoadBinaryData( SvStream& );
bool ExceedsLegacyModuleSize();
void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index 4f75dc6..0161f73 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -102,9 +102,6 @@ public:
virtual void Remove( SbxVariable* ) SAL_OVERRIDE;
virtual void Clear() SAL_OVERRIDE;
- BasicLibInfo* GetLibInfo() { return pLibInfo; }
- void SetLibInfo( BasicLibInfo* p ) { pLibInfo = p; }
-
// Compiler-Interface
SbModule* MakeModule( const OUString& rName, const OUString& rSrc );
SbModule* MakeModule32( const OUString& rName, const OUString& rSrc );
@@ -150,12 +147,8 @@ public:
static Link<StarBASIC*,bool> GetGlobalErrorHdl();
static void SetGlobalErrorHdl( const Link<StarBASIC*,bool>& rNewHdl );
- Link<StarBASIC*,bool> GetErrorHdl() const { return aErrorHdl; }
- void SetErrorHdl( const Link<StarBASIC*,bool>& r ) { aErrorHdl = r; }
static void SetGlobalBreakHdl( const Link<StarBASIC*,sal_uInt16>& rNewHdl );
- Link<StarBASIC*,sal_uInt16> GetBreakHdl() const { return aBreakHdl; }
- void SetBreakHdl( const Link<StarBASIC*,sal_uInt16>& r ) { aBreakHdl = r; }
SbxArrayRef getUnoListeners();
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 348435a..e6fb750 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -86,8 +86,6 @@ public:
sal_uInt32 GetHelpId() const { return nHelpId; }
void SetComment( const OUString& r ) { aComment = r; }
- void SetHelpFile( const OUString& r ) { aHelpFile = r; }
- void SetHelpId( sal_uInt32 nId ) { nHelpId = nId; }
};
class BASIC_DLLPUBLIC SbxHint : public SfxSimpleHint
@@ -254,7 +252,6 @@ public:
SbxStdCollection( const SbxStdCollection& );
SbxStdCollection& operator=( const SbxStdCollection& );
virtual void Insert( SbxVariable* ) SAL_OVERRIDE;
- const OUString& GetElementClass() const { return aElemClass; }
};
#ifndef SBX_ARRAY_DECL_DEFINED
diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx
index 98f9841..6ce2e2c 100644
--- a/include/basic/sbxcore.hxx
+++ b/include/basic/sbxcore.hxx
@@ -74,7 +74,6 @@ public:
inline bool CanRead() const;
inline bool CanWrite() const;
inline bool IsModified() const;
- inline bool IsConst() const;
inline bool IsHidden() const;
inline bool IsVisible() const;
@@ -90,7 +89,6 @@ public:
static void Skip( SvStream& );
bool Store( SvStream& );
virtual bool LoadCompleted();
- bool StoreCompleted();
static SbxError GetError();
static void SetError( SbxError );
@@ -134,9 +132,6 @@ inline bool SbxBase::CanWrite() const
inline bool SbxBase::IsModified() const
{ return IsSet( SBX_MODIFIED ); }
-inline bool SbxBase::IsConst() const
-{ return IsSet( SBX_CONST ); }
-
inline bool SbxBase::IsHidden() const
{ return IsSet( SBX_HIDDEN ); }
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 5ac8d73..9a69c8e 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -113,24 +113,14 @@ public:
bool IsInteger() const { return GetType() == SbxINTEGER ; }
bool IsLong() const { return GetType() == SbxLONG ; }
- bool IsSingle() const { return GetType() == SbxSINGLE ; }
bool IsDouble() const { return GetType() == SbxDOUBLE ; }
bool IsString() const { return GetType() == SbxSTRING ; }
- bool IsDate() const { return GetType() == SbxDATE ; }
bool IsCurrency() const { return GetType() == SbxCURRENCY ; }
bool IsObject() const { return GetType() == SbxOBJECT ; }
- bool IsDataObject() const { return GetType() == SbxDATAOBJECT; }
bool IsBool() const { return GetType() == SbxBOOL ; }
bool IsErr() const { return GetType() == SbxERROR ; }
bool IsEmpty() const { return GetType() == SbxEMPTY ; }
bool IsNull() const { return GetType() == SbxNULL ; }
- bool IsChar() const { return GetType() == SbxCHAR ; }
- bool IsByte() const { return GetType() == SbxBYTE ; }
- bool IsUShort() const { return GetType() == SbxUSHORT ; }
- bool IsULong() const { return GetType() == SbxULONG ; }
- bool IsInt() const { return GetType() == SbxINT ; }
- bool IsUInt() const { return GetType() == SbxUINT ; }
- bool IspChar() const { return GetType() == SbxLPSTR ; }
bool IsNumeric() const;
bool IsNumericRTL() const; // #41692 Interface for Basic
bool ImpIsNumeric( bool bOnlyIntntl ) const; // Implementation
@@ -144,8 +134,6 @@ public:
const SbxValues& GetValues_Impl() const { return aData; }
bool Put( const SbxValues& );
- inline SbxValues& data() { return aData; }
-
sal_Unicode GetChar() const;
sal_Int16 GetInteger() const;
sal_Int32 GetLong() const;
More information about the Libreoffice-commits
mailing list