basic: preliminary cosmetic clean-up

parsing 1000s of line of code is hard enough without having to fight
with weird indentation and irregular formatting.

So as the review progress, in order to follow the code, cosmetic changes
were made...

In order to minimize the task of the reviewers and allow them to
concentrate on what matter, an effort is made to collect these
cosmetic changes into this separate commit.

Change-Id: I3c9b04a0150d0d0a048c2e976fe24de4f2b6b98a

11 files changed, 71 insertions, 71 deletions

diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index 6ff8a69bf0f2..f59b4149120c 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -55,13 +55,13 @@ public:
             BasicError( const BasicError& rErr );
             BasicError( sal_uIntPtr nId, sal_uInt16 nR, const OUString& rErrStr );
 
-    sal_uIntPtr     GetErrorId() const                  { return nErrorId; }
+    sal_uIntPtr GetErrorId() const                  { return nErrorId; }
     sal_uInt16  GetReason() const                   { return nReason; }
-    OUString  GetErrorStr()                       { return aErrStr; }
+    OUString    GetErrorStr()                       { return aErrStr; }
 
     void    SetErrorId( sal_uIntPtr n )             { nErrorId = n; }
     void    SetReason( sal_uInt16 n )               { nReason = n; }
-    void    SetErrorStr( const OUString& rStr)    { aErrStr = rStr; }
+    void    SetErrorStr( const OUString& rStr)      { aErrStr = rStr; }
 };
 
 class BasicLibs;
@@ -74,9 +74,9 @@ namespace basic { class BasicManagerCleaner; }
 class BASIC_DLLPUBLIC OldBasicPassword
 {
 public:
-    virtual void setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword ) = 0;
+    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 void     clearLibraryPassword( const OUString& rLibraryName ) = 0;
     virtual sal_Bool hasLibraryPassword( const OUString& rLibraryName ) = 0;
 
 protected:
@@ -122,8 +122,8 @@ private:
     BasicLibs*          pLibs;
     std::vector<BasicError> aErrors;
 
-    OUString              aName;
-    OUString              maStorageName;
+    OUString            aName;
+    OUString            maStorageName;
     bool                mbDocMgr;
 
     BasicManagerImpl*   mpImpl;
@@ -131,15 +131,15 @@ private:
     BASIC_DLLPRIVATE void Init();
 
 protected:
-    sal_Bool            ImpLoadLibrary( BasicLibInfo* pLibInfo ) const;
-    sal_Bool            ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, sal_Bool bInfosOnly = sal_False );
+    sal_Bool        ImpLoadLibrary( BasicLibInfo* pLibInfo ) const;
+    sal_Bool        ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, sal_Bool bInfosOnly = sal_False );
     void            ImpCreateStdLib( StarBASIC* pParentFromStdLib );
     void            ImpMgrNotLoaded(  const OUString& rStorageName  );
     BasicLibInfo*   CreateLibInfo();
     void            LoadBasicManager( SotStorage& rStorage, const OUString& rBaseURL, sal_Bool bLoadBasics = sal_True );
     void            LoadOldBasicManager( SotStorage& rStorage );
-    sal_Bool            ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const;
-    sal_Bool            ImplEncryptStream( SvStream& rStream ) const;
+    sal_Bool        ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const;
+    sal_Bool        ImplEncryptStream( SvStream& rStream ) const;
     BasicLibInfo*   FindLibInfo( StarBASIC* pBasic ) const;
     void            CheckModules( StarBASIC* pBasic, sal_Bool bReference ) const;
     ~BasicManager();
@@ -159,17 +159,17 @@ public:
     static void     LegacyDeleteBasicManager( BasicManager*& _rpManager );
 
     void            SetStorageName( const OUString& rName )   { maStorageName = rName; }
-    OUString          GetStorageName() const                  { return maStorageName; }
+    OUString        GetStorageName() const                  { return maStorageName; }
     void            SetName( const OUString& rName )          { aName = rName; }
-    OUString          GetName() const                         { return aName; }
+    OUString        GetName() const                         { return aName; }
 
 
-    sal_uInt16          GetLibCount() const;
+    sal_uInt16      GetLibCount() const;
     StarBASIC*      GetLib( sal_uInt16 nLib ) const;
     StarBASIC*      GetLib( const OUString& rName ) const;
-    sal_uInt16          GetLibId( const OUString& rName ) const;
+    sal_uInt16      GetLibId( const OUString& rName ) const;
 
