xmloff: sal_Bool->bool

Change-Id: I1c97da5b7bbac348150399afbf386613433e5551

9 files changed, 31 insertions, 33 deletions

diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx
index f33129787371..45ddee181e05 100644
--- a/include/xmloff/XMLTextShapeStyleContext.hxx
+++ b/include/xmloff/XMLTextShapeStyleContext.hxx
@@ -56,7 +56,7 @@ public:
 
     bool IsAutoUpdate() const { return bAutoUpdate; }
 
-    virtual void CreateAndInsert( sal_Bool bOverwrite ) SAL_OVERRIDE;
+    virtual void CreateAndInsert( bool bOverwrite ) SAL_OVERRIDE;
 
     virtual void Finish( bool bOverwrite ) SAL_OVERRIDE;
 };
diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx
index 92828adcffe7..91336749f2ec 100644
--- a/include/xmloff/formlayerexport.hxx
+++ b/include/xmloff/formlayerexport.hxx
@@ -74,7 +74,7 @@ namespace xmloff
             @see getControlId
             @see examineForms
         */
-        sal_Bool seekPage(
+        bool seekPage(
             const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage);
 
         /** get the id for the given control
diff --git a/include/xmloff/i18nmap.hxx b/include/xmloff/i18nmap.hxx
index b8091ac5751c..c790aff77060 100644
--- a/include/xmloff/i18nmap.hxx
+++ b/include/xmloff/i18nmap.hxx
@@ -36,13 +36,13 @@ public:
     {
     }
 
-    sal_Bool operator==( const SvI18NMapEntry_Key& r ) const
+    bool operator==( const SvI18NMapEntry_Key& r ) const
     {
         return nKind == r.nKind &&
                aName == r.aName;
     }
 
-    sal_Bool operator<( const SvI18NMapEntry_Key& r ) const
+    bool operator<( const SvI18NMapEntry_Key& r ) const
     {
         return nKind < r.nKind ||
                ( nKind == r.nKind &&
diff --git a/include/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx
index 19e72295c873..08340cf965ba 100644
--- a/include/xmloff/nmspmap.hxx
+++ b/include/xmloff/nmspmap.hxx
@@ -52,8 +52,7 @@ public:
 
 struct OUStringEqFunc
 {
-    sal_Bool operator()( const OUString &r1,
-                         const OUString &r2) const
+    bool operator()( const OUString &r1, const OUString &r2) const
     {
         return r1 == r2;
     }
@@ -61,8 +60,7 @@ struct OUStringEqFunc
 
 struct uInt32lt
 {
-    sal_Bool operator()( const sal_uInt32 &r1,
-                         const sal_uInt32 &r2) const
+    bool operator()( const sal_uInt32 &r1, const sal_uInt32 &r2) const
     {
         return r1 < r2;
     }
@@ -116,7 +114,7 @@ public:
 
     OUString GetQNameByKey( sal_uInt16 nKey,
                            const OUString& rLocalName,
-                           sal_Bool bCache = sal_True) const;
+                           bool bCache = true) const;
 
     OUString GetAttrNameByKey( sal_uInt16 nKey ) const;
 
@@ -125,12 +123,12 @@ public:
                              OUString *pPrefix,
                              OUString *pLocalName,
                              OUString *pNamespace = 0,
-                             sal_Bool bCache = sal_True) const;
+                             bool bCache = true) const;
 
     /* This will replace the version with the unused 3rd default parameter */
     sal_uInt16 _GetKeyByAttrName( const OUString& rAttrName,
                              OUString *pLocalName = 0,
-                             sal_Bool bCache = sal_True) const;
+                             bool bCache = true) const;
 
     sal_uInt16 GetFirstKey() const;
     sal_uInt16 GetNextKey( sal_uInt16 nOldKey ) const;
@@ -140,11 +138,11 @@ public:
        This might be replaced by a better interface later. */
     const NameSpaceHash& GetAllEntries() const { return aNameHash; }
 
-    static sal_Bool NormalizeOasisURN( OUString& rName );
-    static sal_Bool NormalizeW3URI( OUString& rName );
-    static sal_Bool NormalizeURI( OUString& rName );
+    static bool NormalizeOasisURN( OUString& rName );
+    static bool NormalizeW3URI( OUString& rName );
+    static bool NormalizeURI( OUString& rName );
 
