filter/msfilter: sal_Bool->bool

Change-Id: I24deda680469ce99ba358a68e83551bdb584751a

8 files changed, 504 insertions, 504 deletions

diff --git a/filter/source/msfilter/dffpropset.cxx b/filter/source/msfilter/dffpropset.cxx
index 4af0a0c169fa..189ff085234a 100644
--- a/filter/source/msfilter/dffpropset.cxx
+++ b/filter/source/msfilter/dffpropset.cxx
@@ -1264,9 +1264,9 @@ void DffPropSet::InitializePropSet( sal_uInt16 nPropSetType ) const
     }
 }
 
-sal_Bool DffPropSet::IsHardAttribute( sal_uInt32 nId ) const
+bool DffPropSet::IsHardAttribute( sal_uInt32 nId ) const
 {
-    sal_Bool bRetValue = sal_True;
+    bool bRetValue = true;
     nId &= 0x3ff;
     if ( ( nId & 0x3f ) >= 48 ) // is this a flag id
         bRetValue = (mpPropSetEntries[nId | 0x3f].nComplexIndexOrFlagsHAttr
@@ -1317,7 +1317,7 @@ OUString DffPropSet::GetPropertyString( sal_uInt32 nId, SvStream& rStrm ) const
     return aBuffer.makeStringAndClear();
 }
 
-sal_Bool DffPropSet::SeekToContent( sal_uInt32 nRecType, SvStream& rStrm ) const
+bool DffPropSet::SeekToContent( sal_uInt32 nRecType, SvStream& rStrm ) const
 {
     nRecType &= 0x3ff;
     if ( mpPropSetEntries[ nRecType ].aFlags.bSet )
@@ -1328,11 +1328,11 @@ sal_Bool DffPropSet::SeekToContent( sal_uInt32 nRecType, SvStream& rStrm ) const
             if ( nIndex < maOffsets.size() )
             {
                 rStrm.Seek( maOffsets[ nIndex ] );
-                return sal_True;
+                return true;
             }
         }
     }
-    return sal_False;
+    return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index ffe2cb729d6f..370c06e13d9a 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -145,7 +145,7 @@ void EscherPropertyContainer::ImplInit()
     nCountCount = 0;
     nCountSize = 0;
     nSortBufSize = 64;
-    bHasComplexData = sal_False;
+    bHasComplexData = false;
     pSortStruct = new EscherPropSortStruct[ nSortBufSize ];
 }
 
@@ -178,7 +178,7 @@ EscherPropertyContainer::~EscherPropertyContainer()
     delete[] pSortStruct;
 };
 
-void EscherPropertyContainer::AddOpt( sal_uInt16 nPropID, sal_uInt32 nPropValue, sal_Bool bBlib )
+void EscherPropertyContainer::AddOpt( sal_uInt16 nPropID, sal_uInt32 nPropValue, bool bBlib )
 {
     AddOpt( nPropID, bBlib, nPropValue, NULL, 0 );
 }
@@ -195,10 +195,10 @@ void EscherPropertyContainer::AddOpt( sal_uInt16 nPropID, const OUString& rStrin
     }
     pBuf[ j++ ] = 0;
     pBuf[ j++ ] = 0;
-    AddOpt( nPropID, sal_True, nLen, pBuf, nLen );
+    AddOpt( nPropID, true, nLen, pBuf, nLen );
 }
 
-void EscherPropertyContainer::AddOpt( sal_uInt16 nPropID, sal_Bool bBlib, sal_uInt32 nPropValue, sal_uInt8* pProp, sal_uInt32 nPropSize )
+void EscherPropertyContainer::AddOpt( sal_uInt16 nPropID, bool bBlib, sal_uInt32 nPropValue, sal_uInt8* pProp, sal_uInt32 nPropSize )
 {
     if ( bBlib )                // bBlib is only valid when fComplex = 0
         nPropID |= 0x4000;
@@ -245,33 +245,33 @@ void EscherPropertyContainer::AddOpt( sal_uInt16 nPropID, sal_Bool bBlib, sal_uI
     if ( pProp )
     {
         nCountSize += nPropSize;
-        bHasComplexData = sal_True;
+        bHasComplexData = true;
     }
 }
 
-sal_Bool EscherPropertyContainer::GetOpt( sal_uInt16 nPropId, sal_uInt32& rPropValue ) const
+bool EscherPropertyContainer::GetOpt( sal_uInt16 nPropId, sal_uInt32& rPropValue ) const
 {
     EscherPropSortStruct aPropStruct;
 
     if ( GetOpt( nPropId, aPropStruct ) )
     {
         rPropValue = aPropStruct.nPropValue;
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool EscherPropertyContainer::GetOpt( sal_uInt16 nPropId, EscherPropSortStruct& rPropValue ) const
+bool EscherPropertyContainer::GetOpt( sal_uInt16 nPropId, EscherPropSortStruct& rPropValue ) const
 {
     for( sal_uInt32 i = 0; i < nSortCount; i++ )
     {
         if ( ( pSortStruct[ i ].nPropId &~0xc000 ) == ( nPropId &~0xc000 ) )
         {
             rPropValue = pSortStruct[ i ];
-            return sal_True;
+            return true;
         }
     }
-    return sal_False;
+    return false;
 }
 
 EscherProperties EscherPropertyContainer::GetOpts() const
@@ -324,14 +324,14 @@ void EscherPropertyContainer::Commit( SvStream& rSt, sal_uInt16 nVersion, sal_uI
     }
 }
 
-sal_Bool EscherPropertyContainer::IsFontWork() const
+bool EscherPropertyContainer::IsFontWork() const
 {
     sal_uInt32 nTextPathFlags = 0;
     GetOpt( DFF_Prop_gtextFStrikethrough, nTextPathFlags );
     return ( nTextPathFlags & 0x4000 ) != 0;
 }
 
-sal_uInt32 EscherPropertyContainer::ImplGetColor( const sal_uInt32 nSOColor, sal_Bool bSwap )
+sal_uInt32 EscherPropertyContainer::ImplGetColor( const sal_uInt32 nSOColor, bool bSwap )
 {
     if ( bSwap )
     {
@@ -424,7 +424,7 @@ void EscherPropertyContainer::CreateGradientProperties(
 }
 
 void EscherPropertyContainer::CreateGradientProperties(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet , sal_Bool bTransparentGradient)
+    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet , bool bTransparentGradient)
 {
     ::com::sun::star::uno::Any          aAny;
     ::com::sun::star::awt::Gradient*    pGradient = NULL;
@@ -439,14 +439,14 @@ void EscherPropertyContainer::CreateGradientProperties(
 
     // Transparency gradient: Means the third setting in transparency page is set
     if (bTransparentGradient &&  EscherPropertyValueHelper::GetPropertyValue(
-        aAny, rXPropSet, OUString( "FillTransparenceGradient" ), sal_False ) )
+        aAny, rXPropSet, OUString( "FillTransparenceGradient" ), false ) )
     {
         pGradient = (::com::sun::star::awt::Gradient*)aAny.getValue();
 
         ::com::sun::star::uno::Any          aAnyTemp;
         const rtl::OUString aPropName( "FillStyle" );
         if ( EscherPropertyValueHelper::GetPropertyValue(
-            aAnyTemp, rXPropSet, aPropName, sal_False ) )
+            aAnyTemp, rXPropSet, aPropName, false ) )
         {
             ::com::sun::star::drawing::FillStyle eFS;
             if ( ! ( aAnyTemp >>= eFS ) )
@@ -455,17 +455,17 @@ void EscherPropertyContainer::CreateGradientProperties(
             if ( eFS == ::com::sun::star::drawing::FillStyle_SOLID)
             {
                 if ( EscherPropertyValueHelper::GetPropertyValue(
-                    aAnyTemp, rXPropSet, OUString( "FillColor" ), sal_False ) )
+                    aAnyTemp, rXPropSet, OUString( "FillColor" ), false ) )
                 {
-                    pGradient->StartColor = ImplGetColor( *((sal_uInt32*)aAnyTemp.getValue()), sal_False );
-                    pGradient->EndColor = ImplGetColor( *((sal_uInt32*)aAnyTemp.getValue()), sal_False );
+                    pGradient->StartColor = ImplGetColor( *((sal_uInt32*)aAnyTemp.getValue()), false );
+                    pGradient->EndColor = ImplGetColor( *((sal_uInt32*)aAnyTemp.getValue()), false );
                 }
             }
             // gradient and transparency.
             else if( eFS == ::com::sun::star::drawing::FillStyle_GRADIENT )
             {
                 if ( EscherPropertyValueHelper::GetPropertyValue(
-                    aAny, rXPropSet, OUString( "FillGradient" ), sal_False ) )
+                    aAny, rXPropSet, OUString( "FillGradient" ), false ) )
                     pGradient = (::com::sun::star::awt::Gradient*)aAny.getValue();
             }
         }
@@ -473,7 +473,7 @@ void EscherPropertyContainer::CreateGradientProperties(
     }
     // Not transparency gradient
     else if ( EscherPropertyValueHelper::GetPropertyValue(
-        aAny, rXPropSet, OUString( "FillGradient" ), sal_False ) )
+        aAny, rXPropSet, OUString( "FillGradient" ), false ) )
     {
         pGradient = (::com::sun::star::awt::Gradient*)aAny.getValue();
     }
@@ -542,7 +542,7 @@ void EscherPropertyContainer::CreateGradientProperties(
 
     // Transparency gradient
     if (bTransparentGradient &&  EscherPropertyValueHelper::GetPropertyValue(
-        aAny, rXPropSet, OUString( "FillTransparenceGradient" ), sal_False ) )
+        aAny, rXPropSet, OUString( "FillTransparenceGradient" ), false ) )
     {
         pGradient = (::com::sun::star::awt::Gradient*)aAny.getValue();
         if ( pGradient )
@@ -557,7 +557,7 @@ void EscherPropertyContainer::CreateGradientProperties(
 
 void    EscherPropertyContainer::CreateFillProperties(
     const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
-    sal_Bool bEdge ,  const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
+    bool bEdge ,  const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
 {
     if ( rXShape.is() )
     {
@@ -566,7 +566,7 @@ void    EscherPropertyContainer::CreateFillProperties(
         {
             SfxItemSet aAttr( pObj->GetMergedItemSet() );
             // tranparency with gradient. Means the third setting in transparency page is set
-            sal_Bool bTransparentGradient =  ( aAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) &&
+            bool bTransparentGradient =  ( aAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) &&
                 ( (const XFillFloatTransparenceItem&) aAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled();
             CreateFillProperties(  rXPropSet, bEdge, bTransparentGradient );
         }
@@ -575,7 +575,7 @@ void    EscherPropertyContainer::CreateFillProperties(
 
 void EscherPropertyContainer::CreateFillProperties(
     const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
-    sal_Bool bEdge , sal_Bool bTransparentGradient)
+    bool bEdge , bool bTransparentGradient)
 
 {
     ::com::sun::star::uno::Any aAny;
@@ -584,7 +584,7 @@ void EscherPropertyContainer::CreateFillProperties(
     const OUString aPropName( "FillStyle" );
 
     if ( EscherPropertyValueHelper::GetPropertyValue(
-            aAny, rXPropSet, aPropName, sal_False ) )
+            aAny, rXPropSet, aPropName, false ) )
     {
         ::com::sun::star::drawing::FillStyle eFS;
         if ( ! ( aAny >>= eFS ) )
@@ -601,14 +601,14 @@ void EscherPropertyContainer::CreateFillProperties(
 
             case ::com::sun::star::drawing::FillStyle_BITMAP :
             {
-                CreateGraphicProperties( rXPropSet, OUString( "FillBitmapURL" ), sal_True );
+                CreateGraphicProperties( rXPropSet, OUString( "FillBitmapURL" ), true );
                 AddOpt( ESCHER_Prop_fNoFillHitTest, 0x140014 );
                 AddOpt( ESCHER_Prop_fillBackColor, nFillBackColor  );
             }
             break;
             case ::com::sun::star::drawing::FillStyle_HATCH :
             {
-                CreateGraphicProperties( rXPropSet, OUString( "FillHatch" ), sal_True );
+                CreateGraphicProperties( rXPropSet, OUString( "FillHatch" ), true );
             }
             break;
             case ::com::sun::star::drawing::FillStyle_SOLID :
@@ -624,7 +624,7 @@ void EscherPropertyContainer::CreateFillProperties(
                         AddOpt( ESCHER_Prop_fillType, ESCHER_FillSolid );
 
                     if ( EscherPropertyValueHelper::GetPropertyValue(
-                            aAny, rXPropSet, OUString( "FillColor" ), sal_False ) )
+                            aAny, rXPropSet, OUString( "FillColor" ), false ) )
                     {
                         sal_uInt32 nFillColor = ImplGetColor( *((sal_uInt32*)aAny.getValue()) );
                         nFillBackColor = nFillColor ^ 0xffffff;
@@ -642,7 +642,7 @@ void EscherPropertyContainer::CreateFillProperties(
         if ( eFS != ::com::sun::star::drawing::FillStyle_NONE )
         {
             sal_uInt16 nTransparency = ( EscherPropertyValueHelper::GetPropertyValue(
-                aAny, rXPropSet, OUString( "FillTransparence" ), sal_True ) )
+                aAny, rXPropSet, OUString( "FillTransparence" ), true ) )
                 ? *((sal_Int16*)aAny.getValue() ) : 0;
             if (  nTransparency )
                 AddOpt( ESCHER_Prop_fillOpacity, ( ( 100 - nTransparency ) << 16 ) / 100 );
@@ -653,7 +653,7 @@ void EscherPropertyContainer::CreateFillProperties(
 
 void EscherPropertyContainer::CreateTextProperties(
     const uno::Reference< beans::XPropertySet > & rXPropSet, sal_uInt32 nTextId,
-        const sal_Bool bIsCustomShape, const sal_Bool bIsTextFrame )
+        const bool bIsCustomShape, const bool bIsTextFrame )
 {
     uno::Any aAny;
     text::WritingMode               eWM( text::WritingMode_LR_TB );
@@ -672,22 +672,22 @@ void EscherPropertyContainer::CreateTextProperties(
     sal_Bool bWordWrap          ( sal_False );
     sal_Bool bAutoGrowSize      ( sal_False );
 
-    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "TextWritingMode" ), sal_True ) )
+    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "TextWritingMode" ), true ) )
         aAny >>= eWM;
-    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "TextVerticalAdjust" ), sal_True ) )
+    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "TextVerticalAdjust" ), true ) )
         aAny >>= eVA;
-    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "TextHorizontalAdjust" ), sal_True ) )
+    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "TextHorizontalAdjust" ), true ) )
         aAny >>= eHA;
     if ( bIsCustomShape )
     {
-        if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "TextWordWrap" ), sal_False ) )
+        if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "TextWordWrap" ), false ) )
             aAny >>= bWordWrap;
-        if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "TextAutoGrowHeight" ), sal_True ) )
+        if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "TextAutoGrowHeight" ), true ) )
             aAny >>= bAutoGrowSize;
     }
     else if ( bIsTextFrame )
     {
-        if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "TextAutoGrowWidth" ), sal_True ) )
+        if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "TextAutoGrowWidth" ), true ) )
             aAny >>= bAutoGrowWidth;
 
 // i63936 not setting autogrowheight, because otherwise
@@ -828,7 +828,7 @@ void EscherPropertyContainer::CreateTextProperties(
     if (bIsTextFrame && !bIsCustomShape)
     {
         sal_uInt16 nAngle = EscherPropertyValueHelper::GetPropertyValue(
-            aAny, rXPropSet, OUString( "RotateAngle" ), sal_True ) ?
+            aAny, rXPropSet, OUString( "RotateAngle" ), true ) ?
                 (sal_uInt16)( ( *((sal_Int32*)aAny.getValue() ) ) + 5 ) / 10 : 0;
         if (nAngle==900)
         {
@@ -841,7 +841,7 @@ void EscherPropertyContainer::CreateTextProperties(
     }
 }
 
-sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart,
+bool EscherPropertyContainer::GetLineArrow( const bool bLineStart,
     const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
         ESCHER_LineEnd& reLineEnd, sal_Int32& rnArrowLength, sal_Int32& rnArrowWidth )
 {
@@ -857,7 +857,7 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart,
 
     ::com::sun::star::uno::Any aAny;
     if ( EscherPropertyValueHelper::GetPropertyValue(
-            aAny, rXPropSet, sLine, sal_False ) )
+            aAny, rXPropSet, sLine, false ) )
     {
         PolyPolygon aPolyPoly( EscherPropertyContainer::GetPolyPolygon( aAny ) );
         if ( aPolyPoly.Count() && aPolyPoly[ 0 ].GetSize() )
@@ -869,7 +869,7 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart,
             rnArrowWidth  = 1;
 
             if ( EscherPropertyValueHelper::GetPropertyValue(
-                aAny, rXPropSet, sLineName, sal_False ) )
+                aAny, rXPropSet, sLineName, false ) )
             {
                 OUString        aArrowStartName = *(OUString*)aAny.getValue();
                 sal_Int16       nWhich = bLineStart ? XATTR_LINESTART : XATTR_LINEEND;
@@ -946,7 +946,7 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart,
 
 void EscherPropertyContainer::CreateLineProperties(
     const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
-        sal_Bool bEdge )
+        bool bEdge )
 {
     ::com::sun::star::uno::Any aAny;
     sal_uInt32 nLineFlags = 0x80008;
@@ -956,7 +956,7 @@ void EscherPropertyContainer::CreateLineProperties(
     sal_Int32 nArrowWidth;
 
     sal_Bool bSwapLineEnds = sal_False;
-    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "CircleKind" ), sal_True ) )
+    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "CircleKind" ), true ) )
     {
         ::com::sun::star::drawing::CircleKind  eCircleKind;
         if ( aAny >>= eCircleKind )
@@ -981,7 +981,7 @@ void EscherPropertyContainer::CreateLineProperties(
     }
 
     // support LineCaps
-    if(EscherPropertyValueHelper::GetPropertyValue(aAny, rXPropSet, OUString( "LineCap" ), sal_False))
+    if(EscherPropertyValueHelper::GetPropertyValue(aAny, rXPropSet, OUString( "LineCap" ), false))
     {
         ::com::sun::star::drawing::LineCap aLineCap(com::sun::star::drawing::LineCap_BUTT);
 
@@ -1008,7 +1008,7 @@ void EscherPropertyContainer::CreateLineProperties(
         }
     }
 
-    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineStyle" ), sal_False ) )
+    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineStyle" ), false ) )
     {
         ::com::sun::star::drawing::LineStyle eLS;
         if ( aAny >>= eLS )
@@ -1021,7 +1021,7 @@ void EscherPropertyContainer::CreateLineProperties(
 
                 case ::com::sun::star::drawing::LineStyle_DASH :
                 {
-                    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineDash" ), sal_False ) )
+                    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineDash" ), false ) )
                     {
                         ESCHER_LineDashing eDash = ESCHER_LineSolid;
                         ::com::sun::star::drawing::LineDash* pLineDash = (::com::sun::star::drawing::LineDash*)aAny.getValue();
@@ -1076,7 +1076,7 @@ void EscherPropertyContainer::CreateLineProperties(
                 break;
             }
         }
-        if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineColor" ), sal_False ) )
+        if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineColor" ), false ) )
         {
             sal_uInt32 nLineColor = ImplGetColor( *((sal_uInt32*)aAny.getValue()) );
             AddOpt( ESCHER_Prop_lineColor, nLineColor );
@@ -1084,13 +1084,13 @@ void EscherPropertyContainer::CreateLineProperties(
         }
     }
 
-    sal_uInt32 nLineSize = ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineWidth" ), sal_False ) )
+    sal_uInt32 nLineSize = ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineWidth" ), false ) )
         ? *((sal_uInt32*)aAny.getValue()) : 0;
     if ( nLineSize > 1 )
         AddOpt( ESCHER_Prop_lineWidth, nLineSize * 360 );       // 100TH MM -> PT , 1PT = 12700 EMU
 
     ESCHER_LineJoin eLineJoin = ESCHER_LineJoinMiter;
-    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineJoint" ), sal_True ) )
+    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineJoint" ), true ) )
     {
         ::com::sun::star::drawing::LineJoint eLJ;
         if ( aAny >>= eLJ )
@@ -1115,7 +1115,7 @@ void EscherPropertyContainer::CreateLineProperties(
     AddOpt( ESCHER_Prop_lineJoinStyle, eLineJoin );
 
     if ( EscherPropertyValueHelper::GetPropertyValue(
-        aAny, rXPropSet, "LineTransparence", sal_True ) )
+        aAny, rXPropSet, "LineTransparence", true ) )
     {
         sal_Int16 nTransparency = 0;
         if ( aAny >>= nTransparency )
@@ -1123,7 +1123,7 @@ void EscherPropertyContainer::CreateLineProperties(
     }
 
 
-    if ( bEdge == sal_False )
+    if ( !bEdge )
     {
         AddOpt( ESCHER_Prop_fFillOK, 0x1001 );
         AddOpt( ESCHER_Prop_fNoFillHitTest, 0x100000 );
@@ -1141,7 +1141,7 @@ static Size lcl_SizeToEmu(Size aPrefSize, MapMode aPrefMapMode)
 }
 
 void EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
-                                                            sal_uInt32 nBlibId, sal_Bool bCreateCroppingAttributes )
+                                                            sal_uInt32 nBlibId, bool bCreateCroppingAttributes )
 {
     ::com::sun::star::uno::Any aAny;
 
@@ -1238,7 +1238,7 @@ void EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::sta
     }
 }
 
-sal_Bool EscherPropertyContainer::CreateShapeProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
+bool EscherPropertyContainer::CreateShapeProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
 {
     uno::Reference< beans::XPropertySet > aXPropSet( rXShape, uno::UNO_QUERY );
     if ( aXPropSet.is() )
@@ -1246,13 +1246,13 @@ sal_Bool EscherPropertyContainer::CreateShapeProperties( const ::com::sun::star:
         sal_Bool bVal = false;
         ::com::sun::star::uno::Any aAny;
         sal_uInt32 nShapeAttr = 0;
-        EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "Visible" ), sal_True );
+        EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "Visible" ), true );
         if ( aAny >>= bVal )
         {
             if ( !bVal )
                 nShapeAttr |= 0x20002;  // set fHidden = true
         }