-    OUString          GetLibName( sal_uInt16 nLib );
+    OUString        GetLibName( sal_uInt16 nLib );
 
     /** announces the library containers which belong to this BasicManager
 
@@ -183,11 +183,11 @@ public:
     const ::com::sun::star::uno::Reference< com::sun::star::script::XPersistentLibraryContainer >&
                     GetScriptLibraryContainer()  const;
 
-    sal_Bool            LoadLib( sal_uInt16 nLib );
-    sal_Bool            RemoveLib( sal_uInt16 nLib, sal_Bool bDelBasicFromStorage );
+    sal_Bool        LoadLib( sal_uInt16 nLib );
+    sal_Bool        RemoveLib( sal_uInt16 nLib, sal_Bool bDelBasicFromStorage );
 
     // Modify-Flag will be reset only during save.
-    sal_Bool            IsBasicModified() const;
+    sal_Bool        IsBasicModified() const;
 
     std::vector<BasicError>& GetErrors();
 
@@ -231,7 +231,7 @@ private:
     // For XML import/export:
     BASIC_DLLPRIVATE StarBASIC* CreateLib( const OUString& rLibName );
     BASIC_DLLPRIVATE StarBASIC* CreateLib( const OUString& rLibName, const OUString& Password,
-                               const OUString& LinkTargetURL );
+                                           const OUString& LinkTargetURL );
 };
 
 #endif  //_BASMGR_HXX
diff --git a/basic/inc/basic/modsizeexceeded.hxx b/basic/inc/basic/modsizeexceeded.hxx
index 83176f0a62ee..e736348e14a6 100644
--- a/basic/inc/basic/modsizeexceeded.hxx
+++ b/basic/inc/basic/modsizeexceeded.hxx
@@ -43,7 +43,7 @@ class BASIC_DLLPUBLIC ModuleSizeExceeded : public ::cppu::WeakImplHelper1< ::com
 
     // member
     private:
-    rtl::OUString m_sMods;
+    OUString m_sMods;
     com::sun::star::uno::Any m_aRequest;
     com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > m_lContinuations;
     com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > m_xAbort;
diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx
index 1d3409f802b6..2bc29cbb08c3 100644
--- a/basic/inc/basic/sbdef.hxx
+++ b/basic/inc/basic/sbdef.hxx
@@ -26,13 +26,13 @@
 
 // Returns type name for Basic type, array flag is ignored
 // implementation: basic/source/runtime/methods.cxx
-BASIC_DLLPUBLIC ::rtl::OUString getBasicTypeName( SbxDataType eType );
+BASIC_DLLPUBLIC OUString getBasicTypeName( SbxDataType eType );
 
 // Returns type name for Basic objects, especially
 // important for SbUnoObj instances
 // implementation: basic/source/classes/sbunoobj.cxx
 class SbxObject;
-BASIC_DLLPUBLIC ::rtl::OUString getBasicObjectTypeName( SbxObject* pObj );
+BASIC_DLLPUBLIC OUString getBasicObjectTypeName( SbxObject* pObj );
 
 // Allows Basic IDE to set watch mode to suppress errors
 // implementation: basic/source/runtime/runtime.cxx
@@ -52,8 +52,8 @@ BASIC_DLLPUBLIC void setBasicWatchMode( bool bOn );
 #define SBXID_JSCRIPTMOD    0x6a62          // jm: JavaScript Module
 #define SBXID_JSCRIPTMETH   0x6a64          // jm: JavaScript Module
 
-#define SBX_HINT_BASICSTART     SFX_HINT_USER04
-#define SBX_HINT_BASICSTOP      SFX_HINT_USER05
+#define SBX_HINT_BASICSTART SFX_HINT_USER04
+#define SBX_HINT_BASICSTOP  SFX_HINT_USER05
 
 enum PropertyMode
 {
diff --git a/basic/inc/basic/sbmeth.hxx b/basic/inc/basic/sbmeth.hxx
index 6963c0db288f..0f24d4a9800e 100644
--- a/basic/inc/basic/sbmeth.hxx
+++ b/basic/inc/basic/sbmeth.hxx
@@ -37,8 +37,8 @@ class BASIC_DLLPUBLIC SbMethod : public SbxMethod
     friend class SbJScriptMethod;
     friend class SbIfaceMapperMethod;
 
-    SbxVariable* mCaller;                   // caller
-    SbModule* pMod;
+    SbxVariable*  mCaller;                   // caller
+    SbModule*     pMod;
     sal_uInt16    nDebugFlags;
     sal_uInt16    nLine1, nLine2;
     sal_uInt32    nStart;
@@ -54,17 +54,17 @@ public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMETHOD,2);
     TYPEINFO();
     virtual SbxInfo* GetInfo();
-    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& );
+    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& );
 
     // Interface to execute a method from the applications
     virtual ErrCode Call( SbxValue* pRet = NULL,  SbxVariable* pCaller = NULL );
-    virtual void Broadcast( sal_uIntPtr nHintId );
+    virtual void    Broadcast( sal_uIntPtr nHintId );
 };
 
 SV_DECL_IMPL_REF(SbMethod)
diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index 464ebf2ca227..7d32abc41f09 100644
--- a/basic/inc/basic/sbmod.hxx
+++ b/basic/inc/basic/sbmod.hxx
@@ -74,15 +74,15 @@ protected:
     SbProcedureProperty* GetProcedureProperty( const String&, SbxDataType );
     SbIfaceMapperMethod* GetIfaceMapperMethod( const String&, SbMethod* );
     void            EndDefinitions( sal_Bool=sal_False );
-    sal_uInt16          Run( SbMethod* );
+    sal_uInt16      Run( SbMethod* );
     void            RunInit();
     void            ClearPrivateVars();
     void            ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic );
     void            GlobalRunInit( bool bBasicStart );  // for all modules
     void            GlobalRunDeInit( void );
-    const sal_uInt8*    FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16& ) const;
-    const sal_uInt8*    FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16&,
-                        sal_Bool bFollowJumps, const SbiImage* pImg=NULL ) const;
+    const sal_uInt8* FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16& ) const;
+    const sal_uInt8* FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16&,
+                                    sal_Bool bFollowJumps, const SbiImage* pImg=NULL ) const;
     virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
     virtual sal_Bool StoreData( SvStream& ) const;
     virtual sal_Bool LoadCompleted();
@@ -109,27 +109,27 @@ public:
     virtual sal_Bool    IsCompiled() const;
     const SbxObject* FindType( String aTypeName ) const;
 
-    virtual sal_Bool    IsBreakable( sal_uInt16 nLine ) const;
-    virtual size_t  GetBPCount() const;
-    virtual sal_uInt16  GetBP( size_t n ) const;
-    virtual sal_Bool    IsBP( sal_uInt16 nLine ) const;
-    virtual sal_Bool    SetBP( sal_uInt16 nLine );
-    virtual sal_Bool    ClearBP( sal_uInt16 nLine );
-    virtual void    ClearAllBP();
+    virtual sal_Bool IsBreakable( sal_uInt16 nLine ) const;
+    virtual size_t   GetBPCount() const;
+    virtual sal_uInt16 GetBP( size_t n ) const;
+    virtual sal_Bool IsBP( sal_uInt16 nLine ) const;
+    virtual sal_Bool SetBP( sal_uInt16 nLine );
+    virtual sal_Bool ClearBP( sal_uInt16 nLine );
+    virtual void     ClearAllBP();
 
     // Lines of Subs
     virtual SbMethod*   GetFunctionForLine( sal_uInt16 );
 
     // Store only image, no source (needed for new password protection)
-       sal_Bool StoreBinaryData( SvStream& );
-       sal_Bool StoreBinaryData( SvStream&, sal_uInt16 nVer );
+    sal_Bool StoreBinaryData( SvStream& );
+    sal_Bool StoreBinaryData( SvStream&, sal_uInt16 nVer );
     sal_Bool LoadBinaryData( SvStream&, sal_uInt16 nVer );
     sal_Bool LoadBinaryData( SvStream& );
     sal_Bool ExceedsLegacyModuleSize();
-    void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
-    bool HasExeCode();
-    bool IsVBACompat() const;
-    void SetVBACompat( bool bCompat );
+    void     fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
+    bool     HasExeCode();
+    bool     IsVBACompat() const;
+    void     SetVBACompat( bool bCompat );
     sal_Int32 GetModuleType() { return mnType; }
     void SetModuleType( sal_Int32 nType ) { mnType = nType; }
     bool isProxyModule() { return bIsProxyModule; }
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index cffd4ad70645..af3fa605381b 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -134,9 +134,9 @@ public:
     void            ClearAllModuleVars( void );
 
     // Calls for error and break handler
-    static sal_uInt16   GetLine();
-    static sal_uInt16   GetCol1();
-    static sal_uInt16   GetCol2();
+    static sal_uInt16 GetLine();
+    static sal_uInt16 GetCol1();
+    static sal_uInt16 GetCol2();
     static void     SetErrorData( SbError nCode, sal_uInt16 nLine,
                                   sal_uInt16 nCol1, sal_uInt16 nCol2 );
 
diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index 30dac56c42d1..f6e924ef096e 100644
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -68,7 +68,7 @@ class BASIC_DLLPUBLIC SbxInfo : public SvRefBase
 
     String          aComment;
     String          aHelpFile;
-    sal_uInt32          nHelpId;
+    sal_uInt32      nHelpId;
     SbxParams       aParams;
 
 protected:
@@ -209,8 +209,8 @@ public:
     void   AddDim32( sal_Int32, sal_Int32 );
     void   unoAddDim32( sal_Int32, sal_Int32 );
     sal_Bool   GetDim32( sal_Int32, sal_Int32&, sal_Int32& ) const;
-        bool hasFixedSize() { return mbHasFixedSize; };
-        void setHasFixedSize( bool bHasFixedSize ) {mbHasFixedSize = bHasFixedSize; };
+    bool hasFixedSize() { return mbHasFixedSize; };
+    void setHasFixedSize( bool bHasFixedSize ) {mbHasFixedSize = bHasFixedSize; };
 };
 
 class BASIC_DLLPUBLIC SbxCollection : public SbxObject
diff --git a/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx
index 37142a9c865f..7b088bedda1e 100644
--- a/basic/inc/basic/sbxbase.hxx
+++ b/basic/inc/basic/sbxbase.hxx
@@ -39,7 +39,7 @@ struct SbxAppData
     SbxBasicFormater    *pBasicFormater;    // Pointer to Format()-Command helper class
 
     LanguageType        eBasicFormaterLangType;
-        // It might be useful to store this class 'global' because some string reosurces are saved here
+    // It might be useful to store this class 'global' because some string reosurces are saved here
 
     SbxAppData() : eSbxError( SbxERR_OK ), aFacs(), pBasicFormater( NULL ) {}
     ~SbxAppData();
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index e1ff9be77923..ce86fd695e0e 100644
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -68,10 +68,10 @@ protected:
     SBX_DECL_PERSIST(0,0,0);
 public:
     TYPEINFO();
-    inline void     SetFlags( sal_uInt16 n );
+    inline void         SetFlags( sal_uInt16 n );
     inline sal_uInt16   GetFlags() const;
-    inline void     SetFlag( sal_uInt16 n );
-    inline void     ResetFlag( sal_uInt16 n );
+    inline void         SetFlag( sal_uInt16 n );
+    inline void         ResetFlag( sal_uInt16 n );
     inline sal_Bool     IsSet( sal_uInt16 n ) const;
     inline sal_Bool     IsReset( sal_uInt16 n ) const;
     inline sal_Bool     CanRead() const;
@@ -81,17 +81,17 @@ public:
     inline sal_Bool     IsHidden() const;
     inline sal_Bool     IsVisible() const;
 
-    virtual sal_Bool IsFixed() const;
-    virtual void SetModified( sal_Bool );
+    virtual sal_Bool    IsFixed() const;
+    virtual void        SetModified( sal_Bool );
 
-    virtual SbxDataType  GetType()  const;
+    virtual SbxDataType GetType()  const;
     virtual SbxClassType GetClass() const;
 
     virtual void Clear();
 
     static SbxBase* Load( SvStream& );
-    static void Skip( SvStream& );
-    sal_Bool Store( SvStream& );
+    static void     Skip( SvStream& );
+    sal_Bool        Store( SvStream& );
     virtual sal_Bool LoadCompleted();
     virtual sal_Bool StoreCompleted();
 
diff --git a/basic/inc/basic/sbxprop.hxx b/basic/inc/basic/sbxprop.hxx
index 8b3bdb90d1f8..34e58778bf39 100644
--- a/basic/inc/basic/sbxprop.hxx
+++ b/basic/inc/basic/sbxprop.hxx
@@ -32,7 +32,7 @@ public:
     SbxProperty( const SbxProperty& r ) : SvRefBase( r ), SbxVariable( r ) {}
     virtual ~SbxProperty();
     SbxProperty& operator=( const SbxProperty& r )
-    { SbxVariable::operator=( r ); return *this; }
+        { SbxVariable::operator=( r ); return *this; }
     virtual SbxClassType GetClass() const;
 };
 
diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index 8bbd87b4871b..c02c2a1fabfd 100644
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -167,8 +167,8 @@ public:
 
     SbxBase*    GetObject() const;
     sal_uInt8   GetByte() const;
-    sal_uInt16 GetUShort() const;
-    sal_uInt32 GetULong() const;
+    sal_uInt16  GetUShort() const;
+    sal_uInt32  GetULong() const;
 
     sal_Bool PutInteger( sal_Int16 );
     sal_Bool PutLong( sal_Int32 );
@@ -293,7 +293,7 @@ class BASIC_DLLPUBLIC SbxVariable : public SbxValue
     SfxBroadcaster*  pCst;              // Broadcaster, if needed
     String           maName;            // Name, if available
     SbxArrayRef      mpPar;             // Parameter-Array, if set
-    sal_uInt16           nHash;             // Hash-ID for search
+    sal_uInt16       nHash;             // Hash-ID for search
 
     BASIC_DLLPRIVATE SbxVariableImpl* getImpl( void );