svtools: sal_Bool->bool

Change-Id: I288a5c8b86d21a1b91f464aaf162aed9aca35a42

5 files changed, 136 insertions, 139 deletions

diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index 7d42660de663..515501b60a60 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -42,22 +42,22 @@ using namespace ::osl                   ;
 using namespace ::com::sun::star::uno   ;
 
 #define ROOTNODE_START                  OUString("Office.Common/Drawinglayer"   )
-#define DEFAULT_OVERLAYBUFFER           sal_True
-#define DEFAULT_PAINTBUFFER             sal_True
+#define DEFAULT_OVERLAYBUFFER           true
+#define DEFAULT_PAINTBUFFER             true
 #define DEFAULT_STRIPE_COLOR_A          0
 #define DEFAULT_STRIPE_COLOR_B          16581375
 #define DEFAULT_STRIPE_LENGTH           4
 
 // #i73602#
 // #i74769#, #i75172# : Change default for Calc and Writer to True
-#define DEFAULT_OVERLAYBUFFER_CALC          sal_True
-#define DEFAULT_OVERLAYBUFFER_WRITER        sal_True
-#define DEFAULT_OVERLAYBUFFER_DRAWIMPRESS   sal_True
+#define DEFAULT_OVERLAYBUFFER_CALC          true
+#define DEFAULT_OVERLAYBUFFER_WRITER        true
+#define DEFAULT_OVERLAYBUFFER_DRAWIMPRESS   true
 
 // #i74769#, #i75172#
-#define DEFAULT_PAINTBUFFER_CALC            sal_True
-#define DEFAULT_PAINTBUFFER_WRITER          sal_True
-#define DEFAULT_PAINTBUFFER_DRAWIMPRESS     sal_True
+#define DEFAULT_PAINTBUFFER_CALC            true
+#define DEFAULT_PAINTBUFFER_WRITER          true
+#define DEFAULT_PAINTBUFFER_DRAWIMPRESS     true
 
 // #i4219#
 #define DEFAULT_MAXIMUMPAPERWIDTH           300
@@ -68,16 +68,16 @@ using namespace ::com::sun::star::uno   ;
 #define DEFAULT_MAXIMUMPAPERBOTTOMMARGIN    9999
 
 // primitives
-#define DEFAULT_ANTIALIASING                        sal_True
-#define DEFAULT_SNAPHORVERLINESTODISCRETE           sal_True
-#define DEFAULT_SOLIDDRAGCREATE                     sal_True
-#define DEFAULT_RENDERDECORATEDTEXTDIRECT           sal_True
-#define DEFAULT_RENDERSIMPLETEXTDIRECT              sal_True
+#define DEFAULT_ANTIALIASING                        true
+#define DEFAULT_SNAPHORVERLINESTODISCRETE           true
+#define DEFAULT_SOLIDDRAGCREATE                     true
+#define DEFAULT_RENDERDECORATEDTEXTDIRECT           true
+#define DEFAULT_RENDERSIMPLETEXTDIRECT              true
 #define DEFAULT_QUADRATIC3DRENDERLIMIT              1000000
 #define DEFAULT_QUADRATICFORMCONTROLRENDERLIMIT     45000
 
 // #i97672# selection settings
-#define DEFAULT_TRANSPARENTSELECTION                sal_True
+#define DEFAULT_TRANSPARENTSELECTION                true
 #define DEFAULT_TRANSPARENTSELECTIONPERCENT         75
 #define DEFAULT_SELECTIONMAXIMUMLUMINANCEPERCENT    70
 
@@ -181,50 +181,50 @@ public:
 //  public interface
 
 
-    sal_Bool    IsOverlayBuffer() const;
-    sal_Bool    IsPaintBuffer() const;
+    bool        IsOverlayBuffer() const;
+    bool        IsPaintBuffer() const;
     Color       GetStripeColorA() const;
     Color       GetStripeColorB() const;
     sal_uInt16  GetStripeLength() const;
 
     // #i73602#
