diff options
Diffstat (limited to 'svl/source/items/ctypeitm.cxx')
| -rw-r--r-- | svl/source/items/ctypeitm.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index 576071b56e1c..184b692eaad9 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -35,8 +35,8 @@ //============================================================================ // The following defines are copied from chaos/source/items/cstritem.cxx: -#define CNTSTRINGITEM_STREAM_MAGIC ( (UINT32)0xfefefefe ) -#define CNTSTRINGITEM_STREAM_SEEKREL (-( (long)( sizeof( UINT32 ) ) ) ) +#define CNTSTRINGITEM_STREAM_MAGIC ( (sal_uInt32)0xfefefefe ) +#define CNTSTRINGITEM_STREAM_SEEKREL (-( (long)( sizeof( sal_uInt32 ) ) ) ) //============================================================================ // @@ -56,14 +56,14 @@ CntContentTypeItem::CntContentTypeItem() } //---------------------------------------------------------------------------- -CntContentTypeItem::CntContentTypeItem( USHORT which, const XubString& rType ) +CntContentTypeItem::CntContentTypeItem( sal_uInt16 which, const XubString& rType ) : CntUnencodedStringItem( which, rType ), _eType( CONTENT_TYPE_NOT_INIT ) { } //---------------------------------------------------------------------------- -CntContentTypeItem::CntContentTypeItem( USHORT which, +CntContentTypeItem::CntContentTypeItem( sal_uInt16 which, const INetContentType eType ) : CntUnencodedStringItem( which, INetContentTypes::GetContentType( eType ) ), _eType( eType ) @@ -80,7 +80,7 @@ CntContentTypeItem::CntContentTypeItem( const CntContentTypeItem& rOrig ) //============================================================================ // virtual -USHORT CntContentTypeItem::GetVersion(USHORT) const +sal_uInt16 CntContentTypeItem::GetVersion(sal_uInt16) const { return 1; // because it uses SfxPoolItem::read/writeUnicodeString() } @@ -88,17 +88,17 @@ USHORT CntContentTypeItem::GetVersion(USHORT) const //---------------------------------------------------------------------------- // virtual SfxPoolItem* CntContentTypeItem::Create( SvStream& rStream, - USHORT nItemVersion ) const + sal_uInt16 nItemVersion ) const { // CntContentTypeItem used to be derived from CntStringItem, so take that // into account: UniString aValue; readUnicodeString(rStream, aValue, nItemVersion >= 1); - UINT32 nMagic = 0; + sal_uInt32 nMagic = 0; rStream >> nMagic; if (nMagic == CNTSTRINGITEM_STREAM_MAGIC) { - BOOL bEncrypted = FALSE; + sal_Bool bEncrypted = sal_False; rStream >> bEncrypted; DBG_ASSERT(!bEncrypted, "CntContentTypeItem::Create() reads encrypted data"); @@ -111,12 +111,12 @@ SfxPoolItem* CntContentTypeItem::Create( SvStream& rStream, //---------------------------------------------------------------------------- // virtual -SvStream & CntContentTypeItem::Store(SvStream & rStream, USHORT) const +SvStream & CntContentTypeItem::Store(SvStream & rStream, sal_uInt16) const { // CntContentTypeItem used to be derived from CntStringItem, so take that // into account: writeUnicodeString(rStream, GetValue()); - rStream << CNTSTRINGITEM_STREAM_MAGIC << BOOL(FALSE); + rStream << CNTSTRINGITEM_STREAM_MAGIC << sal_Bool(sal_False); return rStream; } @@ -223,7 +223,7 @@ void CntContentTypeItem::SetValue( const INetContentType eType ) //---------------------------------------------------------------------------- // virtual -BOOL CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const +sal_Bool CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal,sal_uInt8 ) const { rVal <<= rtl::OUString(GetValue()); return true; @@ -231,7 +231,7 @@ BOOL CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const //---------------------------------------------------------------------------- // virtual -BOOL CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE ) +sal_Bool CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal,sal_uInt8 ) { rtl::OUString aValue; if ( rVal >>= aValue ) |