Convert all Query/Put Value() to bool

20 files changed, 431 insertions, 431 deletions

diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index fd0007cce8e5..4b360c474eb4 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -63,7 +63,7 @@ String SvxLongLRSpaceItem::GetValueText() const
 #define TWIP_TO_MM100(TWIP)     ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
 #define MM100_TO_TWIP(MM100)    ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
 
-sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -82,18 +82,18 @@ sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
 
         case MID_LEFT: nVal = lLeft; break;
         case MID_RIGHT: nVal = lRight; break;
-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;
+        default: DBG_ERROR("Wrong MemberId!"); return false;
     }
 
     if ( bConvert )
         nVal = TWIP_TO_MM100( nVal );
 
     rVal <<= nVal;
-    return TRUE;
+    return true;
 }
 
 // -----------------------------------------------------------------------
-sal_Bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -106,7 +106,7 @@ sal_Bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, B
         {
             lLeft    = bConvert ? MM100_TO_TWIP( aLeftRightMargin.Left ) : aLeftRightMargin.Left;
             lRight   = bConvert ? MM100_TO_TWIP( aLeftRightMargin.Right ) : aLeftRightMargin.Right;
-            return sal_True;
+            return true;
         }
     }
     else if ( rVal >>= nVal )
@@ -118,13 +118,13 @@ sal_Bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, B
         {
             case MID_LEFT: lLeft = nVal; break;
             case MID_RIGHT: lRight = nVal; break;
-            default: DBG_ERROR("Wrong MemberId!"); return sal_False;
+            default: DBG_ERROR("Wrong MemberId!"); return false;
         }
 
-        return sal_True;
+        return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 //------------------------------------------------------------------------
@@ -189,7 +189,7 @@ String SvxLongULSpaceItem::GetValueText() const
     return String();
 }
 
-sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -203,23 +203,23 @@ sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
             aUpperLowerMargin.Upper = bConvert ? TWIP_TO_MM100( lLeft ) : lLeft;
             aUpperLowerMargin.Lower = bConvert ? TWIP_TO_MM100( lRight ) : lRight;
             rVal <<= aUpperLowerMargin;
-            return TRUE;
+            return true;
         }
 
         case MID_UPPER: nVal = lLeft; break;
         case MID_LOWER: nVal = lRight; break;
-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;
+        default: DBG_ERROR("Wrong MemberId!"); return false;
     }
 
     if ( bConvert )
         nVal = TWIP_TO_MM100( nVal );
 
     rVal <<= nVal;
-    return TRUE;
+    return true;
 }
 
 // -----------------------------------------------------------------------
-sal_Bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -232,7 +232,7 @@ sal_Bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, B
         {
             lLeft    = bConvert ? MM100_TO_TWIP( aUpperLowerMargin.Upper ) : aUpperLowerMargin.Upper;
             lRight   = bConvert ? MM100_TO_TWIP( aUpperLowerMargin.Lower ) : aUpperLowerMargin.Lower;
-            return sal_True;
+            return true;
         }
     }
     else if ( rVal >>= nVal )
@@ -244,13 +244,13 @@ sal_Bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, B
         {
             case MID_UPPER: lLeft = nVal; break;
             case MID_LOWER: lRight = nVal; break;
-            default: DBG_ERROR("Wrong MemberId!"); return sal_False;
+            default: DBG_ERROR("Wrong MemberId!"); return false;
         }
 
-        return sal_True;
+        return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 //------------------------------------------------------------------------
@@ -307,7 +307,7 @@ int SvxPagePosSizeItem::operator==( const SfxPoolItem& rCmp) const
             lHeight == ((const SvxPagePosSizeItem &)rCmp).lHeight;
 }
 
-sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
 
@@ -322,7 +322,7 @@ sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
             aPagePosSize.Width = lWidth;
             aPagePosSize.Height = lHeight;
             rVal <<= aPagePosSize;
-            return TRUE;
+            return true;
         }
 
         case MID_X: nVal = aPos.X(); break;
@@ -330,14 +330,14 @@ sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
         case MID_WIDTH: nVal = lWidth; break;
         case MID_HEIGHT: nVal = lHeight; break;
 
-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;
+        default: DBG_ERROR("Wrong MemberId!"); return false;
     }
 
     rVal <<= nVal;
-    return TRUE;
+    return true;
 }
 
-sal_Bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
 
@@ -368,10 +368,10 @@ sal_Bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, B
             default: DBG_ERROR("Wrong MemberId!"); return sal_False;
         }
 
-        return sal_True;
+        return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 //------------------------------------------------------------------------
@@ -595,14 +595,14 @@ long SvxColumnItem::GetVisibleRight() const
     return (*this)[nIdx].nEnd;
 }
 