-    sal_Bool    IsOverlayBuffer_Calc() const;
-    sal_Bool    IsOverlayBuffer_Writer() const;
-    sal_Bool    IsOverlayBuffer_DrawImpress() const;
+    bool        IsOverlayBuffer_Calc() const;
+    bool        IsOverlayBuffer_Writer() const;
+    bool        IsOverlayBuffer_DrawImpress() const;
 
     // #i74769#, #i75172#
-    sal_Bool    IsPaintBuffer_Calc() const;
-    sal_Bool    IsPaintBuffer_Writer() const;
-    sal_Bool    IsPaintBuffer_DrawImpress() const;
+    bool        IsPaintBuffer_Calc() const;
+    bool        IsPaintBuffer_Writer() const;
+    bool        IsPaintBuffer_DrawImpress() const;
 
     // #i4219#
-    sal_uInt32 GetMaximumPaperWidth() const;
-    sal_uInt32 GetMaximumPaperHeight() const;
-    sal_uInt32 GetMaximumPaperLeftMargin() const;
-    sal_uInt32 GetMaximumPaperRightMargin() const;
-    sal_uInt32 GetMaximumPaperTopMargin() const;
-    sal_uInt32 GetMaximumPaperBottomMargin() const;
+    sal_uInt32  GetMaximumPaperWidth() const;
+    sal_uInt32  GetMaximumPaperHeight() const;
+    sal_uInt32  GetMaximumPaperLeftMargin() const;
+    sal_uInt32  GetMaximumPaperRightMargin() const;
+    sal_uInt32  GetMaximumPaperTopMargin() const;
+    sal_uInt32  GetMaximumPaperBottomMargin() const;
 
     // helper
-    sal_Bool IsAAPossibleOnThisSystem() const;
+    bool        IsAAPossibleOnThisSystem() const;
 
     // primitives
-    sal_Bool    IsAntiAliasing() const;
-    sal_Bool    IsSnapHorVerLinesToDiscrete() const;
-    sal_Bool    IsSolidDragCreate() const;
-    sal_Bool    IsRenderDecoratedTextDirect() const;
-    sal_Bool    IsRenderSimpleTextDirect() const;
+    bool        IsAntiAliasing() const;
+    bool        IsSnapHorVerLinesToDiscrete() const;
+    bool        IsSolidDragCreate() const;
+    bool        IsRenderDecoratedTextDirect() const;
+    bool        IsRenderSimpleTextDirect() const;
     sal_uInt32  GetQuadratic3DRenderLimit() const;
     sal_uInt32  GetQuadraticFormControlRenderLimit() const;
 
-    void        SetAntiAliasing( sal_Bool bState );
+    void        SetAntiAliasing( bool bState );
 
     // #i97672# selection settings
-    sal_Bool    IsTransparentSelection() const;
+    bool        IsTransparentSelection() const;
     sal_uInt16  GetTransparentSelectionPercent() const;
     sal_uInt16  GetSelectionMaximumLuminancePercent() const;
 
-    void        SetTransparentSelection( sal_Bool bState );
+    void        SetTransparentSelection( bool bState );
     void        SetTransparentSelectionPercent( sal_uInt16 nPercent );
 
 
@@ -241,21 +241,21 @@ private:
 
 private:
 
-        sal_Bool    m_bOverlayBuffer;
-        sal_Bool    m_bPaintBuffer;
+        bool        m_bOverlayBuffer;
+        bool        m_bPaintBuffer;
         Color       m_bStripeColorA;
         Color       m_bStripeColorB;
         sal_uInt16  m_nStripeLength;
 
         // #i73602#
-        sal_Bool    m_bOverlayBuffer_Calc;
-        sal_Bool    m_bOverlayBuffer_Writer;
-        sal_Bool    m_bOverlayBuffer_DrawImpress;
+        bool        m_bOverlayBuffer_Calc;
+        bool        m_bOverlayBuffer_Writer;
+        bool        m_bOverlayBuffer_DrawImpress;
 
         // #i74769#, #i75172#
-        sal_Bool    m_bPaintBuffer_Calc;
-        sal_Bool    m_bPaintBuffer_Writer;
-        sal_Bool    m_bPaintBuffer_DrawImpress;
+        bool        m_bPaintBuffer_Calc;
+        bool        m_bPaintBuffer_Writer;
+        bool        m_bPaintBuffer_DrawImpress;
 
         // #i4219#
         sal_uInt32  m_nMaximumPaperWidth;
