xmloff: sal_Bool->bool

Change-Id: Id3d8f4f4ef32280a131907ffa32eb2ad5d6ea2e1

6 files changed, 54 insertions, 53 deletions

diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 7c7eef29fe12..b45ed3993c4b 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -484,7 +484,7 @@ public:
                             const OUString& rEmbeddedObjectURL );
 
     OUString EncodeStyleName( const OUString& rName,
-                                     sal_Bool *pEncoded=0 ) const;
+                                     bool *pEncoded=0 ) const;
 
     // save linked sections?
     inline bool IsSaveLinkedSections() { return mbSaveLinkedSections; }
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index 58071ec281d3..86b97264237f 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -42,8 +42,8 @@ class SvxXMLListStyleContext : public SvXMLStyleContext
     SvxXMLListStyle_Impl        *pLevelStyles;
 
     sal_Int32                   nLevels;
-    sal_Bool                    bConsecutive : 1;
-    sal_Bool                    bOutline : 1;
+    bool                        bConsecutive : 1;
+    bool                        bOutline : 1;
 
 protected:
 
@@ -60,7 +60,7 @@ public:
             const OUString& rLName,
             const ::com::sun::star::uno::Reference<
                     ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
-            sal_Bool bOutl=sal_False );
+            bool bOutl = false );
 
     virtual ~SvxXMLListStyleContext();
 
@@ -78,8 +78,8 @@ public:
     const ::com::sun::star::uno::Reference <
         ::com::sun::star::container::XIndexReplace >& GetNumRules() const
         { return xNumRules; }
-    sal_Bool IsOutline() const { return bOutline; }
-    sal_Bool IsConsecutive() const { return bConsecutive; }
+    bool IsOutline() const { return bOutline; }
+    bool IsConsecutive() const { return bConsecutive; }
     sal_Int32 GetLevels() const { return nLevels; }
 
     static ::com::sun::star::uno::Reference <
@@ -92,9 +92,9 @@ public:
         const ::com::sun::star::uno::Reference <
             ::com::sun::star::container::XIndexReplace > & rNumRule,
         sal_Int16 nLevel,
-        sal_Bool bOrdered );
+        bool bOrdered );
 
-    virtual void CreateAndInsertLate( sal_Bool bOverwrite ) SAL_OVERRIDE;
+    virtual void CreateAndInsertLate( bool bOverwrite ) SAL_OVERRIDE;
 
     void CreateAndInsertAuto() const;
 };
diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx
index 8a6b27623fdd..5f6d52c497c6 100644
--- a/include/xmloff/xmlprmap.hxx
+++ b/include/xmloff/xmlprmap.hxx
@@ -105,7 +105,7 @@ public:
 
     /** Returns the type of an entry */
     sal_uInt32 GetEntryType( sal_Int32 nIndex,
-                                   sal_Bool bWithFlags = sal_True ) const
+                             bool bWithFlags = true ) const
     {
         DBG_ASSERT( (nIndex >= 0) && (nIndex < (sal_Int32)aMapEntries.size() ), "illegal access to invalid entry!" );
         sal_uInt32 nType = aMapEntries[nIndex].nType;
@@ -165,10 +165,10 @@ public:
 
     /** import/export
         This methods calls the respective im/export-method of the respective PropertyHandler. */
-    virtual sal_Bool exportXML( OUString& rStrExpValue,
+    virtual bool exportXML( OUString& rStrExpValue,
                                 const XMLPropertyState& rProperty,
                                 const SvXMLUnitConverter& rUnitConverter ) const;
-    virtual sal_Bool importXML( const OUString& rStrImpValue,
+    virtual bool importXML( const OUString& rStrImpValue,
                                 XMLPropertyState& rProperty,
                                 const SvXMLUnitConverter& rUnitConverter ) const;
 
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 26f7ff8ac259..aaf6ce7f5c7e 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -64,20 +64,20 @@ class XMLOFF_DLLPUBLIC SvXMLStyleContext : public SvXMLImportContext
     OUString     maDisplayName;
     OUString     maAutoName;
     OUString     maParentName;// Will be moved to XMLPropStyle soon!!!!
-    OUString     maFollow;   // Will be moved to XMLPropStyle soon!!!!
-    sal_Bool            mbHidden;
+    OUString     maFollow;    // Will be moved to XMLPropStyle soon!!!!
+    bool         mbHidden;
 
-    OUString     maHelpFile; // Will be removed very soon!!!!
+    OUString     maHelpFile;  // Will be removed very soon!!!!
 
-    sal_uInt32          mnHelpId;   // Will be removed very soon!!!!
-    sal_uInt16          mnFamily;
+    sal_uInt32   mnHelpId;    // Will be removed very soon!!!!
+    sal_uInt16   mnFamily;
 
-    sal_Bool            mbValid : 1;    // Set this to false in CreateAndInsert
-                                    // if the style shouldn't be processed
-                                    // by Finish() or si somehow invalid.
-    sal_Bool            mbNew : 1;  // Set this to false in CreateAnsInsert
-                                    // if the style is already existing.
-    sal_Bool            mbDefaultStyle : 1;
+    bool         mbValid : 1; // Set this to false in CreateAndInsert
+                              // if the style shouldn't be processed
+                              // by Finish() or si somehow invalid.
+    bool         mbNew : 1;   // Set this to false in CreateAnsInsert
+                              // if the style is already existing.
+    bool         mbDefaultStyle : 1;
 
 protected:
 
@@ -95,8 +95,9 @@ public:
     SvXMLStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLName,
         const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
-    sal_uInt16 nFamily=0, sal_Bool bDefaultStyle = sal_False );
+              ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
+              sal_uInt16 nFamily=0,
+              bool bDefaultStyle = false );
 
     virtual ~SvXMLStyleContext();
 
@@ -120,13 +121,13 @@ public:
 
     sal_uInt16 GetFamily() const { return mnFamily; }
 
-    sal_Bool IsValid() const { return mbValid; }
-    void SetValid( sal_Bool b ) { mbValid = b; }
+    bool IsValid() const { return mbValid; }
+    void SetValid( bool b ) { mbValid = b; }
 
-    sal_Bool IsNew() const { return mbNew; }
-    void SetNew( sal_Bool b ) { mbNew = b; }
+    bool IsNew() const { return mbNew; }
+    void SetNew( bool b ) { mbNew = b; }
 
-    sal_Bool IsHidden() const { return mbHidden; }
+    bool IsHidden() const { return mbHidden; }
 
     // This method is called for every default style
     virtual void SetDefaults();
@@ -137,13 +138,13 @@ public:
 
     // 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().
-    virtual void CreateAndInsertLate( sal_Bool bOverwrite );
+    virtual void CreateAndInsertLate( bool bOverwrite );
 
     // This method is called fpr every style after all styles have been
     // inserted into the document.
     virtual void Finish( bool bOverwrite );
 
-    sal_Bool IsDefaultStyle() const { return mbDefaultStyle; }
+    bool IsDefaultStyle() const { return mbDefaultStyle; }
 
     /** if this method returns true, its parent styles context
         should not add it to its container.<br>
@@ -153,7 +154,7 @@ public:
         and Finish() will not be called.
         The default return value is false
     */
-    virtual sal_Bool IsTransient() const;
+    virtual bool IsTransient() const;
 };
 
 class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext
@@ -219,7 +220,7 @@ public:
         const OUString& rLName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
-        sal_Bool bAutomatic = sal_False );
+        bool bAutomatic = false );
 
     virtual ~SvXMLStylesContext();
 
@@ -238,7 +239,7 @@ public:
     const SvXMLStyleContext *FindStyleChildContext(
                                       sal_uInt16 nFamily,
                                       const OUString& rName,
-                                      sal_Bool bCreateIndex=sal_False ) const;
+                                      bool bCreateIndex = false ) const;
     virtual sal_uInt16 GetFamily( const OUString& rFamily ) const;
     virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper(
                         sal_uInt16 nFamily ) const;
@@ -251,13 +252,13 @@ public:
        virtual ::com::sun::star::uno::Reference < ::com::sun::star::style::XAutoStyleFamily >
         GetAutoStyles( sal_uInt16 nFamily ) const;
     void CopyAutoStylesToDoc();
-    void CopyStylesToDoc( sal_Bool bOverwrite, sal_Bool bFinish=sal_True );
-    void FinishStyles( sal_Bool bOverwrite );
+    void CopyStylesToDoc( bool bOverwrite, bool bFinish = true );
+    void FinishStyles( bool bOverwrite );
 
     // This method must be called to release the references to all styles
     // that are stored in the context.
     void Clear();
-    sal_Bool IsAutomaticStyle() const;
+    bool IsAutomaticStyle() const;
 };
 
 #endif // INCLUDED_XMLOFF_XMLSTYLE_HXX
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 6f6ad44f762e..c934912203d5 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3247,7 +3247,7 @@ namespace xmloff { namespace token {
         enum XMLTokenEnum eToken );
 
     /// compare eToken to the string
-    XMLOFF_DLLPUBLIC sal_Bool IsXMLToken(
+    XMLOFF_DLLPUBLIC bool IsXMLToken(
         const OUString& rString,
         enum XMLTokenEnum eToken );
 } }
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index 1ea19a756f11..29a5e37b40c6 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -64,7 +64,7 @@ private:
 public:
     SvXMLTokenEnumerator( const OUString& rString, sal_Unicode cSeparator = sal_Unicode(' ') );
 
