filter: sal_Bool->bool

Change-Id: Icf20f23cb46ad3cb147d8c6a743f1d25a23fbca5

6 files changed, 71 insertions, 71 deletions

diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index 9c719df4916f..083b1589e8e5 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -69,8 +69,8 @@ PageInfo::PageInfo()
         , mnBackgroundID( 0 )
         , mnObjectsID( 0)
         , mnForegroundID( 0)
-        , mbBackgroundVisible( sal_False )
-        , mbBackgroundObjectsVisible( sal_False )
+        , mbBackgroundVisible( false )
+        , mbBackgroundObjectsVisible( false )
 {
 }
 
@@ -95,7 +95,7 @@ FlashExporter::FlashExporter(
     const Reference< XDrawPage >& rxSelectedDrawPage,
 
     sal_Int32 nJPEGCompressMode,
-    sal_Bool bExportOLEAsJPEG)
+    bool bExportOLEAsJPEG)
     : mxContext(rxContext)
     // #i56084# variables for selection export
     , mxSelectedShapes(rxSelectedShapes)
@@ -139,7 +139,7 @@ const sal_uInt16 cBackgroundObjectsDepth = 3;
 const sal_uInt16 cPageObjectsDepth = 4;
 const sal_uInt16 cWaitButtonDepth = 10;
 