-        EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "Printable" ), sal_True );
+        EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "Printable" ), true );
         if ( aAny >>= bVal )
         {
             if ( !bVal )
@@ -1261,13 +1261,13 @@ sal_Bool EscherPropertyContainer::CreateShapeProperties( const ::com::sun::star:
         if ( nShapeAttr )
             AddOpt( ESCHER_Prop_fPrint, nShapeAttr );
     }
-    return sal_True;
+    return true;
 }
 
-sal_Bool EscherPropertyContainer::CreateOLEGraphicProperties(
+bool EscherPropertyContainer::CreateOLEGraphicProperties(
     const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
 {
-    sal_Bool    bRetValue = sal_False;
+    bool    bRetValue = false;
 
     if ( rXShape.is() )
     {
@@ -1285,9 +1285,9 @@ sal_Bool EscherPropertyContainer::CreateOLEGraphicProperties(
     return bRetValue;
 }
 
-sal_Bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, const GraphicObject& rGraphicObj )
+bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, const GraphicObject& rGraphicObj )
 {
-    sal_Bool    bRetValue = sal_False;
+    bool    bRetValue = false;
     OString aUniqueId( rGraphicObj.GetUniqueID() );
     if ( !aUniqueId.isEmpty() )
     {
@@ -1307,9 +1307,9 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::sta
             sal_uInt32 nBlibId = pGraphicProvider->GetBlibID( *pPicOutStrm, aUniqueId, aRect, pVisArea, NULL );
             if ( nBlibId )
             {
-                AddOpt( ESCHER_Prop_pib, nBlibId, sal_True );
-                ImplCreateGraphicAttributes( aXPropSet, nBlibId, sal_False );
-                bRetValue = sal_True;
+                AddOpt( ESCHER_Prop_pib, nBlibId, true );
+                ImplCreateGraphicAttributes( aXPropSet, nBlibId, false );
+                bRetValue = true;
             }
             delete pVisArea;
         }
@@ -1317,10 +1317,10 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::sta
     return bRetValue;
 }
 
-sal_Bool EscherPropertyContainer::CreateMediaGraphicProperties(
+bool EscherPropertyContainer::CreateMediaGraphicProperties(
     const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
 {
-    sal_Bool    bRetValue = sal_False;
+    bool    bRetValue = false;
     if ( rXShape.is() )
     {
         SdrObject* pSdrMedia( GetSdrObjectFromXShape( rXShape ) );  // SJ: leaving unoapi, because currently there is
@@ -1333,7 +1333,7 @@ sal_Bool EscherPropertyContainer::CreateMediaGraphicProperties(
     return bRetValue;
 }
 
-sal_Bool EscherPropertyContainer::ImplCreateEmbeddedBmp( const OString& rUniqueId )
+bool EscherPropertyContainer::ImplCreateEmbeddedBmp( const OString& rUniqueId )
 {
     if( !rUniqueId.isEmpty() )
     {
@@ -1347,17 +1347,17 @@ sal_Bool EscherPropertyContainer::ImplCreateEmbeddedBmp( const OString& rUniqueI
             aMemStrm.ObjectOwnsMemory( false );
             sal_uInt8* pBuf = (sal_uInt8*) aMemStrm.GetData();
             sal_uInt32 nSize = aMemStrm.Seek( STREAM_SEEK_TO_END );
-            AddOpt( ESCHER_Prop_fillBlip, sal_True, nSize, pBuf, nSize );
-            return sal_True;
+            AddOpt( ESCHER_Prop_fillBlip, true, nSize, pBuf, nSize );
+            return true;
         }
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool EscherPropertyContainer::CreateEmbeddedBitmapProperties(
+bool EscherPropertyContainer::CreateEmbeddedBitmapProperties(
     const OUString& rBitmapUrl, ::com::sun::star::drawing::BitmapMode eBitmapMode )
 {
-    sal_Bool bRetValue = sal_False;
+    bool bRetValue = false;
     OUString aVndUrl( "vnd.sun.star.GraphicObject:" );
     OUString aBmpUrl( rBitmapUrl );
     sal_Int32 nIndex = aBmpUrl.indexOf( aVndUrl, 0 );
@@ -1411,24 +1411,24 @@ GraphicObject lclDrawHatch( const ::com::sun::star::drawing::Hatch& rHatch, cons
 } // namespace
 
 
-sal_Bool EscherPropertyContainer::CreateEmbeddedHatchProperties( const ::com::sun::star::drawing::Hatch& rHatch, const Color& rBackColor, bool bFillBackground )
+bool EscherPropertyContainer::CreateEmbeddedHatchProperties( const ::com::sun::star::drawing::Hatch& rHatch, const Color& rBackColor, bool bFillBackground )
 {
     const Rectangle aRect(pShapeBoundRect ? *pShapeBoundRect : Rectangle(Point(0,0), Size(28000, 21000)));
     GraphicObject aGraphicObject = lclDrawHatch( rHatch, rBackColor, bFillBackground, aRect );
     OString aUniqueId = aGraphicObject.GetUniqueID();
-    sal_Bool bRetValue = ImplCreateEmbeddedBmp( aUniqueId );
+    bool bRetValue = ImplCreateEmbeddedBmp( aUniqueId );
     if ( bRetValue )
         AddOpt( ESCHER_Prop_fillType, ESCHER_FillTexture );
     return bRetValue;
 }
 
 
-sal_Bool EscherPropertyContainer::CreateGraphicProperties(
+bool EscherPropertyContainer::CreateGraphicProperties(
     const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
-        const OUString& rSource, const sal_Bool bCreateFillBitmap, const sal_Bool bCreateCroppingAttributes,
-            const sal_Bool bFillBitmapModeAllowed, const sal_Bool bOOxmlExport )
+        const OUString& rSource, const bool bCreateFillBitmap, const bool bCreateCroppingAttributes,
+            const bool bFillBitmapModeAllowed, const bool bOOxmlExport )
 {
-    sal_Bool        bRetValue = sal_False;
+    bool        bRetValue = false;
     sal_Bool        bCreateFillStyles = sal_False;
 
     sal_Bool        bMirrored = sal_False;
@@ -1505,12 +1505,12 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
             if ( aAny >>= aHatch )
             {
                 Color aBackColor;
-                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillColor" ), sal_False ) )
+                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillColor" ), false ) )
                 {
-                    aBackColor = ImplGetColor( *((sal_uInt32*)aAny.getValue()), sal_False );
+                    aBackColor = ImplGetColor( *((sal_uInt32*)aAny.getValue()), false );
                 }
                 bool bFillBackground = false;
-                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillBackground" ), sal_True ) )
+                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillBackground" ), true ) )
                 {
                     aAny >>= bFillBackground;
                 }
@@ -1523,7 +1523,7 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
             }
         }
 
-        if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "IsMirrored" ), sal_True ) )
+        if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "IsMirrored" ), true ) )
             aAny >>= bMirrored;
 
         // #121074# transparency of graphic is not supported in MS formats, get and apply it
@@ -1555,12 +1555,12 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
 
         if ( bCreateFillBitmap && bFillBitmapModeAllowed )
         {
-            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillBitmapMode" ), sal_True ) )
+            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillBitmapMode" ), true ) )
                 aAny >>= eBitmapMode;
         }
         else
         {
-            nAngle = bRotate && EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "RotateAngle" ), sal_True )
+            nAngle = bRotate && EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "RotateAngle" ), true )
                 ? (sal_uInt16)( ( *((sal_Int32*)aAny.getValue() ) ) + 5 ) / 10
                 : 0;
         }
@@ -1680,27 +1680,27 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
             if ( eBitmapMode == ::com::sun::star::drawing::BitmapMode_REPEAT )
             {
                 sal_Int32 nSizeX = 0,nSizeY = 0,nOffsetX = 0,nOffsetY = 0,nPosOffsetX = 0,nPosOffsetY = 0;
-                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, "FillBitmapSizeX", sal_True ) )
+                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, "FillBitmapSizeX", true ) )
                 {
                     aAny >>= nSizeX;
                 }
-                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, "FillBitmapSizeY", sal_True ) )
+                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, "FillBitmapSizeY", true ) )
                 {
                     aAny >>= nSizeY;
                 }
-                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, "FillBitmapOffsetX", sal_True ) )
+                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, "FillBitmapOffsetX", true ) )
                 {
                     aAny >>= nOffsetX;
                 }
-                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, "FillBitmapOffsetY", sal_True ) )
+                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, "FillBitmapOffsetY", true ) )
                 {
                     aAny >>= nOffsetY;
                 }
-                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, "FillBitmapPositionOffsetX", sal_True ) )
+                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, "FillBitmapPositionOffsetX", true ) )
                 {
                     aAny >>= nPosOffsetX;
                 }
-                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, "FillBitmapPositionOffsetY", sal_True ) )
+                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, "FillBitmapPositionOffsetY", true ) )
                 {
                     aAny >>= nPosOffsetY;
                 }
@@ -1724,15 +1724,15 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
                     {
                         if(bCreateFillBitmap)
                         {
-                            AddOpt(ESCHER_Prop_fillBlip, nBlibId, sal_True);
+                            AddOpt(ESCHER_Prop_fillBlip, nBlibId, true);
                         }
                         else
                         {
-                            AddOpt( ESCHER_Prop_pib, nBlibId, sal_True );
+                            AddOpt( ESCHER_Prop_pib, nBlibId, true );
                             ImplCreateGraphicAttributes( rXPropSet, nBlibId, bCreateCroppingAttributes );
                         }
 
-                        bRetValue = sal_True;
+                        bRetValue = true;
                     }
                 }
                 else
@@ -1748,8 +1748,8 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
                         aMemStrm.ObjectOwnsMemory( false );
                         sal_uInt8* pBuf = (sal_uInt8*) aMemStrm.GetData();
                         sal_uInt32 nSize = aMemStrm.Seek( STREAM_SEEK_TO_END );
-                        AddOpt( ESCHER_Prop_fillBlip, sal_True, nSize, pBuf, nSize );
-                        bRetValue = sal_True;
+                        AddOpt( ESCHER_Prop_fillBlip, true, nSize, pBuf, nSize );
+                        bRetValue = true;
                     }
                 }
             }
@@ -1768,7 +1768,7 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
     }
     delete pGraphicAttr;
     if ( bCreateFillStyles )
-        CreateFillProperties( rXPropSet, sal_True );
+        CreateFillProperties( rXPropSet, true );
 
     return bRetValue;
 }
@@ -1787,13 +1787,13 @@ PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno
 
     if ( aAny >>= aXPropSet )
     {
-        sal_Bool bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sPolyPolygonBezier, sal_True );
+        sal_Bool bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sPolyPolygonBezier, true );
         if ( !bHasProperty )
-            bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sPolyPolygon, sal_True );
+            bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sPolyPolygon, true );
         if ( !bHasProperty )
-            bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sPolygon, sal_True );
+            bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sPolygon, true );
         if ( !bHasProperty )
-            bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sCustomShapeGeometry, sal_True );
+            bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sCustomShapeGeometry, true );
         if ( bHasProperty )
             aRetPolyPoly = GetPolyPolygon( aAny );
     }
@@ -2010,17 +2010,17 @@ PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno
     return aPolyPolygon;
 }
 
-sal_Bool EscherPropertyContainer::CreatePolygonProperties(
+bool EscherPropertyContainer::CreatePolygonProperties(
     const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
-        sal_uInt32 nFlags,
-            sal_Bool bBezier,
-                ::com::sun::star::awt::Rectangle& rGeoRect,
-                    Polygon* pPolygon )
+          sal_uInt32 nFlags,
+          bool bBezier,
+          ::com::sun::star::awt::Rectangle& rGeoRect,
+          Polygon* pPolygon )
 {
     static OUString sPolyPolygonBezier  ( "PolyPolygonBezier" );
     static OUString sPolyPolygon        ( "PolyPolygon" );
 
-    sal_Bool    bRetValue = sal_True;
+    bool    bRetValue = true;
     sal_Bool    bLine = ( nFlags & ESCHER_CREATEPOLYGON_LINE ) != 0;
 
     PolyPolygon aPolyPolygon;
@@ -2031,7 +2031,7 @@ sal_Bool EscherPropertyContainer::CreatePolygonProperties(
     {
         ::com::sun::star::uno::Any aAny;
         bRetValue = EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
-                        ( bBezier ) ? sPolyPolygonBezier : sPolyPolygon, sal_True );
+                        ( bBezier ) ? sPolyPolygonBezier : sPolyPolygon, true );
         if ( bRetValue )
         {
             aPolyPolygon = GetPolyPolygon( aAny );
@@ -2052,7 +2052,7 @@ sal_Bool EscherPropertyContainer::CreatePolygonProperties(
                                 rPoly[ 1 ].Y() - rPoly[ 0 ].Y() );
             }
             else
-                bRetValue = sal_False;
+                bRetValue = false;
         }
         else
         {
@@ -2152,8 +2152,8 @@ sal_Bool EscherPropertyContainer::CreatePolygonProperties(
             AddOpt( ESCHER_Prop_geoBottom, rGeoRect.Height );
 
             AddOpt( ESCHER_Prop_shapePath, ESCHER_ShapeComplex );
-            AddOpt( ESCHER_Prop_pVertices, sal_True, nVerticesBufSize - 6, (sal_uInt8*)pVerticesBuf, nVerticesBufSize );
-            AddOpt( ESCHER_Prop_pSegmentInfo, sal_True, nSegmentBufSize, (sal_uInt8*)pSegmentBuf, nSegmentBufSize );
+            AddOpt( ESCHER_Prop_pVertices, true, nVerticesBufSize - 6, (sal_uInt8*)pVerticesBuf, nVerticesBufSize );
+            AddOpt( ESCHER_Prop_pSegmentInfo, true, nSegmentBufSize, (sal_uInt8*)pSegmentBuf, nSegmentBufSize );
         }
     }
     return bRetValue;
@@ -2263,7 +2263,7 @@ void lcl_Rotate(sal_Int32 nAngle, Point center, Point& pt)
 Generally, draw the connector from top to bottom, from left to right when meet the adjust value,
 but when (X1>X2 or Y1>Y2),the draw director must be reverse, FlipV or FlipH should be set to true.
 */
-sal_Bool lcl_GetAngle(Polygon &rPoly,sal_uInt16& rShapeFlags,sal_Int32& nAngle )
+bool lcl_GetAngle(Polygon &rPoly,sal_uInt16& rShapeFlags,sal_Int32& nAngle )
 {
     Point aStart = rPoly[0];
     Point aEnd = rPoly[rPoly.GetSize()-1];
@@ -2304,11 +2304,11 @@ sal_Bool lcl_GetAngle(Polygon &rPoly,sal_uInt16& rShapeFlags,sal_Int32& nAngle )
         nAngle *= 655;
         nAngle += 0x8000;
         nAngle &=~0xffff;                                  // round nAngle to whole number of degrees
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
-sal_Bool EscherPropertyContainer::CreateConnectorProperties(
+bool EscherPropertyContainer::CreateConnectorProperties(
     const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape,
     EscherSolverContainer& rSolverContainer, ::com::sun::star::awt::Rectangle& rGeoRect,
             sal_uInt16& rShapeType, sal_uInt16& rShapeFlags )
@@ -2320,7 +2320,7 @@ sal_Bool EscherPropertyContainer::CreateConnectorProperties(
     static OUString sEdgeEndConnection    ( "EdgeEndConnection" );
     static OUString sEdgePath             ( "PolyPolygonBezier" );
 
-    sal_Bool bRetValue = sal_False;
+    bool bRetValue = false;
     rShapeType = rShapeFlags = 0;
 
     if ( rXShape.is() )
@@ -2331,7 +2331,7 @@ sal_Bool EscherPropertyContainer::CreateConnectorProperties(
         ::com::sun::star::uno::Any aAny( rXShape->queryInterface( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >*) 0 ) ));
         if ( aAny >>= aXPropSet )
         {
-            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sEdgeKind, sal_True ) )
+            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sEdgeKind, true ) )
             {
                 ::com::sun::star::drawing::ConnectorType eCt;
                 aAny >>= eCt;
@@ -2394,7 +2394,7 @@ sal_Bool EscherPropertyContainer::CreateConnectorProperties(
                                             rShapeType = ( sal_uInt16 )( ESCHER_ShpInst_BentConnector2 + nAdjCount);
                                             for ( sal_Int32 i = 0 ; i < nAdjCount; ++ i)
                                                 AddOpt( (sal_uInt16) ( ESCHER_Prop_adjustValue+i) , lcl_GetConnectorAdjustValue( aPoly, i ) );
-                                            bRetValue = sal_True;
+                                            bRetValue = true;
                                         }
                                         sal_Int32 nAngle=0;
                                         if (lcl_GetAngle(aPoly,rShapeFlags,nAngle ))
@@ -2418,8 +2418,8 @@ sal_Bool EscherPropertyContainer::CreateConnectorProperties(
                             }
                             break;
                         }
-                        CreateLineProperties( aXPropSet, sal_False );
-                        bRetValue = sal_True;
+                        CreateLineProperties( aXPropSet, false );
+                        bRetValue = true;
                     }
                 }
             }
@@ -2428,7 +2428,7 @@ sal_Bool EscherPropertyContainer::CreateConnectorProperties(
     return bRetValue;
 }
 