-sal_Bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
     {
         case MID_COLUMNARRAY:
         {
-            return sal_False;
+            return false;
         }
         case MID_RIGHT: rVal <<= nRight; break;
         case MID_LEFT: rVal <<= nLeft; break;
@@ -612,10 +612,10 @@ sal_Bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember
         default: DBG_ERROR("Wrong MemberId!"); return sal_False;
     }
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     sal_Int32 nVal = 0;
@@ -623,7 +623,7 @@ sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe
     {
         case MID_COLUMNARRAY:
         {
-            return sal_False;
+            return false;
         }
         case MID_RIGHT: rVal >>= nRight; break;
         case MID_LEFT: rVal >>= nLeft; break;
@@ -633,7 +633,7 @@ sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe
         default: DBG_ERROR("Wrong MemberId!"); return sal_False;
     }
 
-    return sal_True;
+    return true;
 }
 
 //------------------------------------------------------------------------
@@ -706,7 +706,7 @@ SvxObjectItem::SvxObjectItem( const SvxObjectItem& rCopy ) :
 {
 }
 
-sal_Bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -721,13 +721,13 @@ sal_Bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember
             return sal_False;
     }
 
-    return TRUE;
+    return true;
 }
 
-sal_Bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
-    BOOL bRet=FALSE;
+    BOOL bRet = false;
     switch ( nMemberId )
     {
         case MID_START_X : bRet = (rVal >>= nStartX); break;
diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx
index 68ce67febc25..86bd31a00de0 100644
--- a/svx/source/engine3d/svx3ditems.cxx
+++ b/svx/source/engine3d/svx3ditems.cxx
@@ -398,19 +398,19 @@ SfxPoolItem* Svx3DCloseBackItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
 //////////////////////////////////////////////////////////////////////////////
 
 // Svx3DNormalsKindItem: use drawing::NormalsKind
-sal_Bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (drawing::NormalsKind)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::NormalsKind eVar;
     if(!(rVal >>= eVar))
-        return sal_False;
+        return false;
     SetValue((sal_Int16)eVar);
-    return sal_True;
+    return true;
 }
 
 SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* /*pPool*/) const
@@ -419,19 +419,19 @@ SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DTextureProjectionXItem: use drawing::TextureProjectionMode
-sal_Bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (drawing::TextureProjectionMode)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::TextureProjectionMode eVar;
     if(!(rVal >>= eVar))
-        return sal_False;
+        return false;
     SetValue((sal_Int16)eVar);
-    return sal_True;
+    return true;
 }
 
 SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* /*pPool*/) const
@@ -440,19 +440,19 @@ SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DTextureProjectionYItem: use drawing::TextureProjectionMode
-sal_Bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (drawing::TextureProjectionMode)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::TextureProjectionMode eVar;
     if(!(rVal >>= eVar))
-        return sal_False;
+        return false;
     SetValue((sal_Int16)eVar);
-    return sal_True;
+    return true;
 }
 
 SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* /*pPool*/) const
@@ -461,19 +461,19 @@ SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DTextureKindItem: use drawing::TextureKind
-sal_Bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (drawing::TextureKind)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::TextureKind eVar;
     if(!(rVal >>= eVar))
-        return sal_False;
+        return false;
     SetValue((sal_Int16)eVar);
-    return sal_True;
+    return true;
 }
 
 SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* /*pPool*/) const
@@ -482,19 +482,19 @@ SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DTextureModeItem: use drawing:TextureMode
-sal_Bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (drawing::TextureMode)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::TextureMode eVar;
     if(!(rVal >>= eVar))
-        return sal_False;
+        return false;
     SetValue((sal_Int16)eVar);
-    return sal_True;
+    return true;
 }
 
 SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* /*pPool*/) const
@@ -503,19 +503,19 @@ SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DPerspectiveItem: use drawing::ProjectionMode
-sal_Bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (drawing::ProjectionMode)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::ProjectionMode eVar;
     if(!(rVal >>= eVar))
-        return sal_False;
+        return false;
     SetValue((sal_Int16)eVar);
-    return sal_True;
+    return true;
 }
 
 SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* /*pPool*/) const
@@ -524,19 +524,19 @@ SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DShadeModeItem: use drawing::ShadeMode
-sal_Bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (drawing::ShadeMode)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::ShadeMode eVar;
     if(!(rVal >>= eVar))
-        return sal_False;
+        return false;
     SetValue((sal_Int16)eVar);
-    return sal_True;
+    return true;
 }
 
 SfxPoolItem* Svx3DShadeModeItem::Clone(SfxItemPool* /*pPool*/) const
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 )
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 3a3935f819f8..6cb9bdb91cb5 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -1131,29 +1131,29 @@ BOOL __EXPORT SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()
 
 void __EXPORT SdrTextFitToSizeTypeItem::SetBoolValue(BOOL bVal) { SetValue(sal::static_int_cast< USHORT >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); }
 