-sal_Bool FlashExporter::exportAll( Reference< XComponent > xDoc, Reference< XOutputStream > &xOutputStream, Reference< XStatusIndicator> &xStatusIndicator )
+bool FlashExporter::exportAll( Reference< XComponent > xDoc, Reference< XOutputStream > &xOutputStream, Reference< XStatusIndicator> &xStatusIndicator )
 {
     Reference< XServiceInfo > xDocServInfo( xDoc, UNO_QUERY );
     if( xDocServInfo.is() )
@@ -147,11 +147,11 @@ sal_Bool FlashExporter::exportAll( Reference< XComponent > xDoc, Reference< XOut
 
     Reference< XDrawPagesSupplier > xDrawPagesSupplier(xDoc, UNO_QUERY);
     if(!xDrawPagesSupplier.is())
-        return sal_False;
+        return false;
 
     Reference< XIndexAccess > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY );
     if(!xDrawPages.is())
-        return sal_False;
+        return false;
 
     Reference< XDrawPage > xDrawPage;
 
@@ -212,7 +212,7 @@ sal_Bool FlashExporter::exportAll( Reference< XComponent > xDoc, Reference< XOut
         Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY );
         if( mbPresentation )
         {
-            sal_Bool bVisible = sal_False;
+            bool bVisible = false;
             xPropSet->getPropertyValue( "Visible" ) >>= bVisible;
             if( !bVisible )
                 continue;
@@ -278,15 +278,15 @@ sal_Bool FlashExporter::exportAll( Reference< XComponent > xDoc, Reference< XOut
 
     mpWriter->storeTo( xOutputStream );
 
-    return sal_True;
+    return true;
 }
 
 
-sal_Bool FlashExporter::exportSlides( Reference< XDrawPage > xDrawPage, Reference< XOutputStream > &xOutputStream, sal_uInt16 /* nPage */ )
+bool FlashExporter::exportSlides( Reference< XDrawPage > xDrawPage, Reference< XOutputStream > &xOutputStream, sal_uInt16 /* nPage */ )
 {
     Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY );
     if( !xDrawPage.is() || !xPropSet.is() )
-        return sal_False;
+        return false;
 
     try
     {
@@ -300,10 +300,10 @@ sal_Bool FlashExporter::exportSlides( Reference< XDrawPage > xDrawPage, Referenc
 
         if( mbPresentation )
         {
-            sal_Bool bVisible = sal_False;
+            bool bVisible = false;
             xPropSet->getPropertyValue( "Visible" ) >>= bVisible;
             if( !bVisible )
-                return sal_False;
+                return false;
         }
     }
     catch( const Exception& )
@@ -315,10 +315,10 @@ sal_Bool FlashExporter::exportSlides( Reference< XDrawPage > xDrawPage, Referenc
 
     mpWriter->storeTo( xOutputStream );
 
-    return sal_True;
+    return true;
 }
 
-sal_uInt16 FlashExporter::exportBackgrounds( Reference< XDrawPage > xDrawPage, Reference< XOutputStream > &xOutputStream, sal_uInt16 nPage, sal_Bool bExportObjects )
+sal_uInt16 FlashExporter::exportBackgrounds( Reference< XDrawPage > xDrawPage, Reference< XOutputStream > &xOutputStream, sal_uInt16 nPage, bool bExportObjects )
 {
     Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY );
     if( !xDrawPage.is() || !xPropSet.is() )
@@ -347,14 +347,14 @@ sal_uInt16 FlashExporter::exportBackgrounds( Reference< XDrawPage > xDrawPage, R
     return nPage;
 }
 
-sal_uInt16 FlashExporter::exportBackgrounds( Reference< XDrawPage > xDrawPage, sal_uInt16 nPage, sal_Bool bExportObjects )
+sal_uInt16 FlashExporter::exportBackgrounds( Reference< XDrawPage > xDrawPage, sal_uInt16 nPage, bool bExportObjects )
 {
     Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY );
     if( !xDrawPage.is() || !xPropSet.is() )
         return sal_False;
 
-    sal_Bool bBackgroundVisible = true;
-    sal_Bool bBackgroundObjectsVisible = true;
+    bool bBackgroundVisible = true;
+    bool bBackgroundObjectsVisible = true;
 
     if( mbPresentation )
     {
@@ -564,7 +564,7 @@ void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster
         try
         {
             // skip empty presentation objects
-            sal_Bool bEmpty = sal_False;
+            bool bEmpty = false;
             xPropSet->getPropertyValue( "IsEmptyPresentationObject" ) >>= bEmpty;
             if( bEmpty )
                 return;
@@ -677,7 +677,7 @@ bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile
     if(bExportAsJPEG)
     {
         aFilterData[2].Name = "Translucent";
-        aFilterData[2].Value <<= (sal_Bool)sal_True;
+        aFilterData[2].Value <<= true;
     }
 
     Sequence< PropertyValue > aDescriptor( bOnlyBackground ? 4 : 3 );
@@ -695,7 +695,7 @@ bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile
     if( bOnlyBackground )
     {
         aDescriptor[3].Name = "ExportOnlyBackground";
-        aDescriptor[3].Value <<= (sal_Bool)bOnlyBackground;
+        aDescriptor[3].Value <<= bOnlyBackground;
     }
     mxGraphicExporter->setSourceDocument( xComponent );
     mxGraphicExporter->filter( aDescriptor );
diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx
index cb2a2802ebbf..589fd085a397 100644
--- a/filter/source/flash/swfexporter.hxx
+++ b/filter/source/flash/swfexporter.hxx
@@ -75,11 +75,11 @@ public:
     OUString maBookmark;
 
     sal_Int32       mnDimColor;
-    sal_Bool        mbDimHide;
-    sal_Bool        mbDimPrev;
+    bool        mbDimHide;
+    bool        mbDimPrev;
 
-    sal_Bool        mbSoundOn;
-    sal_Bool        mbPlayFull;
+    bool        mbSoundOn;
+    bool        mbPlayFull;
     OUString maSoundURL;
 
     sal_Int32       mnBlueScreenColor;
@@ -127,8 +127,8 @@ struct PageInfo
     sal_uInt16      mnObjectsID;
     sal_uInt16      mnForegroundID;
 
-    sal_Bool mbBackgroundVisible;
-    sal_Bool mbBackgroundObjectsVisible;
+    bool mbBackgroundVisible;
+    bool mbBackgroundObjectsVisible;
 
     ShapeInfoVector maShapesVector;
 
@@ -154,15 +154,15 @@ public:
         const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxSelectedDrawPage,
 
         sal_Int32 nJPEGCompressMode = -1,
-        sal_Bool bExportOLEAsJPEG = false);
+        bool bExportOLEAsJPEG = false);
     ~FlashExporter();
 
     void Flush();
 
-    sal_Bool exportAll( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xDoc, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream,    ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> &xStatusIndicator );
-    sal_Bool exportSlides( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream, sal_uInt16 nPage);
-    sal_uInt16 exportBackgrounds( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream, sal_uInt16 nPage, sal_Bool bExportObjects );
-    sal_uInt16 exportBackgrounds( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, sal_uInt16 nPage, sal_Bool bExportObjects );
+    bool exportAll( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xDoc, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream,    ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> &xStatusIndicator );
+    bool exportSlides( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream, sal_uInt16 nPage);
+    sal_uInt16 exportBackgrounds( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream, sal_uInt16 nPage, bool bExportObjects );
+    sal_uInt16 exportBackgrounds( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, sal_uInt16 nPage, bool bExportObjects );
 
     ChecksumCache gMasterCache;
     ChecksumCache gPrivateCache;
@@ -203,9 +203,9 @@ private:
 
     sal_Int32 mnJPEGcompressMode;
 
-    sal_Bool mbExportOLEAsJPEG;
+    bool mbExportOLEAsJPEG;
 
-    sal_Bool mbPresentation;
+    bool mbPresentation;
 
     sal_Int32 mnPageNumber;
 };
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index 986a4039a6bb..bbbf0f18c6e6 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -164,8 +164,8 @@ public:
     // XFilter
     virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
 
-    sal_Bool ExportAsMultipleFiles( const Sequence< PropertyValue >& aDescriptor );
-    sal_Bool ExportAsSingleFile( const Sequence< PropertyValue >& aDescriptor );
+    bool ExportAsMultipleFiles( const Sequence< PropertyValue >& aDescriptor );
+    bool ExportAsSingleFile( const Sequence< PropertyValue >& aDescriptor );
 
     virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
 
@@ -316,21 +316,21 @@ sal_Bool SAL_CALL FlashExportFilter::filter( const ::com::sun::star::uno::Sequen
 // AS: HACK!  Right now, I create a directory as a sibling to the swf file selected in the Export
 //  dialog.  This directory is called presentation.sxi-swf-files.  The name of the swf file selected
 //  in the Export dialog has no impact on this.  All files created are placed in this directory.
-sal_Bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue >& aDescriptor)
+bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue >& aDescriptor)
 {
     Reference< XDrawPagesSupplier > xDrawPagesSupplier(mxDoc, UNO_QUERY);
     if(!xDrawPagesSupplier.is())
-        return sal_False;
+        return false;
 
     Reference< XIndexAccess > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY );
     if(!xDrawPages.is())
-        return sal_False;
+        return false;
 
     Reference< XDesktop2 > rDesktop = Desktop::create( mxContext );
 
     Reference< XStorable > xStorable(rDesktop->getCurrentComponent(), UNO_QUERY);
     if (!xStorable.is())
-        return sal_False;
+        return false;
 
     Reference< XDrawPage > xDrawPage;
 
@@ -377,7 +377,7 @@ sal_Bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue
 
     // AS: Only export the background config if we're exporting all of the pages, otherwise we'll
     //  screw it up.
-    sal_Bool bExportAll = findPropertyValue<sal_Bool>(aFilterData, "ExportAll", true);
+    bool bExportAll = findPropertyValue<sal_Bool>(aFilterData, "ExportAll", true);
     if (bExportAll)
     {
         osl_removeFile(fullpath.pData);
@@ -427,7 +427,7 @@ sal_Bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue
             fullpath = swfdirpath + STR("/slide") + VAL(nPage+1) + STR("p.swf");
 
             Reference<XOutputStream> xOutputStreamWrap(*(new OslOutputStreamWrapper(fullpath)), UNO_QUERY);
-            sal_Bool ret = aFlashExporter.exportSlides( xDrawPage, xOutputStreamWrap, sal::static_int_cast<sal_uInt16>( nPage ) );
+            bool ret = aFlashExporter.exportSlides( xDrawPage, xOutputStreamWrap, sal::static_int_cast<sal_uInt16>( nPage ) );
             aFlashExporter.Flush();
             xOutputStreamWrap.clear();
 
@@ -453,10 +453,10 @@ sal_Bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue
     if (bExportAll)
         osl_closeFile(xBackgroundConfig);
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >& aDescriptor)
+bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >& aDescriptor)
 {
     Reference < XOutputStream > xOutputStream = findPropertyValue<Reference<XOutputStream> >(aDescriptor, "OutputStream", 0);
     Sequence< PropertyValue > aFilterData;
@@ -464,7 +464,7 @@ sal_Bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >&
     if (!xOutputStream.is() )
     {
         OSL_ASSERT ( false );
-        return sal_False;
+        return false;
     }
 
     FlashExporter aFlashExporter(
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx
index 507de6fc7b18..9ce5f7867d72 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -316,7 +316,7 @@ sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf, sal_Int16 x, sal_Int16
         CharacterIdVector::iterator aIter( maShapeIds.begin() );
         const CharacterIdVector::iterator aEnd( maShapeIds.end() );
 
-        sal_Bool bHaveShapes = aIter != aEnd;
+        bool bHaveShapes = aIter != aEnd;
 
         if (bHaveShapes)
         {
diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx
index c65388feda4b..2d0a4aa4fabe 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -339,10 +339,10 @@ private:
     void Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal_uInt32 nJpgDataLength, sal_uInt8 *pCompressed, sal_uInt32 compressed_size );
     void Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon);
     void Impl_writeActions( const GDIMetaFile& rMtf );
-    void Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled );
-    void Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled, const Color& rFillColor, const Color& rLineColor );
-    void Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFilled, sal_uInt8 nTransparence = 0);
-    void Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFilled, const Color& rFillColor, const Color& rLineColor );
+    void Impl_writePolygon( const Polygon& rPoly, bool bFilled );
+    void Impl_writePolygon( const Polygon& rPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor );
+    void Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, sal_uInt8 nTransparence = 0);
+    void Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor );
     void Impl_writeText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth );
     void Impl_writeText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth, Color aTextColor );
     void Impl_writeGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient );
