xmloff: sal_Bool->bool

Change-Id: Idc7b0ef2591e65e82903d55af68434acbeca0e55

10 files changed, 60 insertions, 60 deletions

diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index f15c8fab3d86..66b342240874 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -164,13 +164,13 @@ private:
     UniReference< XMLAnimationsExporter >       mxAnimationsExporter;
     ShapesInfos                                 maShapesInfos;
     ShapesInfos::iterator                       maCurrentShapesIter;
-    sal_Bool                                    mbExportLayer;
+    bool                                        mbExportLayer;
     ImplXMLShapeExportInfoVector                maShapeInfos;
     ImplXMLShapeExportInfoVector::iterator      maCurrentInfo;
-    OUString                               msPresentationStylePrefix;
+    OUString                                    msPresentationStylePrefix;
 
     // #88546# possibility to swich progress bar handling on/off
-    sal_Bool                                    mbHandleProgressBar;
+    bool                                        mbHandleProgressBar;
 
     rtl::Reference< XMLTableExport >            mxShapeTableExport;
 
@@ -212,7 +212,7 @@ private:
     SAL_DLLPRIVATE void ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& rMatrix, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet);
     SAL_DLLPRIVATE void ImpExportNewTrans_DecomposeAndRefPoint(const ::basegfx::B2DHomMatrix& rMat, ::basegfx::B2DTuple& rTRScale, double& fTRShear, double& fTRRotate, ::basegfx::B2DTuple& rTRTranslate, com::sun::star::awt::Point* pRefPoint);
     SAL_DLLPRIVATE void ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTRScale, double fTRShear, double fTRRotate, ::basegfx::B2DTuple& rTRTranslate, const sal_Int32 nFeatures);
-    SAL_DLLPRIVATE sal_Bool ImpExportPresentationAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet, const OUString& rClass );
+    SAL_DLLPRIVATE bool ImpExportPresentationAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet, const OUString& rClass );
     SAL_DLLPRIVATE void ImpExportText( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
     SAL_DLLPRIVATE void ImpExportEvents( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
     SAL_DLLPRIVATE void ImpExportDescription( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); // #i68101#
@@ -295,13 +295,13 @@ public:
     /// returns the export property mapper for external chaining
     static SvXMLExportPropertyMapper* CreateShapePropMapper( SvXMLExport& rExport );
 
-    void enableLayerExport( sal_Bool bEnable = sal_True ) { mbExportLayer = bEnable; }
-    sal_Bool IsLayerExportEnabled() const { return mbExportLayer; }
+    void enableLayerExport( bool bEnable = true ) { mbExportLayer = bEnable; }
+    bool IsLayerExportEnabled() const { return mbExportLayer; }
 
     // #88546#
     /** defines if the export should increment the progress bar or not */
-    void enableHandleProgressBar( sal_Bool bEnable = sal_True ) { mbHandleProgressBar = bEnable; }
-    sal_Bool IsHandleProgressBarEnabled() const { return mbHandleProgressBar; }
+    void enableHandleProgressBar( bool bEnable = true ) { mbHandleProgressBar = bEnable; }
+    bool IsHandleProgressBarEnabled() const { return mbHandleProgressBar; }
 
     void setPresentationStylePrefix( const OUString& rPrefix ) { msPresentationStylePrefix = rPrefix; }
 
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 15efd3702e19..d0ffcab3aad1 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -194,8 +194,8 @@ public:
 
     sal_Int32 GetDiffuseColor() { return maDiffuseColor; }
     const ::basegfx::B3DVector& GetDirection() { return maDirection; }
-    sal_Bool GetEnabled() { return mbEnabled; }
-    sal_Bool GetSpecular() { return mbSpecular; }
+    bool GetEnabled() { return mbEnabled; }
+    bool GetSpecular() { return mbSpecular; }
 };
 
 
@@ -212,7 +212,7 @@ protected:
 
     // local parameters which need to be read
     com::sun::star::drawing::HomogenMatrix mxHomMat;
-    sal_Bool                        mbSetTransform;
+    bool                        mbSetTransform;
 
     com::sun::star::drawing::ProjectionMode mxPrjMode;
     sal_Int32                   mnDistance;
@@ -225,9 +225,9 @@ protected:
     ::basegfx::B3DVector        maVRP;
     ::basegfx::B3DVector        maVPN;
     ::basegfx::B3DVector        maVUP;
-    sal_Bool                        mbVRPUsed;
-    sal_Bool                        mbVPNUsed;
-    sal_Bool                        mbVUPUsed;
+    bool                        mbVRPUsed;
+    bool                        mbVPNUsed;
+    bool                        mbVUPUsed;
 
 public:
     SdXML3DSceneAttributesHelper( SvXMLImport& rImporter );
@@ -249,12 +249,12 @@ class SvXMLShapeContext : public SvXMLImportContext
 {
 protected:
     com::sun::star::uno::Reference< com::sun::star::drawing::XShape >   mxShape;
-    sal_Bool                                                            mbTemporaryShape;
+    bool                                                            mbTemporaryShape;
     OUString                                                       msHyperlink;
 
 public:
     SvXMLShapeContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
-        const OUString& rLName, sal_Bool bTemporaryShape ) : SvXMLImportContext( rImp, nPrfx, rLName ), mbTemporaryShape(bTemporaryShape) {}
+        const OUString& rLName, bool bTemporaryShape ) : SvXMLImportContext( rImp, nPrfx, rLName ), mbTemporaryShape(bTemporaryShape) {}
 
     TYPEINFO_OVERRIDE();
 
