sax: sal_Bool->bool

Change-Id: I8d9dd585c509fd4c1f09ee817d828f3e600e31d5

5 files changed, 113 insertions, 113 deletions

diff --git a/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx
index bb1f6aca2dee..0fa9fc7411c9 100644
--- a/sax/inc/xml2utf.hxx
+++ b/sax/inc/xml2utf.hxx
@@ -29,15 +29,15 @@ public:
     ~Text2UnicodeConverter();
 
     ::com::sun::star::uno::Sequence < sal_Unicode > convert( const ::com::sun::star::uno::Sequence<sal_Int8> & );
-    sal_Bool canContinue() {  return m_bCanContinue; }
+    bool canContinue() {  return m_bCanContinue; }
 
 private:
     void init( rtl_TextEncoding encoding );
 
     rtl_TextToUnicodeConverter  m_convText2Unicode;
     rtl_TextToUnicodeContext    m_contextText2Unicode;
-    sal_Bool                    m_bCanContinue;
-    sal_Bool                    m_bInitialized;
+    bool                    m_bCanContinue;
+    bool                    m_bInitialized;
     rtl_TextEncoding            m_rtlEncoding;
     ::com::sun::star::uno::Sequence<sal_Int8> m_seqSource;
 };
@@ -58,15 +58,15 @@ public:
             return convert( s.getStr() , s.getLength() );
         }
     ::com::sun::star::uno::Sequence<sal_Int8> convert( const sal_Unicode * , sal_Int32 nLength );
-    sal_Bool canContinue() {  return m_bCanContinue; }
+    bool canContinue() {  return m_bCanContinue; }
 
 private:
     void init( rtl_TextEncoding encoding );
 
     rtl_UnicodeToTextConverter  m_convUnicode2Text;
     rtl_UnicodeToTextContext    m_contextUnicode2Text;
-    sal_Bool                    m_bCanContinue;
-    sal_Bool                    m_bInitialized;
+    bool                    m_bCanContinue;
+    bool                    m_bInitialized;
     rtl_TextEncoding            m_rtlEncoding;
     ::com::sun::star::uno::Sequence<sal_Unicode>        m_seqSource;
 };
@@ -82,7 +82,7 @@ class XMLFile2UTFConverter
 {
 public:
     XMLFile2UTFConverter( ):
-        m_bStarted( sal_False ),
+        m_bStarted( false ),
         m_pText2Unicode( 0 ),
         m_pUnicode2Text( 0 )
         {}
@@ -107,13 +107,13 @@ private:
     // Called only on first Sequence of bytes. Tries to figure out file format and encoding information.
     // @return TRUE, when encoding information could be retrieved
     // @return FALSE, when no encoding information was found in file
-    sal_Bool scanForEncoding( ::com::sun::star::uno::Sequence<sal_Int8> &seq );
+    bool scanForEncoding( ::com::sun::star::uno::Sequence<sal_Int8> &seq );
 
     // Called only on first Sequence of bytes. Tries to figure out
     // if enough data is available to scan encoding
     // @return TRUE, when encoding is retrievable
     // @return FALSE, when more data is needed
-    sal_Bool isEncodingRecognizable( const ::com::sun::star::uno::Sequence< sal_Int8 > & seq );
+    bool isEncodingRecognizable( const ::com::sun::star::uno::Sequence< sal_Int8 > & seq );
 
     // When encoding attribute is within the text (in the first line), it is removed.
     void removeEncoding( ::com::sun::star::uno::Sequence<sal_Int8> &seq );
@@ -123,7 +123,7 @@ private:
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >  m_in;
 
-    sal_Bool m_bStarted;
+    bool m_bStarted;
     OString m_sEncoding;
 
     Text2UnicodeConverter *m_pText2Unicode;
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index d1a8b40405d0..31b1fdd3133c 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -255,7 +255,7 @@ public:
                                         const XML_Char *systemId,
                                         const XML_Char *publicId);
 