@@ -354,9 +354,9 @@ private:
 
     FlashFont& Impl_getFont( const Font& rFont );
 
-    static void Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, sal_Bool bFilled );
+    static void Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, bool bFilled );
 
-    static void Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int16 dy, sal_Bool bFilled );
+    static void Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int16 dy, bool bFilled );
     static void Impl_addStraightEdgeRecord( BitStream& rBits, sal_Int16 dx, sal_Int16 dy );
     static void Impl_addCurvedEdgeRecord( BitStream& rBits, sal_Int16 control_dx, sal_Int16 control_dy, sal_Int16 anchor_dx, sal_Int16 anchor_dy );
     static void Impl_addEndShapeRecord( BitStream& rBits );
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index c8bc2e885583..40d787cd4b17 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -120,7 +120,7 @@ sal_Int32 Writer::mapRelative( sal_Int32 n100thMM ) const
 
 /**
 */
-void Writer::Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, sal_Bool bFilled )
+void Writer::Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, bool bFilled )
 {
     Point aLastPoint( rPoly[0] );
 
@@ -177,13 +177,13 @@ void Writer::Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, sal_Bool b
 
 /** exports a style change record with a move to (x,y) and depending on bFilled a line style 1 or fill style 1
 */
-void Writer::Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int16 dy, sal_Bool bFilled )
+void Writer::Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int16 dy, bool bFilled )
 {
     rBits.writeUB( 0, 1 );          // TypeFlag
     rBits.writeUB( 0, 1 );          // StateNewStyles
     rBits.writeUB( sal_uInt32(!bFilled), 1 ); // StateLineStyle
     rBits.writeUB( 0, 1 );          // StateFillStyle0
-    rBits.writeUB( bFilled, 1 );        // StateFillStyle1
+    rBits.writeUB( bFilled ? 0 : 1, 1 );        // StateFillStyle1
     rBits.writeUB( 1, 1 );          // StateMoveTo
 
     sal_uInt16 nMoveBits = max( getMaxBitsSigned( dx ), getMaxBitsSigned( dy ) );
@@ -264,7 +264,7 @@ void Writer::Impl_addEndShapeRecord( BitStream& rBits )
 
 
 
-void Writer::Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled )
+void Writer::Impl_writePolygon( const Polygon& rPoly, bool bFilled )
 {
     PolyPolygon aPolyPoly( rPoly );
     Impl_writePolyPolygon( aPolyPoly, bFilled );
@@ -272,7 +272,7 @@ void Writer::Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled )
 
 
 