-/* deprecated */ sal_Bool AddAtIndex( sal_uInt16 nIdx, const OUString& rPrefix,
+/* deprecated */ bool AddAtIndex( sal_uInt16 nIdx, const OUString& rPrefix,
                      const OUString& rName, sal_uInt16 nKey = XML_NAMESPACE_UNKNOWN );
 /* deprecated */ sal_uInt16 GetIndexByKey( sal_uInt16 nKey ) const;
 /* deprecated */ sal_uInt16 GetIndexByPrefix( const OUString& rPrefix ) const;
diff --git a/include/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx
index ef1bd800b6d1..a90a2b72ac2d 100644
--- a/include/xmloff/numehelp.hxx
+++ b/include/xmloff/numehelp.hxx
@@ -36,7 +36,7 @@ struct XMLNumberFormat
     OUString   sCurrency;
     sal_Int32       nNumberFormat;
     sal_Int16       nType;
-    sal_Bool        bIsStandard : 1;
+    bool            bIsStandard : 1;
     XMLNumberFormat() : nNumberFormat(0), nType(0) {}
     XMLNumberFormat(const OUString& sTempCurrency, sal_Int32 nTempFormat,
         sal_Int16 nTempType) : sCurrency(sTempCurrency), nNumberFormat(nTempFormat),
@@ -45,7 +45,7 @@ struct XMLNumberFormat
 
 struct LessNumberFormat
 {
-    sal_Bool operator() (const XMLNumberFormat& rValue1, const XMLNumberFormat& rValue2) const
+    bool operator() (const XMLNumberFormat& rValue1, const XMLNumberFormat& rValue2) const
     {
         return rValue1.nNumberFormat < rValue2.nNumberFormat;
     }
@@ -81,35 +81,35 @@ public :
                                 const sal_Int16 nTypeKey,
                                 const double& rValue,
                                 const OUString& rCurrencySymbol,
-                                sal_Bool bExportValue = sal_True);
-    static sal_Bool GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& rCurrencySymbol,
+                                bool bExportValue = true);
+    static bool GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& rCurrencySymbol,
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier);
-    static sal_Int16 GetCellType(const sal_Int32 nNumberFormat, sal_Bool& bIsStandard,
+    static sal_Int16 GetCellType(const sal_Int32 nNumberFormat, bool& bIsStandard,
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier);
     static void SetNumberFormatAttributes(SvXMLExport& rXMLExport,
                                           const sal_Int32 nNumberFormat,
                                           const double& rValue,
-                                          sal_Bool bExportValue = sal_True);
+                                          bool bExportValue = true);
     static void SetNumberFormatAttributes(SvXMLExport& rXMLExport,
                                           const OUString& rValue,
                                           const OUString& rCharacters,
-                                          sal_Bool bExportValue = sal_True,
-                                          sal_Bool bExportTypeAttribute = sal_True);
+                                          bool bExportValue = true,
+                                          bool bExportTypeAttribute = true);
 
-    sal_Bool GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& rCurrencySymbol);
+    bool GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& rCurrencySymbol);
     sal_Int16 GetCellType(const sal_Int32 nNumberFormat, bool& bIsStandard);
     void WriteAttributes(const sal_Int16 nTypeKey,
                                           const double& rValue,
                                           const OUString& rCurrencySymbol,
-                                          sal_Bool bExportValue = sal_True, sal_uInt16 nNamespace = XML_NAMESPACE_OFFICE);
+                                          bool bExportValue = true, sal_uInt16 nNamespace = XML_NAMESPACE_OFFICE);
     void SetNumberFormatAttributes(const sal_Int32 nNumberFormat,
                                           const double& rValue,
-                                          sal_Bool bExportValue = sal_True,
+                                          bool bExportValue = true,
                                           sal_uInt16 nNamespace = XML_NAMESPACE_OFFICE, bool bExportCurrencySymbol = true);
     void SetNumberFormatAttributes(const OUString& rValue,
                                           const OUString& rCharacters,
-                                          sal_Bool bExportValue = sal_True,
-                                          sal_Bool bExportTypeAttribute = sal_True,
+                                          bool bExportValue = true,
+                                          bool bExportTypeAttribute = true,
                                           sal_uInt16 nNamespace = XML_NAMESPACE_OFFICE);
 };
 
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index 059ad70e28bd..4668668cf6de 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -66,7 +66,7 @@ public:
             const OUString& rLName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
             SvXMLStylesContext& rStyles, sal_uInt16 nFamily = 0,
-            sal_Bool bDefaultStyle=sal_False );
+            bool bDefaultStyle=false );
     virtual ~XMLPropStyleContext();
 
     virtual SvXMLImportContext *CreateChildContext(
@@ -90,7 +90,7 @@ public:
 
     virtual void SetDefaults() SAL_OVERRIDE;
 
-    virtual void CreateAndInsert( sal_Bool bOverwrite ) SAL_OVERRIDE;
+    virtual void CreateAndInsert( bool bOverwrite ) SAL_OVERRIDE;
     virtual void Finish( bool bOverwrite ) SAL_OVERRIDE;
 };
 
diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx
index bd34ed337f0e..feee55b2cc03 100644
--- a/include/xmloff/txtstyli.hxx
+++ b/include/xmloff/txtstyli.hxx
@@ -92,7 +92,7 @@ public:
     const OUString& GetDropCapStyleName() const { return sDropCapTextStyleName; }
     const OUString& GetDataStyleName() const { return sDataStyleName; }
 
-    virtual void CreateAndInsert( sal_Bool bOverwrite ) SAL_OVERRIDE;
+    virtual void CreateAndInsert( bool bOverwrite ) SAL_OVERRIDE;
     virtual void Finish( bool bOverwrite ) SAL_OVERRIDE;
     virtual void SetDefaults() SAL_OVERRIDE;
 
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index 1651716afae0..aabba99d17e4 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -175,7 +175,7 @@ public:
                                     const OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE;
-    virtual void CreateAndInsert(sal_Bool bOverwrite) SAL_OVERRIDE;
+    virtual void CreateAndInsert(bool bOverwrite) SAL_OVERRIDE;
     virtual void Finish(bool bOverwrite) SAL_OVERRIDE;
 
     SvXMLNumImpData* GetData() const                { return pData; }
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index e0932a284ff0..26f7ff8ac259 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -133,7 +133,7 @@ public:
 
     // This method is called for every style. It must create it and insert
     // it into the document.
-    virtual void CreateAndInsert( sal_Bool bOverwrite );
+    virtual void CreateAndInsert( bool bOverwrite );
 
     // This method is called for every style. It must create it and insert
     // it into the document if this hasn't happened already in CreateAndInsert().