From b2d2d72a7e401a4693cec9bbe12d8254e250ba70 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 24 Mar 2015 09:52:03 +0200 Subject: loplugin:constantfunction: basic Change-Id: I1c9a33cefb68bec978b2a922c2c3ef00f2a7a1b4 --- basic/source/basmgr/basmgr.cxx | 2 -- basic/source/classes/sbunoobj.cxx | 4 ---- basic/source/sbx/sbxbase.cxx | 7 +------ basic/source/sbx/sbxobj.cxx | 13 ------------- 4 files changed, 1 insertion(+), 25 deletions(-) (limited to 'basic') diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 224d1af368da..a1259178af96 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -2105,7 +2105,6 @@ sal_Bool DialogContainer_Impl::hasElements() { bool bRet = false; - mpLib->GetAll( SbxCLASS_OBJECT ); sal_Int16 nCount = mpLib->GetObjects()->Count(); for( sal_Int16 nObj = 0; nObj < nCount ; nObj++ ) { @@ -2142,7 +2141,6 @@ uno::Any DialogContainer_Impl::getByName( const OUString& aName ) uno::Sequence< OUString > DialogContainer_Impl::getElementNames() throw(uno::RuntimeException, std::exception) { - mpLib->GetAll( SbxCLASS_OBJECT ); sal_Int16 nCount = mpLib->GetObjects()->Count(); uno::Sequence< OUString > aRetSeq( nCount ); OUString* pRetSeq = aRetSeq.getArray(); diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index ac69ddcb606b..3557ed019768 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -2962,10 +2962,6 @@ void createAllObjectProperties( SbxObject* pObj ) { pUnoStructObj->createAllProperties(); } - else - { - pObj->GetAll( SbxCLASS_DONTCARE ); - } } diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index f13b4c9811d7..00728c6a8120 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -273,7 +273,7 @@ bool SbxBase::Store( SvStream& rStrm ) if( rStrm.GetError() != SVSTREAM_OK ) bRes = false; if( bRes ) - bRes = StoreCompleted(); + bRes = true; return bRes; } else @@ -305,11 +305,6 @@ bool SbxBase::LoadCompleted() return true; } -bool SbxBase::StoreCompleted() -{ - return true; -} - //////////////////////////////// SbxFactory SbxFactory::~SbxFactory() diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 46e37ba2f8d2..e57c42911a9c 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -180,10 +180,6 @@ bool SbxObject::IsClass( const OUString& rName ) const SbxVariable* SbxObject::FindUserData( sal_uInt32 nData ) { - if( !GetAll( SbxCLASS_DONTCARE ) ) - { - return NULL; - } SbxVariable* pRes = pMethods->FindUserData( nData ); if( !pRes ) { @@ -228,10 +224,6 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t ) ++nLvl; #endif - if( !GetAll( t ) ) - { - return NULL; - } SbxVariable* pRes = NULL; pObjs->SetFlag( SBX_EXTSEARCH ); if( t == SbxCLASS_DONTCARE ) @@ -743,11 +735,6 @@ void SbxObject::Dump( SvStream& rStrm, bool bFill ) { aIndent += " "; } - // if necessary complete the object - if ( bFill ) - { - GetAll( SbxCLASS_DONTCARE ); - } // Output the data of the object itself OString aNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US)); OString aClassNameStr(OUStringToOString(aClassName, RTL_TEXTENCODING_ASCII_US)); -- cgit