@@ -266,18 +266,18 @@ private:
         sal_uInt32  m_nMaximumPaperBottomMargin;
 
         // primitives
-        sal_Bool    m_bAntiAliasing;
-        sal_Bool    m_bSnapHorVerLinesToDiscrete;
-        sal_Bool    m_bSolidDragCreate;
-        sal_Bool    m_bRenderDecoratedTextDirect;
-        sal_Bool    m_bRenderSimpleTextDirect;
+        bool        m_bAntiAliasing;
+        bool        m_bSnapHorVerLinesToDiscrete;
+        bool        m_bSolidDragCreate;
+        bool        m_bRenderDecoratedTextDirect;
+        bool        m_bRenderSimpleTextDirect;
         sal_uInt32  m_nQuadratic3DRenderLimit;
         sal_uInt32  m_nQuadraticFormControlRenderLimit;
 
         // #i97672# selection settings
         sal_uInt16  m_nTransparentSelectionPercent;
         sal_uInt16  m_nSelectionMaximumLuminancePercent;
-        sal_Bool    m_bTransparentSelection;
+        bool        m_bTransparentSelection;
 
         // local values
         bool        m_bAllowAA : 1;
@@ -693,7 +693,7 @@ void SvtOptionsDrawinglayer_Impl::Notify( const com::sun::star::uno::Sequence<OU
 
 //  public method
 
-sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer() const
+bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer() const
 {
     return m_bOverlayBuffer;
 }
@@ -701,7 +701,7 @@ sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer() const
 
 //  public method
 
-sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer() const
+bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer() const
 {
     return m_bPaintBuffer;
 }
@@ -731,33 +731,33 @@ sal_uInt16 SvtOptionsDrawinglayer_Impl::GetStripeLength() const
 }
 
 // #i73602#
-sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer_Calc() const
+bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer_Calc() const
 {
     return m_bOverlayBuffer_Calc;
 }
 
-sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer_Writer() const
+bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer_Writer() const
 {
     return m_bOverlayBuffer_Writer;
 }
 
-sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer_DrawImpress() const
+bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer_DrawImpress() const
 {
     return m_bOverlayBuffer_DrawImpress;
 }
 
 // #i74769#, #i75172#
-sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer_Calc() const
+bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer_Calc() const
 {
     return m_bPaintBuffer_Calc;
 }
 
-sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer_Writer() const
+bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer_Writer() const
 {
     return m_bPaintBuffer_Writer;
 }
 
-sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer_DrawImpress() const
+bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer_DrawImpress() const
 {
     return m_bPaintBuffer_DrawImpress;
 }
@@ -794,7 +794,7 @@ sal_uInt32 SvtOptionsDrawinglayer_Impl::GetMaximumPaperBottomMargin() const
 }
 
 // helper
-sal_Bool SvtOptionsDrawinglayer_Impl::IsAAPossibleOnThisSystem() const
+bool SvtOptionsDrawinglayer_Impl::IsAAPossibleOnThisSystem() const
 {
     if(!m_bAllowAAChecked)
     {
@@ -819,27 +819,27 @@ sal_Bool SvtOptionsDrawinglayer_Impl::IsAAPossibleOnThisSystem() const
 }
 
 // primitives
-sal_Bool SvtOptionsDrawinglayer_Impl::IsAntiAliasing() const
+bool SvtOptionsDrawinglayer_Impl::IsAntiAliasing() const
 {
     return m_bAntiAliasing;
 }
 
-sal_Bool SvtOptionsDrawinglayer_Impl::IsSnapHorVerLinesToDiscrete() const
+bool SvtOptionsDrawinglayer_Impl::IsSnapHorVerLinesToDiscrete() const
 {
     return m_bSnapHorVerLinesToDiscrete;
 }
 
-sal_Bool SvtOptionsDrawinglayer_Impl::IsSolidDragCreate() const
+bool SvtOptionsDrawinglayer_Impl::IsSolidDragCreate() const
 {
     return m_bSolidDragCreate;
 }
 
-sal_Bool SvtOptionsDrawinglayer_Impl::IsRenderDecoratedTextDirect() const
+bool SvtOptionsDrawinglayer_Impl::IsRenderDecoratedTextDirect() const
 {
     return m_bRenderDecoratedTextDirect;
 }
 
-sal_Bool SvtOptionsDrawinglayer_Impl::IsRenderSimpleTextDirect() const
+bool SvtOptionsDrawinglayer_Impl::IsRenderSimpleTextDirect() const
 {
     return m_bRenderSimpleTextDirect;
 }
@@ -854,7 +854,7 @@ sal_uInt32 SvtOptionsDrawinglayer_Impl::GetQuadraticFormControlRenderLimit() con
     return m_nQuadraticFormControlRenderLimit;
 }
 