-sal_Bool EscherPropertyContainer::CreateShadowProperties(
+bool EscherPropertyContainer::CreateShadowProperties(
     const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet )
 {
     ::com::sun::star::uno::Any aAny;
@@ -2446,20 +2446,20 @@ sal_Bool EscherPropertyContainer::CreateShadowProperties(
     sal_uInt32 nShadowFlags = 0x20000;
     if ( ( nLineFlags & 8 ) || ( nFillFlags & 0x10 ) || bGraphic )
     {
-        if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "Shadow" ), sal_True ) )
+        if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "Shadow" ), true ) )
         {
             if ( aAny >>= bHasShadow )
             {
                 if ( bHasShadow )
                 {
                     nShadowFlags |= 2;
-                    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowColor" ), sal_False ) )
+                    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowColor" ), false ) )
                         AddOpt( ESCHER_Prop_shadowColor, ImplGetColor( *((sal_uInt32*)aAny.getValue()) ) );
-                    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowXDistance" ), sal_False ) )
+                    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowXDistance" ), false ) )
                         AddOpt( ESCHER_Prop_shadowOffsetX, *((sal_Int32*)aAny.getValue()) * 360 );
-                    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowYDistance" ), sal_False ) )
+                    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowYDistance" ), false ) )
                         AddOpt( ESCHER_Prop_shadowOffsetY, *((sal_Int32*)aAny.getValue()) * 360 );
-                    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowTransparence" ), sal_False ) )
+                    if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowTransparence" ), false ) )
                         AddOpt( ESCHER_Prop_shadowOpacity,  0x10000 - (((sal_uInt32)*((sal_uInt16*)aAny.getValue())) * 655 ) );
                 }
             }
@@ -2470,7 +2470,7 @@ sal_Bool EscherPropertyContainer::CreateShadowProperties(
 }
 
 sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( const ::com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter,
-                                const std::vector< sal_Int32 >& rEquationOrder, sal_Bool bAdjustTrans )
+                                const std::vector< sal_Int32 >& rEquationOrder, bool bAdjustTrans )
 {
     sal_Int32 nValue = 0;
     if ( rParameter.Value.getValueTypeClass() == uno::TypeClass_DOUBLE )
@@ -2519,7 +2519,7 @@ sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( cons
     return nValue;
 }
 
-sal_Bool GetValueForEnhancedCustomShapeHandleParameter( sal_Int32& nRetValue, const com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter )
+bool GetValueForEnhancedCustomShapeHandleParameter( sal_Int32& nRetValue, const com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter )
 {
     sal_Bool bSpecial = sal_False;
     nRetValue = 0;
@@ -2638,7 +2638,7 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape,
     }
 }
 
-sal_Bool EscherPropertyContainer::IsDefaultObject( SdrObjCustomShape* pCustoShape , const MSO_SPT eShapeType )
+bool EscherPropertyContainer::IsDefaultObject( SdrObjCustomShape* pCustoShape , const MSO_SPT eShapeType )
 {
     sal_Bool bIsDefaultObject = sal_False;
     switch(eShapeType)
@@ -2685,28 +2685,28 @@ void EscherPropertyContainer::LookForPolarHandles( const MSO_SPT eShapeType, sal
     }
 }
 
-sal_Bool EscherPropertyContainer::GetAdjustmentValue( const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue )
+bool EscherPropertyContainer::GetAdjustmentValue( const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue )
 {
     if ( rkProp.State != beans::PropertyState_DIRECT_VALUE )
-        return sal_False;
+        return false;
 
     sal_Bool bUseFixedFloat = ( nAdjustmentsWhichNeedsToBeConverted & ( 1 << nIndex ) ) != 0;
     if ( rkProp.Value.getValueTypeClass() == uno::TypeClass_DOUBLE )
     {
-    double fValue(0.0);
-    rkProp.Value >>= fValue;
-    if ( bUseFixedFloat )
-        fValue *= 65536.0;
-    nValue = (sal_Int32)fValue;
+        double fValue(0.0);
+        rkProp.Value >>= fValue;
+        if ( bUseFixedFloat )
+            fValue *= 65536.0;
+        nValue = (sal_Int32)fValue;
     }
     else
     {
-    rkProp.Value >>= nValue;
-    if ( bUseFixedFloat )
-        nValue <<= 16;
+        rkProp.Value >>= nValue;
+        if ( bUseFixedFloat )
+             nValue <<= 16;
     }
 
-    return sal_True;
+    return true;
 }
 
 void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeType, const uno::Reference< drawing::XShape > & rXShape )
@@ -3066,7 +3066,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                                     {
                                         nLightFaceFlags |= 2;
                                         uno::Any aFillColor2;
-                                        if ( EscherPropertyValueHelper::GetPropertyValue( aFillColor2, aXPropSet, OUString( "FillColor2" ), sal_True ) )
+                                        if ( EscherPropertyValueHelper::GetPropertyValue( aFillColor2, aXPropSet, OUString( "FillColor2" ), true ) )
                                         {
                                             sal_uInt32 nFillColor = ImplGetColor( *((sal_uInt32*)aFillColor2.getValue()) );
                                             AddOpt( DFF_Prop_c3DExtrusionColor, nFillColor );
@@ -3109,12 +3109,12 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                             }
                             sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ];
                             memcpy( pBuf, aOut.GetData(), nStreamSize );
-                            AddOpt( DFF_Prop_pFormulas, sal_True, nStreamSize - 6, pBuf, nStreamSize );
+                            AddOpt( DFF_Prop_pFormulas, true, nStreamSize - 6, pBuf, nStreamSize );
                         }
                         else
                         {
                             sal_uInt8* pBuf = new sal_uInt8[ 1 ];
-                            AddOpt( DFF_Prop_pFormulas, sal_True, 0, pBuf, 0 );
+                            AddOpt( DFF_Prop_pFormulas, true, 0, pBuf, 0 );
                         }
                     }
                 }
@@ -3213,12 +3213,12 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                                             }
                                             sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ];
                                             memcpy( pBuf, aOut.GetData(), nStreamSize );
-                                            AddOpt( DFF_Prop_connectorPoints, sal_True, nStreamSize - 6, pBuf, nStreamSize );   // -6
+                                            AddOpt( DFF_Prop_connectorPoints, true, nStreamSize - 6, pBuf, nStreamSize );   // -6
                                         }
                                         else
                                         {
                                             sal_uInt8* pBuf = new sal_uInt8[ 1 ];
-                                            AddOpt( DFF_Prop_connectorPoints, sal_True, 0, pBuf, 0 );
+                                            AddOpt( DFF_Prop_connectorPoints, true, 0, pBuf, 0 );
                                         }
                                     }
                                 }
@@ -3334,12 +3334,12 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                                             }
                                             sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ];
                                             memcpy( pBuf, aOut.GetData(), nStreamSize );
-                                            AddOpt( DFF_Prop_pSegmentInfo, sal_False, nStreamSize - 6, pBuf, nStreamSize );
+                                            AddOpt( DFF_Prop_pSegmentInfo, false, nStreamSize - 6, pBuf, nStreamSize );
                                         }
                                         else
                                         {
                                             sal_uInt8* pBuf = new sal_uInt8[ 1 ];
-                                            AddOpt( DFF_Prop_pSegmentInfo, sal_True, 0, pBuf, 0 );
+                                            AddOpt( DFF_Prop_pSegmentInfo, true, 0, pBuf, 0 );
                                         }
                                     }
                                 }
@@ -3392,12 +3392,12 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                                             }
                                             sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ];
                                             memcpy( pBuf, aOut.GetData(), nStreamSize );
-                                            AddOpt( DFF_Prop_textRectangles, sal_True, nStreamSize - 6, pBuf, nStreamSize );
+                                            AddOpt( DFF_Prop_textRectangles, true, nStreamSize - 6, pBuf, nStreamSize );
                                         }
                                         else
                                         {
                                             sal_uInt8* pBuf = new sal_uInt8[ 1 ];
-                                            AddOpt( DFF_Prop_textRectangles, sal_True, 0, pBuf, 0 );
+                                            AddOpt( DFF_Prop_textRectangles, true, 0, pBuf, 0 );
                                         }
                                     }
                                 }
@@ -3502,7 +3502,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                                 aFontName = "Arial Black";
                             AddOpt( DFF_Prop_gtextFont, aFontName );
 
-                            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "CharScaleWidth" ), sal_True ) )
+                            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "CharScaleWidth" ), true ) )
                             {
                                 sal_Int16 nCharScaleWidth = 100;
                                 if ( aAny >>= nCharScaleWidth )
@@ -3514,7 +3514,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                                     }
                                 }
                             }
-                            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "CharHeight" ), sal_True ) )
+                            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "CharHeight" ), true ) )
                             {
                                 float fCharHeight = 0.0;
                                 if ( aAny >>= fCharHeight )
@@ -3523,7 +3523,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                                     AddOpt(ESCHER_Prop_gtextSize, nTextSize);
                                 }
                             }
-                            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "CharKerning" ), sal_True ) )
+                            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "CharKerning" ), true ) )
                             {
                                 sal_Int16 nCharKerning = sal_Int16();
                                 if ( aAny >>= nCharKerning )
@@ -3535,7 +3535,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                                         nTextPathFlags &=~0x1000;
                                 }
                             }
-                            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "CharPosture" ), sal_True ) )
+                            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "CharPosture" ), true ) )
                             {
                                 awt::FontSlant eFontSlant;
                                 if ( aAny >>= eFontSlant )
@@ -3547,7 +3547,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                                         nTextPathFlags &=~0x10;
                                 }
                             }
-                            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "CharWeight" ), sal_True ) )
+                            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "CharWeight" ), true ) )
                             {
                                 float fFontWidth = 0;
                                 if ( aAny >>= fFontWidth )
@@ -3560,7 +3560,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                                 }
                             }
                             // export gTextAlign attr
-                            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, "TextHorizontalAdjust", sal_True ) )
+                            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, "TextHorizontalAdjust", true ) )
                             {
                                 MSO_GeoTextAlign  gTextAlign = mso_alignTextCenter;
                                 drawing::TextHorizontalAdjust   eHA( drawing::TextHorizontalAdjust_LEFT );
@@ -3781,12 +3781,12 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                                 }
                                 sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ];
                                 memcpy( pBuf, aOut.GetData(), nStreamSize );
-                                AddOpt( DFF_Prop_Handles, sal_True, nStreamSize - 6, pBuf, nStreamSize );
+                                AddOpt( DFF_Prop_Handles, true, nStreamSize - 6, pBuf, nStreamSize );
                             }
                             else
                             {
                                 sal_uInt8* pBuf = new sal_uInt8[ 1 ];
-                                AddOpt( DFF_Prop_Handles, sal_True, 0, pBuf, 0 );
+                                AddOpt( DFF_Prop_Handles, true, 0, pBuf, 0 );
                             }
                         }
                     }
@@ -3830,19 +3830,19 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                            .WriteUInt16( nElementSize );
                         for( j = 0; j < nElements; j++ )
                         {
-                            sal_Int32 X = GetValueForEnhancedCustomShapeParameter( aCoordinates[ j ].First, aEquationOrder, sal_True );
-                            sal_Int32 Y = GetValueForEnhancedCustomShapeParameter( aCoordinates[ j ].Second, aEquationOrder, sal_True );
+                            sal_Int32 X = GetValueForEnhancedCustomShapeParameter( aCoordinates[ j ].First, aEquationOrder, true );
+                            sal_Int32 Y = GetValueForEnhancedCustomShapeParameter( aCoordinates[ j ].Second, aEquationOrder, true );
                             aOut.WriteInt32( X )
                                .WriteInt32( Y );
                         }
                         sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ];
                         memcpy( pBuf, aOut.GetData(), nStreamSize );
-                        AddOpt( DFF_Prop_pVertices, sal_True, nStreamSize - 6, pBuf, nStreamSize ); // -6
+                        AddOpt( DFF_Prop_pVertices, true, nStreamSize - 6, pBuf, nStreamSize ); // -6
                     }
                     else
                     {
                         sal_uInt8* pBuf = new sal_uInt8[ 1 ];
-                        AddOpt( DFF_Prop_pVertices, sal_True, 0, pBuf, 0 );
+                        AddOpt( DFF_Prop_pVertices, true, 0, pBuf, 0 );
                     }
                 }
             }
@@ -3915,7 +3915,7 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawi
 }
 
 // Implement for form control export
-sal_Bool   EscherPropertyContainer::CreateBlipPropertiesforOLEControl(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape)
+bool   EscherPropertyContainer::CreateBlipPropertiesforOLEControl(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape)
 {
     SdrObject* pShape = GetSdrObjectFromXShape( rXShape );
     if ( pShape )
@@ -3934,15 +3934,15 @@ sal_Bool   EscherPropertyContainer::CreateBlipPropertiesforOLEControl(const ::co
                 sal_uInt32 nBlibId = pGraphicProvider->GetBlibID( *pPicOutStrm, aUniqueId, aRect, NULL );
                 if ( nBlibId )
                 {
-                    AddOpt( ESCHER_Prop_pib, nBlibId, sal_True );
-                    ImplCreateGraphicAttributes( rXPropSet, nBlibId, sal_False );
-                    return sal_True;
+                    AddOpt( ESCHER_Prop_pib, nBlibId, true );
+                    ImplCreateGraphicAttributes( rXPropSet, nBlibId, false );
+                    return true;
                 }
             }
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 EscherPersistTable::EscherPersistTable()
@@ -3956,15 +3956,15 @@ EscherPersistTable::~EscherPersistTable()
     }
 }
 
-sal_Bool EscherPersistTable::PtIsID( sal_uInt32 nID )
+bool EscherPersistTable::PtIsID( sal_uInt32 nID )
 {
     for( size_t i = 0, n = maPersistTable.size(); i < n; ++i ) {
         EscherPersistEntry* pPtr = maPersistTable[ i ];
         if ( pPtr->mnID == nID ) {
-            return sal_True;
+            return true;
         }
     }
-    return sal_False;
+    return false;
 }
 
 void EscherPersistTable::PtInsert( sal_uInt32 nID, sal_uInt32 nOfs )
@@ -4024,16 +4024,16 @@ sal_uInt32 EscherPersistTable::PtReplaceOrInsert( sal_uInt32 nID, sal_uInt32 nOf
     return 0;
 }
 
-sal_Bool EscherPropertyValueHelper::GetPropertyValue(
+bool EscherPropertyValueHelper::GetPropertyValue(
     ::com::sun::star::uno::Any& rAny,
     const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
     const OUString& rString,
-    sal_Bool bTestPropertyAvailability
-) {
-    sal_Bool bRetValue = sal_True;
+    bool bTestPropertyAvailability)
+{
+    bool bRetValue = true;
     if ( bTestPropertyAvailability )
     {
-        bRetValue = sal_False;
+        bRetValue = false;
         try
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
@@ -4043,7 +4043,7 @@ sal_Bool EscherPropertyValueHelper::GetPropertyValue(
         }
         catch( const ::com::sun::star::uno::Exception& )
         {
-            bRetValue = sal_False;
+            bRetValue = false;
         }
     }
     if ( bRetValue )
@@ -4052,11 +4052,11 @@ sal_Bool EscherPropertyValueHelper::GetPropertyValue(
         {
             rAny = rXPropSet->getPropertyValue( rString );
             if ( !rAny.hasValue() )
-                bRetValue = sal_False;
+                bRetValue = false;
         }
         catch( const ::com::sun::star::uno::Exception& )
         {
-            bRetValue = sal_False;
+            bRetValue = false;
         }
     }
     return bRetValue;
@@ -4087,7 +4087,7 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject
     mnSizeExtra     ( 0 ),
     maPrefSize      ( rObject.GetPrefSize() ),
     maPrefMapMode   ( rObject.GetPrefMapMode() ),
-    mbIsEmpty       ( sal_True )
+    mbIsEmpty       ( true )
 {
     mbIsNativeGraphicPossible = ( pGraphicAttr == NULL );
     meBlibType = UNKNOWN;
@@ -4129,7 +4129,7 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject
                 mnIdentifier[ 1 ] = rtl_crc32( 0, aSt.GetData(), aSt.Tell() );
             }
             else
-                mbIsNativeGraphicPossible = sal_True;
+                mbIsNativeGraphicPossible = true;
         }
         sal_uInt32 i, nTmp, n1, n2;
         n1 = n2 = 0;
@@ -4144,11 +4144,11 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject
         }
         mnIdentifier[ 2 ] = n1;
         mnIdentifier[ 3 ] = n2;
-        mbIsEmpty = sal_False;
+        mbIsEmpty = false;
     }
 };
 
