Remove some #include "tools/list.hxx"

Plus some trailing whitespace cleanup

5 files changed, 23 insertions, 28 deletions

diff --git a/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx
index 45ed25cd89..abf2f77895 100644
--- a/basic/inc/basic/sbxbase.hxx
+++ b/basic/inc/basic/sbxbase.hxx
@@ -30,7 +30,6 @@
 #define _SBXBASE_HXX
 
 #include <i18npool/lang.h>
-#include "tools/list.hxx"
 #include "svl/svarray.hxx"
 #include <basic/sbxdef.hxx>
 
diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index 162f20a126..6538399a28 100644
--- a/basic/inc/pch/precompiled_basic.hxx
+++ b/basic/inc/pch/precompiled_basic.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -213,7 +213,6 @@
 #include "tools/fsys.hxx"
 #include "tools/gen.hxx"
 #include "tools/link.hxx"
-#include "tools/list.hxx"
 #include "tools/rc.hxx"
 #include "tools/rcid.h"
 #include "tools/ref.hxx"
diff --git a/basic/source/app/brkpnts.cxx b/basic/source/app/brkpnts.cxx
index b89f649004..e4d69c6537 100644
--- a/basic/source/app/brkpnts.cxx
+++ b/basic/source/app/brkpnts.cxx
@@ -28,7 +28,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basic.hxx"
-#include <tools/list.hxx>
 #include <basic/sbx.hxx>
 #include <basic/sbmod.hxx>
 #include <basic/sbstar.hxx>
diff --git a/basic/source/app/dialogs.hxx b/basic/source/app/dialogs.hxx
index 48d2d8ccaf..30d513a702 100644
--- a/basic/source/app/dialogs.hxx
+++ b/basic/source/app/dialogs.hxx
@@ -38,7 +38,6 @@
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
 #include <tools/config.hxx>
-#include <tools/list.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index d15f93241a..0fb6f0f957 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,6 @@
 #include <tools/stream.hxx>
 #include <tools/errinf.hxx>
 #include <basic/sbx.hxx>
-#include <tools/list.hxx>
 #include <tools/shl.hxx>
 #include <tools/rc.hxx>
 #include <vcl/svapp.hxx>
@@ -76,7 +75,7 @@ using com::sun::star::lang::XMultiServiceFactory;
 SbxObject* StarBASIC::getVBAGlobals( )
 {
     if ( !pVBAGlobals )
-    {	
+    {
         Any aThisDoc;
         if ( GetUNOConstant("ThisComponent", aThisDoc) )
         {
@@ -387,13 +386,13 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj )
                         pDest->AddDim32( lb, ub );
                     }
                 }
-                else 
+                else
                     pDest->unoAddDim( 0, -1 ); // variant array
 
                 USHORT nSavFlags = pVar->GetFlags();
                 pNewProp->ResetFlag( SBX_FIXED );
-                // need to reset the FIXED flag 
-                // when calling PutObject ( because the type will not match Object ) 	
+                // need to reset the FIXED flag
+                // when calling PutObject ( because the type will not match Object )
                 pNewProp->PutObject( pDest );
                 pNewProp->SetFlags( nSavFlags );
             }
@@ -490,7 +489,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
         }
     }
 
-    // Copy SbIfaceMapperMethod in a second step to ensure that 
+    // Copy SbIfaceMapperMethod in a second step to ensure that
     // the corresponding base methods have already been copied
     for( i = 0 ; i < nMethodCount ; i++ )
     {
@@ -515,7 +514,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
                 DBG_ERROR( "Found no ImplMethod copy" );
                 continue;
             }
-            SbIfaceMapperMethod* pNewIfaceMethod = 
+            SbIfaceMapperMethod* pNewIfaceMethod =
                 new SbIfaceMapperMethod( pIfaceMethod->GetName(), pImplMethodCopy );
             pMethods->PutDirect( pNewIfaceMethod, i );
         }
@@ -598,7 +597,7 @@ SbClassModuleObject::~SbClassModuleObject()
     if( StarBASIC::IsRunning() )
         triggerTerminateEvent();
 
-    // Must be deleted by base class dtor because this data 
+    // Must be deleted by base class dtor because this data
     // is not owned by the SbClassModuleObject object
     pImage = NULL;
     pBreaks = NULL;