@@ -320,7 +320,7 @@ public:
         SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
-        sal_Bool bTemporaryShape = sal_False);
+        bool bTemporaryShape = false);
 
     SvXMLShapeContext* CreateFrameChildContext(
         SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName,
@@ -378,7 +378,7 @@ public:
                                sal_Int32 nZIndex );
 
     void addShapeConnection( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rConnectorShape,
-                             sal_Bool bStart,
+                             bool bStart,
                              const OUString& rDestShapeId,
                              sal_Int32 nDestGlueId );
 
@@ -415,11 +415,11 @@ public:
 
     // #88546#
     /** defines if the import should increment the progress bar or not */
-    void enableHandleProgressBar( sal_Bool bEnable = sal_True );
-    sal_Bool IsHandleProgressBarEnabled() const;
+    void enableHandleProgressBar( bool bEnable = true );
+    bool IsHandleProgressBarEnabled() const;
 
     /** queries the capability of the current model to create presentation shapes */
-    sal_Bool IsPresentationShapesSupported();
+    bool IsPresentationShapesSupported();
 
     XMLSdPropHdlFactory* GetSdPropHdlFactory() const { return mpSdPropHdlFactory; }
 
diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx
index 95ad053e7ae6..c58fc7f2d2c3 100644
--- a/include/xmloff/styleexp.hxx
+++ b/include/xmloff/styleexp.hxx
@@ -69,7 +69,7 @@ private:
 
 protected:
 