-sal_Bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     drawing::TextFitToSizeType eFS = (drawing::TextFitToSizeType)GetValue();
     rVal <<= eFS;
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::TextFitToSizeType eFS;
     if(!(rVal >>= eFS))
     {
         sal_Int32 nEnum = 0;
         if(!(rVal >>= nEnum))
-            return sal_False;
+            return false;
 
         eFS = (drawing::TextFitToSizeType) nEnum;
     }
 
     SetValue( sal::static_int_cast< USHORT >( (SdrFitToSizeType)eFS ) );
 
-    return sal_True;
+    return true;
 }
 
 TYPEINIT1_AUTOFACTORY(SdrTextVertAdjustItem,SfxEnumItem);
@@ -1183,27 +1183,27 @@ SfxItemPresentation __EXPORT SdrTextVertAdjustItem::GetPresentation(SfxItemPrese
     return ePres;
 }
 
-sal_Bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (drawing::TextVerticalAdjust)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::TextVerticalAdjust eAdj;
     if(!(rVal >>= eAdj))
     {
         sal_Int32 nEnum = 0;
         if(!(rVal >>= nEnum))
-            return sal_False;
+            return false;
 
         eAdj = (drawing::TextVerticalAdjust)nEnum;
     }
 
     SetValue( sal::static_int_cast< USHORT >( (SdrTextVertAdjust)eAdj ) );
 
-    return sal_True;
+    return true;
 }
 
 TYPEINIT1_AUTOFACTORY(SdrTextHorzAdjustItem,SfxEnumItem);
@@ -1233,27 +1233,27 @@ SfxItemPresentation __EXPORT SdrTextHorzAdjustItem::GetPresentation(SfxItemPrese
     return ePres;
 }
 
-sal_Bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (drawing::TextHorizontalAdjust)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::TextHorizontalAdjust eAdj;
     if(!(rVal >>= eAdj))
     {
         sal_Int32 nEnum = 0;
         if(!(rVal >>= nEnum))
-            return sal_False;
+            return false;
 
         eAdj = (drawing::TextHorizontalAdjust)nEnum;
     }
 
     SetValue( sal::static_int_cast< USHORT >( (SdrTextHorzAdjust)eAdj ) );
 
-    return sal_True;
+    return true;
 }
 
 TYPEINIT1_AUTOFACTORY(SdrTextAniKindItem,SfxEnumItem);
@@ -1283,26 +1283,26 @@ SfxItemPresentation __EXPORT SdrTextAniKindItem::GetPresentation(SfxItemPresenta
     return ePres;
 }
 
-sal_Bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (drawing::TextAnimationKind)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::TextAnimationKind eKind;
     if(!(rVal >>= eKind))
     {
         sal_Int32 nEnum = 0;
         if(!(rVal >>= nEnum))
-            return sal_False;
+            return false;
         eKind = (drawing::TextAnimationKind)nEnum;
     }
 
     SetValue( sal::static_int_cast< USHORT >( (SdrTextAniKind)eKind ) );
 
-    return sal_True;
+    return true;
 }
 
 TYPEINIT1_AUTOFACTORY(SdrTextAniDirectionItem,SfxEnumItem);
@@ -1332,27 +1332,27 @@ SfxItemPresentation __EXPORT SdrTextAniDirectionItem::GetPresentation(SfxItemPre
     return ePres;
 }
 
-sal_Bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (drawing::TextAnimationDirection)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::TextAnimationDirection eDir;
     if(!(rVal >>= eDir))
     {
         sal_Int32 nEnum = 0;
         if(!(rVal >>= nEnum))
-            return sal_False;
+            return false;
 
         eDir = (drawing::TextAnimationDirection)nEnum;
     }
 
     SetValue( sal::static_int_cast< USHORT >( (SdrTextAniDirection)eDir ) );
 
-    return sal_True;
+    return true;
 }
 
 TYPEINIT1_AUTOFACTORY(SdrTextAniDelayItem,SfxUInt16Item);