@@ -669,7 +668,7 @@ SbClassData::SbClassData( void )
 
 void SbClassData::clear( void )
 {
-    mxIfaces->Clear(); 
+    mxIfaces->Clear();
     maRequiredTypes.clear();
 }
 
@@ -836,7 +835,7 @@ SbModule* StarBASIC::MakeModule32( const String& rName, const ::rtl::OUString& r
 }
 SbModule* StarBASIC::MakeModule32( const String& rName, const ModuleInfo& mInfo, const rtl::OUString& rSrc )
 {
-    
+
     OSL_TRACE("create module %s type mInfo %d", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr(), mInfo.ModuleType );
     SbModule* p = NULL;
     switch ( mInfo.ModuleType )
@@ -856,7 +855,7 @@ SbModule* StarBASIC::MakeModule32( const String& rName, const ModuleInfo& mInfo,
         break;
         default:
             p = new SbModule( rName, isVBAEnabled() );
-            
+
     }
     p->SetSource32( rSrc );
     p->SetParent( this );
@@ -1002,7 +1001,7 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
         if(	!pModule->IsCompiled() )
             pModule->Compile();
     }
-    // compile modules first then RunInit ( otherwise there is 
+    // compile modules first then RunInit ( otherwise there is
     // can be order dependency, e.g. classmodule A has a member
     // of of type classmodule B and classmodule B hasn't been compiled yet )
 
@@ -1347,7 +1346,7 @@ USHORT StarBASIC::GetVBErrorCode( SbError nError )
                 nRet = 0;
         }
     }
-    
+
     // search loop
     const SFX_VB_ErrorItem* pErrItem;
     USHORT nIndex = 0;
@@ -1558,7 +1557,7 @@ BOOL StarBASIC::RTError( SbError code, const String& rMsg, USHORT l, USHORT c1,
     {
         // very confusing, even though MakeErrorText sets up the error text
         // seems that this is not used ( if rMsg already has content )
-        // In the case of VBA MakeErrorText also formats the error to be alittle more 
+        // In the case of VBA MakeErrorText also formats the error to be alittle more
         // like vba ( adds an error number etc )
         if ( SbiRuntime::isVBAEnabled() && ( code == SbERR_BASIC_COMPAT ) )
         {
@@ -1783,7 +1782,7 @@ BasicCollection::BasicCollection( const XubString& rClass )
         nRemoveHash = MakeHashCode( String::CreateFromAscii( pRemoveStr ) );
     }
     Initialize();
-    
+
 }
 
 BasicCollection::~BasicCollection()
@@ -1811,18 +1810,18 @@ void BasicCollection::Initialize()
     p->SetFlag( SBX_DONTSTORE );
     p = Make( String::CreateFromAscii( pRemoveStr ), SbxCLASS_METHOD, SbxEMPTY );
     p->SetFlag( SBX_DONTSTORE );
-    if ( !xAddInfo.Is() ) 
+    if ( !xAddInfo.Is() )
     {
         xAddInfo = new SbxInfo;
-        xAddInfo->AddParam(  String( RTL_CONSTASCII_USTRINGPARAM("Item") ), SbxVARIANT, SBX_READ );	
-        xAddInfo->AddParam(  String( RTL_CONSTASCII_USTRINGPARAM("Key") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL );	
-        xAddInfo->AddParam(  String( RTL_CONSTASCII_USTRINGPARAM("Before") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL );	
-        xAddInfo->AddParam(  String( RTL_CONSTASCII_USTRINGPARAM("After") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL );	
+        xAddInfo->AddParam(  String( RTL_CONSTASCII_USTRINGPARAM("Item") ), SbxVARIANT, SBX_READ );
+        xAddInfo->AddParam(  String( RTL_CONSTASCII_USTRINGPARAM("Key") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL );
+        xAddInfo->AddParam(  String( RTL_CONSTASCII_USTRINGPARAM("Before") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL );
+        xAddInfo->AddParam(  String( RTL_CONSTASCII_USTRINGPARAM("After") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL );
     }
-    if ( !xItemInfo.Is() ) 
+    if ( !xItemInfo.Is() )
     {
         xItemInfo = new SbxInfo;
-        xItemInfo->AddParam(  String( RTL_CONSTASCII_USTRINGPARAM("Index") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL);	
+        xItemInfo->AddParam(  String( RTL_CONSTASCII_USTRINGPARAM("Index") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL);
     }
 }