1 files changed, 11 insertions, 11 deletions

diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx
index 387dc4c7caa5..867cf6e2bd07 100644..100755
--- a/basic/inc/basic/sbxobj.hxx
+++ b/basic/inc/basic/sbxobj.hxx
@@ -43,9 +43,9 @@ class SbxObject : public SbxVariable, public SfxListener
 {
     SbxObjectImpl* mpSbxObjectImpl; // Impl data
 
-    SbxArray* FindVar( SbxVariable*, USHORT& );
+    SbxArray* FindVar( SbxVariable*, sal_uInt16& );
     // AB 23.3.1997, special method for VCPtrRemove (see below)
-    SbxArray* VCPtrFindVar( SbxVariable*, USHORT& );
+    SbxArray* VCPtrFindVar( SbxVariable*, sal_uInt16& );
 protected:
     SbxArrayRef  pMethods;                  // Methods
     SbxArrayRef  pProps;                    // Properties
@@ -53,8 +53,8 @@ protected:
     SbxProperty* pDfltProp;                 // Default-Property
     String       aClassName;                // Classname
     String       aDfltPropName;
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
     virtual ~SbxObject();
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
@@ -68,7 +68,7 @@ public:
     virtual SbxClassType GetClass() const;
     virtual void Clear();
 
-    virtual BOOL  IsClass( const String& ) const;
+    virtual sal_Bool  IsClass( const String& ) const;
     const String& GetClassName() const { return aClassName; }
     void          SetClassName( const String &rNew ) { aClassName = rNew; }
     // Default-Property
@@ -76,15 +76,15 @@ public:
     void SetDfltProperty( const String& r );
     void SetDfltProperty( SbxProperty* );
     // Search for an element
-    virtual SbxVariable* FindUserData( UINT32 nUserData );
+    virtual SbxVariable* FindUserData( sal_uInt32 nUserData );
     virtual SbxVariable* Find( const String&, SbxClassType );
     SbxVariable* FindQualified( const String&, SbxClassType );
     // Quick-Call-Interface for Methods
-    virtual BOOL Call( const String&, SbxArray* = NULL );
+    virtual sal_Bool Call( const String&, SbxArray* = NULL );
     // Execution of DDE-Commands
     SbxVariable* Execute( const String& );
     // Manage elements
-    virtual BOOL GetAll( SbxClassType ) { return TRUE; }
+    virtual sal_Bool GetAll( SbxClassType ) { return sal_True; }
     SbxVariable* Make( const String&, SbxClassType, SbxDataType );
     virtual SbxObject* MakeObject( const String&, const String& );
     virtual void Insert( SbxVariable* );
@@ -97,7 +97,7 @@ public:
     virtual void Remove( SbxVariable* );
     // AB 23.3.1997, deletion per pointer for controls (duplicate names!)
     void VCPtrRemove( SbxVariable* );
-    void SetPos( SbxVariable*, USHORT );
+    void SetPos( SbxVariable*, sal_uInt16 );
 
     // Macro-Recording
     virtual String GenerateSource( const String &rLinePrefix,
@@ -109,9 +109,9 @@ public:
     // Hooks
     virtual SvDispatch* GetSvDispatch();
     // Debugging
-    void Dump( SvStream&, BOOL bDumpAll=FALSE );
+    void Dump( SvStream&, sal_Bool bDumpAll=sal_False );
 
-    static void GarbageCollection( ULONG nObjects = 0 /* ::= all */ );
+    static void GarbageCollection( sal_uIntPtr nObjects = 0 /* ::= all */ );
 };
 
 #ifndef __SBX_SBXOBJECTREF_HXX