From 7b5fac67fd2441778cb9a6d2f529adc270998144 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 22 Jun 2017 14:50:10 +0200 Subject: loplugin:unusedfields in accessibility..comphelper Change-Id: Ifb68d65fc3e48dd80e3ff2b7a4124468fdda1695 Reviewed-on: https://gerrit.libreoffice.org/39137 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- basic/source/basmgr/basmgr.cxx | 4 ---- basic/source/classes/sb.cxx | 1 - basic/source/comp/parser.cxx | 3 --- basic/source/inc/iosys.hxx | 3 +-- basic/source/inc/parser.hxx | 1 - basic/source/runtime/iosys.cxx | 9 +++------ 6 files changed, 4 insertions(+), 17 deletions(-) (limited to 'basic') diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 47d09e629a44..2b71f0439003 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -342,7 +342,6 @@ private: bool bDoLoad; bool bReference; - bool bPasswordVerified; // Lib represents library in new UNO library container uno::Reference< script::XLibraryContainer > mxScriptCont; @@ -381,7 +380,6 @@ public: const OUString& GetPassword() const { return aPassword; } void SetPassword( const OUString& rNewPassword ) { aPassword = rNewPassword; } - void SetPasswordVerified() { bPasswordVerified = true; } static BasicLibInfo* Create( SotStorageStream& rSStream ); @@ -395,7 +393,6 @@ public: BasicLibInfo::BasicLibInfo() { bReference = false; - bPasswordVerified = false; bDoLoad = false; mxScriptCont = nullptr; aStorageName = szImbedded; @@ -601,7 +598,6 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo ) { pOldBasicPassword->setLibraryPassword( pLib->GetName(), rpBasLibInfo->GetPassword() ); - rpBasLibInfo->SetPasswordVerified(); } } } diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 4a37061eafd4..e72136234e21 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -915,7 +915,6 @@ StarBASIC::StarBASIC( StarBASIC* p, bool bIsDocBasic ) : SbxObject("StarBASIC"), bDocBasic( bIsDocBasic ) { SetParent( p ); - pLibInfo = nullptr; bNoRtl = bBreak = false; bVBAEnabled = false; diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx index 45e1b49c9537..0347e0eccd62 100644 --- a/basic/source/comp/parser.cxx +++ b/basic/source/comp/parser.cxx @@ -122,7 +122,6 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm ) pStack = nullptr; pWithVar = nullptr; nBase = 0; - bText = bGblDefs = bNewGblDefs = bSingleLineIf = @@ -788,11 +787,9 @@ void SbiParser::Option() SbiToken eTok = Next(); if( eTok == BINARY ) { - bText = false; } else if( eTok == SYMBOL && GetSym().equalsIgnoreAsciiCase("text") ) { - bText = true; } else { diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx index d13da0ee0014..4bed2e20160c 100644 --- a/basic/source/inc/iosys.hxx +++ b/basic/source/inc/iosys.hxx @@ -54,14 +54,13 @@ class SbiStream sal_uInt64 nLine; short nLen; // buffer length SbiStreamFlags nMode; - short nChan; ErrCode nError; void MapError(); public: SbiStream(); ~SbiStream(); - ErrCode Open( short, const OString&, StreamMode, SbiStreamFlags, short ); + ErrCode Open( const OString&, StreamMode, SbiStreamFlags, short ); ErrCode Close(); ErrCode Read(OString&, sal_uInt16 = 0, bool bForceReadingPerByte=false); ErrCode Read( char& ); diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx index e81ce3b50c29..a2138283bb22 100644 --- a/basic/source/inc/parser.hxx +++ b/basic/source/inc/parser.hxx @@ -70,7 +70,6 @@ public: SbiCodeGen aGen; // Code-Generator SbiSymPool* pPool; short nBase; // OPTION BASE-value - bool bText; // OPTION COMPARE TEXT bool bExplicit; // true: OPTION EXPLICIT bool bClassModule; // true: OPTION ClassModule StringVector aIfaceVector; // Holds all interfaces implemented by a class module diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index fca1a1c17cc7..dce5777e14af 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -126,7 +126,6 @@ SbiStream::SbiStream() , nLine(0) , nLen(0) , nMode(SbiStreamFlags::NONE) - , nChan(0) , nError(0) { } @@ -449,11 +448,10 @@ void UCBStream::SetSize( sal_uInt64 nSize ) ErrCode SbiStream::Open -( short nCh, const OString& rName, StreamMode nStrmMode, SbiStreamFlags nFlags, short nL ) +( const OString& rName, StreamMode nStrmMode, SbiStreamFlags nFlags, short nL ) { nMode = nFlags; nLen = nL; - nChan = nCh; nLine = 0; nExpandOnWriteTo = 0; if( ( nStrmMode & ( StreamMode::READ|StreamMode::WRITE ) ) == StreamMode::READ ) @@ -522,7 +520,6 @@ ErrCode SbiStream::Close() MapError(); pStrm.reset(); } - nChan = 0; return nError; } @@ -674,8 +671,8 @@ void SbiIoSystem::Open(short nCh, const OString& rName, StreamMode nMode, SbiStr } else { - pChan[ nCh ] = new SbiStream; - nError = pChan[ nCh ]->Open( nCh, rName, nMode, nFlags, nLen ); + pChan[ nCh ] = new SbiStream; + nError = pChan[ nCh ]->Open( rName, nMode, nFlags, nLen ); if( nError ) { delete pChan[ nCh ]; -- cgit