-void SvtOptionsDrawinglayer_Impl::SetAntiAliasing( sal_Bool bState )
+void SvtOptionsDrawinglayer_Impl::SetAntiAliasing( bool bState )
 {
     if(m_bAntiAliasing != bState)
     {
@@ -864,12 +864,12 @@ void SvtOptionsDrawinglayer_Impl::SetAntiAliasing( sal_Bool bState )
 }
 
 // #i97672# selection settings
-sal_Bool SvtOptionsDrawinglayer_Impl::IsTransparentSelection() const
+bool SvtOptionsDrawinglayer_Impl::IsTransparentSelection() const
 {
     return m_bTransparentSelection;
 }
 
-void SvtOptionsDrawinglayer_Impl::SetTransparentSelection( sal_Bool bState )
+void SvtOptionsDrawinglayer_Impl::SetTransparentSelection( bool bState )
 {
     if(m_bTransparentSelection != bState)
     {
@@ -995,7 +995,7 @@ SvtOptionsDrawinglayer::~SvtOptionsDrawinglayer()
 
 //  public method
 
-sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer() const
+bool SvtOptionsDrawinglayer::IsOverlayBuffer() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsOverlayBuffer();
@@ -1004,7 +1004,7 @@ sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer() const
 
 //  public method
 
-sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer() const
+bool SvtOptionsDrawinglayer::IsPaintBuffer() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsPaintBuffer();
@@ -1038,38 +1038,38 @@ sal_uInt16 SvtOptionsDrawinglayer::GetStripeLength() const
 }
 
 // #i73602#
-sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer_Calc() const
+bool SvtOptionsDrawinglayer::IsOverlayBuffer_Calc() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsOverlayBuffer_Calc();
 }
 
-sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer_Writer() const
+bool SvtOptionsDrawinglayer::IsOverlayBuffer_Writer() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsOverlayBuffer_Writer();
 }
 
-sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer_DrawImpress() const
+bool SvtOptionsDrawinglayer::IsOverlayBuffer_DrawImpress() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsOverlayBuffer_DrawImpress();
 }
 
 // #i74769#, #i75172#
-sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer_Calc() const
+bool SvtOptionsDrawinglayer::IsPaintBuffer_Calc() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsPaintBuffer_Calc();
 }
 
-sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer_Writer() const
+bool SvtOptionsDrawinglayer::IsPaintBuffer_Writer() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsPaintBuffer_Writer();
 }
 
-sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer_DrawImpress() const
+bool SvtOptionsDrawinglayer::IsPaintBuffer_DrawImpress() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsPaintBuffer_DrawImpress();
@@ -1113,7 +1113,7 @@ sal_uInt32 SvtOptionsDrawinglayer::GetMaximumPaperBottomMargin() const
 }
 
 // helper
-sal_Bool SvtOptionsDrawinglayer::IsAAPossibleOnThisSystem() const
+bool SvtOptionsDrawinglayer::IsAAPossibleOnThisSystem() const
 {
     return m_pDataContainer->IsAAPossibleOnThisSystem();
 }
@@ -1125,25 +1125,25 @@ bool SvtOptionsDrawinglayer::IsAntiAliasing() const
     return m_pDataContainer->IsAntiAliasing() && IsAAPossibleOnThisSystem();
 }
 
