xmloff: sal_Bool->bool

Change-Id: Ib8c99a646923257647487cd7f121023876587cd2

17 files changed, 208 insertions, 209 deletions

diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index f8282b9d9543..2ef1eef7188e 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -309,7 +309,7 @@ protected:
     sal_Bool bFixed;
     sal_Bool bIsDate;           // is this a date?
                                 // (for XMLDateFieldImportContext, really)
-    sal_Bool bIsDefaultLanguage;
+    bool     bIsDefaultLanguage;
 
 public:
     TYPEINFO_OVERRIDE();
@@ -618,7 +618,7 @@ class XMLDateTimeDocInfoImportContext : public XMLSimpleDocInfoImportContext
     sal_Bool bFormatOK;
     sal_Bool bIsDate;
     sal_Bool bHasDateTime;
-    sal_Bool bIsDefaultLanguage;
+    bool     bIsDefaultLanguage;
 
 public:
     TYPEINFO_OVERRIDE();
@@ -670,7 +670,7 @@ class XMLUserDocInfoImportContext : public XMLSimpleDocInfoImportContext
     const OUString sPropertyIsFixedLanguage;
     sal_Int32   nFormat;
     sal_Bool    bFormatOK;
-    sal_Bool    bIsDefaultLanguage;
+    bool        bIsDefaultLanguage;
 
 public:
     TYPEINFO_OVERRIDE();
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index e6469403cad5..4806349a7fd1 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -60,7 +60,7 @@ class XMLValueImportHelper
     sal_Int32 nFormatKey;       /// format key (only valid of bFormatOK)
     OUString sFormula;   /// formula string
     OUString sDefault;   /// default (see bStringDefault/bFormulaDef.)
-    sal_Bool bIsDefaultLanguage;/// format (of nFormatKey) has system language?
+    bool bIsDefaultLanguage;/// format (of nFormatKey) has system language?
 
     sal_Bool bStringType;       /// is this a string (or a float) type?
     sal_Bool bFormatOK;         /// have we read a style:data-style-name attr.?
diff --git a/xmloff/source/text/XMLChangeImportContext.cxx b/xmloff/source/text/XMLChangeImportContext.cxx
index 698f56e29233..f65697e832d5 100644
--- a/xmloff/source/text/XMLChangeImportContext.cxx
+++ b/xmloff/source/text/XMLChangeImportContext.cxx
@@ -74,9 +74,9 @@ void XMLChangeImportContext::StartElement(
 
             // call for bStart and bEnd (may both be true)
             if (bIsStart)
-                rHelper->RedlineSetCursor(sID,sal_True,bIsOutsideOfParagraph);
+                rHelper->RedlineSetCursor(sID, true, bIsOutsideOfParagraph);
             if (bIsEnd)
-                rHelper->RedlineSetCursor(sID,sal_False,bIsOutsideOfParagraph);
+                rHelper->RedlineSetCursor(sID, false, bIsOutsideOfParagraph);
 
             // outside of paragraph and still open? set open redline ID
             if (bIsOutsideOfParagraph)
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index 9d6c969e48d2..65e9fd321059 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -236,8 +236,7 @@ void XMLIndexTOCContext::StartElement(
         // finally, check for redlines that should start at
         // the section start node
         if( bValid )
-            GetImport().GetTextImport()->
-                RedlineAdjustStartNodeCursor(sal_True);
+            GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(true);
 
         if (pStyle != NULL)
         {
@@ -282,7 +281,7 @@ void XMLIndexTOCContext::EndElement()
                                          sEmpty, sal_True);
 
         // check for Redlines on our end node
-        GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(sal_False);
+        GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(false);
     }
 }
 
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index 2128cf154bd6..7aee65c44669 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -238,7 +238,7 @@ void XMLSectionImportContext::StartElement(
 
                 // finally, check for redlines that should start at
                 // the section start node
-                rHelper->RedlineAdjustStartNodeCursor(sal_True); // start ???
+                rHelper->RedlineAdjustStartNodeCursor(true); // start ???
 
                 // xml:id for RDF metadata
                 GetImport().SetXmlId(xIfc, sXmlId);
@@ -348,7 +348,7 @@ void XMLSectionImportContext::EndElement()
                                      sEmpty, sal_True);
 
     // check for redlines to our endnode
