sdext: sal_Bool->bool

Change-Id: Ib505866047da2cbe0b00d99aa5d7050199b45e1c

16 files changed, 184 insertions, 184 deletions

diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index 267ff6da59d2..699d5f68fd02 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -131,7 +131,7 @@ void OptimizerSettings::SaveSettingsToConfiguration( const Reference< XNameRepla
     }
 }
 
-sal_Bool OptimizerSettings::operator==( const OptimizerSettings& rOptimizerSettings ) const
+bool OptimizerSettings::operator==( const OptimizerSettings& rOptimizerSettings ) const
 {
     return ( rOptimizerSettings.mbJPEGCompression == mbJPEGCompression )
         && ( rOptimizerSettings.mnJPEGQuality == mnJPEGQuality )
@@ -440,9 +440,9 @@ void ConfigurationAccess::SetConfigProperty( const PPPOptimizerTokenEnum eProper
     }
 }
 
-sal_Bool ConfigurationAccess::GetConfigProperty( const PPPOptimizerTokenEnum ePropertyToken, const sal_Bool bDefault ) const
+bool ConfigurationAccess::GetConfigProperty( const PPPOptimizerTokenEnum ePropertyToken, const bool bDefault ) const
 {
-    sal_Bool bRetValue = bDefault;
+    bool bRetValue = bDefault;
     if ( ! ( GetConfigProperty( ePropertyToken ) >>= bRetValue ) )
         bRetValue = bDefault;
     return bRetValue;
diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx
index 2dddae4ea316..70e828138b26 100644
--- a/sdext/source/minimizer/configurationaccess.hxx
+++ b/sdext/source/minimizer/configurationaccess.hxx
@@ -39,43 +39,43 @@
 struct OptimizerSettings
 {
     OUString   maName;
-    sal_Bool        mbJPEGCompression;
+    bool        mbJPEGCompression;
     sal_Int32       mnJPEGQuality;
-    sal_Bool        mbRemoveCropArea;
+    bool        mbRemoveCropArea;
     sal_Int32       mnImageResolution;
-    sal_Bool        mbEmbedLinkedGraphics;
-    sal_Bool        mbOLEOptimization;
+    bool        mbEmbedLinkedGraphics;
+    bool        mbOLEOptimization;
     sal_Int16       mnOLEOptimizationType;
-    sal_Bool        mbDeleteUnusedMasterPages;
-    sal_Bool        mbDeleteHiddenSlides;
-    sal_Bool        mbDeleteNotesPages;
+    bool        mbDeleteUnusedMasterPages;
+    bool        mbDeleteHiddenSlides;
+    bool        mbDeleteNotesPages;
     OUString   maCustomShowName;
-    sal_Bool        mbSaveAs;
+    bool        mbSaveAs;
     OUString   maSaveAsURL;
     OUString   maFilterName;
-    sal_Bool        mbOpenNewDocument;
+    bool        mbOpenNewDocument;
     sal_Int64       mnEstimatedFileSize;
 
     OptimizerSettings() :
-        mbJPEGCompression( sal_False ),
+        mbJPEGCompression( false ),
         mnJPEGQuality( 90 ),
-        mbRemoveCropArea( sal_False ),
+        mbRemoveCropArea( false ),
         mnImageResolution( 0 ),
-        mbEmbedLinkedGraphics( sal_False ),
-        mbOLEOptimization( sal_False ),
+        mbEmbedLinkedGraphics( false ),
+        mbOLEOptimization( false ),
         mnOLEOptimizationType( 0 ),
-        mbDeleteUnusedMasterPages( sal_False ),
-        mbDeleteHiddenSlides( sal_False ),
-        mbDeleteNotesPages( sal_False ),
-        mbSaveAs( sal_True ),
-        mbOpenNewDocument( sal_True ),
+        mbDeleteUnusedMasterPages( false ),
+        mbDeleteHiddenSlides( false ),
+        mbDeleteNotesPages( false ),
+        mbSaveAs( true ),
+        mbOpenNewDocument( true ),
         mnEstimatedFileSize( 0 ){};
         ~OptimizerSettings(){};
 
         void LoadSettingsFromConfiguration( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& rSettings );
         void SaveSettingsToConfiguration( const com::sun::star::uno::Reference< com::sun::star::container::XNameReplace >& rSettings );
 
-        sal_Bool operator==( const OptimizerSettings& rOptimizerSettings ) const;
+        bool operator==( const OptimizerSettings& rOptimizerSettings ) const;
 
 };
 class ConfigurationAccess
@@ -94,7 +94,7 @@ class ConfigurationAccess
         com::sun::star::uno::Any GetConfigProperty( const PPPOptimizerTokenEnum ) const;
         void SetConfigProperty( const PPPOptimizerTokenEnum, const com::sun::star::uno::Any& aValue );
 
-        sal_Bool GetConfigProperty( const PPPOptimizerTokenEnum, const sal_Bool bDefault ) const;
+        bool GetConfigProperty( const PPPOptimizerTokenEnum, const bool bDefault ) const;
         sal_Int16 GetConfigProperty( const PPPOptimizerTokenEnum, const sal_Int16 nDefault ) const;
         sal_Int32 GetConfigProperty( const PPPOptimizerTokenEnum, const sal_Int32 nDefault ) const;
 
diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index d0b2761519f9..d6a1b836080c 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -62,10 +62,9 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext
     Reference< XFilePickerControlAccess > xAccess( mxFilePicker, UNO_QUERY );
     if ( xAccess.is() )
     {
-        Any aValue( static_cast< sal_Bool >( sal_True ) );
         try
         {
-            xAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0, aValue );
+            xAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0, Any( true ) );
         }
         catch( com::sun::star::uno::Exception& )
         {}