-void Writer::Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled, const Color& rFillColor, const Color& rLineColor )
+void Writer::Impl_writePolygon( const Polygon& rPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor )
 {
     PolyPolygon aPolyPoly( rPoly );
     Impl_writePolyPolygon( aPolyPoly, bFilled, rFillColor, rLineColor );
@@ -280,7 +280,7 @@ void Writer::Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled, const Co
 
 
 
-void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFilled, sal_uInt8 nTransparence /* = 0 */ )
+void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, sal_uInt8 nTransparence /* = 0 */ )
 {
     Color aLineColor( mpVDev->GetLineColor() );
     if( 0 == aLineColor.GetTransparency() )
@@ -293,7 +293,7 @@ void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFill
 
 
 
-void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFilled, const Color& rFillColor, const Color& rLineColor )
+void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor )
 {
     PolyPolygon aPolyPoly( rPolyPoly );
 
@@ -523,7 +523,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal
         PolyPolygon aPolyPoygon;
         mpVDev->GetTextOutline( aPolyPoygon, rText, 0, 0, (sal_uInt16)nLen, true, nWidth, pDXArray );
         aPolyPoygon.Translate( rPos );
-        Impl_writePolyPolygon( aPolyPoygon, sal_True, aTextColor, aTextColor );
+        Impl_writePolyPolygon( aPolyPoygon, true, aTextColor, aTextColor );
     }
     else
     {
@@ -698,7 +698,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal
                 aPoly[ 3 ].X() = aPoly[ 0 ].X();
                 aPoly[ 3 ].Y() = aPoly[ 2 ].Y();
 
-                Impl_writePolygon( aPoly, sal_True, aTextColor, aTextColor );
+                Impl_writePolygon( aPoly, true, aTextColor, aTextColor );
             }
 
             // AS: The factor of 1.5 on the nLineHeight is a magic number.  I'm not sure why it works,
