summaryrefslogtreecommitdiff
path: root/basic/inc/basic/sbxcore.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'basic/inc/basic/sbxcore.hxx')
-rw-r--r--basic/inc/basic/sbxcore.hxx104
1 files changed, 52 insertions, 52 deletions
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index 83e474521cc2..b4e80a49f168 100644
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -45,30 +45,30 @@ class UniString;
// This version of the Macros does not define Load/StorePrivateData()-methods
#define SBX_DECL_PERSIST_NODATA( nCre, nSbxId, nVer ) \
- virtual UINT32 GetCreator() const { return nCre; } \
- virtual UINT16 GetVersion() const { return nVer; } \
- virtual UINT16 GetSbxId() const { return nSbxId; }
+ virtual sal_uInt32 GetCreator() const { return nCre; } \
+ virtual sal_uInt16 GetVersion() const { return nVer; } \
+ virtual sal_uInt16 GetSbxId() const { return nSbxId; }
#define SBX_DECL_PERSIST_NODATA_() \
- virtual UINT32 GetCreator() const; \
- virtual UINT16 GetVersion() const; \
- virtual UINT16 GetSbxId() const;
+ virtual sal_uInt32 GetCreator() const; \
+ virtual sal_uInt16 GetVersion() const; \
+ virtual sal_uInt16 GetSbxId() const;
// This version of the macro defines Load/StorePrivateData()-methods
#define SBX_DECL_PERSIST( nCre, nSbxId, nVer ) \
- virtual BOOL LoadPrivateData( SvStream&, USHORT ); \
- virtual BOOL StorePrivateData( SvStream& ) const; \
+ virtual sal_Bool LoadPrivateData( SvStream&, sal_uInt16 ); \
+ virtual sal_Bool StorePrivateData( SvStream& ) const; \
SBX_DECL_PERSIST_NODATA( nCre, nSbxId, nVer )
#define SBX_DECL_PERSIST_() \
- virtual BOOL LoadPrivateData( SvStream&, USHORT ); \
- virtual BOOL StorePrivateData( SvStream& ) const; \
+ virtual sal_Bool LoadPrivateData( SvStream&, sal_uInt16 ); \
+ virtual sal_Bool StorePrivateData( SvStream& ) const; \
SBX_DECL_PERSIST_NODATA_()
#define SBX_IMPL_PERSIST( C, nCre, nSbxId, nVer ) \
- UINT32 C::GetCreator() const { return nCre; } \
- UINT16 C::GetVersion() const { return nVer; } \
- UINT16 C::GetSbxId() const { return nSbxId; }
+ sal_uInt32 C::GetCreator() const { return nCre; } \
+ sal_uInt16 C::GetVersion() const { return nVer; } \
+ sal_uInt16 C::GetSbxId() const { return nSbxId; }
class SbxBase;
class SbxFactory;
@@ -82,10 +82,10 @@ class SbxBase : virtual public SvRefBase
{
SbxBaseImpl* mpSbxBaseImpl; // Impl data
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
protected:
- USHORT nFlags; // Flag-Bits
+ sal_uInt16 nFlags; // Flag-Bits
SbxBase();
SbxBase( const SbxBase& );
@@ -94,21 +94,21 @@ protected:
SBX_DECL_PERSIST(0,0,0);
public:
TYPEINFO();
- inline void SetFlags( USHORT n );
- inline USHORT GetFlags() const;
- inline void SetFlag( USHORT n );
- inline void ResetFlag( USHORT n );
- inline BOOL IsSet( USHORT n ) const;
- inline BOOL IsReset( USHORT n ) const;
- inline BOOL CanRead() const;
- inline BOOL CanWrite() const;
- inline BOOL IsModified() const;
- inline BOOL IsConst() const;
- inline BOOL IsHidden() const;
- inline BOOL IsVisible() const;
-
- virtual BOOL IsFixed() const;
- virtual void SetModified( BOOL );
+ inline void SetFlags( sal_uInt16 n );
+ inline sal_uInt16 GetFlags() const;
+ 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;
+ inline sal_Bool CanWrite() const;
+ inline sal_Bool IsModified() const;
+ inline sal_Bool IsConst() const;
+ inline sal_Bool IsHidden() const;
+ inline sal_Bool IsVisible() const;
+
+ virtual sal_Bool IsFixed() const;
+ virtual void SetModified( sal_Bool );
virtual SbxDataType GetType() const;
virtual SbxClassType GetClass() const;
@@ -117,24 +117,24 @@ public:
static SbxBase* Load( SvStream& );
static void Skip( SvStream& );
- BOOL Store( SvStream& );
- virtual BOOL LoadCompleted();
- virtual BOOL StoreCompleted();
+ sal_Bool Store( SvStream& );
+ virtual sal_Bool LoadCompleted();
+ virtual sal_Bool StoreCompleted();
static SbxError GetError();
static void SetError( SbxError );
- static BOOL IsError();
+ static sal_Bool IsError();
static void ResetError();
// Set the factory for Load/Store/Create
static void AddFactory( SbxFactory* );
static void RemoveFactory( SbxFactory* );
- static SbxBase* Create( UINT16, UINT32=SBXCR_SBX );
+ static SbxBase* Create( sal_uInt16, sal_uInt32=SBXCR_SBX );
static SbxObject* CreateObject( const String& );
// Sbx solution as replacement for SfxBroadcaster::Enable()
- static void StaticEnableBroadcasting( BOOL bEnable );
- static BOOL StaticIsEnabledBroadcasting( void );
+ static void StaticEnableBroadcasting( sal_Bool bEnable );
+ static sal_Bool StaticIsEnabledBroadcasting( void );
};
#ifndef SBX_BASE_DECL_DEFINED
@@ -142,40 +142,40 @@ public:
SV_DECL_REF(SbxBase)
#endif
-inline void SbxBase::SetFlags( USHORT n )
+inline void SbxBase::SetFlags( sal_uInt16 n )
{ DBG_CHKTHIS( SbxBase, 0 ); nFlags = n; }
-inline USHORT SbxBase::GetFlags() const
+inline sal_uInt16 SbxBase::GetFlags() const
{ DBG_CHKTHIS( SbxBase, 0 ); return nFlags; }
-inline void SbxBase::SetFlag( USHORT n )
+inline void SbxBase::SetFlag( sal_uInt16 n )
{ DBG_CHKTHIS( SbxBase, 0 ); nFlags |= n; }
-inline void SbxBase::ResetFlag( USHORT n )
+inline void SbxBase::ResetFlag( sal_uInt16 n )
{ DBG_CHKTHIS( SbxBase, 0 ); nFlags &= ~n; }
-inline BOOL SbxBase::IsSet( USHORT n ) const
-{ DBG_CHKTHIS( SbxBase, 0 ); return BOOL( ( nFlags & n ) != 0 ); }
+inline sal_Bool SbxBase::IsSet( sal_uInt16 n ) const
+{ DBG_CHKTHIS( SbxBase, 0 ); return sal_Bool( ( nFlags & n ) != 0 ); }
-inline BOOL SbxBase::IsReset( USHORT n ) const
-{ DBG_CHKTHIS( SbxBase, 0 ); return BOOL( ( nFlags & n ) == 0 ); }
+inline sal_Bool SbxBase::IsReset( sal_uInt16 n ) const
+{ DBG_CHKTHIS( SbxBase, 0 ); return sal_Bool( ( nFlags & n ) == 0 ); }
-inline BOOL SbxBase::CanRead() const
+inline sal_Bool SbxBase::CanRead() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_READ ); }
-inline BOOL SbxBase::CanWrite() const
+inline sal_Bool SbxBase::CanWrite() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_WRITE ); }
-inline BOOL SbxBase::IsModified() const
+inline sal_Bool SbxBase::IsModified() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_MODIFIED ); }
-inline BOOL SbxBase::IsConst() const
+inline sal_Bool SbxBase::IsConst() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_CONST ); }
-inline BOOL SbxBase::IsHidden() const
+inline sal_Bool SbxBase::IsHidden() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_HIDDEN ); }
-inline BOOL SbxBase::IsVisible() const
+inline sal_Bool SbxBase::IsVisible() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsReset( SBX_INVISIBLE ); }
#endif