-void EscherBlibEntry::WriteBlibEntry( SvStream& rSt, sal_Bool bWritePictureOffset, sal_uInt32 nResize )
+void EscherBlibEntry::WriteBlibEntry( SvStream& rSt, bool bWritePictureOffset, sal_uInt32 nResize )
 {
     sal_uInt32  nPictureOffset = ( bWritePictureOffset ) ? mnPictureOffset : 0;
 
@@ -4178,14 +4178,14 @@ EscherBlibEntry::~EscherBlibEntry()
 {
 };
 
-sal_Bool EscherBlibEntry::operator==( const EscherBlibEntry& rEscherBlibEntry ) const
+bool EscherBlibEntry::operator==( const EscherBlibEntry& rEscherBlibEntry ) const
 {
     for ( int i = 0; i < 3; i++ )
     {
         if ( mnIdentifier[ i ] != rEscherBlibEntry.mnIdentifier[ i ] )
-            return sal_False;
+            return false;
     }
-    return sal_True;
+    return true;
 }
 
 EscherGraphicProvider::EscherGraphicProvider( sal_uInt32 nFlags ) :
@@ -4239,13 +4239,13 @@ sal_uInt32 EscherGraphicProvider::GetBlibStoreContainerSize( SvStream* pMergePic
     return nSize;
 }
 
-sal_Bool EscherGraphicProvider::WriteBlibStoreEntry(SvStream& rSt,
-    sal_uInt32 nBlipId, sal_Bool bWritePictureOffSet, sal_uInt32 nResize)
+bool EscherGraphicProvider::WriteBlibStoreEntry(SvStream& rSt,
+    sal_uInt32 nBlipId, bool bWritePictureOffSet, sal_uInt32 nResize)
 {
     if (nBlipId > mnBlibEntrys || nBlipId == 0)
-        return sal_False;
+        return false;
     mpBlibEntrys[nBlipId-1]->WriteBlibEntry(rSt, bWritePictureOffSet, nResize);
-    return sal_True;
+    return true;
 }
 
 void EscherGraphicProvider::WriteBlibStoreContainer( SvStream& rSt, SvStream* pMergePicStreamBSE )
@@ -4268,7 +4268,7 @@ void EscherGraphicProvider::WriteBlibStoreContainer( SvStream& rSt, SvStream* pM
 
                 ESCHER_BlibType nBlibType = pBlibEntry->meBlibType;
                 nBlipSize = pBlibEntry->mnSize + pBlibEntry->mnSizeExtra;
-                pBlibEntry->WriteBlibEntry( rSt, sal_False, nBlipSize );
+                pBlibEntry->WriteBlibEntry( rSt, false, nBlipSize );
 
                 // BLIP
                 pMergePicStreamBSE->Seek( pBlibEntry->mnPictureOffset );
@@ -4301,14 +4301,14 @@ void EscherGraphicProvider::WriteBlibStoreContainer( SvStream& rSt, SvStream* pM
         else
         {
             for ( sal_uInt32 i = 0; i < mnBlibEntrys; i++ )
-                mpBlibEntrys[ i ]->WriteBlibEntry( rSt, sal_True );
+                mpBlibEntrys[ i ]->WriteBlibEntry( rSt, true );
         }
     }
 }
 
-sal_Bool EscherGraphicProvider::GetPrefSize( const sal_uInt32 nBlibId, Size& rPrefSize, MapMode& rPrefMapMode )
+bool EscherGraphicProvider::GetPrefSize( const sal_uInt32 nBlibId, Size& rPrefSize, MapMode& rPrefMapMode )
 {
-    sal_Bool bInRange = nBlibId && ( ( nBlibId - 1 ) < mnBlibEntrys );
+    bool bInRange = nBlibId && ( ( nBlibId - 1 ) < mnBlibEntrys );
     if ( bInRange )
     {
         EscherBlibEntry* pEntry = mpBlibEntrys[ nBlibId - 1 ];
@@ -4320,7 +4320,7 @@ sal_Bool EscherGraphicProvider::GetPrefSize( const sal_uInt32 nBlibId, Size& rPr
 
 sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OString& rId,
                                             const Rectangle& /* rBoundRect */, const com::sun::star::awt::Rectangle* pVisArea,
-                                            const GraphicAttr* pGraphicAttr, const sal_Bool bOOxmlExport )
+                                            const GraphicAttr* pGraphicAttr, const bool bOOxmlExport )
 {
     sal_uInt32          nBlibId = 0;
     GraphicObject       aGraphicObject( rId );
@@ -4616,7 +4616,7 @@ sal_uInt32 EscherConnectorListEntry::GetClosestPoint( const Polygon& rPoly, cons
 //          2 ->Bottom      4 ->Bottom
 //          3 ->Right       6 ->Right
 
-sal_uInt32 EscherConnectorListEntry::GetConnectorRule( sal_Bool bFirst )
+sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst )
 {
     sal_uInt32 nRule = 0;
 
@@ -4826,7 +4826,7 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( sal_Bool bFirst )
             aPoly[ 2 ] = Point( aCenter.X(), aRect.Bottom() );
             aPoly[ 3 ] = Point( aRect.Right(), aCenter.Y() );
 
-            sal_Int32 nAngle = ( EscherPropertyValueHelper::GetPropertyValue( aAny, aPropertySet, OUString( "RotateAngle" ), sal_True ) )
+            sal_Int32 nAngle = ( EscherPropertyValueHelper::GetPropertyValue( aAny, aPropertySet, OUString( "RotateAngle" ), true ) )
                     ? *((sal_Int32*)aAny.getValue() ) : 0;
             if ( nAngle )
                 aPoly.Rotate( aRect.TopLeft(), (sal_uInt16)( ( nAngle + 5 ) / 10 ) );
@@ -4901,9 +4901,9 @@ void EscherSolverContainer::WriteSolver( SvStream& rStrm )
             if ( aConnectorRule.nShapeC )
             {
                 if ( aConnectorRule.nShapeA )
-                    aConnectorRule.ncptiA = pPtr->GetConnectorRule( sal_True );
+                    aConnectorRule.ncptiA = pPtr->GetConnectorRule( true );
                 if ( aConnectorRule.nShapeB )
-                    aConnectorRule.ncptiB = pPtr->GetConnectorRule( sal_False );
+                    aConnectorRule.ncptiB = pPtr->GetConnectorRule( false );
             }
             rStrm  .WriteUInt32( (sal_uInt32)( ( ESCHER_ConnectorRule << 16 ) | 1 ) )   // atom hd
                    .WriteUInt32( (sal_uInt32)24 )
@@ -5208,7 +5208,7 @@ sal_uInt32 EscherEx::GetPersistOffset( sal_uInt32 nKey )
     return PtGetOffsetByID( ESCHER_Persist_PrivateEntry | nKey );
 }
 
-sal_Bool EscherEx::DoSeek( sal_uInt32 nKey )
+bool EscherEx::DoSeek( sal_uInt32 nKey )
 {
     sal_uInt32 nPos = PtGetOffsetByID( nKey );
     if ( nPos )
@@ -5216,21 +5216,21 @@ sal_Bool EscherEx::DoSeek( sal_uInt32 nKey )
     else
     {
         if (! PtIsID( nKey ) )
-            return sal_False;
+            return false;
         mpOutStrm->Seek( 0 );
     }
-    return sal_True;
+    return true;
 }
 
-sal_Bool EscherEx::SeekToPersistOffset( sal_uInt32 nKey )
+bool EscherEx::SeekToPersistOffset( sal_uInt32 nKey )
 {
     return DoSeek( ESCHER_Persist_PrivateEntry | nKey );
 }
 
-sal_Bool EscherEx::InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue )
+bool EscherEx::InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue )
 {
     sal_uInt32  nOldPos = mpOutStrm->Tell();
-    sal_Bool    bRetValue = SeekToPersistOffset( nKey );
+    bool        bRetValue = SeekToPersistOffset( nKey );
     if ( bRetValue )
     {
         mpOutStrm->WriteUInt32( nValue );
@@ -5265,7 +5265,7 @@ void EscherEx::OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance )
             {
                 if ( !mbEscherDg )
                 {
-                    mbEscherDg = sal_True;
+                    mbEscherDg = true;
                     mnCurrentDg = mxGlobal->GenerateDrawingId();
                     AddAtom( 8, ESCHER_Dg, 0, mnCurrentDg );
                     PtReplaceOrInsert( ESCHER_Persist_Dg | mnCurrentDg, mpOutStrm->Tell() );
@@ -5280,7 +5280,7 @@ void EscherEx::OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance )
         {
             if ( mbEscherDg )
             {
-                mbEscherSpgr = sal_True;
+                mbEscherSpgr = true;
             }
         }
         break;
@@ -5308,7 +5308,7 @@ void EscherEx::CloseContainer()
         {
             if ( mbEscherDg )
             {
-                mbEscherDg = sal_False;
+                mbEscherDg = false;
                 if ( DoSeek( ESCHER_Persist_Dg | mnCurrentDg ) )
                     mpOutStrm->WriteUInt32( mxGlobal->GetDrawingShapeCount( mnCurrentDg ) ).WriteUInt32( mxGlobal->GetLastShapeId( mnCurrentDg ) );
             }
@@ -5319,7 +5319,7 @@ void EscherEx::CloseContainer()
         {
             if ( mbEscherSpgr )
             {
-                mbEscherSpgr = sal_False;
+                mbEscherSpgr = false;
 
             }
         }
@@ -5429,9 +5429,9 @@ sal_uInt32 EscherEx::EnterGroup( const Rectangle* pBoundRect )
     return EnterGroup( OUString(), pBoundRect );
 }
 
-sal_Bool EscherEx::SetGroupSnapRect( sal_uInt32 nGroupLevel, const Rectangle& rRect )
+bool EscherEx::SetGroupSnapRect( sal_uInt32 nGroupLevel, const Rectangle& rRect )
 {
-    sal_Bool bRetValue = sal_False;
+    bool bRetValue = false;
     if ( nGroupLevel )
     {
         sal_uInt32 nCurrentPos = mpOutStrm->Tell();
@@ -5447,9 +5447,9 @@ sal_Bool EscherEx::SetGroupSnapRect( sal_uInt32 nGroupLevel, const Rectangle& rR
     return bRetValue;
 }
 
-sal_Bool EscherEx::SetGroupLogicRect( sal_uInt32 nGroupLevel, const Rectangle& rRect )
+bool EscherEx::SetGroupLogicRect( sal_uInt32 nGroupLevel, const Rectangle& rRect )
 {
-    sal_Bool bRetValue = sal_False;
+    bool bRetValue = false;
     if ( nGroupLevel )
     {
         sal_uInt32 nCurrentPos = mpOutStrm->Tell();
@@ -5490,7 +5490,7 @@ void EscherEx::Commit( EscherPropertyContainer& rProps, const Rectangle& )
     rProps.Commit( GetStream() );
 }
 
-sal_uInt32 EscherEx::GetColor( const sal_uInt32 nSOColor, sal_Bool bSwap )
+sal_uInt32 EscherEx::GetColor( const sal_uInt32 nSOColor, bool bSwap )
 {
     if ( bSwap )
     {
@@ -5503,14 +5503,14 @@ sal_uInt32 EscherEx::GetColor( const sal_uInt32 nSOColor, sal_Bool bSwap )
         return nSOColor & 0xffffff;
 }
 
-sal_uInt32 EscherEx::GetColor( const Color& rSOColor, sal_Bool bSwap )
+sal_uInt32 EscherEx::GetColor( const Color& rSOColor, bool bSwap )
 {
     sal_uInt32 nColor = ( rSOColor.GetRed() << 16 );
     nColor |= ( rSOColor.GetGreen() << 8 );
     nColor |= rSOColor.GetBlue();
 
     if ( !bSwap )
-        nColor = GetColor( nColor, sal_True );
+        nColor = GetColor( nColor, true );
 
     return nColor;
 }
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index bfb9615aac62..4f98103eabc2 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -157,7 +157,7 @@ void ImplEESdrWriter::ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherProperty
     mpEscherEx->OpenContainer( ESCHER_SpContainer );                \
     ADD_SHAPE( ESCHER_ShpInst_TextBox, 0xa00 );                     \
     if ( bFill )                                                    \
-        aPropOpt.CreateFillProperties( rObj.mXPropSet, sal_True );  \
+        aPropOpt.CreateFillProperties( rObj.mXPropSet, true );  \
     if( rObj.ImplGetText() )                                        \
         aPropOpt.CreateTextProperties( rObj.mXPropSet,              \
             mpEscherEx->QueryTextID( rObj.GetShapeRef(),            \
@@ -271,7 +271,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
                 pMemStrm->ObjectOwnsMemory( false );
                 sal_uInt8* pBuf = (sal_uInt8*) pMemStrm->GetData();
                 sal_uInt32 nSize = pMemStrm->Seek( STREAM_SEEK_TO_END );
-                aPropOpt.AddOpt( ESCHER_Prop_pihlShape, sal_False, nSize, pBuf, nSize );
+                aPropOpt.AddOpt( ESCHER_Prop_pihlShape, false, nSize, pBuf, nSize );
             }
             if ( pInteraction->hasInteraction() )
                 aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x00080008 );
@@ -287,7 +287,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             if ( sCustomShapeType == "col-502ad400" || sCustomShapeType == "col-60da8460" )
             {
                 ADD_SHAPE( ESCHER_ShpInst_PictureFrame, 0xa00 );
-                if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, "MetaFile", sal_False ) )
+                if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, "MetaFile", false ) )
                 {
                     aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
                     aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x100000 );        // no fill
@@ -310,12 +310,12 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
                     sal::static_int_cast< sal_uInt16 >(eShapeType),
                     nMirrorFlags | 0xa00 );
                 aPropOpt.CreateCustomShapeProperties( eShapeType, rObj.GetShapeRef() );
-                aPropOpt.CreateFillProperties( rObj.mXPropSet, sal_True );
+                aPropOpt.CreateFillProperties( rObj.mXPropSet, true );
                 if ( rObj.ImplGetText() )
                 {
                     if ( !aPropOpt.IsFontWork() )
                         aPropOpt.CreateTextProperties( rObj.mXPropSet, mpEscherEx->QueryTextID(
-                            rObj.GetShapeRef(), rObj.GetShapeId() ), sal_True, sal_False );
+                            rObj.GetShapeRef(), rObj.GetShapeId() ), true, false );
                 }
             }
         }
@@ -342,11 +342,11 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             {
                 ADD_SHAPE( ESCHER_ShpInst_Rectangle, 0xa00 );           // Flags: Connector | HasSpt
             }
-            aPropOpt.CreateFillProperties( rObj.mXPropSet, sal_True );
+            aPropOpt.CreateFillProperties( rObj.mXPropSet, true );
             if( rObj.ImplGetText() )
                 aPropOpt.CreateTextProperties( rObj.mXPropSet,
                     mpEscherEx->QueryTextID( rObj.GetShapeRef(),
-                        rObj.GetShapeId() ), sal_False, sal_False );
+                        rObj.GetShapeId() ), false, false );
         }
         else if ( rObj.GetType() == "drawing.Ellipse" )
         {
@@ -382,7 +382,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             {
                 mpEscherEx->OpenContainer( ESCHER_SpContainer );
                 ADD_SHAPE( ESCHER_ShpInst_Ellipse, 0xa00 );         // Flags: Connector | HasSpt
-                aPropOpt.CreateFillProperties( rObj.mXPropSet, sal_True );
+                aPropOpt.CreateFillProperties( rObj.mXPropSet, true );
             }
             else
             {
@@ -424,15 +424,15 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
                     case POLY_PIE :
                     case POLY_CHORD :
                     {
-                        aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, sal_False, aNewRect, &aPolygon );
-                        aPropOpt.CreateFillProperties( rObj.mXPropSet, sal_True  );
+                        aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, false, aNewRect, &aPolygon );
+                        aPropOpt.CreateFillProperties( rObj.mXPropSet, true  );
                     }
                     break;
 
                     case POLY_ARC :
                     {
-                        aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, sal_False, aNewRect, &aPolygon );
-                        aPropOpt.CreateLineProperties( rObj.mXPropSet, sal_False );
+                        aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, false, aNewRect, &aPolygon );
+                        aPropOpt.CreateLineProperties( rObj.mXPropSet, false );
                     }
                     break;
                 }
@@ -442,7 +442,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             if ( rObj.ImplGetText() )
                 aPropOpt.CreateTextProperties( rObj.mXPropSet,
                     mpEscherEx->QueryTextID( rObj.GetShapeRef(),
-                        rObj.GetShapeId() ), sal_False, sal_False );
+                        rObj.GetShapeId() ), false, false );
 
         }
         else if ( rObj.GetType() == "drawing.Control" )
@@ -453,8 +453,8 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
         {
             sal_uInt16 nSpType, nSpFlags;
             ::com::sun::star::awt::Rectangle aNewRect;
-            if ( aPropOpt.CreateConnectorProperties( rObj.GetShapeRef(),
-                            rSolverContainer, aNewRect, nSpType, nSpFlags ) == sal_False )
+            if ( ! aPropOpt.CreateConnectorProperties( rObj.GetShapeRef(),
+                            rSolverContainer, aNewRect, nSpType, nSpFlags ) )
                 break;
             rObj.SetRect( Rectangle( ImplMapPoint( Point( aNewRect.X, aNewRect.Y ) ),
                                         ImplMapSize( Size( aNewRect.Width, aNewRect.Height ) ) ) );
@@ -469,7 +469,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
         else if ( rObj.GetType() == "drawing.Line" )
         {
             ::com::sun::star::awt::Rectangle aNewRect;
-            aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_LINE, sal_False, aNewRect, NULL );
+            aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_LINE, false, aNewRect, NULL );
             MapRect(rObj);
             //i27942: Poly/Lines/Bezier do not support text.
 
@@ -482,7 +482,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
 
             ADD_SHAPE( ESCHER_ShpInst_Line, nFlags );
             aPropOpt.AddOpt( ESCHER_Prop_shapePath, ESCHER_ShapeComplex );
-            aPropOpt.CreateLineProperties( rObj.mXPropSet, sal_False );
+            aPropOpt.CreateLineProperties( rObj.mXPropSet, false );
             rObj.SetAngle( 0 );
         }
         else if ( rObj.GetType() == "drawing.PolyPolygon" )
@@ -495,9 +495,9 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             mpEscherEx->OpenContainer( ESCHER_SpContainer );
             ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 );        // Flags: Connector | HasSpt
             ::com::sun::star::awt::Rectangle aNewRect;
-            aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, sal_False, aNewRect, NULL );
+            aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, false, aNewRect, NULL );
             MapRect(rObj);
-            aPropOpt.CreateFillProperties( rObj.mXPropSet, sal_True );
+            aPropOpt.CreateFillProperties( rObj.mXPropSet, true );
             rObj.SetAngle( 0 );
         }
         else if ( rObj.GetType() == "drawing.PolyLine" )
@@ -507,9 +507,9 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             mpEscherEx->OpenContainer( ESCHER_SpContainer );
             ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 );        // Flags: Connector | HasSpt
             ::com::sun::star::awt::Rectangle aNewRect;
-            aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, sal_False, aNewRect, NULL );
+            aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, false, aNewRect, NULL );
             MapRect(rObj);
-            aPropOpt.CreateLineProperties( rObj.mXPropSet, sal_False );
+            aPropOpt.CreateLineProperties( rObj.mXPropSet, false );
             rObj.SetAngle( 0 );
         }
         else if ( rObj.GetType() == "drawing.OpenBezier" )
@@ -519,9 +519,9 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             mpEscherEx->OpenContainer( ESCHER_SpContainer );
             ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 );        // Flags: Connector | HasSpt
             ::com::sun::star::awt::Rectangle aNewRect;
-            aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, sal_True, aNewRect, NULL );
+            aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, true, aNewRect, NULL );
             MapRect(rObj);
-            aPropOpt.CreateLineProperties( rObj.mXPropSet, sal_False );
+            aPropOpt.CreateLineProperties( rObj.mXPropSet, false );
             rObj.SetAngle( 0 );
         }
         else if ( rObj.GetType() == "drawing.ClosedBezier" )
@@ -534,9 +534,9 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             mpEscherEx->OpenContainer( ESCHER_SpContainer );
             ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 );        // Flags: Connector | HasSpt
             ::com::sun::star::awt::Rectangle aNewRect;
-            aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, sal_True, aNewRect, NULL );
+            aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, true, aNewRect, NULL );
             MapRect(rObj);
-            aPropOpt.CreateFillProperties( rObj.mXPropSet, sal_True );
+            aPropOpt.CreateFillProperties( rObj.mXPropSet, true );
             rObj.SetAngle( 0 );
         }
         else if ( rObj.GetType() == "drawing.GraphicObject" )
@@ -562,7 +562,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
                        have to create a simpe Rectangle with fill bitmap instead (while not allowing BitmapMode_Repeat).
                     */
                     ADD_SHAPE( ESCHER_ShpInst_Rectangle, 0xa00 );           // Flags: Connector | HasSpt
-                    if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, "GraphicURL", sal_True,  sal_True, sal_False ) )
+                    if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, "GraphicURL", true, true, false ) )
                     {
                         aPropOpt.AddOpt( ESCHER_Prop_WrapText, ESCHER_WrapNone );
                         aPropOpt.AddOpt( ESCHER_Prop_AnchorText, ESCHER_AnchorMiddle );
@@ -572,13 +572,13 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
                         if ( rObj.ImplGetText() )
                             aPropOpt.CreateTextProperties( rObj.mXPropSet,
                                 mpEscherEx->QueryTextID( rObj.GetShapeRef(),
-                                    rObj.GetShapeId() ), sal_False, sal_False );
+                                    rObj.GetShapeId() ), false, false );
                     }
                 }
                 else
                 {
                     ADD_SHAPE( ESCHER_ShpInst_PictureFrame, 0xa00 );
-                    if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, "GraphicURL", sal_False, sal_True, sal_True, bOOxmlExport ) )
+                    if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, "GraphicURL", false, true, true, bOOxmlExport ) )
                         aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
                 }
             }
@@ -647,7 +647,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             mpEscherEx->OpenContainer( ESCHER_SpContainer );
             ADD_SHAPE( ESCHER_ShpInst_PictureFrame, 0xa00 );
 
-                if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, "Bitmap", sal_False ) )
+                if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, "Bitmap", false ) )
                 aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
         }
         else if ( rObj.GetType() == "drawing.Caption" )
@@ -655,7 +655,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             rObj.SetAngle( 0 );
             mpEscherEx->OpenContainer( ESCHER_SpContainer );
             ADD_SHAPE( ESCHER_ShpInst_TextBox, 0xa00 );
-            if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, "MetaFile", sal_False ) )
+            if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, "MetaFile", false ) )
                 aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
         }
         else if ( rObj.GetType() == "drawing.dontknow" )
@@ -663,7 +663,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             rObj.SetAngle( 0 );
             mpEscherEx->OpenContainer( ESCHER_SpContainer );
             ADD_SHAPE( ESCHER_ShpInst_PictureFrame, 0xa00 );
-            if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, "MetaFile", sal_False ) )
+            if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, "MetaFile", false ) )
                 aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
         }
         else
diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx
index 17cbd8b665f7..15b6147fe169 100644
--- a/filter/source/msfilter/mscodec.cxx
+++ b/filter/source/msfilter/mscodec.cxx
@@ -163,9 +163,9 @@ void MSCodec_Xor95::InitKey( const sal_uInt8 pnPassData[ 16 ] )
     }
 }
 
-sal_Bool MSCodec_Xor95::InitCodec( const uno::Sequence< beans::NamedValue >& aData )
+bool MSCodec_Xor95::InitCodec( const uno::Sequence< beans::NamedValue >& aData )
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     ::comphelper::SequenceAsHashMap aHashData( aData );
     uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault("XOR95EncryptionKey", uno::Sequence< sal_Int8 >() );