-    virtual sal_Bool exportStyle(
+    virtual bool exportStyle(
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::style::XStyle > & rStyle,
         const OUString& rXMLFamily,
@@ -94,16 +94,16 @@ public:
 //  void exportStyleFamily(
 //      const OUString& rFamily, const OUString& rXMLFamily,
 //      const UniReference < XMLPropertySetMapper >& rPropMapper,
-//      sal_Bool bUsed, sal_uInt16 nFamily = 0,
+//      bool bUsed, sal_uInt16 nFamily = 0,
 //      const OUString* pPrefix = 0L);
 
 //  void exportStyleFamily(
 //      const sal_Char *pFamily, const OUString& rXMLFamily,
 //      const UniReference < XMLPropertySetMapper >& rPropMapper,
-//      sal_Bool bUsed, sal_uInt16 nFamily = 0,
+//      bool bUsed, sal_uInt16 nFamily = 0,
 //      const OUString* pPrefix = 0L);
 
-    virtual sal_Bool exportDefaultStyle(
+    virtual bool exportDefaultStyle(
         const ::com::sun::star::uno::Reference<
                 ::com::sun::star::beans::XPropertySet > & xPropSet,
         const OUString& rXMLFamily,
@@ -112,13 +112,13 @@ public:
     void exportStyleFamily(
         const OUString& rFamily, const OUString& rXMLFamily,
         const UniReference < SvXMLExportPropertyMapper >& rPropMapper,
-        sal_Bool bUsed, sal_uInt16 nFamily = 0,
+        bool bUsed, sal_uInt16 nFamily = 0,
         const OUString* pPrefix = 0L);
 
     void exportStyleFamily(
         const sal_Char *pFamily, const OUString& rXMLFamily,
         const UniReference < SvXMLExportPropertyMapper >& rPropMapper,
-        sal_Bool bUsed, sal_uInt16 nFamily = 0,
+        bool bUsed, sal_uInt16 nFamily = 0,
         const OUString* pPrefix = 0L);
 };
 
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 9a0514a598f1..cd00dd42a5e8 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1730,7 +1730,7 @@ void SdXMLExport::ImpWritePresentationStyles()
                     aPrefix += "-";
                     aStEx.exportStyleFamily(xNamed->getName(),
                         OUString(XML_STYLE_FAMILY_SD_PRESENTATION_NAME),
-                        aMapperRef, sal_False,
+                        aMapperRef, false,
                         XML_STYLE_FAMILY_SD_PRESENTATION_ID, &aPrefix);
                 }
             }
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 9bd4258ae326..d43da5c4c9ee 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -121,9 +121,9 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp,
 :   mrExport( rExp ),
     maShapesInfos(),
     maCurrentShapesIter(maShapesInfos.end()),
-    mbExportLayer( sal_False ),
+    mbExportLayer( false ),
     // #88546# init to sal_False
-    mbHandleProgressBar( sal_False ),
+    mbHandleProgressBar( false ),
     msZIndex( "ZOrder" ),
     msPrintable( "Printable" ),
     msVisible( "Visible" ),
@@ -1246,7 +1246,7 @@ void XMLShapeExport::ExportGraphicDefaults()
                 aStEx.exportDefaultStyle( xDefaults, OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), xPropertySetMapper );
 
                 // write graphic family styles
-                aStEx.exportStyleFamily("graphics", OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), xPropertySetMapper, sal_False, XML_STYLE_FAMILY_SD_GRAPHICS_ID);
+                aStEx.exportStyleFamily("graphics", OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), xPropertySetMapper, false, XML_STYLE_FAMILY_SD_GRAPHICS_ID);
             }
         }
         catch(const lang::ServiceNotRegisteredException&)
@@ -1435,9 +1435,9 @@ void XMLShapeExport::ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTR
     }
 }
 
-sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< beans::XPropertySet >& xPropSet, const OUString& rClass )
+bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< beans::XPropertySet >& xPropSet, const OUString& rClass )
 {
-    sal_Bool bIsEmpty = sal_False;
+    bool bIsEmpty = false;
 
     // write presentation class entry
     mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_CLASS, rClass);
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 3a20ad8bfd8f..5d5521c8a325 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -59,8 +59,8 @@ typedef std::map<sal_Int32,com::sun::star::uno::Reference< com::sun::star::drawi
 struct ConnectionHint
 {
     com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxConnector;
-    sal_Bool  bStart;
-    OUString aDestShapeId;
+    bool      bStart;
+    OUString  aDestShapeId;
     sal_Int32 nDestGlueId;
 };
 
@@ -101,10 +101,10 @@ struct XMLShapeImportHelperImpl
     std::vector<ConnectionHint> maConnections;
 
     // #88546# possibility to swich progress bar handling on/off
-    sal_Bool                    mbHandleProgressBar;
+    bool                        mbHandleProgressBar;
 
     // stores the capability of the current model to create presentation shapes