-sal_Bool SvtOptionsDrawinglayer::IsSnapHorVerLinesToDiscrete() const
+bool SvtOptionsDrawinglayer::IsSnapHorVerLinesToDiscrete() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsAntiAliasing() && m_pDataContainer->IsSnapHorVerLinesToDiscrete();
 }
 
-sal_Bool SvtOptionsDrawinglayer::IsSolidDragCreate() const
+bool SvtOptionsDrawinglayer::IsSolidDragCreate() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsSolidDragCreate();
 }
 
-sal_Bool SvtOptionsDrawinglayer::IsRenderDecoratedTextDirect() const
+bool SvtOptionsDrawinglayer::IsRenderDecoratedTextDirect() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsRenderDecoratedTextDirect();
 }
 
-sal_Bool SvtOptionsDrawinglayer::IsRenderSimpleTextDirect() const
+bool SvtOptionsDrawinglayer::IsRenderSimpleTextDirect() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsRenderSimpleTextDirect();
@@ -1161,20 +1161,20 @@ sal_uInt32 SvtOptionsDrawinglayer::GetQuadraticFormControlRenderLimit() const
     return m_pDataContainer->GetQuadraticFormControlRenderLimit();
 }
 
-void SvtOptionsDrawinglayer::SetAntiAliasing( sal_Bool bState )
+void SvtOptionsDrawinglayer::SetAntiAliasing( bool bState )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pDataContainer->SetAntiAliasing( bState );
 }
 
 // #i97672# selection settings
-sal_Bool SvtOptionsDrawinglayer::IsTransparentSelection() const
+bool SvtOptionsDrawinglayer::IsTransparentSelection() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsTransparentSelection();
 }
 
-void SvtOptionsDrawinglayer::SetTransparentSelection( sal_Bool bState )
+void SvtOptionsDrawinglayer::SetTransparentSelection( bool bState )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pDataContainer->SetTransparentSelection( bState );
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index fc0f0c1cc5d2..2e58a6ce4fbb 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -76,39 +76,37 @@ public:
      SvtPrintOptions_Impl( const OUString& rConfigRoot );
     ~SvtPrintOptions_Impl();
 
-    sal_Bool    IsReduceTransparency() const ;
+    bool        IsReduceTransparency() const ;
     sal_Int16   GetReducedTransparencyMode() const ;
-    sal_Bool    IsReduceGradients() const ;
+    bool        IsReduceGradients() const ;
     sal_Int16   GetReducedGradientMode() const ;
     sal_Int16   GetReducedGradientStepCount() const ;
-    sal_Bool    IsReduceBitmaps() const ;
+    bool        IsReduceBitmaps() const ;
     sal_Int16   GetReducedBitmapMode() const ;
     sal_Int16   GetReducedBitmapResolution() const ;
-    sal_Bool    IsReducedBitmapIncludesTransparency() const ;
-    sal_Bool    IsConvertToGreyscales() const;
-    sal_Bool    IsPDFAsStandardPrintJobFormat() const;
+    bool        IsReducedBitmapIncludesTransparency() const ;
+    bool        IsConvertToGreyscales() const;
+    bool        IsPDFAsStandardPrintJobFormat() const;
 
-    void        SetReduceTransparency( sal_Bool bState ) ;
+    void        SetReduceTransparency( bool bState ) ;
     void        SetReducedTransparencyMode( sal_Int16 nMode ) ;
-    void        SetReduceGradients( sal_Bool bState ) ;
+    void        SetReduceGradients( bool bState ) ;
     void        SetReducedGradientMode( sal_Int16 nMode ) ;
     void        SetReducedGradientStepCount( sal_Int16 nStepCount ) ;
-    void        SetReduceBitmaps( sal_Bool bState ) ;
+    void        SetReduceBitmaps( bool bState ) ;
     void        SetReducedBitmapMode( sal_Int16 nMode ) ;
     void        SetReducedBitmapResolution( sal_Int16 nResolution ) ;