@@ -173,7 +173,7 @@ sal_Bool MSCodec_Xor95::InitCodec( const uno::Sequence< beans::NamedValue >& aDa
     if ( aKey.getLength() == 16 )
     {
         (void)memcpy( mpnKey, aKey.getConstArray(), 16 );
-        bResult = sal_True;
+        bResult = true;
 
         mnKey = (sal_uInt16)aHashData.getUnpackedValueOrDefault("XOR95BaseKey", (sal_Int16)0 );
         mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault("XOR95PasswordHash", (sal_Int16)0 );
@@ -285,12 +285,12 @@ static void lcl_PrintDigest(const sal_uInt8* /*pDigest*/, const char* /*msg*/)
 }
 #endif
 
-sal_Bool MSCodec_Std97::InitCodec( const uno::Sequence< beans::NamedValue >& aData )
+bool MSCodec_Std97::InitCodec( const uno::Sequence< beans::NamedValue >& aData )
 {
 #if DEBUG_MSO_ENCRYPTION_STD97
     fprintf(stdout, "MSCodec_Std97::InitCodec: --begin\n");fflush(stdout);
 #endif
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     ::comphelper::SequenceAsHashMap aHashData( aData );
     uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault("STD97EncryptionKey", uno::Sequence< sal_Int8 >() );
@@ -302,7 +302,7 @@ sal_Bool MSCodec_Std97::InitCodec( const uno::Sequence< beans::NamedValue >& aDa
         if ( aUniqueID.getLength() == 16 )
         {
             (void)memcpy( m_pDocId, aUniqueID.getConstArray(), 16 );
-            bResult = sal_True;
+            bResult = true;
             lcl_PrintDigest(m_pDigestValue, "digest value");
             lcl_PrintDigest(m_pDocId, "DocId value");
         }
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 63686e8d886e..2fe9e63469a6 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -202,7 +202,7 @@ void Impl_OlePres::Write( SvStream & rStm )
 DffPropertyReader::DffPropertyReader( const SvxMSDffManager& rMan ) :
     rManager( rMan ),
     pDefaultPropSet( NULL ),
-    mbRotateGranientFillWithAngle ( 0 )
+    mbRotateGranientFillWithAngle ( false )
 {
     InitializePropSet( DFF_msofbtOPT );
 }
@@ -737,19 +737,19 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
                                 {
                                     OUString aPropName( "EndShape" );
                                     aAny <<= aXShape;
-                                    SetPropValue( aAny, xPropSet, aPropName, sal_True );
+                                    SetPropValue( aAny, xPropSet, aPropName, true );
                                     aPropName = "EndGluePointIndex";
                                     aAny <<= nId;
-                                    SetPropValue( aAny, xPropSet, aPropName, sal_True );
+                                    SetPropValue( aAny, xPropSet, aPropName, true );
                                 }
                                 else
                                 {
                                     OUString aPropName( "StartShape" );
                                     aAny <<= aXShape;
-                                    SetPropValue( aAny, xPropSet, aPropName, sal_True );
+                                    SetPropValue( aAny, xPropSet, aPropName, true );
                                     aPropName = "StartGluePointIndex";
                                     aAny <<= nId;
-                                    SetPropValue( aAny, xPropSet, aPropName, sal_True );
+                                    SetPropValue( aAny, xPropSet, aPropName, true );
                                 }
 
                                 // Not sure what this is good for, repaint or broadcast of object change.
@@ -769,8 +769,8 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
 
 static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const MSO_LineEnd eLineEnd,
     const MSO_LineEndWidth eLineWidth, const MSO_LineEndLength eLineLength,
-    sal_Int32& rnArrowWidth, sal_Bool& rbArrowCenter,
-    OUString& rsArrowName, sal_Bool bScaleArrow )
+    sal_Int32& rnArrowWidth, bool& rbArrowCenter,
+    OUString& rsArrowName, bool bScaleArrow )
 {
     basegfx::B2DPolyPolygon aRetPolyPoly;
     // 70 100mm = 2pt = 40 twip. In MS, line width less than 2pt has the same size arrow as 2pt
@@ -795,7 +795,7 @@ static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const M
         case mso_lineWideArrow          : fWidthMul = 5.0; nLineNumber += 6; break;
     }
 
-    rbArrowCenter = sal_False;
+    rbArrowCenter = false;
     OUStringBuffer aArrowName;
     switch ( eLineEnd )
     {
@@ -860,7 +860,7 @@ static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const M
             aTriangle.append(basegfx::B2DPoint( 0.0, fLengthMul * fLineWidth * 0.50 ));
             aTriangle.setClosed(true);
             aRetPolyPoly = basegfx::B2DPolyPolygon(aTriangle);
-            rbArrowCenter = sal_True;
+            rbArrowCenter = true;
             aArrowName.append("msArrowDiamondEnd ");
         }
         break;
@@ -869,7 +869,7 @@ static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const M
             aRetPolyPoly = basegfx::B2DPolyPolygon( XPolygon( Point( (sal_Int32)( fWidthMul * fLineWidth * 0.50 ), 0 ),
                                 (sal_Int32)( fWidthMul * fLineWidth * 0.50 ),
                                     (sal_Int32)( fLengthMul * fLineWidth * 0.50 ), 0, 3600 ).getB2DPolygon() );
-            rbArrowCenter = sal_True;
+            rbArrowCenter = true;
             aArrowName.append("msArrowOvalEnd ");
         }
         break;
@@ -1020,7 +1020,7 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh
                 MSO_LineEndLength   eLength = (MSO_LineEndLength)GetPropertyValue( DFF_Prop_lineStartArrowLength, mso_lineMediumLenArrow );
 
                 sal_Int32   nArrowWidth;
-                sal_Bool    bArrowCenter;
+                bool        bArrowCenter;
                 OUString    aArrowName;
                 basegfx::B2DPolyPolygon aPolyPoly(GetLineArrow( nLineWidth, eLineEnd, eWidth, eLength, nArrowWidth, bArrowCenter, aArrowName, bScaleArrows ));
 
@@ -1038,7 +1038,7 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh
                 MSO_LineEndLength   eLength = (MSO_LineEndLength)GetPropertyValue( DFF_Prop_lineEndArrowLength, mso_lineMediumLenArrow );
 
                 sal_Int32   nArrowWidth;
-                sal_Bool    bArrowCenter;
+                bool        bArrowCenter;
                 OUString    aArrowName;
                 basegfx::B2DPolyPolygon aPolyPoly(GetLineArrow( nLineWidth, eLineEnd, eWidth, eLength, nArrowWidth, bArrowCenter, aArrowName, bScaleArrows ));
 
@@ -2882,7 +2882,7 @@ DffRecordManager::DffRecordManager( SvStream& rIn ) :
     Consume( rIn );
 }
 
-void DffRecordManager::Consume( SvStream& rIn, sal_Bool bAppend, sal_uInt32 nStOfs )
+void DffRecordManager::Consume( SvStream& rIn, bool bAppend, sal_uInt32 nStOfs )
 {
     if ( !bAppend )
         Clear();
@@ -2989,16 +2989,16 @@ DffRecordHeader* DffRecordManager::Last()
     return pRet;
 }
 
-sal_Bool DffRecordManager::SeekToContent( SvStream& rIn, sal_uInt16 nRecId, DffSeekToContentMode eMode )
+bool DffRecordManager::SeekToContent( SvStream& rIn, sal_uInt16 nRecId, DffSeekToContentMode eMode )
 {
     DffRecordHeader* pHd = GetRecordHeader( nRecId, eMode );
     if ( pHd )
     {
         pHd->SeekToContent( rIn );
-        return sal_True;
+        return true;
     }
     else
-        return sal_False;
+        return false;
 }
 
 DffRecordHeader* DffRecordManager::GetRecordHeader( sal_uInt16 nRecId, DffSeekToContentMode eMode )
@@ -3148,9 +3148,9 @@ void SvxMSDffManager::SetModel(SdrModel* pModel, long nApplicationScale)
     }
 }
 
-sal_Bool SvxMSDffManager::SeekToShape( SvStream& rSt, void* /* pClientData */, sal_uInt32 nId ) const
+bool SvxMSDffManager::SeekToShape( SvStream& rSt, void* /* pClientData */, sal_uInt32 nId ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if ( !maFidcls.empty() )
     {
         sal_uInt32 nMerk = rSt.Tell();
@@ -3180,7 +3180,7 @@ sal_Bool SvxMSDffManager::SeekToShape( SvStream& rSt, void* /* pClientData */, s
                             if ( nId == nShapeId )
                             {
                                 aEscherObjListHd.SeekToBegOfRecord( rSt );
-                                bRet = sal_True;
+                                bRet = true;
                                 break;
                             }
                         }
@@ -4091,7 +4091,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
 
     DffObjData aObjData( rHd, rClientRect, nCalledByGroup );
     aObjData.bRotateTextWithShape = ( GetSvxMSDffSettings() & SVXMSDFF_SETTINGS_IMPORT_EXCEL ) == 0;
-    maShapeRecords.Consume( rSt, sal_False );
+    maShapeRecords.Consume( rSt, false );
     if( maShapeRecords.SeekToContent( rSt,
         DFF_msofbtUDefProp,
         SEEK_FROM_BEGINNING ) )
@@ -4972,7 +4972,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
                 }
                 if ( rSt.GetError() != 0 )
                     break;
-                pImpRec->bHasUDefProp = sal_True;
+                pImpRec->bHasUDefProp = true;
                 nBytesLeft  -= 6;
             }
         }
@@ -5291,11 +5291,11 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
 
         //Means that fBehindDocument is set
         if (GetPropertyValue(DFF_Prop_fPrint) & 0x20)
-            pImpRec->bDrawHell = sal_True;
+            pImpRec->bDrawHell = true;
         else
-            pImpRec->bDrawHell = sal_False;
+            pImpRec->bDrawHell = false;
         if (GetPropertyValue(DFF_Prop_fPrint) & 0x02)
-            pImpRec->bHidden = sal_True;
+            pImpRec->bHidden = true;
         pTextImpRec->bDrawHell  = pImpRec->bDrawHell;
         pTextImpRec->bHidden = pImpRec->bHidden;
         pImpRec->nNextShapeId   = GetPropertyValue( DFF_Prop_hspNext, 0 );
@@ -5506,7 +5506,7 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_,
      nSvxMSDffOLEConvFlags( 0 ),
      pSecPropSet( NULL ),
      mnDefaultColor( mnDefaultColor_),
-     mbTracing( sal_False )
+     mbTracing( false )
 {
     SetModel( pSdrModel_, nApplicationScale );
 
@@ -5555,7 +5555,7 @@ SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, const OUString& rBaseURL )
      nSvxMSDffOLEConvFlags( 0 ),
      pSecPropSet( NULL ),
      mnDefaultColor( COL_DEFAULT ),
-     mbTracing( sal_False )
+     mbTracing( false )
 {
     SetModel( NULL, 0 );
 }
@@ -5666,7 +5666,7 @@ void SvxMSDffManager::CheckTxBxStoryChain()
         boost::shared_ptr<SvxMSDffShapeInfo> const pObj = *iter;
         if( pObj->nTxBxComp )
         {
-            pObj->bLastBoxInChain = sal_False;
+            pObj->bLastBoxInChain = false;
             // group change?
             // #156763#
             // the text id also contains an internal drawing container id
@@ -5700,7 +5700,7 @@ void SvxMSDffManager::CheckTxBxStoryChain()
 
             if( bSetReplaceFALSE )
             {
-                pObj->bReplaceByFly = sal_False;
+                pObj->bReplaceByFly = false;
             }
         }
         // copy all Shape Info objects to m_pShapeInfosById, sorted by nShapeId
@@ -5885,7 +5885,7 @@ void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, sal_uLong nLenDg,
         // Patriarch found (the upmost shape group container) ?
         if( DFF_msofbtSpgrContainer == nFbt )
         {
-            if(!this->GetShapeGroupContainerData( rSt, nLength, sal_True, nDrawingContainerId )) return;
+            if(!this->GetShapeGroupContainerData( rSt, nLength, true, nDrawingContainerId )) return;
         }
         // empty Shape Container ? (outside of shape group container)
         else if( DFF_msofbtSpContainer == nFbt )
@@ -5899,9 +5899,9 @@ void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, sal_uLong nLenDg,
     while( nReadDg < nLenDg );
 }
 
-sal_Bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt,
+bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt,
                                                   sal_uLong nLenShapeGroupCont,
-                                                  sal_Bool bPatriarch,
+                                                  bool bPatriarch,
                                                   const unsigned long nDrawingContainerId )
 {
     sal_uInt8 nVer;sal_uInt16 nInst;sal_uInt16 nFbt;sal_uInt32 nLength;
@@ -5913,21 +5913,21 @@ sal_Bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt,
     do
     {
         if( !this->ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength ) )
-            return sal_False;
+            return false;
         nReadSpGrCont += DFF_COMMON_RECORD_HEADER_SIZE;
         // Shape Container?
         if( DFF_msofbtSpContainer == nFbt )
         {
             sal_uLong nGroupOffs = bFirst ? nStartShapeGroupCont - DFF_COMMON_RECORD_HEADER_SIZE : ULONG_MAX;
             if ( !this->GetShapeContainerData( rSt, nLength, nGroupOffs, nDrawingContainerId ) )
-                return sal_False;
-            bFirst = sal_False;
+                return false;
+            bFirst = false;
         }
         // nested shape group container ?
         else if( DFF_msofbtSpgrContainer == nFbt )
         {
-            if ( !this->GetShapeGroupContainerData( rSt, nLength, sal_False, nDrawingContainerId ) )
-                return sal_False;
+            if ( !this->GetShapeGroupContainerData( rSt, nLength, false, nDrawingContainerId ) )
+                return false;
         }
         else
             rSt.SeekRel( nLength );
@@ -5936,10 +5936,10 @@ sal_Bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt,
     while( nReadSpGrCont < nLenShapeGroupCont );
     // possition the steam correctly
     rSt.Seek( nStartShapeGroupCont + nLenShapeGroupCont );
-    return sal_True;
+    return true;
 }
 
-sal_Bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
+bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
                                              sal_uLong nLenShapeCont,
                                              sal_uLong nPosGroup,
                                              const unsigned long nDrawingContainerId )
@@ -5969,7 +5969,7 @@ sal_Bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
 
     do
     {
-        if(!this->ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength)) return sal_False;
+        if(!this->ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength)) return false;
         nReadSpCont += DFF_COMMON_RECORD_HEADER_SIZE;
         // FSP ?
         if( ( DFF_msofbtSp == nFbt ) && ( 4 <= nLength ) )
@@ -6107,7 +6107,7 @@ sal_Bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
                          )
                 ) ) )
         {
-            aInfo.bReplaceByFly = sal_True;
+            aInfo.bReplaceByFly = true;
         }
         m_pShapeInfosByTxBxComp->insert(::boost::shared_ptr<SvxMSDffShapeInfo>(
                     new SvxMSDffShapeInfo(aInfo)));
@@ -6116,7 +6116,7 @@ sal_Bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
 
     // and position the Stream correctly again
     rSt.Seek( nStartShapeCont + nLenShapeCont );
-    return sal_True;
+    return true;
 }
 
 
@@ -6126,7 +6126,7 @@ sal_Bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
     Access to a shape at runtime (via the Shape-Id)
     ----------------------------
 ******************************************************************************/
