diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-04 15:23:50 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-04 17:02:43 +0100 |
commit | b92ca447f89a74add22bc09ca8570d5327069677 (patch) | |
tree | 6334eaf271e637307c9a87906c99b48bfdbac249 /svl/source/items | |
parent | 3f9bf0a9aeb91b1211a5659044ab1eb22da9be7c (diff) |
Convert all Query/Put Value() to bool
Diffstat (limited to 'svl/source/items')
-rw-r--r-- | svl/source/items/cenumitm.cxx | 8 | ||||
-rw-r--r-- | svl/source/items/cintitem.cxx | 40 | ||||
-rw-r--r-- | svl/source/items/cntwall.cxx | 8 | ||||
-rw-r--r-- | svl/source/items/ctypeitm.cxx | 4 | ||||
-rw-r--r-- | svl/source/items/custritm.cxx | 4 | ||||
-rw-r--r-- | svl/source/items/dateitem.cxx | 10 | ||||
-rw-r--r-- | svl/source/items/globalnameitem.cxx | 10 | ||||
-rw-r--r-- | svl/source/items/ilstitem.cxx | 8 | ||||
-rw-r--r-- | svl/source/items/imageitm.cxx | 10 | ||||
-rw-r--r-- | svl/source/items/intitem.cxx | 10 | ||||
-rw-r--r-- | svl/source/items/lckbitem.cxx | 12 | ||||
-rw-r--r-- | svl/source/items/poolitem.cxx | 8 | ||||
-rw-r--r-- | svl/source/items/ptitem.cxx | 10 | ||||
-rw-r--r-- | svl/source/items/rectitem.cxx | 12 | ||||
-rw-r--r-- | svl/source/items/slstitm.cxx | 10 | ||||
-rw-r--r-- | svl/source/items/srchitem.cxx | 10 | ||||
-rw-r--r-- | svl/source/items/szitem.cxx | 10 | ||||
-rw-r--r-- | svl/source/items/visitem.cxx | 10 |
18 files changed, 97 insertions, 97 deletions
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index c5e1a09ec324..da8b52234485 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -70,7 +70,7 @@ SfxEnumItemInterface::GetPresentation(SfxItemPresentation, SfxMapUnit, //============================================================================ // virtual -BOOL SfxEnumItemInterface::QueryValue(com::sun::star::uno::Any& rVal, BYTE) +bool SfxEnumItemInterface::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const { rVal <<= sal_Int32(GetEnumValue()); @@ -79,7 +79,7 @@ BOOL SfxEnumItemInterface::QueryValue(com::sun::star::uno::Any& rVal, BYTE) //============================================================================ // virtual -BOOL SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal, +bool SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal, BYTE) { sal_Int32 nTheValue = 0; @@ -233,7 +233,7 @@ SfxItemPresentation CntBoolItem::GetPresentation(SfxItemPresentation, //============================================================================ // virtual -BOOL CntBoolItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const +bool CntBoolItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const { rVal <<= sal_Bool(m_bValue); return true; @@ -241,7 +241,7 @@ BOOL CntBoolItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const //============================================================================ // virtual -BOOL CntBoolItem::PutValue(const com::sun::star::uno::Any& rVal, BYTE) +bool CntBoolItem::PutValue(const com::sun::star::uno::Any& rVal, BYTE) { sal_Bool bTheValue = sal_Bool(); if (rVal >>= bTheValue) diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index dd22ab757fe7..2d735e8e0201 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -87,26 +87,26 @@ SfxItemPresentation CntByteItem::GetPresentation(SfxItemPresentation, //============================================================================ // virtual -BOOL CntByteItem::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const +bool CntByteItem::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const { sal_Int8 nValue = m_nValue; rVal <<= nValue; - return TRUE; + return true; } //============================================================================ // virtual -BOOL CntByteItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE) +bool CntByteItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE) { sal_Int8 nValue = sal_Int8(); if (rVal >>= nValue) { m_nValue = nValue; - return TRUE; + return true; } DBG_ERROR( "CntByteItem::PutValue - Wrong type!" ); - return FALSE; + return false; } //============================================================================ @@ -222,27 +222,27 @@ SfxItemPresentation CntUInt16Item::GetPresentation(SfxItemPresentation, //============================================================================ // virtual -BOOL CntUInt16Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const +bool CntUInt16Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const { sal_Int32 nValue = m_nValue; rVal <<= nValue; - return TRUE; + return true; } //============================================================================ // virtual -BOOL CntUInt16Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE) +bool CntUInt16Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE) { sal_Int32 nValue = 0; if (rVal >>= nValue) { DBG_ASSERT( nValue <= USHRT_MAX, "Overflow in UInt16 value!"); m_nValue = (sal_uInt16)nValue; - return TRUE; + return true; } DBG_ERROR( "CntUInt16Item::PutValue - Wrong type!" ); - return FALSE; + return false; } //============================================================================ @@ -354,26 +354,26 @@ SfxItemPresentation CntInt32Item::GetPresentation(SfxItemPresentation, //============================================================================ // virtual -BOOL CntInt32Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const +bool CntInt32Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const { sal_Int32 nValue = m_nValue; rVal <<= nValue; - return TRUE; + return true; } //============================================================================ // virtual -BOOL CntInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE) +bool CntInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE) { sal_Int32 nValue = 0; if (rVal >>= nValue) { m_nValue = nValue; - return TRUE; + return true; } DBG_ERROR( "CntInt32Item::PutValue - Wrong type!" ); - return FALSE; + return false; } //============================================================================ @@ -487,28 +487,28 @@ SfxItemPresentation CntUInt32Item::GetPresentation(SfxItemPresentation, //============================================================================ // virtual -BOOL CntUInt32Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const +bool CntUInt32Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const { sal_Int32 nValue = m_nValue; DBG_ASSERT( nValue>=0, "Overflow in UInt32 value!"); rVal <<= nValue; - return TRUE; + return true; } //============================================================================ // virtual -BOOL CntUInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE) +bool CntUInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE) { sal_Int32 nValue = 0; if (rVal >>= nValue) { DBG_ASSERT( nValue>=0, "Overflow in UInt32 value!"); m_nValue = nValue; - return TRUE; + return true; } DBG_ERROR( "CntUInt32Item::PutValue - Wrong type!" ); - return FALSE; + return false; } //============================================================================ diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index 56632c675d01..4ccb1443dc16 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -150,18 +150,18 @@ SfxPoolItem* CntWallpaperItem::Clone( SfxItemPool* ) const //---------------------------------------------------------------------------- // virtual -BOOL CntWallpaperItem::QueryValue( com::sun::star::uno::Any&,BYTE ) const +bool CntWallpaperItem::QueryValue( com::sun::star::uno::Any&,BYTE ) const { DBG_ERROR("Not implemented!"); - return FALSE; + return false; } //---------------------------------------------------------------------------- // virtual -BOOL CntWallpaperItem::PutValue( const com::sun::star::uno::Any&,BYTE ) +bool CntWallpaperItem::PutValue( const com::sun::star::uno::Any&,BYTE ) { DBG_ERROR("Not implemented!"); - return FALSE; + return false; } diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index 576071b56e1c..77f3871de04e 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -223,7 +223,7 @@ void CntContentTypeItem::SetValue( const INetContentType eType ) //---------------------------------------------------------------------------- // virtual -BOOL CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const +bool CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) 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 ) +bool CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE ) { rtl::OUString aValue; if ( rVal >>= aValue ) diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index 9d192cc7e7b8..9497ff11e90f 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -106,7 +106,7 @@ CntUnencodedStringItem::GetPresentation(SfxItemPresentation, SfxMapUnit, //============================================================================ // virtual -BOOL CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE) +bool CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const { rVal <<= rtl::OUString(m_aValue); @@ -115,7 +115,7 @@ BOOL CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE) //============================================================================ // virtual -BOOL CntUnencodedStringItem::PutValue(const com::sun::star::uno::Any& rVal, +bool CntUnencodedStringItem::PutValue(const com::sun::star::uno::Any& rVal, BYTE) { rtl::OUString aTheValue; diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx index 27170c1d4f6e..fcd969e886cf 100644 --- a/svl/source/items/dateitem.cxx +++ b/svl/source/items/dateitem.cxx @@ -174,7 +174,7 @@ SfxItemPresentation SfxDateTimeItem::GetPresentation //---------------------------------------------------------------------------- // virtual -BOOL SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal, +bool SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ) { nMemberId &= ~CONVERT_TWIPS; @@ -188,16 +188,16 @@ BOOL SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal, aValue.Minutes, aValue.Seconds, aValue.HundredthSeconds ) ); - return TRUE; + return true; } DBG_ERROR( "SfxDateTimeItem::PutValue - Wrong type!" ); - return FALSE; + return false; } //---------------------------------------------------------------------------- // virtual -BOOL SfxDateTimeItem::QueryValue( com::sun::star::uno::Any& rVal, +bool SfxDateTimeItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -209,7 +209,7 @@ BOOL SfxDateTimeItem::QueryValue( com::sun::star::uno::Any& rVal, aDateTime.GetMonth(), aDateTime.GetYear() ); rVal <<= aValue; - return TRUE; + return true; } // ----------------------------------------------------------------------- diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index a0ebd97c89b6..e19bf894b344 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -80,7 +80,7 @@ SfxPoolItem* SfxGlobalNameItem::Clone(SfxItemPool *) const //---------------------------------------------------------------------------- // virtual -BOOL SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) +bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) { com::sun::star::uno::Reference < com::sun::star::script::XTypeConverter > xConverter ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")), @@ -94,21 +94,21 @@ BOOL SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) if ( aSeq.getLength() == 16 ) { m_aName.MakeFromMemory( (void*) aSeq.getConstArray() ); - return TRUE; + return true; } DBG_ERROR( "SfxGlobalNameItem::PutValue - Wrong type!" ); - return FALSE; + return true; } //---------------------------------------------------------------------------- // virtual -BOOL SfxGlobalNameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const +bool SfxGlobalNameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const { com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 ); void* pData = ( void* ) &m_aName.GetCLSID(); memcpy( aSeq.getArray(), pData, 16 ); rVal <<= aSeq; - return TRUE; + return true; } diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx index 691fa7d131be..6b31877a24e3 100644 --- a/svl/source/items/ilstitem.cxx +++ b/svl/source/items/ilstitem.cxx @@ -75,7 +75,7 @@ SfxPoolItem* SfxIntegerListItem::Clone( SfxItemPool * ) const return new SfxIntegerListItem( *this ); } -BOOL SfxIntegerListItem::PutValue ( const com::sun::star::uno::Any& rVal, BYTE ) +bool SfxIntegerListItem::PutValue ( const com::sun::star::uno::Any& rVal, BYTE ) { ::com::sun::star::uno::Reference < ::com::sun::star::script::XTypeConverter > xConverter ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")), @@ -84,16 +84,16 @@ BOOL SfxIntegerListItem::PutValue ( const com::sun::star::uno::Any& rVal, BYTE try { aNew = xConverter->convertTo( rVal, ::getCppuType((const ::com::sun::star::uno::Sequence < sal_Int32 >*)0) ); } catch (::com::sun::star::uno::Exception&) { - return FALSE; + return true; } return ( aNew >>= m_aList ); } -BOOL SfxIntegerListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const +bool SfxIntegerListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const { rVal <<= m_aList; - return TRUE; + return true; } void SfxIntegerListItem::GetList( SvULongs& rList ) const diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx index 88c3daa137dc..9c87f62d1dfb 100644 --- a/svl/source/items/imageitm.cxx +++ b/svl/source/items/imageitm.cxx @@ -87,7 +87,7 @@ int SfxImageItem::operator==( const SfxPoolItem& rItem ) const return( ((SfxImageItem&) rItem).GetValue() == GetValue() && (*pImp == *(((SfxImageItem&)rItem).pImp) ) ); } -BOOL SfxImageItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const +bool SfxImageItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const { ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSeq( 4 ); aSeq[0] = ::com::sun::star::uno::makeAny( GetValue() ); @@ -96,10 +96,10 @@ BOOL SfxImageItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const aSeq[3] = ::com::sun::star::uno::makeAny( rtl::OUString( pImp->aURL )); rVal = ::com::sun::star::uno::makeAny( aSeq ); - return TRUE; + return true; } -BOOL SfxImageItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) +bool SfxImageItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) { ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSeq; if (( rVal >>= aSeq ) && ( aSeq.getLength() == 4 )) @@ -112,10 +112,10 @@ BOOL SfxImageItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) aSeq[2] >>= pImp->bMirrored; if ( aSeq[3] >>= aURL ) pImp->aURL = aURL; - return TRUE; + return true; } - return FALSE; + return false; } void SfxImageItem::SetRotation( long nValue ) diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 0342af15e8cb..4729b5e1afd8 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -111,26 +111,26 @@ SfxItemPresentation SfxInt16Item::GetPresentation(SfxItemPresentation, //============================================================================ // virtual -BOOL SfxInt16Item::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const +bool SfxInt16Item::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const { sal_Int16 nValue = m_nValue; rVal <<= nValue; - return TRUE; + return true; } //============================================================================ // virtual -BOOL SfxInt16Item::PutValue(const com::sun::star::uno::Any& rVal, BYTE ) +bool SfxInt16Item::PutValue(const com::sun::star::uno::Any& rVal, BYTE ) { sal_Int16 nValue = sal_Int16(); if (rVal >>= nValue) { m_nValue = nValue; - return TRUE; + return true; } DBG_ERROR( "SfxInt16Item::PutValue - Wrong type!" ); - return FALSE; + return false; } //============================================================================ diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index f1845fc251ee..140d9bcf8b49 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -137,7 +137,7 @@ SvStream& SfxLockBytesItem::Store(SvStream &rStream, USHORT ) const //---------------------------------------------------------------------------- // virtual -BOOL SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) +bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) { com::sun::star::uno::Sequence< sal_Int8 > aSeq; if ( rVal >>= aSeq ) @@ -153,16 +153,16 @@ BOOL SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) else _xVal = NULL; - return TRUE; + return true; } DBG_ERROR( "SfxLockBytesItem::PutValue - Wrong type!" ); - return FALSE; + return true; } //---------------------------------------------------------------------------- // virtual -BOOL SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const +bool SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const { if ( _xVal.Is() ) { @@ -172,7 +172,7 @@ BOOL SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const if ( _xVal->Stat( &aStat, SVSTATFLAG_DEFAULT ) == ERRCODE_NONE ) nLen = aStat.nSize; else - return FALSE; + return false; ULONG nRead = 0; com::sun::star::uno::Sequence< sal_Int8 > aSeq( nLen ); @@ -186,6 +186,6 @@ BOOL SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const rVal <<= aSeq; } - return TRUE; + return true; } diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 77cf3dfff014..325c99c40ce0 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -504,18 +504,18 @@ void SfxPoolItem::Store(SvStream &rStream) const // ----------------------------------------------------------------------- -BOOL SfxPoolItem::QueryValue( com::sun::star::uno::Any&, BYTE ) const +bool SfxPoolItem::QueryValue( com::sun::star::uno::Any&, BYTE ) const { DBG_ERROR("There is no implementation for QueryValue for this item!"); - return FALSE; + return false; } // ----------------------------------------------------------------------- -BOOL SfxPoolItem::PutValue( const com::sun::star::uno::Any&, BYTE ) +bool SfxPoolItem::PutValue( const com::sun::star::uno::Any&, BYTE ) { DBG_ERROR("There is no implementation for PutValue for this item!"); - return FALSE; + return false; } SfxVoidItem::~SfxVoidItem() diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index 3c12745e5967..3a1a33c5e919 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -139,7 +139,7 @@ SvStream& SfxPointItem::Store(SvStream &rStream, USHORT ) const // ----------------------------------------------------------------------- -BOOL SfxPointItem::QueryValue( uno::Any& rVal, +bool SfxPointItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -155,20 +155,20 @@ BOOL SfxPointItem::QueryValue( uno::Any& rVal, case 0: rVal <<= aTmp; break; case MID_X: rVal <<= aTmp.X; break; case MID_Y: rVal <<= aTmp.Y; break; - default: DBG_ERROR("Wrong MemberId!"); return FALSE; + default: DBG_ERROR("Wrong MemberId!"); return true; } - return TRUE; + return true; } // ----------------------------------------------------------------------- -BOOL SfxPointItem::PutValue( const uno::Any& rVal, +bool SfxPointItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; - BOOL bRet = FALSE; + bool bRet = FALSE; awt::Point aValue; sal_Int32 nVal = 0; if ( !nMemberId ) diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index 893ac3c125b0..c4639404fb3e 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -139,7 +139,7 @@ SvStream& SfxRectangleItem::Store(SvStream &rStream, USHORT ) const // ----------------------------------------------------------------------- -BOOL SfxRectangleItem::QueryValue( com::sun::star::uno::Any& rVal, +bool SfxRectangleItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId) const { nMemberId &= ~CONVERT_TWIPS; @@ -157,17 +157,17 @@ BOOL SfxRectangleItem::QueryValue( com::sun::star::uno::Any& rVal, case MID_RECT_RIGHT: rVal <<= aVal.getY(); break; case MID_WIDTH: rVal <<= aVal.getWidth(); break; case MID_HEIGHT: rVal <<= aVal.getHeight(); break; - default: DBG_ERROR("Wrong MemberID!"); return FALSE; + default: DBG_ERROR("Wrong MemberID!"); return false; } - return TRUE; + return true; } // ----------------------------------------------------------------------- -BOOL SfxRectangleItem::PutValue( const com::sun::star::uno::Any& rVal, +bool SfxRectangleItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ) { - BOOL bRet = FALSE; + bool bRet = false; nMemberId &= ~CONVERT_TWIPS; com::sun::star::awt::Rectangle aValue; sal_Int32 nVal = 0; @@ -190,7 +190,7 @@ BOOL SfxRectangleItem::PutValue( const com::sun::star::uno::Any& rVal, case MID_RECT_RIGHT: aVal.setY( nVal ); break; case MID_WIDTH: aVal.setWidth( nVal ); break; case MID_HEIGHT: aVal.setHeight( nVal ); break; - default: DBG_ERROR("Wrong MemberID!"); return FALSE; + default: DBG_ERROR("Wrong MemberID!"); return false; } } diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index ec9757e278a8..7c6bc45fbe9c 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -393,22 +393,22 @@ void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< rtl::OUStr //---------------------------------------------------------------------------- // virtual -BOOL SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE ) +bool SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE ) { com::sun::star::uno::Sequence< rtl::OUString > aValue; if ( rVal >>= aValue ) { SetStringList( aValue ); - return TRUE; + return true; } DBG_ERROR( "SfxStringListItem::PutValue - Wrong type!" ); - return FALSE; + return false; } //---------------------------------------------------------------------------- // virtual -BOOL SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const +bool SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const { // GetString() is not const!!! SfxStringListItem* pThis = const_cast< SfxStringListItem * >( this ); @@ -416,7 +416,7 @@ BOOL SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const com::sun::star::uno::Sequence< rtl::OUString > aStringList; pThis->GetStringList( aStringList ); rVal = ::com::sun::star::uno::makeAny( aStringList ); - return TRUE; + return true; } diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index ea0c33c8cdf7..53b46fb518c2 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -429,7 +429,7 @@ void SvxSearchItem::SetTransliterationFlags( sal_Int32 nFlags ) aSearchOpt.transliterateFlags = nFlags; } -sal_Bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) @@ -513,18 +513,18 @@ sal_Bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember default: DBG_ERRORFILE( "SvxSearchItem::QueryValue(): Unknown MemberId" ); - return sal_False; + return false; } - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ) { nMemberId &= ~CONVERT_TWIPS; - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nInt = 0; switch ( nMemberId ) { diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index 6c5ab66b8422..454589dbff81 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -135,7 +135,7 @@ SvStream& SfxSizeItem::Store(SvStream &rStream, USHORT ) const } // ----------------------------------------------------------------------- -BOOL SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal, +bool SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -159,20 +159,20 @@ BOOL SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal, rVal <<= aTmp.getWidth(); break; case MID_HEIGHT: rVal <<= aTmp.getHeight(); break; - default: DBG_ERROR("Wrong MemberId!"); return FALSE; + default: DBG_ERROR("Wrong MemberId!"); return false; } - return TRUE; + return true; } // ----------------------------------------------------------------------- -BOOL SfxSizeItem::PutValue( const com::sun::star::uno::Any& rVal, +bool SfxSizeItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ) { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; - BOOL bRet = FALSE; + bool bRet = false; com::sun::star::awt::Size aValue; sal_Int32 nVal = 0; if ( !nMemberId ) diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index 94fdf167496e..0df5a92e3400 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -85,21 +85,21 @@ SfxItemPresentation SfxVisibilityItem::GetPresentation(SfxItemPresentation, //============================================================================ // virtual -BOOL SfxVisibilityItem::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const +bool SfxVisibilityItem::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const { rVal <<= m_nValue; - return TRUE; + return true; } //============================================================================ // virtual -BOOL SfxVisibilityItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE) +bool SfxVisibilityItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE) { if (rVal >>= m_nValue) - return TRUE; + return true; DBG_ERROR( "SfxInt16Item::PutValue - Wrong type!" ); - return FALSE; + return false; } //============================================================================ |