-    void        SetReducedBitmapIncludesTransparency( sal_Bool bState ) ;
-    void        SetConvertToGreyscales( sal_Bool bState ) ;
-    void        SetPDFAsStandardPrintJobFormat( sal_Bool bState ) ;
+    void        SetReducedBitmapIncludesTransparency( bool bState ) ;
+    void        SetConvertToGreyscales( bool bState ) ;
+    void        SetPDFAsStandardPrintJobFormat( bool bState ) ;
 
 
 //  private API
 
 
 private:
-    void impl_setValue (const OUString& sProp,
-                              ::sal_Bool       bNew );
-    void impl_setValue (const OUString& sProp,
-                              ::sal_Int16      nNew );
+    void impl_setValue (const OUString& sProp, bool bNew );
+    void impl_setValue (const OUString& sProp, sal_Int16 nNew );
 
 
 //  private member
@@ -147,9 +145,9 @@ SvtPrintOptions_Impl::SvtPrintOptions_Impl(const OUString& rConfigRoot)
     }
 }
 
-sal_Bool SvtPrintOptions_Impl::IsReduceTransparency() const
+bool SvtPrintOptions_Impl::IsReduceTransparency() const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     try
     {
         if (m_xNode.is())
@@ -187,9 +185,9 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedTransparencyMode() const
     return  nRet;
 }
 
-sal_Bool SvtPrintOptions_Impl::IsReduceGradients() const
+bool SvtPrintOptions_Impl::IsReduceGradients() const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     try
     {
         if (m_xNode.is())
@@ -253,9 +251,9 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedGradientStepCount() const
     return nRet;
 }
 
-sal_Bool SvtPrintOptions_Impl::IsReduceBitmaps() const
+bool SvtPrintOptions_Impl::IsReduceBitmaps() const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     try
     {
         if (m_xNode.is())
@@ -319,9 +317,9 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedBitmapResolution() const
     return  nRet;
 }
 
-sal_Bool SvtPrintOptions_Impl::IsReducedBitmapIncludesTransparency() const
+bool SvtPrintOptions_Impl::IsReducedBitmapIncludesTransparency() const
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     try
     {
         if (m_xNode.is())
@@ -341,9 +339,9 @@ sal_Bool SvtPrintOptions_Impl::IsReducedBitmapIncludesTransparency() const
     return  bRet;
 }
 
-sal_Bool SvtPrintOptions_Impl::IsConvertToGreyscales() const
+bool SvtPrintOptions_Impl::IsConvertToGreyscales() const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     try
     {
         if (m_xNode.is())
@@ -364,9 +362,9 @@ sal_Bool SvtPrintOptions_Impl::IsConvertToGreyscales() const
 
 }
 
-sal_Bool SvtPrintOptions_Impl::IsPDFAsStandardPrintJobFormat() const
+bool SvtPrintOptions_Impl::IsPDFAsStandardPrintJobFormat() const
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     try
     {
         if (m_xNode.is())
@@ -386,7 +384,7 @@ sal_Bool SvtPrintOptions_Impl::IsPDFAsStandardPrintJobFormat() const
     return  bRet;
 }
 
-void SvtPrintOptions_Impl::SetReduceTransparency(sal_Bool bState)
+void SvtPrintOptions_Impl::SetReduceTransparency(bool bState)
 {
     impl_setValue(PROPERTYNAME_REDUCETRANSPARENCY, bState);
 }
@@ -396,7 +394,7 @@ void SvtPrintOptions_Impl::SetReducedTransparencyMode(sal_Int16 nMode)
     impl_setValue(PROPERTYNAME_REDUCEDTRANSPARENCYMODE, nMode);
 }
 
-void SvtPrintOptions_Impl::SetReduceGradients(sal_Bool bState)
+void SvtPrintOptions_Impl::SetReduceGradients(bool bState)
 {
     impl_setValue(PROPERTYNAME_REDUCEGRADIENTS, bState);
 }
@@ -411,7 +409,7 @@ void SvtPrintOptions_Impl::SetReducedGradientStepCount(sal_Int16 nStepCount )
     impl_setValue(PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT, nStepCount);
 }
 
-void SvtPrintOptions_Impl::SetReduceBitmaps(sal_Bool bState )
+void SvtPrintOptions_Impl::SetReduceBitmaps(bool bState )
 {
     impl_setValue(PROPERTYNAME_REDUCEBITMAPS, bState);
 }