-sal_Bool SvxMSDffManager::GetShape(sal_uLong nId, SdrObject*&         rpShape,
+bool SvxMSDffManager::GetShape(sal_uLong nId, SdrObject*&         rpShape,
                                           SvxMSDffImportData& rData)
 {
     ::boost::shared_ptr<SvxMSDffShapeInfo> const pTmpRec(
@@ -6158,7 +6158,7 @@ sal_Bool SvxMSDffManager::GetShape(sal_uLong nId, SdrObject*&         rpShape,
             pStData->Seek( nOldPosData );
         return ( 0 != rpShape );
     }
-    return sal_False;
+    return false;
 }
 
 
@@ -6166,7 +6166,7 @@ sal_Bool SvxMSDffManager::GetShape(sal_uLong nId, SdrObject*&         rpShape,
 /*      access to a BLIP at runtime (if the Blip-Number is already known)
         ---------------------------
 ******************************************************************************/
-sal_Bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, Rectangle* pVisArea )
+bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, Rectangle* pVisArea )
 {
     sal_Bool bOk = sal_False;       // initialize result variable
     if ( pStData )
@@ -6191,7 +6191,7 @@ sal_Bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, Rectangle* p
         if ( !bOk )
         {
             sal_uInt16 nIdx = sal_uInt16( nIdx_ );
-            if( !nIdx || (pBLIPInfos->size() < nIdx) ) return sal_False;
+            if( !nIdx || (pBLIPInfos->size() < nIdx) ) return false;
 
             // possibly delete old error flag(s)
             if( rStCtrl.GetError() )
@@ -6249,7 +6249,7 @@ sal_Bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, Rectangle* p
 /*      access to a BLIP at runtime (with correctly positioned stream)
     ---------------------------------
 ******************************************************************************/
-sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, Rectangle* pVisArea ) const
+bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, Rectangle* pVisArea ) const
 {
     sal_uLong nOldPos = rBLIPStream.Tell();
 
@@ -6438,7 +6438,7 @@ bool SvxMSDffManager::ReadCommonRecordHeader(SvStream& rSt,
     return true;
 }
 
-sal_Bool SvxMSDffManager::ProcessClientAnchor(SvStream& rStData, sal_uInt32 nDatLen,
+bool SvxMSDffManager::ProcessClientAnchor(SvStream& rStData, sal_uInt32 nDatLen,
                                           char*& rpBuff, sal_uInt32& rBuffLen ) const
 {
     if( nDatLen )
@@ -6447,10 +6447,10 @@ sal_Bool SvxMSDffManager::ProcessClientAnchor(SvStream& rStData, sal_uInt32 nDat
         rpBuff = new char[rBuffLen];
         rBuffLen = rStData.Read(rpBuff, rBuffLen);
     }
-    return sal_True;
+    return true;
 }
 
-sal_Bool SvxMSDffManager::ProcessClientData(SvStream& rStData, sal_uInt32 nDatLen,
+bool SvxMSDffManager::ProcessClientData(SvStream& rStData, sal_uInt32 nDatLen,
                                         char*& rpBuff, sal_uInt32& rBuffLen ) const
 {
     if( nDatLen )
@@ -6459,7 +6459,7 @@ sal_Bool SvxMSDffManager::ProcessClientData(SvStream& rStData, sal_uInt32 nDatLe
         rpBuff = new char[rBuffLen];
         rBuffLen = rStData.Read(rpBuff, rBuffLen);
     }
-    return sal_True;
+    return true;
 }
 
 
@@ -6473,14 +6473,14 @@ sal_uLong SvxMSDffManager::Calc_nBLIPPos( sal_uLong nOrgVal, sal_uLong /* nStrea
     return nOrgVal;
 }
 
-sal_Bool SvxMSDffManager::GetOLEStorageName( long /* nOLEId */, OUString&, SvStorageRef&, uno::Reference < embed::XStorage >& ) const
+bool SvxMSDffManager::GetOLEStorageName( long /* nOLEId */, OUString&, SvStorageRef&, uno::Reference < embed::XStorage >& ) const
 {
-    return sal_False;
+    return false;
 }
 
-sal_Bool SvxMSDffManager::ShapeHasText( sal_uLong /* nShapeId */, sal_uLong /* nFilePos */ ) const
+bool SvxMSDffManager::ShapeHasText( sal_uLong /* nShapeId */, sal_uLong /* nFilePos */ ) const
 {
-    return sal_True;
+    return true;
 }
 
 // #i32596# - add new parameter <_nCalledByGroup>
@@ -6503,7 +6503,7 @@ SdrObject* SvxMSDffManager::ImportOLE( long nOLEId,
     return pRet;
 }
 
-sal_Bool SvxMSDffManager::MakeContentStream( SotStorage * pStor, const GDIMetaFile & rMtf )
+bool SvxMSDffManager::MakeContentStream( SotStorage * pStor, const GDIMetaFile & rMtf )
 {
     SotStorageStreamRef xStm = pStor->OpenSotStream(OUString(SVEXT_PERSIST_STREAM));
     xStm->SetVersion( pStor->GetVersion() );
@@ -6642,14 +6642,14 @@ static const ClsIDs aClsIDs[] = {
     { 0, "", "" } };
 
 
-sal_Bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen,
+bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen,
                     const GDIMetaFile * pMtf, const SotStorageRef& rDest )
 {
     sal_Bool bMtfRead = sal_False;
     SotStorageStreamRef xOle10Stm = rDest->OpenSotStream( OUString("\1Ole10Native"),
                                                     STREAM_WRITE| STREAM_SHARE_DENYALL );
     if( xOle10Stm->GetError() )
-        return sal_False;
+        return false;
 
     sal_uInt32 nType;
     sal_uInt32 nRecType;
@@ -6689,7 +6689,7 @@ sal_Bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen,
             {
                 pData = new sal_uInt8[ nDataLen ];
                 if( !pData )
-                    return sal_False;
+                    return false;
 
                 rStm.Read( pData, nDataLen );
 
@@ -6744,10 +6744,10 @@ sal_Bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen,
     if( !bMtfRead && pMtf )
     {
         MakeContentStream( rDest, *pMtf );
-        return sal_True;
+        return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 const char* GetInternalServerName_Impl( const SvGlobalName& aGlobName )
@@ -7178,13 +7178,13 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
     return pRet;
 }
 
-sal_Bool SvxMSDffManager::SetPropValue( const uno::Any& rAny, const uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
-            const OUString& rPropName, sal_Bool bTestPropertyAvailability )
+bool SvxMSDffManager::SetPropValue( const uno::Any& rAny, const uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+            const OUString& rPropName, bool bTestPropertyAvailability )
 {
-    sal_Bool bRetValue = sal_True;
+    bool bRetValue = true;
     if ( bTestPropertyAvailability )
     {
-        bRetValue = sal_False;
+        bRetValue = false;
         try
         {
             uno::Reference< beans::XPropertySetInfo >
@@ -7194,7 +7194,7 @@ sal_Bool SvxMSDffManager::SetPropValue( const uno::Any& rAny, const uno::Referen
         }
         catch( const uno::Exception& )
         {
-            bRetValue = sal_False;
+            bRetValue = false;
         }
     }
     if ( bRetValue )
@@ -7202,11 +7202,11 @@ sal_Bool SvxMSDffManager::SetPropValue( const uno::Any& rAny, const uno::Referen
         try
         {
             rXPropSet->setPropertyValue( rPropName, rAny );
-            bRetValue = sal_True;
+            bRetValue = true;
         }
         catch( const uno::Exception& )
         {
-            bRetValue = sal_False;
+            bRetValue = false;
         }
     }
     return bRetValue;
@@ -7246,15 +7246,15 @@ SvxMSDffImportRec::SvxMSDffImportRec()
 {
       eLineStyle      = mso_lineSimple; // GPF-Bug #66227#
       eLineDashing    = mso_lineSolid;
-      bDrawHell       = sal_False;
-      bHidden         = sal_False;
-
-      bReplaceByFly   = sal_False;
-      bLastBoxInChain = sal_True;
-      bHasUDefProp    = sal_False; // was the DFF_msofbtUDefProp record set?
-      bVFlip = sal_False;
-      bHFlip = sal_False;
-      bAutoWidth      = sal_False;
+      bDrawHell       = false;
+      bHidden         = false;
+
+      bReplaceByFly   = false;
+      bLastBoxInChain = true;
+      bHasUDefProp    = false; // was the DFF_msofbtUDefProp record set?
+      bVFlip          = false;
+      bHFlip          = false;
+      bAutoWidth      = false;
 }
 
 SvxMSDffImportRec::SvxMSDffImportRec(const SvxMSDffImportRec& rCopy)
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index fbde4d64fc36..5bc0ba5c73db 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -458,7 +458,7 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& Macro
 }
 
 // Treat the args as possible inouts ( conversion at bottom of method )
-sal_Bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& aRet, const uno::Any& /*aCaller*/)
+bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& aRet, const uno::Any& /*aCaller*/)
 {
 #ifdef DISABLE_SCRIPTING
     (void) pShell;
@@ -466,9 +466,9 @@ sal_Bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, uno::
     (void) aArgs;
     (void) aRet;
 
-    return sal_False;
+    return false;
 #else
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     if ( !pShell )
         return bRes;
     OUString sUrl = makeMacroURL( sMacroName );
@@ -497,7 +497,7 @@ sal_Bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, uno::
     }
     catch ( const uno::Exception& )
     {
-       bRes = sal_False;
+       bRes = false;
     }
     return bRes;
 #endif
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index d92da70d14d0..06d6faf59ab7 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -480,11 +480,11 @@ PptSlidePersistEntry::PptSlidePersistEntry() :
     nDrawingDgId            ( 0xffffffff ),
     pPresentationObjects    ( NULL ),
     pBObj                   ( NULL ),
-    bBObjIsTemporary        ( sal_True ),
+    bBObjIsTemporary        ( true ),
     ePageKind               ( PPT_MASTERPAGE ),
-    bNotesMaster            ( sal_False ),
-    bHandoutMaster          ( sal_False ),
-    bStarDrawFiller         ( sal_False )
+    bNotesMaster            ( false ),
+    bHandoutMaster          ( false ),
+    bStarDrawFiller         ( false )
 {
     HeaderFooterOfs[ 0 ] =  HeaderFooterOfs[ 1 ] = HeaderFooterOfs[ 2 ] = HeaderFooterOfs[ 3 ] = 0;
 }
@@ -504,12 +504,12 @@ SdrEscherImport::SdrEscherImport( PowerPointImportParam& rParam, const OUString&
     nStreamLen              ( 0 ),
     nTextStylesIndex        ( 0xffff ),
     eCharSetSystem          ( osl_getThreadTextEncoding() ),
-    bWingdingsChecked       ( sal_False ),
-    bWingdingsAvailable     ( sal_False ),
-    bMonotypeSortsChecked   ( sal_False ),
-    bMonotypeSortsAvailable ( sal_False ),
-    bTimesNewRomanChecked   ( sal_False ),
-    bTimesNewRomanAvailable ( sal_False ),
+    bWingdingsChecked       ( false ),
+    bWingdingsAvailable     ( false ),
+    bMonotypeSortsChecked   ( false ),
+    bMonotypeSortsAvailable ( false ),
+    bTimesNewRomanChecked   ( false ),
+    bTimesNewRomanAvailable ( false ),
     rImportParam            ( rParam )
 {
 }
@@ -527,9 +527,9 @@ const PptSlideLayoutAtom* SdrEscherImport::GetSlideLayoutAtom() const
     return NULL;
 }
 
-sal_Bool SdrEscherImport::ReadString( OUString& rStr ) const
+bool SdrEscherImport::ReadString( OUString& rStr ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     DffRecordHeader aStrHd;
     ReadDffRecordHeader( rStCtrl, aStrHd );
     if (aStrHd.nRecType == PPT_PST_TextBytesAtom
@@ -539,7 +539,7 @@ sal_Bool SdrEscherImport::ReadString( OUString& rStr ) const
         sal_Bool bUniCode =
             (aStrHd.nRecType == PPT_PST_TextCharsAtom
             || aStrHd.nRecType == PPT_PST_CString);
-        bRet=sal_True;
+        bRet = true;
         sal_uLong nBytes = aStrHd.nRecLen;
         rStr = MSDFFReadZString( rStCtrl, nBytes, bUniCode );
         aStrHd.SeekToEndOfRecord( rStCtrl );
@@ -554,9 +554,9 @@ bool SdrEscherImport::GetColorFromPalette(sal_uInt16 /*nNum*/, Color& /*rColor*/
     return false;
 }
 
-sal_Bool SdrEscherImport::SeekToShape( SvStream& /*rSt*/, void* /*pClientData*/, sal_uInt32 /*nId*/) const
+bool SdrEscherImport::SeekToShape( SvStream& /*rSt*/, void* /*pClientData*/, sal_uInt32 /*nId*/) const
 {
-    return sal_False;
+    return false;
 }
 
 PptFontEntityAtom* SdrEscherImport::GetFontEnityAtom( sal_uInt32 nNum ) const
@@ -590,7 +590,7 @@ void SdrEscherImport::ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd,
     Scale( r );
     Scale( b );
     rObj.aChildAnchor = Rectangle( l, t, r, b );
-    rObj.bChildAnchor = sal_True;
+    rObj.bChildAnchor = true;
     return;
 };
 
@@ -763,7 +763,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
                 aClientDataHd.SeekToEndOfRecord( rSt );
             }
         }
-        if ( ( aPlaceholderAtom.nPlaceholderId == PPT_PLACEHOLDER_NOTESSLIDEIMAGE ) && ( rPersistEntry.bNotesMaster == sal_False ) )
+        if ( ( aPlaceholderAtom.nPlaceholderId == PPT_PLACEHOLDER_NOTESSLIDEIMAGE ) && ( rPersistEntry.bNotesMaster == false ) )
         {
             sal_uInt16 nPageNum = pSdrModel->GetPageCount();
             if ( nPageNum > 0 )
@@ -1295,7 +1295,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
 
             rStCtrl.Seek( 0 );
             DffRecordManager aPptRecManager;                            // contains all first level container and atoms
-            aPptRecManager.Consume( rStCtrl, sal_False, nStreamLen );
+            aPptRecManager.Consume( rStCtrl, false, nStreamLen );
             for ( pHd = aPptRecManager.Last(); pHd; pHd = aPptRecManager.Prev() )
             {
                 if ( pHd->nRecType == PPT_PST_UserEditAtom )
@@ -1306,23 +1306,23 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
                 }
             }
             if ( !pHd )
-                bOk = sal_False;
+                bOk = false;
         }
     }
     if ( rStCtrl.GetError() != 0 )
-        bOk = sal_False;
+        bOk = false;
 
     if ( bOk )
     {
         nPersistPtrAnz = aUserEditAtom.nMaxPersistWritten + 1;
         if ( ( nPersistPtrAnz >> 2 ) > nStreamLen )     // sj: at least nPersistPtrAnz is not allowed to be greater than filesize
-            bOk = sal_False;                                // (it should not be greater than the PPT_PST_PersistPtrIncrementalBlock, but
+            bOk = false;                                // (it should not be greater than the PPT_PST_PersistPtrIncrementalBlock, but
                                                         // we are reading this block later, so we do not have access yet)
 
         if ( bOk && ( nPersistPtrAnz < ( SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) -1 ) )
             pPersistPtr = new (std::nothrow) sal_uInt32[ nPersistPtrAnz + 1 ];
         if ( !pPersistPtr )
-            bOk = sal_False;
+            bOk = false;
         if ( bOk )
         {
             memset( pPersistPtr, 0x00, (nPersistPtrAnz+1) * sizeof(sal_uInt32) );
@@ -1357,7 +1357,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
                                     pPersistPtr[ nOfs ] = nPt;
                                     if ( pPersistPtr[ nOfs ] > nStreamLen )
                                     {
-                                        bOk = sal_False;
+                                        bOk = false;
                                         OSL_FAIL("SdrPowerPointImport::Ctor(): Ungueltiger Eintrag im Persist-Directory!");
                                     }
                                 }
@@ -1367,7 +1367,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
                             if ( bOk && nAnz > 0 )
                             {
                                 OSL_FAIL("SdrPowerPointImport::Ctor(): Nicht alle Persist-Directory Entraege gelesen!");
-                                bOk = sal_False;
+                                bOk = false;
                             }
                         }
                     }
@@ -1382,14 +1382,14 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
         }
     }
     if ( rStCtrl.GetError() != 0 )
-        bOk = sal_False;
+        bOk = false;
     if ( bOk )
     {   // check Document PersistEntry
         nDocStreamPos = aUserEditAtom.nDocumentRef;
         if ( nDocStreamPos > nPersistPtrAnz )
         {
             OSL_FAIL("SdrPowerPointImport::Ctor(): aUserEditAtom.nDocumentRef ungueltig!");
-            bOk = sal_False;
+            bOk = false;
         }
     }
     if ( bOk )
@@ -1398,7 +1398,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
         if ( nDocStreamPos >= nStreamLen )
         {
             OSL_FAIL("SdrPowerPointImport::Ctor(): nDocStreamPos >= nStreamLen!");
-            bOk = sal_False;
+            bOk = false;
         }
     }
     if ( bOk )
@@ -1417,7 +1417,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
             ReadPptDocumentAtom( rStCtrl, aDocAtom );
         }
         else
-            bOk = sal_False;
+            bOk = false;
 
         if ( bOk )
         {
@@ -1464,9 +1464,9 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
             // now always creating the handout page, it will be the first in our masterpage list
             PptSlidePersistEntry* pE = new PptSlidePersistEntry;
             pE->aPersistAtom.nPsrReference = aDocAtom.nHandoutMasterPersist;
-            pE->bHandoutMaster = sal_True;
+            pE->bHandoutMaster = true;
             if ( !aDocAtom.nHandoutMasterPersist )
-                pE->bStarDrawFiller = sal_True;     // this is a dummy master page
+                pE->bStarDrawFiller = true;     // this is a dummy master page
             pMasterPages->insert( pMasterPages->begin(), pE );
 
             sal_uInt16 nPageListNum = 0;
@@ -1498,7 +1498,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
             if ( pMasterPages->size() == 1 )   // -> there is only a handout page available
             {
                 PptSlidePersistEntry* pE2 = new PptSlidePersistEntry;
-                pE2->bStarDrawFiller = sal_True;            // this is a dummy master page
+                pE2->bStarDrawFiller = true;            // this is a dummy master page
                 pMasterPages->insert( pMasterPages->begin() + 1, pE2 );
             }
 
@@ -1508,12 +1508,12 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
             for ( nMasterPage = 0; nMasterPage < nMasterPages; nMasterPage++ )
             {
                 PptSlidePersistEntry* pE2 = new PptSlidePersistEntry;
-                pE2->bNotesMaster = sal_True;
-                pE2->bStarDrawFiller = sal_True;            // this is a dummy master page
+                pE2->bNotesMaster = true;
+                pE2->bStarDrawFiller = true;            // this is a dummy master page
                 if ( !nMasterPage && aDocAtom.nNotesMasterPersist )
                 {   // special treatment for the first notes master
                     pE2->aPersistAtom.nPsrReference = aDocAtom.nNotesMasterPersist;
-                    pE2->bStarDrawFiller = sal_False;   // this is a dummy master page
+                    pE2->bStarDrawFiller = false;   // this is a dummy master page
                 }
                 pMasterPages->insert( pMasterPages->begin() + (( nMasterPage + 1 ) << 1), pE2 );
             }
@@ -1564,7 +1564,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
                                 }
                             }
                             // office xp is supporting more than one stylesheet
-                            if ( ( pE2->ePageKind == PPT_MASTERPAGE ) && ( pE2->aSlideAtom.nMasterId == 0 ) && ( pE2->bNotesMaster == 0 ) )
+                            if ( ( pE2->ePageKind == PPT_MASTERPAGE ) && ( pE2->aSlideAtom.nMasterId == 0 ) && ( pE2->bNotesMaster == false ) )
                             {
                                 PPTTextSpecInfo aTxSI( 0 );
                                 if ( aTxSIStyle.bValid && !aTxSIStyle.aList.empty() )
@@ -1609,7 +1609,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
         }
     }
     if ( ( rStCtrl.GetError() != 0 ) || ( pDefaultSheet == NULL ) )
-        bOk = sal_False;
+        bOk = false;
     pPPTStyleSheet = pDefaultSheet;
     rStCtrl.Seek( 0 );
 }
@@ -1626,10 +1626,10 @@ SdrPowerPointImport::~SdrPowerPointImport()
     delete[] pPersistPtr;
 }
 
-sal_Bool PPTConvertOCXControls::ReadOCXStream( SotStorageRef& rSrc,
+bool PPTConvertOCXControls::ReadOCXStream( SotStorageRef& rSrc,
         com::sun::star::uno::Reference<
         com::sun::star::drawing::XShape > *pShapeRef,
-        sal_Bool bFloatingCtrl )
+        bool bFloatingCtrl )
 {
     bool bRes = false;
     uno::Reference< form::XFormComponent > xFComp;
@@ -1735,7 +1735,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >&
     return xDrawPage;
 }
 
-sal_Bool SdrPowerPointOLEDecompress( SvStream& rOutput, SvStream& rInput, sal_uInt32 nInputSize )
+bool SdrPowerPointOLEDecompress( SvStream& rOutput, SvStream& rInput, sal_uInt32 nInputSize )
 {
     sal_uInt32 nOldPos = rInput.Tell();
     char* pBuf = new char[ nInputSize ];
@@ -1744,7 +1744,7 @@ sal_Bool SdrPowerPointOLEDecompress( SvStream& rOutput, SvStream& rInput, sal_uI
     aZCodec.BeginCompression();
     SvMemoryStream aSource( pBuf, nInputSize, STREAM_READ );
     aZCodec.Decompress( aSource, rOutput );
-    const sal_Bool bSuccess(0L != aZCodec.EndCompression());
+    const bool bSuccess(0L != aZCodec.EndCompression());
     delete[] pBuf;
     rInput.Seek( nOldPos );
     return bSuccess;
@@ -1860,7 +1860,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId,
                                     uno::Reference< frame::XModel > xModel( pOe->pShell->GetModel() );
                                     PPTConvertOCXControls aPPTConvertOCXControls( this, xIStrm, xModel, eAktPageKind );
                                     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape;
-                                    if ( aPPTConvertOCXControls.ReadOCXStream( xObjStor, &xShape, sal_False ) )
+                                    if ( aPPTConvertOCXControls.ReadOCXStream( xObjStor, &xShape, false ) )
                                         pRet = GetSdrObjectFromXShape( xShape );
 
                                 }
@@ -2107,9 +2107,9 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt
     }
 }
 
-sal_Bool SdrPowerPointImport::ReadFontCollection()
+bool SdrPowerPointImport::ReadFontCollection()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     DffRecordHeader* pEnvHd = aDocRecManager.GetRecordHeader( PPT_PST_Environment );
     if ( pEnvHd )
     {
@@ -2121,7 +2121,7 @@ sal_Bool SdrPowerPointImport::ReadFontCollection()
             sal_uInt16 nCount2 = 0;
             while ( SeekToRec( rStCtrl, PPT_PST_FontEntityAtom, aListHd.GetRecEndFilePos() ) )
             {
-                bRet = sal_True;
+                bRet = true;
                 if ( !pFonts )
                     pFonts = new PptFontCollection;
                 PptFontEntityAtom* pFont = new PptFontEntityAtom;
@@ -2320,9 +2320,9 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj*
     return pText;
 }
 
-sal_Bool SdrPowerPointImport::SeekToDocument( DffRecordHeader* pRecHd ) const
+bool SdrPowerPointImport::SeekToDocument( DffRecordHeader* pRecHd ) const
 {
-    sal_Bool bRet;
+    bool bRet;
     sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for restoring it should the situation arise
     rStCtrl.Seek( nDocStreamPos );
     DffRecordHeader aDocHd;
@@ -2340,10 +2340,10 @@ sal_Bool SdrPowerPointImport::SeekToDocument( DffRecordHeader* pRecHd ) const
     return bRet;
 }
 
-sal_Bool SdrPowerPointImport::SeekToContentOfProgTag( sal_Int32 nVersion, SvStream& rSt,
+bool SdrPowerPointImport::SeekToContentOfProgTag( sal_Int32 nVersion, SvStream& rSt,
                                 const DffRecordHeader& rSourceHd, DffRecordHeader& rContentHd )
 {
-    sal_Bool    bRetValue = sal_False;
+    bool    bRetValue = false;
     sal_uInt32  nOldPos = rSt.Tell();
 
     DffRecordHeader aProgTagsHd, aProgTagBinaryDataHd;
@@ -2372,7 +2372,7 @@ sal_Bool SdrPowerPointImport::SeekToContentOfProgTag( sal_Int32 nVersion, SvStre
                         ReadDffRecordHeader( rSt, rContentHd );
                         if ( rContentHd.nRecType == PPT_PST_BinaryTagData )
                         {
-                            bRetValue = sal_True;
+                            bRetValue = true;
                             break;
                         }
                     }
@@ -2394,9 +2394,9 @@ sal_uInt32 SdrPowerPointImport::GetAktPageId()
     return 0;
 }
 
-sal_Bool SdrPowerPointImport::SeekToAktPage( DffRecordHeader* pRecHd ) const
+bool SdrPowerPointImport::SeekToAktPage( DffRecordHeader* pRecHd ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     PptSlidePersistList* pList = GetPageList( eAktPageKind );
     if ( pList && ( nAktPageNum < pList->size() ) )
     {
@@ -2410,7 +2410,7 @@ sal_Bool SdrPowerPointImport::SeekToAktPage( DffRecordHeader* pRecHd ) const
                 rStCtrl.Seek( nFPos );
                 if ( pRecHd )
                     ReadDffRecordHeader( rStCtrl, *pRecHd );
-                bRet = sal_True;
+                bRet = true;
             }
         }
     }
@@ -2552,9 +2552,9 @@ bool SdrPowerPointImport::GetColorFromPalette( sal_uInt16 nNum, Color& rColor )
     return true;
 }
 