-    sal_Bool getNextToken( OUString& rToken );
+    bool getNextToken( OUString& rToken );
 };
 
 /** the SvXMLTypeConverter converts values of various types from
@@ -124,13 +124,13 @@ public:
 
     /** convert string to enum using given enum map, if the enum is
         not found in the map, this method will return false */
-    static sal_Bool convertEnum( sal_uInt16& rEnum,
+    static bool convertEnum( sal_uInt16& rEnum,
                              const OUString& rValue,
                              const SvXMLEnumMapEntry *pMap );
 
     /** convert string to enum using given token map, if the enum is
         not found in the map, this method will return false */
-    static sal_Bool convertEnum( sal_uInt16& rEnum,
+    static bool convertEnum( sal_uInt16& rEnum,
                              const OUString& rValue,
                              const SvXMLEnumStringMapEntry *pMap );
 
@@ -138,7 +138,7 @@ public:
         default token. If the enum is not found in the map,
         this method will either use the given default or return
         false if not default is set */
-    static sal_Bool convertEnum( OUStringBuffer& rBuffer,
+    static bool convertEnum( OUStringBuffer& rBuffer,
                                  unsigned int nValue,
                                  const SvXMLEnumMapEntry *pMap,
                                  enum ::xmloff::token::XMLTokenEnum eDefault =
@@ -147,13 +147,13 @@ public:
     /** convert double number to string (using ::rtl::math) and DO
 		convert to export MapUnit using meCoreMeasureUnit/meXMLMeasureUnit */
     void convertDouble(OUStringBuffer& rBuffer,
-        double fNumber, sal_Bool bWriteUnits) const;
+        double fNumber, bool bWriteUnits) const;
 
     /** convert string to double number (using ::rtl::math) and DO convert. */
-    sal_Bool convertDouble(double& rValue, const OUString& rString, sal_Bool bLookForUnits) const;
+    bool convertDouble(double& rValue, const OUString& rString, bool bLookForUnits) const;
 
     /** get the Null Date of the XModel and set it to the UnitConverter */
-    sal_Bool setNullDate (
+    bool setNullDate (
         const com::sun::star::uno::Reference <com::sun::star::frame::XModel>& xModel);
 
     /** convert double to ISO Date Time String */
@@ -171,15 +171,15 @@ public:
     static void convertDateTime( OUStringBuffer& rBuffer,
                                 const double& fDateTime,
                                 const com::sun::star::util::Date& aNullDate,
-                                   sal_Bool bAddTimeIf0AM=sal_False);
+                                   bool bAddTimeIf0AM = false);
     /** convert ISO Date Time String to double */
-    static sal_Bool convertDateTime( double& fDateTime,
+    static bool convertDateTime( double& fDateTime,
                                 const OUString& rString,
                                 const com::sun::star::util::Date& aNullDate);
 
 
     /** convert string to ::basegfx::B3DVector */
-    static sal_Bool convertB3DVector( ::basegfx::B3DVector& rVector,
+    static bool convertB3DVector( ::basegfx::B3DVector& rVector,
                               const OUString& rValue );
 
     /** convert B3DVector to string */
@@ -187,7 +187,7 @@ public:
         const ::basegfx::B3DVector& rVector );
 
     /** convert string to Position3D */
-    sal_Bool convertPosition3D( com::sun::star::drawing::Position3D& rPosition,
+    bool convertPosition3D( com::sun::star::drawing::Position3D& rPosition,
                               const OUString& rValue );
 
     /** convert Position3D to string */
@@ -196,10 +196,10 @@ public:
 
 
     /** convert num-forat and num-letter-sync values to NumberingType */
-    sal_Bool convertNumFormat( sal_Int16& rType,
+    bool convertNumFormat( sal_Int16& rType,
                                 const OUString& rNumFormat,
                                const OUString& rNumLetterSync,
-                               sal_Bool bNumberNone = sal_False ) const;
+                               bool bNumberNone = false ) const;
 
     /** convert NumberingType to num-forat and num-letter-sync values */
     void convertNumFormat( OUStringBuffer& rBuffer,
@@ -213,9 +213,9 @@ public:
                         const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps);
 
     OUString encodeStyleName( const OUString& rName,
-                                     sal_Bool *pEncoded=0 ) const;
+                                     bool *pEncoded=0 ) const;
     /** convert string (hex) to number (sal_uInt32) */
-    static sal_Bool convertHex( sal_uInt32& nVal,
+    static bool convertHex( sal_uInt32& nVal,
                               const OUString& rValue );
 
     /** convert number (sal_uInt32) to string (hex) */