@@ -426,17 +424,17 @@ void SvtPrintOptions_Impl::SetReducedBitmapResolution(sal_Int16 nResolution )
     impl_setValue(PROPERTYNAME_REDUCEDBITMAPRESOLUTION, nResolution);
 }
 
-void SvtPrintOptions_Impl::SetReducedBitmapIncludesTransparency(sal_Bool bState )
+void SvtPrintOptions_Impl::SetReducedBitmapIncludesTransparency(bool bState )
 {
     impl_setValue(PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY, bState);
 }
 
-void SvtPrintOptions_Impl::SetConvertToGreyscales(sal_Bool bState)
+void SvtPrintOptions_Impl::SetConvertToGreyscales(bool bState)
 {
     impl_setValue(PROPERTYNAME_CONVERTTOGREYSCALES, bState);
 }
 
-void SvtPrintOptions_Impl::SetPDFAsStandardPrintJobFormat(sal_Bool bState)
+void SvtPrintOptions_Impl::SetPDFAsStandardPrintJobFormat(bool bState)
 {
     impl_setValue(PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT, bState);
 }
@@ -447,8 +445,7 @@ SvtPrintOptions_Impl::~SvtPrintOptions_Impl()
     m_xCfg.clear();
 }
 
-void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp,
-                                                ::sal_Bool       bNew )
+void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp, bool bNew )
 {
     try
     {
@@ -459,7 +456,7 @@ void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp,
         if ( ! xSet.is())
             return;
 
-        ::sal_Bool bOld = ! bNew;
+        bool bOld = ! bNew;
         if ( ! (xSet->getPropertyValue(sProp) >>= bOld))
             return;
 
@@ -534,7 +531,7 @@ Mutex& SvtBasePrintOptions::GetOwnStaticMutex()
     return *pMutex;
 }
 
-sal_Bool SvtBasePrintOptions::IsReduceTransparency() const
+bool SvtBasePrintOptions::IsReduceTransparency() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsReduceTransparency();
@@ -546,7 +543,7 @@ sal_Int16 SvtBasePrintOptions::GetReducedTransparencyMode() const
     return m_pDataContainer->GetReducedTransparencyMode();
 }
 
-sal_Bool SvtBasePrintOptions::IsReduceGradients() const
+bool SvtBasePrintOptions::IsReduceGradients() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsReduceGradients();
@@ -564,7 +561,7 @@ sal_Int16 SvtBasePrintOptions::GetReducedGradientStepCount() const
     return m_pDataContainer->GetReducedGradientStepCount();
 }
 
-sal_Bool SvtBasePrintOptions::IsReduceBitmaps() const
+bool SvtBasePrintOptions::IsReduceBitmaps() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsReduceBitmaps();
@@ -582,25 +579,25 @@ sal_Int16 SvtBasePrintOptions::GetReducedBitmapResolution() const
     return m_pDataContainer->GetReducedBitmapResolution();
 }
 
-sal_Bool SvtBasePrintOptions::IsReducedBitmapIncludesTransparency() const
+bool SvtBasePrintOptions::IsReducedBitmapIncludesTransparency() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsReducedBitmapIncludesTransparency();
 }
 
-sal_Bool SvtBasePrintOptions::IsConvertToGreyscales() const
+bool SvtBasePrintOptions::IsConvertToGreyscales() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsConvertToGreyscales();
 }
 
-sal_Bool SvtBasePrintOptions::IsPDFAsStandardPrintJobFormat() const
+bool SvtBasePrintOptions::IsPDFAsStandardPrintJobFormat() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsPDFAsStandardPrintJobFormat();
 }
 
-void SvtBasePrintOptions::SetReduceTransparency( sal_Bool bState )
+void SvtBasePrintOptions::SetReduceTransparency( bool bState )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pDataContainer->SetReduceTransparency( bState ) ;
@@ -612,7 +609,7 @@ void SvtBasePrintOptions::SetReducedTransparencyMode( sal_Int16 nMode )
     m_pDataContainer->SetReducedTransparencyMode( nMode );
 }
 