-sal_Bool SdrPowerPointImport::SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const
+bool SdrPowerPointImport::SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const
 {
-    sal_Bool bRet = SvxMSDffManager::SeekToShape( rSt, pClientData, nId );
+    bool bRet = SvxMSDffManager::SeekToShape( rSt, pClientData, nId );
     if ( !bRet )
     {
         ProcessData& rData = *( (ProcessData*)pClientData );
@@ -2599,7 +2599,7 @@ sal_Bool SdrPowerPointImport::SeekToShape( SvStream& rSt, void* pClientData, sal
                                 if ( nShapePos )
                                 {
                                     rSt.Seek( nShapePos );
-                                    bRet = sal_True;
+                                    bRet = true;
                                 }
                             }
                             if ( !bRet )
@@ -2616,7 +2616,7 @@ sal_Bool SdrPowerPointImport::SeekToShape( SvStream& rSt, void* pClientData, sal
     return bRet;
 }
 
-SdrPage* SdrPowerPointImport::MakeBlancPage( sal_Bool bMaster ) const
+SdrPage* SdrPowerPointImport::MakeBlancPage( bool bMaster ) const
 {
     SdrPage* pRet = pSdrModel->AllocPage( bMaster );
     pRet->SetSize( GetPageSize() );
@@ -2793,7 +2793,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
                                             {
                                                 aEscherObjListHd.SeekToBegOfRecord( rStCtrl );
                                                 rSlidePersist.pBObj = ImportObj( rStCtrl, (void*)&aProcessData, aPageSize, aPageSize );
-                                                rSlidePersist.bBObjIsTemporary = sal_False;
+                                                rSlidePersist.bBObjIsTemporary = false;
                                             }
                                         }
                                     }
@@ -2884,9 +2884,9 @@ const PptSlideLayoutAtom* SdrPowerPointImport::GetSlideLayoutAtom() const
     return NULL;
 }
 
-sal_Bool SdrPowerPointImport::IsNoteOrHandout( sal_uInt16 nPageNum, PptPageKind /*ePageKind*/) const
+bool SdrPowerPointImport::IsNoteOrHandout( sal_uInt16 nPageNum, PptPageKind /*ePageKind*/) const
 {
-    sal_Bool bNote = eAktPageKind == PPT_NOTEPAGE;
+    bool bNote = eAktPageKind == PPT_NOTEPAGE;
     if ( eAktPageKind == PPT_MASTERPAGE )
         bNote = ( nPageNum & 1 ) == 0;
     return bNote;
@@ -2908,12 +2908,12 @@ sal_uInt32 SdrPowerPointImport::GetNotesPageId( sal_uInt16 nPageNum ) const
    return 0;
 }
 
-sal_Bool SdrPowerPointImport::HasMasterPage( sal_uInt16 nPageNum, PptPageKind ePageKind ) const
+bool SdrPowerPointImport::HasMasterPage( sal_uInt16 nPageNum, PptPageKind ePageKind ) const
 {
     if ( ePageKind == PPT_NOTEPAGE )
         return aDocAtom.nNotesMasterPersist != 0;
     if ( ePageKind == PPT_MASTERPAGE )
-        return sal_False;
+        return false;
     return GetMasterPageId( nPageNum, ePageKind ) != 0;
 }
 
@@ -2932,7 +2932,7 @@ sal_uInt16 SdrPowerPointImport::GetMasterPageIndex( sal_uInt16 nPageNum, PptPage
     return nIdx;
 }
 
-SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage, sal_uInt32& nBgFileOffset, sal_Bool bForce )
+SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage, sal_uInt32& nBgFileOffset, bool bForce )
 {
     SdrObject* pRet = NULL;
     sal_Bool bCreateObj = bForce;
@@ -3108,12 +3108,12 @@ PPTExtParaLevel::PPTExtParaLevel()
 , mpfPP10Ext( 0 )
 , mnExtCharacterMask( 0 )
 , mcfPP10Ext( 0 )
-, mbSet( sal_False )
+, mbSet( false )
 {}
 
 SvStream& ReadPPTExtParaLevel( SvStream& rIn, PPTExtParaLevel& rLevel )
 {
-    rLevel.mbSet = sal_True;
+    rLevel.mbSet = true;
     rIn.ReadUInt32( rLevel.mnExtParagraphMask );
     if ( rLevel.mnExtParagraphMask & 0x00800000 )
         rIn.ReadUInt16( rLevel.mnBuBlip );
@@ -3129,15 +3129,15 @@ SvStream& ReadPPTExtParaLevel( SvStream& rIn, PPTExtParaLevel& rLevel )
     return rIn;
 }
 
-sal_Bool PPTExtParaProv::GetGraphic( sal_uInt32 nInstance, Graphic& rGraph ) const
+bool PPTExtParaProv::GetGraphic( sal_uInt32 nInstance, Graphic& rGraph ) const
 {
-    sal_Bool bRetValue = sal_False;
+    bool bRetValue = false;
     PPTBuGraEntry* pPtr = NULL;
     if ( nInstance < aBuGraList.size() )
     {
         pPtr = aBuGraList[ nInstance ];
         if ( pPtr->nInstance == nInstance )
-            bRetValue = sal_True;
+            bRetValue = true;
     }
     if ( !bRetValue )
     {
@@ -3146,7 +3146,7 @@ sal_Bool PPTExtParaProv::GetGraphic( sal_uInt32 nInstance, Graphic& rGraph ) con
             pPtr = aBuGraList[ i ];
             if ( pPtr->nInstance == nInstance )
             {
-                bRetValue = sal_True;
+                bRetValue = true;
                 break;
             }
         }
@@ -3157,8 +3157,8 @@ sal_Bool PPTExtParaProv::GetGraphic( sal_uInt32 nInstance, Graphic& rGraph ) con
 }
 
 PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const DffRecordHeader* pHd ) :
-    bStyles         ( sal_False ),
-    bGraphics       ( sal_False )
+    bStyles         ( false ),
+    bGraphics       ( false )
 {
     sal_uInt32 nOldPos = rSt.Tell();
 
@@ -3224,12 +3224,12 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const
                         aBuGraAtomHd.SeekToEndOfRecord( rSt );
                     }
                     if ( !aBuGraList.empty() )
-                        bGraphics = sal_True;
+                        bGraphics = true;
                 }
                 break;
 
                 case PPT_PST_ExtendedPresRuleContainer :
-                    aExtendedPresRules.Consume( rSt, sal_False, aHd.GetRecEndFilePos() );
+                    aExtendedPresRules.Consume( rSt, false, aHd.GetRecEndFilePos() );
                 break;
 #ifdef DBG_UTIL
                 default :
@@ -3270,7 +3270,7 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const
 
                             while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < aHd.GetRecEndFilePos() ) && ( i < nDepth ) )
                             {
-                                bStyles = sal_True;
+                                bStyles = true;
                                 ReadPPTExtParaLevel( rSt, aExtParaSheet[ aHd.nRecInstance ].aExtParaLevel[ i++ ] );
                             }
 #ifdef DBG_UTIL
@@ -3320,7 +3320,7 @@ PPTNumberFormatCreator::~PPTNumberFormatCreator()
     delete pExtParaProv;
 }
 
-sal_Bool PPTNumberFormatCreator::ImplGetExtNumberFormat( SdrPowerPointImport& rManager,
+bool PPTNumberFormatCreator::ImplGetExtNumberFormat( SdrPowerPointImport& rManager,
     SvxNumberFormat& rNumberFormat, sal_uInt32 nLevel, sal_uInt32 nInstance, sal_uInt32 nDestinationInstance,
         boost::optional< sal_Int16 >& rStartNumbering, sal_uInt32 nFontHeight,  PPTParagraphObj* pPara )
 {
@@ -3611,17 +3611,17 @@ void PPTNumberFormatCreator::GetNumberFormat( SdrPowerPointImport& rManager, Svx
     }
 }
 
-sal_Bool PPTNumberFormatCreator::GetNumberFormat( SdrPowerPointImport& rManager, SvxNumberFormat& rNumberFormat, PPTParagraphObj* pParaObj,
+bool PPTNumberFormatCreator::GetNumberFormat( SdrPowerPointImport& rManager, SvxNumberFormat& rNumberFormat, PPTParagraphObj* pParaObj,
                                                 sal_uInt32 nDestinationInstance, boost::optional< sal_Int16 >& rStartNumbering )
 {
     sal_uInt32 nHardCount = 0;
-    nHardCount += pParaObj->GetAttrib( PPT_ParaAttr_BulletOn, nIsBullet, nDestinationInstance );
-    nHardCount += pParaObj->GetAttrib( PPT_ParaAttr_BulletChar, nBulletChar, nDestinationInstance );
-    nHardCount += pParaObj->GetAttrib( PPT_ParaAttr_BulletFont, nBulletFont, nDestinationInstance );
-    nHardCount += pParaObj->GetAttrib( PPT_ParaAttr_BulletHeight, nBulletHeight, nDestinationInstance );
-    nHardCount += pParaObj->GetAttrib( PPT_ParaAttr_BulletColor, nBulletColor, nDestinationInstance );
-    nHardCount += pParaObj->GetAttrib( PPT_ParaAttr_TextOfs, nTextOfs, nDestinationInstance );
-    nHardCount += pParaObj->GetAttrib( PPT_ParaAttr_BulletOfs, nBulletOfs, nDestinationInstance );
+    nHardCount += pParaObj->GetAttrib( PPT_ParaAttr_BulletOn, nIsBullet, nDestinationInstance ) ? 1 : 0;
+    nHardCount += pParaObj->GetAttrib( PPT_ParaAttr_BulletChar, nBulletChar, nDestinationInstance ) ? 1 : 0;
+    nHardCount += pParaObj->GetAttrib( PPT_ParaAttr_BulletFont, nBulletFont, nDestinationInstance ) ? 1 : 0;
+    nHardCount += pParaObj->GetAttrib( PPT_ParaAttr_BulletHeight, nBulletHeight, nDestinationInstance ) ? 1 : 0;
+    nHardCount += pParaObj->GetAttrib( PPT_ParaAttr_BulletColor, nBulletColor, nDestinationInstance ) ? 1 : 0;
+    nHardCount += pParaObj->GetAttrib( PPT_ParaAttr_TextOfs, nTextOfs, nDestinationInstance ) ? 1 : 0;
+    nHardCount += pParaObj->GetAttrib( PPT_ParaAttr_BulletOfs, nBulletOfs, nDestinationInstance ) ? 1 : 0;
 
     if ( nIsBullet )
         rNumberFormat.SetNumberingType( SVX_NUM_CHAR_SPECIAL );
@@ -3632,7 +3632,7 @@ sal_Bool PPTNumberFormatCreator::GetNumberFormat( SdrPowerPointImport& rManager,
         pPtr->GetAttrib( PPT_CharAttr_FontHeight, nFontHeight, nDestinationInstance );
     if ( nIsBullet )
         nHardCount += ImplGetExtNumberFormat( rManager, rNumberFormat, pParaObj->pParaSet->mnDepth,
-                                                    pParaObj->mnInstance, nDestinationInstance, rStartNumbering, nFontHeight, pParaObj );
+                                                    pParaObj->mnInstance, nDestinationInstance, rStartNumbering, nFontHeight, pParaObj ) ? 1 : 0;
 
     if ( rNumberFormat.GetNumberingType() != SVX_NUM_BITMAP )
         pParaObj->UpdateBulletRelSize( nBulletHeight );
@@ -3748,7 +3748,7 @@ PPTCharSheet::PPTCharSheet( const PPTCharSheet& rAttr )
     *this = rAttr;
 }
 
-void PPTCharSheet::Read( SvStream& rIn, sal_Bool /*bMasterStyle*/, sal_uInt32 nLevel, sal_Bool /*bFirst*/)
+void PPTCharSheet::Read( SvStream& rIn, bool /*bMasterStyle*/, sal_uInt32 nLevel, bool /*bFirst*/)
 {
     // Zeichenattribute
     sal_uInt32 nCMask;
@@ -3848,8 +3848,8 @@ void PPTParaSheet::Read( SdrPowerPointImport&
 #ifdef DBG_UTIL
                     rManager
 #endif
-                    , SvStream& rIn, sal_Bool /*bMasterStyle*/,
-                    sal_uInt32 nLevel, sal_Bool bFirst )
+                    , SvStream& rIn, bool /*bMasterStyle*/,
+                    sal_uInt32 nLevel, bool bFirst )
 {
     // Absatzattribute
     sal_uInt16  nVal16, i, nMask16;
@@ -4038,7 +4038,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
                         mpParaSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->maParaLevel[ nLev ] = mpParaSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->maParaLevel[ nLev - 1 ];
                         mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->maCharLevel[ nLev ] = mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->maCharLevel[ nLev - 1 ];
                     }
-                    mpParaSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->Read( rManager, rIn, sal_True, nLev, bFirst );
+                    mpParaSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->Read( rManager, rIn, true, nLev, bFirst );
                     if ( !nLev )
                     {
                         // set paragraph defaults for instance 4 (TSS_TYPE_TEXT_IN_SHAPE)
@@ -4054,7 +4054,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
                                 rParaLevel.mnAsianLineBreak |= 4;
                         }
                     }
-                    mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->Read( rIn, sal_True, nLev, bFirst );
+                    mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->Read( rIn, true, nLev, bFirst );
                     mpParaSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->UpdateBulletRelSize(  nLev, mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->maCharLevel[ nLev ].mnFontHeight );
                     bFirst = sal_False;
                     nLev++;
@@ -4142,8 +4142,8 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
                     sal_uInt16 nDontKnow;
                     rIn.ReadUInt16( nDontKnow );
                 }
-                mpParaSheet[ nInstance ]->Read( rManager, rIn, sal_True, nLev, bFirst );
-                mpCharSheet[ nInstance ]->Read( rIn, sal_True, nLev, bFirst );
+                mpParaSheet[ nInstance ]->Read( rManager, rIn, true, nLev, bFirst );
+                mpCharSheet[ nInstance ]->Read( rIn, true, nLev, bFirst );
                 mpParaSheet[ nInstance ]->UpdateBulletRelSize(  nLev, mpCharSheet[ nInstance ]->maCharLevel[ nLev ].mnFontHeight );
                 bFirst = sal_False;
                 nLev++;
@@ -4222,7 +4222,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
                             mpParaSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->maParaLevel[ nLev ] = mpParaSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->maParaLevel[ nLev - 1 ];
                             mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->maCharLevel[ nLev ] = mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->maCharLevel[ nLev - 1 ];
                         }
-                        mpParaSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->Read( rManager, rIn, sal_True, nLev, bFirst );
+                        mpParaSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->Read( rManager, rIn, true, nLev, bFirst );
                         if ( !nLev )
                         {
                             // set paragraph defaults for instance 4 (TSS_TYPE_TEXT_IN_SHAPE)
@@ -4238,7 +4238,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
                                     rParaLevel.mnAsianLineBreak |= 4;
                             }
                         }
-                        mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->Read( rIn, sal_True, nLev, bFirst );
+                        mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->Read( rIn, true, nLev, bFirst );
                         mpParaSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->UpdateBulletRelSize(  nLev, mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->maCharLevel[ nLev ].mnFontHeight );
                         bFirst = sal_False;
                         nLev++;
@@ -4356,8 +4356,8 @@ PPTCharPropSet::PPTCharPropSet( sal_uInt32 nParagraph ) :
     pCharSet        ( new ImplPPTCharPropSet )
 {
     mnHylinkOrigColor = 0;
-    mbIsHyperlink = sal_False;
-    mbHardHylinkOrigColor = sal_False;
+    mbIsHyperlink = false;
+    mbHardHylinkOrigColor = false;
     mnLanguage[ 0 ] = mnLanguage[ 1 ] = mnLanguage[ 2 ] = 0;
 }
 
@@ -4547,28 +4547,28 @@ PPTTextRulerInterpreter::PPTTextRulerInterpreter( sal_uInt32 nFileOfs, SdrPowerP
     }
 }
 
-sal_Bool PPTTextRulerInterpreter::GetDefaultTab( sal_uInt32 /*nLevel*/, sal_uInt16& nValue ) const
+bool PPTTextRulerInterpreter::GetDefaultTab( sal_uInt32 /*nLevel*/, sal_uInt16& nValue ) const
 {
     if ( ! ( mpImplRuler->nFlags & 1 ) )
-        return sal_False;
+        return false;
     nValue = mpImplRuler->nDefaultTab;
-    return sal_True;
+    return true;
 }
 
-sal_Bool PPTTextRulerInterpreter::GetTextOfs( sal_uInt32 nLevel, sal_uInt16& nValue ) const
+bool PPTTextRulerInterpreter::GetTextOfs( sal_uInt32 nLevel, sal_uInt16& nValue ) const
 {
     if ( ! ( ( nLevel < 5 ) && ( mpImplRuler->nFlags & ( 8 << nLevel ) ) ) )
-        return sal_False;
+        return false;
     nValue = mpImplRuler->nTextOfs[ nLevel ];
-    return sal_True;
+    return true;
 }
 
-sal_Bool PPTTextRulerInterpreter::GetBulletOfs( sal_uInt32 nLevel, sal_uInt16& nValue ) const
+bool PPTTextRulerInterpreter::GetBulletOfs( sal_uInt32 nLevel, sal_uInt16& nValue ) const
 {
     if ( ! ( ( nLevel < 5 ) && ( mpImplRuler->nFlags & ( 256 << nLevel ) ) ) )
-        return sal_False;
+        return false;
     nValue = mpImplRuler->nBulletOfs[ nLevel ];
-    return sal_True;
+    return true;
 }
 
 PPTTextRulerInterpreter& PPTTextRulerInterpreter::operator=( PPTTextRulerInterpreter& rRuler )
@@ -4596,7 +4596,7 @@ PPTTextCharacterStyleAtomInterpreter::PPTTextCharacterStyleAtomInterpreter() :
 {
 }
 
-sal_Bool PPTTextCharacterStyleAtomInterpreter::Read( SvStream& rIn, const DffRecordHeader& rRecHd )
+bool PPTTextCharacterStyleAtomInterpreter::Read( SvStream& rIn, const DffRecordHeader& rRecHd )
 {
     rRecHd.SeekToContent( rIn );
 
@@ -4607,7 +4607,7 @@ sal_Bool PPTTextCharacterStyleAtomInterpreter::Read( SvStream& rIn, const DffRec
        .ReadUInt16( nFontHeight )
        .ReadInt32( nFontColor );
 
-    return sal_True;
+    return true;
 }
 
 PPTTextCharacterStyleAtomInterpreter::~PPTTextCharacterStyleAtomInterpreter()
@@ -4615,16 +4615,16 @@ PPTTextCharacterStyleAtomInterpreter::~PPTTextCharacterStyleAtomInterpreter()
 }
 
 PPTTextParagraphStyleAtomInterpreter::PPTTextParagraphStyleAtomInterpreter() :
-    bValid              ( sal_False ),
-    bForbiddenRules     ( sal_False ),
-    bHangingPunctuation ( sal_False ),
-    bLatinTextWrap      ( sal_False )
+    bValid              ( false ),
+    bForbiddenRules     ( false ),
+    bHangingPunctuation ( false ),
+    bLatinTextWrap      ( false )
 {
 }
 
-sal_Bool PPTTextParagraphStyleAtomInterpreter::Read( SvStream& rIn, const DffRecordHeader& rRecHd )
+bool PPTTextParagraphStyleAtomInterpreter::Read( SvStream& rIn, const DffRecordHeader& rRecHd )
 {
-    bValid = sal_False;
+    bValid = false;
     rRecHd.SeekToContent( rIn );
     sal_uInt32 nDummy32, nFlags, nRecEndPos = rRecHd.GetRecEndFilePos();
     sal_uInt16 nDummy16;
@@ -4704,14 +4704,14 @@ PPTTextSpecInfo::~PPTTextSpecInfo()
 }
 
 PPTTextSpecInfoAtomInterpreter::PPTTextSpecInfoAtomInterpreter() :
-    bValid  ( sal_False )
+    bValid  ( false )
 {
 }
 
