2 files changed, 2 insertions, 9 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 58e683438814..b47c3a864104 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1390,11 +1390,8 @@ void StarBASIC::QuitAndExitApplication()
 void StarBASIC::Stop()
 {
     SbiInstance* p = GetSbData()->pInst;
-    while( p )
-    {
+    if( p )
         p->Stop();
-        p = p->pNext;
-    }
 }
 
 bool StarBASIC::IsRunning()
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 198f14eb9420..8d24420bdd4d 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3715,17 +3715,13 @@ static SbUnoServiceCtor* pFirstCtor = nullptr;
 void clearUnoServiceCtors()
 {
     SbUnoServiceCtor* pCtor = pFirstCtor;
-    while( pCtor )
-    {
+    if( pCtor )
         pCtor->SbxValue::Clear();
-        pCtor = pCtor->pNext;
-    }
 }
 
 SbUnoServiceCtor::SbUnoServiceCtor( const OUString& aName_, Reference< XServiceConstructorDescription > const & xServiceCtorDesc )
     : SbxMethod( aName_, SbxOBJECT )
     , m_xServiceCtorDesc( xServiceCtorDesc )
-    , pNext(nullptr)
 {
 }