@@ -83,7 +82,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext
             if ( xFilters->getByName( aFilterList[ i ] ) >>= aFilterProperties )
             {
                 FilterEntry aFilterEntry;
-                sal_Bool bImpressFilter = sal_False;
+                bool bImpressFilter = false;
                 for ( int j = 0; j < aFilterProperties.getLength(); j++ )
                 {
                     PropertyValue& rProperty( aFilterProperties[ j ] );
@@ -94,7 +93,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext
                             OUString sDocumentService;
                             rProperty.Value >>= sDocumentService;
                             if ( sDocumentService == "com.sun.star.presentation.PresentationDocument" )
-                                bImpressFilter = sal_True;
+                                bImpressFilter = true;
                             else
                                 j = aFilterProperties.getLength();
                         }
diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx
index abd95864c12b..21e03590b366 100644
--- a/sdext/source/minimizer/graphiccollector.cxx
+++ b/sdext/source/minimizer/graphiccollector.cxx
@@ -99,7 +99,7 @@ void ImpAddGraphicEntity( const Reference< XComponentContext >& rxMSF, Reference
 
         GraphicCollector::GraphicUser aUser;
         aUser.mxShape = rxShape;
-        aUser.mbFillBitmap = sal_False;
+        aUser.mbFillBitmap = false;
         xShapePropertySet->getPropertyValue( "GraphicURL" ) >>= aUser.maGraphicURL;
         xShapePropertySet->getPropertyValue( "GraphicStreamURL" ) >>= aUser.maGraphicStreamURL;
         xShapePropertySet->getPropertyValue( "GraphicCrop" ) >>= aGraphicCropLogic;
@@ -154,7 +154,7 @@ void ImpAddFillBitmapEntity( const Reference< XComponentContext >& rxMSF, const
                                 {
                                     if ( ( eBitmapMode == BitmapMode_REPEAT ) || ( eBitmapMode == BitmapMode_NO_REPEAT ) )
                                     {
-                                        sal_Bool bLogicalSize = sal_False;
+                                        bool bLogicalSize = false;
                                         awt::Size aSize( 0, 0 );
                                         if ( ( rxPropertySet->getPropertyValue( "FillBitmapLogicalSize" ) >>= bLogicalSize )
                                           && ( rxPropertySet->getPropertyValue( "FillBitmapSizeX" ) >>= aSize.Width )
@@ -184,7 +184,7 @@ void ImpAddFillBitmapEntity( const Reference< XComponentContext >& rxMSF, const
                         GraphicCollector::GraphicUser aUser;
                         aUser.mxPropertySet = rxPropertySet;
                         rxPropertySet->getPropertyValue( "FillBitmapURL" ) >>= aUser.maGraphicURL;
-                        aUser.mbFillBitmap = sal_True;
+                        aUser.mbFillBitmap = true;
                         aUser.maLogicalSize = aLogicalSize;
                         aUser.mxPagePropertySet = rxPagePropertySet;
                         ImpAddEntity( rGraphicEntities, rGraphicSettings, aUser );
@@ -320,11 +320,11 @@ void GraphicCollector::CollectGraphics( const Reference< XComponentContext >& rx
                             || ( aGraphicIter->maGraphicCropLogic.Right != aGUIter->maGraphicCropLogic.Right )
                             || ( aGraphicIter->maGraphicCropLogic.Bottom != aGUIter->maGraphicCropLogic.Bottom ) )
                         {
-                            aGraphicIter->mbRemoveCropArea = sal_False;
+                            aGraphicIter->mbRemoveCropArea = false;
                         }
                     }
                     else
-                        aGraphicIter->mbRemoveCropArea = sal_False;
+                        aGraphicIter->mbRemoveCropArea = false;
                     ++aGUIter;
                 }
             }
diff --git a/sdext/source/minimizer/graphiccollector.hxx b/sdext/source/minimizer/graphiccollector.hxx
index d1d37a3b96a6..6a56add545f6 100644
--- a/sdext/source/minimizer/graphiccollector.hxx
+++ b/sdext/source/minimizer/graphiccollector.hxx
@@ -33,14 +33,14 @@
 
 struct GraphicSettings
 {
-    sal_Bool    mbJPEGCompression;
+    bool    mbJPEGCompression;
     sal_Int32   mnJPEGQuality;
-    sal_Bool    mbRemoveCropArea;
+    bool    mbRemoveCropArea;
     sal_Int32   mnImageResolution;
-    sal_Bool    mbEmbedLinkedGraphics;
+    bool    mbEmbedLinkedGraphics;
 
-    GraphicSettings( sal_Bool bJPEGCompression, sal_Int32 nJPEGQuality, sal_Bool bRemoveCropArea,
-                        sal_Int32 nImageResolution, sal_Bool bEmbedLinkedGraphics )
+    GraphicSettings( bool bJPEGCompression, sal_Int32 nJPEGQuality, bool bRemoveCropArea,
+                        sal_Int32 nImageResolution, bool bEmbedLinkedGraphics )
     : mbJPEGCompression( bJPEGCompression )
     , mnJPEGQuality( nJPEGQuality )
     , mbRemoveCropArea( bRemoveCropArea )
@@ -61,20 +61,20 @@ class GraphicCollector
         OUString                       maGraphicStreamURL;
         com::sun::star::text::GraphicCrop   maGraphicCropLogic;
         com::sun::star::awt::Size           maLogicalSize;
-        sal_Bool                            mbFillBitmap;
+        bool                            mbFillBitmap;
 
-        GraphicUser() : mxShape(), maGraphicCropLogic( 0, 0, 0, 0 ), mbFillBitmap( sal_False ) {};
+        GraphicUser() : mxShape(), maGraphicCropLogic( 0, 0, 0, 0 ), mbFillBitmap( false ) {};
     };
 
     struct GraphicEntity
     {
         com::sun::star::awt::Size                       maLogicalSize;                          // the biggest logical size the graphic will be displayed
-        sal_Bool                                        mbRemoveCropArea;
+        bool                                        mbRemoveCropArea;
         com::sun::star::text::GraphicCrop               maGraphicCropLogic;
         std::vector< GraphicUser >                      maUser;
 
         GraphicEntity( const GraphicUser& rUser )
-            : maLogicalSize( rUser.maLogicalSize ), mbRemoveCropArea( sal_False ), maGraphicCropLogic( 0, 0, 0, 0 ) { maUser.push_back( rUser ); };
+            : maLogicalSize( rUser.maLogicalSize ), mbRemoveCropArea( false ), maGraphicCropLogic( 0, 0, 0, 0 ) { maUser.push_back( rUser ); };
     };
 
     static const com::sun::star::awt::DeviceInfo& GetDeviceInfo( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxFact );
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index f3fa1ee83bf0..b2fba1c42b11 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -122,7 +122,7 @@ void ImpDeleteHiddenSlides(  const Reference< XModel >& rxModel )
             Reference< XDrawPage > xDrawPage( xDrawPages->getByIndex( i ), UNO_QUERY_THROW );
             Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY_THROW );
 
-            sal_Bool bVisible = sal_True;
+            bool bVisible = true;
             const OUString sVisible( "Visible"  );
             if ( xPropSet->getPropertyValue( sVisible ) >>= bVisible )
             {
@@ -180,10 +180,10 @@ void ImpConvertOLE( const Reference< XModel >& rxModel, sal_Int32 nOLEOptimizati
                 {
                     Reference< XPropertySet > xPropSet( xShape, UNO_QUERY_THROW );
 
-                    sal_Bool bConvertOLE = nOLEOptimizationType == 0;
+                    bool bConvertOLE = nOLEOptimizationType == 0;
                     if ( nOLEOptimizationType == 1 )
                     {
-                        sal_Bool bIsInternal = sal_True;
+                        bool bIsInternal = true;
                         xPropSet->getPropertyValue( "IsInternal" ) >>= bIsInternal;
                         bConvertOLE = !bIsInternal;
                     }
@@ -214,7 +214,7 @@ void ImpConvertOLE( const Reference< XModel >& rxModel, sal_Int32 nOLEOptimizati
 }
 
 void ImpCompressGraphic( Reference< XGraphicProvider >& rxGraphicProvider, const Reference< XGraphic >& rxGraphic, Reference< XOutputStream >& rxOutputStream,
-    const OUString& rDestMimeType, const awt::Size& rLogicalSize, sal_Int32 nJPEGQuality, sal_Int32 nImageResolution, sal_Bool bRemoveCropping, const text::GraphicCrop& rGraphicCropLogic )
+    const OUString& rDestMimeType, const awt::Size& rLogicalSize, sal_Int32 nJPEGQuality, sal_Int32 nImageResolution, bool bRemoveCropping, const text::GraphicCrop& rGraphicCropLogic )
 {
     try
     {
@@ -268,9 +268,9 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
             sal_Int8 nGraphicType( xGraphic->getType() );
             if ( nGraphicType == com::sun::star::graphic::GraphicType::PIXEL )
             {
-                sal_Bool bTransparent = sal_False;
-                sal_Bool bAlpha       = sal_False;
-                sal_Bool bAnimated    = sal_False;
+                bool bTransparent = false;
+                bool bAlpha       = false;
+                bool bAnimated    = false;
 
                 awt::Size aSourceSizePixel( 0, 0 );
                 text::GraphicCrop aGraphicCropPixel( 0, 0, 0, 0 );
@@ -283,8 +283,8 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
                     awt::Size aDestSizePixel( aSourceSizePixel );
                     if ( !bAnimated )
                     {
-                        sal_Bool bNeedsOptimizing = sal_False;
-                        sal_Bool bRemoveCropArea( rGraphicSettings.mbRemoveCropArea );
+                        bool bNeedsOptimizing = false;
+                        bool bRemoveCropArea( rGraphicSettings.mbRemoveCropArea );
 
                         // cropping has to be removed from SourceSizePixel
                         if ( aGraphicCropLogic.Left || aGraphicCropLogic.Top || aGraphicCropLogic.Right || aGraphicCropLogic.Bottom )
@@ -292,7 +292,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
                             const awt::Size aSize100thMM( GraphicCollector::GetOriginalSize( rxContext, xGraphic ) );
 
                             if ( bRemoveCropArea )
-                                bNeedsOptimizing = sal_True;
+                                bNeedsOptimizing = true;
 
                             if ( aSize100thMM.Width && aSize100thMM.Height )
                             {
@@ -307,7 +307,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
                             }
                             else
                             {
-                                bRemoveCropArea = sal_False;
+                                bRemoveCropArea = false;
                             }
                         }
                         if ( ( aSourceSizePixel.Width > 0 ) && ( aSourceSizePixel.Height > 0 ) )
@@ -317,7 +317,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
                             {
                                 aDestMimeType = "image/jpeg";
 //                                      if( aSourceMimeType != aDestMimeType )
-                                bNeedsOptimizing = sal_True;
+                                bNeedsOptimizing = true;
                             }
                             if ( bRemoveCropArea )
                                 aDestSizePixel = aSourceSizePixel;
@@ -333,7 +333,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
                                     const double fNewSizePixelY = ((double)aDestSizePixel.Height* rGraphicSettings.mnImageResolution ) / fSourceDPIY;
 
                                     aDestSizePixel = awt::Size( (sal_Int32)fNewSizePixelX, (sal_Int32)fNewSizePixelY );
-                                    bNeedsOptimizing = sal_True;
+                                    bNeedsOptimizing = true;
                                 }
                             }
                             if ( bNeedsOptimizing && aDestSizePixel.Width && aDestSizePixel.Height )
@@ -361,7 +361,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
                 Reference< XStream > xTempFile( io::TempFile::create(rxContext), UNO_QUERY_THROW );
                 Reference< XOutputStream > xOutputStream( xTempFile->getOutputStream() );
                 Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create( rxContext ) );
-                ImpCompressGraphic( xGraphicProvider, xGraphic, xOutputStream, aDestMimeType, aLogicalSize, rGraphicSettings.mnJPEGQuality, rGraphicSettings.mnImageResolution, sal_False, aGraphicCropLogic );
+                ImpCompressGraphic( xGraphicProvider, xGraphic, xOutputStream, aDestMimeType, aLogicalSize, rGraphicSettings.mnJPEGQuality, rGraphicSettings.mnImageResolution, false, aGraphicCropLogic );
                 Reference< XInputStream > xInputStream( xTempFile->getInputStream() );
                 Reference< XSeekable > xSeekable( xInputStream, UNO_QUERY_THROW );
                 xSeekable->seek( 0 );
@@ -449,7 +449,7 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
                                 if ( xFillBitmap.is() )
                                 {
                                     awt::Size aSize;
-                                    sal_Bool bLogicalSize;
+                                    bool bLogicalSize;
 
                                     Reference< XPropertySet >& rxPropertySet( aGraphicUserIter->mxPropertySet );
                                     rxPropertySet->setPropertyValue( "FillBitmap", Any( xFillBitmap ) );
@@ -488,17 +488,17 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
 ImpOptimizer::ImpOptimizer( const Reference< XComponentContext >& rxContext, const Reference< XModel >& rxModel ) :
     mxContext                   ( rxContext ),
     mxModel                     ( rxModel ),
-    mbJPEGCompression           ( sal_False ),
+    mbJPEGCompression           ( false ),
     mnJPEGQuality               ( 90 ),
-    mbRemoveCropArea            ( sal_False ),
+    mbRemoveCropArea            ( false ),
     mnImageResolution           ( 0 ),
-    mbEmbedLinkedGraphics       ( sal_True ),
-    mbOLEOptimization           ( sal_False ),
+    mbEmbedLinkedGraphics       ( true ),
+    mbOLEOptimization           ( false ),
     mnOLEOptimizationType       ( 0 ),
-    mbDeleteUnusedMasterPages   ( sal_False ),
-    mbDeleteHiddenSlides        ( sal_False ),
-    mbDeleteNotesPages          ( sal_False ),
-    mbOpenNewDocument           ( sal_True )
+    mbDeleteUnusedMasterPages   ( false ),
+    mbDeleteHiddenSlides        ( false ),
+    mbDeleteNotesPages          ( false ),
+    mbOpenNewDocument           ( true )
 {
 }
 
@@ -523,7 +523,7 @@ void ImpOptimizer::DispatchStatus()
 
 
 
-sal_Bool ImpOptimizer::Optimize()
+bool ImpOptimizer::Optimize()
 {
 
     if ( !maCustomShowName.isEmpty() )
@@ -573,7 +573,7 @@ sal_Bool ImpOptimizer::Optimize()
     }
     SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 100 ) ) );
     DispatchStatus();
-    return sal_True;
+    return true;
 }
 
 static void DispatchURL( Reference< XComponentContext > xContext, const OUString& sURL, Reference< XFrame > xFrame )
@@ -597,9 +597,9 @@ static void DispatchURL( Reference< XComponentContext > xContext, const OUString
 
 
 
-sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
+bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
 
     if ( mxModel.is() )
     {
@@ -686,7 +686,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
 
                 Sequence< PropertyValue > aLoadProps( 1 );
                 aLoadProps[ 0 ].Name = "Hidden";
-                aLoadProps[ 0 ].Value <<= (sal_Bool)( sal_True );
+                aLoadProps[ 0 ].Value <<= true;
                 mxModel = Reference< XModel >( xComponentLoader->loadComponentFromURL(
                     maSaveAsURL, "_self", 0, aLoadProps ), UNO_QUERY );
             }
@@ -747,7 +747,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
         }
     }
     else
-        bRet = sal_False;
+        bRet = false;
     return bRet;
 }
 
diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx
index ca0689f210ae..8a27821a786e 100644
--- a/sdext/source/minimizer/impoptimizer.hxx
+++ b/sdext/source/minimizer/impoptimizer.hxx
@@ -42,24 +42,24 @@ private:
     com::sun::star::uno::Reference< com::sun::star::frame::XModel >             mxModel;
     com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >          mxStatusDispatcher;
 
-    sal_Bool        mbJPEGCompression;
-    sal_Int32       mnJPEGQuality;
-    sal_Bool        mbRemoveCropArea;
-    sal_Int32       mnImageResolution;
-    sal_Bool        mbEmbedLinkedGraphics;
-    sal_Bool        mbOLEOptimization;
-    sal_Int32       mnOLEOptimizationType;
-    OUString   maCustomShowName;
-    sal_Bool        mbDeleteUnusedMasterPages;
-    sal_Bool        mbDeleteHiddenSlides;
-    sal_Bool        mbDeleteNotesPages;
-    OUString   maSaveAsURL;
-    OUString   maFilterName;
-    sal_Bool        mbOpenNewDocument;
+    bool        mbJPEGCompression;
+    sal_Int32   mnJPEGQuality;
+    bool        mbRemoveCropArea;
+    sal_Int32   mnImageResolution;
+    bool        mbEmbedLinkedGraphics;
+    bool        mbOLEOptimization;
+    sal_Int32   mnOLEOptimizationType;
+    OUString    maCustomShowName;
+    bool        mbDeleteUnusedMasterPages;
+    bool        mbDeleteHiddenSlides;
+    bool        mbDeleteNotesPages;
+    OUString    maSaveAsURL;
+    OUString    maFilterName;
+    bool        mbOpenNewDocument;
 
     com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxInformationDialog;
 
-    sal_Bool Optimize();
+    bool Optimize();
 
 public:
 
@@ -67,7 +67,7 @@ public:
             const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel );
         ~ImpOptimizer();
 
-        sal_Bool Optimize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rArguments );
+        bool     Optimize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rArguments );
         void     DispatchStatus();
 };
 
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 787d4f235c51..0e0ac80aab56 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -59,7 +59,7 @@ using namespace ::com::sun::star::container;
 
 
 OUString InsertFixedText( InformationDialog& rInformationDialog, const OUString& rControlName, const OUString& rLabel,
-                                sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Int16 nTabIndex )
+                                sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, bool bMultiLine, sal_Int16 nTabIndex )
 {
     OUString pNames[] = {
         OUString("Height"),
@@ -98,7 +98,7 @@ OUString InsertImage(
     sal_Int32 nPosY,
     sal_Int32 nWidth,
     sal_Int32 nHeight,
-    sal_Bool bScale )
+    bool bScale )
 {
     OUString pNames[] = {
         OUString("Border"),
@@ -301,19 +301,19 @@ void InformationDialog::InitDialog()
     InsertImage( *this,
                  OUString( "aboutimage" ),
                  OUString( "private:standardimage/query" ),
-                 5, 5, 25, 25, sal_False );
-    InsertFixedText( *this, OUString("fixedtext"), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 );
+                 5, 5, 25, 25, false );
+    InsertFixedText( *this, OUString("fixedtext"), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, true, 0 );
     if ( !maSaveAsURL.isEmpty() )
         InsertCheckBox(  *this, "OpenNewDocument", xItemListener, getString( STR_AUTOMATICALLY_OPEN ), PAGE_POS_X, 42, PAGE_WIDTH, 8, 1 );
     InsertButton( *this, OUString("button"), mxActionListener, DIALOG_WIDTH / 2 - 25, nDialogHeight - 20, 50, 14, 2, STR_OK );
 
-    sal_Bool bOpenNewDocument = mrbOpenNewDocument;
+    bool bOpenNewDocument = mrbOpenNewDocument;
     setControlProperty( "OpenNewDocument", "State", Any( (sal_Int16)bOpenNewDocument ) );
 }
 
 
 
-InformationDialog::InformationDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame, const OUString& rSaveAsURL, sal_Bool& rbOpenNewDocument, const sal_Int64& rSourceSize, const sal_Int64& rDestSize, const sal_Int64& rApproxSize ) :
+InformationDialog::InformationDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame, const OUString& rSaveAsURL, bool& rbOpenNewDocument, const sal_Int64& rSourceSize, const sal_Int64& rDestSize, const sal_Int64& rApproxSize ) :
     UnoDialog( rxContext, rxFrame ),
     ConfigurationAccess( rxContext, NULL ),
     mxContext( rxContext ),