-void SvtBasePrintOptions::SetReduceGradients( sal_Bool bState )
+void SvtBasePrintOptions::SetReduceGradients( bool bState )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pDataContainer->SetReduceGradients( bState );
@@ -630,7 +627,7 @@ void SvtBasePrintOptions::SetReducedGradientStepCount( sal_Int16 nStepCount )
     m_pDataContainer->SetReducedGradientStepCount( nStepCount );
 }
 
-void SvtBasePrintOptions::SetReduceBitmaps( sal_Bool bState )
+void SvtBasePrintOptions::SetReduceBitmaps( bool bState )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pDataContainer->SetReduceBitmaps( bState );
@@ -648,19 +645,19 @@ void SvtBasePrintOptions::SetReducedBitmapResolution( sal_Int16 nResolution )
     m_pDataContainer->SetReducedBitmapResolution( nResolution );
 }
 
-void SvtBasePrintOptions::SetReducedBitmapIncludesTransparency( sal_Bool bState )
+void SvtBasePrintOptions::SetReducedBitmapIncludesTransparency( bool bState )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pDataContainer->SetReducedBitmapIncludesTransparency( bState );
 }
 
-void SvtBasePrintOptions::SetConvertToGreyscales( sal_Bool bState )
+void SvtBasePrintOptions::SetConvertToGreyscales( bool bState )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pDataContainer->SetConvertToGreyscales( bState );
 }
 
-void SvtBasePrintOptions::SetPDFAsStandardPrintJobFormat( sal_Bool bState )
+void SvtBasePrintOptions::SetPDFAsStandardPrintJobFormat( bool bState )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pDataContainer->SetPDFAsStandardPrintJobFormat( bState );
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index d6adef7445bf..90b047783b65 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -44,7 +44,7 @@ void ImplFillPrnDlgListBox( const Printer* pPrinter,
 
 
 
-void ImplFreePrnDlgListBox( ListBox* pBox, sal_Bool bClear )
+void ImplFreePrnDlgListBox( ListBox* pBox, bool bClear )
 {
     if ( bClear )
         pBox->Clear();
@@ -245,7 +245,7 @@ PrinterSetupDialog::PrinterSetupDialog(Window* pParent)
 
 PrinterSetupDialog::~PrinterSetupDialog()
 {
-    ImplFreePrnDlgListBox(m_pLbName, sal_False);
+    ImplFreePrnDlgListBox(m_pLbName, false);
     delete mpTempPrinter;
 }
 
diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx
index 85c25bc00a8c..655c8ed1e2c5 100644
--- a/svtools/source/misc/openfiledroptargetlistener.cxx
+++ b/svtools/source/misc/openfiledroptargetlistener.cxx
@@ -170,19 +170,19 @@ void OpenFileDropTargetListener::implts_EndDrag()
     /* } SAFE */
 }
 
-sal_Bool OpenFileDropTargetListener::implts_IsDropFormatSupported( SotFormatStringId nFormat )
+bool OpenFileDropTargetListener::implts_IsDropFormatSupported( SotFormatStringId nFormat )
 {
     /* SAFE { */
     SolarMutexGuard aGuard;
 
     DataFlavorExVector::iterator aIter( m_pFormats->begin() ), aEnd( m_pFormats->end() );
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     while ( aIter != aEnd )
     {
         if ( nFormat == (*aIter++).mnSotId )
         {
-            bRet = sal_True;
+            bRet = true;
             aIter = aEnd;
         }
     }
diff --git a/svtools/source/svhtml/htmlsupp.cxx b/svtools/source/svhtml/htmlsupp.cxx
index f1de1c0e3313..7069e4e2a07e 100644
--- a/svtools/source/svhtml/htmlsupp.cxx
+++ b/svtools/source/svhtml/htmlsupp.cxx
@@ -82,7 +82,7 @@ bool HTMLParser::ParseScriptOptions( OUString& rLangString, const OUString& rBas
     return true;
 }
 
-void HTMLParser::RemoveSGMLComment( OUString &rString, sal_Bool bFull )
+void HTMLParser::RemoveSGMLComment( OUString &rString, bool bFull )
 {
     sal_Unicode c = 0;
     while( !rString.isEmpty() &&