-sal_Bool PPTTextSpecInfoAtomInterpreter::Read( SvStream& rIn, const DffRecordHeader& rRecHd,
+bool PPTTextSpecInfoAtomInterpreter::Read( SvStream& rIn, const DffRecordHeader& rRecHd,
     sal_uInt16 nRecordType, const PPTTextSpecInfo* pTextSpecDefault )
 {
-    bValid = sal_False;
+    bValid = false;
     sal_uInt32  nCharIdx = 0;
     rRecHd.SeekToContent( rIn );
 
@@ -4807,7 +4807,7 @@ PPTStyleTextPropReader::PPTStyleTextPropReader( SvStream& rIn, SdrPowerPointImpo
 
 void PPTStyleTextPropReader::ReadParaProps( SvStream& rIn, SdrPowerPointImport& rMan, const DffRecordHeader& rTextHeader,
                                             const OUString& aString, PPTTextRulerInterpreter& rRuler,
-                                            sal_uInt32& nCharCount, sal_Bool& bTextPropAtom )
+                                            sal_uInt32& nCharCount, bool& bTextPropAtom )
 {
     sal_uInt32  nMask = 0; //TODO: nMask initialized here to suppress warning for now, see corresponding TODO below
     sal_uInt32  nCharAnzRead = 0;
@@ -4818,7 +4818,7 @@ void PPTStyleTextPropReader::ReadParaProps( SvStream& rIn, SdrPowerPointImport&
     DffRecordHeader aTextHd2;
     rTextHeader.SeekToContent( rIn );
     if ( rMan.SeekToRec( rIn, PPT_PST_StyleTextPropAtom, rTextHeader.GetRecEndFilePos(), &aTextHd2 ) )
-        bTextPropAtom = sal_True;
+        bTextPropAtom = true;
     while ( nCharAnzRead <= nStringLen )
     {
         PPTParaPropSet aParaPropSet;
@@ -4925,7 +4925,7 @@ void PPTStyleTextPropReader::ReadParaProps( SvStream& rIn, SdrPowerPointImport&
 
         if ( ( nCharCount > nStringLen ) || ( nStringLen < nCharAnzRead + nCharCount ) )
         {
-            bTextPropAtom = sal_False;
+            bTextPropAtom = false;
             nCharCount = nStringLen - nCharAnzRead;
             // please fix the right hand side of
             // PPTParaPropSet& PPTParaPropSet::operator=(PPTParaPropSet&),
@@ -4957,7 +4957,7 @@ void PPTStyleTextPropReader::ReadParaProps( SvStream& rIn, SdrPowerPointImport&
 
 void PPTStyleTextPropReader::ReadCharProps( SvStream& rIn, PPTCharPropSet& aCharPropSet, const OUString& aString,
                                             sal_uInt32& nCharCount, sal_uInt32 nCharAnzRead,
-                                            sal_Bool& bTextPropAtom, sal_uInt32 nExtParaPos,
+                                            bool& bTextPropAtom, sal_uInt32 nExtParaPos,
                                             const std::vector< StyleTextProp9 >& aStyleTextProp9,
                                             sal_uInt32& nExtParaFlags, sal_uInt16& nBuBlip,
                                             sal_uInt16& nHasAnm, sal_uInt32& nAnmScheme )
@@ -4976,7 +4976,7 @@ void PPTStyleTextPropReader::ReadCharProps( SvStream& rIn, PPTCharPropSet& aChar
         nCharCount = nStringLen - nCharAnzRead;
         if ( nCharsToRead < -1 )
         {
-            bTextPropAtom = sal_False;
+            bTextPropAtom = false;
             OSL_FAIL( "SJ:PPTStyleTextPropReader::could not get this PPT_PST_StyleTextPropAtom by reading the character attributes" );
         }
     }
@@ -5134,7 +5134,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
     {
         // no chars, but potentially char/para props?
         sal_uInt32  nCharCount;
-        sal_Bool    bTextPropAtom = sal_False;
+        bool        bTextPropAtom = false;
         ReadParaProps( rIn, rMan, rTextHeader, aString, rRuler, nCharCount, bTextPropAtom );
 
         if ( bTextPropAtom )
@@ -5158,7 +5158,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
     if ( !aString.isEmpty() )
     {
         sal_uInt32  nCharCount;
-        sal_Bool    bTextPropAtom = sal_False;
+        bool        bTextPropAtom = false;
 
         ReadParaProps( rIn, rMan, rTextHeader, aString, rRuler, nCharCount, bTextPropAtom );
 
@@ -5316,16 +5316,16 @@ PPTPortionObj::~PPTPortionObj()
 {
 }
 
-sal_Bool PPTPortionObj::HasTabulator()
+bool PPTPortionObj::HasTabulator()
 {
-    sal_Bool bRetValue =    sal_False;
+    bool bRetValue =    false;
     sal_Int32           nCount;
     const sal_Unicode*  pPtr = maString.getStr();
     for ( nCount = 0; nCount < maString.getLength(); nCount++ )
     {
         if ( pPtr[ nCount ] == 0x9 )
         {
-            bRetValue = sal_True;
+            bRetValue = true;
             break;
         }
 
@@ -5333,12 +5333,12 @@ sal_Bool PPTPortionObj::HasTabulator()
     return bRetValue;
 }
 
-sal_Bool PPTPortionObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sal_uInt32 nDestinationInstance ) const
+bool PPTPortionObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sal_uInt32 nDestinationInstance ) const
 {
     sal_uInt32  nMask = 1 << nAttr;
     rRetValue = 0;
 
-    sal_uInt32 bIsHardAttribute = ( ( pCharSet->mnAttrSet & nMask ) != 0 ) ? 1 : 0;
+    bool bIsHardAttribute = ( ( pCharSet->mnAttrSet & nMask ) != 0 );
 
     if ( bIsHardAttribute )
     {
@@ -5377,7 +5377,7 @@ sal_Bool PPTPortionObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sal_
         PPTCharLevel* pCharLevel = NULL;
         if ( ( nDestinationInstance == 0xffffffff )
                 || ( mnDepth && ( ( mnInstance == TSS_TYPE_SUBTITLE ) || ( mnInstance == TSS_TYPE_TEXT_IN_SHAPE ) ) ) )
-            bIsHardAttribute = 1;
+            bIsHardAttribute = true;
         else if ( nDestinationInstance != mnInstance )
             pCharLevel = &mrStyleSheet.mpCharSheet[ nDestinationInstance ]->maCharLevel[ mnDepth ];
         switch( nAttr )
@@ -5394,7 +5394,7 @@ sal_Bool PPTPortionObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sal_
                 {
                     sal_uInt32 nTmp = ( pCharLevel->mnFlags & nMask ) ? 1 : 0;
                     if ( rRetValue != nTmp )
-                        bIsHardAttribute = 1;
+                        bIsHardAttribute = true;
                 }
             }
             break;
@@ -5402,42 +5402,42 @@ sal_Bool PPTPortionObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sal_
             {
                 rRetValue = rCharLevel.mnFont;
                 if ( pCharLevel && ( rRetValue != pCharLevel->mnFont ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             case PPT_CharAttr_AsianOrComplexFont :
             {
                 rRetValue = rCharLevel.mnAsianOrComplexFont;
                 if ( pCharLevel && ( rRetValue != pCharLevel->mnAsianOrComplexFont ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             case PPT_CharAttr_FontHeight :
             {
                 rRetValue = rCharLevel.mnFontHeight;
                 if ( pCharLevel && ( rRetValue != pCharLevel->mnFontHeight ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             case PPT_CharAttr_FontColor :
             {
                 rRetValue = rCharLevel.mnFontColor;
                 if ( pCharLevel && ( rRetValue != pCharLevel->mnFontColor ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             case PPT_CharAttr_Escapement :
             {
                 rRetValue = rCharLevel.mnEscapement;
                 if ( pCharLevel && ( rRetValue != pCharLevel->mnEscapement ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             default :
                 OSL_FAIL( "SJ:PPTPortionObj::GetAttrib ( attribute does not exist )" );
         }
     }
-    return (sal_Bool)bIsHardAttribute;
+    return bIsHardAttribute;
 }
 
 void PPTPortionObj::ApplyTo(  SfxItemSet& rSet, SdrPowerPointImport& rManager, sal_uInt32 nDestinationInstance )
@@ -5680,7 +5680,7 @@ PPTParagraphObj::PPTParagraphObj( const PPTStyleSheet& rStyleSheet, sal_uInt32 n
     PPTNumberFormatCreator  ( NULL ),
     mrStyleSheet            ( rStyleSheet ),
     mnInstance              ( nInstance ),
-    mbTab                   ( sal_True )       // style sheets always have to get the right tabulator setting
+    mbTab                   ( true )       // style sheets always have to get the right tabulator setting
 {
     if ( nDepth > 4 )
         nDepth = 4;
@@ -5696,7 +5696,7 @@ PPTParagraphObj::PPTParagraphObj( PPTStyleTextPropReader& rPropReader,
     PPTTextRulerInterpreter ( rRuler ),
     mrStyleSheet            ( rStyleSheet ),
     mnInstance              ( nInstance ),
-    mbTab                   ( sal_False ),
+    mbTab                   ( false ),
     mnCurrentObject         ( 0 )
 {
     if (rnCurCharPos < rPropReader.aCharPropList.size())
@@ -5754,7 +5754,7 @@ void PPTParagraphObj::UpdateBulletRelSize( sal_uInt32& nBulletRelSize ) const
     }
 }
 
-sal_Bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sal_uInt32 nDestinationInstance )
+bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sal_uInt32 nDestinationInstance )
 {
     sal_uInt32  nMask = 1 << nAttr;
     rRetValue = 0;
@@ -5762,10 +5762,10 @@ sal_Bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sa
     if ( nAttr > 21 )
     {
         OSL_FAIL( "SJ:PPTParagraphObj::GetAttrib - attribute does not exist" );
-        return sal_False;
+        return false;
     }
 
-    sal_uInt32 bIsHardAttribute = ( ( pParaSet->mnAttrSet & nMask ) != 0 ) ? 1 : 0;
+    bool bIsHardAttribute = ( ( pParaSet->mnAttrSet & nMask ) != 0 );
 
     if ( bIsHardAttribute )
     {
@@ -5834,7 +5834,7 @@ sal_Bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sa
         PPTParaLevel* pParaLevel = NULL;
         if ( ( nDestinationInstance == 0xffffffff )
             || ( pParaSet->mnDepth && ( ( mnInstance == TSS_TYPE_SUBTITLE ) || ( mnInstance == TSS_TYPE_TEXT_IN_SHAPE ) ) ) )
-            bIsHardAttribute = 1;
+            bIsHardAttribute = true;
         else if ( nDestinationInstance != mnInstance )
             pParaLevel = &mrStyleSheet.mpParaSheet[ nDestinationInstance ]->maParaLevel[ pParaSet->mnDepth ];
         switch ( nAttr )
@@ -5845,7 +5845,7 @@ sal_Bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sa
                 if ( pParaLevel )
                 {
                     if ( rRetValue != ( (sal_uInt32)pParaLevel->mnBuFlags & ( 1 << PPT_ParaAttr_BulletOn ) ) )
-                        bIsHardAttribute = 1;
+                        bIsHardAttribute = true;
                 }
             }
             break;
@@ -5858,7 +5858,7 @@ sal_Bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sa
             {
                 rRetValue = rParaLevel.mnBulletChar;
                 if ( pParaLevel && ( rRetValue != pParaLevel->mnBulletChar ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             case PPT_ParaAttr_BulletFont :
@@ -5872,7 +5872,7 @@ sal_Bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sa
                 {
                     rRetValue = rParaLevel.mnBulletFont;
                     if ( pParaLevel && ( rRetValue != pParaLevel->mnBulletFont ) )
-                        bIsHardAttribute = 1;
+                        bIsHardAttribute = true;
                 }
                 else
                 {
@@ -5885,7 +5885,7 @@ sal_Bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sa
                     else
                     {
                         rRetValue = mrStyleSheet.mpCharSheet[ mnInstance ]->maCharLevel[ pParaSet->mnDepth ].mnFont;
-                        bIsHardAttribute = 1;
+                        bIsHardAttribute = true;
                     }
                 }
             }
@@ -5894,7 +5894,7 @@ sal_Bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sa
             {
                 rRetValue = rParaLevel.mnBulletHeight;
                 if ( pParaLevel && ( rRetValue != pParaLevel->mnBulletHeight ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             case PPT_ParaAttr_BulletColor :
@@ -5908,7 +5908,7 @@ sal_Bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sa
                 {
                     rRetValue = rParaLevel.mnBulletColor;
                     if ( pParaLevel && ( rRetValue != pParaLevel->mnBulletColor ) )
-                        bIsHardAttribute = 1;
+                        bIsHardAttribute = true;
                 }
                 else
                 {
@@ -5921,7 +5921,7 @@ sal_Bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sa
                                 rRetValue = rPortion.mnHylinkOrigColor;
                             else
                                 rRetValue = mrStyleSheet.mpCharSheet[ mnInstance ]->maCharLevel[ pParaSet->mnDepth ].mnFontColor;
-                            bIsHardAttribute = sal_True;
+                            bIsHardAttribute = true;
                         }
                         else
                         {
@@ -5931,7 +5931,7 @@ sal_Bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sa
                     else
                     {
                         rRetValue = mrStyleSheet.mpCharSheet[ mnInstance ]->maCharLevel[ pParaSet->mnDepth ].mnFontColor;
-                        bIsHardAttribute = 1;
+                        bIsHardAttribute = true;
                     }
                 }
             }
@@ -5940,82 +5940,82 @@ sal_Bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sa
             {
                 rRetValue = rParaLevel.mnAdjust;
                 if ( pParaLevel && ( rRetValue != pParaLevel->mnAdjust ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             case PPT_ParaAttr_LineFeed :
             {
                 rRetValue = rParaLevel.mnLineFeed;
                 if ( pParaLevel && ( rRetValue != pParaLevel->mnLineFeed ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             case PPT_ParaAttr_UpperDist :
             {
                 rRetValue = rParaLevel.mnUpperDist;
                 if ( pParaLevel && ( rRetValue != pParaLevel->mnUpperDist ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             case PPT_ParaAttr_LowerDist :
             {
                 rRetValue = rParaLevel.mnLowerDist;
                 if ( pParaLevel && ( rRetValue != pParaLevel->mnLowerDist ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             case PPT_ParaAttr_TextOfs :
             {
                 rRetValue = rParaLevel.mnTextOfs;
                 if ( pParaLevel && ( rRetValue != pParaLevel->mnTextOfs ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             case PPT_ParaAttr_BulletOfs :
             {
                 rRetValue = rParaLevel.mnBulletOfs;
                 if ( pParaLevel && ( rRetValue != pParaLevel->mnBulletOfs ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             case PPT_ParaAttr_DefaultTab :
             {
                 rRetValue = rParaLevel.mnDefaultTab;
                 if ( pParaLevel && ( rRetValue != pParaLevel->mnDefaultTab ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             case PPT_ParaAttr_AsianLB_1 :
             {
                 rRetValue = rParaLevel.mnAsianLineBreak & 1;
                 if ( pParaLevel && ( rRetValue != ( (sal_uInt32)pParaLevel->mnAsianLineBreak & 1 ) ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             case PPT_ParaAttr_AsianLB_2 :
             {
                 rRetValue = ( rParaLevel.mnAsianLineBreak >> 1 ) & 1;
                 if ( pParaLevel && ( rRetValue != ( ( (sal_uInt32)pParaLevel->mnAsianLineBreak >> 1 ) & 1 ) ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             case PPT_ParaAttr_AsianLB_3 :
             {
                 rRetValue = ( rParaLevel.mnAsianLineBreak >> 2 ) & 1;
                 if ( pParaLevel && ( rRetValue != ( ( (sal_uInt32)pParaLevel->mnAsianLineBreak >> 2 ) & 1 ) ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
             case PPT_ParaAttr_BiDi :
             {
                 rRetValue = rParaLevel.mnBiDi;
                 if ( pParaLevel && ( rRetValue != pParaLevel->mnBiDi ) )
-                    bIsHardAttribute = 1;
+                    bIsHardAttribute = true;
             }
             break;
         }
     }
-    return (sal_Bool)bIsHardAttribute;
+    return bIsHardAttribute;
 }
 
 void PPTParagraphObj::ApplyTo( SfxItemSet& rSet,  boost::optional< sal_Int16 >& rStartNumbering, SdrPowerPointImport& rManager, sal_uInt32 nDestinationInstance, const PPTParagraphObj* /*pPrev*/)
@@ -6073,8 +6073,8 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet,  boost::optional< sal_Int16 >&
 
     sal_uInt32 nIsBullet2, _nTextOfs, _nBulletOfs, nHardAttribute = 0;
     GetAttrib( PPT_ParaAttr_BulletOn, nIsBullet2, nDestinationInstance );
-    nHardAttribute += GetAttrib( PPT_ParaAttr_TextOfs, _nTextOfs, nDestinationInstance );
-    nHardAttribute += GetAttrib( PPT_ParaAttr_BulletOfs, _nBulletOfs, nDestinationInstance );
+    nHardAttribute += GetAttrib( PPT_ParaAttr_TextOfs, _nTextOfs, nDestinationInstance ) ? 1 : 0;
+    nHardAttribute += GetAttrib( PPT_ParaAttr_BulletOfs, _nBulletOfs, nDestinationInstance ) ? 1 : 0;
     if ( !nIsBullet2 )
     {
         SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE );
@@ -6866,9 +6866,9 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
 
                                                             const SvxURLField* pField = (const SvxURLField*)(*FE)->pField1->GetField();
 
-                                                            pCurrent->mbIsHyperlink=sal_True;
-                                                            pCurrent->mnHylinkOrigColor=pCurrent->pCharSet->mnColor;
-                                                            pCurrent->mbHardHylinkOrigColor= ( ( pCurrent->pCharSet->mnAttrSet >>PPT_CharAttr_FontColor ) & 1)>0;
+                                                            pCurrent->mbIsHyperlink = true;
+                                                            pCurrent->mnHylinkOrigColor = pCurrent->pCharSet->mnColor;
+                                                            pCurrent->mbHardHylinkOrigColor = ( ( pCurrent->pCharSet->mnAttrSet >>PPT_CharAttr_FontColor ) & 1)>0;
 
                                                             if ( pCurrent->mpFieldItem )
                                                             {
@@ -7020,12 +7020,12 @@ PPTTextObj& PPTTextObj::operator=( PPTTextObj& rTextObj )
     return *this;
 }
 
-sal_Bool IsLine( const SdrObject* pObj )
+bool IsLine( const SdrObject* pObj )
 {
     return pObj->ISA( SdrPathObj ) && ((SdrPathObj*)pObj)->IsLine() && (((SdrPathObj*)pObj)->GetPointCount() == 2 );
 }
 
-sal_Bool GetCellPosition( const SdrObject* pObj, const std::set< sal_Int32 >& rRows, const std::set< sal_Int32 >& rColumns,
+bool GetCellPosition( const SdrObject* pObj, const std::set< sal_Int32 >& rRows, const std::set< sal_Int32 >& rColumns,
                             sal_Int32& nTableIndex, sal_Int32& nRow, sal_Int32& nRowCount, sal_Int32& nColumn, sal_Int32& nColumnCount )
 {
     Rectangle aSnapRect( pObj->GetSnapRect() );
@@ -7583,9 +7583,9 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTab
     return pRet;
 }
 
-sal_Bool SdrPowerPointImport::IsVerticalText() const
+bool SdrPowerPointImport::IsVerticalText() const
 {
-    sal_Bool bVerticalText = sal_False;
+    bool bVerticalText = false;
     if ( IsProperty( DFF_Prop_txflTextFlow ) )
     {
         MSO_TextFlow eTextFlow = (MSO_TextFlow)( GetPropertyValue( DFF_Prop_txflTextFlow ) & 0xFFFF );
diff --git a/filter/source/msfilter/svxmsbas2.cxx b/filter/source/msfilter/svxmsbas2.cxx
index a1c4b8eb8825..c06f10bb31f0 100644
--- a/filter/source/msfilter/svxmsbas2.cxx
+++ b/filter/source/msfilter/svxmsbas2.cxx
@@ -25,7 +25,7 @@
 
 using namespace com::sun::star;
 
-sal_uLong SvxImportMSVBasic::SaveOrDelMSVBAStorage( sal_Bool bSaveInto,
+sal_uLong SvxImportMSVBasic::SaveOrDelMSVBAStorage( bool bSaveInto,
                                                 const OUString& rStorageName )
 {
     sal_uLong nRet = ERRCODE_NONE;