-    rHelper->RedlineAdjustStartNodeCursor(sal_False);
+    rHelper->RedlineAdjustStartNodeCursor(false);
 }
 
 SvXMLImportContext* XMLSectionImportContext::CreateChildContext(
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx
index 8f452940b86d..116cc6bd326b 100644
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -66,11 +66,11 @@ void XMLTextMasterPageExport::exportHeaderFooterContent(
                                                                bAutoStyles);
     if( bAutoStyles )
         GetExport().GetTextParagraphExport()
-                ->collectTextAutoStyles( rText, sal_True, bExportParagraph );
+                ->collectTextAutoStyles( rText, true, bExportParagraph );
     else
     {
         GetExport().GetTextParagraphExport()->exportTextDeclarations( rText );
-        GetExport().GetTextParagraphExport()->exportText( rText, sal_True, bExportParagraph );
+        GetExport().GetTextParagraphExport()->exportText( rText, true, bExportParagraph );
     }
 
     // tracked changes (end of XText)
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 3aa1691bf4d0..a18f0e2e14ce 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -991,9 +991,9 @@ void XMLTextFieldExport::ExportField(
                     : 0;
 
     // find out whether we need to set the style or hyperlink
-    sal_Bool bHasHyperlink;
-    sal_Bool bIsUICharStyle;
-    sal_Bool bHasAutoStyle;
+    bool bHasHyperlink;
+    bool bIsUICharStyle;
+    bool bHasAutoStyle;
     OUString sStyle = GetExport().GetTextParagraphExport()->
         FindTextStyleAndHyperlink( xRangePropSet, bHasHyperlink, bIsUICharStyle,
                                    bHasAutoStyle, pStates );
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index ec52fbb33b56..e188f826755e 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -1084,7 +1084,7 @@ XMLTimeFieldImportContext::XMLTimeFieldImportContext(
 ,   bFormatOK(sal_False)
 ,   bFixed(sal_False)
 ,   bIsDate(sal_False)
-,   bIsDefaultLanguage( sal_True )
+,   bIsDefaultLanguage( true )
 {
     bValid = sal_True;  // always valid!
 }
@@ -1823,7 +1823,7 @@ XMLDateTimeDocInfoImportContext::XMLDateTimeDocInfoImportContext(
     , bFormatOK(sal_False)
     , bIsDate(false)
     , bHasDateTime(false)
-    , bIsDefaultLanguage(sal_True)
+    , bIsDefaultLanguage(true)
 {
     // we allow processing of EDIT_DURATION here, because import of actual
     // is not supported anyway. If it was, we'd need an extra import class
@@ -1932,7 +1932,7 @@ XMLUserDocInfoImportContext::XMLUserDocInfoImportContext(
     , sPropertyIsFixedLanguage(sAPI_is_fixed_language)
     , nFormat(0)
     , bFormatOK(sal_False)
-    , bIsDefaultLanguage( sal_True )
+    , bIsDefaultLanguage( true )
 {
     bValid = sal_False;
 }
diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx
index 31bfde9feed6..888efd782052 100644
--- a/xmloff/source/text/txtftne.cxx
+++ b/xmloff/source/text/txtftne.cxx
@@ -66,7 +66,7 @@ using namespace ::xmloff::token;
 void XMLTextParagraphExport::exportTextFootnote(
     const Reference<XPropertySet> & rPropSet,
     const OUString& rText,
-    sal_Bool bAutoStyles, sal_Bool bIsProgress )
+    bool bAutoStyles, bool bIsProgress )
 {
     // get footnote and associated text
     Any aAny;
@@ -92,9 +92,9 @@ void XMLTextParagraphExport::exportTextFootnote(
     {
         // create span (for citation mark) if necessary; footnote content
         // wil be handled via exportTextFootnoteHelper, exportText
-        sal_Bool bHasHyperlink;
-        sal_Bool bIsUICharStyle = sal_False;
-        sal_Bool bHasAutoStyle = sal_False;
+        bool bHasHyperlink;
+        bool bIsUICharStyle = false;
+        bool bHasAutoStyle = false;
 
         OUString sStyle = FindTextStyleAndHyperlink( rPropSet, bHasHyperlink,
                                                      bIsUICharStyle, bHasAutoStyle );
@@ -154,13 +154,13 @@ void XMLTextParagraphExport::exportTextFootnoteHelper(
     const Reference<XFootnote> & rFootnote,
     const Reference<XText> & rText,
     const OUString& rTextString,
-    sal_Bool bAutoStyles,
-    sal_Bool bIsEndnote,
-    sal_Bool bIsProgress )
+    bool bAutoStyles,
+    bool bIsEndnote,
+    bool bIsProgress )
 {
     if (bAutoStyles)
     {
-        exportText(rText, bAutoStyles, bIsProgress, sal_True );
+        exportText(rText, bAutoStyles, bIsProgress, true );
     }
     else
     {
@@ -198,7 +198,7 @@ void XMLTextParagraphExport::exportTextFootnoteHelper(
         {
             SvXMLElementExport aBody(GetExport(), XML_NAMESPACE_TEXT,
                                      XML_NOTE_BODY, sal_False, sal_False);
-            exportText(rText, bAutoStyles, bIsProgress, sal_True );
+            exportText(rText, bAutoStyles, bIsProgress, true );
         }
     }
 }
@@ -211,14 +211,14 @@ void XMLTextParagraphExport::exportTextFootnoteConfiguration()
                                                      UNO_QUERY);
     Reference<XPropertySet> aFootnoteConfiguration(
         aFootnotesSupplier->getFootnoteSettings());
-    exportTextFootnoteConfigurationHelper(aFootnoteConfiguration, sal_False);
+    exportTextFootnoteConfigurationHelper(aFootnoteConfiguration, false);
 
     // endnote settings
     Reference<XEndnotesSupplier> aEndnotesSupplier(GetExport().GetModel(),
                                                    UNO_QUERY);
     Reference<XPropertySet> aEndnoteConfiguration(
         aEndnotesSupplier->getEndnoteSettings());
-    exportTextFootnoteConfigurationHelper(aEndnoteConfiguration, sal_True);
+    exportTextFootnoteConfigurationHelper(aEndnoteConfiguration, true);
 }
 
 
@@ -246,7 +246,7 @@ static void lcl_exportString(
 
 void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper(
     const Reference<XPropertySet> & rFootnoteConfig,
-    sal_Bool bIsEndnote)
+    bool bIsEndnote)
 {
     GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NOTE_CLASS,
                              GetXMLToken( bIsEndnote ? XML_ENDNOTE
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index bb3e867f1e7b..5293dbb8154e 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1081,7 +1081,7 @@ void XMLTextImportHelper::ResetCursor()
 }
 
 
-sal_Bool XMLTextImportHelper::HasFrameByName( const OUString& rName ) const
+bool XMLTextImportHelper::HasFrameByName( const OUString& rName ) const
 {
     return (m_pImpl->m_xTextFrames.is() &&
             m_pImpl->m_xTextFrames->hasByName(rName))
@@ -1103,7 +1103,7 @@ void XMLTextImportHelper::InsertString( const OUString& rChars )
 }
 
 void XMLTextImportHelper::InsertString( const OUString& rChars,
-                                        sal_Bool& rIgnoreLeadingSpace )
+                                        bool& rIgnoreLeadingSpace )
 {
     DBG_ASSERT(m_pImpl->m_xText.is(), "no text");
     DBG_ASSERT(m_pImpl->m_xCursorAsRange.is(), "no range");
@@ -1123,10 +1123,10 @@ void XMLTextImportHelper::InsertString( const OUString& rChars,
                 case 0x0d:
                     if( !rIgnoreLeadingSpace )
                         sChars.append( (sal_Unicode)0x20 );
-                    rIgnoreLeadingSpace = sal_True;
+                    rIgnoreLeadingSpace = true;
                     break;
                 default:
-                    rIgnoreLeadingSpace = sal_False;
+                    rIgnoreLeadingSpace = false;
                     sChars.append( c );
                     break;
             }
@@ -1201,7 +1201,7 @@ void XMLTextImportHelper::DeleteParagraph()
 OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars,
                                                 const OUString& rStyleName,
                                                 sal_uInt8& rFlags,
-                                                sal_Bool bPara,
+                                                bool bPara,
                                                 SvXMLImport& rImport ) const
 {
     OUStringBuffer sChars( rChars );
@@ -1402,11 +1402,11 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
         SvXMLImport& rImport,
         const Reference < XTextCursor >& rCursor,
         const OUString& rStyleName,
-        sal_Bool bPara,
-        sal_Bool bOutlineLevelAttrFound,
+        bool bPara,
+        bool bOutlineLevelAttrFound,
         sal_Int8 nOutlineLevel,
         // Numberings/Bullets in table not visible after save/reload (#i80724#)
-        sal_Bool bSetListAttrs )
+        bool bSetListAttrs )
 {
     static OUString s_ParaStyleName( "ParaStyleName");
     static OUString s_CharStyleName( "CharStyleName");
@@ -1911,7 +1911,7 @@ void XMLTextImportHelper::AddOutlineStyleCandidate( const sal_Int8 nOutlineLevel
     }
 }
 
-void XMLTextImportHelper::SetOutlineStyles( sal_Bool bSetEmptyLevels )
+void XMLTextImportHelper::SetOutlineStyles( bool bSetEmptyLevels )
 {
     static OUString s_NumberingStyleName( "NumberingStyleName");
     static OUString s_HeadingStyleName( "HeadingStyleName");
@@ -2346,7 +2346,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTableChildContext(
 
 /// get data style key for use with NumberFormat property
 sal_Int32 XMLTextImportHelper::GetDataStyleKey(const OUString& sStyleName,
-                                               sal_Bool* pIsSystemLanguage )
+                                               bool* pIsSystemLanguage )
 {
     const SvXMLStyleContext* pStyle =
         ((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)->
@@ -2505,7 +2505,7 @@ void XMLTextImportHelper::InsertBookmarkStartRange(
     m_pImpl->m_BookmarkVector.push_back(sName);
 }
 
-sal_Bool XMLTextImportHelper::FindAndRemoveBookmarkStartRange(
+bool XMLTextImportHelper::FindAndRemoveBookmarkStartRange(
     const OUString & sName,
     Reference<XTextRange> & o_rRange,
     OUString & o_rXmlId,
@@ -2528,11 +2528,11 @@ sal_Bool XMLTextImportHelper::FindAndRemoveBookmarkStartRange(
         {
             m_pImpl->m_BookmarkVector.erase(it);
         }
-        return sal_True;
+        return true;
     }
     else
     {
-        return sal_False;
+        return false;
     }
 }
 
@@ -2653,11 +2653,11 @@ void XMLTextImportHelper::ConnectFrameChains(
     }
 }
 
-sal_Bool XMLTextImportHelper::IsInFrame() const
+bool XMLTextImportHelper::IsInFrame() const
 {
     static OUString s_TextFrame( "TextFrame");
 
-    sal_Bool bIsInFrame = sal_False;
+    bool bIsInFrame = false;
 
     // are we currently in a text frame? yes, if the cursor has a
     // TextFrame property and it's non-NULL
@@ -2671,7 +2671,7 @@ sal_Bool XMLTextImportHelper::IsInFrame() const
 
             if (xFrame.is())
             {
-                bIsInFrame = sal_True;
+                bIsInFrame = true;
             }
         }
     }
@@ -2679,9 +2679,9 @@ sal_Bool XMLTextImportHelper::IsInFrame() const
     return bIsInFrame;
 }
 
-sal_Bool XMLTextImportHelper::IsInHeaderFooter() const
+bool XMLTextImportHelper::IsInHeaderFooter() const
 {
-    return sal_False;
+    return false;
 }
 
 Reference< XPropertySet> XMLTextImportHelper::createAndInsertOLEObject(
@@ -2709,7 +2709,7 @@ Reference< XPropertySet> XMLTextImportHelper::createAndInsertOOoLink(
 Reference< XPropertySet> XMLTextImportHelper::createAndInsertApplet(
                                         const OUString& /*rCode*/,
                                         const OUString& /*rName*/,
-                                        sal_Bool /*bMayScript*/,
+                                        bool /*bMayScript*/,
                                         const OUString& /*rHRef*/,
                                         sal_Int32 /*nWidth*/, sal_Int32 /*nHeight*/ )
 {
@@ -2745,7 +2745,7 @@ void XMLTextImportHelper::RedlineAdd( const OUString& /*rType*/,
                                       const OUString& /*rAuthor*/,
                                       const OUString& /*rComment*/,
                                       const util::DateTime& /*rDateTime*/,
-                                      sal_Bool /*bMergeLastPara*/)
+                                      bool /*bMergeLastPara*/)
 {
     // dummy implementation: do nothing
 }
@@ -2761,23 +2761,23 @@ Reference<XTextCursor> XMLTextImportHelper::RedlineCreateText(
 
 void XMLTextImportHelper::RedlineSetCursor(
     const OUString& /*rId*/,
-    sal_Bool /*bStart*/,
-    sal_Bool /*bIsOutsideOfParagraph*/)
+    bool /*bStart*/,
+    bool /*bIsOutsideOfParagraph*/)
 {
     // dummy implementation: do nothing
 }
 
-void XMLTextImportHelper::RedlineAdjustStartNodeCursor(sal_Bool)
+void XMLTextImportHelper::RedlineAdjustStartNodeCursor(bool)
 {
     // dummy implementation: do nothing
 }
 
-void XMLTextImportHelper::SetShowChanges( sal_Bool )
+void XMLTextImportHelper::SetShowChanges( bool )
 {
     // dummy implementation: do nothing
 }
 
-void XMLTextImportHelper::SetRecordChanges( sal_Bool )
+void XMLTextImportHelper::SetRecordChanges( bool )
 {
     // dummy implementation: do nothing
 }
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index e965708f1238..09c6b260cc09 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -725,9 +725,9 @@ OUString XMLTextParagraphExport::Find(
 
 OUString XMLTextParagraphExport::FindTextStyleAndHyperlink(
            const Reference < XPropertySet > & rPropSet,
-        sal_Bool& rbHyperlink,
-        sal_Bool& rbHasCharStyle,
-        sal_Bool& rbHasAutoStyle,
+        bool& rbHyperlink,
+        bool& rbHasCharStyle,
+        bool& rbHasAutoStyle,
         const XMLPropertyState** ppAddStates ) const
 {
     UniReference < SvXMLExportPropertyMapper > xPropMapper(GetTextPropMapper());
@@ -735,7 +735,7 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink(
 
     // Get parent and remove hyperlinks (they aren't of interest)
     OUString sName;
-    rbHyperlink = rbHasCharStyle = rbHasAutoStyle = sal_False;
+    rbHyperlink = rbHasCharStyle = rbHasAutoStyle = false;
     sal_uInt16 nIgnoreProps = 0;
     UniReference< XMLPropertySetMapper > xPM(xPropMapper->getPropertySetMapper());
     ::std::vector< XMLPropertyState >::iterator aFirstDel = xPropStates.end();
@@ -762,7 +762,7 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink(
             nIgnoreProps++;
             break;
         case CTF_HYPERLINK_URL:
-            rbHyperlink = sal_True;
+            rbHyperlink = true;
             i->mnIndex = -1;
             if( nIgnoreProps )
                 aSecondDel = i;
@@ -795,7 +795,7 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink(
         OUString sParent; // AutoStyles should not have parents!
         sName = GetAutoStylePool().Find( XML_STYLE_FAMILY_TEXT_TEXT, sParent, xPropStates );
         // assert(!sName.isEmpty()); // AutoStyle could not be found
-        rbHasAutoStyle = sal_True;
+        rbHasAutoStyle = true;
     }
 
     return sName;
@@ -1179,9 +1179,9 @@ XMLTextParagraphExport::XMLTextParagraphExport(
     pIndexMarkExport( NULL ),
     pRedlineExport( NULL ),
     pHeadingStyles( NULL ),
-    bProgress( sal_False ),
-    bBlock( sal_False ),
-    bOpenRuby( sal_False ),
+    bProgress( false ),
+    bBlock( false ),
+    bOpenRuby( false ),
     mpTextListsHelper( 0 ),
     maTextListsHelperStack(),
     sActualSize("ActualSize"),
@@ -1384,8 +1384,8 @@ SvXMLExportPropertyMapper *XMLTextParagraphExport::CreateParaDefaultExtPropMappe
     return new XMLTextExportPropertySetMapper( pPropMapper, rExport );
 }
 
-void XMLTextParagraphExport::exportPageFrames( sal_Bool bAutoStyles,
-                                               sal_Bool bIsProgress )
+void XMLTextParagraphExport::exportPageFrames( bool bAutoStyles,
+                                               bool bIsProgress )
 {
     const TextContentSet* const pTexts = pBoundFrameSets->GetTexts()->GetPageBoundContents();
     const TextContentSet* const pGraphics = pBoundFrameSets->GetGraphics()->GetPageBoundContents();
@@ -1394,7 +1394,7 @@ void XMLTextParagraphExport::exportPageFrames( sal_Bool bAutoStyles,
     for(TextContentSet::const_iterator_t it = pTexts->getBegin();
         it != pTexts->getEnd();
         ++it)
-        exportTextFrame(*it, bAutoStyles, bIsProgress, sal_True);
+        exportTextFrame(*it, bAutoStyles, bIsProgress, true);
     for(TextContentSet::const_iterator_t it = pGraphics->getBegin();
         it != pGraphics->getEnd();
         ++it)
@@ -1410,8 +1410,8 @@ void XMLTextParagraphExport::exportPageFrames( sal_Bool bAutoStyles,
 }
 
 void XMLTextParagraphExport::exportFrameFrames(
-        sal_Bool bAutoStyles,
-        sal_Bool bIsProgress,
+        bool bAutoStyles,
+        bool bIsProgress,
         const Reference < XTextFrame > *pParentTxtFrame )
 {
     const TextContentSet* const pTexts = pBoundFrameSets->GetTexts()->GetFrameBoundContents(*pParentTxtFrame);
@@ -1419,7 +1419,7 @@ void XMLTextParagraphExport::exportFrameFrames(
         for(TextContentSet::const_iterator_t it = pTexts->getBegin();
             it != pTexts->getEnd();
             ++it)
-            exportTextFrame(*it, bAutoStyles, bIsProgress, sal_True);
+            exportTextFrame(*it, bAutoStyles, bIsProgress, true);
     const TextContentSet* const pGraphics = pBoundFrameSets->GetGraphics()->GetFrameBoundContents(*pParentTxtFrame);
     if(pGraphics)
         for(TextContentSet::const_iterator_t it = pGraphics->getBegin();
@@ -1450,12 +1450,12 @@ static const enum XMLTokenEnum lcl_XmlBookmarkElements[] = {
 
 // This function replaces the text portion iteration during auto style
 // collection.
-bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgress )
+bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
 {
     GetExport().GetShapeExport(); // make sure the graphics styles family is added
 
-    const sal_Bool bAutoStyles = sal_True;
-    const sal_Bool bExportContent = sal_False;
+    const bool bAutoStyles = true;
+    const bool bExportContent = false;
 
     // Export AutoStyles:
     Reference< XAutoStylesSupplier > xAutoStylesSupp( GetExport().GetModel(), UNO_QUERY );
@@ -1518,7 +1518,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres
                 a >>= xText;
                 if ( xText.is() )
                 {
-                    exportText( xText, sal_True, bIsProgress, bExportContent );
+                    exportText( xText, true, bIsProgress, bExportContent );
                     GetExport().GetTextParagraphExport()
                         ->collectTextAutoStyles( xText );
                 }
@@ -1604,7 +1604,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres
             {
                 Any aAny = xTables->getByIndex( i );
                 Reference< XTextTable > xTable = *(Reference<XTextTable>*)aAny.getValue();
-                exportTable( xTable, sal_True, sal_True );
+                exportTable( xTable, true, true );
             }
         }
     }
@@ -1660,9 +1660,9 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres
 
 void XMLTextParagraphExport::exportText(
         const Reference < XText > & rText,
-        sal_Bool bAutoStyles,
-        sal_Bool bIsProgress,
-        sal_Bool bExportParagraph )
+        bool bAutoStyles,
+        bool bIsProgress,
+        bool bExportParagraph )
 {
     if( bAutoStyles )
         GetExport().GetShapeExport(); // make sure the graphics styles family
@@ -1678,7 +1678,7 @@ void XMLTextParagraphExport::exportText(
     if( ! xParaEnum.is() )
         return;
 
-    sal_Bool bExportLevels = sal_True;
+    bool bExportLevels = true;
 
     if (xPropertySet.is())
     {
@@ -1721,9 +1721,9 @@ void XMLTextParagraphExport::exportText(
 void XMLTextParagraphExport::exportText(
         const Reference < XText > & rText,
         const Reference < XTextSection > & rBaseSection,
-        sal_Bool bAutoStyles,
-        sal_Bool bIsProgress,
-        sal_Bool bExportParagraph )
+        bool bAutoStyles,
+        bool bIsProgress,
+        bool bExportParagraph )
 {
     if( bAutoStyles )
         GetExport().GetShapeExport(); // make sure the graphics styles family
@@ -1749,37 +1749,37 @@ void XMLTextParagraphExport::exportText(
         pRedlineExport->ExportStartOrEndRedline( xPropertySet, sal_False );
 }
 
-sal_Bool XMLTextParagraphExport::exportTextContentEnumeration(
+bool XMLTextParagraphExport::exportTextContentEnumeration(
         const Reference < XEnumeration > & rContEnum,
-        sal_Bool bAutoStyles,
+        bool bAutoStyles,
         const Reference < XTextSection > & rBaseSection,
-        sal_Bool bIsProgress,
-        sal_Bool bExportParagraph,
+        bool bIsProgress,
+        bool bExportParagraph,
         const Reference < XPropertySet > *pRangePropSet,
-        sal_Bool bExportLevels )
+        bool bExportLevels )
 {
     DBG_ASSERT( rContEnum.is(), "No enumeration to export!" );
-    sal_Bool bHasMoreElements = rContEnum->hasMoreElements();
+    bool bHasMoreElements = rContEnum->hasMoreElements();
     if( !bHasMoreElements )
-        return sal_False;
+        return false;
 
     XMLTextNumRuleInfo aPrevNumInfo;
     XMLTextNumRuleInfo aNextNumInfo;
 
-    sal_Bool bHasContent = sal_False;
+    bool bHasContent = false;
     Reference<XTextSection> xCurrentTextSection(rBaseSection);
 
     MultiPropertySetHelper aPropSetHelper(
                                bAutoStyles ? aParagraphPropertyNamesAuto :
                                           aParagraphPropertyNames );
 
-    sal_Bool bHoldElement = sal_False;
+    bool bHoldElement = false;
     Reference < XTextContent > xTxtCntnt;
     while( bHoldElement || bHasMoreElements )
     {
         if (bHoldElement)
         {
-            bHoldElement = sal_False;
+            bHoldElement = false;
         }
         else
         {
@@ -1841,7 +1841,7 @@ sal_Bool XMLTextParagraphExport::exportTextContentEnumeration(
             else
                 exportParagraph( xTxtCntnt, bAutoStyles, bIsProgress,
                                  bExportParagraph, aPropSetHelper );
-            bHasContent = sal_True;
+            bHasContent = true;
         }
         else if( xServiceInfo->supportsService( sTableService ) )
         {
@@ -1871,11 +1871,11 @@ sal_Bool XMLTextParagraphExport::exportTextContentEnumeration(
                 pSectionExport->ExportMasterDocHeadingDummies();
             }
 
-            bHasContent = sal_True;
+            bHasContent = true;
         }
         else if( xServiceInfo->supportsService( sTextFrameService ) )
         {
-            exportTextFrame( xTxtCntnt, bAutoStyles, bIsProgress, sal_True, pRangePropSet );
+            exportTextFrame( xTxtCntnt, bAutoStyles, bIsProgress, true, pRangePropSet );
         }
         else if( xServiceInfo->supportsService( sTextGraphicService ) )
         {
@@ -1912,12 +1912,12 @@ sal_Bool XMLTextParagraphExport::exportTextContentEnumeration(
                                     bAutoStyles );
     }
 
-    return sal_True;
+    return true;
 }
 
 void XMLTextParagraphExport::exportParagraph(
         const Reference < XTextContent > & rTextContent,
-        sal_Bool bAutoStyles, sal_Bool bIsProgress, sal_Bool bExportParagraph,
+        bool bAutoStyles, bool bIsProgress, bool bExportParagraph,
         MultiPropertySetHelper& rPropSetHelper)
 {
     sal_Int16 nOutlineLevel = -1;
@@ -2121,13 +2121,13 @@ void XMLTextParagraphExport::exportParagraph(
     Reference < XEnumerationAccess > xEA( rTextContent, UNO_QUERY );
     Reference < XEnumeration > xTextEnum;
     xTextEnum = xEA->createEnumeration();
-    const sal_Bool bHasPortions = xTextEnum.is();
+    const bool bHasPortions = xTextEnum.is();
 
     Reference < XEnumeration> xContentEnum;
     Reference < XContentEnumerationAccess > xCEA( rTextContent, UNO_QUERY );
     if( xCEA.is() )
         xContentEnum.set(xCEA->createContentEnumeration( sTextContentService ));
-    const sal_Bool bHasContentEnum = xContentEnum.is() &&
+    const bool bHasContentEnum = xContentEnum.is() &&
                                         xContentEnum->hasMoreElements();
 
     Reference < XTextSection > xSection;
@@ -2158,13 +2158,13 @@ void XMLTextParagraphExport::exportParagraph(
         if( bHasContentEnum )
             exportTextContentEnumeration(
                                     xContentEnum, bAutoStyles, xSection,
-                                    bIsProgress, sal_True, 0, sal_True );
+                                    bIsProgress, true, 0, true );
         if ( bHasPortions )
             exportTextRangeEnumeration( xTextEnum, bAutoStyles, bIsProgress );
     }
     else
     {
-        sal_Bool bPrevCharIsSpace = sal_True;
+        bool bPrevCharIsSpace = true;
         enum XMLTokenEnum eElem =
             0 < nOutlineLevel ? XML_H : XML_P;
         SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, eElem,
@@ -2180,8 +2180,8 @@ void XMLTextParagraphExport::exportParagraph(
 
 void XMLTextParagraphExport::exportTextRangeEnumeration(
         const Reference < XEnumeration > & rTextEnum,
-        sal_Bool bAutoStyles, sal_Bool bIsProgress,
-        sal_Bool bPrvChrIsSpc )
+        bool bAutoStyles, bool bIsProgress,
+        bool bPrvChrIsSpc )
 {
     static const OUString sMeta("InContentMetadata");
     static const OUString sFieldMarkName("__FieldMark_");
@@ -2243,7 +2243,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
                 if( xContentEnum.is() )
                     exportTextContentEnumeration( xContentEnum,
                                                     bAutoStyles,
-                                                    xSection, bIsProgress, sal_True,
+                                                    xSection, bIsProgress, true,
                                                      &xPropSet  );
 
                 bPrevCharIsSpace = false;
@@ -2448,13 +2448,13 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
 
 void XMLTextParagraphExport::exportTable(
         const Reference < XTextContent > &,
-        sal_Bool /*bAutoStyles*/, sal_Bool /*bIsProgress*/ )
+        bool /*bAutoStyles*/, bool /*bIsProgress*/ )
 {
 }
 
 void XMLTextParagraphExport::exportTextField(
         const Reference < XTextRange > & rTextRange,
-        sal_Bool bAutoStyles, sal_Bool bIsProgress )
+        bool bAutoStyles, bool bIsProgress )
 {
     Reference < XPropertySet > xPropSet( rTextRange, UNO_QUERY );
     // non-Writer apps need not support Property TextField, so test first
@@ -2464,7 +2464,7 @@ void XMLTextParagraphExport::exportTextField(
         DBG_ASSERT( xTxtFld.is(), "text field missing" );
         if( xTxtFld.is() )
         {
-            exportTextField(xTxtFld, bAutoStyles, bIsProgress, sal_True);
+            exportTextField(xTxtFld, bAutoStyles, bIsProgress, true);
         }
         else
         {
@@ -2476,8 +2476,8 @@ void XMLTextParagraphExport::exportTextField(
 
 void XMLTextParagraphExport::exportTextField(
         const Reference < XTextField > & xTextField,
-        const sal_Bool bAutoStyles, const sal_Bool bIsProgress,
-        const sal_Bool bRecursive )
+        const bool bAutoStyles, const bool bIsProgress,
+        const bool bRecursive )
 {
     if ( bAutoStyles )
     {
@@ -2492,7 +2492,7 @@ void XMLTextParagraphExport::exportTextField(
 
 void XMLTextParagraphExport::exportSoftPageBreak(
     const Reference<XPropertySet> & ,
-    sal_Bool )
+    bool )
 {
     SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
                               XML_SOFT_PAGE_BREAK, sal_False,
@@ -2503,7 +2503,7 @@ void XMLTextParagraphExport::exportTextMark(
     const Reference<XPropertySet> & rPropSet,
     const OUString& rProperty,
     const enum XMLTokenEnum pElements[],
-    sal_Bool bAutoStyles)
+    bool bAutoStyles)
 {
     // mib said: "Hau wech!"
 
@@ -2550,11 +2550,11 @@ void XMLTextParagraphExport::exportTextMark(
     // else: no styles. (see above)
 }
 
-static sal_Bool lcl_txtpara_isBoundAsChar(
+static bool lcl_txtpara_isBoundAsChar(
         const Reference < XPropertySet > & rPropSet,
         const Reference < XPropertySetInfo > & rPropSetInfo )
 {
-    sal_Bool bIsBoundAsChar = sal_False;
+    bool bIsBoundAsChar = false;
     OUString sAnchorType( "AnchorType"  );
     if( rPropSetInfo->hasPropertyByName( sAnchorType ) )
     {
@@ -2568,7 +2568,7 @@ static sal_Bool lcl_txtpara_isBoundAsChar(
 
 sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
     const Reference < XPropertySet >& rPropSet,
-    sal_Bool bShape,
+    bool bShape,
     OUString *pMinHeightValue,
     OUString *pMinWidthValue)
 {
@@ -2781,9 +2781,9 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
 void XMLTextParagraphExport::exportAnyTextFrame(
         const Reference < XTextContent > & rTxtCntnt,
         FrameType eType,
-        sal_Bool bAutoStyles,
-        sal_Bool bIsProgress,
-        sal_Bool bExportContent,
+        bool bAutoStyles,
+        bool bIsProgress,
+        bool bExportContent,
         const Reference < XPropertySet > *pRangePropSet)
 {
     Reference < XPropertySet > xPropSet( rTxtCntnt, UNO_QUERY );
@@ -2809,8 +2809,8 @@ void XMLTextParagraphExport::exportAnyTextFrame(
                 {
                     Reference < XTextFrame > xTxtFrame( rTxtCntnt, UNO_QUERY );
                     Reference < XText > xTxt(xTxtFrame->getText());
-                    exportFrameFrames( sal_True, bIsProgress, &xTxtFrame );
-                    exportText( xTxt, bAutoStyles, bIsProgress, sal_True );
+                    exportFrameFrames( true, bIsProgress, &xTxtFrame );
+                    exportText( xTxt, bAutoStyles, bIsProgress, true );
                 }
             }
             break;
@@ -2832,16 +2832,16 @@ void XMLTextParagraphExport::exportAnyTextFrame(
             sal_Bool bAddCharStyles = pRangePropSet &&
                 lcl_txtpara_isBoundAsChar( xPropSet, xPropSetInfo );
 
-            sal_Bool bIsUICharStyle;
-            sal_Bool bHasAutoStyle = sal_False;
-            sal_Bool bDummy;
+            bool bIsUICharStyle;
+            bool bHasAutoStyle = false;
+            bool bDummy;
 
             OUString sStyle;
 
             if( bAddCharStyles )
                    sStyle = FindTextStyleAndHyperlink( *pRangePropSet, bDummy, bIsUICharStyle, bHasAutoStyle );
             else
-                bIsUICharStyle = sal_False;
+                bIsUICharStyle = false;
 
             XMLTextCharStyleNamesElementExport aCharStylesExport(
                 GetExport(), bIsUICharStyle &&
@@ -2876,7 +2876,7 @@ void XMLTextParagraphExport::exportAnyTextFrame(
                         {
                             Reference < XShape > xShape( rTxtCntnt, UNO_QUERY );
                             sal_Int32 nFeatures =
-                                addTextFrameAttributes( xPropSet, sal_True );
+                                addTextFrameAttributes( xPropSet, true );
                             GetExport().GetShapeExport()
                                 ->exportShape( xShape, nFeatures );
                         }
@@ -2891,7 +2891,7 @@ void XMLTextParagraphExport::exportAnyTextFrame(
 void XMLTextParagraphExport::_exportTextFrame(
         const Reference < XPropertySet > & rPropSet,
         const Reference < XPropertySetInfo > & rPropSetInfo,
-        sal_Bool bIsProgress )
+        bool bIsProgress )
 {
     Reference < XTextFrame > xTxtFrame( rPropSet, UNO_QUERY );
     Reference < XText > xTxt(xTxtFrame->getText());
@@ -2941,7 +2941,7 @@ void XMLTextParagraphExport::_exportTextFrame(
         // frame bound frames
         exportFramesBoundToFrame( xTxtFrame, bIsProgress );
 
-        exportText( xTxt, sal_False, bIsProgress, sal_True );
+        exportText( xTxt, false, bIsProgress, true );
     }
 
     // script:events
@@ -3069,7 +3069,7 @@ void XMLTextParagraphExport::_exportTextGraphic(
     if( !sAutoStyle.isEmpty() )
         GetExport().AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE_NAME,
                                   GetExport().EncodeStyleName( sAutoStyle ) );
-    addTextFrameAttributes( rPropSet, sal_False );
+    addTextFrameAttributes( rPropSet, false );
 
     // svg:transform
     sal_Int16 nVal = 0;
@@ -3224,7 +3224,7 @@ void XMLTextParagraphExport::setTextEmbeddedGraphicURL(
 {
 }
 
-sal_Bool XMLTextParagraphExport::addHyperlinkAttributes(
+bool XMLTextParagraphExport::addHyperlinkAttributes(
     const Reference< XPropertySet > & rPropSet,
     const Reference< XPropertyState > & rPropState,
     const Reference< XPropertySetInfo > & rPropSetInfo )
@@ -3247,7 +3247,7 @@ sal_Bool XMLTextParagraphExport::addHyperlinkAttributes(
     {
         // hyperlink without an URL does not make sense
         OSL_ENSURE( false, "hyperlink without an URL --> no export to ODF" );
-        return sal_False;
+        return false;
     }
 
     if ( rPropSetInfo->hasPropertyByName( sHyperLinkName )
@@ -3331,8 +3331,8 @@ void XMLTextParagraphExport::exportTextRangeSpan(
     const com::sun::star::uno::Reference< com::sun::star::text::XTextRange > & rTextRange,
     Reference< XPropertySet > & xPropSet,
     Reference < XPropertySetInfo > & xPropSetInfo,
-    const sal_Bool bIsUICharStyle,
-    const sal_Bool bHasAutoStyle,
+    const bool bIsUICharStyle,
+    const bool bHasAutoStyle,
     const OUString& sStyle,
     bool& rPrevCharIsSpace,
     FieldmarkType& openFieldMark )
@@ -3361,7 +3361,7 @@ void XMLTextParagraphExport::exportTextRangeSpan(
 
 void XMLTextParagraphExport::exportTextRange(
         const Reference< XTextRange > & rTextRange,
-        sal_Bool bAutoStyles,
+        bool bAutoStyles,
         bool& rPrevCharIsSpace,
         FieldmarkType& openFieldMark )
 {
@@ -3372,14 +3372,14 @@ void XMLTextParagraphExport::exportTextRange(
     }
     else
     {
-        sal_Bool bHyperlink = sal_False;
-        sal_Bool bIsUICharStyle = sal_False;
-        sal_Bool bHasAutoStyle = sal_False;
+        bool bHyperlink = false;
+        bool bIsUICharStyle = false;
+        bool bHasAutoStyle = false;
         const OUString sStyle(
             FindTextStyleAndHyperlink( xPropSet, bHyperlink, bIsUICharStyle, bHasAutoStyle ) );
 
         Reference < XPropertySetInfo > xPropSetInfo;
-        sal_Bool bHyperlinkAttrsAdded = sal_False;
+        bool bHyperlinkAttrsAdded = false;
         if ( bHyperlink )
         {
             Reference< XPropertyState > xPropState( xPropSet, UNO_QUERY );
@@ -3418,16 +3418,16 @@ void XMLTextParagraphExport::exportText( const OUString& rText,
     for( sal_Int32 nPos = 0; nPos < nEndPos; nPos++ )
     {
         sal_Unicode cChar = rText[nPos];
-        sal_Bool bExpCharAsText = sal_True;
-        sal_Bool bExpCharAsElement = sal_False;
-        sal_Bool bCurrCharIsSpace = sal_False;
+        bool bExpCharAsText = true;
+        bool bExpCharAsElement = false;
+        bool bCurrCharIsSpace = false;
         switch( cChar )
         {
         case 0x0009:    // Tab
         case 0x000A:    // LF
             // These characters are exported as text.
-            bExpCharAsElement = sal_True;
-            bExpCharAsText = sal_False;
+            bExpCharAsElement = true;
+            bExpCharAsText = false;
             break;
         case 0x000D:
             break;  // legal character
@@ -3436,9 +3436,9 @@ void XMLTextParagraphExport::exportText( const OUString& rText,
             {
                 // If the previous character is a space character,
                 // too, export a special space element.
-                bExpCharAsText = sal_False;
+                bExpCharAsText = false;
             }
-            bCurrCharIsSpace = sal_True;
+            bCurrCharIsSpace = true;
             break;
         default:
             if( cChar < 0x0020 )
@@ -3449,7 +3449,7 @@ void XMLTextParagraphExport::exportText( const OUString& rText,
                             "illegal character in text content" );
                 txtparae_bContainsIllegalCharacters = sal_True;
 #endif
-                bExpCharAsText = sal_False;
+                bExpCharAsText = false;
             }
             break;
         }
@@ -3582,12 +3582,12 @@ void XMLTextParagraphExport::exportTextDeclarations(
     pFieldExport->ExportFieldDeclarations(rText);
 }
 
-void XMLTextParagraphExport::exportUsedDeclarations( sal_Bool bOnlyUsed )
+void XMLTextParagraphExport::exportUsedDeclarations( bool bOnlyUsed )
 {
     pFieldExport->SetExportOnlyUsedFieldDeclarations( bOnlyUsed );
 }
 
-void XMLTextParagraphExport::exportTrackedChanges(sal_Bool bAutoStyles)
+void XMLTextParagraphExport::exportTrackedChanges(bool bAutoStyles)
 {
     if (NULL != pRedlineExport)
         pRedlineExport->ExportChangesList( bAutoStyles );
@@ -3595,7 +3595,7 @@ void XMLTextParagraphExport::exportTrackedChanges(sal_Bool bAutoStyles)
 
 void XMLTextParagraphExport::exportTrackedChanges(
     const Reference<XText> & rText,
-    sal_Bool bAutoStyle)
+    bool bAutoStyle)
 {
     if (NULL != pRedlineExport)
         pRedlineExport->ExportChangesList(rText, bAutoStyle);
@@ -3646,7 +3646,7 @@ void XMLTextParagraphExport::exportTextAutoStyles()
 
 void XMLTextParagraphExport::exportRuby(
     const Reference<XPropertySet> & rPropSet,
-    sal_Bool bAutoStyles )
+    bool bAutoStyles )
 {
     // early out: a collapsed ruby makes no sense
     if (*(sal_Bool*)rPropSet->getPropertyValue(sIsCollapsed).getValue())
@@ -3690,7 +3690,7 @@ void XMLTextParagraphExport::exportRuby(
             GetExport().ClearAttrList();
             GetExport().StartElement( XML_NAMESPACE_TEXT, XML_RUBY_BASE,
                                       sal_False );
-            bOpenRuby = sal_True;
+            bOpenRuby = true;
         }
         else
         {
@@ -3721,14 +3721,14 @@ void XMLTextParagraphExport::exportRuby(
 
             // and finally, close the ruby
             GetExport().EndElement(XML_NAMESPACE_TEXT, XML_RUBY, sal_False);
-            bOpenRuby = sal_False;
+            bOpenRuby = false;
         }
     }
 }
 
 void XMLTextParagraphExport::exportMeta(
     const Reference<XPropertySet> & i_xPortion,
-    sal_Bool i_bAutoStyles, sal_Bool i_isProgress)
+    bool i_bAutoStyles, bool i_isProgress)
 {
     static OUString sMeta("InContentMetadata");
 
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index bfa03d8b4b53..8bb11885ace8 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -275,12 +275,12 @@ class XMLImpSpanContext_Impl : public SvXMLImportContext
 {
     const OUString sTextFrame;
 
-    XMLHints_Impl&  rHints;
+    XMLHints_Impl&      rHints;
     XMLStyleHint_Impl   *pHint;
 
-    sal_Bool&       rIgnoreLeadingSpace;
+    bool&                rIgnoreLeadingSpace;
 
-    sal_uInt8               nStarFontsConvFlags;
+    sal_uInt8            nStarFontsConvFlags;
 
 public:
 
@@ -292,8 +292,8 @@ public:
             const OUString& rLName,
             const Reference< xml::sax::XAttributeList > & xAttrList,
             XMLHints_Impl& rHnts,
-            sal_Bool& rIgnLeadSpace
-    ,sal_uInt8              nSFConvFlags
+            bool& rIgnLeadSpace,
+            sal_uInt8 nSFConvFlags
                           );
 
     virtual ~XMLImpSpanContext_Impl();
@@ -303,8 +303,8 @@ public:
             sal_uInt16 nPrefix, const OUString& rLocalName,
             const Reference< xml::sax::XAttributeList > & xAttrList,
             sal_uInt16 nToken, XMLHints_Impl& rHnts,
-            sal_Bool& rIgnLeadSpace
-    ,sal_uInt8              nStarFontsConvFlags = 0
+            bool& rIgnLeadSpace,
+            sal_uInt8 nStarFontsConvFlags = 0
              );
     virtual SvXMLImportContext *CreateChildContext(
             sal_uInt16 nPrefix, const OUString& rLocalName,
@@ -318,7 +318,7 @@ class XMLImpHyperlinkContext_Impl : public SvXMLImportContext
     XMLHints_Impl&  mrHints;
     XMLHyperlinkHint_Impl   *mpHint;
 
-    sal_Bool&       mrbIgnoreLeadingSpace;
+    bool&       mrbIgnoreLeadingSpace;
 
 public:
 
@@ -330,7 +330,7 @@ public:
             const OUString& rLName,
             const Reference< xml::sax::XAttributeList > & xAttrList,
             XMLHints_Impl& rHnts,
-            sal_Bool& rIgnLeadSpace );
+            bool& rIgnLeadSpace );
 
     virtual ~XMLImpHyperlinkContext_Impl();
 
@@ -349,7 +349,7 @@ XMLImpHyperlinkContext_Impl::XMLImpHyperlinkContext_Impl(
     const OUString& rLName,
     const Reference< xml::sax::XAttributeList > & xAttrList,
     XMLHints_Impl& rHnts,
-    sal_Bool& rIgnLeadSpace )
+    bool& rIgnLeadSpace )
     : SvXMLImportContext( rImport, nPrfx, rLName )
     , mrHints( rHnts )
     , mpHint( new XMLHyperlinkHint_Impl( GetImport().GetTextImport()->GetCursorAsRange()->getStart() ) )
@@ -451,7 +451,7 @@ class XMLImpRubyBaseContext_Impl : public SvXMLImportContext
 {
     XMLHints_Impl&  rHints;
 
-    sal_Bool&       rIgnoreLeadingSpace;
+    bool&       rIgnoreLeadingSpace;
 
 public:
 
@@ -463,7 +463,7 @@ public:
             const OUString& rLName,
             const Reference< xml::sax::XAttributeList > & xAttrList,
             XMLHints_Impl& rHnts,
-            sal_Bool& rIgnLeadSpace );
+            bool& rIgnLeadSpace );
 
     virtual ~XMLImpRubyBaseContext_Impl();
 
@@ -482,7 +482,7 @@ XMLImpRubyBaseContext_Impl::XMLImpRubyBaseContext_Impl(
         const OUString& rLName,
         const Reference< xml::sax::XAttributeList > &,
         XMLHints_Impl& rHnts,
-        sal_Bool& rIgnLeadSpace ) :
+        bool& rIgnLeadSpace ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
     rHints( rHnts ),
     rIgnoreLeadingSpace( rIgnLeadSpace )
@@ -515,7 +515,7 @@ class XMLImpRubyContext_Impl : public SvXMLImportContext
 {
     XMLHints_Impl&  rHints;
 
-    sal_Bool&       rIgnoreLeadingSpace;
+    bool&       rIgnoreLeadingSpace;
 
     Reference < XTextRange > m_xStart;
     OUString        m_sStyleName;
@@ -532,7 +532,7 @@ public:
             const OUString& rLName,
             const Reference< xml::sax::XAttributeList > & xAttrList,
             XMLHints_Impl& rHnts,
-            sal_Bool& rIgnLeadSpace );
+            bool& rIgnLeadSpace );
 
     virtual ~XMLImpRubyContext_Impl();
 
@@ -611,7 +611,7 @@ XMLImpRubyContext_Impl::XMLImpRubyContext_Impl(
         const OUString& rLName,
         const Reference< xml::sax::XAttributeList > & xAttrList,
         XMLHints_Impl& rHnts,
-        sal_Bool& rIgnLeadSpace ) :
+        bool& rIgnLeadSpace ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
     rHints( rHnts ),
     rIgnoreLeadingSpace( rIgnLeadSpace )
@@ -683,7 +683,7 @@ class XMLMetaImportContextBase : public SvXMLImportContext
 {
     XMLHints_Impl&    m_rHints;
 
-    sal_Bool& m_rIgnoreLeadingSpace;
+    bool& m_rIgnoreLeadingSpace;
 
     /// start position
     Reference<XTextRange> m_xStart;
@@ -699,7 +699,7 @@ public:
         const sal_uInt16 i_nPrefix,
         const OUString& i_rLocalName,
         XMLHints_Impl& i_rHints,
-        sal_Bool & i_rIgnoreLeadingSpace );
+        bool & i_rIgnoreLeadingSpace );
 
     virtual ~XMLMetaImportContextBase();
 
@@ -728,7 +728,7 @@ XMLMetaImportContextBase::XMLMetaImportContextBase(
         const sal_uInt16 i_nPrefix,
         const OUString& i_rLocalName,
         XMLHints_Impl& i_rHints,
-        sal_Bool & i_rIgnoreLeadingSpace )
+        bool & i_rIgnoreLeadingSpace )
     : SvXMLImportContext( i_rImport, i_nPrefix, i_rLocalName )
     , m_rHints( i_rHints )
     , m_rIgnoreLeadingSpace( i_rIgnoreLeadingSpace )
@@ -818,7 +818,7 @@ public:
         const sal_uInt16 i_nPrefix,
         const OUString& i_rLocalName,
         XMLHints_Impl& i_rHints,
-        sal_Bool & i_rIgnoreLeadingSpace );
+        bool & i_rIgnoreLeadingSpace );
 
     virtual void ProcessAttribute(sal_uInt16 const i_nPrefix,
         OUString const & i_rLocalName, OUString const & i_rValue) SAL_OVERRIDE;
@@ -833,7 +833,7 @@ XMLMetaImportContext::XMLMetaImportContext(
         const sal_uInt16 i_nPrefix,
         const OUString& i_rLocalName,
         XMLHints_Impl& i_rHints,
-        sal_Bool & i_rIgnoreLeadingSpace )
+        bool & i_rIgnoreLeadingSpace )
     : XMLMetaImportContextBase( i_rImport, i_nPrefix, i_rLocalName,
             i_rHints, i_rIgnoreLeadingSpace )
     , m_bHaveAbout(false)
@@ -912,7 +912,7 @@ public:
         const sal_uInt16 i_nPrefix,
         const OUString& i_rLocalName,
         XMLHints_Impl& i_rHints,
-        sal_Bool & i_rIgnoreLeadingSpace );
+        bool & i_rIgnoreLeadingSpace );
 
     virtual void ProcessAttribute(sal_uInt16 const i_nPrefix,
         OUString const & i_rLocalName, OUString const & i_rValue) SAL_OVERRIDE;
@@ -927,7 +927,7 @@ XMLMetaFieldImportContext::XMLMetaFieldImportContext(
         const sal_uInt16 i_nPrefix,
         const OUString& i_rLocalName,
         XMLHints_Impl& i_rHints,
-        sal_Bool & i_rIgnoreLeadingSpace )
+        bool & i_rIgnoreLeadingSpace )
     : XMLMetaImportContextBase( i_rImport, i_nPrefix, i_rLocalName,
             i_rHints, i_rIgnoreLeadingSpace )
 {
@@ -966,7 +966,7 @@ void XMLMetaFieldImportContext::InsertMeta(
 
         if (!m_DataStyleName.isEmpty())
         {
-            sal_Bool isDefaultLanguage(sal_True);
+            bool isDefaultLanguage(true);
 
             const sal_Int32 nKey( GetImport().GetTextImport()->GetDataStyleKey(
                                    m_DataStyleName, & isDefaultLanguage) );
@@ -1518,8 +1518,8 @@ XMLImpSpanContext_Impl::XMLImpSpanContext_Impl(
         const OUString& rLName,
         const Reference< xml::sax::XAttributeList > & xAttrList,
         XMLHints_Impl& rHnts,
-        sal_Bool& rIgnLeadSpace
-    ,sal_uInt8              nSFConvFlags
+        bool& rIgnLeadSpace,
+        sal_uInt8 nSFConvFlags
                                               )
 :   SvXMLImportContext( rImport, nPrfx, rLName )
 ,   sTextFrame("TextFrame")
@@ -1565,8 +1565,8 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
         const Reference< xml::sax::XAttributeList > & xAttrList,
         sal_uInt16 nToken,
         XMLHints_Impl& rHints,
-        sal_Bool& rIgnoreLeadingSpace
-    ,sal_uInt8              nStarFontsConvFlags
+        bool& rIgnoreLeadingSpace,
+        sal_uInt8 nStarFontsConvFlags
      )
 {
     SvXMLImportContext *pContext = 0;
@@ -1586,14 +1586,14 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
         pContext = new XMLCharContext( rImport, nPrefix,
                                                rLocalName, xAttrList,
                                                0x0009, false );
-        rIgnoreLeadingSpace = sal_False;
+        rIgnoreLeadingSpace = false;
         break;
 
     case XML_TOK_TEXT_LINE_BREAK:
         pContext = new XMLCharContext( rImport, nPrefix,
                                                rLocalName, xAttrList,
                                                ControlCharacter::LINE_BREAK );
-        rIgnoreLeadingSpace = sal_False;
+        rIgnoreLeadingSpace = false;
         break;
 
     case XML_TOK_TEXT_S:
@@ -1625,7 +1625,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
         {
             pContext = new XMLUrlFieldImportContext( rImport, *rImport.GetTextImport().get(), nPrefix, rLocalName );
             //whitespace handling like other fields
-            rIgnoreLeadingSpace = sal_False;
+            rIgnoreLeadingSpace = false;
 
         }
         break;
@@ -1651,7 +1651,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
                                                      *rImport.GetTextImport().get(),
                                                      nPrefix, rLocalName );
         }
-        rIgnoreLeadingSpace = sal_False;
+        rIgnoreLeadingSpace = false;
         break;
 
     case XML_TOK_TEXT_REFERENCE:
@@ -1700,7 +1700,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
                     pTextFrameContext, xAnchorPos ) );
             }
             pContext = pTextFrameContext;
-            rIgnoreLeadingSpace = sal_False;
+            rIgnoreLeadingSpace = false;
         }
         break;
     case XML_TOK_DRAW_A:
@@ -1794,7 +1794,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
                 new SvXMLImportContext( rImport, nPrefix, rLocalName );
         }
         // Behind fields, shapes and any unknown content blanks aren't ignored
-        rIgnoreLeadingSpace = sal_False;
+        rIgnoreLeadingSpace = false;
     }
 
     return pContext;
@@ -1822,7 +1822,7 @@ void XMLImpSpanContext_Impl::Characters( const OUString& rChars )
     OUString sChars =
         GetImport().GetTextImport()->ConvertStarFonts( rChars, sStyleName,
                                                        nStarFontsConvFlags,
-                                                       sal_False, GetImport() );
+                                                       false, GetImport() );
     GetImport().GetTextImport()->InsertString( sChars, rIgnoreLeadingSpace );
 }
 
@@ -1841,7 +1841,7 @@ XMLParaContext::XMLParaContext(
     pHints( 0 ),
     // Lost outline numbering in master document (#i73509#)
     mbOutlineLevelAttrFound( sal_False ),
-    bIgnoreLeadingSpace( sal_True ),
+    bIgnoreLeadingSpace( true ),
     bHeading( bHead ),
     bIsListHeader( false ),
     bIsRestart (false),
@@ -2018,9 +2018,9 @@ XMLParaContext::~XMLParaContext()
         */
         xTxtImport->SetStyleAndAttrs( GetImport(), xAttrCursor,
                                       sCellParaStyleName,
-                                      sal_True,
-                                      sal_False, -1, // suppress outline handling
-                                      sal_False );   // suppress list attributes handling
+                                      true,
+                                      false, -1, // suppress outline handling
+                                      false );   // suppress list attributes handling
     }
 
     // #103445# for headings without style name, find the proper style
@@ -2031,7 +2031,7 @@ XMLParaContext::~XMLParaContext()
     // Add paramter <mbOutlineLevelAttrFound> (#i73509#)
     sStyleName = xTxtImport->SetStyleAndAttrs( GetImport(), xAttrCursor,
                                                sStyleName,
-                                               sal_True,
+                                               true,
                                                mbOutlineLevelAttrFound,
                                                bHeading ? nOutlineLevel : -1 );
 
@@ -2093,7 +2093,7 @@ XMLParaContext::~XMLParaContext()
                     if( !rStyleName.isEmpty() )
                         xTxtImport->SetStyleAndAttrs( GetImport(),
                                                       xAttrCursor, rStyleName,
-                                                      sal_False );
+                                                      false );
                 }
                 break;
             case XML_HINT_REFERENCE:
@@ -2246,7 +2246,7 @@ void XMLParaContext::Characters( const OUString& rChars )
     OUString sChars =
         GetImport().GetTextImport()->ConvertStarFonts( rChars, sStyleName,
                                                        nStarFontsConvFlags,
-                                                       sal_True, GetImport() );
+                                                       true, GetImport() );
     GetImport().GetTextImport()->InsertString( sChars, bIgnoreLeadingSpace );
 }
 
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index 40cb943e3744..a04d20a6bbcd 100644
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
@@ -48,7 +48,7 @@ class XMLParaContext : public SvXMLImportContext
     XMLHints_Impl           *pHints;
     // Lost outline numbering in master document (#i73509#)
     sal_Bool                mbOutlineLevelAttrFound;
-    sal_Bool                bIgnoreLeadingSpace;
+    bool                bIgnoreLeadingSpace;
     bool                bHeading;
     sal_Bool                bIsListHeader;
     sal_Bool                bIsRestart;
diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx
index 91d386552bb0..1dc5a1f6ce00 100644
--- a/xmloff/source/text/txtsecte.cxx
+++ b/xmloff/source/text/txtsecte.cxx
@@ -66,7 +66,7 @@ void XMLTextParagraphExport::exportListAndSectionChange(
     const Reference<XTextContent> & rNextSectionContent,
     const XMLTextNumRuleInfo& rPrevRule,
     const XMLTextNumRuleInfo& rNextRule,
-    sal_Bool bAutoStyles)
+    bool bAutoStyles)
 {
     Reference<XTextSection> xNextSection;
 
@@ -92,7 +92,7 @@ void XMLTextParagraphExport::exportListAndSectionChange(
     const Reference<XTextContent> & rNextSectionContent,
     const XMLTextNumRuleInfo& rPrevRule,
     const XMLTextNumRuleInfo& rNextRule,
-    sal_Bool bAutoStyles)
+    bool bAutoStyles)
 {
     Reference<XTextSection> xNextSection;
 
@@ -119,7 +119,7 @@ void XMLTextParagraphExport::exportListAndSectionChange(
     const Reference<XTextSection> & rNextSection,
     const XMLTextNumRuleInfo& rPrevRule,
     const XMLTextNumRuleInfo& rNextRule,
-    sal_Bool bAutoStyles)
+    bool bAutoStyles)
 {
     // old != new? -> maybe we have to start or end a new section
     if (rPrevSection != rNextSection)
diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx
index eba122b9d2ee..34c842c314a7 100644
--- a/xmloff/source/text/txtstyle.cxx
+++ b/xmloff/source/text/txtstyle.cxx
@@ -102,13 +102,13 @@ void XMLTextParagraphExport::exportStyleAttributes(
     }
 }
 
-void XMLTextParagraphExport::exportNumStyles( sal_Bool bUsed )
+void XMLTextParagraphExport::exportNumStyles( bool bUsed )
 {
     SvxXMLNumRuleExport aNumRuleExport( GetExport() );
     aNumRuleExport.exportStyles( bUsed, pListAutoPool, !IsBlockMode() );
 }
 
-void XMLTextParagraphExport::exportTextStyles( sal_Bool bUsed, sal_Bool bProg )
+void XMLTextParagraphExport::exportTextStyles( bool bUsed, bool bProg )
 {
     sal_Bool bOldProg = bProgress;
     bProgress = bProg;
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index 34ad344c355b..13afc4c210e8 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -82,18 +82,18 @@ void XMLTextStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
         if( IsXMLToken( rLocalName, XML_AUTO_UPDATE ) )
         {
             if( IsXMLToken( rValue, XML_TRUE ) )
-                bAutoUpdate = sal_True;
+                bAutoUpdate = true;
         }
         else if( IsXMLToken( rLocalName, XML_LIST_STYLE_NAME ) )
         {
             sListStyleName = rValue;
             // Inherited paragraph style lost information about unset numbering (#i69523#)
-            mbListStyleSet = sal_True;
+            mbListStyleSet = true;
         }
         else if( IsXMLToken( rLocalName, XML_MASTER_PAGE_NAME ) )
         {
             sMasterPageName = rValue;
-            bHasMasterPageName = sal_True;
+            bHasMasterPageName = true;
         }
         else if( IsXMLToken( rLocalName, XML_DATA_STYLE_NAME ) )
         {
@@ -127,7 +127,7 @@ XMLTextStyleContext::XMLTextStyleContext( SvXMLImport& rImport,
         sal_uInt16 nPrfx, const OUString& rLName,
         const Reference< XAttributeList > & xAttrList,
         SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
-        sal_Bool bDefaultStyle )
+        bool bDefaultStyle )
 :   XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle )
 ,   sIsAutoUpdate( "IsAutoUpdate" )
 ,   sCategory( "Category" )
@@ -136,11 +136,11 @@ XMLTextStyleContext::XMLTextStyleContext( SvXMLImport& rImport,
 ,   sDropCapCharStyleName( "DropCapCharStyleName" )
 ,   sPageDescName( "PageDescName" )
 ,   nOutlineLevel( -1 )
-,   bAutoUpdate( sal_False )
-,   bHasMasterPageName( sal_False )
-,   bHasCombinedCharactersLetter( sal_False )
+,   bAutoUpdate( false )
+,   bHasMasterPageName( false )
+,   bHasCombinedCharactersLetter( false )
 // Inherited paragraph style lost information about unset numbering (#i69523#)
-,   mbListStyleSet( sal_False )
+,   mbListStyleSet( false )
 ,   pEventContext( NULL )
 {
 }
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index c1832e65d009..96ae34819339 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -1260,7 +1260,7 @@ XMLValueImportHelper::XMLValueImportHelper(
 
         fValue(0.0),
         nFormatKey(0),
-        bIsDefaultLanguage(sal_True),
+        bIsDefaultLanguage(true),
 
         bStringType(sal_False),
         bFormatOK(sal_False),