@@ -341,7 +341,7 @@ InformationDialog::~InformationDialog()
 
 
 
-sal_Bool InformationDialog::execute()
+bool InformationDialog::execute()
 {
     UnoDialog::execute();
 
@@ -351,7 +351,7 @@ sal_Bool InformationDialog::execute()
         Any aAny( getControlProperty( "OpenNewDocument", "State" ) );
         if ( aAny >>= nInt16 )
         {
-            sal_Bool bOpenNewDocument = static_cast< sal_Bool >( nInt16 );
+            bool bOpenNewDocument = static_cast< bool >( nInt16 );
             mrbOpenNewDocument = bOpenNewDocument;
         }
     }
@@ -365,7 +365,7 @@ void OKActionListener::actionPerformed( const ActionEvent& rEvent )
 {
     if ( rEvent.ActionCommand == "button" )
     {
-        mrInformationDialog.endExecute( sal_True );
+        mrInformationDialog.endExecute( true );
     }
 }
 void OKActionListener::disposing( const ::com::sun::star::lang::EventObject& /* Source */ )
diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx
index 75bba9d6fe75..d3309cd12680 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -19,6 +19,7 @@
 
 #ifndef INCLUDED_SDEXT_SOURCE_MINIMIZER_INFORMATIONDIALOG_HXX
 #define INCLUDED_SDEXT_SOURCE_MINIMIZER_INFORMATIONDIALOG_HXX
+
 #include "unodialog.hxx"
 #include "configurationaccess.hxx"
 #include "pppoptimizertoken.hxx"
@@ -47,10 +48,10 @@ public :
 
     InformationDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
             com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, const OUString& rSaveAsURL,
-                sal_Bool& bOpenNewDocument, const sal_Int64& nSourceSize, const sal_Int64& nDestSize, const sal_Int64& nApproxDest );
+                bool& bOpenNewDocument, const sal_Int64& nSourceSize, const sal_Int64& nDestSize, const sal_Int64& nApproxDest );
     ~InformationDialog();
 
-    sal_Bool                execute();
+    bool                execute();
 
 private :
 
@@ -65,7 +66,7 @@ private :
     sal_Int64 mnSourceSize;
     sal_Int64 mnDestSize;
     sal_Int64 mnApproxSize;
-    sal_Bool& mrbOpenNewDocument;
+    bool& mrbOpenNewDocument;
     const OUString& maSaveAsURL;
 
 public :
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index 3954851a3ea9..085c99e8eade 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -112,11 +112,11 @@ void OptimizerDialog::InitRoadmap()
         Reference< XPropertySet > xPropertySet( mxRoadmapControlModel, UNO_QUERY_THROW );
         xPropertySet->setPropertyValue( "Name", Any( OUString("rdmNavi") ) );
         mxRoadmapControl = mxDialog->getControl( "rdmNavi" );
-        InsertRoadmapItem( 0, sal_True, getString( STR_INTRODUCTION ), ITEM_ID_INTRODUCTION );
-        InsertRoadmapItem( 1, sal_True, getString( STR_SLIDES ), ITEM_ID_SLIDES );
-        InsertRoadmapItem( 2, sal_True, getString( STR_IMAGE_OPTIMIZATION ), ITEM_ID_GRAPHIC_OPTIMIZATION );
-        InsertRoadmapItem( 3, sal_True, getString( STR_OLE_OBJECTS ), ITEM_ID_OLE_OPTIMIZATION );
-        InsertRoadmapItem( 4, sal_True, getString( STR_SUMMARY ), ITEM_ID_SUMMARY );
+        InsertRoadmapItem( 0, true, getString( STR_INTRODUCTION ), ITEM_ID_INTRODUCTION );
+        InsertRoadmapItem( 1, true, getString( STR_SLIDES ), ITEM_ID_SLIDES );
+        InsertRoadmapItem( 2, true, getString( STR_IMAGE_OPTIMIZATION ), ITEM_ID_GRAPHIC_OPTIMIZATION );
+        InsertRoadmapItem( 3, true, getString( STR_OLE_OBJECTS ), ITEM_ID_OLE_OPTIMIZATION );
+        InsertRoadmapItem( 4, true, getString( STR_SUMMARY ), ITEM_ID_SUMMARY );
 
         // Well, that's messy, but the
         // BMP_PRESENTATION_MINIMIZER from sd module cannot be used here directly
@@ -124,8 +124,8 @@ void OptimizerDialog::InitRoadmap()
         OUString sURL( "private:graphicrepository/sd/res/minimize_presi_80.png" );
 
         xPropertySet->setPropertyValue( "ImageURL", Any( sURL ) );
-        xPropertySet->setPropertyValue( "Activated", Any( (sal_Bool)sal_True ) );
-        xPropertySet->setPropertyValue( "Complete", Any( (sal_Bool)sal_True ) );
+        xPropertySet->setPropertyValue( "Activated", Any( true ) );
+        xPropertySet->setPropertyValue( "Complete", Any( true ) );
         xPropertySet->setPropertyValue( "CurrentItemID", Any( (sal_Int16)ITEM_ID_INTRODUCTION ) );
         xPropertySet->setPropertyValue( "Text", Any( getString( STR_STEPS ) ) );
     }
@@ -136,7 +136,7 @@ void OptimizerDialog::InitRoadmap()
 
 
 
-void OptimizerDialog::InsertRoadmapItem( const sal_Int32 nIndex, const sal_Bool bEnabled, const OUString& rLabel, const sal_Int32 nItemID )
+void OptimizerDialog::InsertRoadmapItem( const sal_Int32 nIndex, const bool bEnabled, const OUString& rLabel, const sal_Int32 nItemID )
 {
     try
     {
@@ -251,7 +251,7 @@ OptimizerDialog::~OptimizerDialog()
 
 
 
-sal_Bool OptimizerDialog::execute()
+bool OptimizerDialog::execute()
 {
     Reference< XItemEventBroadcaster > maRoadmapBroadcaster( mxRoadmapControl, UNO_QUERY_THROW );
     maRoadmapBroadcaster->addItemListener( mxItemListener );
@@ -518,7 +518,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
             mrOptimizerDialog.setControlProperty( "FixedText0Pg4", "Enabled", Any( sal_True ) );
 
             // check if we have to open the FileDialog
-            sal_Bool    bSuccessfullyExecuted = sal_True;
+            bool    bSuccessfullyExecuted = true;
             sal_Int16   nInt16 = 0;
             mrOptimizerDialog.getControlProperty( "RadioButton1Pg4", "State" ) >>= nInt16;
             if ( nInt16 )
@@ -550,7 +550,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
                         }
                     }
                 }
-                 sal_Bool bDialogExecuted = aFileOpenDialog.execute() == dialogs::ExecutableDialogResults::OK;
+                 bool bDialogExecuted = aFileOpenDialog.execute() == dialogs::ExecutableDialogResults::OK;
                 if ( bDialogExecuted )
                 {
                     aSaveAsURL = aFileOpenDialog.getURL();
@@ -560,7 +560,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
                 if ( aSaveAsURL.isEmpty() )
                 {
                     // something goes wrong...
-                    bSuccessfullyExecuted = sal_False;
+                    bSuccessfullyExecuted = false;
                 }
 
                 // waiting for 500ms
@@ -622,7 +622,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
             }
         }
         break;
-        case TK_btnNavCancel :  mrOptimizerDialog.endExecute( sal_False ); break;
+        case TK_btnNavCancel :  mrOptimizerDialog.endExecute( false ); break;
         case TK_Button0Pg0 :    // delete configuration
         {
             OUString aSelectedItem( mrOptimizerDialog.GetSelectedString( "ListBox0Pg0" ) );
diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx
index 6c7241568d48..ec9e6b8ce325 100644
--- a/sdext/source/minimizer/optimizerdialog.hxx
+++ b/sdext/source/minimizer/optimizerdialog.hxx
@@ -64,11 +64,11 @@ public :
         com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > rxStatusDispatcher );
     ~OptimizerDialog();
 