-    int static callbackExternalEntityRef(   XML_Parser parser,
+    bool static callbackExternalEntityRef(   XML_Parser parser,
                                             const XML_Char *openEntityNames,
                                             const XML_Char *base,
                                             const XML_Char *systemId,
@@ -718,7 +718,7 @@ void SaxExpatParser_Impl::parse( )
             break;
         }
 
-        sal_Bool bContinue = ( XML_Parse( getEntity().pParser ,
+        bool bContinue = ( XML_Parse( getEntity().pParser ,
                                                 (const char *) seqOut.getArray(),
                                                 nRead,
                                                 0 ) != XML_STATUS_ERROR );
@@ -874,12 +874,12 @@ void SaxExpatParser_Impl::callbackNotationDecl(
 
 
 
-int SaxExpatParser_Impl::callbackExternalEntityRef(
+bool SaxExpatParser_Impl::callbackExternalEntityRef(
     XML_Parser parser, const XML_Char *context,
     SAL_UNUSED_PARAMETER const XML_Char * /*base*/, const XML_Char *systemId,
     const XML_Char *publicId)
 {
-    sal_Bool bOK = sal_True;
+    bool bOK = true;
     InputSource source;
     SaxExpatParser_Impl *pImpl = ((SaxExpatParser_Impl*)XML_GetUserData( parser ));
 
@@ -895,7 +895,7 @@ int SaxExpatParser_Impl::callbackExternalEntityRef(
         catch( const SAXParseException & e )
         {
             pImpl->exception = e;
-            bOK = sal_False;
+            bOK = false;
         }
         catch( const SAXException & e )
         {
@@ -905,7 +905,7 @@ int SaxExpatParser_Impl::callbackExternalEntityRef(
                 pImpl->rDocumentLocator->getSystemId(),
                 pImpl->rDocumentLocator->getLineNumber(),
                 pImpl->rDocumentLocator->getColumnNumber() );
-            bOK = sal_False;
+            bOK = false;
         }
     }
 
@@ -913,7 +913,7 @@ int SaxExpatParser_Impl::callbackExternalEntityRef(
         entity.pParser = XML_ExternalEntityParserCreate( parser , context, 0 );
         if( ! entity.pParser )
         {
-            return sal_False;
+            return false;
         }
 
         entity.converter.setInputStream( entity.structSource.aInputStream );
@@ -925,17 +925,17 @@ int SaxExpatParser_Impl::callbackExternalEntityRef(
         catch( const SAXParseException & e )
         {
             pImpl->exception = e;
-            bOK = sal_False;
+            bOK = false;
         }
         catch( const IOException &e )
         {
             pImpl->exception.WrappedException <<= e;
-            bOK = sal_False;
+            bOK = false;
         }
         catch( const css::uno::RuntimeException &e )
         {
             pImpl->exception.WrappedException <<=e;
-            bOK = sal_False;
+            bOK = false;
         }
 
         pImpl->popEntity();
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx
index d0fc173838f5..059ba7978250 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -89,7 +89,7 @@ private:
 
     sal_Int32                   nLastLineFeedPos; // is negative after writing a sequence
     sal_uInt32                  nCurrentPos;
-    sal_Bool                    m_bStartElementFinished;
+    bool                    m_bStartElementFinished;
 
     inline sal_uInt32 writeSequence() throw( SAXException );
 
@@ -98,10 +98,10 @@ private:
     // writes sequence only on overflow, sequence could be full on the end (rPos == SEQUENCESIZE)
     inline void AddBytes(sal_Int8* pTarget, sal_uInt32& rPos,
                 const sal_Int8* pBytes, sal_uInt32 nBytesCount) throw( SAXException );
-    inline sal_Bool convertToXML(const sal_Unicode * pStr,
+    inline bool convertToXML(const sal_Unicode * pStr,
                         sal_Int32 nStrLen,
-                        sal_Bool bDoNormalization,
-                        sal_Bool bNormalizeWhitespace,
+                        bool bDoNormalization,
+                        bool bNormalizeWhitespace,
                         sal_Int8 *pTarget,
                         sal_uInt32& rPos) throw( SAXException );
     inline void FinishStartElement() throw( SAXException );
@@ -112,7 +112,7 @@ public:
         mp_Sequence(NULL),
         nLastLineFeedPos(0),
         nCurrentPos(0),
-        m_bStartElementFinished(sal_True)
+        m_bStartElementFinished(true)
     {
         OSL_ENSURE(SEQUENCESIZE > 50, "Sequence cache size to small");
         mp_Sequence = m_Sequence.getArray();
@@ -128,9 +128,9 @@ public:
 // returns whether it works correct or invalid characters were in the string
 // If there are invalid characters in the string it returns sal_False.
 // Than the calling method has to throw the needed Exception.
-    inline sal_Bool writeString(const OUString& rWriteOutString,
-                        sal_Bool bDoNormalization,
-                        sal_Bool bNormalizeWhitespace) throw( SAXException );
+    inline bool writeString(const OUString& rWriteOutString,
+                        bool bDoNormalization,
+                        bool bNormalizeWhitespace) throw( SAXException );
 
     sal_uInt32 GetLastColumnCount() const
         { return (sal_uInt32)(nCurrentPos - nLastLineFeedPos); }
@@ -141,25 +141,25 @@ public:
 // If there are invalid characters in one of the strings it returns sal_False.
 // Than the calling method has to throw the needed Exception.
     inline SaxInvalidCharacterError startElement(const OUString& rName, const Reference< XAttributeList >& xAttribs) throw( SAXException );
-    inline sal_Bool FinishEmptyElement() throw( SAXException );
+    inline bool FinishEmptyElement() throw( SAXException );
 
 // returns whether it works correct or invalid characters were in the string
 // If there are invalid characters in the string it returns sal_False.
 // Than the calling method has to throw the needed Exception.
-    inline sal_Bool endElement(const OUString& rName) throw( SAXException );
+    inline bool endElement(const OUString& rName) throw( SAXException );
     inline void endDocument() throw( SAXException );
 
 // returns whether it works correct or invalid characters were in the strings
 // If there are invalid characters in the string it returns sal_False.
 // Than the calling method has to throw the needed Exception.
-    inline sal_Bool processingInstruction(const OUString& rTarget, const OUString& rData) throw( SAXException );
+    inline bool processingInstruction(const OUString& rTarget, const OUString& rData) throw( SAXException );
     inline void startCDATA() throw( SAXException );
     inline void endCDATA() throw( SAXException );
 
 // returns whether it works correct or invalid characters were in the strings
 // If there are invalid characters in the string it returns sal_False.
 // Than the calling method has to throw the needed Exception.
-    inline sal_Bool comment(const OUString& rComment) throw( SAXException );
+    inline bool comment(const OUString& rComment) throw( SAXException );
 
     inline void clearBuffer() throw( SAXException );
 };
@@ -173,9 +173,9 @@ const sal_Bool g_bValidCharsBelow32[32] =
     0,0,0,0,0,0,0,0
 };
 
-inline sal_Bool IsInvalidChar(const sal_Unicode aChar)
+inline bool IsInvalidChar(const sal_Unicode aChar)
 {
-    sal_Bool bRet(sal_False);
+    bool bRet(false);
     // check first for the most common characters
     if( aChar < 32 || aChar >= 0xd800 )
         bRet = ( (aChar < 32 && ! g_bValidCharsBelow32[aChar]) ||
@@ -234,21 +234,21 @@ inline void SaxWriterHelper::AddBytes(sal_Int8* pTarget, sal_uInt32& rPos,
            must call calcXMLByteLength on the same string, to ensure,
            that there is enough memory for converting.
  */
-inline sal_Bool SaxWriterHelper::convertToXML( const sal_Unicode * pStr,
+inline bool SaxWriterHelper::convertToXML( const sal_Unicode * pStr,
                         sal_Int32 nStrLen,
-                        sal_Bool bDoNormalization,
-                        sal_Bool bNormalizeWhitespace,
+                        bool bDoNormalization,
+                        bool bNormalizeWhitespace,
                         sal_Int8 *pTarget,
                         sal_uInt32& rPos ) throw( SAXException )
 {
-    sal_Bool bRet(sal_True);
+    bool bRet(true);
     sal_uInt32 nSurrogate = 0;
 
     for( sal_Int32 i = 0 ; i < nStrLen ; i ++ )
     {
         sal_uInt16 c = pStr[i];
         if (IsInvalidChar(c))
-            bRet = sal_False;
+            bRet = false;
         else if( (c >= 0x0001) && (c <= 0x007F) )
         {
             if( bDoNormalization )
@@ -411,7 +411,7 @@ inline sal_Bool SaxWriterHelper::convertToXML( const sal_Unicode * pStr,
             else
             {
                 OSL_FAIL( "illegal Unicode character" );
-                bRet = sal_False;
+                bRet = false;
             }
 
             // reset surrogate
@@ -457,7 +457,7 @@ inline sal_Bool SaxWriterHelper::convertToXML( const sal_Unicode * pStr,
         {
             OSL_ENSURE( nSurrogate != 0, "left-over Unicode surrogate" );
             nSurrogate = 0;
-            bRet = sal_False;
+            bRet = false;
         }
     }
     return bRet;
@@ -471,7 +471,7 @@ inline void SaxWriterHelper::FinishStartElement() throw( SAXException )
         nCurrentPos++;
         if (nCurrentPos == SEQUENCESIZE)
             nCurrentPos = writeSequence();
-        m_bStartElementFinished = sal_True;
+        m_bStartElementFinished = true;
     }
 }
 
@@ -513,9 +513,9 @@ inline void SaxWriterHelper::insertIndentation(sal_uInt32 m_nLevel) throw( SAXEx
     }
 }
 
-inline sal_Bool SaxWriterHelper::writeString( const OUString& rWriteOutString,
-                        sal_Bool bDoNormalization,
-                        sal_Bool bNormalizeWhitespace ) throw( SAXException )
+inline bool SaxWriterHelper::writeString( const OUString& rWriteOutString,
+                        bool bDoNormalization,
+                        bool bNormalizeWhitespace ) throw( SAXException )
 {
     FinishStartElement();
     return convertToXML(rWriteOutString.getStr(),
@@ -563,7 +563,7 @@ inline SaxInvalidCharacterError SaxWriterHelper::startElement(const OUString& rN
         nCurrentPos = writeSequence();
 
     SaxInvalidCharacterError eRet(SAX_NONE);
-    if (!writeString(rName, sal_False, sal_False))
+    if (!writeString(rName, false, false))
         eRet = SAX_ERROR;
 
     sal_Int16 nAttribCount = xAttribs.is() ? static_cast<sal_Int16>(xAttribs->getLength()) : 0;
@@ -580,7 +580,7 @@ inline SaxInvalidCharacterError SaxWriterHelper::startElement(const OUString& rN
         assert(DebugAttributes.find(rAttrName) == DebugAttributes.end());
         DebugAttributes.insert(rAttrName);
 #endif
-        if (!writeString(rAttrName, sal_False, sal_False))
+        if (!writeString(rAttrName, false, false))
             eRet = SAX_ERROR;
 
         mp_Sequence[nCurrentPos] = '=';
@@ -592,7 +592,7 @@ inline SaxInvalidCharacterError SaxWriterHelper::startElement(const OUString& rN
         if (nCurrentPos == SEQUENCESIZE)
             nCurrentPos = writeSequence();
 
-        if (!writeString(xAttribs->getValueByIndex( i ), sal_True, sal_True) &&
+        if (!writeString(xAttribs->getValueByIndex( i ), true, true) &&
             !(eRet == SAX_ERROR))
             eRet = SAX_WARNING;
 
@@ -602,16 +602,16 @@ inline SaxInvalidCharacterError SaxWriterHelper::startElement(const OUString& rN
             nCurrentPos = writeSequence();
     }
 
-    m_bStartElementFinished = sal_False;    // because the '>' character is not added,
+    m_bStartElementFinished = false;    // because the '>' character is not added,
                                             // because it is possible, that the "/>"
                                             // characters have to add
     return eRet;
 }
 
-inline sal_Bool SaxWriterHelper::FinishEmptyElement() throw( SAXException )
+inline bool SaxWriterHelper::FinishEmptyElement() throw( SAXException )
 {
     if (m_bStartElementFinished)
-        return sal_False;
+        return false;
 
     mp_Sequence[nCurrentPos] = '/';
     nCurrentPos++;
@@ -622,12 +622,12 @@ inline sal_Bool SaxWriterHelper::FinishEmptyElement() throw( SAXException )
     if (nCurrentPos == SEQUENCESIZE)
         nCurrentPos = writeSequence();
 
-    m_bStartElementFinished = sal_True;
+    m_bStartElementFinished = true;
 
-    return sal_True;
+    return true;
 }
 
-inline sal_Bool SaxWriterHelper::endElement(const OUString& rName) throw( SAXException )
+inline bool SaxWriterHelper::endElement(const OUString& rName) throw( SAXException )
 {
     FinishStartElement();
 
@@ -640,7 +640,7 @@ inline sal_Bool SaxWriterHelper::endElement(const OUString& rName) throw( SAXExc
     if (nCurrentPos == SEQUENCESIZE)
         nCurrentPos = writeSequence();
 
-    sal_Bool bRet(writeString( rName, sal_False, sal_False));
+    bool bRet(writeString( rName, false, false));
 
     mp_Sequence[nCurrentPos] = '>';
     nCurrentPos++;
@@ -673,7 +673,7 @@ inline void SaxWriterHelper::clearBuffer() throw( SAXException )
     }
 }
 
-inline sal_Bool SaxWriterHelper::processingInstruction(const OUString& rTarget, const OUString& rData) throw( SAXException )
+inline bool SaxWriterHelper::processingInstruction(const OUString& rTarget, const OUString& rData) throw( SAXException )
 {
     FinishStartElement();
     mp_Sequence[nCurrentPos] = '<';
@@ -685,15 +685,15 @@ inline sal_Bool SaxWriterHelper::processingInstruction(const OUString& rTarget,
     if (nCurrentPos == SEQUENCESIZE)
         nCurrentPos = writeSequence();
 
-    sal_Bool bRet(writeString( rTarget, sal_False, sal_False ));
+    bool bRet(writeString( rTarget, false, false ));
 
     mp_Sequence[nCurrentPos] = ' ';
     nCurrentPos++;
     if (nCurrentPos == SEQUENCESIZE)
         nCurrentPos = writeSequence();
 
-    if (!writeString( rData, sal_False, sal_False ))
-        bRet = sal_False;
+    if (!writeString( rData, false, false ))
+        bRet = false;
 
     mp_Sequence[nCurrentPos] = '?';
     nCurrentPos++;
@@ -735,7 +735,7 @@ inline void SaxWriterHelper::endCDATA() throw( SAXException )
         nCurrentPos = writeSequence();
 }
 
-inline sal_Bool SaxWriterHelper::comment(const OUString& rComment) throw( SAXException )
+inline bool SaxWriterHelper::comment(const OUString& rComment) throw( SAXException )
 {
     FinishStartElement();
     mp_Sequence[nCurrentPos] = '<';
@@ -755,7 +755,7 @@ inline sal_Bool SaxWriterHelper::comment(const OUString& rComment) throw( SAXExc
     if (nCurrentPos == SEQUENCESIZE)
         nCurrentPos = writeSequence();
 
-    sal_Bool bRet(writeString( rComment, sal_False, sal_False));
+    bool bRet(writeString( rComment, false, false));
 
     mp_Sequence[nCurrentPos] = '-';
     nCurrentPos++;
@@ -774,8 +774,8 @@ inline sal_Bool SaxWriterHelper::comment(const OUString& rComment) throw( SAXExc
 }
 
 inline sal_Int32 calcXMLByteLength( const sal_Unicode *pStr, sal_Int32 nStrLen,
-                                    sal_Bool bDoNormalization,
-                                    sal_Bool bNormalizeWhitespace )
+                                    bool bDoNormalization,
+                                    bool bNormalizeWhitespace )
 {
     sal_Int32 nOutputLength = 0;
     sal_uInt32 nSurrogate = 0;
@@ -902,9 +902,9 @@ public: // XActiveDataSource
                 m_out = aStream;
                 delete m_pSaxWriterHelper;
                 m_pSaxWriterHelper = new SaxWriterHelper(m_out);
-                m_bDocStarted = sal_False;
+                m_bDocStarted = false;
                 m_nLevel = 0;
-                m_bIsCDATA = sal_False;
+                m_bIsCDATA = false;
 
                 }
             }
@@ -962,10 +962,10 @@ private:
     SaxWriterHelper*            m_pSaxWriterHelper;
 
     // Status information
-    sal_Bool m_bDocStarted : 1;
-    sal_Bool m_bIsCDATA : 1;
-    sal_Bool m_bForceLineBreak : 1;
-    sal_Bool m_bAllowLineBreak : 1;
+    bool m_bDocStarted : 1;
+    bool m_bIsCDATA : 1;
+    bool m_bForceLineBreak : 1;
+    bool m_bAllowLineBreak : 1;
     sal_Int32 m_nLevel;
 };
 
@@ -979,12 +979,12 @@ sal_Int32 SAXWriter::getIndentPrefixLength( sal_Int32 nFirstLineBreakOccurrence
             ((nFirstLineBreakOccurrence + m_pSaxWriterHelper->GetLastColumnCount()) > MAXCOLUMNCOUNT)) )
             nLength = m_nLevel;
     }
-    m_bForceLineBreak = sal_False;
-    m_bAllowLineBreak = sal_False;
+    m_bForceLineBreak = false;
+    m_bAllowLineBreak = false;
     return nLength;
 }
 
-static inline sal_Bool isFirstCharWhitespace( const sal_Unicode *p ) throw()
+static inline bool isFirstCharWhitespace( const sal_Unicode *p ) throw()
 {
     return *p == ' ';
 }
@@ -1014,7 +1014,7 @@ void SAXWriter::startDocument()                     throw(SAXException, RuntimeE
     if( m_bDocStarted || ! m_out.is() || !m_pSaxWriterHelper ) {
         throw SAXException();
     }
-    m_bDocStarted = sal_True;
+    m_bDocStarted = true;
     m_pSaxWriterHelper->startDocument();
 }
 
@@ -1072,20 +1072,20 @@ void SAXWriter::startElement(const OUString& aName, const Reference< XAttributeL
 
         nLength ++; // "<"
         nLength += calcXMLByteLength( aName.getStr() , aName.getLength(),
-                                  sal_False, sal_False ); // the tag name
+                                  false, false ); // the tag name
 
         sal_Int16 n;
         for( n = 0 ; n < static_cast<sal_Int16>(nAttribCount) ; n ++ ) {
             nLength ++; // " "
             OUString tmp =  xAttribs->getNameByIndex( n );
 
-            nLength += calcXMLByteLength( tmp.getStr() , tmp.getLength() , sal_False, sal_False );
+            nLength += calcXMLByteLength( tmp.getStr() , tmp.getLength() , false, false );
 
             nLength += 2; // ="
 
             tmp = xAttribs->getValueByIndex( n );
 
-            nLength += calcXMLByteLength( tmp.getStr(), tmp.getLength(), sal_True, sal_True );
+            nLength += calcXMLByteLength( tmp.getStr(), tmp.getLength(), true, true );
 
             nLength += 1; // "
         }
@@ -1128,7 +1128,7 @@ void SAXWriter::endElement(const OUString& aName)   throw (SAXException, Runtime
     if( m_nLevel < 0 ) {
         throw SAXException();
     }
-    sal_Bool bRet(sal_True);
+    bool bRet(true);
 
     // check here because Helper's endElement is not always called
 #ifdef DBG_UTIL
@@ -1139,13 +1139,13 @@ void SAXWriter::endElement(const OUString& aName)   throw (SAXException, Runtime
 #endif
 
     if( m_pSaxWriterHelper->FinishEmptyElement() )
-        m_bForceLineBreak = sal_False;
+        m_bForceLineBreak = false;
     else
     {
         // only ascii chars allowed
         sal_Int32 nLength(0);
         if (m_bAllowLineBreak)
-            nLength = 3 + calcXMLByteLength( aName.getStr(), aName.getLength(), sal_False, sal_False );
+            nLength = 3 + calcXMLByteLength( aName.getStr(), aName.getLength(), false, false );
         sal_Int32 nPrefix = getIndentPrefixLength( nLength );
 
         if( nPrefix >= 0 )
@@ -1171,11 +1171,11 @@ void SAXWriter::characters(const OUString& aChars)  throw(SAXException, RuntimeE
         throw except;
     }
 
-    sal_Bool bThrowException(sal_False);
+    bool bThrowException(false);
     if( !aChars.isEmpty() )
     {
         if( m_bIsCDATA )
-            bThrowException = !m_pSaxWriterHelper->writeString( aChars, sal_False, sal_False );
+            bThrowException = !m_pSaxWriterHelper->writeString( aChars, false, false );
         else
         {
             // Note : nFirstLineBreakOccurrence is not exact, because we don't know, how
@@ -1188,7 +1188,7 @@ void SAXWriter::characters(const OUString& aChars)  throw(SAXException, RuntimeE
                 sal_Int32 nFirstLineBreakOccurrence = getFirstLineBreak( aChars );
 
                 nLength = calcXMLByteLength( aChars.getStr(), aChars.getLength(),
-                                               ! m_bIsCDATA , sal_False );
+                                               ! m_bIsCDATA , false );
                 nIndentPrefix = getIndentPrefixLength(
                     nFirstLineBreakOccurrence >= 0 ? nFirstLineBreakOccurrence : nLength );
             }
@@ -1203,7 +1203,7 @@ void SAXWriter::characters(const OUString& aChars)  throw(SAXException, RuntimeE
                 else
                     m_pSaxWriterHelper->insertIndentation( nIndentPrefix );
             }
-            bThrowException = !m_pSaxWriterHelper->writeString(aChars, sal_True , sal_False);
+            bThrowException = !m_pSaxWriterHelper->writeString(aChars, true , false);
         }
     }
     if (bThrowException)
@@ -1222,7 +1222,7 @@ void SAXWriter::ignorableWhitespace(const OUString&) throw(SAXException, Runtime
         throw SAXException ();
     }
 
-    m_bForceLineBreak = sal_True;
+    m_bForceLineBreak = true;
 }
 
 void SAXWriter::processingInstruction(const OUString& aTarget, const OUString& aData)
@@ -1237,11 +1237,11 @@ void SAXWriter::processingInstruction(const OUString& aTarget, const OUString& a
     if (m_bAllowLineBreak)
     {
         nLength = 2;  // "<?"
-        nLength += calcXMLByteLength( aTarget.getStr(), aTarget.getLength(), sal_False, sal_False );
+        nLength += calcXMLByteLength( aTarget.getStr(), aTarget.getLength(), false, false );
 
         nLength += 1;  // " "
 
-        nLength += calcXMLByteLength( aData.getStr(), aData.getLength(), sal_False, sal_False );
+        nLength += calcXMLByteLength( aData.getStr(), aData.getLength(), false, false );
 
         nLength += 2; // "?>"
     }
@@ -1280,7 +1280,7 @@ void SAXWriter::startCDATA(void) throw(SAXException, RuntimeException, std::exce
 
     m_pSaxWriterHelper->startCDATA();
 
-    m_bIsCDATA = sal_True;
+    m_bIsCDATA = true;
 }
 
 void SAXWriter::endCDATA(void) throw (SAXException,RuntimeException, std::exception)
@@ -1299,7 +1299,7 @@ void SAXWriter::endCDATA(void) throw (SAXException,RuntimeException, std::except
 
     m_pSaxWriterHelper->endCDATA();
 
-    m_bIsCDATA = sal_False;
+    m_bIsCDATA = false;
 }
 
 
@@ -1314,7 +1314,7 @@ void SAXWriter::comment(const OUString& sComment) throw(SAXException, RuntimeExc
     if (m_bAllowLineBreak)
     {
         nLength = 4; // "<!--"
-        nLength += calcXMLByteLength( sComment.getStr(), sComment.getLength(), sal_False, sal_False);
+        nLength += calcXMLByteLength( sComment.getStr(), sComment.getLength(), false, false);
 
         nLength += 3;
     }
@@ -1338,7 +1338,7 @@ void SAXWriter::allowLineBreak( )   throw ( SAXException , RuntimeException, std
         throw SAXException();
     }
 
-     m_bAllowLineBreak = sal_True;
+     m_bAllowLineBreak = true;
 }
 
 void SAXWriter::unknown(const OUString& sString) throw (SAXException, RuntimeException, std::exception)
@@ -1358,13 +1358,13 @@ void SAXWriter::unknown(const OUString& sString) throw (SAXException, RuntimeExc
 
     sal_Int32 nLength(0);
     if (m_bAllowLineBreak)
-        nLength = calcXMLByteLength( sString.getStr(), sString.getLength(), sal_False, sal_False );
+        nLength = calcXMLByteLength( sString.getStr(), sString.getLength(), false, false );
 
     sal_Int32 nPrefix = getIndentPrefixLength( nLength );
     if( nPrefix >= 0 )
         m_pSaxWriterHelper->insertIndentation( nPrefix );
 
-    if (!m_pSaxWriterHelper->writeString( sString, sal_False, sal_False))
+    if (!m_pSaxWriterHelper->writeString( sString, false, false))
     {
         SAXException except;
         except.Message = "Invalid character during XML-Export";
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index b3909122cf65..90e55dca6532 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -104,7 +104,7 @@ sal_Int32 XMLFile2UTFConverter::readAndConvert( Sequence<sal_Int8> &seq , sal_In
                 // ( otherwise the expat-Parser will crash )
                 // This must be done after decoding !
                 // ( e.g. Files decoded in ucs-4 cannot be read properly )
-                m_bStarted = sal_True;
+                m_bStarted = true;
                 removeEncoding( seq );
             }
             nRead = seq.getLength();
@@ -170,31 +170,31 @@ void XMLFile2UTFConverter::removeEncoding( Sequence<sal_Int8> &seq )
 }
 
 // Checks, if enough data has been accumulated to recognize the encoding
-sal_Bool XMLFile2UTFConverter::isEncodingRecognizable( const Sequence< sal_Int8 > &seq)
+bool XMLFile2UTFConverter::isEncodingRecognizable( const Sequence< sal_Int8 > &seq)
 {
     const sal_Int8 *pSource = seq.getConstArray();
-    sal_Bool bCheckIfFirstClosingBracketExsists = sal_False;
+    bool bCheckIfFirstClosingBracketExsists = false;
 
     if( seq.getLength() < 8 ) {
         // no recognition possible, when less than 8 bytes are available
-        return sal_False;
+        return false;
     }
 
     if( ! strncmp( (const char * ) pSource , "<?xml" , 4 ) ) {
         // scan if the <?xml tag finishes within this buffer
-        bCheckIfFirstClosingBracketExsists = sal_True;
+        bCheckIfFirstClosingBracketExsists = true;
     }
     else if( ('<' == pSource[0] || '<' == pSource[2] ) &&
              ( ('?' == pSource[4] || '?' == pSource[6] ) ) )
     {
         // check for utf-16
-        bCheckIfFirstClosingBracketExsists = sal_True;
+        bCheckIfFirstClosingBracketExsists = true;
     }
     else if( ( '<' == pSource[1] || '<' == pSource[3] ) &&
              ( '?' == pSource[5] || '?' == pSource[7] ) )
     {
         // check for
-        bCheckIfFirstClosingBracketExsists = sal_True;
+        bCheckIfFirstClosingBracketExsists = true;
     }
 
     if( bCheckIfFirstClosingBracketExsists )
@@ -204,24 +204,24 @@ sal_Bool XMLFile2UTFConverter::isEncodingRecognizable( const Sequence< sal_Int8
             // whole <?xml tag is valid
             if( '>' == pSource[ i ] )
             {
-                return sal_True;
+                return true;
             }
         }
-        return sal_False;
+        return false;
     }
 
     // No <? tag in front, no need for a bigger buffer
-    return sal_True;
+    return true;
 }
 
-sal_Bool XMLFile2UTFConverter::scanForEncoding( Sequence< sal_Int8 > &seq )
+bool XMLFile2UTFConverter::scanForEncoding( Sequence< sal_Int8 > &seq )
 {
     const sal_uInt8 *pSource = reinterpret_cast<const sal_uInt8*>( seq.getConstArray() );
-    sal_Bool bReturn = sal_True;
+    bool bReturn = true;
 
     if( seq.getLength() < 4 ) {
         // no recognition possible, when less than 4 bytes are available
-        return sal_False;
+        return false;
     }
 
     // first level : detect possible file formats
@@ -322,7 +322,7 @@ sal_Bool XMLFile2UTFConverter::scanForEncoding( Sequence< sal_Int8 > &seq )
     else {
         // other
         // UTF8 is directly recognized by the parser.
-        bReturn = sal_False;
+        bReturn = false;
     }
 
     return bReturn;
@@ -353,8 +353,8 @@ Text2UnicodeConverter::Text2UnicodeConverter( const OString &sEncoding )
     rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( sEncoding.getStr() );
     if( RTL_TEXTENCODING_DONTKNOW == encoding )
     {
-        m_bCanContinue = sal_False;
-        m_bInitialized = sal_False;
+        m_bCanContinue = false;
+        m_bInitialized = false;
     }
     else
     {
@@ -373,8 +373,8 @@ Text2UnicodeConverter::~Text2UnicodeConverter()
 
 void Text2UnicodeConverter::init( rtl_TextEncoding encoding )
 {
-    m_bCanContinue = sal_True;
-    m_bInitialized = sal_True;
+    m_bCanContinue = true;
+    m_bInitialized = true;
 
     m_convText2Unicode  = rtl_createTextToUnicodeConverter(encoding);
     m_contextText2Unicode = rtl_createTextToUnicodeContext( m_convText2Unicode );
@@ -551,8 +551,8 @@ Sequence<sal_Int8> Unicode2TextConverter::convert(const sal_Unicode *puSource ,
 
 void Unicode2TextConverter::init( rtl_TextEncoding encoding )
 {
-    m_bCanContinue = sal_True;
-    m_bInitialized = sal_True;
+    m_bCanContinue = true;
+    m_bInitialized = true;
 
     m_convUnicode2Text  = rtl_createUnicodeToTextConverter( encoding );
     m_contextUnicode2Text = rtl_createUnicodeToTextContext( m_convUnicode2Text );
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 6642a60c4d8a..d332de0c2866 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -529,7 +529,7 @@ bool Converter::convertNumber(  sal_Int32& rValue,
 {
     rValue = 0;
     sal_Int64 nNumber = 0;
-    sal_Bool bRet = convertNumber64(nNumber,rString,nMin,nMax);
+    bool bRet = convertNumber64(nNumber,rString,nMin,nMax);
     if ( bRet )
         rValue = static_cast<sal_Int32>(nNumber);
     return bRet;