@@ -1492,19 +1492,19 @@ sal_uInt16 SdrTextFixedCellHeightItem::GetVersion( sal_uInt16 /*nFileFormatVersi
 {
     return 1;
 }
-sal_Bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     sal_Bool bValue = (sal_Bool)GetValue();
     rVal <<= bValue;
-    return sal_True;
+    return true;
 }
-sal_Bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Bool bValue = sal_Bool();
     if( !( rVal >>= bValue ) )
-        return sal_False;
+        return false;
     SetValue( bValue );
-    return sal_True;
+    return true;
 }
 #ifdef SDR_ISPOOLABLE
 int __EXPORT SdrTextFixedCellHeightItem::IsPoolable() const
@@ -1650,7 +1650,7 @@ sal_uInt16 SdrCustomShapeAdjustmentItem::GetVersion( sal_uInt16 /*nFileFormatVer
     return 1;
 }
 
-sal_Bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     sal_uInt32 i, nCount = GetCount();
     uno::Sequence< sal_Int32 > aSequence( nCount );
@@ -1661,14 +1661,14 @@ sal_Bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE /*nMembe
             *pPtr++ = GetValue( i ).nValue;
     }
     rVal <<= aSequence;
-    return sal_True;
+    return true;
 }
 
-sal_Bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     uno::Sequence< sal_Int32 > aSequence;
     if( !( rVal >>= aSequence ) )
-        return sal_False;
+        return false;
 
     void* pPtr;
     for ( pPtr = aAdjustmentValueList.First(); pPtr; pPtr = aAdjustmentValueList.Next() )
@@ -1685,7 +1685,7 @@ sal_Bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, BYTE /*nM
             aAdjustmentValueList.Insert( pItem, LIST_APPEND );
         }
     }
-    return sal_True;
+    return true;
 }
 
 
@@ -1721,7 +1721,7 @@ SfxItemPresentation __EXPORT SdrEdgeKindItem::GetPresentation(SfxItemPresentatio
     return ePres;
 }
 
-sal_Bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     drawing::ConnectorType eCT = drawing::ConnectorType_STANDARD;
 
@@ -1738,17 +1738,17 @@ sal_Bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 
     rVal <<= eCT;
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::ConnectorType eCT;
     if(!(rVal >>= eCT))
     {
         sal_Int32 nEnum = 0;
         if(!(rVal >>= nEnum))
-            return sal_False;
+            return false;
 
         eCT = (drawing::ConnectorType)nEnum;
     }
@@ -1765,119 +1765,119 @@ sal_Bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
     }
     SetValue( sal::static_int_cast< USHORT >( eEK ) );
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SdrEdgeNode1HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrEdgeNode1HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
-        return sal_False;
+        return false;
 
     SetValue( nValue );
-    return sal_True;
+    return true;
 }
 
-BOOL SdrEdgeNode1VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrEdgeNode1VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
-    return sal_True;
+    return true;
 }
 
-BOOL SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
-        return sal_False;
+        return false;
 
     SetValue( nValue );
-    return sal_True;
+    return true;
 }
 
-BOOL SdrEdgeNode2HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrEdgeNode2HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
-    return sal_True;
+    return true;
 }
 
-BOOL SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
-        return sal_False;
+        return false;
 
     SetValue( nValue );
-    return sal_True;
+    return true;
 }
 
-BOOL SdrEdgeNode2VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrEdgeNode2VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
-    return sal_True;
+    return true;
 }
 
-BOOL SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
-        return sal_False;
+        return false;
 
     SetValue( nValue );
-    return sal_True;
+    return true;
 }
 
-BOOL SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
-    return sal_True;
+    return true;
 }
 
-BOOL SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
-        return sal_False;
+        return false;
 
     SetValue( nValue );
-    return sal_True;
+    return true;
 }
 
-BOOL SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
-    return sal_True;
+    return true;
 }
 
-BOOL SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
-        return sal_False;
+        return false;
 
     SetValue( nValue );
-    return sal_True;
+    return true;
 }
 
-BOOL SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
-    return sal_True;
+    return true;
 }
 
-BOOL SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
-        return sal_False;
+        return false;
 
     SetValue( nValue );
-    return sal_True;
+    return true;
 }
 
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1912,26 +1912,26 @@ SfxItemPresentation __EXPORT SdrMeasureKindItem::GetPresentation(SfxItemPresenta
     return ePres;
 }
 
-sal_Bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (drawing::MeasureKind)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::MeasureKind eKind;
     if(!(rVal >>= eKind))
     {
         sal_Int32 nEnum = 0;
         if(!(rVal >>= nEnum))
-            return sal_False;
+            return false;
 
         eKind = (drawing::MeasureKind)nEnum;
     }
 
     SetValue( sal::static_int_cast< USHORT >( (SdrMeasureKind)eKind ) );
-    return sal_True;
+    return true;
 }
 
 TYPEINIT1_AUTOFACTORY(SdrMeasureTextHPosItem,SfxEnumItem);
@@ -1961,26 +1961,26 @@ SfxItemPresentation __EXPORT SdrMeasureTextHPosItem::GetPresentation(SfxItemPres
     return ePres;
 }
 
-sal_Bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (drawing::MeasureTextHorzPos)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::MeasureTextHorzPos ePos;
     if(!(rVal >>= ePos))
     {
         sal_Int32 nEnum = 0;
         if(!(rVal >>= nEnum))
-            return sal_False;
+            return false;
 
         ePos = (drawing::MeasureTextHorzPos)nEnum;
     }
 
     SetValue( sal::static_int_cast< USHORT >( (SdrMeasureTextHPos)ePos ) );
-    return sal_True;
+    return true;
 }
 
 TYPEINIT1_AUTOFACTORY(SdrMeasureTextVPosItem,SfxEnumItem);
@@ -2010,26 +2010,26 @@ SfxItemPresentation __EXPORT SdrMeasureTextVPosItem::GetPresentation(SfxItemPres
     return ePres;
 }
 
-sal_Bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (drawing::MeasureTextVertPos)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::MeasureTextVertPos ePos;
     if(!(rVal >>= ePos))
     {
         sal_Int32 nEnum = 0;
         if(!(rVal >>= nEnum))
-            return sal_False;
+            return false;
 
         ePos = (drawing::MeasureTextVertPos)nEnum;
     }
 
     SetValue( sal::static_int_cast< USHORT >( (SdrMeasureTextHPos)ePos ) );
-    return sal_True;
+    return true;
 }
 
 TYPEINIT1_AUTOFACTORY(SdrMeasureUnitItem,SfxEnumItem);
@@ -2071,20 +2071,20 @@ SfxItemPresentation __EXPORT SdrMeasureUnitItem::GetPresentation(SfxItemPresenta
     return ePres;
 }
 
-sal_Bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nMeasure = 0;
     if(!(rVal >>= nMeasure))
-        return sal_False;
+        return false;
 
     SetValue( sal::static_int_cast< USHORT >( (FieldUnit)nMeasure ) );
-    return sal_True;
+    return true;
 }
 
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -2119,26 +2119,26 @@ SfxItemPresentation __EXPORT SdrCircKindItem::GetPresentation(SfxItemPresentatio
     return ePres;
 }
 
-sal_Bool SdrCircKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrCircKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (drawing::CircleKind)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     drawing::CircleKind eKind;
     if(!(rVal >>= eKind))
     {
         sal_Int32 nEnum = 0;
         if(!(rVal >>= nEnum))
-            return sal_False;
+            return false;
 
         eKind = (drawing::CircleKind)nEnum;
     }
 
     SetValue( sal::static_int_cast< USHORT >( (SdrCircKind)eKind ) );
-    return sal_True;
+    return true;
 }
 
 //------------------------------------------------------------
@@ -2282,20 +2282,20 @@ SfxPoolItem* __EXPORT SdrGrafGamma100Item::Create( SvStream& rIn, USHORT /*nVer*
     return new SdrGrafGamma100Item( rIn );
 }
 
-sal_Bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= ((double)GetValue()) / 100.0;
-    return sal_True;
+    return true;
 }
 
-sal_Bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     double nGamma = 0;
     if(!(rVal >>= nGamma))
-        return sal_False;
+        return false;
 
     SetValue( (UINT32)(nGamma * 100.0  ) );
-    return sal_True;
+    return true;
 }
 
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index a301e47e5c25..f4de14dcb94a 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -484,19 +484,19 @@ const Color& XColorItem::GetColorValue(const XColorTable* pTable) const
 
 }
 
-sal_Bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
-    return sal_True;
+    return true;
 }
 
-sal_Bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
     SetColorValue( nValue );
 
-    return sal_True;
+    return true;
 }
 
 
@@ -609,14 +609,14 @@ SfxItemPresentation XLineStyleItem::GetPresentation
     }
 }
 
-sal_Bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     ::com::sun::star::drawing::LineStyle eLS = (::com::sun::star::drawing::LineStyle)GetValue();
     rVal <<= eLS;
-    return sal_True;
+    return true;
 }
 
-sal_Bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
 {
     ::com::sun::star::drawing::LineStyle eLS;
     if(!(rVal >>= eLS ))
@@ -624,12 +624,12 @@ sal_Bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
         // also try an int (for Basic)
         sal_Int32 nLS = 0;
         if(!(rVal >>= nLS))
-            return sal_False;
+            return false;
         eLS = (::com::sun::star::drawing::LineStyle)nLS;
     }
 
     SetValue( sal::static_int_cast< USHORT >( eLS ) );
-    return sal_True;
+    return true;
 }
 
 //------------------------------------------------------------------------
@@ -1104,7 +1104,7 @@ FASTBOOL XLineDashItem::ScaleMetrics(long nMul, long nDiv)
     return TRUE;
 }
 
-sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1202,13 +1202,13 @@ sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
             break;
         }
 
-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;
+        default: DBG_ERROR("Wrong MemberId!"); return false;
     }
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1231,7 +1231,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
                     else if ( aPropSeq[n].Name.equalsAsciiL( "LineDash", 8 ))
                     {
                         if ( aPropSeq[n].Value >>= aLineDash )
-                            bLineDash = sal_True;
+                            bLineDash = true;
                     }
                 }
 
@@ -1253,17 +1253,17 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
                     SetDashValue( aXDash );
                 }
 
-                return sal_True;
+                return true;
             }
 
-            return sal_False;
+            return false;
         }
 
         case MID_NAME:
         {
             rtl::OUString aName;
             if (!(rVal >>= aName))
-                return sal_False;
+                return false;
             SetName( aName );
             break;
         }
@@ -1272,7 +1272,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
         {
             ::com::sun::star::drawing::LineDash aLineDash;
             if(!(rVal >>= aLineDash))
-                return sal_False;
+                return false;
 
             XDash aXDash;
 
@@ -1294,7 +1294,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
         {
             sal_Int16 nVal = sal_Int16();
             if(!(rVal >>= nVal))
-                return sal_False;
+                return false;
 
             XDash aXDash = GetDashValue();
             aXDash.SetDashStyle((XDashStyle)((UINT16)(nVal)));
@@ -1312,7 +1312,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
         {
             sal_Int16 nVal = sal_Int16();
             if(!(rVal >>= nVal))
-                return sal_False;
+                return false;
 
             XDash aXDash = GetDashValue();
             if ( nMemberId == MID_LINEDASH_DOTS )
@@ -1333,7 +1333,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
         {
             sal_Int32 nVal = 0;
             if(!(rVal >>= nVal))
-                return sal_False;
+                return false;
 
             XDash aXDash = GetDashValue();
             if ( nMemberId == MID_LINEDASH_DOTLEN )
@@ -1351,7 +1351,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 BOOL XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
@@ -1472,17 +1472,17 @@ SfxItemPresentation XLineWidthItem::GetPresentation
     }
 }
 
-sal_Bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
 {
     sal_Int32 nValue = GetValue();
     if( 0 != (nMemberId&CONVERT_TWIPS) )
         nValue = TWIP_TO_MM100(nValue);
 
     rVal <<= nValue;
-    return sal_True;
+    return true;
 }
 
-sal_Bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
@@ -1490,7 +1490,7 @@ sal_Bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
         nValue = MM100_TO_TWIP(nValue);
 
     SetValue( nValue );
-    return sal_True;
+    return true;
 }
 
 // -------------------
@@ -1597,20 +1597,20 @@ SfxItemPresentation XLineColorItem::GetPresentation
     }
 }
 
-sal_Bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
-    return sal_True;
+    return true;
 }
 
-sal_Bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
-        return sal_False;
+        return false;
 
     SetColorValue( nValue );
-    return sal_True;
+    return true;
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -1913,7 +1913,7 @@ SfxItemPresentation XLineStartItem::GetPresentation
     }
 }
 
-sal_Bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1930,16 +1930,16 @@ sal_Bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
         rVal <<= aBezier;
     }
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
     if( nMemberId == MID_NAME )
     {
-        return sal_False;
+        return false;
     }
     else
     {
@@ -1948,7 +1948,7 @@ sal_Bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
         if( rVal.hasValue() && rVal.getValue() )
         {
             if( rVal.getValueType() != ::getCppuType((const com::sun::star::drawing::PolyPolygonBezierCoords*)0) )
-                return sal_False;
+                return false;
 
             com::sun::star::drawing::PolyPolygonBezierCoords* pCoords = (com::sun::star::drawing::PolyPolygonBezierCoords*)rVal.getValue();
             if( pCoords->Coordinates.getLength() > 0 )
@@ -1960,7 +1960,7 @@ sal_Bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 /** this function searches in both the models pool and the styles pool for XLineStartItem
@@ -2607,7 +2607,7 @@ SfxItemPresentation XLineEndItem::GetPresentation
     }
 }
 
-sal_Bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -2623,16 +2623,16 @@ sal_Bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMembe
         SvxConvertB2DPolyPolygonToPolyPolygonBezier( maPolyPolygon, aBezier );
         rVal <<= aBezier;
     }
-    return sal_True;
+    return true;
 }
 
-sal_Bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
     if( nMemberId == MID_NAME )
     {
-        return sal_False;
+        return false;
     }
     else
     {
@@ -2641,7 +2641,7 @@ sal_Bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nM
         if( rVal.hasValue() && rVal.getValue() )
         {
             if( rVal.getValueType() != ::getCppuType((const com::sun::star::drawing::PolyPolygonBezierCoords*)0) )
-                return sal_False;
+                return false;
 
             com::sun::star::drawing::PolyPolygonBezierCoords* pCoords = (com::sun::star::drawing::PolyPolygonBezierCoords*)rVal.getValue();
             if( pCoords->Coordinates.getLength() > 0 )
@@ -2653,7 +2653,7 @@ sal_Bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nM
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 // ----------------------------
@@ -2748,18 +2748,18 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation
     }
 }
 
-sal_Bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
     SetValue( nValue );
-    return sal_True;
+    return true;
 }
 
 
@@ -2855,18 +2855,18 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation
     }
 }
 
-sal_Bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
-    return sal_True;
+    return true;
 }
 
-sal_Bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
     SetValue( nValue );
-    return sal_True;
+    return true;
 }
 
 
@@ -2961,20 +2961,20 @@ SfxItemPresentation XLineStartCenterItem::GetPresentation
     }
 }
 
-sal_Bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     sal_Bool bValue = GetValue();
     rVal.setValue( &bValue, ::getCppuBooleanType()  );
-    return sal_True;
+    return true;
 }
 
-sal_Bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
 {
     if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
-        return sal_False;
+        return false;
 
     SetValue( *(sal_Bool*)rVal.getValue() );
-    return sal_True;
+    return true;
 }
 
 
@@ -3069,20 +3069,20 @@ SfxItemPresentation XLineEndCenterItem::GetPresentation
     }
 }
 
-sal_Bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     sal_Bool bValue = GetValue();
     rVal.setValue( &bValue, ::getCppuBooleanType()  );
-    return sal_True;
+    return true;
 }
 
-BOOL XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
 {
     if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
-        return sal_False;
+        return false;
 
     SetValue( *(sal_Bool*)rVal.getValue() );
-    return sal_True;
+    return true;
 }
 
 
@@ -3213,17 +3213,17 @@ USHORT XFillStyleItem::GetValueCount() const
 }
 
 // -----------------------------------------------------------------------
-sal_Bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     ::com::sun::star::drawing::FillStyle eFS = (::com::sun::star::drawing::FillStyle)GetValue();
 
     rVal <<= eFS;
 
-    return sal_True;
+    return true;
 }
 
 // -----------------------------------------------------------------------
-sal_Bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
 {
     ::com::sun::star::drawing::FillStyle eFS;
     if(!(rVal >>= eFS))
@@ -3231,13 +3231,13 @@ sal_Bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
         // also try an int (for Basic)
         sal_Int32 nFS = 0;
         if(!(rVal >>= nFS))
-            return sal_False;
+            return false;
         eFS = (::com::sun::star::drawing::FillStyle)nFS;
     }
 
     SetValue( sal::static_int_cast< USHORT >( eFS ) );
 
-    return sal_True;
+    return true;
 }
 
 
@@ -3347,23 +3347,23 @@ SfxItemPresentation XFillColorItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-sal_Bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
 
-    return sal_True;
+    return true;
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue ))
-        return sal_False;
+        return false;
 
     SetColorValue( nValue );
-    return sal_True;
+    return true;
 }
 
 // -----------------------------
@@ -3774,7 +3774,7 @@ SfxItemPresentation XFillGradientItem::GetPresentation
 }
 
 // -----------------------------------------------------------------------
-sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
 {
     //sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -3847,14 +3847,14 @@ sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE n
         case MID_GRADIENT_ENDINTENSITY: rVal <<= GetGradientValue().GetEndIntens(); break;
         case MID_GRADIENT_STEPCOUNT: rVal <<= GetGradientValue().GetSteps(); break;
 
-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;
+        default: DBG_ERROR("Wrong MemberId!"); return false;
     }
 
-    return sal_True;
+    return true;
 }
 
 // -----------------------------------------------------------------------
-sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -3900,17 +3900,17 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
                     SetGradientValue( aXGradient );
                 }
 
-                return sal_True;
+                return true;
             }
 
-            return sal_False;
+            return false;
         }
 
         case MID_NAME:
         {
             rtl::OUString aName;
             if (!(rVal >>= aName ))
-                return sal_False;
+                return false;
             SetName( aName );
             break;
         }
@@ -3919,7 +3919,7 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
         {
             ::com::sun::star::awt::Gradient aGradient2;
             if(!(rVal >>= aGradient2))
-                return sal_False;
+                return false;
 
             XGradient aXGradient;
 
@@ -3943,7 +3943,7 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
         {
             sal_Int32 nVal = 0;
             if(!(rVal >>= nVal ))
-                return sal_False;
+                return false;
 
             XGradient aXGradient = GetGradientValue();
 
@@ -3966,7 +3966,7 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
         {
             sal_Int16 nVal = sal_Int16();
             if(!(rVal >>= nVal ))
-                return sal_False;
+                return false;
 
             XGradient aXGradient = GetGradientValue();
 
@@ -3995,7 +3995,7 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 BOOL XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
@@ -4134,14 +4134,14 @@ USHORT XFillFloatTransparenceItem::GetVersion( USHORT nFileFormatVersion ) const
 
 //------------------------------------------------------------------------
 
-sal_Bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
 {
     return XFillGradientItem::QueryValue( rVal, nMemberId );
 }
 
 //------------------------------------------------------------------------
 
-sal_Bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
 {
     return XFillGradientItem::PutValue( rVal, nMemberId );
 }
@@ -4479,7 +4479,7 @@ FASTBOOL XFillHatchItem::ScaleMetrics(long nMul, long nDiv)
 }
 
 // -----------------------------------------------------------------------
-sal_Bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -4536,14 +4536,14 @@ sal_Bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
         case MID_HATCH_ANGLE:
             rVal <<= aHatch.GetAngle(); break;
 
-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;
+        default: DBG_ERROR("Wrong MemberId!"); return false;
     }
 
-    return sal_True;
+    return true;
 }
 
 // -----------------------------------------------------------------------
-sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -4579,17 +4579,17 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
                     aHatch.SetAngle( aUnoHatch.Angle );
                 }
 
-                return sal_True;
+                return true;
             }
 
-            return sal_False;
+            return false;
         }
 
         case MID_FILLHATCH:
         {
             ::com::sun::star::drawing::Hatch aUnoHatch;
             if(!(rVal >>= aUnoHatch))
-                return sal_False;
+                return false;
 
             aHatch.SetHatchStyle( (XHatchStyle)aUnoHatch.Style );
             aHatch.SetColor( aUnoHatch.Color );
@@ -4602,7 +4602,7 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
         {
             rtl::OUString aName;
             if (!(rVal >>= aName ))
-                return sal_False;
+                return false;
             SetName( aName );
             break;
         }
@@ -4611,7 +4611,7 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
         {
             sal_Int16 nVal = sal_Int16();
             if (!(rVal >>= nVal ))
-                return sal_False;
+                return false;
             aHatch.SetHatchStyle( (XHatchStyle)nVal );
             break;
         }
@@ -4622,7 +4622,7 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
         {
             sal_Int32 nVal = 0;
             if (!(rVal >>= nVal ))
-                return sal_False;
+                return false;
 
             if ( nMemberId == MID_HATCH_COLOR )
                 aHatch.SetColor( nVal );
@@ -4633,10 +4633,10 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
             break;
         }
 
-        default: DBG_ERROR("Wrong MemberId!"); return sal_False;
+        default: DBG_ERROR("Wrong MemberId!"); return false;
     }
 
-    return sal_True;
+    return true;
 }
 
 BOOL XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
@@ -4753,10 +4753,10 @@ USHORT XFormTextStyleItem::GetValueCount() const
 \*************************************************************************/
 
 // #FontWork#
-sal_Bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
-    return sal_True;
+    return true;
 }
 
 /*************************************************************************
@@ -4766,13 +4766,13 @@ sal_Bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) con
 \*************************************************************************/
 
 // #FontWork#