-    sal_Bool                execute();
+    bool                execute();
 
     sal_Int16               mnCurrentStep;
     sal_Int16               mnTabIndex;
-    sal_Bool                mbIsReadonly;
+    bool                mbIsReadonly;
 
 private :
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
@@ -103,7 +103,7 @@ private :
 
     void ActivatePage( sal_Int16 nStep );
     void DeactivatePage( sal_Int16 nStep );
-    void InsertRoadmapItem( const sal_Int32 nIndex, const sal_Bool bEnabled, const OUString& rLabel, const sal_Int32 nItemID );
+    void InsertRoadmapItem( const sal_Int32 nIndex, const bool bEnabled, const OUString& rLabel, const sal_Int32 nItemID );
 
 public :
 
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index bb4049423c81..73c7d6bcdc6f 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -92,7 +92,7 @@ OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rCo
 
 
 OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, Reference< XActionListener >& xActionListener,
-    sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, sal_Bool bEnabled, PPPOptimizerTokenEnum nResID, sal_Int16 nPushButtonType )
+    sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, bool bEnabled, PPPOptimizerTokenEnum nResID, sal_Int16 nPushButtonType )
 {
     OUString pNames[] = {
         OUString("Enabled"),
@@ -129,7 +129,7 @@ OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rContr
 
 
 OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const OUString& rLabel,
-                                sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Bool bBold, sal_Int16 nTabIndex )
+                                sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, bool bMultiLine, bool bBold, sal_Int16 nTabIndex )
 {
     OUString pNames[] = {
         OUString("Height"),
@@ -225,8 +225,8 @@ OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString
         Any( (sal_Int32)12 ),
         Any( nXPos ),
         Any( nYPos ),
-        Any( (sal_Bool)sal_True ),
-        Any( (sal_Bool)sal_True ),
+        Any( true ),
+        Any( true ),
         Any( (sal_Int16)0 ),
         Any( nTabIndex ),
         Any( nWidth ) };
@@ -250,7 +250,7 @@ OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString
 
 
 OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName,
-    const Reference< XTextListener > xTextListener, const sal_Bool bEnabled, const Sequence< OUString >& rItemList,
+    const Reference< XTextListener > xTextListener, const bool bEnabled, const Sequence< OUString >& rItemList,
         sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex )
 {
     OUString pNames[] = {
@@ -291,7 +291,7 @@ OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon
 
 
 OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XItemListener > xItemListener,
-    const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Int16 nTabIndex )
+    const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, bool bMultiLine, sal_Int16 nTabIndex )
 {
     OUString pNames[] = {
         OUString("Height"),
@@ -327,7 +327,7 @@ OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& r
 
 
 OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName,
-    const Reference< XActionListener > xActionListener, const sal_Bool bEnabled, const Sequence< OUString >& rItemList,
+    const Reference< XActionListener > xActionListener, const bool bEnabled, const Sequence< OUString >& rItemList,
         sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex )
 {
     OUString pNames[] = {
@@ -379,10 +379,10 @@ void OptimizerDialog::InitNavigationBar()
     InsertSeparator( *this, "lnNavSep1", 0, 0, DIALOG_HEIGHT - 26, OD_DIALOG_WIDTH, 1 );
     InsertSeparator( *this, "lnNavSep2", 1, 85, 0, 1, BUTTON_POS_Y - 6 );
 
-    InsertButton( *this, "btnNavBack", mxActionListener, nBackPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, sal_False, STR_BACK, PushButtonType_STANDARD );
-    InsertButton( *this, "btnNavNext", mxActionListener, nNextPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, sal_True, STR_NEXT, PushButtonType_STANDARD );
-    InsertButton( *this, "btnNavFinish", mxActionListener, nFinishPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, sal_True, STR_FINISH, PushButtonType_STANDARD );
-    InsertButton( *this, "btnNavCancel", mxActionListener, nCancelPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, sal_True, STR_CANCEL, PushButtonType_STANDARD );
+    InsertButton( *this, "btnNavBack", mxActionListener, nBackPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, false, STR_BACK, PushButtonType_STANDARD );
+    InsertButton( *this, "btnNavNext", mxActionListener, nNextPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, true, STR_NEXT, PushButtonType_STANDARD );
+    InsertButton( *this, "btnNavFinish", mxActionListener, nFinishPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, true, STR_FINISH, PushButtonType_STANDARD );
+    InsertButton( *this, "btnNavCancel", mxActionListener, nCancelPosX, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, mnTabIndex++, true, STR_CANCEL, PushButtonType_STANDARD );
 
     setControlProperty( "btnNavNext", "DefaultButton", Any( sal_True ) );
 }
@@ -408,14 +408,14 @@ void OptimizerDialog::UpdateControlStatesPage0()
             }
         }
     }
-    sal_Bool bRemoveButtonEnabled = sal_False;
+    bool bRemoveButtonEnabled = false;
     Sequence< short > aSelectedItems;
     if ( nSelectedItem >= 0 )
     {
         aSelectedItems.realloc( 1 );
         aSelectedItems[ 0 ] = nSelectedItem;
         if ( nSelectedItem > 2 )    // only allowing to delete custom themes, the first can|t be deleted
-            bRemoveButtonEnabled = sal_True;
+            bRemoveButtonEnabled = true;
     }
     setControlProperty( "ListBox0Pg0", "StringItemList", Any( aItemList ) );
     setControlProperty( "ListBox0Pg0", "SelectedItems", Any( aSelectedItems ) );
