summaryrefslogtreecommitdiff
path: root/svx/source/items
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2010-10-04 15:23:49 +0100
committerMichael Meeks <michael.meeks@novell.com>2010-10-04 17:01:12 +0100
commit45169c93d57acf066748c3ff93b45c919e209db7 (patch)
treec5363f9808b267a62804b7a1cc0c9a4496b0f4f2 /svx/source/items
parentc85da5656b3a188c0251c22070263b4de56f6a7c (diff)
Convert all Query/Put Value() to bool
Diffstat (limited to 'svx/source/items')
-rw-r--r--svx/source/items/SmartTagItem.cxx8
-rw-r--r--svx/source/items/algitem.cxx36
-rw-r--r--svx/source/items/chrtitem.cxx18
-rw-r--r--svx/source/items/clipfmtitem.cxx10
-rw-r--r--svx/source/items/customshapeitem.cxx10
-rw-r--r--svx/source/items/drawitem.cxx60
-rw-r--r--svx/source/items/e3ditem.cxx10
-rw-r--r--svx/source/items/grfitem.cxx10
-rw-r--r--svx/source/items/hlnkitem.cxx12
-rw-r--r--svx/source/items/pageitem.cxx10
-rw-r--r--svx/source/items/rotmodit.cxx8
-rw-r--r--svx/source/items/viewlayoutitem.cxx26
-rw-r--r--svx/source/items/zoomitem.cxx24
-rw-r--r--svx/source/items/zoomslideritem.cxx32
14 files changed, 137 insertions, 137 deletions
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
index 7089da42860b..ce1d1952761b 100644
--- a/svx/source/items/SmartTagItem.cxx
+++ b/svx/source/items/SmartTagItem.cxx
@@ -72,14 +72,14 @@ SvxSmartTagItem::SvxSmartTagItem( const USHORT nId,
// -----------------------------------------------------------------------
-sal_Bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, BYTE /* nMemberId */ ) const
+bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, BYTE /* nMemberId */ ) const
{
- return sal_False;
+ return false;
}
// -----------------------------------------------------------------------
-sal_Bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, BYTE /* nMemberId */)
+bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, BYTE /* nMemberId */)
{
- return sal_False;
+ return false;
}
// -----------------------------------------------------------------------
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 183db0e3a722..0229ec3876b2 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -107,7 +107,7 @@ SfxItemPresentation SvxHorJustifyItem::GetPresentation
//------------------------------------------------------------------------
-sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -148,10 +148,10 @@ sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
}
break;
}
- return sal_True;
+ return true;
}
-sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -201,7 +201,7 @@ sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
SetValue( (USHORT)eSvx );
}
}
- return sal_True;
+ return true;
}
//------------------------------------------------------------------------
@@ -273,7 +273,7 @@ SfxItemPresentation SvxVerJustifyItem::GetPresentation
//------------------------------------------------------------------------
-sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -306,10 +306,10 @@ sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
break;
}
}
- return sal_True;
+ return true;
}
-sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -357,7 +357,7 @@ sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
}
}
- return sal_True;
+ return true;
}
//------------------------------------------------------------------------
@@ -430,7 +430,7 @@ SfxItemPresentation SvxOrientationItem::GetPresentation
//------------------------------------------------------------------------
-sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
table::CellOrientation eUno = table::CellOrientation_STANDARD;
switch ( (SvxCellOrientation)GetValue() )
@@ -441,10 +441,10 @@ sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) co
case SVX_ORIENTATION_STACKED: eUno = table::CellOrientation_STACKED; break;
}
rVal <<= eUno;
- return sal_True;
+ return true;
}
-sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
table::CellOrientation eOrient;
if(!(rVal >>= eOrient))
@@ -464,7 +464,7 @@ sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/
default: ; //prevent warning
}
SetValue( (USHORT)eSvx );
- return sal_True;
+ return true;
}
//------------------------------------------------------------------------
@@ -673,7 +673,7 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, USHORT /*nItemVersion*/) cons
//------------------------------------------------------------------------
-sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -694,14 +694,14 @@ sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
break;
default:
DBG_ERROR("unknown MemberId");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
//------------------------------------------------------------------------
-sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 );
long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX; // Members sind sal_Int16
@@ -725,9 +725,9 @@ sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
break;
default:
DBG_ERROR("unknown MemberId");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
//------------------------------------------------------------------------
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 8957bd2e3ba0..ce793ee721d7 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -193,7 +193,7 @@ SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, USHORT /*nVer*/) const
// -----------------------------------------------------------------------
-sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
// the order of the two enums is not equal, so a mapping is required
::com::sun::star::chart::ChartAxisArrangeOrderType eAO;
@@ -213,12 +213,12 @@ sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BY
rVal <<= eAO;
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
// the order of the two enums is not equal, so a mapping is required
::com::sun::star::chart::ChartAxisArrangeOrderType eAO;
@@ -229,7 +229,7 @@ sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal
// also try an int (for Basic)
sal_Int32 nAO = 0;
if(!(rVal >>= nAO))
- return sal_False;
+ return false;
eAO = static_cast< ::com::sun::star::chart::ChartAxisArrangeOrderType >( nAO );
}
@@ -244,12 +244,12 @@ sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal
case ::com::sun::star::chart::ChartAxisArrangeOrderType_AUTO:
eOrder = CHTXTORDER_AUTO; break;
default:
- return sal_False;
+ return false;
}
SetValue( (USHORT)eOrder );
- return sal_True;
+ return true;
}
/*************************************************************************
@@ -395,14 +395,14 @@ SfxFieldUnit SvxDoubleItem::GetUnit() const
// -----------------------------------------------------------------------
-sal_Bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
rVal <<= fVal;
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
return rVal >>= fVal;
}
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index 086cd1cff161..92ab08d33bec 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -78,7 +78,7 @@ SvxClipboardFmtItem::~SvxClipboardFmtItem()
delete pImpl;
}
-BOOL SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
USHORT nCount = Count();
@@ -93,10 +93,10 @@ BOOL SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMe
}
rVal <<= aClipFormats;
- return TRUE;
+ return true;
}
-sal_Bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
::com::sun::star::frame::status::ClipboardFormats aClipFormats;
if ( rVal >>= aClipFormats )
@@ -108,10 +108,10 @@ sal_Bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal,
for ( USHORT n=0; n < nCount; n++ )
AddClipbrdFormat( ULONG( aClipFormats.Identifiers[n] ), aClipFormats.Names[n], n );
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
int SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index c7a401ed4054..60ece263e871 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -355,17 +355,17 @@ sal_uInt16 SdrCustomShapeGeometryItem::GetVersion( sal_uInt16 /*nFileFormatVersi
{
return 1;
}
-sal_Bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
rVal <<= aPropSeq;
- return sal_True;
+ return true;
}
-sal_Bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
if ( ! ( rVal >>= aPropSeq ) )
- return sal_False;
+ return false;
else
- return sal_True;
+ return true;
}
const uno::Sequence< beans::PropertyValue >& SdrCustomShapeGeometryItem::GetGeometry() const
{
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index 27d7dba45c49..9f6286ffd84a 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -104,19 +104,19 @@ SfxPoolItem* SvxColorTableItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxColorTableItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxColorTableItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
// Please ask CD if you want to change this.
sal_Int64 aValue = sal_Int64( (ULONG)pColorTable );
rVal = uno::makeAny( aValue );
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
@@ -125,10 +125,10 @@ sal_Bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if ( rVal >>= aValue )
{
pColorTable = (XColorTable *)(ULONG)aValue;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
//==================================================================
@@ -188,19 +188,19 @@ SfxPoolItem* SvxGradientListItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxGradientListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxGradientListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
// Please ask CD if you want to change this.
sal_Int64 aValue = sal_Int64( (ULONG)pGradientList );
rVal = uno::makeAny( aValue );
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
@@ -209,10 +209,10 @@ sal_Bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BY
if ( rVal >>= aValue )
{
pGradientList = (XGradientList *)(ULONG)aValue;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
//==================================================================
@@ -272,19 +272,19 @@ SfxPoolItem* SvxHatchListItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxHatchListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxHatchListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
// Please ask CD if you want to change this.
sal_Int64 aValue = sal_Int64( (ULONG)pHatchList );
rVal = uno::makeAny( aValue );
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
@@ -293,10 +293,10 @@ sal_Bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if ( rVal >>= aValue )
{
pHatchList = (XHatchList *)(ULONG)aValue;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
//==================================================================
@@ -356,19 +356,19 @@ SfxPoolItem* SvxBitmapListItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxBitmapListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxBitmapListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
// Please ask CD if you want to change this.
sal_Int64 aValue = sal_Int64( (ULONG)pBitmapList );
rVal = uno::makeAny( aValue );
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
@@ -377,10 +377,10 @@ sal_Bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if ( rVal >>= aValue )
{
pBitmapList = (XBitmapList *)(ULONG)aValue;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
@@ -442,18 +442,18 @@ SfxPoolItem* SvxDashListItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxDashListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxDashListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
sal_Int64 aValue = sal_Int64( (ULONG)pDashList );
rVal = uno::makeAny( aValue );
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
@@ -461,10 +461,10 @@ sal_Bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /
if ( rVal >>= aValue )
{
pDashList = (XDashList *)(ULONG)aValue;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
// -----------------------------------------------------------------------
@@ -531,18 +531,18 @@ SfxPoolItem* SvxLineEndListItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-sal_Bool SvxLineEndListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxLineEndListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
sal_Int64 aValue = sal_Int64( (ULONG)pLineEndList );
rVal = uno::makeAny( aValue );
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
{
// This is only a quick helper to have UI support for these list items. Don't use
// this method to query for a valid UNO representation.
@@ -550,8 +550,8 @@ sal_Bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
if ( rVal >>= aValue )
{
pLineEndList = (XLineEndList *)(ULONG)aValue;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
index 846c422ae03a..274f1991c96a 100644
--- a/svx/source/items/e3ditem.cxx
+++ b/svx/source/items/e3ditem.cxx
@@ -133,7 +133,7 @@ SvStream& SvxB3DVectorItem::Store(SvStream &rStream, USHORT /*nItemVersion*/) co
// -----------------------------------------------------------------------
-sal_Bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
drawing::Direction3D aDirection;
@@ -143,21 +143,21 @@ sal_Bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) cons
aDirection.DirectionZ = aVal.getZ();
rVal <<= aDirection;
- return( sal_True );
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
drawing::Direction3D aDirection;
if(!(rVal >>= aDirection))
- return sal_False;
+ return false;
aVal.setX(aDirection.DirectionX);
aVal.setY(aDirection.DirectionY);
aVal.setZ(aDirection.DirectionZ);
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx
index ce28ee300cbb..92a74d611ce1 100644
--- a/svx/source/items/grfitem.cxx
+++ b/svx/source/items/grfitem.cxx
@@ -117,7 +117,7 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, USHORT nVersion ) const
-BOOL SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -137,17 +137,17 @@ BOOL SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
rVal <<= aRet;
- return sal_True;
+ return true;
}
-BOOL SvxGrfCrop::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxGrfCrop::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
text::GraphicCrop aVal;
if(!(rVal >>= aVal))
- return sal_False;
+ return false;
if( bConvert )
{
aVal.Right = MM100_TO_TWIP(aVal.Right );
@@ -160,7 +160,7 @@ BOOL SvxGrfCrop::PutValue( const uno::Any& rVal, BYTE nMemberId )
nRight = aVal.Right ;
nTop = aVal.Top ;
nBottom = aVal.Bottom;
- return sal_True;
+ return true;
}
SfxItemPresentation SvxGrfCrop::GetPresentation(
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index a67a87021d31..c8c634c36a91 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -360,7 +360,7 @@ void SvxHyperlinkItem::SetMacroTable( const SvxMacroTableDtor& rTbl )
pMacroTable = new SvxMacroTableDtor ( rTbl );
}
-BOOL SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -382,13 +382,13 @@ BOOL SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberI
rVal <<= (sal_Int32) eType;
break;
default:
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
-BOOL SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -422,9 +422,9 @@ BOOL SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMem
eType = (SvxLinkInsertMode) (sal_uInt16) nVal;
break;
default:
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 49aa566f867d..14cb836ec2f0 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -164,7 +164,7 @@ SfxItemPresentation SvxPageItem::GetPresentation
}
//------------------------------------------------------------------------
-sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -198,10 +198,10 @@ sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
break;
}
- return sal_True;
+ return true;
}
//------------------------------------------------------------------------
-sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
switch( nMemberId )
{
@@ -209,7 +209,7 @@ sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue))
- return sal_False;
+ return false;
eNumType = (SvxNumType)nValue;
}
@@ -239,7 +239,7 @@ sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
}
break;
}
- return sal_True;
+ return true;
}
//------------------------------------------------------------------------
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 10a0adf3f0c9..3f74d0815c86 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -136,7 +136,7 @@ USHORT __EXPORT SvxRotateModeItem::GetVersion( USHORT /*nFileVersion*/ ) const
// QueryValue/PutValue: Der ::com::sun::star::table::CellVertJustify enum wird mitbenutzt...
-sal_Bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
table::CellVertJustify eUno = table::CellVertJustify_STANDARD;
switch ( (SvxRotateMode)GetValue() )
@@ -147,10 +147,10 @@ sal_Bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) con
case SVX_ROTATE_MODE_BOTTOM: eUno = table::CellVertJustify_BOTTOM; break;
}
rVal <<= eUno;
- return sal_True;
+ return true;
}
-sal_Bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
table::CellVertJustify eUno;
if(!(rVal >>= eUno))
@@ -171,7 +171,7 @@ sal_Bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
default: ;//prevent warning
}
SetValue( (USHORT)eSvx );
- return sal_True;
+ return true;
}
diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx
index 47775bb7a2ce..2fddc14d0c02 100644
--- a/svx/source/items/viewlayoutitem.cxx
+++ b/svx/source/items/viewlayoutitem.cxx
@@ -111,7 +111,7 @@ int SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const
mbBookMode == rItem.IsBookMode() );
}
-sal_Bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -131,13 +131,13 @@ sal_Bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMe
case MID_VIEWLAYOUT_BOOKMODE: rVal <<= (sal_Bool) mbBookMode; break;
default:
DBG_ERROR("svx::SvxViewLayoutItem::QueryValue(), Wrong MemberId!");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
-sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -170,11 +170,11 @@ sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
{
SetValue( (UINT16)nColumns );
mbBookMode = bBookMode;
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
case MID_VIEWLAYOUT_COLUMNS:
@@ -183,10 +183,10 @@ sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if ( rVal >>= nVal )
{
SetValue( (UINT16)nVal );
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
case MID_VIEWLAYOUT_BOOKMODE:
@@ -194,18 +194,18 @@ sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
sal_Bool bBookMode = sal_False;
if ( rVal >>= bBookMode )
{
- mbBookMode = bBookMode;
- return sal_True;
+ mbBookMode = bBookMode;
+ return true;
}
else
- return sal_False;
+ return false;
}
default:
DBG_ERROR("svx::SvxViewLayoutItem::PutValue(), Wrong MemberId!");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
diff --git a/svx/source/items/zoomitem.cxx b/svx/source/items/zoomitem.cxx
index bc5438d23686..9b3050966c73 100644
--- a/svx/source/items/zoomitem.cxx
+++ b/svx/source/items/zoomitem.cxx
@@ -117,7 +117,7 @@ int SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const
eType == rItem.GetType() );
}
-sal_Bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -141,13 +141,13 @@ sal_Bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId
case MID_TYPE: rVal <<= (sal_Int16) eType; break;
default:
DBG_ERROR("svx::SvxZoomItem::QueryValue(), Wrong MemberId!");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
-sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -187,11 +187,11 @@ sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemb
SetValue( (UINT16)nValueTmp );
nValueSet = nValueSetTmp;
eType = SvxZoomType( nTypeTmp );
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
case MID_VALUE:
@@ -200,10 +200,10 @@ sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemb
if ( rVal >>= nVal )
{
SetValue( (UINT16)nVal );
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
case MID_VALUESET:
@@ -216,16 +216,16 @@ sal_Bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemb
nValueSet = (sal_Int16) nVal;
else if ( nMemberId == MID_TYPE )
eType = SvxZoomType( (sal_Int16) nVal );
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
default:
DBG_ERROR("svx::SvxZoomItem::PutValue(), Wrong MemberId!");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx
index 555e0ad07f94..d29641affa65 100644
--- a/svx/source/items/zoomslideritem.cxx
+++ b/svx/source/items/zoomslideritem.cxx
@@ -108,7 +108,7 @@ int SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const
mnMinZoom == rItem.mnMinZoom && mnMaxZoom == rItem.mnMaxZoom );
}
-sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -150,13 +150,13 @@ sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMe
break;
default:
DBG_ERROR("svx::SvxZoomSliderItem::QueryValue(), Wrong MemberId!");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
-sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -205,11 +205,11 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
mnMinZoom = sal::static_int_cast< USHORT >( nMinZoom );
mnMaxZoom = sal::static_int_cast< USHORT >( nMaxZoom );
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
case MID_ZOOMSLIDER_CURRENTZOOM:
@@ -218,10 +218,10 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if ( rVal >>= nVal )
{
SetValue( (UINT16)nVal );
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
case MID_ZOOMSLIDER_SNAPPINGPOINTS:
@@ -230,10 +230,10 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if ( rVal >>= aValues )
{
maValues = aValues;
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
case MID_ZOOMSLIDER_MINZOOM:
{
@@ -241,10 +241,10 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if( rVal >>= nVal )
{
mnMinZoom = (UINT16)nVal;
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
case MID_ZOOMSLIDER_MAXZOOM:
{
@@ -252,17 +252,17 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if( rVal >>= nVal )
{
mnMaxZoom = (UINT16)nVal;
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
default:
DBG_ERROR("svx::SvxZoomSliderItem::PutValue(), Wrong MemberId!");
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
void SvxZoomSliderItem::AddSnappingPoint( sal_Int32 nNew )