-sal_Bool XFormTextStyleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFormTextStyleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
     SetValue(sal::static_int_cast< USHORT >(nValue));
 
-    return sal_True;
+    return true;
 }
 
 //-------------------------
@@ -4858,10 +4858,10 @@ USHORT XFormTextAdjustItem::GetValueCount() const
 \*************************************************************************/
 
 // #FontWork#
-sal_Bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
-    return sal_True;
+    return true;
 }
 
 /*************************************************************************
@@ -4871,13 +4871,13 @@ sal_Bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) co
 \*************************************************************************/
 
 // #FontWork#
-sal_Bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
     SetValue(sal::static_int_cast< USHORT >(nValue));
 
-    return sal_True;
+    return true;
 }
 
 //----------------------------
@@ -5220,10 +5220,10 @@ USHORT XFormTextShadowItem::GetValueCount() const
 \*************************************************************************/
 
 // #FontWork#
-sal_Bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
-    return sal_True;
+    return true;
 }
 
 /*************************************************************************
@@ -5233,13 +5233,13 @@ sal_Bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) co
 \*************************************************************************/
 
 // #FontWork#
-sal_Bool XFormTextShadowItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFormTextShadowItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
     SetValue(sal::static_int_cast< USHORT >(nValue));
 
-    return sal_True;
+    return true;
 }
 
 // -------------------------------