@@ -425,12 +425,12 @@ void OptimizerDialog::InitPage0()
 {
     Sequence< OUString > aItemList;
     std::vector< OUString > aControlList;
-    aControlList.push_back( InsertFixedText( *this, "FixedText0Pg0", getString( STR_INTRODUCTION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) );
-    aControlList.push_back( InsertFixedText( *this, "FixedText1Pg0", getString( STR_INTRODUCTION_T ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 100, sal_True, sal_False, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText0Pg0", getString( STR_INTRODUCTION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false, true, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText1Pg0", getString( STR_INTRODUCTION_T ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 100, true, false, mnTabIndex++ ) );
     aControlList.push_back( InsertSeparator( *this, "Separator1Pg0", 0, PAGE_POS_X + 6, DIALOG_HEIGHT - 66, PAGE_WIDTH - 12, 1 ) );
-    aControlList.push_back( InsertFixedText( *this, "FixedText2Pg0", getString( STR_CHOSE_SETTINGS ), PAGE_POS_X + 6, DIALOG_HEIGHT - 60, PAGE_WIDTH - 12, 8, sal_True, sal_False, mnTabIndex++ ) );
-    aControlList.push_back( InsertListBox(  *this, "ListBox0Pg0", mxActionListenerListBox0Pg0, sal_True, aItemList, PAGE_POS_X + 6, DIALOG_HEIGHT - 48, ( OD_DIALOG_WIDTH - 50 ) - ( PAGE_POS_X + 6 ), 12, mnTabIndex++ ) );
-    aControlList.push_back( InsertButton( *this, "Button0Pg0", mxActionListener, OD_DIALOG_WIDTH - 46, DIALOG_HEIGHT - 49, 40, 14, mnTabIndex++, sal_True, STR_REMOVE, PushButtonType_STANDARD ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText2Pg0", getString( STR_CHOSE_SETTINGS ), PAGE_POS_X + 6, DIALOG_HEIGHT - 60, PAGE_WIDTH - 12, 8, true, false, mnTabIndex++ ) );
+    aControlList.push_back( InsertListBox(  *this, "ListBox0Pg0", mxActionListenerListBox0Pg0, true, aItemList, PAGE_POS_X + 6, DIALOG_HEIGHT - 48, ( OD_DIALOG_WIDTH - 50 ) - ( PAGE_POS_X + 6 ), 12, mnTabIndex++ ) );
+    aControlList.push_back( InsertButton( *this, "Button0Pg0", mxActionListener, OD_DIALOG_WIDTH - 46, DIALOG_HEIGHT - 49, 40, 14, mnTabIndex++, true, STR_REMOVE, PushButtonType_STANDARD ) );
     maControlPages.push_back( aControlList );
     DeactivatePage( 0 );
     UpdateControlStatesPage0();
@@ -440,9 +440,9 @@ void OptimizerDialog::InitPage0()
 
 void OptimizerDialog::UpdateControlStatesPage1()
 {
-    sal_Bool bDeleteUnusedMasterPages( GetConfigProperty( TK_DeleteUnusedMasterPages, sal_False ) );
-    sal_Bool bDeleteHiddenSlides( GetConfigProperty( TK_DeleteHiddenSlides, sal_False ) );
-    sal_Bool bDeleteNotesPages( GetConfigProperty( TK_DeleteNotesPages, sal_False ) );
+    bool bDeleteUnusedMasterPages( GetConfigProperty( TK_DeleteUnusedMasterPages, sal_False ) );
+    bool bDeleteHiddenSlides( GetConfigProperty( TK_DeleteHiddenSlides, sal_False ) );
+    bool bDeleteNotesPages( GetConfigProperty( TK_DeleteNotesPages, sal_False ) );
 
     setControlProperty( "CheckBox0Pg3", "State", Any( (sal_Int16)bDeleteUnusedMasterPages ) );
     setControlProperty( "CheckBox1Pg3", "State", Any( (sal_Int16)bDeleteNotesPages ) );
@@ -460,11 +460,11 @@ void OptimizerDialog::InitPage1()
             aCustomShowList = aXCont->getElementNames();
     }
     std::vector< OUString > aControlList;
-    aControlList.push_back( InsertFixedText( *this, "FixedText0Pg3", getString( STR_CHOOSE_SLIDES ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText0Pg3", getString( STR_CHOOSE_SLIDES ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false, true, mnTabIndex++ ) );
     aControlList.push_back( InsertCheckBox(  *this, "CheckBox0Pg3", mxItemListener, getString( STR_DELETE_MASTER_PAGES ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
     aControlList.push_back( InsertCheckBox(  *this, "CheckBox2Pg3", mxItemListener, getString( STR_DELETE_HIDDEN_SLIDES ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
     aControlList.push_back( InsertCheckBox(  *this, "CheckBox3Pg3", mxItemListener, getString( STR_CUSTOM_SHOW ), PAGE_POS_X + 6, PAGE_POS_Y + 42, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
-    aControlList.push_back( InsertListBox(  *this, "ListBox0Pg3", mxActionListener, sal_True, aCustomShowList, PAGE_POS_X + 14, PAGE_POS_Y + 54, 150, 12, mnTabIndex++ ) );
+    aControlList.push_back( InsertListBox(  *this, "ListBox0Pg3", mxActionListener, true, aCustomShowList, PAGE_POS_X + 14, PAGE_POS_Y + 54, 150, 12, mnTabIndex++ ) );
     aControlList.push_back( InsertCheckBox(  *this, "CheckBox1Pg3", mxItemListener, getString( STR_DELETE_NOTES_PAGES ), PAGE_POS_X + 6, PAGE_POS_Y + 70, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
     maControlPages.push_back( aControlList );
     DeactivatePage( 1 );
@@ -480,9 +480,9 @@ void OptimizerDialog::InitPage1()
 
 void OptimizerDialog::UpdateControlStatesPage2()
 {
-    sal_Bool bJPEGCompression( GetConfigProperty( TK_JPEGCompression, sal_False ) );
-    sal_Bool bRemoveCropArea( GetConfigProperty( TK_RemoveCropArea, sal_False ) );
-    sal_Bool bEmbedLinkedGraphics( GetConfigProperty( TK_EmbedLinkedGraphics, sal_True ) );
+    bool bJPEGCompression( GetConfigProperty( TK_JPEGCompression, sal_False ) );
+    bool bRemoveCropArea( GetConfigProperty( TK_RemoveCropArea, sal_False ) );
+    bool bEmbedLinkedGraphics( GetConfigProperty( TK_EmbedLinkedGraphics, sal_True ) );
     sal_Int32 nJPEGQuality( GetConfigProperty( TK_JPEGQuality, (sal_Int32)90 ) );
 
     sal_Int32 nImageResolution( GetConfigProperty( TK_ImageResolution, (sal_Int32)0 ) );
@@ -507,8 +507,8 @@ void OptimizerDialog::UpdateControlStatesPage2()
     if ( aResolutionText.isEmpty() )
         aResolutionText = OUString::number( nImageResolution );
 
-    setControlProperty( "RadioButton0Pg1", "State", Any( (sal_Int16)( bJPEGCompression != sal_True ) ) );
-    setControlProperty( "RadioButton1Pg1", "State", Any( (sal_Int16)( bJPEGCompression != sal_False ) ) );
+    setControlProperty( "RadioButton0Pg1", "State", Any( (sal_Int16)( bJPEGCompression == false ) ) );
+    setControlProperty( "RadioButton1Pg1", "State", Any( (sal_Int16)( bJPEGCompression == true ) ) );
     setControlProperty( "FixedText1Pg1", "Enabled", Any( bJPEGCompression ) );
     setControlProperty( "FormattedField0Pg1", "Enabled", Any( bJPEGCompression ) );
     setControlProperty( "FormattedField0Pg1", "EffectiveValue", Any( (double)nJPEGQuality ) );
@@ -527,13 +527,13 @@ void OptimizerDialog::InitPage2()
     aResolutionItemList[ 3 ] = getString( STR_IMAGE_RESOLUTION_3 ).getToken( 1, ';', nI3 );
 
     std::vector< OUString > aControlList;
-    aControlList.push_back( InsertFixedText( *this, "FixedText0Pg1", getString( STR_GRAPHIC_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) );
-    aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg1", mxItemListener, getString( STR_LOSSLESS_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, sal_False, mnTabIndex++ ) );
-    aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg1", mxItemListener, getString( STR_JPEG_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH - 12, 8, sal_False, mnTabIndex++ ) );
-    aControlList.push_back( InsertFixedText( *this, "FixedText1Pg1", getString( STR_QUALITY ), PAGE_POS_X + 20, PAGE_POS_Y + 40, 72, 8, sal_False, sal_False, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText0Pg1", getString( STR_GRAPHIC_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false, true, mnTabIndex++ ) );
+    aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg1", mxItemListener, getString( STR_LOSSLESS_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, false, mnTabIndex++ ) );
+    aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg1", mxItemListener, getString( STR_JPEG_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH - 12, 8, false, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText1Pg1", getString( STR_QUALITY ), PAGE_POS_X + 20, PAGE_POS_Y + 40, 72, 8, false, false, mnTabIndex++ ) );
     aControlList.push_back( InsertFormattedField( *this, "FormattedField0Pg1", mxTextListenerFormattedField0Pg1, mxSpinListenerFormattedField0Pg1, PAGE_POS_X + 106, PAGE_POS_Y + 38, 50, 0, 100, mnTabIndex++ ) );
-    aControlList.push_back( InsertFixedText( *this, "FixedText2Pg1", getString( STR_IMAGE_RESOLUTION ), PAGE_POS_X + 6, PAGE_POS_Y + 54, 94, 8, sal_False, sal_False, mnTabIndex++ ) );
-    aControlList.push_back( InsertComboBox(  *this, "ComboBox0Pg1", mxTextListenerComboBox0Pg1, sal_True, aResolutionItemList, PAGE_POS_X + 106, PAGE_POS_Y + 52, 100, 12, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText2Pg1", getString( STR_IMAGE_RESOLUTION ), PAGE_POS_X + 6, PAGE_POS_Y + 54, 94, 8, false, false, mnTabIndex++ ) );
+    aControlList.push_back( InsertComboBox(  *this, "ComboBox0Pg1", mxTextListenerComboBox0Pg1, true, aResolutionItemList, PAGE_POS_X + 106, PAGE_POS_Y + 52, 100, 12, mnTabIndex++ ) );
     aControlList.push_back( InsertCheckBox(  *this, "CheckBox1Pg1", mxItemListener, getString( STR_REMOVE_CROP_AREA ), PAGE_POS_X + 6, PAGE_POS_Y + 68, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
     aControlList.push_back( InsertCheckBox(  *this, "CheckBox2Pg1", mxItemListener, getString( STR_EMBED_LINKED_GRAPHICS ), PAGE_POS_X + 6, PAGE_POS_Y + 82, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
     maControlPages.push_back( aControlList );
@@ -545,7 +545,7 @@ void OptimizerDialog::InitPage2()
 
 void OptimizerDialog::UpdateControlStatesPage3()
 {
-    sal_Bool bConvertOLEObjects( GetConfigProperty( TK_OLEOptimization, sal_False ) );
+    bool bConvertOLEObjects( GetConfigProperty( TK_OLEOptimization, sal_False ) );
     sal_Int16 nOLEOptimizationType( GetConfigProperty( TK_OLEOptimizationType, (sal_Int16)0 ) );
 
     setControlProperty( "CheckBox0Pg2", "State", Any( (sal_Int16)bConvertOLEObjects ) );
@@ -573,11 +573,11 @@ void OptimizerDialog::InitPage3()
     }
 
     std::vector< OUString > aControlList;
-    aControlList.push_back( InsertFixedText( *this, "FixedText0Pg2", getString( STR_OLE_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText0Pg2", getString( STR_OLE_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false, true, mnTabIndex++ ) );
     aControlList.push_back( InsertCheckBox(  *this, "CheckBox0Pg2", mxItemListener, getString( STR_OLE_REPLACE ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, mnTabIndex++ ) );
-    aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg2", mxItemListener, getString( STR_ALL_OLE_OBJECTS ), PAGE_POS_X + 14, PAGE_POS_Y + 28, PAGE_WIDTH - 22, 8, sal_False, mnTabIndex++ ) );
-    aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg2", mxItemListener, getString( STR_ALIEN_OLE_OBJECTS_ONLY ), PAGE_POS_X + 14, PAGE_POS_Y + 40, PAGE_WIDTH - 22, 8, sal_False, mnTabIndex++ ) );
-    aControlList.push_back( InsertFixedText( *this, "FixedText1Pg2", nOLECount ? getString( STR_OLE_OBJECTS_DESC ) : getString( STR_NO_OLE_OBJECTS_DESC ), PAGE_POS_X + 6, PAGE_POS_Y + 64, PAGE_WIDTH - 22, 50, sal_True, sal_False, mnTabIndex++ ) );
+    aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg2", mxItemListener, getString( STR_ALL_OLE_OBJECTS ), PAGE_POS_X + 14, PAGE_POS_Y + 28, PAGE_WIDTH - 22, 8, false, mnTabIndex++ ) );
+    aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg2", mxItemListener, getString( STR_ALIEN_OLE_OBJECTS_ONLY ), PAGE_POS_X + 14, PAGE_POS_Y + 40, PAGE_WIDTH - 22, 8, false, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText1Pg2", nOLECount ? getString( STR_OLE_OBJECTS_DESC ) : getString( STR_NO_OLE_OBJECTS_DESC ), PAGE_POS_X + 6, PAGE_POS_Y + 64, PAGE_WIDTH - 22, 50, true, false, mnTabIndex++ ) );
     maControlPages.push_back( aControlList );
     DeactivatePage( 3 );
     UpdateControlStatesPage3();
@@ -603,7 +603,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal, sal_Unicode nSeparator =
 
 void OptimizerDialog::UpdateControlStatesPage4()
 {
-    sal_Bool bSaveAs( GetConfigProperty( TK_SaveAs, sal_True ) );
+    bool bSaveAs( GetConfigProperty( TK_SaveAs, sal_True ) );
     if ( mbIsReadonly )
     {
         setControlProperty( "RadioButton0Pg4", "State", Any( (sal_Int16)( sal_False ) ) );
@@ -611,8 +611,8 @@ void OptimizerDialog::UpdateControlStatesPage4()
     }
     else
     {
-        setControlProperty( "RadioButton0Pg4", "State", Any( (sal_Int16)( bSaveAs == sal_False ) ) );
-        setControlProperty( "RadioButton1Pg4", "State", Any( (sal_Int16)( bSaveAs == sal_True ) ) );
+        setControlProperty( "RadioButton0Pg4", "State", Any( (sal_Int16)( bSaveAs == false ) ) );
+        setControlProperty( "RadioButton1Pg4", "State", Any( (sal_Int16)( bSaveAs == true ) ) );
     }
     setControlProperty( "ComboBox0Pg4", "Enabled", Any( sal_False ) );
 
@@ -628,14 +628,14 @@ void OptimizerDialog::UpdateControlStatesPage4()
     setControlProperty( "ComboBox0Pg4", "StringItemList", Any( aItemList ) );
 
     // now check if it is sensible to enable the combo box
-    sal_Bool bSaveSettingsEnabled = sal_True;
+    bool bSaveSettingsEnabled = true;
     if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one
     {
         for ( w = 1; w < rList.size(); w++ )
         {
             if ( rList[ w ] == rList[ 0 ] )
             {
-                bSaveSettingsEnabled = sal_False;
+                bSaveSettingsEnabled = false;
                 break;
             }
         }
@@ -688,7 +688,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
             while( aIter != vUsedPageList.end() )
             {
                 Reference< XPropertySet > xPropSet( *aIter, UNO_QUERY_THROW );
-                sal_Bool bVisible = sal_True;
+                bool bVisible = true;
                 const OUString sVisible( "Visible"  );
                 if ( xPropSet->getPropertyValue( sVisible ) >>= bVisible )
                 {
@@ -707,7 +707,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
                 Reference< XDrawPage > xDrawPage( xDrawPages->getByIndex( i ), UNO_QUERY_THROW );
                 Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY_THROW );
 
-                sal_Bool bVisible = sal_True;
+                bool bVisible = true;
                 const OUString sVisible( "Visible"  );
                 if ( xPropSet->getPropertyValue( sVisible ) >>= bVisible )
                 {
@@ -743,7 +743,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
 
 // generating graphic compression info
     sal_Int32 nGraphics = 0;
-    sal_Bool bJPEGCompression( GetConfigProperty( TK_JPEGCompression, sal_False ) );
+    bool bJPEGCompression( GetConfigProperty( TK_JPEGCompression, sal_False ) );
     sal_Int32 nJPEGQuality( GetConfigProperty( TK_JPEGQuality, (sal_Int32)90 ) );
     sal_Int32 nImageResolution( GetConfigProperty( TK_ImageResolution, (sal_Int32)0 ) );
     GraphicSettings aGraphicSettings( bJPEGCompression, nJPEGQuality, GetConfigProperty( TK_RemoveCropArea, sal_False ),
@@ -867,27 +867,27 @@ void OptimizerDialog::InitPage4()
     Reference< XTextListener > xTextListener;
     Sequence< OUString > aItemList;
     std::vector< OUString > aControlList;
-    aControlList.push_back( InsertFixedText( *this, "FixedText0Pg4", getString( STR_SUMMARY_TITLE ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText0Pg4", getString( STR_SUMMARY_TITLE ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false, true, mnTabIndex++ ) );
 //  aControlList.push_back( InsertSeparator( *this, "Separator0Pg4", 0, PAGE_POS_X + 6, PAGE_POS_Y + 90, PAGE_WIDTH - 12, 1 ) );
 
-    aControlList.push_back( InsertFixedText( *this, "FixedText4Pg4", OUString(), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, sal_False, sal_False, mnTabIndex++ ) );
-    aControlList.push_back( InsertFixedText( *this, "FixedText5Pg4", OUString(), PAGE_POS_X + 6, PAGE_POS_Y + 22, PAGE_WIDTH - 12, 8, sal_False, sal_False, mnTabIndex++ ) );
-    aControlList.push_back( InsertFixedText( *this, "FixedText6Pg4", OUString(), PAGE_POS_X + 6, PAGE_POS_Y + 30, PAGE_WIDTH - 12, 8, sal_False, sal_False, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText4Pg4", OUString(), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, false, false, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText5Pg4", OUString(), PAGE_POS_X + 6, PAGE_POS_Y + 22, PAGE_WIDTH - 12, 8, false, false, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText6Pg4", OUString(), PAGE_POS_X + 6, PAGE_POS_Y + 30, PAGE_WIDTH - 12, 8, false, false, mnTabIndex++ ) );
 
-    aControlList.push_back( InsertFixedText( *this, "FixedText2Pg4", getString( STR_CURRENT_FILESIZE ), PAGE_POS_X + 6, PAGE_POS_Y + 50, 88, 8, sal_False, sal_False, mnTabIndex++ ) );
-    aControlList.push_back( InsertFixedText( *this, "FixedText7Pg4", OUString(), PAGE_POS_X + 100, PAGE_POS_Y + 50, 30, 8, sal_False, sal_False, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText2Pg4", getString( STR_CURRENT_FILESIZE ), PAGE_POS_X + 6, PAGE_POS_Y + 50, 88, 8, false, false, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText7Pg4", OUString(), PAGE_POS_X + 100, PAGE_POS_Y + 50, 30, 8, false, false, mnTabIndex++ ) );
     setControlProperty( "FixedText7Pg4", "Align", Any( static_cast< short >( 2 ) ) );
-    aControlList.push_back( InsertFixedText( *this, "FixedText3Pg4", getString( STR_ESTIMATED_FILESIZE ), PAGE_POS_X + 6, PAGE_POS_Y + 58, 88, 8, sal_False, sal_False, mnTabIndex++ ) );
-    aControlList.push_back( InsertFixedText( *this, "FixedText8Pg4", OUString(), PAGE_POS_X + 100, PAGE_POS_Y + 58, 30, 8, sal_False, sal_False, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText3Pg4", getString( STR_ESTIMATED_FILESIZE ), PAGE_POS_X + 6, PAGE_POS_Y + 58, 88, 8, false, false, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText8Pg4", OUString(), PAGE_POS_X + 100, PAGE_POS_Y + 58, 30, 8, false, false, mnTabIndex++ ) );
     setControlProperty( "FixedText8Pg4", "Align", Any( static_cast< short >( 2 ) ) );
 
-    aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg4", mxItemListener, getString(  STR_APPLY_TO_CURRENT ), PAGE_POS_X + 6, PAGE_POS_Y + 78, PAGE_WIDTH - 12, 8, sal_False, mnTabIndex++ ) );
-    aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg4", mxItemListener, getString( STR_SAVE_AS ), PAGE_POS_X + 6, PAGE_POS_Y + 90, PAGE_WIDTH - 12, 8, sal_False, mnTabIndex++ ) );
-    aControlList.push_back( InsertFixedText( *this, "FixedText1Pg4", OUString(), PAGE_POS_X + 6, DIALOG_HEIGHT - 87, PAGE_WIDTH - 12, 8, sal_True, sal_False, mnTabIndex++ ) );
+    aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg4", mxItemListener, getString(  STR_APPLY_TO_CURRENT ), PAGE_POS_X + 6, PAGE_POS_Y + 78, PAGE_WIDTH - 12, 8, false, mnTabIndex++ ) );
+    aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg4", mxItemListener, getString( STR_SAVE_AS ), PAGE_POS_X + 6, PAGE_POS_Y + 90, PAGE_WIDTH - 12, 8, false, mnTabIndex++ ) );
+    aControlList.push_back( InsertFixedText( *this, "FixedText1Pg4", OUString(), PAGE_POS_X + 6, DIALOG_HEIGHT - 87, PAGE_WIDTH - 12, 8, true, false, mnTabIndex++ ) );
     aControlList.push_back( "Progress" );
     aControlList.push_back( InsertSeparator( *this, "Separator1Pg4", 0, PAGE_POS_X + 6, DIALOG_HEIGHT - 58, PAGE_WIDTH - 12, 1 ) );
     aControlList.push_back( InsertCheckBox(  *this, "CheckBox1Pg4", mxItemListener, getString( STR_SAVE_SETTINGS ), PAGE_POS_X + 6, DIALOG_HEIGHT - 47, 100, 8, mnTabIndex++ ) );
-    aControlList.push_back( InsertComboBox(  *this, "ComboBox0Pg4", xTextListener, sal_True, aItemList, PAGE_POS_X + 106, DIALOG_HEIGHT - 48, 100, 12, mnTabIndex++ ) );
+    aControlList.push_back( InsertComboBox(  *this, "ComboBox0Pg4", xTextListener, true, aItemList, PAGE_POS_X + 106, DIALOG_HEIGHT - 48, 100, 12, mnTabIndex++ ) );
     maControlPages.push_back( aControlList );
     DeactivatePage( 4 );
 
@@ -937,14 +937,14 @@ void OptimizerDialog::ActivatePage( sal_Int16 nStep )
     std::vector< OUString >::iterator aBeg( maControlPages[ nStep ].begin() );
     std::vector< OUString >::iterator aEnd( maControlPages[ nStep ].end() );
     while( aBeg != aEnd )
-        setVisible( *aBeg++, sal_True );
+        setVisible( *aBeg++, true );
 }
 void OptimizerDialog::DeactivatePage( sal_Int16 nStep )
 {
     std::vector< OUString >::iterator aBeg( maControlPages[ nStep ].begin() );
     std::vector< OUString >::iterator aEnd( maControlPages[ nStep ].end() );
     while( aBeg != aEnd )
-        setVisible( *aBeg++, sal_False );
+        setVisible( *aBeg++, false );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx
index 903225cc361a..00c41a031f98 100644
--- a/sdext/source/minimizer/unodialog.cxx
+++ b/sdext/source/minimizer/unodialog.cxx
@@ -57,7 +57,7 @@ UnoDialog::UnoDialog( const Reference< XComponentContext > &rxContext, Reference
     mxControlModel( mxDialogModel, UNO_QUERY_THROW ),
     mxDialog( UnoControlDialog::create(rxContext) ),
     mxControl( mxDialog, UNO_QUERY_THROW ),
-    mbStatus( sal_False )
+    mbStatus( false )
 {
     mxControl->setModel( mxControlModel );
 
@@ -83,7 +83,7 @@ void UnoDialog::execute()
     mxDialog->execute();
 }
 
-void UnoDialog::endExecute( sal_Bool bStatus )
+void UnoDialog::endExecute( bool bStatus )
 {
     mbStatus = bStatus;
     mxDialog->endExecute();
@@ -125,7 +125,7 @@ Reference< XInterface > UnoDialog::insertControlModel( const OUString& rServiceN
 
 
 
-void UnoDialog::setVisible( const OUString& rName, sal_Bool bVisible )
+void UnoDialog::setVisible( const OUString& rName, bool bVisible )
 {
     try
     {
diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx
index 34467ec6c356..2186085b8b00 100644
--- a/sdext/source/minimizer/unodialog.hxx
+++ b/sdext/source/minimizer/unodialog.hxx
@@ -66,7 +66,7 @@ public :
     ~UnoDialog();
 
     void execute();
-    void endExecute( sal_Bool bStatus );
+    void endExecute( bool bStatus );
 
     com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > createWindowPeer( com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > xParentPeer )
         throw ( com::sun::star::uno::Exception );
@@ -74,7 +74,7 @@ public :
     com::sun::star::uno::Reference< com::sun::star::uno::XInterface > insertControlModel( const OUString& rServiceName, const OUString& rName,
         const com::sun::star::uno::Sequence< OUString >& rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rPropertyValues );
 
-    void setVisible( const OUString& rName, sal_Bool bVisible );
+    void setVisible( const OUString& rName, bool bVisible );
 
     com::sun::star::uno::Reference< com::sun::star::awt::XButton > insertButton( const OUString& rName,
         com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > xActionListener, const com::sun::star::uno::Sequence< OUString >& rPropertyNames,
@@ -124,7 +124,7 @@ public :
     com::sun::star::uno::Reference< com::sun::star::awt::XControl >                 mxControl;
     com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer >              mxWindowPeer;
 
-    sal_Bool                                                                        mbStatus;
+    bool                                                                        mbStatus;
 };
 
 #endif // INCLUDED_SDEXT_SOURCE_MINIMIZER_UNODIALOG_HXX
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index 6899fc50bed4..a6cb0983d57d 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -58,7 +58,7 @@ PDFIHybridAdaptor::PDFIHybridAdaptor( const uno::Reference< uno::XComponentConte
 // XFilter
 sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::PropertyValue >& rFilterData ) throw( uno::RuntimeException, std::exception )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( m_xModel.is() )
     {
         uno::Reference< io::XStream > xSubStream;
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 6b98df0289d0..3b82fd3a7d00 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -226,7 +226,7 @@ protected:
 
     void UpdateState (const sal_Int16 aState, const bool bValue);
 
-    sal_Bool IsDisposed (void) const;
+    bool IsDisposed (void) const;
 
     void ThrowIfDisposed (void) const
         throw (css::lang::DisposedException);
@@ -1355,7 +1355,7 @@ awt::Point PresenterAccessible::AccessibleObject::GetAbsoluteParentLocation (voi
         return awt::Point();
 }
 
-sal_Bool PresenterAccessible::AccessibleObject::IsDisposed (void) const
+bool PresenterAccessible::AccessibleObject::IsDisposed (void) const
 {
     return (rBHelper.bDisposed || rBHelper.bInDispose);
 }