-    sal_Bool                    mbIsPresentationShapesSupported;
+    bool                        mbIsPresentationShapesSupported;
 };
 
 XMLShapeImportHelper::XMLShapeImportHelper(
@@ -140,7 +140,7 @@ XMLShapeImportHelper::XMLShapeImportHelper(
     mpImpl->mpSortContext = 0;
 
     // #88546# init to sal_False
-    mpImpl->mbHandleProgressBar = sal_False;
+    mpImpl->mbHandleProgressBar = false;
 
     mpSdPropHdlFactory = new XMLSdPropHdlFactory( rModel, rImporter );
 
@@ -483,7 +483,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext(
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes,
-    sal_Bool bTemporaryShape)
+    bool bTemporaryShape)
 {
     SdXMLShapeContext *pContext = 0L;
 
@@ -951,7 +951,7 @@ void XMLShapeImportHelper::shapeWithZIndexAdded( com::sun::star::uno::Reference<
 }
 
 void XMLShapeImportHelper::addShapeConnection( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rConnectorShape,
-                         sal_Bool bStart,
+                         bool bStart,
                          const OUString& rDestShapeId,
                          sal_Int32 nDestGlueId )
 {
@@ -1129,18 +1129,18 @@ rShapes
 
 // #88546#
 /** defines if the import should increment the progress bar or not */
-void XMLShapeImportHelper::enableHandleProgressBar( sal_Bool bEnable )
+void XMLShapeImportHelper::enableHandleProgressBar( bool bEnable )
 {
     mpImpl->mbHandleProgressBar = bEnable;
 }
 
-sal_Bool XMLShapeImportHelper::IsHandleProgressBarEnabled() const
+bool XMLShapeImportHelper::IsHandleProgressBarEnabled() const
 {
     return mpImpl->mbHandleProgressBar;
 }
 
 /** queries the capability of the current model to create presentation shapes */
-sal_Bool XMLShapeImportHelper::IsPresentationShapesSupported()
+bool XMLShapeImportHelper::IsPresentationShapesSupported()
 {
     return mpImpl->mbIsPresentationShapesSupported;
 }
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index 9ea80f0f0105..7465fa308056 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -200,7 +200,7 @@ SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( sal_uInt16 nPr
 
 SdXML3DSceneAttributesHelper::SdXML3DSceneAttributesHelper( SvXMLImport& rImporter )
 :   mrImport( rImporter ),
-    mbSetTransform( sal_False ),
+    mbSetTransform( false ),
     mxPrjMode(drawing::ProjectionMode_PERSPECTIVE),
     mnDistance(1000),
     mnFocalLength(1000),
@@ -211,9 +211,9 @@ SdXML3DSceneAttributesHelper::SdXML3DSceneAttributesHelper( SvXMLImport& rImport
     maVRP(0.0, 0.0, 1.0),
     maVPN(0.0, 0.0, 1.0),
     maVUP(0.0, 1.0, 0.0),
-    mbVRPUsed(sal_False),
-    mbVPNUsed(sal_False),
-    mbVUPUsed(sal_False)
+    mbVRPUsed(false),
+    mbVPNUsed(false),
+    mbVUPUsed(false)
 {
 }
 
@@ -260,7 +260,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co
             if(aNewVec != maVRP)
             {
                 maVRP = aNewVec;
-                mbVRPUsed = sal_True;
+                mbVRPUsed = true;
             }
             return;
         }
@@ -272,7 +272,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co
             if(aNewVec != maVPN)
             {
                 maVPN = aNewVec;
-                mbVPNUsed = sal_True;
+                mbVPNUsed = true;
             }
             return;
         }
@@ -284,7 +284,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co
             if(aNewVec != maVUP)
             {
                 maVUP = aNewVec;
-                mbVUPUsed = sal_True;
+                mbVUPUsed = true;
             }
             return;
         }
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 8ba56a37d23b..a41a10c07d9f 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -2021,9 +2021,9 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA
 
             // add connection ids
             if( !maStartShapeId.isEmpty() )
-                GetImport().GetShapeImport()->addShapeConnection( mxShape, sal_True, maStartShapeId, mnStartGlueId );
+                GetImport().GetShapeImport()->addShapeConnection( mxShape, true, maStartShapeId, mnStartGlueId );
             if( !maEndShapeId.isEmpty() )
-                GetImport().GetShapeImport()->addShapeConnection( mxShape, sal_False, maEndShapeId, mnEndGlueId );
+                GetImport().GetShapeImport()->addShapeConnection( mxShape, false, maEndShapeId, mnEndGlueId );
 
             uno::Reference< beans::XPropertySet > xProps( mxShape, uno::UNO_QUERY );
             if( xProps.is() )
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 25211b5ebe61..5af7c127907c 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -78,7 +78,7 @@ void XMLStyleExport::exportStyleContent( const Reference< XStyle >& )
 {
 }
 
-sal_Bool XMLStyleExport::exportStyle(
+bool XMLStyleExport::exportStyle(
         const Reference< XStyle >& rStyle,
         const OUString& rXMLFamily,
         const UniReference < SvXMLExportPropertyMapper >& rPropMapper,
@@ -96,7 +96,7 @@ sal_Bool XMLStyleExport::exportStyle(
     {
         aAny = xPropSet->getPropertyValue( sIsPhysical );
         if( !*(sal_Bool *)aAny.getValue() )
-            return sal_False;
+            return false;
     }
 
     // <style:style ...>
@@ -330,10 +330,10 @@ sal_Bool XMLStyleExport::exportStyle(
         Reference<XEventsSupplier> xEventsSupp(rStyle, UNO_QUERY);
         GetExport().GetEventExport().Export(xEventsSupp);
     }
-    return sal_True;
+    return true;
 }
 
-sal_Bool XMLStyleExport::exportDefaultStyle(
+bool XMLStyleExport::exportDefaultStyle(
         const Reference< XPropertySet >& xPropSet,
           const OUString& rXMLFamily,
         const UniReference < SvXMLExportPropertyMapper >& rPropMapper )
@@ -359,14 +359,14 @@ sal_Bool XMLStyleExport::exportDefaultStyle(
         rPropMapper->exportXML( GetExport(), xPropStates,
                                      XML_EXPORT_FLAG_IGN_WS );
     }
-    return sal_True;
+    return true;
 }
 
 void XMLStyleExport::exportStyleFamily(
     const sal_Char *pFamily,
     const OUString& rXMLFamily,
     const UniReference < SvXMLExportPropertyMapper >& rPropMapper,
-    sal_Bool bUsed, sal_uInt16 nFamily, const OUString* pPrefix)
+    bool bUsed, sal_uInt16 nFamily, const OUString* pPrefix)
 {
     const OUString sFamily(OUString::createFromAscii(pFamily ));
     exportStyleFamily( sFamily, rXMLFamily, rPropMapper, bUsed, nFamily,
@@ -376,7 +376,7 @@ void XMLStyleExport::exportStyleFamily(
 void XMLStyleExport::exportStyleFamily(
     const OUString& rFamily, const OUString& rXMLFamily,
     const UniReference < SvXMLExportPropertyMapper >& rPropMapper,
-    sal_Bool bUsed, sal_uInt16 nFamily, const OUString* pPrefix)
+    bool bUsed, sal_uInt16 nFamily, const OUString* pPrefix)
 {
     DBG_ASSERT( GetExport().GetModel().is(), "There is the model?" );
     Reference< XStyleFamiliesSupplier > xFamiliesSupp( GetExport().GetModel(), UNO_QUERY );
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 4054fc559cc4..966970290335 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -450,7 +450,7 @@ void XMLTableExport::exportTableStyles()
     XMLStyleExport aStEx(mrExport, OUString(), mrExport.GetAutoStylePool().get());
 
     // write graphic family styles
-    aStEx.exportStyleFamily("cell", OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME), mxCellExportPropertySetMapper.get(), sal_True, XML_STYLE_FAMILY_TABLE_CELL);
+    aStEx.exportStyleFamily("cell", OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME), mxCellExportPropertySetMapper.get(), true, XML_STYLE_FAMILY_TABLE_CELL);
 
     exportTableTemplates();
 }