@@ -5539,10 +5539,10 @@ USHORT XFormTextStdFormItem::GetValueCount() const
 \*************************************************************************/
 
 // #FontWork#
-sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
-    return sal_True;
+    return true;
 }
 
 /*************************************************************************
@@ -5552,13 +5552,13 @@ sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) c
 \*************************************************************************/
 
 // #FontWork#
-sal_Bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
     SetValue(sal::static_int_cast< USHORT >(nValue));
 
-    return sal_True;
+    return true;
 }
 
 // --------------------------
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index ea91bc120201..f01ee3fb61d7 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -238,7 +238,7 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres,
 
 // -----------------------------------------------------------------------------
 
-sal_Bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
 {
     ::com::sun::star::drawing::LineJoint eJoint = ::com::sun::star::drawing::LineJoint_NONE;
 
@@ -263,12 +263,12 @@ sal_Bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nM
     }
 
     rVal <<= eJoint;
-    return sal_True;
+    return true;
 }
 
 // -----------------------------------------------------------------------------
 
-BOOL XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
 {
     XLineJoint eJoint = XLINEJOINT_NONE;
     ::com::sun::star::drawing::LineJoint eUnoJoint;
@@ -278,7 +278,7 @@ BOOL XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM
         // also try an int (for Basic)
         sal_Int32 nLJ = 0;
         if(!(rVal >>= nLJ))
-            return sal_False;
+            return false;
         eUnoJoint = (::com::sun::star::drawing::LineJoint)nLJ;
     }
 
@@ -302,7 +302,7 @@ BOOL XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM
 
     SetValue( sal::static_int_cast< USHORT >( eJoint ) );
 
-    return sal_True;
+    return true;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 486602e28256..5ab5f1e1d76e 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -716,7 +716,7 @@ SfxItemPresentation XFillBitmapItem::GetPresentation
 
 //------------------------------------------------------------------------
 
-sal_Bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -777,12 +777,12 @@ sal_Bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMe
         rVal <<= aPropSeq;
     }
 
-    return sal_True;
+    return true;
 }
 
 //------------------------------------------------------------------------
 
-sal_Bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;