@@ -714,7 +714,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal
                 aPoly[ 3 ].X() = aPoly[ 0 ].X();
                 aPoly[ 3 ].Y() = aPoly[ 2 ].Y();
 
-                Impl_writePolygon( aPoly, sal_True, aTextColor, aTextColor );
+                Impl_writePolygon( aPoly, true, aTextColor, aTextColor );
             }
         }
 
@@ -1355,7 +1355,7 @@ void Writer::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegf
             for(sal_uInt32 a(0); a < aLinePolyPolygon.count(); a++)
             {
                 const basegfx::B2DPolygon aCandidate(aLinePolyPolygon.getB2DPolygon(a));
-                Impl_writePolygon(Polygon(aCandidate), sal_False );
+                Impl_writePolygon(Polygon(aCandidate), false );
             }
         }
 
@@ -1370,7 +1370,7 @@ void Writer::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegf
             for(sal_uInt32 a(0); a < aFillPolyPolygon.count(); a++)
             {
                 const Polygon aPolygon(aFillPolyPolygon.getB2DPolygon(a));
-                Impl_writePolyPolygon(PolyPolygon(Polygon(aPolygon)), sal_True );
+                Impl_writePolyPolygon(PolyPolygon(Polygon(aPolygon)), true );
             }
 
             mpVDev->SetLineColor(aOldLineColor);
@@ -1487,7 +1487,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
 
                 if( aPoly.GetSize() )
                 {
-                    Impl_writePolygon( aPoly, sal_True );
+                    Impl_writePolygon( aPoly, true );
                 }
             }
             break;
@@ -1501,7 +1501,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
                 {
                     if(pA->GetLineInfo().IsDefault())
                     {
-                        Impl_writePolygon( rPoly, sal_False );
+                        Impl_writePolygon( rPoly, false );
                     }
                     else
                     {
@@ -1518,7 +1518,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
                 const PolyPolygon&              rPolyPoly = pA->GetPolyPolygon();
 
                 if( rPolyPoly.Count() )
-                    Impl_writePolyPolygon( rPolyPoly, sal_True );
+                    Impl_writePolyPolygon( rPolyPoly, true );
             }
             break;
 
@@ -1557,7 +1557,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
                 {
                     // convert transparence from percent into 0x00 - 0xff
                     sal_uInt8 nTransparence = (sal_uInt8) MinMax( FRound( pA->GetTransparence() * 2.55 ), 0, 255 );
-                    Impl_writePolyPolygon( rPolyPoly, sal_True, nTransparence );
+                    Impl_writePolyPolygon( rPolyPoly, true, nTransparence );
                 }
             }
             break;
@@ -1604,7 +1604,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
             {
                 const MetaEPSAction*    pA = (const MetaEPSAction*) pAction;
                 const GDIMetaFile       aGDIMetaFile( pA->GetSubstitute() );
-                sal_Bool                bFound = sal_False;
+                bool                bFound = false;
 
                 for( size_t j = 0, nC = aGDIMetaFile.GetActionSize(); ( j < nC ) && !bFound; j++ )
                 {
@@ -1612,7 +1612,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
 
                     if( pSubstAct->GetType() == META_BMPSCALE_ACTION )
                     {
-                        bFound = sal_True;
+                        bFound = true;
                         const MetaBmpScaleAction* pBmpScaleAction = (const MetaBmpScaleAction*) pSubstAct;
                         Impl_writeImage( pBmpScaleAction->GetBitmap(),
                                       pA->GetPoint(), pA->GetSize(),
@@ -1630,7 +1630,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
                 if( pA->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_BEGIN") )
                 {
                     const MetaGradientExAction* pGradAction = NULL;
-                    sal_Bool                    bDone = sal_False;
+                    bool                    bDone = false;
 
                     while( !bDone && ( ++i < nCount ) )
                     {
@@ -1641,7 +1641,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
                         else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
                                  ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_END") ) )
                         {
-                            bDone = sal_True;
+                            bDone = true;
                         }
                     }