unotools: sal_Bool -> bool

Change-Id: I8051c0756e0474a5b4f748e0aa15a9922e82ea97

37 files changed, 786 insertions, 786 deletions

diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx
index 93d984fa8767..df2f6a3cf77d 100644
--- a/unotools/source/accessibility/accessiblerelationsethelper.cxx
+++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx
@@ -39,7 +39,7 @@ public:
     AccessibleRelation getRelation( sal_Int32 nIndex )
             throw (lang::IndexOutOfBoundsException,
                     uno::RuntimeException);
-    sal_Bool containsRelation( sal_Int16 aRelationType )
+    bool containsRelation( sal_Int16 aRelationType )
         throw (uno::RuntimeException);
     AccessibleRelation getRelationByType( sal_Int16 aRelationType )
             throw (uno::RuntimeException);
@@ -78,7 +78,7 @@ AccessibleRelation AccessibleRelationSetHelperImpl::getRelation( sal_Int32 nInde
     return maRelations[nIndex];
 }
 
-sal_Bool AccessibleRelationSetHelperImpl::containsRelation( sal_Int16 aRelationType )
+bool AccessibleRelationSetHelperImpl::containsRelation( sal_Int16 aRelationType )
     throw (uno::RuntimeException)
 {
     AccessibleRelation defaultRelation; // default is INVALID
@@ -91,7 +91,7 @@ AccessibleRelation AccessibleRelationSetHelperImpl::getRelationByType( sal_Int16
 {
     sal_Int32 nCount(getRelationCount());
     sal_Int32 i(0);
-    sal_Bool bFound(sal_False);
+    bool bFound(false);
     while ((i < nCount) && !bFound)
     {
         if (maRelations[i].RelationType == aRelationType)
@@ -107,11 +107,11 @@ void AccessibleRelationSetHelperImpl::AddRelation(const AccessibleRelation& rRel
 {
     sal_Int32 nCount(getRelationCount());
     sal_Int32 i(0);
-    sal_Bool bFound(sal_False);
+    bool bFound(false);
     while ((i < nCount) && !bFound)
     {
         if (maRelations[i].RelationType == rRelation.RelationType)
-            bFound = sal_True;
+            bFound = true;
         else
             i++;
     }
diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx
index 5a2c6ff19449..f0318fdf5c84 100644
--- a/unotools/source/accessibility/accessiblestatesethelper.cxx
+++ b/unotools/source/accessibility/accessiblestatesethelper.cxx
@@ -37,9 +37,9 @@ public:
     AccessibleStateSetHelperImpl(const AccessibleStateSetHelperImpl& rImpl);
     ~AccessibleStateSetHelperImpl();
 
-    sal_Bool IsEmpty () const
+    bool IsEmpty () const
         throw (uno::RuntimeException);
-    sal_Bool Contains (sal_Int16 aState) const
+    bool Contains (sal_Int16 aState) const
         throw (uno::RuntimeException);
     uno::Sequence<sal_Int16> GetStates() const
         throw (uno::RuntimeException);
@@ -68,13 +68,13 @@ AccessibleStateSetHelperImpl::~AccessibleStateSetHelperImpl()
 {
 }
 
-inline sal_Bool AccessibleStateSetHelperImpl::IsEmpty () const
+inline bool AccessibleStateSetHelperImpl::IsEmpty () const
     throw (uno::RuntimeException)
 {
     return maStates == 0;
 }
 
-inline sal_Bool AccessibleStateSetHelperImpl::Contains (sal_Int16 aState) const
+inline bool AccessibleStateSetHelperImpl::Contains (sal_Int16 aState) const
     throw (uno::RuntimeException)
 {
     DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is too small");
@@ -210,7 +210,7 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::containsAll
     sal_Int32 nCount(rStateSet.getLength());
     const sal_Int16* pStates = rStateSet.getConstArray();
     sal_Int32 i = 0;
-    sal_Bool bFound(sal_True);
+    bool bFound(true);
     while (i < nCount)
     {
         bFound = mpHelperImpl->Contains(pStates[i]);
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index dcd3ab4b271b..a3d57edacb21 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -113,7 +113,7 @@ namespace utl
 
         // access helper
         OUString getBootstrapValue(OUString const& _sName, OUString const& _sDefault) const;
-        sal_Bool getVersionValue(OUString const& _sName, OUString& _rValue, OUString const& _sDefault) const;
+        bool getVersionValue(OUString const& _sName, OUString& _rValue, OUString const& _sDefault) const;
 
         OUString getImplName() const { return m_aImplName; }
 
@@ -595,7 +595,7 @@ OUString Bootstrap::getBuildIdData(OUString const& _sDefault)
 
     OUString sBuildId;
     // read buildid from version.ini (versionrc), if it doesn't exist or buildid is empty
-    if ( data().getVersionValue( csBuildIdItem, sBuildId, _sDefault ) != sal_True ||
+    if ( !data().getVersionValue( csBuildIdItem, sBuildId, _sDefault ) ||
          sBuildId.isEmpty() )
          // read buildid from bootstrap.ini (bootstraprc)
         sBuildId = data().getBootstrapValue( csBuildIdItem, _sDefault );
@@ -779,7 +779,7 @@ OUString Bootstrap::Impl::getBootstrapValue(OUString const& _sName, OUString con
 }
 // ---------------------------------------------------------------------------------------
 
-sal_Bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rValue, OUString const& _sDefault) const
+bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rValue, OUString const& _sDefault) const
 {
     // try to open version.ini (versionrc)
     OUString uri;
@@ -787,11 +787,11 @@ sal_Bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rVa
     rtl::Bootstrap aData( uri + "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") );
     if ( aData.getHandle() == NULL )
         // version.ini (versionrc) doesn't exist
-        return sal_False;
+        return false;
 
     // read value
     aData.getFrom(_sName,_rValue,_sDefault);
-    return sal_True;
+    return true;
 }
 // ---------------------------------------------------------------------------------------
 
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index 082bbf02f9c0..61bf2db03a50 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -59,12 +59,12 @@ class SvtCmdOptions
             m_aCommandHashMap.clear();
         }
 
-        sal_Bool HasEntries() const
+        bool HasEntries() const
         {
             return ( m_aCommandHashMap.size() > 0 );
         }
 
-        sal_Bool Lookup( const OUString& aCmd ) const
+        bool Lookup( const OUString& aCmd ) const
         {
             CommandHashMap::const_iterator pEntry = m_aCommandHashMap.find( aCmd );
             return ( pEntry != m_aCommandHashMap.end() );
@@ -165,8 +165,8 @@ class SvtCommandOptions_Impl : public ConfigItem
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        sal_Bool                HasEntries  (   SvtCommandOptions::CmdOption    eOption     ) const;
-        sal_Bool                Lookup      (   SvtCommandOptions::CmdOption    eCmdOption, const OUString& ) const;
+        bool                HasEntries  (   SvtCommandOptions::CmdOption    eOption     ) const;
+        bool                Lookup      (   SvtCommandOptions::CmdOption    eCmdOption, const OUString& ) const;
         void EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
 
     private:
@@ -227,7 +227,7 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl()
     // We need it to get information about changes outside these class on ouer used configuration keys! */
     Sequence< OUString > aNotifySeq( 1 );
     aNotifySeq[0] = "Disabled";
-    EnableNotification( aNotifySeq, sal_True );
+    EnableNotification( aNotifySeq, true );
 }
 
 //*****************************************************************************************************************
@@ -295,18 +295,18 @@ void SvtCommandOptions_Impl::Commit()
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-sal_Bool SvtCommandOptions_Impl::HasEntries( SvtCommandOptions::CmdOption eOption ) const
+bool SvtCommandOptions_Impl::HasEntries( SvtCommandOptions::CmdOption eOption ) const
 {
     if ( eOption == SvtCommandOptions::CMDOPTION_DISABLED )
-        return ( m_aDisabledCommands.HasEntries() > 0 );
+        return m_aDisabledCommands.HasEntries();
     else
-        return sal_False;
+        return false;
 }
 
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-sal_Bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption, const OUString& aCommand ) const
+bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption, const OUString& aCommand ) const
 {
     switch( eCmdOption )
     {
@@ -318,7 +318,7 @@ sal_Bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption
             DBG_ASSERT( false, "SvtCommandOptions_Impl::Lookup()\nUnknown option type given!\n" );
     }
 
-    return sal_False;
+    return false;
 }
 
 //*****************************************************************************************************************
@@ -409,7 +409,7 @@ SvtCommandOptions::~SvtCommandOptions()
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-sal_Bool SvtCommandOptions::HasEntries( CmdOption eOption ) const
+bool SvtCommandOptions::HasEntries( CmdOption eOption ) const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->HasEntries( eOption );
@@ -418,7 +418,7 @@ sal_Bool SvtCommandOptions::HasEntries( CmdOption eOption ) const
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-sal_Bool SvtCommandOptions::Lookup( CmdOption eCmdOption, const OUString& aCommandURL ) const
+bool SvtCommandOptions::Lookup( CmdOption eCmdOption, const OUString& aCommandURL ) const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->Lookup( eCmdOption, aCommandURL );
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 1f5ce94f3601..818ca7454e6b 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -118,7 +118,7 @@ ConfigChangeListener_Impl::~ConfigChangeListener_Impl()
 {
 }
 
-static sal_Bool lcl_Find(
+static bool lcl_Find(
         const OUString& rTemp,
         const OUString* pCheckPropertyNames,
         sal_Int32 nLength)
@@ -127,8 +127,8 @@ static sal_Bool lcl_Find(
     //i.e ...Print/Content/Graphic and .../Print
     for(sal_Int32 nIndex = 0; nIndex < nLength; nIndex++)
         if( isPrefixOfConfigurationPath(rTemp, pCheckPropertyNames[nIndex]) )
-            return sal_True;
-    return sal_False;
+            return true;
+    return false;
 }
 //-----------------------------------------------------------------------------
 void ConfigChangeListener_Impl::changesOccurred( const ChangesEvent& rEvent ) throw(RuntimeException)
@@ -455,13 +455,13 @@ Sequence< Any > ConfigItem::GetProperties(const Sequence< OUString >& rNames)
     return aRet;
 }
 
-sal_Bool ConfigItem::PutProperties( const Sequence< OUString >& rNames,
+bool ConfigItem::PutProperties( const Sequence< OUString >& rNames,
                                                 const Sequence< Any>& rValues)
 {
     ValueCounter_Impl aCounter(m_nInValueChange);
     Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree();
     Reference<XNameReplace> xTopNodeReplace(xHierarchyAccess, UNO_QUERY);
-    sal_Bool bRet = xHierarchyAccess.is() && xTopNodeReplace.is();
+    bool bRet = xHierarchyAccess.is() && xTopNodeReplace.is();
     if(bRet)
     {
         Sequence< OUString >    lNames          ;
@@ -502,14 +502,14 @@ sal_Bool ConfigItem::PutProperties( const Sequence< OUString >& rNames,
                     Reference<XNameReplace>   xNodeReplace(xNodeAcc, UNO_QUERY);
                     Reference<XNameContainer> xNodeCont   (xNodeAcc, UNO_QUERY);
 
-                    sal_Bool bExist = (xNodeAcc.is() && xNodeAcc->hasByName(sProperty));
+                    bool bExist = (xNodeAcc.is() && xNodeAcc->hasByName(sProperty));
                     if (bExist && xNodeReplace.is())
                         xNodeReplace->replaceByName(sProperty, pValues[i]);
                     else
                         if (!bExist && xNodeCont.is())
                             xNodeCont->insertByName(sProperty, pValues[i]);
                         else
-                            bRet = sal_False;
+                            bRet = false;
                 }
                 else //direct value
                 {
@@ -535,8 +535,8 @@ void ConfigItem::DisableNotification()
     RemoveChangesListener();
 }
 
-sal_Bool    ConfigItem::EnableNotification(const Sequence< OUString >& rNames,
-                sal_Bool bEnableInternalNotification )
+bool    ConfigItem::EnableNotification(const Sequence< OUString >& rNames,
+                bool bEnableInternalNotification )
 
 {
     OSL_ENSURE(0 == (m_nMode&CONFIG_MODE_RELEASE_TREE), "notification in CONFIG_MODE_RELEASE_TREE mode not possible");
@@ -544,12 +544,12 @@ sal_Bool    ConfigItem::EnableNotification(const Sequence< OUString >& rNames,
     Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree();
     Reference<XChangesNotifier> xChgNot(xHierarchyAccess, UNO_QUERY);
     if(!xChgNot.is())
-        return sal_False;
+        return false;
 
     OSL_ENSURE(!xChangeLstnr.is(), "EnableNotification already called");
     if(xChangeLstnr.is())
         xChgNot->removeChangesListener( xChangeLstnr );
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
 
     try
     {
@@ -558,7 +558,7 @@ sal_Bool    ConfigItem::EnableNotification(const Sequence< OUString >& rNames,
     }
     catch (const RuntimeException&)
     {
-        bRet = sal_False;
+        bRet = false;
     }
     return bRet;
 }
@@ -690,10 +690,10 @@ Sequence< OUString > ConfigItem::GetNodeNames(const OUString& rNode, ConfigNameF
     return aRet;
 }
 
-sal_Bool ConfigItem::ClearNodeSet(const OUString& rNode)
+bool ConfigItem::ClearNodeSet(const OUString& rNode)
 {
     ValueCounter_Impl aCounter(m_nInValueChange);
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree();
     if(xHierarchyAccess.is())
     {
@@ -708,7 +708,7 @@ sal_Bool ConfigItem::ClearNodeSet(const OUString& rNode)
             else
                 xCont = Reference<XNameContainer> (xHierarchyAccess, UNO_QUERY);
             if(!xCont.is())
-                return sal_False;
+                return false;
             Sequence< OUString > aNames = xCont->getElementNames();
             const OUString* pNames = aNames.getConstArray();
             Reference<XChangesBatch> xBatch(xHierarchyAccess, UNO_QUERY);
@@ -721,17 +721,17 @@ sal_Bool ConfigItem::ClearNodeSet(const OUString& rNode)
                 CATCH_INFO("Exception from removeByName(): ")
             }
             xBatch->commitChanges();
-            bRet = sal_True;
+            bRet = true;
         }
         CATCH_INFO("Exception from ClearNodeSet")
     }
     return bRet;
 }
 
-sal_Bool ConfigItem::ClearNodeElements(const OUString& rNode, Sequence< OUString >& rElements)
+bool ConfigItem::ClearNodeElements(const OUString& rNode, Sequence< OUString >& rElements)
 {
     ValueCounter_Impl aCounter(m_nInValueChange);
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree();
     if(xHierarchyAccess.is())
     {
@@ -747,7 +747,7 @@ sal_Bool ConfigItem::ClearNodeElements(const OUString& rNode, Sequence< OUString
             else
                 xCont = Reference<XNameContainer> (xHierarchyAccess, UNO_QUERY);
             if(!xCont.is())
-                return sal_False;
+                return false;
             try
             {
                 for(sal_Int32 nElement = 0; nElement < rElements.getLength(); nElement++)
@@ -758,7 +758,7 @@ sal_Bool ConfigItem::ClearNodeElements(const OUString& rNode, Sequence< OUString
                 xBatch->commitChanges();
             }
             CATCH_INFO("Exception from commitChanges(): ")
-            bRet = sal_True;
+            bRet = true;
         }
         CATCH_INFO("Exception from GetNodeNames: ")
     }
@@ -801,11 +801,11 @@ Sequence< OUString > lcl_extractSetPropertyNames( const Sequence< PropertyValue
 }
 
 // Add or change properties
-sal_Bool ConfigItem::SetSetProperties(
+bool ConfigItem::SetSetProperties(
     const OUString& rNode, Sequence< PropertyValue > rValues)
 {
     ValueCounter_Impl aCounter(m_nInValueChange);
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree();
     if(xHierarchyAccess.is())
     {
@@ -821,7 +821,7 @@ sal_Bool ConfigItem::SetSetProperties(
             else
                 xCont = Reference<XNameContainer> (xHierarchyAccess, UNO_QUERY);
             if(!xCont.is())
-                return sal_False;
+                return false;
 
             Reference<XSingleServiceFactory> xFac(xCont, UNO_QUERY);
 
@@ -855,7 +855,7 @@ sal_Bool ConfigItem::SetSetProperties(
                 Sequence< Any> aSetValues(rValues.getLength());
                 Any* pSetValues = aSetValues.getArray();
 
-                sal_Bool bEmptyNode = rNode.isEmpty();
+                bool bEmptyNode = rNode.isEmpty();
                 for(sal_Int32 k = 0; k < rValues.getLength(); k++)
                 {
                     pSetNames[k] =  pProperties[k].Name.copy( bEmptyNode ? 1 : 0);
@@ -894,17 +894,17 @@ sal_Bool ConfigItem::SetSetProperties(
         catch (const Exception&)
         {
 #endif
-            bRet = sal_False;
+            bRet = false;
         }
     }
     return bRet;
 }
 
-sal_Bool ConfigItem::ReplaceSetProperties(
+bool ConfigItem::ReplaceSetProperties(
     const OUString& rNode, Sequence< PropertyValue > rValues)
 {
     ValueCounter_Impl aCounter(m_nInValueChange);
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree();
     if(xHierarchyAccess.is())
     {
@@ -920,7 +920,7 @@ sal_Bool ConfigItem::ReplaceSetProperties(
             else
                 xCont = Reference<XNameContainer> (xHierarchyAccess, UNO_QUERY);
             if(!xCont.is())
-                return sal_False;
+                return false;
 
             // JB: Change: now the same name handling for sets of simple values
             const Sequence< OUString > aSubNodeNames = lcl_extractSetPropertyNames(rValues, rNode);
@@ -937,12 +937,12 @@ sal_Bool ConfigItem::ReplaceSetProperties(
 
                 for(sal_Int32 nContSub = 0; nContSub < aContainerSubNodes.getLength(); nContSub++)
                 {
-                    sal_Bool bFound = sal_False;
+                    bool bFound = false;
                     for(sal_Int32 j = 0; j < nSubNodeCount; j++)
                     {
                         if(pSubNodeNames[j] == pContainerSubNodes[nContSub])
                         {
-                            bFound = sal_True;
+                            bFound = true;
                             break;
                         }
                     }
@@ -995,7 +995,7 @@ sal_Bool ConfigItem::ReplaceSetProperties(
                 Sequence< Any> aSetValues(rValues.getLength());
                 Any* pSetValues = aSetValues.getArray();
 
-                sal_Bool bEmptyNode = rNode.isEmpty();
+                bool bEmptyNode = rNode.isEmpty();
                 for(sal_Int32 k = 0; k < rValues.getLength(); k++)
                 {
                     pSetNames[k] =  pProperties[k].Name.copy( bEmptyNode ? 1 : 0);
@@ -1032,16 +1032,16 @@ sal_Bool ConfigItem::ReplaceSetProperties(
         catch (const Exception&)
         {
 #endif
-            bRet = sal_False;
+            bRet = false;
         }
     }
     return bRet;
 }
 
-sal_Bool ConfigItem::AddNode(const OUString& rNode, const OUString& rNewNode)
+bool ConfigItem::AddNode(const OUString& rNode, const OUString& rNewNode)
 {
     ValueCounter_Impl aCounter(m_nInValueChange);
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree();
     if(xHierarchyAccess.is())
     {
@@ -1057,7 +1057,7 @@ sal_Bool ConfigItem::AddNode(const OUString& rNode, const OUString& rNewNode)
             else
                 xCont = Reference<XNameContainer> (xHierarchyAccess, UNO_QUERY);
             if(!xCont.is())
-                return sal_False;
+                return false;
 
             Reference<XSingleServiceFactory> xFac(xCont, UNO_QUERY);
 
@@ -1095,7 +1095,7 @@ sal_Bool ConfigItem::AddNode(const OUString& rNode, const OUString& rNewNode)
         catch (const Exception&)
         {
 #endif
-            bRet = sal_False;
+            bRet = false;
         }
     }
     return bRet;
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx
index 2f6550a66e2e..ac1966491dae 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.cxx
@@ -54,7 +54,7 @@ namespace utl
     //========================================================================
     //------------------------------------------------------------------------
     OConfigurationNode::OConfigurationNode(const Reference< XInterface >& _rxNode )
-        :m_bEscapeNames(sal_False)
+        :m_bEscapeNames(false)
     {
         OSL_ENSURE(_rxNode.is(), "OConfigurationNode::OConfigurationNode: invalid node interface!");
         if (_rxNode.is())
@@ -208,7 +208,7 @@ namespace utl
     }
 
     //------------------------------------------------------------------------
-    sal_Bool OConfigurationNode::removeNode(const OUString& _rName) const throw()
+    bool OConfigurationNode::removeNode(const OUString& _rName) const throw()
     {
         OSL_ENSURE(m_xContainerAccess.is(), "OConfigurationNode::removeNode: object is invalid!");
         if (m_xContainerAccess.is())
@@ -217,7 +217,7 @@ namespace utl
             {
                 OUString sName = normalizeName(_rName, NO_CALLER);
                 m_xContainerAccess->removeByName(sName);
-                return sal_True;
+                return true;
             }
             catch (NoSuchElementException&)
             {
@@ -238,7 +238,7 @@ namespace utl
                 OSL_FAIL("OConfigurationNode::removeNode: caught a generic exception!");
             }
         }
-        return sal_False;
+        return false;
     }
     //------------------------------------------------------------------------
     OConfigurationNode OConfigurationNode::insertNode(const OUString& _rName,const Reference< XInterface >& _xNode) const throw()
@@ -329,15 +329,15 @@ namespace utl
     }
 
     //------------------------------------------------------------------------
-    void OConfigurationNode::setEscape(sal_Bool _bEnable)
+    void OConfigurationNode::setEscape(bool _bEnable)
     {
         m_bEscapeNames = _bEnable && Reference< XStringEscape >::query(m_xDirectAccess).is();
     }
 
     //------------------------------------------------------------------------
-    sal_Bool OConfigurationNode::isSetNode() const
+    bool OConfigurationNode::isSetNode() const
     {
-        sal_Bool bIsSet = sal_False;
+        bool bIsSet = false;
         Reference< XServiceInfo > xSI(m_xHierarchyAccess, UNO_QUERY);
         if (xSI.is())
         {
@@ -347,7 +347,7 @@ namespace utl
         return bIsSet;
     }
 
-    sal_Bool OConfigurationNode::hasByHierarchicalName( const OUString& _rName ) const throw()
+    bool OConfigurationNode::hasByHierarchicalName( const OUString& _rName ) const throw()
     {
         OSL_ENSURE( m_xHierarchyAccess.is(), "OConfigurationNode::hasByHierarchicalName: no hierarchy access!" );
         try
@@ -361,11 +361,11 @@ namespace utl
         catch(Exception&)
         {
         }
-        return sal_False;
+        return false;
     }
 
     //------------------------------------------------------------------------
-    sal_Bool OConfigurationNode::hasByName(const OUString& _rName) const throw()
+    bool OConfigurationNode::hasByName(const OUString& _rName) const throw()
     {
         OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::hasByName: object is invalid!");
         try
@@ -377,13 +377,13 @@ namespace utl
         catch(Exception&)
         {
         }
-        return sal_False;
+        return false;
     }
 
     //------------------------------------------------------------------------
-    sal_Bool OConfigurationNode::setNodeValue(const OUString& _rPath, const Any& _rValue) const throw()
+    bool OConfigurationNode::setNodeValue(const OUString& _rPath, const Any& _rValue) const throw()
     {
-        sal_Bool bResult = false;
+        bool bResult = false;
 
         OSL_ENSURE(m_xReplaceAccess.is(), "OConfigurationNode::setNodeValue: object is invalid!");
         if (m_xReplaceAccess.is())
@@ -553,29 +553,29 @@ namespace utl
     }
 
     //------------------------------------------------------------------------
-    sal_Bool OConfigurationTreeRoot::commit() const throw()
+    bool OConfigurationTreeRoot::commit() const throw()
     {
         OSL_ENSURE(isValid(), "OConfigurationTreeRoot::commit: object is invalid!");
         if (!isValid())
-            return sal_False;
+            return false;
         OSL_ENSURE(m_xCommitter.is(), "OConfigurationTreeRoot::commit: I'm a readonly node!");
         if (!m_xCommitter.is())
-            return sal_False;
+            return false;
 
         try
         {
             m_xCommitter->commitChanges();
-            return sal_True;
+            return true;
         }
         catch(const Exception&)
         {
             DBG_UNHANDLED_EXCEPTION();
         }
-        return sal_False;
+        return false;
     }
 
     //------------------------------------------------------------------------
-    OConfigurationTreeRoot OConfigurationTreeRoot::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider, const OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, sal_Bool _bLazyWrite)
+    OConfigurationTreeRoot OConfigurationTreeRoot::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider, const OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, bool _bLazyWrite)
     {
         Reference< XInterface > xRoot( lcl_createConfigurationRoot(
             _rxConfProvider, _rPath, _eMode != CM_READONLY, _nDepth, _bLazyWrite ) );
@@ -585,14 +585,14 @@ namespace utl
     }
 
     //------------------------------------------------------------------------
-    OConfigurationTreeRoot OConfigurationTreeRoot::createWithComponentContext( const Reference< XComponentContext >& _rxContext, const OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, sal_Bool _bLazyWrite )
+    OConfigurationTreeRoot OConfigurationTreeRoot::createWithComponentContext( const Reference< XComponentContext >& _rxContext, const OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, bool _bLazyWrite )
     {
         return createWithProvider( lcl_getConfigProvider( _rxContext ), _rPath, _nDepth, _eMode, _bLazyWrite );
     }
 
     //------------------------------------------------------------------------
     OConfigurationTreeRoot OConfigurationTreeRoot::tryCreateWithComponentContext( const Reference< XComponentContext >& rxContext,
-        const OUString& _rPath, sal_Int32 _nDepth , CREATION_MODE _eMode , sal_Bool _bLazyWrite )
+        const OUString& _rPath, sal_Int32 _nDepth , CREATION_MODE _eMode , bool _bLazyWrite )
     {
         OSL_ENSURE( rxContext.is(), "OConfigurationTreeRoot::tryCreateWithComponentContext: invalid XComponentContext!" );
         try
diff --git a/unotools/source/config/configpaths.cxx b/unotools/source/config/configpaths.cxx
index 5dabd7f57e44..ff6875fc281f 100644
--- a/unotools/source/config/configpaths.cxx
+++ b/unotools/source/config/configpaths.cxx
@@ -74,7 +74,7 @@ void lcl_resolveCharEntities(OUString & aLocalString)
 }
 
 //----------------------------------------------------------------------------
-sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath,
+bool splitLastFromConfigurationPath(OUString const& _sInPath,
                                         OUString& _rsOutPath,
                                         OUString& _rsLocalName)
 {
@@ -196,7 +196,7 @@ sal_Int32 lcl_findPrefixEnd(OUString const& _sNestedPath, OUString const& _sPref
     OSL_ENSURE(nPrefixLength == 0 || _sPrefixPath[nPrefixLength-1] != '/',
                 "Cannot handle slash-terminated prefix paths");
 
-    sal_Bool bIsPrefix;
+    bool bIsPrefix;
     if (_sNestedPath.getLength() > nPrefixLength)
     {
         bIsPrefix = _sNestedPath[nPrefixLength] == '/' &&
@@ -216,7 +216,7 @@ sal_Int32 lcl_findPrefixEnd(OUString const& _sNestedPath, OUString const& _sPref
 }
 
 //----------------------------------------------------------------------------
-sal_Bool isPrefixOfConfigurationPath(OUString const& _sNestedPath,
+bool isPrefixOfConfigurationPath(OUString const& _sNestedPath,
                                      OUString const& _sPrefixPath)
 {
     return _sPrefixPath.isEmpty() || lcl_findPrefixEnd(_sNestedPath,_sPrefixPath) != 0;
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index 53bc30b035d5..d03646a5d05a 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -108,7 +108,7 @@ namespace utl
                 if ( _rData.hasValue() )
                 {
 #ifdef DBG_UTIL
-                    sal_Bool bSuccess =
+                    bool bSuccess =
 #endif
                     // assign the value
                     uno_type_assignData(
@@ -297,7 +297,7 @@ namespace utl
         );
     }
 
-    void OConfigurationValueContainer::write( sal_Bool _bCommit )
+    void OConfigurationValueContainer::write( bool _bCommit )
     {
         // collect the current values in the exchange locations
         std::for_each(
@@ -308,14 +308,14 @@ namespace utl
 
         // commit the changes done (if requested)
         if ( _bCommit )
-            commit( sal_False );
+            commit( false );
     }
 
-    void OConfigurationValueContainer::commit( sal_Bool _bWrite )
+    void OConfigurationValueContainer::commit( bool _bWrite )
     {
         // write the current values in the exchange locations (if requested)
         if ( _bWrite )
-            write( sal_False );
+            write( false );
 
         // commit the changes done
         m_pImpl->aConfigRoot.commit( );
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index c01af9312787..b161d66b79bb 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -117,7 +117,7 @@ GlobalEventConfig_Impl::GlobalEventConfig_Impl()
     // We need it to get information about changes outside these class on our used configuration keys! */
     Sequence< OUString > aNotifySeq( 1 );
     aNotifySeq[0] = "Events";
-    EnableNotification( aNotifySeq, sal_True );
+    EnableNotification( aNotifySeq, true );
 }
 
 //*****************************************************************************************************************
@@ -284,18 +284,18 @@ Sequence< OUString > SAL_CALL GlobalEventConfig_Impl::getElementNames(  ) throw
     return uno::Sequence< OUString >(pRet, m_supportedEvents.size());
 }
 
-sal_Bool SAL_CALL GlobalEventConfig_Impl::hasByName( const OUString& aName ) throw (RuntimeException)
+bool SAL_CALL GlobalEventConfig_Impl::hasByName( const OUString& aName ) throw (RuntimeException)
 {
     if ( m_eventBindingHash.find( aName ) != m_eventBindingHash.end() )
-        return sal_True;
+        return true;
 
     // never accessed before - is it supported in general?
     SupportedEventsVector::const_iterator pos = ::std::find(
         m_supportedEvents.begin(), m_supportedEvents.end(), aName );
     if ( pos != m_supportedEvents.end() )
-        return sal_True;
+        return true;
 
-    return sal_False;
+    return false;
 }
 
 Type SAL_CALL GlobalEventConfig_Impl::getElementType(  ) throw (RuntimeException)
@@ -304,7 +304,7 @@ Type SAL_CALL GlobalEventConfig_Impl::getElementType(  ) throw (RuntimeException
     return ::getCppuType((const Sequence<beans::PropertyValue>*)0);
 }
 
-sal_Bool SAL_CALL GlobalEventConfig_Impl::hasElements(  ) throw (RuntimeException)
+bool SAL_CALL GlobalEventConfig_Impl::hasElements(  ) throw (RuntimeException)
 {
     return ( m_eventBindingHash.empty() );
 }
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index b6d02d37ee5e..acdf7adad215 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -132,7 +132,7 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem
         OUString                                        m_aExtensionPropName;
 
         SvtExtendedSecurityOptions::OpenHyperlinkMode   m_eOpenHyperlinkMode;
-        sal_Bool                                        m_bROOpenHyperlinkMode;
+        bool                                        m_bROOpenHyperlinkMode;
         ExtensionHashMap                                m_aExtensionHashMap;
 };
 
@@ -145,7 +145,7 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl()
     , m_aSecureExtensionsSetName( SECURE_EXTENSIONS_SET )
     , m_aExtensionPropName( EXTENSION_PROPNAME )
     , m_eOpenHyperlinkMode(SvtExtendedSecurityOptions::OPEN_NEVER)
-    , m_bROOpenHyperlinkMode(sal_False)
+    , m_bROOpenHyperlinkMode(false)
     // Init member then.
 {
     // Fill the extension hash map with all secure extension strings
diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index 09829dbcb911..cc05e1041c5a 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -52,27 +52,27 @@ using namespace com::sun::star::uno;
 
 class SvtAppFilterOptions_Impl : public utl::ConfigItem
 {
-    sal_Bool                bLoadVBA;
-    sal_Bool                bSaveVBA;
+    bool                bLoadVBA;
+    bool                bSaveVBA;
 public:
     SvtAppFilterOptions_Impl(const OUString& rRoot) :
         utl::ConfigItem(rRoot),
-        bLoadVBA(sal_False),
-        bSaveVBA(sal_False)  {}
+        bLoadVBA(false),
+        bSaveVBA(false)  {}
     ~SvtAppFilterOptions_Impl();
     virtual void            Commit();
     virtual void            Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames);
     void                    Load();
 
-    sal_Bool                IsLoad() const {return bLoadVBA;}
-    void                    SetLoad(sal_Bool bSet)
+    bool                IsLoad() const {return bLoadVBA;}
+    void                    SetLoad(bool bSet)
                             {
                                 if(bSet != bLoadVBA)
                                     SetModified();
                                 bLoadVBA = bSet;
                             }
-    sal_Bool                IsSave() const {return bSaveVBA;}
-    void                    SetSave(sal_Bool bSet)
+    bool                IsSave() const {return bSaveVBA;}
+    void                    SetSave(bool bSet)
                             {
                                 if(bSet != bSaveVBA)
                                     SetModified();
@@ -126,17 +126,17 @@ void    SvtAppFilterOptions_Impl::Load()
 // -----------------------------------------------------------------------
 class SvtWriterFilterOptions_Impl : public SvtAppFilterOptions_Impl
 {
-    sal_Bool                bLoadExecutable;
+    bool                bLoadExecutable;
 public:
     SvtWriterFilterOptions_Impl(const OUString& rRoot) :
         SvtAppFilterOptions_Impl(rRoot),
-        bLoadExecutable(sal_False)
+        bLoadExecutable(false)
     {}
     virtual void            Commit();
     void                    Load();
 
-    sal_Bool                IsLoadExecutable() const {return bLoadExecutable;}
-    void                    SetLoadExecutable(sal_Bool bSet)
+    bool                IsLoadExecutable() const {return bLoadExecutable;}
+    void                    SetLoadExecutable(bool bSet)
                             {
                                 if(bSet != bLoadExecutable)
                                     SetModified();
@@ -172,17 +172,17 @@ void SvtWriterFilterOptions_Impl::Load()
 // -----------------------------------------------------------------------
 class SvtCalcFilterOptions_Impl : public SvtAppFilterOptions_Impl
 {
-    sal_Bool                bLoadExecutable;
+    bool                bLoadExecutable;
 public:
     SvtCalcFilterOptions_Impl(const OUString& rRoot) :
         SvtAppFilterOptions_Impl(rRoot),
-        bLoadExecutable(sal_False)
+        bLoadExecutable(false)
     {}
     virtual void            Commit();
     void                    Load();
 
-    sal_Bool                IsLoadExecutable() const {return bLoadExecutable;}
-    void                    SetLoadExecutable(sal_Bool bSet)
+    bool                IsLoadExecutable() const {return bLoadExecutable;}
+    void                    SetLoadExecutable(bool bSet)
                             {
                                 if(bSet != bLoadExecutable)
                                     SetModified();
@@ -246,8 +246,8 @@ struct SvtFilterOptions_Impl
         Load();
     }
 
-    void SetFlag( sal_uLong nFlag, sal_Bool bSet );
-    sal_Bool IsFlag( sal_uLong nFlag ) const;
+    void SetFlag( sal_uLong nFlag, bool bSet );
+    bool IsFlag( sal_uLong nFlag ) const;
     void Load()
     {
         aWriterCfg.Load();
@@ -256,7 +256,7 @@ struct SvtFilterOptions_Impl
     }
 };
 
-void SvtFilterOptions_Impl::SetFlag( sal_uLong nFlag, sal_Bool bSet )
+void SvtFilterOptions_Impl::SetFlag( sal_uLong nFlag, bool bSet )
 {
     switch(nFlag)
     {
@@ -276,9 +276,9 @@ void SvtFilterOptions_Impl::SetFlag( sal_uLong nFlag, sal_Bool bSet )
     }
 }
 
-sal_Bool SvtFilterOptions_Impl::IsFlag( sal_uLong nFlag ) const
+bool SvtFilterOptions_Impl::IsFlag( sal_uLong nFlag ) const
 {
-    sal_Bool bRet;
+    bool bRet;
     switch(nFlag)
     {
         case FILTERCFG_WORD_CODE        : bRet = aWriterCfg.IsLoad();break;
@@ -400,7 +400,7 @@ void SvtFilterOptions::Load()
         {
             if(pValues[nProp].hasValue())
             {
-                sal_Bool bVal = *(sal_Bool*)pValues[nProp].getValue();
+                bool bVal = *(sal_Bool*)pValues[nProp].getValue();
                 sal_uLong nFlag = lcl_GetFlag(nProp);
                 pImp->SetFlag( nFlag, bVal);
             }
@@ -409,117 +409,117 @@ void SvtFilterOptions::Load()
 }
 // -----------------------------------------------------------------------
 
-void SvtFilterOptions::SetLoadWordBasicCode( sal_Bool bFlag )
+void SvtFilterOptions::SetLoadWordBasicCode( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_WORD_CODE, bFlag );
     SetModified();
 }
 
-sal_Bool SvtFilterOptions::IsLoadWordBasicCode() const
+bool SvtFilterOptions::IsLoadWordBasicCode() const
 {
     return pImp->IsFlag( FILTERCFG_WORD_CODE );
 }
 
-void SvtFilterOptions::SetLoadWordBasicExecutable( sal_Bool bFlag )
+void SvtFilterOptions::SetLoadWordBasicExecutable( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_WORD_WBCTBL, bFlag );
     SetModified();
 }
 
-sal_Bool SvtFilterOptions::IsLoadWordBasicExecutable() const
+bool SvtFilterOptions::IsLoadWordBasicExecutable() const
 {
     return pImp->IsFlag( FILTERCFG_WORD_WBCTBL );
 }
 
-void SvtFilterOptions::SetLoadWordBasicStorage( sal_Bool bFlag )
+void SvtFilterOptions::SetLoadWordBasicStorage( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_WORD_STORAGE, bFlag );
     SetModified();
 }
 
-sal_Bool SvtFilterOptions::IsLoadWordBasicStorage() const
+bool SvtFilterOptions::IsLoadWordBasicStorage() const
 {
     return pImp->IsFlag( FILTERCFG_WORD_STORAGE );
 }
 
 // -----------------------------------------------------------------------
 
-void SvtFilterOptions::SetLoadExcelBasicCode( sal_Bool bFlag )
+void SvtFilterOptions::SetLoadExcelBasicCode( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_EXCEL_CODE, bFlag );
     SetModified();
 }
 
-sal_Bool SvtFilterOptions::IsLoadExcelBasicCode() const
+bool SvtFilterOptions::IsLoadExcelBasicCode() const
 {
     return pImp->IsFlag( FILTERCFG_EXCEL_CODE );
 }
 
-void SvtFilterOptions::SetLoadExcelBasicExecutable( sal_Bool bFlag )
+void SvtFilterOptions::SetLoadExcelBasicExecutable( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_EXCEL_EXECTBL, bFlag );
     SetModified();
 }
 
-sal_Bool SvtFilterOptions::IsLoadExcelBasicExecutable() const
+bool SvtFilterOptions::IsLoadExcelBasicExecutable() const
 {
     return pImp->IsFlag( FILTERCFG_EXCEL_EXECTBL );
 }
 
-void SvtFilterOptions::SetLoadExcelBasicStorage( sal_Bool bFlag )
+void SvtFilterOptions::SetLoadExcelBasicStorage( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_EXCEL_STORAGE, bFlag );
     SetModified();
 }
 
-sal_Bool SvtFilterOptions::IsLoadExcelBasicStorage() const
+bool SvtFilterOptions::IsLoadExcelBasicStorage() const
 {
     return pImp->IsFlag( FILTERCFG_EXCEL_STORAGE );
 }
 
 // -----------------------------------------------------------------------
 
-void SvtFilterOptions::SetLoadPPointBasicCode( sal_Bool bFlag )
+void SvtFilterOptions::SetLoadPPointBasicCode( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_PPOINT_CODE, bFlag );
     SetModified();
 }
 
-sal_Bool SvtFilterOptions::IsLoadPPointBasicCode() const
+bool SvtFilterOptions::IsLoadPPointBasicCode() const
 {
     return pImp->IsFlag( FILTERCFG_PPOINT_CODE );
 }
 
-void SvtFilterOptions::SetLoadPPointBasicStorage( sal_Bool bFlag )
+void SvtFilterOptions::SetLoadPPointBasicStorage( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_PPOINT_STORAGE, bFlag );
     SetModified();
 }
 
-sal_Bool SvtFilterOptions::IsLoadPPointBasicStorage() const
+bool SvtFilterOptions::IsLoadPPointBasicStorage() const
 {
     return pImp->IsFlag( FILTERCFG_PPOINT_STORAGE );
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvtFilterOptions::IsMathType2Math() const
+bool SvtFilterOptions::IsMathType2Math() const
 {
     return pImp->IsFlag( FILTERCFG_MATH_LOAD );
 }
 
-void SvtFilterOptions::SetMathType2Math( sal_Bool bFlag )
+void SvtFilterOptions::SetMathType2Math( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_MATH_LOAD, bFlag );
     SetModified();
 }
 
-sal_Bool SvtFilterOptions::IsMath2MathType() const
+bool SvtFilterOptions::IsMath2MathType() const
 {
     return pImp->IsFlag( FILTERCFG_MATH_SAVE );
 }
 
-void SvtFilterOptions::SetMath2MathType( sal_Bool bFlag )
+void SvtFilterOptions::SetMath2MathType( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_MATH_SAVE, bFlag );
     SetModified();
@@ -527,51 +527,51 @@ void SvtFilterOptions::SetMath2MathType( sal_Bool bFlag )
 
 
 // -----------------------------------------------------------------------
-sal_Bool SvtFilterOptions::IsWinWord2Writer() const
+bool SvtFilterOptions::IsWinWord2Writer() const
 {
     return pImp->IsFlag( FILTERCFG_WRITER_LOAD );
 }
 
-void SvtFilterOptions::SetWinWord2Writer( sal_Bool bFlag )
+void SvtFilterOptions::SetWinWord2Writer( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_WRITER_LOAD, bFlag );
     SetModified();
 }
 
-sal_Bool SvtFilterOptions::IsWriter2WinWord() const
+bool SvtFilterOptions::IsWriter2WinWord() const
 {
     return pImp->IsFlag( FILTERCFG_WRITER_SAVE );
 }
 
-void SvtFilterOptions::SetWriter2WinWord( sal_Bool bFlag )
+void SvtFilterOptions::SetWriter2WinWord( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_WRITER_SAVE, bFlag );
     SetModified();
 }
 
-sal_Bool SvtFilterOptions::IsUseEnhancedFields() const
+bool SvtFilterOptions::IsUseEnhancedFields() const
 {
     return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS );
 }
 
 // -----------------------------------------------------------------------
-sal_Bool SvtFilterOptions::IsExcel2Calc() const
+bool SvtFilterOptions::IsExcel2Calc() const
 {
     return pImp->IsFlag( FILTERCFG_CALC_LOAD );
 }
 
-void SvtFilterOptions::SetExcel2Calc( sal_Bool bFlag )
+void SvtFilterOptions::SetExcel2Calc( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_CALC_LOAD, bFlag );
     SetModified();
 }
 
-sal_Bool SvtFilterOptions::IsCalc2Excel() const
+bool SvtFilterOptions::IsCalc2Excel() const
 {
     return pImp->IsFlag( FILTERCFG_CALC_SAVE );
 }
 
-void SvtFilterOptions::SetCalc2Excel( sal_Bool bFlag )
+void SvtFilterOptions::SetCalc2Excel( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_CALC_SAVE, bFlag );
     SetModified();
@@ -579,23 +579,23 @@ void SvtFilterOptions::SetCalc2Excel( sal_Bool bFlag )
 
 
 // -----------------------------------------------------------------------
-sal_Bool SvtFilterOptions::IsPowerPoint2Impress() const
+bool SvtFilterOptions::IsPowerPoint2Impress() const
 {
     return pImp->IsFlag( FILTERCFG_IMPRESS_LOAD );
 }
 
-void SvtFilterOptions::SetPowerPoint2Impress( sal_Bool bFlag )
+void SvtFilterOptions::SetPowerPoint2Impress( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_IMPRESS_LOAD, bFlag );
     SetModified();
 }
 
-sal_Bool SvtFilterOptions::IsImpress2PowerPoint() const
+bool SvtFilterOptions::IsImpress2PowerPoint() const
 {
     return pImp->IsFlag( FILTERCFG_IMPRESS_SAVE );
 }
 
-void SvtFilterOptions::SetImpress2PowerPoint( sal_Bool bFlag )
+void SvtFilterOptions::SetImpress2PowerPoint( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_IMPRESS_SAVE, bFlag );
     SetModified();
@@ -603,12 +603,12 @@ void SvtFilterOptions::SetImpress2PowerPoint( sal_Bool bFlag )
 
 
 // -----------------------------------------------------------------------
-sal_Bool SvtFilterOptions::IsSmartArt2Shape() const
+bool SvtFilterOptions::IsSmartArt2Shape() const
 {
     return pImp->IsFlag( FILTERCFG_SMARTART_SHAPE_LOAD );
 }
 
-void SvtFilterOptions::SetSmartArt2Shape( sal_Bool bFlag )
+void SvtFilterOptions::SetSmartArt2Shape( bool bFlag )
 {
     pImp->SetFlag( FILTERCFG_SMARTART_SHAPE_LOAD, bFlag );
     SetModified();
@@ -629,19 +629,19 @@ SvtFilterOptions& SvtFilterOptions::Get()
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvtFilterOptions::IsEnablePPTPreview() const
+bool SvtFilterOptions::IsEnablePPTPreview() const
 {
     return pImp->IsFlag( FILTERCFG_ENABLE_PPT_PREVIEW );
 }
 
 
-sal_Bool SvtFilterOptions::IsEnableCalcPreview() const
+bool SvtFilterOptions::IsEnableCalcPreview() const
 {
     return pImp->IsFlag( FILTERCFG_ENABLE_EXCEL_PREVIEW );
 }
 
 
-sal_Bool SvtFilterOptions::IsEnableWordPreview() const
+bool SvtFilterOptions::IsEnableWordPreview() const
 {
     return pImp->IsFlag( FILTERCFG_ENABLE_WORD_PREVIEW );
 }
diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx
index 89b8bbb5d5a7..c249f67a790e 100644
--- a/unotools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.cxx
@@ -96,11 +96,11 @@ class SvtFontOptions_Impl : public ConfigItem
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        sal_Bool    IsFontHistoryEnabled        (                   ) const ;
-        void        EnableFontHistory           ( sal_Bool bState   )       ;
+        bool    IsFontHistoryEnabled        (                   ) const ;
+        void        EnableFontHistory           ( bool bState   )       ;
 
-        sal_Bool    IsFontWYSIWYGEnabled        (                   ) const ;
-        void        EnableFontWYSIWYG           ( sal_Bool bState   )       ;
+        bool    IsFontWYSIWYGEnabled        (                   ) const ;
+        void        EnableFontWYSIWYG           ( bool bState   )       ;
 
     private:
 
@@ -121,9 +121,9 @@ class SvtFontOptions_Impl : public ConfigItem
 
     private:
 
-        sal_Bool        m_bReplacementTable     ;
-        sal_Bool        m_bFontHistory          ;
-        sal_Bool        m_bFontWYSIWYG          ;
+        bool        m_bReplacementTable     ;
+        bool        m_bFontHistory          ;
+        bool        m_bFontWYSIWYG          ;
 };
 
 //*****************************************************************************************************************
@@ -133,9 +133,9 @@ SvtFontOptions_Impl::SvtFontOptions_Impl()
     // Init baseclasses first
     :   ConfigItem          ( ROOTNODE_FONT )
     // Init member then.
-    ,   m_bReplacementTable ( sal_False     )
-    ,   m_bFontHistory      ( sal_False     )
-    ,   m_bFontWYSIWYG      ( sal_False     )
+    ,   m_bReplacementTable ( false     )
+    ,   m_bFontHistory      ( false     )
+    ,   m_bFontWYSIWYG      ( false     )
 {
     // Use our static list of configuration keys to get his values.
     Sequence< OUString >    seqNames    = impl_GetPropertyNames (           );
@@ -261,7 +261,7 @@ void SvtFontOptions_Impl::Commit()
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-sal_Bool SvtFontOptions_Impl::IsFontHistoryEnabled() const
+bool SvtFontOptions_Impl::IsFontHistoryEnabled() const
 {
     return m_bFontHistory;
 }
@@ -269,7 +269,7 @@ sal_Bool SvtFontOptions_Impl::IsFontHistoryEnabled() const
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-void SvtFontOptions_Impl::EnableFontHistory( sal_Bool bState )
+void SvtFontOptions_Impl::EnableFontHistory( bool bState )
 {
     m_bFontHistory = bState;
     SetModified();
@@ -278,7 +278,7 @@ void SvtFontOptions_Impl::EnableFontHistory( sal_Bool bState )
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-sal_Bool SvtFontOptions_Impl::IsFontWYSIWYGEnabled() const
+bool SvtFontOptions_Impl::IsFontWYSIWYGEnabled() const
 {
     return m_bFontWYSIWYG;
 }
@@ -286,7 +286,7 @@ sal_Bool SvtFontOptions_Impl::IsFontWYSIWYGEnabled() const
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-void SvtFontOptions_Impl::EnableFontWYSIWYG( sal_Bool bState )
+void SvtFontOptions_Impl::EnableFontWYSIWYG( bool bState )
 {
     m_bFontWYSIWYG = bState;
     SetModified();
@@ -357,7 +357,7 @@ SvtFontOptions::~SvtFontOptions()
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-sal_Bool SvtFontOptions::IsFontHistoryEnabled() const
+bool SvtFontOptions::IsFontHistoryEnabled() const
 {
     MutexGuard aGuard( impl_GetOwnStaticMutex() );
     return m_pDataContainer->IsFontHistoryEnabled();
@@ -366,7 +366,7 @@ sal_Bool SvtFontOptions::IsFontHistoryEnabled() const
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-void SvtFontOptions::EnableFontHistory( sal_Bool bState )
+void SvtFontOptions::EnableFontHistory( bool bState )
 {
     MutexGuard aGuard( impl_GetOwnStaticMutex() );
     m_pDataContainer->EnableFontHistory( bState );
@@ -375,7 +375,7 @@ void SvtFontOptions::EnableFontHistory( sal_Bool bState )
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-sal_Bool SvtFontOptions::IsFontWYSIWYGEnabled() const
+bool SvtFontOptions::IsFontWYSIWYGEnabled() const
 {
     MutexGuard aGuard( impl_GetOwnStaticMutex() );
     return m_pDataContainer->IsFontWYSIWYGEnabled();
@@ -384,7 +384,7 @@ sal_Bool SvtFontOptions::IsFontWYSIWYGEnabled() const
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-void SvtFontOptions::EnableFontWYSIWYG( sal_Bool bState )
+void SvtFontOptions::EnableFontWYSIWYG( bool bState )
 {
     MutexGuard aGuard( impl_GetOwnStaticMutex() );
     m_pDataContainer->EnableFontWYSIWYG( bState );
diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx
index 8abbb38e84e4..cc9e4dd97ab3 100644
--- a/unotools/source/config/itemholder1.cxx
+++ b/unotools/source/config/itemholder1.cxx
@@ -64,10 +64,10 @@ ItemHolder1::ItemHolder1()
 #ifdef DBG_UTIL
     catch(const css::uno::Exception& rEx)
     {
-        static sal_Bool bMessage = sal_True;
+        static bool bMessage = true;
         if(bMessage)
         {
-            bMessage = sal_False;
+            bMessage = false;
             OString sMsg("CreateInstance with arguments exception: ");
             sMsg += OString(rEx.Message.getStr(),
                         rEx.Message.getLength(),
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 10b9c799f895..353d4cbc984f 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -52,9 +52,9 @@ namespace
         public rtl::Static< osl::Mutex, theSvtLinguConfigItemMutex > {};
 }
 
-static sal_Bool lcl_SetLocale( sal_Int16 &rLanguage, const uno::Any &rVal )
+static bool lcl_SetLocale( sal_Int16 &rLanguage, const uno::Any &rVal )
 {
-    sal_Bool bSucc = sal_False;
+    bool bSucc = false;
 
     lang::Locale aNew;
     if (rVal >>= aNew)  // conversion successful?
@@ -63,7 +63,7 @@ static sal_Bool lcl_SetLocale( sal_Int16 &rLanguage, const uno::Any &rVal )
         if (nNew != rLanguage)
         {
             rLanguage = nNew;
-            bSucc = sal_True;
+            bSucc = true;
         }
     }
     return bSucc;
@@ -92,34 +92,34 @@ SvtLinguOptions::SvtLinguOptions()
 
     // general options
     bIsUseDictionaryList    =
-    bIsIgnoreControlCharacters  = sal_True;
+    bIsIgnoreControlCharacters  = true;
 
     // spelling options
     bIsSpellCapitalization  =
-    bIsSpellSpecial         = sal_True;
+    bIsSpellSpecial         = true;
     bIsSpellAuto            =
     bIsSpellReverse         =
     bIsSpellWithDigits      =
-    bIsSpellUpperCase       = sal_False;
+    bIsSpellUpperCase       = false;
 
     // text conversion options
-    bIsIgnorePostPositionalWord     = sal_True;
+    bIsIgnorePostPositionalWord     = true;
     bIsAutoCloseDialog              =
     bIsShowEntriesRecentlyUsedFirst =
-    bIsAutoReplaceUniqueEntries     = sal_False;
-    bIsDirectionToSimplified        = sal_True;
+    bIsAutoReplaceUniqueEntries     = false;
+    bIsDirectionToSimplified        = true;
     bIsUseCharacterVariants         =
     bIsTranslateCommonTerms         =
-    bIsReverseMapping               = sal_False;
+    bIsReverseMapping               = false;
 
     bROIsDirectionToSimplified      =
     bROIsUseCharacterVariants       =
     bROIsTranslateCommonTerms       =
-    bROIsReverseMapping             = sal_False;
+    bROIsReverseMapping             = false;
 
     // hyphenation options
-    bIsHyphSpecial          = sal_True;
-    bIsHyphAuto             = sal_False;
+    bIsHyphSpecial          = true;
+    bIsHyphAuto             = false;
     nHyphMinLeading         =
     nHyphMinTrailing        = 2;
     nHyphMinWordLength      = 0;
@@ -127,8 +127,8 @@ SvtLinguOptions::SvtLinguOptions()
     nDataFilesChangedCheckValue = 0;
 
     //grammar options
-    bIsGrammarAuto = sal_False,
-    bIsGrammarInteractive = sal_False;
+    bIsGrammarAuto = false,
+    bIsGrammarInteractive = false;
 
 }
 
@@ -140,10 +140,10 @@ class SvtLinguConfigItem : public utl::ConfigItem
     SvtLinguConfigItem( const SvtLinguConfigItem & );
     SvtLinguConfigItem & operator = ( const SvtLinguConfigItem & );
 
-    static sal_Bool GetHdlByName( sal_Int32 &rnHdl, const OUString &rPropertyName, sal_Bool bFullPropName = sal_False );
+    static bool GetHdlByName( sal_Int32 &rnHdl, const OUString &rPropertyName, bool bFullPropName = false );
     static const uno::Sequence< OUString > GetPropertyNames();
-    sal_Bool                LoadOptions( const uno::Sequence< OUString > &rProperyNames );
-    sal_Bool                SaveOptions( const uno::Sequence< OUString > &rProperyNames );
+    bool                LoadOptions( const uno::Sequence< OUString > &rProperyNames );
+    bool                SaveOptions( const uno::Sequence< OUString > &rProperyNames );
 
 public:
     SvtLinguConfigItem();
@@ -167,15 +167,15 @@ public:
     com::sun::star::uno::Any
             GetProperty( sal_Int32 nPropertyHandle ) const;
 
-    sal_Bool    SetProperty( const OUString &rPropertyName,
+    bool    SetProperty( const OUString &rPropertyName,
                          const com::sun::star::uno::Any &rValue );
-    sal_Bool    SetProperty( sal_Int32 nPropertyHandle,
+    bool    SetProperty( sal_Int32 nPropertyHandle,
                          const com::sun::star::uno::Any &rValue );
 
     const SvtLinguOptions& GetOptions() const;
 
-    sal_Bool    IsReadOnly( const OUString &rPropertyName ) const;
-    sal_Bool    IsReadOnly( sal_Int32 nPropertyHandle ) const;
+    bool    IsReadOnly( const OUString &rPropertyName ) const;
+    bool    IsReadOnly( sal_Int32 nPropertyHandle ) const;
 };
 
 
@@ -279,10 +279,10 @@ const uno::Sequence< OUString > SvtLinguConfigItem::GetPropertyNames()
     return aNames;
 }
 
-sal_Bool SvtLinguConfigItem::GetHdlByName(
+bool SvtLinguConfigItem::GetHdlByName(
     sal_Int32 &rnHdl,
     const OUString &rPropertyName,
-    sal_Bool bFullPropName )
+    bool bFullPropName )
 {
     NamesToHdl *pEntry = &aNamesToHdl[0];
 
@@ -331,7 +331,7 @@ uno::Any SvtLinguConfigItem::GetProperty( sal_Int32 nPropertyHandle ) const
     uno::Any aRes;
 
     const sal_Int16 *pnVal = 0;
-    const sal_Bool  *pbVal = 0;
+    const bool  *pbVal = 0;
     const sal_Int32 *pnInt32Val = 0;
 
     const SvtLinguOptions &rOpt = const_cast< SvtLinguConfigItem * >(this)->aOpt;
@@ -407,11 +407,11 @@ uno::Any SvtLinguConfigItem::GetProperty( sal_Int32 nPropertyHandle ) const
 }
 
 
-sal_Bool SvtLinguConfigItem::SetProperty( const OUString &rPropertyName, const uno::Any &rValue )
+bool SvtLinguConfigItem::SetProperty( const OUString &rPropertyName, const uno::Any &rValue )
 {
     osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get());
 
-    sal_Bool bSucc = sal_False;
+    bool bSucc = false;
     sal_Int32 nHdl;
     if (GetHdlByName( nHdl, rPropertyName ))
         bSucc = SetProperty( nHdl, rValue );
@@ -419,18 +419,18 @@ sal_Bool SvtLinguConfigItem::SetProperty( const OUString &rPropertyName, const u
 }
 
 
-sal_Bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno::Any &rValue )
+bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno::Any &rValue )
 {
     osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get());
 
-    sal_Bool bSucc = sal_False;
+    bool bSucc = false;
     if (!rValue.hasValue())
         return bSucc;
 
-    sal_Bool bMod = sal_False;
+    bool bMod = false;
 
     sal_Int16 *pnVal = 0;
-    sal_Bool  *pbVal = 0;
+    bool  *pbVal = 0;
     sal_Int32 *pnInt32Val = 0;
 
     SvtLinguOptions &rOpt = aOpt;
@@ -453,13 +453,13 @@ sal_Bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno::
         case UPH_ACTIVE_DICTIONARIES :
         {
             rValue >>= rOpt.aActiveDics;
-            bMod = sal_True;
+            bMod = true;
             break;
         }
         case UPH_ACTIVE_CONVERSION_DICTIONARIES :
         {
             rValue >>= rOpt.aActiveConvDics;
-            bMod = sal_True;
+            bMod = true;
             break;
         }
         case UPH_DEFAULT_LOCALE :
@@ -499,15 +499,15 @@ sal_Bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno::
 
     if (pbVal)
     {
-        sal_Bool bNew = sal_Bool();
+        bool bNew = bool();
         if (rValue >>= bNew)
         {
             if (bNew != *pbVal)
             {
                 *pbVal = bNew;
-                bMod = sal_True;
+                bMod = true;
             }
-            bSucc = sal_True;
+            bSucc = true;
         }
     }
     else if (pnVal)
@@ -518,9 +518,9 @@ sal_Bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno::
             if (nNew != *pnVal)
             {
                 *pnVal = nNew;
-                bMod = sal_True;
+                bMod = true;
             }
-            bSucc = sal_True;
+            bSucc = true;
         }
     }
     else if (pnInt32Val)
@@ -531,9 +531,9 @@ sal_Bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno::
             if (nNew != *pnInt32Val)
             {
                 *pnInt32Val = nNew;
-                bMod = sal_True;
+                bMod = true;
             }
-            bSucc = sal_True;
+            bSucc = true;
         }
     }
 
@@ -550,11 +550,11 @@ const SvtLinguOptions& SvtLinguConfigItem::GetOptions() const
     return aOpt;
 }
 
-sal_Bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProperyNames )
+bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProperyNames )
 {
     osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get());
 
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
 
     const OUString *pProperyNames = rProperyNames.getConstArray();
     sal_Int32 nProps = rProperyNames.getLength();
@@ -572,7 +572,7 @@ sal_Bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProp
         {
             const uno::Any &rVal = pValue[i];
             sal_Int32 nPropertyHandle;
-            GetHdlByName( nPropertyHandle, pProperyNames[i], sal_True );
+            GetHdlByName( nPropertyHandle, pProperyNames[i], true );
             switch ( nPropertyHandle )
             {
                 case UPH_DEFAULT_LOCALE :
@@ -630,11 +630,11 @@ sal_Bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProp
                                 //default is locale dependent:
                                 if (MsLangId::isTraditionalChinese(rOpt.nDefaultLanguage_CJK))
                                 {
-                                    rOpt.bIsDirectionToSimplified = sal_False;
+                                    rOpt.bIsDirectionToSimplified = false;
                                 }
                                 else
                                 {
-                                    rOpt.bIsDirectionToSimplified = sal_True;
+                                    rOpt.bIsDirectionToSimplified = true;
                                 }
                             }
                     } break;
@@ -660,7 +660,7 @@ sal_Bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProp
             }
         }
 
-        bRes = sal_True;
+        bRes = true;
     }
     DBG_ASSERT( bRes, "LoadOptions failed" );
 
@@ -668,14 +668,14 @@ sal_Bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProp
 }
 
 
-sal_Bool SvtLinguConfigItem::SaveOptions( const uno::Sequence< OUString > &rProperyNames )
+bool SvtLinguConfigItem::SaveOptions( const uno::Sequence< OUString > &rProperyNames )
 {
     if (!IsModified())
-        return sal_True;
+        return true;
 
     osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get());
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const uno::Type &rBOOL     = ::getBooleanCppuType();
     const uno::Type &rINT16    = ::getCppuType( (sal_Int16 *) NULL );
     const uno::Type &rINT32    = ::getCppuType( (sal_Int32 *) NULL );
@@ -736,22 +736,22 @@ sal_Bool SvtLinguConfigItem::SaveOptions( const uno::Sequence< OUString > &rProp
     return bRet;
 }
 
-sal_Bool SvtLinguConfigItem::IsReadOnly( const OUString &rPropertyName ) const
+bool SvtLinguConfigItem::IsReadOnly( const OUString &rPropertyName ) const
 {
     osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get());
 
-    sal_Bool bReadOnly = sal_False;
+    bool bReadOnly = false;
     sal_Int32 nHdl;
     if (GetHdlByName( nHdl, rPropertyName ))
         bReadOnly = IsReadOnly( nHdl );
     return bReadOnly;
 }
 
-sal_Bool SvtLinguConfigItem::IsReadOnly( sal_Int32 nPropertyHandle ) const
+bool SvtLinguConfigItem::IsReadOnly( sal_Int32 nPropertyHandle ) const
 {
     osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get());
 
-    sal_Bool bReadOnly = sal_False;
+    bool bReadOnly = false;
 
     const SvtLinguOptions &rOpt = const_cast< SvtLinguConfigItem * >(this)->aOpt;
     switch(nPropertyHandle)
@@ -848,7 +848,7 @@ uno::Sequence< uno::Any > SvtLinguConfig::GetProperties( const uno::Sequence< OU
     return GetConfigItem().GetProperties(rNames);
 }
 
-sal_Bool SvtLinguConfig::ReplaceSetProperties(
+bool SvtLinguConfig::ReplaceSetProperties(
         const OUString &rNode, uno::Sequence< beans::PropertyValue > rValues )
 {
     return GetConfigItem().ReplaceSetProperties( rNode, rValues );
@@ -864,28 +864,28 @@ uno::Any SvtLinguConfig::GetProperty( sal_Int32 nPropertyHandle ) const
     return GetConfigItem().GetProperty( nPropertyHandle );
 }
 
-sal_Bool SvtLinguConfig::SetProperty( const OUString &rPropertyName, const uno::Any &rValue )
+bool SvtLinguConfig::SetProperty( const OUString &rPropertyName, const uno::Any &rValue )
 {
     return GetConfigItem().SetProperty( rPropertyName, rValue );
 }
 
-sal_Bool SvtLinguConfig::SetProperty( sal_Int32 nPropertyHandle, const uno::Any &rValue )
+bool SvtLinguConfig::SetProperty( sal_Int32 nPropertyHandle, const uno::Any &rValue )
 {
     return GetConfigItem().SetProperty( nPropertyHandle, rValue );
 }
 
-sal_Bool SvtLinguConfig::GetOptions( SvtLinguOptions &rOptions ) const
+bool SvtLinguConfig::GetOptions( SvtLinguOptions &rOptions ) const
 {
     rOptions = GetConfigItem().GetOptions();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SvtLinguConfig::IsReadOnly( const OUString &rPropertyName ) const
+bool SvtLinguConfig::IsReadOnly( const OUString &rPropertyName ) const
 {
     return GetConfigItem().IsReadOnly( rPropertyName );
 }
 
-sal_Bool SvtLinguConfig::GetElementNamesFor(
+bool SvtLinguConfig::GetElementNamesFor(
      const OUString &rNodeName,
      uno::Sequence< OUString > &rElementNames ) const
 {
@@ -904,13 +904,13 @@ sal_Bool SvtLinguConfig::GetElementNamesFor(
     return bSuccess;
 }
 
-sal_Bool SvtLinguConfig::GetSupportedDictionaryFormatsFor(
+bool SvtLinguConfig::GetSupportedDictionaryFormatsFor(
     const OUString &rSetName,
     const OUString &rSetEntry,
     uno::Sequence< OUString > &rFormatList ) const
 {
     if (rSetName.isEmpty() || rSetEntry.isEmpty())
-        return sal_False;
+        return false;
     bool bSuccess = false;
     try
     {
@@ -969,12 +969,12 @@ static bool lcl_GetFileUrlFromOrigin(
 }
 
 
-sal_Bool SvtLinguConfig::GetDictionaryEntry(
+bool SvtLinguConfig::GetDictionaryEntry(
     const OUString &rNodeName,
     SvtLinguConfigDictionaryEntry &rDicEntry ) const
 {
     if (rNodeName.isEmpty())
-        return sal_False;
+        return false;
     bool bSuccess = false;
     try
     {
diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx
index 4fac21c7c4d9..4726ccd5aeba 100644
--- a/unotools/source/config/localisationoptions.cxx
+++ b/unotools/source/config/localisationoptions.cxx
@@ -33,7 +33,7 @@ using namespace ::osl                   ;
 using namespace ::com::sun::star::uno   ;
 
 #define ROOTNODE_LOCALISATION           OUString("Office.Common/View/Localisation")
-#define DEFAULT_AUTOMNEMONIC            sal_False
+#define DEFAULT_AUTOMNEMONIC            false
 #define DEFAULT_DIALOGSCALE             0
 
 #define PROPERTYNAME_AUTOMNEMONIC       OUString("AutoMnemonic")
@@ -95,7 +95,7 @@ class SvtLocalisationOptions_Impl : public ConfigItem
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        sal_Bool    IsAutoMnemonic  (                   ) const ;
+        bool    IsAutoMnemonic  (                   ) const ;
         sal_Int32   GetDialogScale  (                   ) const ;
 
     private:
@@ -117,7 +117,7 @@ class SvtLocalisationOptions_Impl : public ConfigItem
 
     private:
 
-        sal_Bool    m_bAutoMnemonic     ;
+        bool    m_bAutoMnemonic     ;
         sal_Int32   m_nDialogScale      ;
 };
 
@@ -243,7 +243,7 @@ void SvtLocalisationOptions_Impl::Commit()
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-sal_Bool SvtLocalisationOptions_Impl::IsAutoMnemonic() const
+bool SvtLocalisationOptions_Impl::IsAutoMnemonic() const
 {
     return m_bAutoMnemonic;
 }
@@ -317,7 +317,7 @@ SvtLocalisationOptions::~SvtLocalisationOptions()
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-sal_Bool SvtLocalisationOptions::IsAutoMnemonic() const
+bool SvtLocalisationOptions::IsAutoMnemonic() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsAutoMnemonic();
diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index 62ef5f11e9f8..15adf8b10c8b 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -39,9 +39,9 @@ static sal_Int32 nRefCount = 0;
 
 class SfxMiscCfg : public utl::ConfigItem
 {
-    sal_Bool            bPaperSize;     // printer warnings
-    sal_Bool            bPaperOrientation;
-    sal_Bool            bNotFound;
+    bool            bPaperSize;     // printer warnings
+    bool            bPaperOrientation;
+    bool            bNotFound;
     sal_Int32       nYear2000;      // two digit year representation
 
     const com::sun::star::uno::Sequence<OUString> GetPropertyNames();
@@ -54,14 +54,14 @@ public:
     virtual void            Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames);
     virtual void            Commit();
 
-    sal_Bool        IsNotFoundWarning()     const {return bNotFound;}
-    void        SetNotFoundWarning( sal_Bool bSet);
+    bool        IsNotFoundWarning()     const {return bNotFound;}
+    void        SetNotFoundWarning( bool bSet);
 
-    sal_Bool        IsPaperSizeWarning()    const {return bPaperSize;}
-    void        SetPaperSizeWarning(sal_Bool bSet);
+    bool        IsPaperSizeWarning()    const {return bPaperSize;}
+    void        SetPaperSizeWarning(bool bSet);
 
-    sal_Bool        IsPaperOrientationWarning()     const {return bPaperOrientation;}
-    void        SetPaperOrientationWarning( sal_Bool bSet);
+    bool        IsPaperOrientationWarning()     const {return bPaperOrientation;}
+    void        SetPaperOrientationWarning( bool bSet);
 
                 // 0 ... 99
     sal_Int32   GetYear2000()           const { return nYear2000; }
@@ -71,9 +71,9 @@ public:
 
 SfxMiscCfg::SfxMiscCfg() :
     ConfigItem(OUString("Office.Common") ),
-    bPaperSize(sal_False),
-    bPaperOrientation (sal_False),
-    bNotFound (sal_False),
+    bPaperSize(false),
+    bPaperOrientation (false),
+    bNotFound (false),
     nYear2000( 1930 )
 {
     Load();
@@ -83,21 +83,21 @@ SfxMiscCfg::~SfxMiscCfg()
 {
 }
 
-void SfxMiscCfg::SetNotFoundWarning( sal_Bool bSet)
+void SfxMiscCfg::SetNotFoundWarning( bool bSet)
 {
     if(bNotFound != bSet)
         SetModified();
     bNotFound = bSet;
 }
 
-void SfxMiscCfg::SetPaperSizeWarning( sal_Bool bSet)
+void SfxMiscCfg::SetPaperSizeWarning( bool bSet)
 {
     if(bPaperSize != bSet)
         SetModified();
     bPaperSize = bSet;
 }
 
-void SfxMiscCfg::SetPaperOrientationWarning( sal_Bool bSet)
+void SfxMiscCfg::SetPaperOrientationWarning( bool bSet)
 {
     if(bPaperOrientation != bSet)
         SetModified();
@@ -210,32 +210,32 @@ MiscCfg::~MiscCfg( )
     }
 }
 
-sal_Bool MiscCfg::IsNotFoundWarning()   const
+bool MiscCfg::IsNotFoundWarning()   const
 {
     return pImpl->IsNotFoundWarning();
 }
 
-void MiscCfg::SetNotFoundWarning(   sal_Bool bSet)
+void MiscCfg::SetNotFoundWarning(   bool bSet)
 {
     pImpl->SetNotFoundWarning( bSet );
 }
 
-sal_Bool MiscCfg::IsPaperSizeWarning()  const
+bool MiscCfg::IsPaperSizeWarning()  const
 {
     return pImpl->IsPaperSizeWarning();
 }
 
-void MiscCfg::SetPaperSizeWarning(sal_Bool bSet)
+void MiscCfg::SetPaperSizeWarning(bool bSet)
 {
     pImpl->SetPaperSizeWarning( bSet );
 }
 
-sal_Bool MiscCfg::IsPaperOrientationWarning()   const
+bool MiscCfg::IsPaperOrientationWarning()   const
 {
     return pImpl->IsPaperOrientationWarning();
 }
 
-void MiscCfg::SetPaperOrientationWarning(   sal_Bool bSet)
+void MiscCfg::SetPaperOrientationWarning(   bool bSet)
 {
     pImpl->SetPaperOrientationWarning( bSet );
 }
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index aa3ce5afd764..60607d0e4352 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -103,7 +103,7 @@ struct FactoryInfo
         // easy way to reset struct member!
         void free()
         {
-            bInstalled                  = sal_False;
+            bInstalled                  = false;
             sFactory                    = "";
             sShortName                  = "";
             sTemplateFile               = "";
@@ -111,12 +111,12 @@ struct FactoryInfo
             sEmptyDocumentURL           = "";
             sDefaultFilter              = "";
             nIcon                       = 0;
-            bChangedTemplateFile        = sal_False;
-            bChangedWindowAttributes    = sal_False;
-            bChangedEmptyDocumentURL    = sal_False;
-            bChangedDefaultFilter       = sal_False;
-            bChangedIcon                = sal_False;
-            bDefaultFilterReadonly      = sal_False;
+            bChangedTemplateFile        = false;
+            bChangedWindowAttributes    = false;
+            bChangedEmptyDocumentURL    = false;
+            bChangedDefaultFilter       = false;
+            bChangedIcon                = false;
+            bDefaultFilterReadonly      = false;
         }
 
         //---------------------------------------------------------------------------------------------------------
@@ -131,7 +131,7 @@ struct FactoryInfo
             css::uno::Sequence< css::beans::PropertyValue > lProperties   ( 4 );
             sal_Int8                                        nRealyChanged = 0  ;
 
-            if( bChangedTemplateFile == sal_True )
+            if( bChangedTemplateFile )
             {
                 lProperties[nRealyChanged].Name = sNodeBase + PROPERTYNAME_TEMPLATEFILE;
 
@@ -148,25 +148,25 @@ struct FactoryInfo
 
                 ++nRealyChanged;
             }
-            if( bChangedWindowAttributes == sal_True )
+            if( bChangedWindowAttributes )
             {
                 lProperties[nRealyChanged].Name    = sNodeBase + PROPERTYNAME_WINDOWATTRIBUTES;
                 lProperties[nRealyChanged].Value <<= sWindowAttributes;
                 ++nRealyChanged;
             }
-            if( bChangedEmptyDocumentURL == sal_True )
+            if( bChangedEmptyDocumentURL )
             {
                 lProperties[nRealyChanged].Name    = sNodeBase + PROPERTYNAME_EMPTYDOCUMENTURL;
                 lProperties[nRealyChanged].Value <<= sEmptyDocumentURL;
                 ++nRealyChanged;
             }
-            if( bChangedDefaultFilter == sal_True )
+            if( bChangedDefaultFilter )
             {
                 lProperties[nRealyChanged].Name    = sNodeBase + PROPERTYNAME_DEFAULTFILTER;
                 lProperties[nRealyChanged].Value <<= sDefaultFilter;
                 ++nRealyChanged;
             }
-            if( bChangedIcon == sal_True )
+            if( bChangedIcon )
             {
                 lProperties[nRealyChanged].Name    = sNodeBase + PROPERTYNAME_ICON;
                 lProperties[nRealyChanged].Value <<= nIcon;
@@ -174,11 +174,11 @@ struct FactoryInfo
             }
 
             // Don't forget to reset changed flags! Otherwise we save it again and again and ...
-            bChangedTemplateFile        = sal_False         ;
-            bChangedWindowAttributes    = sal_False         ;
-            bChangedEmptyDocumentURL    = sal_False         ;
-            bChangedDefaultFilter       = sal_False         ;
-            bChangedIcon                = sal_False         ;
+            bChangedTemplateFile        = false         ;
+            bChangedWindowAttributes    = false         ;
+            bChangedEmptyDocumentURL    = false         ;
+            bChangedDefaultFilter       = false         ;
+            bChangedIcon                = false         ;
 
             lProperties.realloc( nRealyChanged );
             return lProperties;
@@ -188,25 +188,25 @@ struct FactoryInfo
         // We must support setting AND marking of changed values.
         // That's why we can't make our member public. We must use get/set/init methods
         // to control access on it!
-        sal_Bool            getInstalled        () const { return bInstalled;         };
+        bool            getInstalled        () const { return bInstalled;         };
         OUString     getFactory          () const { return sFactory;           };
         OUString     getShortName        () const { return sShortName;         };
         OUString     getTemplateFile     () const { return sTemplateFile;      };
         OUString     getWindowAttributes () const { return sWindowAttributes;  };
         OUString     getDefaultFilter    () const { return sDefaultFilter;     };
-        sal_Bool            isDefaultFilterReadonly() const { return bDefaultFilterReadonly; }
+        bool            isDefaultFilterReadonly() const { return bDefaultFilterReadonly; }
         sal_Int32           getIcon             () const { return nIcon;              };
 
         //---------------------------------------------------------------------------------------------------------
         // If you call set-methods - we check for changes of valkues and mark it.
         // But if you wish to set it without that ... you must initialize it!
-        void initInstalled        ( sal_Bool               bNewInstalled        ) { bInstalled        = bNewInstalled        ; }
+        void initInstalled        ( bool               bNewInstalled        ) { bInstalled        = bNewInstalled        ; }
         void initFactory          ( const OUString& sNewFactory          ) { sFactory          = sNewFactory          ; }
         void initShortName        ( const OUString& sNewShortName        ) { sShortName        = sNewShortName        ; }
         void initWindowAttributes ( const OUString& sNewWindowAttributes ) { sWindowAttributes = sNewWindowAttributes ; }
         void initEmptyDocumentURL ( const OUString& sNewEmptyDocumentURL ) { sEmptyDocumentURL = sNewEmptyDocumentURL ; }
         void initDefaultFilter    ( const OUString& sNewDefaultFilter    ) { sDefaultFilter    = sNewDefaultFilter    ; }
-        void setDefaultFilterReadonly( const sal_Bool bVal){bDefaultFilterReadonly = bVal;}
+        void setDefaultFilterReadonly( const bool bVal){bDefaultFilterReadonly = bVal;}
         void initIcon             ( sal_Int32              nNewIcon             ) { nIcon             = nNewIcon             ; }
 
         //---------------------------------------------------------------------------------------------------------
@@ -230,7 +230,7 @@ struct FactoryInfo
             if( sTemplateFile != sNewTemplateFile )
             {
                 sTemplateFile        = sNewTemplateFile;
-                bChangedTemplateFile = sal_True        ;
+                bChangedTemplateFile = true        ;
             }
         };
 
@@ -240,7 +240,7 @@ struct FactoryInfo
             if( sWindowAttributes != sNewWindowAttributes )
             {
                 sWindowAttributes        = sNewWindowAttributes;
-                bChangedWindowAttributes = sal_True            ;
+                bChangedWindowAttributes = true            ;
             }
         };
 
@@ -250,7 +250,7 @@ struct FactoryInfo
             if( sDefaultFilter != sNewDefaultFilter )
             {
                 sDefaultFilter       = sNewDefaultFilter;
-                bChangedDefaultFilter = sal_True         ;
+                bChangedDefaultFilter = true         ;
             }
         };
 
@@ -264,7 +264,7 @@ struct FactoryInfo
             return xSubstVars;
         }
 
-        sal_Bool            bInstalled                      ;
+        bool            bInstalled                      ;
         OUString     sFactory                        ;
         OUString     sShortName                      ;
         OUString     sTemplateFile                   ;
@@ -273,12 +273,12 @@ struct FactoryInfo
         OUString     sDefaultFilter                  ;
         sal_Int32           nIcon                           ;
 
-        sal_Bool            bChangedTemplateFile        :1  ;
-        sal_Bool            bChangedWindowAttributes    :1  ;
-        sal_Bool            bChangedEmptyDocumentURL    :1  ;
-        sal_Bool            bChangedDefaultFilter       :1  ;
-        sal_Bool            bChangedIcon                :1  ;
-        sal_Bool            bDefaultFilterReadonly      :1  ;
+        bool            bChangedTemplateFile        :1  ;
+        bool            bChangedWindowAttributes    :1  ;
+        bool            bChangedEmptyDocumentURL    :1  ;
+        bool            bChangedDefaultFilter       :1  ;
+        bool            bChangedIcon                :1  ;
+        bool            bDefaultFilterReadonly      :1  ;
 
         css::uno::Reference< css::util::XStringSubstitution >  xSubstVars;
 };
@@ -318,15 +318,15 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem
         //---------------------------------------------------------------------------------------------------------
         //  public interface
         //---------------------------------------------------------------------------------------------------------
-        sal_Bool        IsModuleInstalled         (       SvtModuleOptions::EModule     eModule    ) const;
+        bool        IsModuleInstalled         (       SvtModuleOptions::EModule     eModule    ) const;
         ::com::sun::star::uno::Sequence < OUString > GetAllServiceNames();
         OUString GetFactoryName            (       SvtModuleOptions::EFactory    eFactory   ) const;
         OUString GetFactoryStandardTemplate(       SvtModuleOptions::EFactory    eFactory   ) const;
         OUString GetFactoryEmptyDocumentURL(       SvtModuleOptions::EFactory    eFactory   ) const;
         OUString GetFactoryDefaultFilter   (       SvtModuleOptions::EFactory    eFactory   ) const;
-        sal_Bool        IsDefaultFilterReadonly(          SvtModuleOptions::EFactory eFactory      ) const;
+        bool        IsDefaultFilterReadonly(          SvtModuleOptions::EFactory eFactory      ) const;
         sal_Int32       GetFactoryIcon            (       SvtModuleOptions::EFactory    eFactory   ) const;
-        static sal_Bool ClassifyFactoryByName     ( const OUString&              sName      ,
+        static bool ClassifyFactoryByName     ( const OUString&              sName      ,
                                                           SvtModuleOptions::EFactory&   eFactory   );
         void            SetFactoryStandardTemplate(       SvtModuleOptions::EFactory    eFactory   ,
                                                     const OUString&              sTemplate  );
@@ -351,7 +351,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem
     //-------------------------------------------------------------------------------------------------------------
     private:
         FactoryInfoList     m_lFactories;
-        sal_Bool            m_bReadOnlyStatesWellKnown;
+        bool            m_bReadOnlyStatesWellKnown;
 };
 
 /*-************************************************************************************************************//**
@@ -370,7 +370,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem
 *//*-*************************************************************************************************************/
 SvtModuleOptions_Impl::SvtModuleOptions_Impl()
     :   ::utl::ConfigItem( ROOTNODE_FACTORIES )
-    ,   m_bReadOnlyStatesWellKnown( sal_False )
+    ,   m_bReadOnlyStatesWellKnown( false )
 {
     // First initialize list of factory infos! Otherwise we couldnt gurantee right working of these class.
     for( sal_Int32 nFactory=0; nFactory<FACTORYCOUNT; ++nFactory )
@@ -505,9 +505,9 @@ void SvtModuleOptions_Impl::Commit()
     @onerror    We return default values. (mostly "not installed"!)
     @threadsafe no
 *//*-*****************************************************************************************************/
-sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eModule ) const
+bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eModule ) const
 {
-    sal_Bool bInstalled = sal_False;
+    bool bInstalled = false;
     switch( eModule )
     {
         case SvtModuleOptions::E_SWRITER    :   bInstalled = m_lFactories[SvtModuleOptions::E_WRITER].getInstalled();
@@ -528,7 +528,7 @@ sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eMo
                                                 break;
         case SvtModuleOptions::E_SSTARTMODULE :   bInstalled = m_lFactories[SvtModuleOptions::E_STARTMODULE].getInstalled();
                                                 break;
-        case SvtModuleOptions::E_SBASIC     :   bInstalled = sal_True; // Couldn't be deselected by setup yet!
+        case SvtModuleOptions::E_SBASIC     :   bInstalled = true; // Couldn't be deselected by setup yet!
                                                 break;
         case SvtModuleOptions::E_SDATABASE  :   bInstalled = m_lFactories[SvtModuleOptions::E_DATABASE].getInstalled();
                                                 break;
@@ -702,9 +702,9 @@ OUString SvtModuleOptions_Impl::GetFactoryDefaultFilter( SvtModuleOptions::EFact
     return sDefaultFilter;
 }
 //*****************************************************************************************************************
-sal_Bool SvtModuleOptions_Impl::IsDefaultFilterReadonly( SvtModuleOptions::EFactory eFactory   ) const
+bool SvtModuleOptions_Impl::IsDefaultFilterReadonly( SvtModuleOptions::EFactory eFactory   ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( eFactory>=0 && eFactory<FACTORYCOUNT )
     {
         bRet = m_lFactories[eFactory].isDefaultFilterReadonly();
@@ -801,62 +801,62 @@ css::uno::Sequence< OUString > SvtModuleOptions_Impl::impl_ExpandSetNames( const
     @onerror    We return false.
     @threadsafe no
 *//*-*************************************************************************************************************/
-sal_Bool SvtModuleOptions_Impl::ClassifyFactoryByName( const OUString& sName, SvtModuleOptions::EFactory& eFactory )
+bool SvtModuleOptions_Impl::ClassifyFactoryByName( const OUString& sName, SvtModuleOptions::EFactory& eFactory )
 {
-    sal_Bool bState;
+    bool bState;
 
     eFactory = SvtModuleOptions::E_WRITER     ;
     bState   = ( sName == FACTORYNAME_WRITER );
 
-    if( bState == sal_False )
+    if( !bState )
     {
         eFactory = SvtModuleOptions::E_WRITERWEB     ;
         bState   = ( sName == FACTORYNAME_WRITERWEB );
     }
     // no else!
-    if( bState == sal_False )
+    if( !bState )
     {
         eFactory = SvtModuleOptions::E_WRITERGLOBAL     ;
         bState   = ( sName == FACTORYNAME_WRITERGLOBAL );
     }
     // no else!
-    if( bState == sal_False )
+    if( !bState )
     {
         eFactory = SvtModuleOptions::E_CALC     ;
         bState   = ( sName == FACTORYNAME_CALC );
     }
     // no else!
-    if( bState == sal_False )
+    if( !bState )
     {
         eFactory = SvtModuleOptions::E_DRAW     ;
         bState   = ( sName == FACTORYNAME_DRAW );
     }
     // no else!
-    if( bState == sal_False )
+    if( !bState )
     {
         eFactory = SvtModuleOptions::E_IMPRESS     ;
         bState   = ( sName == FACTORYNAME_IMPRESS );
     }
     // no else!
-    if( bState == sal_False )
+    if( !bState )
     {
         eFactory = SvtModuleOptions::E_MATH     ;
         bState   = ( sName == FACTORYNAME_MATH );
     }
     // no else!
-    if( bState == sal_False )
+    if( !bState )
     {
         eFactory = SvtModuleOptions::E_CHART     ;
         bState   = ( sName == FACTORYNAME_CHART );
     }
     // no else!
-    if( bState == sal_False )
+    if( !bState )
     {
         eFactory = SvtModuleOptions::E_DATABASE     ;
         bState   = ( sName == FACTORYNAME_DATABASE );
     }
     // no else!
-    if( bState == sal_False )
+    if( !bState )
     {
         eFactory = SvtModuleOptions::E_STARTMODULE    ;
         bState   = ( sName == FACTORYNAME_STARTMODULE);
@@ -911,7 +911,7 @@ void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< OUString >& lFa
     for( sal_Int32 nSetNode=0; nSetNode<nNodeCount; ++nSetNode )
     {
         const OUString& sFactoryName = lFactories[nSetNode];
-        if( ClassifyFactoryByName( sFactoryName, eFactory ) == sal_True )
+        if( ClassifyFactoryByName( sFactoryName, eFactory ) )
         {
             OUString sTemp;
             sal_Int32       nTemp = 0;
@@ -919,7 +919,7 @@ void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< OUString >& lFa
             pInfo = &(m_lFactories[eFactory]);
             pInfo->free();
 
-            pInfo->initInstalled( sal_True     );
+            pInfo->initInstalled( true     );
             pInfo->initFactory  ( sFactoryName );
 
             if (lValues[nPropertyStart+PROPERTYHANDLE_SHORTNAME] >>= sTemp)
@@ -971,7 +971,7 @@ void SvtModuleOptions_Impl::MakeReadonlyStatesAvailable()
         rInfo.setDefaultFilterReadonly(lReadonlyStates[i]);
     }
 
-    m_bReadOnlyStatesWellKnown = sal_True;
+    m_bReadOnlyStatesWellKnown = true;
 }
 
 //*****************************************************************************************************************
@@ -1032,7 +1032,7 @@ SvtModuleOptions::~SvtModuleOptions()
     @onerror    -
     @threadsafe yes
 *//*-*************************************************************************************************************/
-sal_Bool SvtModuleOptions::IsModuleInstalled( EModule eModule ) const
+bool SvtModuleOptions::IsModuleInstalled( EModule eModule ) const
 {
     ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() );
     return m_pDataContainer->IsModuleInstalled( eModule );
@@ -1066,7 +1066,7 @@ OUString SvtModuleOptions::GetFactoryDefaultFilter( EFactory eFactory ) const
     return m_pDataContainer->GetFactoryDefaultFilter( eFactory );
 }
 //*****************************************************************************************************************
-sal_Bool SvtModuleOptions::IsDefaultFilterReadonly( EFactory eFactory   ) const
+bool SvtModuleOptions::IsDefaultFilterReadonly( EFactory eFactory   ) const
 {
     ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() );
     m_pDataContainer->MakeReadonlyStatesAvailable();
@@ -1080,7 +1080,7 @@ sal_Int32 SvtModuleOptions::GetFactoryIcon( EFactory eFactory ) const
 }
 
 //*****************************************************************************************************************
-sal_Bool SvtModuleOptions::ClassifyFactoryByName( const OUString& sName    ,
+bool SvtModuleOptions::ClassifyFactoryByName( const OUString& sName    ,
                                                         EFactory&        eFactory )
 {
     // We don't need any mutex here ... because we don't use any member here!
@@ -1104,54 +1104,54 @@ void SvtModuleOptions::SetFactoryDefaultFilter(       EFactory         eFactory,
 }
 
 //*****************************************************************************************************************
-sal_Bool SvtModuleOptions::IsMath() const
+bool SvtModuleOptions::IsMath() const
 {
     ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() );
     return m_pDataContainer->IsModuleInstalled( E_SMATH );
 }
 
 //*****************************************************************************************************************
-sal_Bool SvtModuleOptions::IsChart() const
+bool SvtModuleOptions::IsChart() const
 {
     ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() );
     return m_pDataContainer->IsModuleInstalled( E_SCHART );
 }
 
 //*****************************************************************************************************************
-sal_Bool SvtModuleOptions::IsCalc() const
+bool SvtModuleOptions::IsCalc() const
 {
     ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() );
     return m_pDataContainer->IsModuleInstalled( E_SCALC );
 }
 
 //*****************************************************************************************************************
-sal_Bool SvtModuleOptions::IsDraw() const
+bool SvtModuleOptions::IsDraw() const
 {
     ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() );
     return m_pDataContainer->IsModuleInstalled( E_SDRAW );
 }
 
 //*****************************************************************************************************************
-sal_Bool SvtModuleOptions::IsWriter() const
+bool SvtModuleOptions::IsWriter() const
 {
     ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() );
     return m_pDataContainer->IsModuleInstalled( E_SWRITER );
 }
 
 //*****************************************************************************************************************
-sal_Bool SvtModuleOptions::IsImpress() const
+bool SvtModuleOptions::IsImpress() const
 {
     ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() );
     return m_pDataContainer->IsModuleInstalled( E_SIMPRESS );
 }
 
 //*****************************************************************************************************************
-sal_Bool SvtModuleOptions::IsBasicIDE() const
+bool SvtModuleOptions::IsBasicIDE() const
 {
-    return sal_True;
+    return true;
 }
 //*****************************************************************************************************************
-sal_Bool SvtModuleOptions::IsDataBase() const
+bool SvtModuleOptions::IsDataBase() const
 {
     ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() );
     return m_pDataContainer->IsModuleInstalled( E_SDATABASE );
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index 29ca7de9fdaa..6bfed83d7e99 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -52,7 +52,7 @@ private:
 
     enum NodeType{ NT_Group, NT_Page, NT_Option };
     void            ReadNode( const OUString& _rNode, NodeType _eType );
-    sal_Bool        IsHidden( const OUString& _rPath ) const;
+    bool        IsHidden( const OUString& _rPath ) const;
 
 public:
                     SvtOptionsDlgOptions_Impl();
@@ -62,10 +62,10 @@ public:
 
     static ::osl::Mutex & getInitMutex();
 
-    sal_Bool        IsGroupHidden   (   const OUString& _rGroup ) const;
-    sal_Bool        IsPageHidden    (   const OUString& _rPage,
+    bool        IsGroupHidden   (   const OUString& _rGroup ) const;
+    bool        IsPageHidden    (   const OUString& _rPage,
                                         const OUString& _rGroup ) const;
-    sal_Bool        IsOptionHidden  (   const OUString& _rOption,
+    bool        IsOptionHidden  (   const OUString& _rOption,
                                         const OUString& _rPage,
                                         const OUString& _rGroup ) const;
 };
@@ -149,7 +149,7 @@ void SvtOptionsDlgOptions_Impl::ReadNode( const OUString& _rNode, NodeType _eTyp
 
     Sequence< Any > aValues;
     aValues = GetProperties( lResult );
-    sal_Bool bHide = sal_False;
+    bool bHide = false;
     if ( aValues[0] >>= bHide )
         m_aOptionNodeList.insert( OptionNodeList::value_type( sNode, bHide ) );
 
@@ -185,9 +185,9 @@ OUString getOptionPath( const OUString& _rOption )
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvtOptionsDlgOptions_Impl::IsHidden( const OUString& _rPath ) const
+bool SvtOptionsDlgOptions_Impl::IsHidden( const OUString& _rPath ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     OptionNodeList::const_iterator pIter = m_aOptionNodeList.find( _rPath );
     if ( pIter != m_aOptionNodeList.end() )
         bRet = pIter->second;
@@ -196,21 +196,21 @@ sal_Bool SvtOptionsDlgOptions_Impl::IsHidden( const OUString& _rPath ) const
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvtOptionsDlgOptions_Impl::IsGroupHidden( const OUString& _rGroup ) const
+bool SvtOptionsDlgOptions_Impl::IsGroupHidden( const OUString& _rGroup ) const
 {
     return IsHidden( getGroupPath( _rGroup ) );
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvtOptionsDlgOptions_Impl::IsPageHidden( const OUString& _rPage, const OUString& _rGroup ) const
+bool SvtOptionsDlgOptions_Impl::IsPageHidden( const OUString& _rPage, const OUString& _rGroup ) const
 {
     return IsHidden( getGroupPath( _rGroup  ) + getPagePath( _rPage ) );
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvtOptionsDlgOptions_Impl::IsOptionHidden(
+bool SvtOptionsDlgOptions_Impl::IsOptionHidden(
     const OUString& _rOption, const OUString& _rPage, const OUString& _rGroup ) const
 {
     return IsHidden( getGroupPath( _rGroup  ) + getPagePath( _rPage ) + getOptionPath( _rOption ) );
@@ -247,17 +247,17 @@ SvtOptionsDialogOptions::~SvtOptionsDialogOptions()
     }
 }
 
-sal_Bool SvtOptionsDialogOptions::IsGroupHidden( const OUString& _rGroup ) const
+bool SvtOptionsDialogOptions::IsGroupHidden( const OUString& _rGroup ) const
 {
     return m_pImp->IsGroupHidden( _rGroup );
 }
 
-sal_Bool SvtOptionsDialogOptions::IsPageHidden( const OUString& _rPage, const OUString& _rGroup ) const
+bool SvtOptionsDialogOptions::IsPageHidden( const OUString& _rPage, const OUString& _rGroup ) const
 {
     return m_pImp->IsPageHidden( _rPage, _rGroup );
 }
 
-sal_Bool SvtOptionsDialogOptions::IsOptionHidden(
+bool SvtOptionsDialogOptions::IsOptionHidden(
     const OUString& _rOption, const OUString& _rPage, const OUString& _rGroup ) const
 {
     return m_pImp->IsOptionHidden( _rOption, _rPage, _rGroup );
diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx
index 73c171970c90..b4736c263254 100644
--- a/unotools/source/config/printwarningoptions.cxx
+++ b/unotools/source/config/printwarningoptions.cxx
@@ -74,17 +74,17 @@ public:
 //  public interface
 //---------------------------------------------------------------------------------------------------------
 
-    sal_Bool    IsPaperSize() const { return m_bPaperSize; }
-    sal_Bool    IsPaperOrientation() const { return m_bPaperOrientation; }
-    sal_Bool    IsNotFound() const { return m_bNotFound; }
-    sal_Bool    IsTransparency() const { return m_bTransparency; }
-    sal_Bool    IsModifyDocumentOnPrintingAllowed() const { return m_bModifyDocumentOnPrintingAllowed; }
-
-    void        SetPaperSize( sal_Bool bState ) { m_bPaperSize = bState; SetModified(); }
-    void        SetPaperOrientation( sal_Bool bState ) { m_bPaperOrientation = bState; SetModified(); }
-    void        SetNotFound( sal_Bool bState ) { m_bNotFound = bState; SetModified(); }
-    void        SetTransparency( sal_Bool bState ) { m_bTransparency = bState; SetModified(); }
-    void        SetModifyDocumentOnPrintingAllowed( sal_Bool bState ) { m_bModifyDocumentOnPrintingAllowed = bState; SetModified(); }
+    bool    IsPaperSize() const { return m_bPaperSize; }
+    bool    IsPaperOrientation() const { return m_bPaperOrientation; }
+    bool    IsNotFound() const { return m_bNotFound; }
+    bool    IsTransparency() const { return m_bTransparency; }
+    bool    IsModifyDocumentOnPrintingAllowed() const { return m_bModifyDocumentOnPrintingAllowed; }
+
+    void        SetPaperSize( bool bState ) { m_bPaperSize = bState; SetModified(); }
+    void        SetPaperOrientation( bool bState ) { m_bPaperOrientation = bState; SetModified(); }
+    void        SetNotFound( bool bState ) { m_bNotFound = bState; SetModified(); }
+    void        SetTransparency( bool bState ) { m_bTransparency = bState; SetModified(); }
+    void        SetModifyDocumentOnPrintingAllowed( bool bState ) { m_bModifyDocumentOnPrintingAllowed = bState; SetModified(); }
 
 //-------------------------------------------------------------------------------------------------------------
 //  private methods
@@ -100,11 +100,11 @@ private:
 
 private:
 
-    sal_Bool    m_bPaperSize;
-    sal_Bool    m_bPaperOrientation;
-    sal_Bool    m_bNotFound;
-    sal_Bool    m_bTransparency;
-    sal_Bool    m_bModifyDocumentOnPrintingAllowed;
+    bool    m_bPaperSize;
+    bool    m_bPaperOrientation;
+    bool    m_bNotFound;
+    bool    m_bTransparency;
+    bool    m_bModifyDocumentOnPrintingAllowed;
 };
 
 //*****************************************************************************************************************
@@ -112,11 +112,11 @@ private:
 //*****************************************************************************************************************
 SvtPrintWarningOptions_Impl::SvtPrintWarningOptions_Impl() :
     ConfigItem( ROOTNODE_START  ),
-    m_bPaperSize( sal_False ),
-    m_bPaperOrientation( sal_False ),
-    m_bNotFound( sal_False ),
-    m_bTransparency( sal_True ),
-    m_bModifyDocumentOnPrintingAllowed( sal_True )
+    m_bPaperSize( false ),
+    m_bPaperOrientation( false ),
+    m_bNotFound( false ),
+    m_bTransparency( true ),
+    m_bModifyDocumentOnPrintingAllowed( true )
 {
     Sequence< OUString >    seqNames( impl_GetPropertyNames() );
     Sequence< Any >         seqValues( GetProperties( seqNames ) );
@@ -287,7 +287,7 @@ SvtPrintWarningOptions::~SvtPrintWarningOptions()
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-sal_Bool SvtPrintWarningOptions::IsPaperSize() const
+bool SvtPrintWarningOptions::IsPaperSize() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsPaperSize();
@@ -296,7 +296,7 @@ sal_Bool SvtPrintWarningOptions::IsPaperSize() const
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-sal_Bool SvtPrintWarningOptions::IsPaperOrientation() const
+bool SvtPrintWarningOptions::IsPaperOrientation() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsPaperOrientation();
@@ -305,7 +305,7 @@ sal_Bool SvtPrintWarningOptions::IsPaperOrientation() const
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-sal_Bool SvtPrintWarningOptions::IsTransparency() const
+bool SvtPrintWarningOptions::IsTransparency() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsTransparency();
@@ -314,7 +314,7 @@ sal_Bool SvtPrintWarningOptions::IsTransparency() const
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-void SvtPrintWarningOptions::SetPaperSize( sal_Bool bState )
+void SvtPrintWarningOptions::SetPaperSize( bool bState )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pDataContainer->SetPaperSize( bState );
@@ -323,7 +323,7 @@ void SvtPrintWarningOptions::SetPaperSize( sal_Bool bState )
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-void SvtPrintWarningOptions::SetPaperOrientation( sal_Bool bState )
+void SvtPrintWarningOptions::SetPaperOrientation( bool bState )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pDataContainer->SetPaperOrientation( bState );
@@ -332,14 +332,14 @@ void SvtPrintWarningOptions::SetPaperOrientation( sal_Bool bState )
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-void SvtPrintWarningOptions::SetTransparency( sal_Bool bState )
+void SvtPrintWarningOptions::SetTransparency( bool bState )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pDataContainer->SetTransparency( bState );
 }
 // -----------------------------------------------------------------------------
 
-sal_Bool SvtPrintWarningOptions::IsModifyDocumentOnPrintingAllowed() const
+bool SvtPrintWarningOptions::IsModifyDocumentOnPrintingAllowed() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->IsModifyDocumentOnPrintingAllowed();
@@ -347,7 +347,7 @@ sal_Bool SvtPrintWarningOptions::IsModifyDocumentOnPrintingAllowed() const
 
 // -----------------------------------------------------------------------------
 
-void SvtPrintWarningOptions::SetModifyDocumentOnPrintingAllowed( sal_Bool bState )
+void SvtPrintWarningOptions::SetModifyDocumentOnPrintingAllowed( bool bState )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pDataContainer->SetModifyDocumentOnPrintingAllowed( bState ) ;
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index a58439b018e8..609ecc58f0d8 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -37,7 +37,7 @@ using namespace com::sun::star::uno;
 class SvtSaveOptions_Impl;
 class SvtLoadOptions_Impl;
 
-#define CFG_READONLY_DEFAULT    sal_False
+#define CFG_READONLY_DEFAULT    false
 
 struct SvtLoadSaveOptions_Impl
 {
@@ -51,7 +51,7 @@ static sal_Int32           nRefCount = 0;
 class SvtSaveOptions_Impl : public utl::ConfigItem
 {
     sal_Int32                           nAutoSaveTime;
-    sal_Bool                            bUseUserData,
+    bool                            bUseUserData,
                                         bBackup,
                                         bAutoSave,
                                         bAutoSavePrompt,
@@ -70,7 +70,7 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
 
     SvtSaveOptions::ODFDefaultVersion   eODFDefaultVersion;
 
-    sal_Bool                            bROAutoSaveTime,
+    bool                            bROAutoSaveTime,
                                         bROUseUserData,
                                         bROBackup,
                                         bROAutoSave,
@@ -97,43 +97,43 @@ public:
     virtual void            Commit();
 
     sal_Int32               GetAutoSaveTime() const             { return nAutoSaveTime; }
-    sal_Bool                    IsUseUserData() const               { return bUseUserData; }
-    sal_Bool                    IsBackup() const                    { return bBackup; }
-    sal_Bool                    IsAutoSave() const                  { return bAutoSave; }
-    sal_Bool                    IsAutoSavePrompt() const            { return bAutoSavePrompt; }
-    sal_Bool                    IsUserAutoSave() const              { return bUserAutoSave; }
-    sal_Bool                    IsDocInfoSave() const               { return bDocInfSave; }
-    sal_Bool                    IsSaveWorkingSet() const            { return bSaveWorkingSet;         }
-    sal_Bool                    IsSaveDocView() const               { return bSaveDocView; }
-    sal_Bool                    IsSaveRelINet() const               { return bSaveRelINet; }
-    sal_Bool                    IsSaveRelFSys() const               { return bSaveRelFSys; }
-    sal_Bool                    IsSaveUnpacked() const              { return bSaveUnpacked; }
-    sal_Bool                IsPrettyPrintingEnabled( ) const    { return bDoPrettyPrinting; }
-    sal_Bool                IsWarnAlienFormat() const           { return bWarnAlienFormat; }
-    sal_Bool                IsLoadDocPrinter() const            { return bLoadDocPrinter; }
-    sal_Bool                IsUseSHA1InODF12() const            { return bUseSHA1InODF12; }
-    sal_Bool                IsUseBlowfishInODF12() const        { return bUseBlowfishInODF12; }
+    bool                    IsUseUserData() const               { return bUseUserData; }
+    bool                    IsBackup() const                    { return bBackup; }
+    bool                    IsAutoSave() const                  { return bAutoSave; }
+    bool                    IsAutoSavePrompt() const            { return bAutoSavePrompt; }
+    bool                    IsUserAutoSave() const              { return bUserAutoSave; }
+    bool                    IsDocInfoSave() const               { return bDocInfSave; }
+    bool                    IsSaveWorkingSet() const            { return bSaveWorkingSet;         }
+    bool                    IsSaveDocView() const               { return bSaveDocView; }
+    bool                    IsSaveRelINet() const               { return bSaveRelINet; }
+    bool                    IsSaveRelFSys() const               { return bSaveRelFSys; }
+    bool                    IsSaveUnpacked() const              { return bSaveUnpacked; }
+    bool                IsPrettyPrintingEnabled( ) const    { return bDoPrettyPrinting; }
+    bool                IsWarnAlienFormat() const           { return bWarnAlienFormat; }
+    bool                IsLoadDocPrinter() const            { return bLoadDocPrinter; }
+    bool                IsUseSHA1InODF12() const            { return bUseSHA1InODF12; }
+    bool                IsUseBlowfishInODF12() const        { return bUseBlowfishInODF12; }
 
     SvtSaveOptions::ODFDefaultVersion
                             GetODFDefaultVersion() const        { return eODFDefaultVersion; }
 
     void                    SetAutoSaveTime( sal_Int32 n );
-    void                    SetUseUserData( sal_Bool b );
-    void                    SetBackup( sal_Bool b );
-    void                    SetAutoSave( sal_Bool b );
-    void                    SetAutoSavePrompt( sal_Bool b );
-    void                    SetUserAutoSave( sal_Bool b );
-    void                    SetDocInfoSave( sal_Bool b );
-    void                    SetSaveWorkingSet( sal_Bool b );
-    void                    SetSaveDocView( sal_Bool b );
-    void                    SetSaveRelINet( sal_Bool b );
-    void                    SetSaveRelFSys( sal_Bool b );
-    void                    EnablePrettyPrinting( sal_Bool _bDoPP );
-    void                    SetWarnAlienFormat( sal_Bool _bDoPP );
-    void                    SetLoadDocPrinter( sal_Bool bNew );
+    void                    SetUseUserData( bool b );
+    void                    SetBackup( bool b );
+    void                    SetAutoSave( bool b );
+    void                    SetAutoSavePrompt( bool b );
+    void                    SetUserAutoSave( bool b );
+    void                    SetDocInfoSave( bool b );
+    void                    SetSaveWorkingSet( bool b );
+    void                    SetSaveDocView( bool b );
+    void                    SetSaveRelINet( bool b );
+    void                    SetSaveRelFSys( bool b );
+    void                    EnablePrettyPrinting( bool _bDoPP );
+    void                    SetWarnAlienFormat( bool _bDoPP );
+    void                    SetLoadDocPrinter( bool bNew );
     void                    SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersion eNew );
 
-    sal_Bool                IsReadOnly( SvtSaveOptions::EOption eOption ) const;
+    bool                IsReadOnly( SvtSaveOptions::EOption eOption ) const;
 };
 
 void SvtSaveOptions_Impl::SetAutoSaveTime( sal_Int32 n )
@@ -146,7 +146,7 @@ void SvtSaveOptions_Impl::SetAutoSaveTime( sal_Int32 n )
     }
 }
 
-void SvtSaveOptions_Impl::SetUseUserData( sal_Bool b )
+void SvtSaveOptions_Impl::SetUseUserData( bool b )
 {
     if (!bROUseUserData && bUseUserData!=b)
     {
@@ -155,7 +155,7 @@ void SvtSaveOptions_Impl::SetUseUserData( sal_Bool b )
     }
 }
 
-void SvtSaveOptions_Impl::SetBackup( sal_Bool b )
+void SvtSaveOptions_Impl::SetBackup( bool b )
 {
     if (!bROBackup && bBackup!=b)
     {
@@ -164,7 +164,7 @@ void SvtSaveOptions_Impl::SetBackup( sal_Bool b )
     }
 }
 
-void SvtSaveOptions_Impl::SetAutoSave( sal_Bool b )
+void SvtSaveOptions_Impl::SetAutoSave( bool b )
 {
     if (!bROAutoSave && bAutoSave!=b)
     {
@@ -174,7 +174,7 @@ void SvtSaveOptions_Impl::SetAutoSave( sal_Bool b )
     }
 }
 
-void SvtSaveOptions_Impl::SetAutoSavePrompt( sal_Bool b )
+void SvtSaveOptions_Impl::SetAutoSavePrompt( bool b )
 {
     if (!bROAutoSavePrompt && bAutoSavePrompt!=b)
     {
@@ -183,7 +183,7 @@ void SvtSaveOptions_Impl::SetAutoSavePrompt( sal_Bool b )
     }
 }
 
-void SvtSaveOptions_Impl::SetUserAutoSave( sal_Bool b )
+void SvtSaveOptions_Impl::SetUserAutoSave( bool b )
 {
     if (!bROUserAutoSave && bUserAutoSave!=b)
     {
@@ -193,7 +193,7 @@ void SvtSaveOptions_Impl::SetUserAutoSave( sal_Bool b )
     }
 }
 
-void SvtSaveOptions_Impl::SetDocInfoSave(sal_Bool b)
+void SvtSaveOptions_Impl::SetDocInfoSave(bool b)
 {
     if (!bRODocInfSave && bDocInfSave!=b)
     {
@@ -202,7 +202,7 @@ void SvtSaveOptions_Impl::SetDocInfoSave(sal_Bool b)
     }
 }
 
-void SvtSaveOptions_Impl::SetSaveWorkingSet( sal_Bool b )
+void SvtSaveOptions_Impl::SetSaveWorkingSet( bool b )
 {
     if (!bROSaveWorkingSet && bSaveWorkingSet!=b)
     {
@@ -211,7 +211,7 @@ void SvtSaveOptions_Impl::SetSaveWorkingSet( sal_Bool b )
     }
 }
 
-void SvtSaveOptions_Impl::SetSaveDocView( sal_Bool b )
+void SvtSaveOptions_Impl::SetSaveDocView( bool b )
 {
     if (!bROSaveDocView && bSaveDocView!=b)
     {
@@ -220,7 +220,7 @@ void SvtSaveOptions_Impl::SetSaveDocView( sal_Bool b )
     }
 }
 
-void SvtSaveOptions_Impl::SetSaveRelINet( sal_Bool b )
+void SvtSaveOptions_Impl::SetSaveRelINet( bool b )
 {
     if (!bROSaveRelINet && bSaveRelINet!=b)
     {
@@ -229,7 +229,7 @@ void SvtSaveOptions_Impl::SetSaveRelINet( sal_Bool b )
     }
 }
 
-void SvtSaveOptions_Impl::SetSaveRelFSys( sal_Bool b )
+void SvtSaveOptions_Impl::SetSaveRelFSys( bool b )
 {
     if (!bROSaveRelFSys && bSaveRelFSys!=b)
     {
@@ -238,7 +238,7 @@ void SvtSaveOptions_Impl::SetSaveRelFSys( sal_Bool b )
     }
 }
 
-void SvtSaveOptions_Impl::EnablePrettyPrinting( sal_Bool _bDoPP )
+void SvtSaveOptions_Impl::EnablePrettyPrinting( bool _bDoPP )
 {
     if (!bRODoPrettyPrinting && bDoPrettyPrinting!=_bDoPP)
     {
@@ -247,7 +247,7 @@ void SvtSaveOptions_Impl::EnablePrettyPrinting( sal_Bool _bDoPP )
     }
 }
 
-void SvtSaveOptions_Impl::SetWarnAlienFormat( sal_Bool _bDoPP )
+void SvtSaveOptions_Impl::SetWarnAlienFormat( bool _bDoPP )
 {
     if (!bROWarnAlienFormat && bWarnAlienFormat!=_bDoPP)
     {
@@ -256,7 +256,7 @@ void SvtSaveOptions_Impl::SetWarnAlienFormat( sal_Bool _bDoPP )
     }
 }
 
-void SvtSaveOptions_Impl::SetLoadDocPrinter( sal_Bool bNew )
+void SvtSaveOptions_Impl::SetLoadDocPrinter( bool bNew )
 {
     if ( !bROLoadDocPrinter && bLoadDocPrinter != bNew )
     {
@@ -274,9 +274,9 @@ void SvtSaveOptions_Impl::SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersio
     }
 }
 
-sal_Bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) const
+bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) const
 {
-    sal_Bool bReadOnly = CFG_READONLY_DEFAULT;
+    bool bReadOnly = CFG_READONLY_DEFAULT;
     switch(eOption)
     {
         case SvtSaveOptions::E_AUTOSAVETIME :
@@ -394,22 +394,22 @@ Sequence< OUString > GetPropertyNames()
 SvtSaveOptions_Impl::SvtSaveOptions_Impl()
     : ConfigItem( OUString("Office.Common/Save") )
     , nAutoSaveTime( 0 )
-    , bUseUserData( sal_False )
-    , bBackup( sal_False )
-    , bAutoSave( sal_False )
-    , bAutoSavePrompt( sal_False )
-    , bUserAutoSave( sal_False )
-    , bDocInfSave( sal_False )
-    , bSaveWorkingSet( sal_False )
-    , bSaveDocView( sal_False )
-    , bSaveRelINet( sal_False )
-    , bSaveRelFSys( sal_False )
-    , bSaveUnpacked( sal_False )
-    , bDoPrettyPrinting( sal_False )
-    , bWarnAlienFormat( sal_True )
-    , bLoadDocPrinter( sal_True )
-    , bUseSHA1InODF12( sal_False )
-    , bUseBlowfishInODF12( sal_False )
+    , bUseUserData( false )
+    , bBackup( false )
+    , bAutoSave( false )
+    , bAutoSavePrompt( false )
+    , bUserAutoSave( false )
+    , bDocInfSave( false )
+    , bSaveWorkingSet( false )
+    , bSaveDocView( false )
+    , bSaveRelINet( false )
+    , bSaveRelFSys( false )
+    , bSaveUnpacked( false )
+    , bDoPrettyPrinting( false )
+    , bWarnAlienFormat( true )
+    , bLoadDocPrinter( true )
+    , bUseSHA1InODF12( false )
+    , bUseBlowfishInODF12( false )
     , eODFDefaultVersion( SvtSaveOptions::ODFVER_LATEST )
     , bROAutoSaveTime( CFG_READONLY_DEFAULT )
     , bROUseUserData( CFG_READONLY_DEFAULT )
@@ -479,7 +479,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
 
                     default:
                     {
-                        sal_Bool bTemp = sal_Bool();
+                        bool bTemp = bool();
                         if ( pValues[nProp] >>= bTemp )
                         {
                             switch ( nProp )
@@ -755,7 +755,7 @@ void SvtSaveOptions_Impl::Notify( const Sequence<OUString>& )
 class SvtLoadOptions_Impl : public utl::ConfigItem
 {
 
-    sal_Bool                            bLoadUserDefinedSettings;
+    bool                            bLoadUserDefinedSettings;
 
 public:
                             SvtLoadOptions_Impl();
@@ -764,15 +764,15 @@ public:
     virtual void            Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames );
     virtual void            Commit();
 
-    void                    SetLoadUserSettings(sal_Bool b){bLoadUserDefinedSettings = b; SetModified();}
-    sal_Bool                IsLoadUserSettings() const {return bLoadUserDefinedSettings;}
+    void                    SetLoadUserSettings(bool b){bLoadUserDefinedSettings = b; SetModified();}
+    bool                IsLoadUserSettings() const {return bLoadUserDefinedSettings;}
 };
 // -----------------------------------------------------------------------
 const sal_Char cUserDefinedSettings[] = "UserDefinedSettings";
 
 SvtLoadOptions_Impl::SvtLoadOptions_Impl()
     : ConfigItem( OUString("Office.Common/Load") )
-    , bLoadUserDefinedSettings( sal_False )
+    , bLoadUserDefinedSettings( false )
 {
     Sequence< OUString > aNames(1);
     aNames[0] = OUString::createFromAscii(cUserDefinedSettings);
@@ -856,147 +856,147 @@ sal_Int32 SvtSaveOptions::GetAutoSaveTime() const
     return pImp->pSaveOpt->GetAutoSaveTime();
 }
 
-void SvtSaveOptions::SetUseUserData( sal_Bool b )
+void SvtSaveOptions::SetUseUserData( bool b )
 {
     pImp->pSaveOpt->SetUseUserData( b );
 }
 
-sal_Bool SvtSaveOptions::IsUseUserData() const
+bool SvtSaveOptions::IsUseUserData() const
 {
     return pImp->pSaveOpt->IsUseUserData();
 }
 
-void SvtSaveOptions::SetBackup( sal_Bool b )
+void SvtSaveOptions::SetBackup( bool b )
 {
     pImp->pSaveOpt->SetBackup( b );
 }
 
-sal_Bool SvtSaveOptions::IsBackup() const
+bool SvtSaveOptions::IsBackup() const
 {
     return pImp->pSaveOpt->IsBackup();
 }
 
-void SvtSaveOptions::SetAutoSave( sal_Bool b )
+void SvtSaveOptions::SetAutoSave( bool b )
 {
     pImp->pSaveOpt->SetAutoSave( b );
 }
 
-sal_Bool SvtSaveOptions::IsAutoSave() const
+bool SvtSaveOptions::IsAutoSave() const
 {
     return pImp->pSaveOpt->IsAutoSave();
 }
 
-void SvtSaveOptions::SetAutoSavePrompt( sal_Bool b )
+void SvtSaveOptions::SetAutoSavePrompt( bool b )
 {
     pImp->pSaveOpt->SetAutoSavePrompt( b );
 }
 
-sal_Bool SvtSaveOptions::IsAutoSavePrompt() const
+bool SvtSaveOptions::IsAutoSavePrompt() const
 {
     return pImp->pSaveOpt->IsAutoSavePrompt();
 }
 
-void SvtSaveOptions::SetUserAutoSave( sal_Bool b )
+void SvtSaveOptions::SetUserAutoSave( bool b )
 {
     pImp->pSaveOpt->SetUserAutoSave( b );
 }
 
-sal_Bool SvtSaveOptions::IsUserAutoSave() const
+bool SvtSaveOptions::IsUserAutoSave() const
 {
     return pImp->pSaveOpt->IsUserAutoSave();
 }
 
-void SvtSaveOptions::SetDocInfoSave(sal_Bool b)
+void SvtSaveOptions::SetDocInfoSave(bool b)
 {
     pImp->pSaveOpt->SetDocInfoSave( b );
 }
 
-sal_Bool SvtSaveOptions::IsDocInfoSave() const
+bool SvtSaveOptions::IsDocInfoSave() const
 {
     return pImp->pSaveOpt->IsDocInfoSave();
 }
 
-void SvtSaveOptions::SetSaveWorkingSet( sal_Bool b )
+void SvtSaveOptions::SetSaveWorkingSet( bool b )
 {
     pImp->pSaveOpt->SetSaveWorkingSet( b );
 }
 
-sal_Bool SvtSaveOptions::IsSaveWorkingSet() const
+bool SvtSaveOptions::IsSaveWorkingSet() const
 {
     return pImp->pSaveOpt->IsSaveWorkingSet();
 }
 
-void SvtSaveOptions::SetSaveDocView( sal_Bool b )
+void SvtSaveOptions::SetSaveDocView( bool b )
 {
     pImp->pSaveOpt->SetSaveDocView( b );
 }
 
-sal_Bool SvtSaveOptions::IsSaveDocView() const
+bool SvtSaveOptions::IsSaveDocView() const
 {
     return pImp->pSaveOpt->IsSaveDocView();
 }
 
-void SvtSaveOptions::SetSaveRelINet( sal_Bool b )
+void SvtSaveOptions::SetSaveRelINet( bool b )
 {
     pImp->pSaveOpt->SetSaveRelINet( b );
 }
 
-sal_Bool SvtSaveOptions::IsSaveRelINet() const
+bool SvtSaveOptions::IsSaveRelINet() const
 {
     return pImp->pSaveOpt->IsSaveRelINet();
 }
 
-void SvtSaveOptions::SetSaveRelFSys( sal_Bool b )
+void SvtSaveOptions::SetSaveRelFSys( bool b )
 {
     pImp->pSaveOpt->SetSaveRelFSys( b );
 }
 
-sal_Bool SvtSaveOptions::IsSaveRelFSys() const
+bool SvtSaveOptions::IsSaveRelFSys() const
 {
     return pImp->pSaveOpt->IsSaveRelFSys();
 }
 
-sal_Bool SvtSaveOptions::IsSaveUnpacked() const
+bool SvtSaveOptions::IsSaveUnpacked() const
 {
     return pImp->pSaveOpt->IsSaveUnpacked();
 }
 
-void SvtSaveOptions::SetLoadUserSettings(sal_Bool b)
+void SvtSaveOptions::SetLoadUserSettings(bool b)
 {
     pImp->pLoadOpt->SetLoadUserSettings(b);
 }
 
-sal_Bool   SvtSaveOptions::IsLoadUserSettings() const
+bool   SvtSaveOptions::IsLoadUserSettings() const
 {
     return pImp->pLoadOpt->IsLoadUserSettings();
 }
 
-void SvtSaveOptions::SetPrettyPrinting( sal_Bool _bEnable )
+void SvtSaveOptions::SetPrettyPrinting( bool _bEnable )
 {
     pImp->pSaveOpt->EnablePrettyPrinting( _bEnable );
 }
 
-sal_Bool SvtSaveOptions::IsPrettyPrinting() const
+bool SvtSaveOptions::IsPrettyPrinting() const
 {
     return pImp->pSaveOpt->IsPrettyPrintingEnabled();
 }
 
-void SvtSaveOptions::SetWarnAlienFormat( sal_Bool _bEnable )
+void SvtSaveOptions::SetWarnAlienFormat( bool _bEnable )
 {
     pImp->pSaveOpt->SetWarnAlienFormat( _bEnable );
 }
 
-sal_Bool SvtSaveOptions::IsWarnAlienFormat() const
+bool SvtSaveOptions::IsWarnAlienFormat() const
 {
     return pImp->pSaveOpt->IsWarnAlienFormat();
 }
 
-void SvtSaveOptions::SetLoadDocumentPrinter( sal_Bool _bEnable )
+void SvtSaveOptions::SetLoadDocumentPrinter( bool _bEnable )
 {
     pImp->pSaveOpt->SetLoadDocPrinter( _bEnable );
 }
 
-sal_Bool SvtSaveOptions::IsLoadDocumentPrinter() const
+bool SvtSaveOptions::IsLoadDocumentPrinter() const
 {
     return pImp->pSaveOpt->IsLoadDocPrinter();
 }
@@ -1011,17 +1011,17 @@ SvtSaveOptions::ODFDefaultVersion SvtSaveOptions::GetODFDefaultVersion() const
     return pImp->pSaveOpt->GetODFDefaultVersion();
 }
 
-sal_Bool SvtSaveOptions::IsUseSHA1InODF12() const
+bool SvtSaveOptions::IsUseSHA1InODF12() const
 {
     return pImp->pSaveOpt->IsUseSHA1InODF12();
 }
 
-sal_Bool SvtSaveOptions::IsUseBlowfishInODF12() const
+bool SvtSaveOptions::IsUseBlowfishInODF12() const
 {
     return pImp->pSaveOpt->IsUseBlowfishInODF12();
 }
 
-sal_Bool SvtSaveOptions::IsReadOnly( SvtSaveOptions::EOption eOption ) const
+bool SvtSaveOptions::IsReadOnly( SvtSaveOptions::EOption eOption ) const
 {
     return pImp->pSaveOpt->IsReadOnly(eOption);
 }
diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index 3845eaa816f5..894529523869 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.cxx
@@ -38,18 +38,18 @@ using namespace com::sun::star::i18n;
 class SvtSearchOptions_Impl : public ConfigItem
 {
     sal_Int32   nFlags;
-    sal_Bool    bModified;
+    bool    bModified;
 
     // disallow copy-constructor and assignment-operator for now
     SvtSearchOptions_Impl( const SvtSearchOptions_Impl & );
     SvtSearchOptions_Impl & operator = ( const SvtSearchOptions_Impl & );
 
 protected:
-    sal_Bool            IsModified() const { return bModified; }
+    bool            IsModified() const { return bModified; }
     using ConfigItem::SetModified;
-    void            SetModified( sal_Bool bVal );
-    sal_Bool            Load();
-    sal_Bool            Save();
+    void            SetModified( bool bVal );
+    bool            Load();
+    bool            Save();
 
     Sequence< OUString >    GetPropertyNames() const;
 
@@ -61,8 +61,8 @@ public:
     virtual void    Commit();
     virtual void    Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames );
 
-    sal_Bool            GetFlag( sal_uInt16 nOffset ) const;
-    void            SetFlag( sal_uInt16 nOffset, sal_Bool bVal );
+    bool            GetFlag( sal_uInt16 nOffset ) const;
+    void            SetFlag( sal_uInt16 nOffset, bool bVal );
 };
 
 
@@ -71,7 +71,7 @@ SvtSearchOptions_Impl::SvtSearchOptions_Impl() :
 {
     nFlags = 0x0003FFFF;    // set all options values to 'true'
     Load();
-    SetModified( sal_False );
+    SetModified( false );
 }
 
 
@@ -91,13 +91,13 @@ void SvtSearchOptions_Impl::Notify( const Sequence< OUString >&  )
 {
 }
 
-sal_Bool SvtSearchOptions_Impl::GetFlag( sal_uInt16 nOffset ) const
+bool SvtSearchOptions_Impl::GetFlag( sal_uInt16 nOffset ) const
 {
     DBG_ASSERT( nOffset <= MAX_FLAGS_OFFSET, "offset out of range");
     return ((nFlags >> nOffset) & 0x01) ? sal_True : sal_False;
 }
 
-void SvtSearchOptions_Impl::SetFlag( sal_uInt16 nOffset, sal_Bool bVal )
+void SvtSearchOptions_Impl::SetFlag( sal_uInt16 nOffset, bool bVal )
 {
     DBG_ASSERT( nOffset <= MAX_FLAGS_OFFSET, "offset out of range");
     sal_Int32 nOldFlags = nFlags;
@@ -107,10 +107,10 @@ void SvtSearchOptions_Impl::SetFlag( sal_uInt16 nOffset, sal_Bool bVal )
     else
         nFlags &= ~nMask;
     if (nFlags != nOldFlags)
-        SetModified( sal_True );
+        SetModified( true );
 }
 
-void SvtSearchOptions_Impl::SetModified( sal_Bool bVal )
+void SvtSearchOptions_Impl::SetModified( bool bVal )
 {
     bModified = bVal;
     if (bModified)
@@ -162,9 +162,9 @@ Sequence< OUString > SvtSearchOptions_Impl::GetPropertyNames() const
     return aNames;
 }
 
-sal_Bool SvtSearchOptions_Impl::Load()
+bool SvtSearchOptions_Impl::Load()
 {
-    sal_Bool bSucc = sal_False;
+    bool bSucc = false;
 
     Sequence< OUString > aNames = GetPropertyNames();
     sal_Int32 nProps = aNames.getLength();
@@ -176,7 +176,7 @@ sal_Bool SvtSearchOptions_Impl::Load()
 
     if (nProps  &&  aValues.getLength() == nProps)
     {
-        bSucc = sal_True;
+        bSucc = true;
 
         const Any* pValues = aValues.getConstArray();
         for (sal_uInt16 i = 0;  i < nProps;  ++i)
@@ -185,7 +185,7 @@ sal_Bool SvtSearchOptions_Impl::Load()
             DBG_ASSERT( rVal.hasValue(), "property value missing" );
             if (rVal.hasValue())
             {
-                sal_Bool bVal = sal_Bool();
+                bool bVal = bool();
                 if (rVal >>= bVal)
                 {
                     if (i <= MAX_FLAGS_OFFSET)
@@ -200,13 +200,13 @@ sal_Bool SvtSearchOptions_Impl::Load()
                 else
                 {
                     OSL_FAIL( "unexpected type" );
-                    bSucc = sal_False;
+                    bSucc = false;
                 }
             }
             else
             {
                 OSL_FAIL( "value missing" );
-                bSucc = sal_False;
+                bSucc = false;
             }
         }
     }
@@ -215,9 +215,9 @@ sal_Bool SvtSearchOptions_Impl::Load()
     return bSucc;
 }
 
-sal_Bool SvtSearchOptions_Impl::Save()
+bool SvtSearchOptions_Impl::Save()
 {
-    sal_Bool bSucc = sal_False;
+    bool bSucc = false;
 
     const Sequence< OUString > aNames = GetPropertyNames();
     sal_Int32 nProps = aNames.getLength();
@@ -230,12 +230,12 @@ sal_Bool SvtSearchOptions_Impl::Save()
     if (nProps  &&  nProps == MAX_FLAGS_OFFSET + 1)
     {
         for (sal_uInt16 i = 0;  i < nProps;  ++i)
-            pValue[i] <<= (sal_Bool) GetFlag(i);
+            pValue[i] <<= GetFlag(i);
         bSucc |= PutProperties( aNames, aValues );
     }
 
     if (bSucc)
-        SetModified( sal_False );
+        SetModified( false );
 
     return bSucc;
 }
@@ -297,267 +297,267 @@ sal_Int32 SvtSearchOptions::GetTransliterationFlags() const
     return nRes;
 }
 
-sal_Bool SvtSearchOptions::IsWholeWordsOnly() const
+bool SvtSearchOptions::IsWholeWordsOnly() const
 {
     return pImpl->GetFlag( 0 );
 }
 
-void SvtSearchOptions::SetWholeWordsOnly( sal_Bool bVal )
+void SvtSearchOptions::SetWholeWordsOnly( bool bVal )
 {
     pImpl->SetFlag( 0, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsBackwards() const
+bool SvtSearchOptions::IsBackwards() const
 {
     return pImpl->GetFlag( 1 );
 }
 
-void SvtSearchOptions::SetBackwards( sal_Bool bVal )
+void SvtSearchOptions::SetBackwards( bool bVal )
 {
     pImpl->SetFlag( 1, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsUseRegularExpression() const
+bool SvtSearchOptions::IsUseRegularExpression() const
 {
     return pImpl->GetFlag( 2 );
 }
 
-void SvtSearchOptions::SetUseRegularExpression( sal_Bool bVal )
+void SvtSearchOptions::SetUseRegularExpression( bool bVal )
 {
     pImpl->SetFlag( 2, bVal );
 }
 
-void SvtSearchOptions::SetSearchForStyles( sal_Bool bVal )
+void SvtSearchOptions::SetSearchForStyles( bool bVal )
 {
     pImpl->SetFlag( 3, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsSimilaritySearch() const
+bool SvtSearchOptions::IsSimilaritySearch() const
 {
     return pImpl->GetFlag( 4 );
 }
 
-void SvtSearchOptions::SetSimilaritySearch( sal_Bool bVal )
+void SvtSearchOptions::SetSimilaritySearch( bool bVal )
 {
     pImpl->SetFlag( 4, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsUseAsianOptions() const
+bool SvtSearchOptions::IsUseAsianOptions() const
 {
     return pImpl->GetFlag( 5 );
 }
 
-void SvtSearchOptions::SetUseAsianOptions( sal_Bool bVal )
+void SvtSearchOptions::SetUseAsianOptions( bool bVal )
 {
     pImpl->SetFlag( 5, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsMatchCase() const
+bool SvtSearchOptions::IsMatchCase() const
 {
     return pImpl->GetFlag( 6 );
 }
 
-void SvtSearchOptions::SetMatchCase( sal_Bool bVal )
+void SvtSearchOptions::SetMatchCase( bool bVal )
 {
     pImpl->SetFlag( 6, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsMatchFullHalfWidthForms() const
+bool SvtSearchOptions::IsMatchFullHalfWidthForms() const
 {
     return pImpl->GetFlag( 7 );
 }
 
-void SvtSearchOptions::SetMatchFullHalfWidthForms( sal_Bool bVal )
+void SvtSearchOptions::SetMatchFullHalfWidthForms( bool bVal )
 {
     pImpl->SetFlag( 7, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsMatchHiraganaKatakana() const
+bool SvtSearchOptions::IsMatchHiraganaKatakana() const
 {
     return pImpl->GetFlag( 8 );
 }
 
-void SvtSearchOptions::SetMatchHiraganaKatakana( sal_Bool bVal )
+void SvtSearchOptions::SetMatchHiraganaKatakana( bool bVal )
 {
     pImpl->SetFlag( 8, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsMatchContractions() const
+bool SvtSearchOptions::IsMatchContractions() const
 {
     return pImpl->GetFlag( 9 );
 }
 
-void SvtSearchOptions::SetMatchContractions( sal_Bool bVal )
+void SvtSearchOptions::SetMatchContractions( bool bVal )
 {
     pImpl->SetFlag( 9, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsMatchMinusDashChoon() const
+bool SvtSearchOptions::IsMatchMinusDashChoon() const
 {
     return pImpl->GetFlag( 10 );
 }
 
-void SvtSearchOptions::SetMatchMinusDashChoon( sal_Bool bVal )
+void SvtSearchOptions::SetMatchMinusDashChoon( bool bVal )
 {
     pImpl->SetFlag( 10, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsMatchRepeatCharMarks() const
+bool SvtSearchOptions::IsMatchRepeatCharMarks() const
 {
     return pImpl->GetFlag( 11 );
 }
 
-void SvtSearchOptions::SetMatchRepeatCharMarks( sal_Bool bVal )
+void SvtSearchOptions::SetMatchRepeatCharMarks( bool bVal )
 {
     pImpl->SetFlag( 11, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsMatchVariantFormKanji() const
+bool SvtSearchOptions::IsMatchVariantFormKanji() const
 {
     return pImpl->GetFlag( 12 );
 }
 
-void SvtSearchOptions::SetMatchVariantFormKanji( sal_Bool bVal )
+void SvtSearchOptions::SetMatchVariantFormKanji( bool bVal )
 {
     pImpl->SetFlag( 12, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsMatchOldKanaForms() const
+bool SvtSearchOptions::IsMatchOldKanaForms() const
 {
     return pImpl->GetFlag( 13 );
 }
 
-void SvtSearchOptions::SetMatchOldKanaForms( sal_Bool bVal )
+void SvtSearchOptions::SetMatchOldKanaForms( bool bVal )
 {
     pImpl->SetFlag( 13, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsMatchDiziDuzu() const
+bool SvtSearchOptions::IsMatchDiziDuzu() const
 {
     return pImpl->GetFlag( 14 );
 }
 
-void SvtSearchOptions::SetMatchDiziDuzu( sal_Bool bVal )
+void SvtSearchOptions::SetMatchDiziDuzu( bool bVal )
 {
     pImpl->SetFlag( 14, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsMatchBavaHafa() const
+bool SvtSearchOptions::IsMatchBavaHafa() const
 {
     return pImpl->GetFlag( 15 );
 }
 
-void SvtSearchOptions::SetMatchBavaHafa( sal_Bool bVal )
+void SvtSearchOptions::SetMatchBavaHafa( bool bVal )
 {
     pImpl->SetFlag( 15, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsMatchTsithichiDhizi() const
+bool SvtSearchOptions::IsMatchTsithichiDhizi() const
 {
     return pImpl->GetFlag( 16 );
 }
 
-void SvtSearchOptions::SetMatchTsithichiDhizi( sal_Bool bVal )
+void SvtSearchOptions::SetMatchTsithichiDhizi( bool bVal )
 {
     pImpl->SetFlag( 16, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsMatchHyuiyuByuvyu() const
+bool SvtSearchOptions::IsMatchHyuiyuByuvyu() const
 {
     return pImpl->GetFlag( 17 );
 }
 
-void SvtSearchOptions::SetMatchHyuiyuByuvyu( sal_Bool bVal )
+void SvtSearchOptions::SetMatchHyuiyuByuvyu( bool bVal )
 {
     pImpl->SetFlag( 17, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsMatchSesheZeje() const
+bool SvtSearchOptions::IsMatchSesheZeje() const
 {
     return pImpl->GetFlag( 18 );
 }
 
-void SvtSearchOptions::SetMatchSesheZeje( sal_Bool bVal )
+void SvtSearchOptions::SetMatchSesheZeje( bool bVal )
 {
     pImpl->SetFlag( 18, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsMatchIaiya() const
+bool SvtSearchOptions::IsMatchIaiya() const
 {
     return pImpl->GetFlag( 19 );
 }
 
-void SvtSearchOptions::SetMatchIaiya( sal_Bool bVal )
+void SvtSearchOptions::SetMatchIaiya( bool bVal )
 {
     pImpl->SetFlag( 19, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsMatchKiku() const
+bool SvtSearchOptions::IsMatchKiku() const
 {
     return pImpl->GetFlag( 20 );
 }
 
-void SvtSearchOptions::SetMatchKiku( sal_Bool bVal )
+void SvtSearchOptions::SetMatchKiku( bool bVal )
 {
     pImpl->SetFlag( 20, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsIgnorePunctuation() const
+bool SvtSearchOptions::IsIgnorePunctuation() const
 {
     return pImpl->GetFlag( 21 );
 }
 
-void SvtSearchOptions::SetIgnorePunctuation( sal_Bool bVal )
+void SvtSearchOptions::SetIgnorePunctuation( bool bVal )
 {
     pImpl->SetFlag( 21, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsIgnoreWhitespace() const
+bool SvtSearchOptions::IsIgnoreWhitespace() const
 {
     return pImpl->GetFlag( 22 );
 }
 
-void SvtSearchOptions::SetIgnoreWhitespace( sal_Bool bVal )
+void SvtSearchOptions::SetIgnoreWhitespace( bool bVal )
 {
     pImpl->SetFlag( 22, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsIgnoreProlongedSoundMark() const
+bool SvtSearchOptions::IsIgnoreProlongedSoundMark() const
 {
     return pImpl->GetFlag( 23 );
 }
 
-void SvtSearchOptions::SetIgnoreProlongedSoundMark( sal_Bool bVal )
+void SvtSearchOptions::SetIgnoreProlongedSoundMark( bool bVal )
 {
     pImpl->SetFlag( 23, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsIgnoreMiddleDot() const
+bool SvtSearchOptions::IsIgnoreMiddleDot() const
 {
     return pImpl->GetFlag( 24 );
 }
 
-void SvtSearchOptions::SetIgnoreMiddleDot( sal_Bool bVal )
+void SvtSearchOptions::SetIgnoreMiddleDot( bool bVal )
 {
     pImpl->SetFlag( 24, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsNotes() const
+bool SvtSearchOptions::IsNotes() const
 {
     return pImpl->GetFlag( 25 );
 }
 
-void SvtSearchOptions::SetNotes( sal_Bool bVal )
+void SvtSearchOptions::SetNotes( bool bVal )
 {
     pImpl->SetFlag( 25, bVal );
 }
 
-sal_Bool SvtSearchOptions::IsIgnoreDiacritics_CTL() const
+bool SvtSearchOptions::IsIgnoreDiacritics_CTL() const
 {
     return pImpl->GetFlag( 26 );
 }
 
-void SvtSearchOptions::SetIgnoreDiacritics_CTL( sal_Bool bVal )
+void SvtSearchOptions::SetIgnoreDiacritics_CTL( bool bVal )
 {
     pImpl->SetFlag( 26, bVal );
 }
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index 3a33933de9e3..c1203331b0fd 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -98,7 +98,7 @@ using namespace ::com::sun::star::uno   ;
 #define PROPERTYCOUNT                               16
 #define PROPERTYHANDLE_INVALID                      -1
 
-#define CFG_READONLY_DEFAULT                        sal_False
+#define CFG_READONLY_DEFAULT                        false
 
 //_________________________________________________________________________________________________________________
 //  private declarations!
@@ -158,21 +158,21 @@ class SvtSecurityOptions_Impl : public ConfigItem
         //  public interface
         //---------------------------------------------------------------------------------------------------------
 
-        sal_Bool                IsReadOnly      ( SvtSecurityOptions::EOption eOption                   ) const ;
+        bool                IsReadOnly      ( SvtSecurityOptions::EOption eOption                   ) const ;
 
         Sequence< OUString >    GetSecureURLs   (                                                       ) const ;
         void                    SetSecureURLs   (   const   Sequence< OUString >&   seqURLList          )       ;
         inline sal_Int32        GetMacroSecurityLevel   (                                               ) const ;
         void                    SetMacroSecurityLevel   ( sal_Int32 _nLevel                             )       ;
 
-        inline sal_Bool         IsMacroDisabled         (                                               ) const ;
+        inline bool         IsMacroDisabled         (                                               ) const ;
 
         Sequence< SvtSecurityOptions::Certificate > GetTrustedAuthors       (                                                                                       ) const ;
         void                                        SetTrustedAuthors       ( const Sequence< SvtSecurityOptions::Certificate >& rAuthors                           )       ;
 
-        sal_Bool                IsOptionSet     ( SvtSecurityOptions::EOption eOption                   ) const ;
-        sal_Bool                SetOption       ( SvtSecurityOptions::EOption eOption, sal_Bool bValue  )       ;
-        sal_Bool                IsOptionEnabled ( SvtSecurityOptions::EOption eOption                   ) const ;
+        bool                IsOptionSet     ( SvtSecurityOptions::EOption eOption                   ) const ;
+        bool                SetOption       ( SvtSecurityOptions::EOption eOption, bool bValue  )       ;
+        bool                IsOptionEnabled ( SvtSecurityOptions::EOption eOption                   ) const ;
 
         /*-****************************************************************************************************//**
             @short      return list of key names of ouer configuration management which represent our module tree
@@ -187,57 +187,57 @@ class SvtSecurityOptions_Impl : public ConfigItem
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        void                    SetProperty( sal_Int32 nHandle, const Any& rValue, sal_Bool bReadOnly );
+        void                    SetProperty( sal_Int32 nHandle, const Any& rValue, bool bReadOnly );
         void                    LoadAuthors( void );
         static sal_Int32        GetHandle( const OUString& rPropertyName );
-        bool                    GetOption( SvtSecurityOptions::EOption eOption, sal_Bool*& rpValue, sal_Bool*& rpRO );
+        bool                    GetOption( SvtSecurityOptions::EOption eOption, bool*& rpValue, bool*& rpRO );
 
         static Sequence< OUString > GetPropertyNames();
 
         Sequence< OUString >                        m_seqSecureURLs;
-        sal_Bool                                    m_bSaveOrSend;
-        sal_Bool                                    m_bSigning;
-        sal_Bool                                    m_bPrint;
-        sal_Bool                                    m_bCreatePDF;
-        sal_Bool                                    m_bRemoveInfo;
-        sal_Bool                                    m_bRecommendPwd;
-        sal_Bool                                    m_bCtrlClickHyperlink;
-        sal_Bool                                    m_bBlockUntrustedRefererLinks;
+        bool                                    m_bSaveOrSend;
+        bool                                    m_bSigning;
+        bool                                    m_bPrint;
+        bool                                    m_bCreatePDF;
+        bool                                    m_bRemoveInfo;
+        bool                                    m_bRecommendPwd;
+        bool                                    m_bCtrlClickHyperlink;
+        bool                                    m_bBlockUntrustedRefererLinks;
         sal_Int32                                   m_nSecLevel;
         Sequence< SvtSecurityOptions::Certificate > m_seqTrustedAuthors;
-        sal_Bool                                    m_bDisableMacros;
-
-        sal_Bool                                    m_bROSecureURLs;
-        sal_Bool                                    m_bROSaveOrSend;
-        sal_Bool                                    m_bROSigning;
-        sal_Bool                                    m_bROPrint;
-        sal_Bool                                    m_bROCreatePDF;
-        sal_Bool                                    m_bRORemoveInfo;
-        sal_Bool                                    m_bRORecommendPwd;
-        sal_Bool                                    m_bROCtrlClickHyperlink;
-        sal_Bool                                    m_bROBlockUntrustedRefererLinks;
-        sal_Bool                                    m_bROSecLevel;
-        sal_Bool                                    m_bROTrustedAuthors;
-        sal_Bool                                    m_bRODisableMacros;
+        bool                                    m_bDisableMacros;
+
+        bool                                    m_bROSecureURLs;
+        bool                                    m_bROSaveOrSend;
+        bool                                    m_bROSigning;
+        bool                                    m_bROPrint;
+        bool                                    m_bROCreatePDF;
+        bool                                    m_bRORemoveInfo;
+        bool                                    m_bRORecommendPwd;
+        bool                                    m_bROCtrlClickHyperlink;
+        bool                                    m_bROBlockUntrustedRefererLinks;
+        bool                                    m_bROSecLevel;
+        bool                                    m_bROTrustedAuthors;
+        bool                                    m_bRODisableMacros;
 
 
         // xmlsec05 deprecated
         EBasicSecurityMode      m_eBasicMode;
-        sal_Bool                m_bExecutePlugins;
-        sal_Bool                m_bWarning;
-        sal_Bool                m_bConfirmation;
-
-        sal_Bool                m_bROConfirmation;
-        sal_Bool                m_bROWarning;
-        sal_Bool                m_bROExecutePlugins;
-        sal_Bool                m_bROBasicMode;
+        bool                m_bExecutePlugins;
+        bool                m_bWarning;
+        bool                m_bConfirmation;
+
+        bool                m_bROConfirmation;
+        bool                m_bROWarning;
+        bool                m_bROExecutePlugins;
+        bool                m_bROBasicMode;
         public:
-        sal_Bool IsWarningEnabled() const;
-        void SetWarningEnabled( sal_Bool bSet );
-        sal_Bool IsConfirmationEnabled() const;
-        void SetConfirmationEnabled( sal_Bool bSet );
-        sal_Bool    IsExecutePlugins() const;
-        void        SetExecutePlugins( sal_Bool bSet );
+        bool IsWarningEnabled() const;
+        void SetWarningEnabled( bool bSet );
+        bool IsConfirmationEnabled() const;
+        void SetConfirmationEnabled( bool bSet );
+        bool    IsExecutePlugins() const;
+        void        SetExecutePlugins( bool bSet );
         EBasicSecurityMode      GetBasicMode    (                                               ) const ;
         void                    SetBasicMode    (           EBasicSecurityMode      eMode       )       ;
 };
@@ -248,17 +248,17 @@ class SvtSecurityOptions_Impl : public ConfigItem
 SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()
     :ConfigItem             ( ROOTNODE_SECURITY         )
     ,m_seqSecureURLs        ( DEFAULT_SECUREURL         )
-    ,m_bSaveOrSend          ( sal_True                  )
-    ,m_bSigning             ( sal_True                  )
-    ,m_bPrint               ( sal_True                  )
-    ,m_bCreatePDF           ( sal_True                  )
-    ,m_bRemoveInfo          ( sal_True                  )
+    ,m_bSaveOrSend          ( true                  )
+    ,m_bSigning             ( true                  )
+    ,m_bPrint               ( true                  )
+    ,m_bCreatePDF           ( true                  )
+    ,m_bRemoveInfo          ( true                  )
     ,m_bRecommendPwd(false)
     ,m_bCtrlClickHyperlink(false)
     ,m_bBlockUntrustedRefererLinks(false)
     ,m_nSecLevel            ( sal_True                  )
     ,m_seqTrustedAuthors    ( DEFAULT_TRUSTEDAUTHORS    )
-    ,m_bDisableMacros       ( sal_False                 )
+    ,m_bDisableMacros       ( false                 )
     ,m_bROSecureURLs        ( CFG_READONLY_DEFAULT      )
     ,m_bROSaveOrSend        ( CFG_READONLY_DEFAULT      )
     ,m_bROSigning           ( CFG_READONLY_DEFAULT      )
@@ -270,13 +270,13 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()
     ,m_bROBlockUntrustedRefererLinks(CFG_READONLY_DEFAULT)
     ,m_bROSecLevel          ( CFG_READONLY_DEFAULT      )
     ,m_bROTrustedAuthors    ( CFG_READONLY_DEFAULT      )
-    ,m_bRODisableMacros     ( sal_True                  ) // currently is not intended to be changed
+    ,m_bRODisableMacros     ( true                  ) // currently is not intended to be changed
 
     // xmlsec05 deprecated
     ,   m_eBasicMode        ( DEFAULT_STAROFFICEBASIC )
-    ,   m_bExecutePlugins   ( sal_True                )
-    ,   m_bWarning          ( sal_True                )
-    ,   m_bConfirmation     ( sal_True                )
+    ,   m_bExecutePlugins   ( true                )
+    ,   m_bWarning          ( true                )
+    ,   m_bConfirmation     ( true                )
     ,   m_bROConfirmation   ( CFG_READONLY_DEFAULT    )
     ,   m_bROWarning        ( CFG_READONLY_DEFAULT    )
     ,   m_bROExecutePlugins ( CFG_READONLY_DEFAULT    )
@@ -315,7 +315,7 @@ SvtSecurityOptions_Impl::~SvtSecurityOptions_Impl()
         Commit();
 }
 
-void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValue, sal_Bool bRO )
+void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValue, bool bRO )
 {
     switch( nProperty )
     {
@@ -542,7 +542,7 @@ sal_Int32 SvtSecurityOptions_Impl::GetHandle( const OUString& rName )
     return nHandle;
 }
 
-bool SvtSecurityOptions_Impl::GetOption( SvtSecurityOptions::EOption eOption, sal_Bool*& rpValue, sal_Bool*& rpRO )
+bool SvtSecurityOptions_Impl::GetOption( SvtSecurityOptions::EOption eOption, bool*& rpValue, bool*& rpRO )
 {
     switch( eOption )
     {
@@ -745,7 +745,7 @@ void SvtSecurityOptions_Impl::Commit()
             {
                 bDone = !m_bRODisableMacros;
                 if( bDone )
-                    lValues[ nRealCount ] <<= (sal_Bool)m_bDisableMacros;
+                    lValues[ nRealCount ] <<= m_bDisableMacros;
             }
             break;
 
@@ -798,9 +798,9 @@ void SvtSecurityOptions_Impl::Commit()
     PutProperties( lNames, lValues );
 }
 
-sal_Bool SvtSecurityOptions_Impl::IsReadOnly( SvtSecurityOptions::EOption eOption ) const
+bool SvtSecurityOptions_Impl::IsReadOnly( SvtSecurityOptions::EOption eOption ) const
 {
-    sal_Bool    bReadonly;
+    bool    bReadonly;
     switch(eOption)
     {
         case SvtSecurityOptions::E_SECUREURLS :
@@ -857,7 +857,7 @@ sal_Bool SvtSecurityOptions_Impl::IsReadOnly( SvtSecurityOptions::EOption eOptio
 
 
         default:
-            bReadonly = sal_True;
+            bReadonly = true;
     }
 
     return bReadonly;
@@ -883,7 +883,7 @@ inline sal_Int32 SvtSecurityOptions_Impl::GetMacroSecurityLevel() const
     return m_nSecLevel;
 }
 
-inline sal_Bool SvtSecurityOptions_Impl::IsMacroDisabled() const
+inline bool SvtSecurityOptions_Impl::IsMacroDisabled() const
 {
     return m_bDisableMacros;
 }
@@ -918,11 +918,11 @@ void SvtSecurityOptions_Impl::SetTrustedAuthors( const Sequence< SvtSecurityOpti
     }
 }
 
-sal_Bool SvtSecurityOptions_Impl::IsOptionSet( SvtSecurityOptions::EOption eOption ) const
+bool SvtSecurityOptions_Impl::IsOptionSet( SvtSecurityOptions::EOption eOption ) const
 {
-    sal_Bool*   pValue;
-    sal_Bool*   pRO;
-    sal_Bool    bRet = sal_False;
+    bool*   pValue;
+    bool*   pRO;
+    bool    bRet = false;
 
     if( ( const_cast< SvtSecurityOptions_Impl* >( this ) )->GetOption( eOption, pValue, pRO ) )
         bRet = *pValue;
@@ -930,17 +930,17 @@ sal_Bool SvtSecurityOptions_Impl::IsOptionSet( SvtSecurityOptions::EOption eOpti
     return bRet;
 }
 
-sal_Bool SvtSecurityOptions_Impl::SetOption( SvtSecurityOptions::EOption eOption, sal_Bool bValue )
+bool SvtSecurityOptions_Impl::SetOption( SvtSecurityOptions::EOption eOption, bool bValue )
 {
-    sal_Bool*   pValue;
-    sal_Bool*   pRO;
-    sal_Bool    bRet = sal_False;
+    bool*   pValue;
+    bool*   pRO;
+    bool    bRet = false;
 
     if( GetOption( eOption, pValue, pRO ) )
     {
         if( !*pRO )
         {
-            bRet = sal_True;
+            bRet = true;
             if( *pValue != bValue )
             {
                 *pValue = bValue;
@@ -952,11 +952,11 @@ sal_Bool SvtSecurityOptions_Impl::SetOption( SvtSecurityOptions::EOption eOption
     return bRet;
 }
 
-sal_Bool SvtSecurityOptions_Impl::IsOptionEnabled( SvtSecurityOptions::EOption eOption ) const
+bool SvtSecurityOptions_Impl::IsOptionEnabled( SvtSecurityOptions::EOption eOption ) const
 {
-    sal_Bool*   pValue;
-    sal_Bool*   pRO;
-    sal_Bool    bRet = sal_False;
+    bool*   pValue;
+    bool*   pRO;
+    bool    bRet = false;
 
     if( ( const_cast< SvtSecurityOptions_Impl* >( this ) )->GetOption( eOption, pValue, pRO ) )
         bRet = !*pRO;
@@ -1030,7 +1030,7 @@ SvtSecurityOptions::~SvtSecurityOptions()
     }
 }
 
-sal_Bool SvtSecurityOptions::IsReadOnly( EOption eOption ) const
+bool SvtSecurityOptions::IsReadOnly( EOption eOption ) const
 {
     MutexGuard aGuard( GetInitMutex() );
     return m_pDataContainer->IsReadOnly(eOption);
@@ -1100,7 +1100,7 @@ void SvtSecurityOptions::SetMacroSecurityLevel( sal_Int32 _nLevel )
     m_pDataContainer->SetMacroSecurityLevel( _nLevel );
 }
 
-sal_Bool SvtSecurityOptions::IsMacroDisabled() const
+bool SvtSecurityOptions::IsMacroDisabled() const
 {
     MutexGuard aGuard( GetInitMutex() );
     return m_pDataContainer->IsMacroDisabled();
@@ -1166,12 +1166,12 @@ void SvtSecurityOptions_Impl::SetBasicMode( EBasicSecurityMode eMode )
     }
 }
 
-sal_Bool SvtSecurityOptions_Impl::IsExecutePlugins() const
+bool SvtSecurityOptions_Impl::IsExecutePlugins() const
 {
     return m_bExecutePlugins;
 }
 
-void SvtSecurityOptions_Impl::SetExecutePlugins( sal_Bool bSet )
+void SvtSecurityOptions_Impl::SetExecutePlugins( bool bSet )
 {
     DBG_ASSERT(!m_bROExecutePlugins, "SvtSecurityOptions_Impl::SetExecutePlugins()\nYou tried to write on a readonly value!\n");
     if (!m_bROExecutePlugins && m_bExecutePlugins!=bSet)
@@ -1181,12 +1181,12 @@ void SvtSecurityOptions_Impl::SetExecutePlugins( sal_Bool bSet )
     }
 }
 
-sal_Bool SvtSecurityOptions_Impl::IsWarningEnabled() const
+bool SvtSecurityOptions_Impl::IsWarningEnabled() const
 {
     return m_bWarning;
 }
 
-void SvtSecurityOptions_Impl::SetWarningEnabled( sal_Bool bSet )
+void SvtSecurityOptions_Impl::SetWarningEnabled( bool bSet )
 {
     DBG_ASSERT(!m_bROWarning, "SvtSecurityOptions_Impl::SetWarningEnabled()\nYou tried to write on a readonly value!\n");
     if (!m_bROWarning && m_bWarning!=bSet)
@@ -1196,12 +1196,12 @@ void SvtSecurityOptions_Impl::SetWarningEnabled( sal_Bool bSet )
     }
 }
 
-sal_Bool SvtSecurityOptions_Impl::IsConfirmationEnabled() const
+bool SvtSecurityOptions_Impl::IsConfirmationEnabled() const
 {
     return m_bConfirmation;
 }
 
-void SvtSecurityOptions_Impl::SetConfirmationEnabled( sal_Bool bSet )
+void SvtSecurityOptions_Impl::SetConfirmationEnabled( bool bSet )
 {
     DBG_ASSERT(!m_bROConfirmation, "SvtSecurityOptions_Impl::SetConfirmationEnabled()\nYou tried to write on a readonly value!\n");
     if (!m_bROConfirmation && m_bConfirmation!=bSet)
@@ -1212,37 +1212,37 @@ void SvtSecurityOptions_Impl::SetConfirmationEnabled( sal_Bool bSet )
 }
 
 
-sal_Bool SvtSecurityOptions::IsExecutePlugins() const
+bool SvtSecurityOptions::IsExecutePlugins() const
 {
     MutexGuard aGuard( GetInitMutex() );
     return m_pDataContainer->IsExecutePlugins();
 }
 
-void SvtSecurityOptions::SetExecutePlugins( sal_Bool bSet )
+void SvtSecurityOptions::SetExecutePlugins( bool bSet )
 {
     MutexGuard aGuard( GetInitMutex() );
     m_pDataContainer->SetExecutePlugins( bSet );
 }
 
-sal_Bool SvtSecurityOptions::IsWarningEnabled() const
+bool SvtSecurityOptions::IsWarningEnabled() const
 {
     MutexGuard aGuard( GetInitMutex() );
     return m_pDataContainer->IsWarningEnabled();
 }
 
-void SvtSecurityOptions::SetWarningEnabled( sal_Bool bSet )
+void SvtSecurityOptions::SetWarningEnabled( bool bSet )
 {
     MutexGuard aGuard( GetInitMutex() );
     m_pDataContainer->SetWarningEnabled( bSet );
 }
 
-sal_Bool SvtSecurityOptions::IsConfirmationEnabled() const
+bool SvtSecurityOptions::IsConfirmationEnabled() const
 {
     MutexGuard aGuard( GetInitMutex() );
     return m_pDataContainer->IsConfirmationEnabled();
 }
 
-void SvtSecurityOptions::SetConfirmationEnabled( sal_Bool bSet )
+void SvtSecurityOptions::SetConfirmationEnabled( bool bSet )
 {
     MutexGuard aGuard( GetInitMutex() );
     m_pDataContainer->SetConfirmationEnabled( bSet );
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index 7c140bca3aaf..5f17b08f4e99 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -94,7 +94,7 @@ public:
 
     OUString GetFullName () const;
 
-    sal_Bool IsTokenReadonly (sal_uInt16 nToken) const;
+    bool IsTokenReadonly (sal_uInt16 nToken) const;
     OUString GetToken (sal_uInt16 nToken) const;
     void     SetToken (sal_uInt16 nToken, OUString const& rNewToken);
     void     Notify ();
@@ -208,7 +208,7 @@ void SvtUserOptions::Impl::Notify ()
     NotifyListeners(0);
 }
 
-sal_Bool SvtUserOptions::Impl::IsTokenReadonly (sal_uInt16 nToken) const
+bool SvtUserOptions::Impl::IsTokenReadonly (sal_uInt16 nToken) const
 {
     if (nToken < nOptionNameCount)
     {
@@ -221,7 +221,7 @@ sal_Bool SvtUserOptions::Impl::IsTokenReadonly (sal_uInt16 nToken) const
     else
     {
         SAL_WARN("unotools.config", "SvtUserOptions::Impl::IsTokenReadonly(): invalid token");
-        return sal_False;
+        return false;
     }
 }
 
@@ -278,7 +278,7 @@ OUString SvtUserOptions::GetCustomerNumber () const { return GetToken(USER_OPT_C
 
 void SvtUserOptions::SetCustomerNumber (OUString const& sToken) { SetToken(USER_OPT_CUSTOMERNUMBER, sToken); }
 
-sal_Bool SvtUserOptions::IsTokenReadonly (sal_uInt16 nToken) const
+bool SvtUserOptions::IsTokenReadonly (sal_uInt16 nToken) const
 {
     osl::MutexGuard aGuard(GetInitMutex());
     return pImpl->IsTokenReadonly(nToken);
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index 43ac37df1406..124eaef77334 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -47,7 +47,7 @@
 #define DEFAULT_WINDOWSTATE                     OUString()
 #define DEFAULT_USERDATA                        css::uno::Sequence< css::beans::NamedValue >()
 #define DEFAULT_PAGEID                          0
-#define DEFAULT_VISIBLE                         sal_False
+#define DEFAULT_VISIBLE                         false
 
 //#define DEBUG_VIEWOPTIONS
 
@@ -111,7 +111,7 @@ class IMPL_TViewData
             m_nPageID      = DEFAULT_PAGEID      ;
             m_bVisible     = DEFAULT_VISIBLE     ;
 
-            m_bDefault     = sal_True            ;
+            m_bDefault     = true            ;
         }
 
         //---------------------------------------------------------------------------------------------------------
@@ -119,7 +119,7 @@ class IMPL_TViewData
         void setWindowState( const OUString& sValue )
         {
             m_bDefault     = (
-                                ( m_bDefault == sal_True            )    &&
+                                m_bDefault    &&
                                 ( sValue     == DEFAULT_WINDOWSTATE )
                              );
             m_sWindowState = sValue;
@@ -129,7 +129,7 @@ class IMPL_TViewData
         void setUserData( const css::uno::Sequence< css::beans::NamedValue >& lValue )
         {
             m_bDefault  = (
-                            ( m_bDefault == sal_True         )    &&
+                            m_bDefault    &&
                             ( lValue     == DEFAULT_USERDATA )
                           );
             m_lUserData = lValue;
@@ -139,17 +139,17 @@ class IMPL_TViewData
         void setPageID( sal_Int32 nValue )
         {
             m_bDefault = (
-                           ( m_bDefault == sal_True       )    &&
+                           m_bDefault    &&
                            ( nValue     == DEFAULT_PAGEID )
                          );
             m_nPageID  = nValue;
         }
 
         //---------------------------------------------------------------------------------------------------------
-        void setVisible( sal_Bool bValue )
+        void setVisible( bool bValue )
         {
             m_bDefault = (
-                           ( m_bDefault == sal_True        )    &&
+                           m_bDefault    &&
                            ( bValue     == DEFAULT_VISIBLE )
                          );
             m_bVisible = bValue;
@@ -160,7 +160,7 @@ class IMPL_TViewData
         OUString                              getWindowState() { return m_sWindowState; }
         css::uno::Sequence< css::beans::NamedValue > getUserData   () { return m_lUserData   ; }
         sal_Int32                                    getPageID     () { return m_nPageID     ; }
-        sal_Bool                                     getVisible    () { return m_bVisible    ; }
+        bool                                     getVisible    () { return m_bVisible    ; }
 
         //---------------------------------------------------------------------------------------------------------
         // special operation for easy access on user data
@@ -170,9 +170,9 @@ class IMPL_TViewData
             // we change UserData in every case!
             //    a) we change already existing item
             // or b) we add a new one
-            m_bDefault = sal_False;
+            m_bDefault = false;
 
-            sal_Bool  bExist = sal_False;
+            bool  bExist = false;
             sal_Int32 nCount = m_lUserData.getLength();
 
             // change it, if it already exist ...
@@ -181,13 +181,13 @@ class IMPL_TViewData
                 if( m_lUserData[nStep].Name == sName )
                 {
                     m_lUserData[nStep].Value = aValue  ;
-                    bExist                   = sal_True;
+                    bExist                   = true;
                     break;
                 }
             }
 
             // ... or create new list item
-            if( bExist == sal_False )
+            if( !bExist )
             {
                 m_lUserData.realloc( nCount+1 );
                 m_lUserData[nCount].Name  = sName  ;
@@ -215,15 +215,15 @@ class IMPL_TViewData
 
         //---------------------------------------------------------------------------------------------------------
         // check for default items
-        sal_Bool isDefault() { return m_bDefault; }
+        bool isDefault() { return m_bDefault; }
 
     private:
         OUString                                 m_sWindowState    ;
         css::uno::Sequence< css::beans::NamedValue >    m_lUserData       ;
         sal_Int32                                       m_nPageID         ;
-        sal_Bool                                        m_bVisible        ;
+        bool                                        m_bVisible        ;
 
-        sal_Bool                                        m_bDefault        ;
+        bool                                        m_bDefault        ;
 };
 
 struct IMPL_TStringHashCode
@@ -258,8 +258,8 @@ class SvtViewOptionsBase_Impl
 
                                                         SvtViewOptionsBase_Impl ( const OUString&                                sList    );
         virtual                                        ~SvtViewOptionsBase_Impl (                                                                );
-        sal_Bool                                        Exists                  ( const OUString&                                sName    );
-        sal_Bool                                        Delete                  ( const OUString&                                sName    );
+        bool                                        Exists                  ( const OUString&                                sName    );
+        bool                                        Delete                  ( const OUString&                                sName    );
         OUString                                 GetWindowState          ( const OUString&                                sName    );
         void                                            SetWindowState          ( const OUString&                                sName    ,
                                                                                   const OUString&                                sState   );
@@ -271,7 +271,7 @@ class SvtViewOptionsBase_Impl
                                                                                         sal_Int32                                       nID      );
         State                                           GetVisible              ( const OUString&                                sName    );
         void                                            SetVisible              ( const OUString&                                sName    ,
-                                                                                        sal_Bool                                        bVisible );
+                                                                                        bool                                        bVisible );
         css::uno::Any                                   GetUserItem             ( const OUString&                                sName    ,
                                                                                   const OUString&                                sItem    );
         void                                            SetUserItem             ( const OUString&                                sName    ,
@@ -281,7 +281,7 @@ class SvtViewOptionsBase_Impl
     //-------------------------------------------------------------------------------------------------------------
     private:
         css::uno::Reference< css::uno::XInterface > impl_getSetNode( const OUString& sNode           ,
-                                                                           sal_Bool         bCreateIfMissing);
+                                                                           bool         bCreateIfMissing);
 
     //-------------------------------------------------------------------------------------------------------------
     private:
@@ -378,9 +378,9 @@ SvtViewOptionsBase_Impl::~SvtViewOptionsBase_Impl()
     @return         true , if item exist
                     false, otherwise
 *//*-*************************************************************************************************************/
-sal_Bool SvtViewOptionsBase_Impl::Exists( const OUString& sName )
+bool SvtViewOptionsBase_Impl::Exists( const OUString& sName )
 {
-    sal_Bool bExists = sal_False;
+    bool bExists = false;
 
     try
     {
@@ -389,7 +389,7 @@ sal_Bool SvtViewOptionsBase_Impl::Exists( const OUString& sName )
     }
     catch(const css::uno::Exception& ex)
         {
-            bExists = sal_False;
+            bExists = false;
             SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION(ex)
         }
 
@@ -406,25 +406,25 @@ sal_Bool SvtViewOptionsBase_Impl::Exists( const OUString& sName )
     @return         true , if item not exist(!) or could be deleted (should be the same!)
                     false, otherwise
 *//*-*************************************************************************************************************/
-sal_Bool SvtViewOptionsBase_Impl::Delete( const OUString& sName )
+bool SvtViewOptionsBase_Impl::Delete( const OUString& sName )
 {
     #ifdef DEBUG_VIEWOPTIONS
     ++m_nWriteCount;
     #endif
 
-    sal_Bool bDeleted = sal_False;
+    bool bDeleted = false;
     try
     {
         css::uno::Reference< css::container::XNameContainer > xSet(m_xSet, css::uno::UNO_QUERY_THROW);
         xSet->removeByName(sName);
-        bDeleted = sal_True;
+        bDeleted = true;
         ::comphelper::ConfigurationHelper::flush(m_xRoot);
     }
     catch(const css::container::NoSuchElementException&)
-        { bDeleted = sal_True; }
+        { bDeleted = true; }
     catch(const css::uno::Exception& ex)
         {
-            bDeleted = sal_False;
+            bDeleted = false;
             SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION(ex)
         }
 
@@ -450,7 +450,7 @@ OUString SvtViewOptionsBase_Impl::GetWindowState( const OUString& sName )
     try
     {
         css::uno::Reference< css::beans::XPropertySet > xNode(
-            impl_getSetNode(sName, sal_False),
+            impl_getSetNode(sName, false),
             css::uno::UNO_QUERY);
         if (xNode.is())
             xNode->getPropertyValue(PROPERTY_WINDOWSTATE) >>= sWindowState;
@@ -475,7 +475,7 @@ void SvtViewOptionsBase_Impl::SetWindowState( const OUString& sName  ,
     try
     {
         css::uno::Reference< css::beans::XPropertySet > xNode(
-            impl_getSetNode(sName, sal_True),
+            impl_getSetNode(sName, true),
             css::uno::UNO_QUERY_THROW);
         xNode->setPropertyValue(PROPERTY_WINDOWSTATE, css::uno::makeAny(sState));
         ::comphelper::ConfigurationHelper::flush(m_xRoot);
@@ -496,7 +496,7 @@ css::uno::Sequence< css::beans::NamedValue > SvtViewOptionsBase_Impl::GetUserDat
     try
     {
         css::uno::Reference< css::container::XNameAccess > xNode(
-            impl_getSetNode(sName, sal_False),
+            impl_getSetNode(sName, false),
             css::uno::UNO_QUERY); // no _THROW ! because we dont create missing items here. So we have to live with zero references .-)
         css::uno::Reference< css::container::XNameAccess > xUserData;
         if (xNode.is())
@@ -537,7 +537,7 @@ void SvtViewOptionsBase_Impl::SetUserData( const OUString&
     try
     {
         css::uno::Reference< css::container::XNameAccess > xNode(
-            impl_getSetNode(sName, sal_True),
+            impl_getSetNode(sName, true),
             css::uno::UNO_QUERY_THROW);
         css::uno::Reference< css::container::XNameContainer > xUserData;
         xNode->getByName(PROPERTY_USERDATA) >>= xUserData;
@@ -574,7 +574,7 @@ css::uno::Any SvtViewOptionsBase_Impl::GetUserItem( const OUString& sName ,
     try
     {
         css::uno::Reference< css::container::XNameAccess > xNode(
-            impl_getSetNode(sName, sal_False),
+            impl_getSetNode(sName, false),
             css::uno::UNO_QUERY);
         css::uno::Reference< css::container::XNameAccess > xUserData;
         if (xNode.is())
@@ -605,7 +605,7 @@ void SvtViewOptionsBase_Impl::SetUserItem( const OUString& sName  ,
     try
     {
         css::uno::Reference< css::container::XNameAccess > xNode(
-            impl_getSetNode(sName, sal_True),
+            impl_getSetNode(sName, true),
             css::uno::UNO_QUERY_THROW);
         css::uno::Reference< css::container::XNameContainer > xUserData;
         xNode->getByName(PROPERTY_USERDATA) >>= xUserData;
@@ -635,7 +635,7 @@ sal_Int32 SvtViewOptionsBase_Impl::GetPageID( const OUString& sName )
     try
     {
         css::uno::Reference< css::beans::XPropertySet > xNode(
-            impl_getSetNode(sName, sal_False),
+            impl_getSetNode(sName, false),
             css::uno::UNO_QUERY);
         if (xNode.is())
             xNode->getPropertyValue(PROPERTY_PAGEID) >>= nID;
@@ -660,7 +660,7 @@ void SvtViewOptionsBase_Impl::SetPageID( const OUString& sName ,
     try
     {
         css::uno::Reference< css::beans::XPropertySet > xNode(
-            impl_getSetNode(sName, sal_True),
+            impl_getSetNode(sName, true),
             css::uno::UNO_QUERY_THROW);
         xNode->setPropertyValue(PROPERTY_PAGEID, css::uno::makeAny(nID));
         ::comphelper::ConfigurationHelper::flush(m_xRoot);
@@ -682,11 +682,11 @@ SvtViewOptionsBase_Impl::State SvtViewOptionsBase_Impl::GetVisible( const OUStri
     try
     {
         css::uno::Reference< css::beans::XPropertySet > xNode(
-            impl_getSetNode(sName, sal_False),
+            impl_getSetNode(sName, false),
             css::uno::UNO_QUERY);
         if (xNode.is())
         {
-            sal_Bool bVisible = sal_False;
+            bool bVisible = false;
             if (xNode->getPropertyValue(PROPERTY_VISIBLE) >>= bVisible)
             {
                 eState = bVisible ? STATE_TRUE : STATE_FALSE;
@@ -703,7 +703,7 @@ SvtViewOptionsBase_Impl::State SvtViewOptionsBase_Impl::GetVisible( const OUStri
 
 //*****************************************************************************************************************
 void SvtViewOptionsBase_Impl::SetVisible( const OUString& sName    ,
-                                                sal_Bool         bVisible )
+                                                bool         bVisible )
 {
     #ifdef DEBUG_VIEWOPTIONS
     ++m_nWriteCount;
@@ -712,7 +712,7 @@ void SvtViewOptionsBase_Impl::SetVisible( const OUString& sName    ,
     try
     {
         css::uno::Reference< css::beans::XPropertySet > xNode(
-            impl_getSetNode(sName, sal_True),
+            impl_getSetNode(sName, true),
             css::uno::UNO_QUERY_THROW);
         xNode->setPropertyValue(PROPERTY_VISIBLE, css::uno::makeAny(bVisible));
         ::comphelper::ConfigurationHelper::flush(m_xRoot);
@@ -734,7 +734,7 @@ void SvtViewOptionsBase_Impl::SetVisible( const OUString& sName    ,
     @return         -
 *//*-*************************************************************************************************************/
 css::uno::Reference< css::uno::XInterface > SvtViewOptionsBase_Impl::impl_getSetNode( const OUString& sNode           ,
-                                                                                            sal_Bool         bCreateIfMissing)
+                                                                                            bool         bCreateIfMissing)
 {
     css::uno::Reference< css::uno::XInterface > xNode;
 
@@ -883,12 +883,12 @@ SvtViewOptions::~SvtViewOptions()
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-sal_Bool SvtViewOptions::Exists() const
+bool SvtViewOptions::Exists() const
 {
     // Ready for multithreading
     ::osl::MutexGuard aGuard( GetOwnStaticMutex() );
 
-    sal_Bool bExists = sal_False;
+    bool bExists = false;
     switch( m_eViewType )
     {
         case E_DIALOG       :   {
@@ -914,12 +914,12 @@ sal_Bool SvtViewOptions::Exists() const
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-sal_Bool SvtViewOptions::Delete()
+bool SvtViewOptions::Delete()
 {
     // Ready for multithreading
     ::osl::MutexGuard aGuard( GetOwnStaticMutex() );
 
-    sal_Bool bState = sal_False;
+    bool bState = false;
     switch( m_eViewType )
     {
         case E_DIALOG       :   {
@@ -1039,7 +1039,7 @@ void SvtViewOptions::SetPageID( sal_Int32 nID )
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-sal_Bool SvtViewOptions::IsVisible() const
+bool SvtViewOptions::IsVisible() const
 {
     // Ready for multithreading
     ::osl::MutexGuard aGuard( GetOwnStaticMutex() );
@@ -1048,7 +1048,7 @@ sal_Bool SvtViewOptions::IsVisible() const
     // These call isn't allowed for dialogs, tab-dialogs or tab-pages!
     OSL_ENSURE( !(m_eViewType==E_DIALOG||m_eViewType==E_TABDIALOG||m_eViewType==E_TABPAGE), "SvtViewOptions::IsVisible()\nCall not allowed for Dialogs, TabDialogs or TabPages! I do nothing!\n" );
 
-    sal_Bool bState = sal_False;
+    bool bState = false;
     if( m_eViewType == E_WINDOW )
         bState = m_pDataContainer_Windows->GetVisible( m_sViewName ) == SvtViewOptionsBase_Impl::STATE_TRUE;
 
@@ -1058,7 +1058,7 @@ sal_Bool SvtViewOptions::IsVisible() const
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-void SvtViewOptions::SetVisible( sal_Bool bState )
+void SvtViewOptions::SetVisible( bool bState )
 {
     // Ready for multithreading
     ::osl::MutexGuard aGuard( GetOwnStaticMutex() );
diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx
index bd598d2fc4c8..a63f7956ef05 100644
--- a/unotools/source/config/xmlaccelcfg.cxx
+++ b/unotools/source/config/xmlaccelcfg.cxx
@@ -108,7 +108,7 @@ throw( SAXException, RuntimeException )
             throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
         }
         else
-            m_bAcceleratorMode = sal_True;
+            m_bAcceleratorMode = true;
     }
     else if ( aElementName == ELEMENT_ACCELERATORITEM )
     {
@@ -122,7 +122,7 @@ throw( SAXException, RuntimeException )
         else
         {
             // read accelerator item
-            m_bItemCloseExpected = sal_True;
+            m_bItemCloseExpected = true;
 
             SvtAcceleratorConfigItem aItem;
 
diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx
index 0382e768ab16..d8a1a8b4e638 100644
--- a/unotools/source/i18n/intlwrapper.cxx
+++ b/unotools/source/i18n/intlwrapper.cxx
@@ -60,7 +60,7 @@ void IntlWrapper::ImplNewLocaleData() const
 }
 
 
-void IntlWrapper::ImplNewCollator( sal_Bool bCaseSensitive ) const
+void IntlWrapper::ImplNewCollator( bool bCaseSensitive ) const
 {
     CollatorWrapper* p = new CollatorWrapper( m_xContext );
     if ( bCaseSensitive )
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 9a7439109815..3ef632634b36 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -72,8 +72,8 @@ LocaleDataWrapper::LocaleDataWrapper(
         m_xContext( rxContext ),
         xLD( LocaleData::create(rxContext) ),
         maLanguageTag( rLanguageTag ),
-        bLocaleDataItemValid( sal_False ),
-        bReservedWordValid( sal_False )
+        bLocaleDataItemValid( false ),
+        bReservedWordValid( false )
 {
     invalidateData();
 }
@@ -85,8 +85,8 @@ LocaleDataWrapper::LocaleDataWrapper(
         m_xContext( comphelper::getProcessComponentContext() ),
         xLD( LocaleData::create(m_xContext) ),
         maLanguageTag( rLanguageTag ),
-        bLocaleDataItemValid( sal_False ),
-        bReservedWordValid( sal_False )
+        bLocaleDataItemValid( false ),
+        bReservedWordValid( false )
 {
     invalidateData();
 }
@@ -128,13 +128,13 @@ void LocaleDataWrapper::invalidateData()
     {
         for (sal_Int32 j=0; j<LocaleItem::COUNT; ++j)
             aLocaleItem[j] = "";
-        bLocaleDataItemValid = sal_False;
+        bLocaleDataItemValid = false;
     }
     if ( bReservedWordValid )
     {
         for ( sal_Int16 j=0; j<reservedWords::COUNT; ++j )
             aReservedWord[j] = "";
-        bReservedWordValid = sal_False;
+        bReservedWordValid = false;
     }
     xDefaultCalendar.reset();
     if (aGrouping.getLength())
@@ -361,7 +361,7 @@ void LocaleDataWrapper::getOneLocaleItemImpl( sal_Int16 nItem )
     if ( !bLocaleDataItemValid )
     {
         aLocaleDataItem = getLocaleItem();
-        bLocaleDataItemValid = sal_True;
+        bLocaleDataItemValid = true;
     }
     switch ( nItem )
     {
@@ -427,7 +427,7 @@ void LocaleDataWrapper::getOneReservedWordImpl( sal_Int16 nWord )
     if ( !bReservedWordValid )
     {
         aReservedWordSeq = getReservedWord();
-        bReservedWordValid = sal_True;
+        bReservedWordValid = true;
     }
     DBG_ASSERT( nWord < aReservedWordSeq.getLength(), "getOneReservedWordImpl: which one?" );
     if ( nWord < aReservedWordSeq.getLength() )
@@ -617,13 +617,13 @@ void LocaleDataWrapper::scanCurrFormatImpl( const OUString& rCode,
     const sal_Unicode* const pStop = pStr + rCode.getLength();
     const sal_Unicode* p = pStr + nStart;
     int nInSection = 0;
-    sal_Bool bQuote = sal_False;
+    bool bQuote = false;
     while ( p < pStop )
     {
         if ( bQuote )
         {
             if ( *p == '"' && *(p-1) != '\\' )
-                bQuote = sal_False;
+                bQuote = false;
         }
         else
         {
@@ -631,7 +631,7 @@ void LocaleDataWrapper::scanCurrFormatImpl( const OUString& rCode,
             {
                 case '"' :
                     if ( pStr == p || *(p-1) != '\\' )
-                        bQuote = sal_True;
+                        bQuote = true;
                 break;
                 case '-' :
                     if (!nInSection && nSign == -1)
@@ -1217,8 +1217,8 @@ inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const sal_Unicode* pCopyBu
 
 
 sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf,
-        sal_Int64 nNumber, sal_uInt16 nDecimals, sal_Bool bUseThousandSep,
-        sal_Bool bTrailingZeros ) const
+        sal_Int64 nNumber, sal_uInt16 nDecimals, bool bUseThousandSep,
+        bool bTrailingZeros ) const
 {
     sal_Unicode aNumBuf[64];
     sal_Unicode* pNumBuf;
@@ -1302,11 +1302,11 @@ sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf,
         {
             pBuf = ImplAddString( pBuf, getNumDecimalSep() );
 
-            sal_Bool bNullEnd = sal_True;
+            bool bNullEnd = true;
             while ( i < nNumLen )
             {
                 if ( *pNumBuf != '0' )
-                    bNullEnd = sal_False;
+                    bNullEnd = false;
 
                 *pBuf = *pNumBuf;
                 pBuf++;
@@ -1373,7 +1373,7 @@ OUString LocaleDataWrapper::getDate( const Date& rDate ) const
 }
 
 
-OUString LocaleDataWrapper::getTime( const Time& rTime, sal_Bool bSec, sal_Bool b100Sec ) const
+OUString LocaleDataWrapper::getTime( const Time& rTime, bool bSec, bool b100Sec ) const
 {
     ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical );
 //!TODO: leading zeros et al
@@ -1403,8 +1403,8 @@ OUString LocaleDataWrapper::getTime( const Time& rTime, sal_Bool bSec, sal_Bool
 
 
 OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCal,
-        sal_Int16 nDisplayDayOfWeek, sal_Bool bDayOfMonthWithLeadingZero,
-        sal_Int16 nDisplayMonth, sal_Bool bTwoDigitYear ) const
+        sal_Int16 nDisplayDayOfWeek, bool bDayOfMonthWithLeadingZero,
+        sal_Int16 nDisplayMonth, bool bTwoDigitYear ) const
 {
     ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical );
     using namespace ::com::sun::star::i18n;
@@ -1447,7 +1447,7 @@ OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCa
 }
 
 
-OUString LocaleDataWrapper::getDuration( const Time& rTime, sal_Bool bSec, sal_Bool b100Sec ) const
+OUString LocaleDataWrapper::getDuration( const Time& rTime, bool bSec, bool b100Sec ) const
 {
     ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical );
     sal_Unicode aBuf[128];
@@ -1493,7 +1493,7 @@ inline size_t ImplGetNumberStringLengthGuess( const LocaleDataWrapper& rLoc, sal
 
 
 OUString LocaleDataWrapper::getNum( sal_Int64 nNumber, sal_uInt16 nDecimals,
-        sal_Bool bUseThousandSep, sal_Bool bTrailingZeros ) const
+        bool bUseThousandSep, bool bTrailingZeros ) const
 {
     ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical );
     sal_Unicode aBuf[128];      // big enough for 64-bit long and crazy grouping
@@ -1512,7 +1512,7 @@ OUString LocaleDataWrapper::getNum( sal_Int64 nNumber, sal_uInt16 nDecimals,
 }
 
 OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals,
-        const OUString& rCurrencySymbol, sal_Bool bUseThousandSep ) const
+        const OUString& rCurrencySymbol, bool bUseThousandSep ) const
 {
     ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical );
     sal_Unicode aBuf[192];
@@ -1529,18 +1529,18 @@ OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals,
         new sal_Unicode[ rCurrencySymbol.getLength() + nGuess + 20 ]);
     sal_Unicode* pBuf = pBuffer;
 
-    sal_Bool bNeg;
+    bool bNeg;
     if ( nNumber < 0 )
     {
-        bNeg = sal_True;
+        bNeg = true;
         nNumber *= -1;
     }
     else
-        bNeg = sal_False;
+        bNeg = false;
 
     // convert number
     sal_Unicode* pEndNumBuf = ImplAddFormatNum( pNumBuffer, nNumber, nDecimals,
-        bUseThousandSep, sal_True );
+        bUseThousandSep, true );
     sal_Int32 nNumLen = (sal_Int32)(sal_uLong)(pEndNumBuf-pNumBuffer);
 
     // replace zeros with zero character
@@ -1548,7 +1548,7 @@ OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals,
     {
         sal_Unicode* pTempBuf;
         sal_uInt16  i;
-        sal_Bool    bZero = sal_True;
+        bool    bZero = true;
 
         pTempBuf = pNumBuffer+nNumLen-nDecimals;
         i = 0;
@@ -1556,7 +1556,7 @@ OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals,
         {
             if ( *pTempBuf != '0' )
             {
-                bZero = sal_False;
+                bZero = false;
                 break;
             }
 
diff --git a/unotools/source/i18n/readwritemutexguard.cxx b/unotools/source/i18n/readwritemutexguard.cxx
index 0bc602e73127..08327250fe8f 100644
--- a/unotools/source/i18n/readwritemutexguard.cxx
+++ b/unotools/source/i18n/readwritemutexguard.cxx
@@ -82,7 +82,7 @@ ReadWriteGuard::~ReadWriteGuard()
 
 void ReadWriteGuard::changeReadToWrite()
 {
-    sal_Bool bOk = !(nMode & (ReadWriteGuardMode::nWrite | ReadWriteGuardMode::nBlockCritical));
+    bool bOk = !(nMode & (ReadWriteGuardMode::nWrite | ReadWriteGuardMode::nBlockCritical));
     DBG_ASSERT( bOk, "ReadWriteGuard::changeReadToWrite: can't" );
     if ( bOk )
     {
@@ -97,7 +97,7 @@ void ReadWriteGuard::changeReadToWrite()
         nMode |= ReadWriteGuardMode::nWrite;
         // wait for any other read to complete
 // TODO: set up a waiting thread instead of a loop
-        sal_Bool bWait = sal_True;
+        bool bWait = true;
         do
         {
             rMutex.pMutex->acquire();
diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx
index c0f8dded5d03..c6b04807a216 100644
--- a/unotools/source/misc/atom.cxx
+++ b/unotools/source/misc/atom.cxx
@@ -33,7 +33,7 @@ AtomProvider::~AtomProvider()
 {
 }
 
-int AtomProvider::getAtom( const OUString& rString, sal_Bool bCreate )
+int AtomProvider::getAtom( const OUString& rString, bool bCreate )
 {
     ::boost::unordered_map< OUString, int, OUStringHash >::iterator it = m_aAtomMap.find( rString );
     if( it != m_aAtomMap.end() )
@@ -66,7 +66,7 @@ MultiAtomProvider::~MultiAtomProvider()
         delete it->second;
 }
 
-int MultiAtomProvider::getAtom( int atomClass, const OUString& rString, sal_Bool bCreate )
+int MultiAtomProvider::getAtom( int atomClass, const OUString& rString, bool bCreate )
 {
     ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::iterator it =
           m_aAtomLists.find( atomClass );
diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx
index 4c3f6df9fb4e..af477672d1eb 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.cxx
@@ -33,7 +33,7 @@ namespace
                         const OUString& rString,
                         T /*nMin*/ = -1, T /*nMax*/ = -1)
     {
-        sal_Bool bNeg = sal_False;
+        bool bNeg = false;
         rValue = 0;
 
         sal_Int32 nPos = 0L;
@@ -45,7 +45,7 @@ namespace
 
         if( nPos < nLen && '-' == rString[nPos] )
         {
-            bNeg = sal_True;
+            bNeg = true;
             nPos++;
         }
 
diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx
index 79502b36abb1..8014c978d82e 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -329,13 +329,13 @@ MediaDescriptor::MediaDescriptor(const css::uno::Sequence< css::beans::PropertyV
 {
 }
 
-sal_Bool MediaDescriptor::isStreamReadOnly() const
+bool MediaDescriptor::isStreamReadOnly() const
 {
     static OUString CONTENTSCHEME_FILE( "file" );
     static OUString CONTENTPROP_ISREADONLY( "IsReadOnly" );
-    static sal_Bool READONLY_FALLBACK = sal_False;
+    static bool READONLY_FALLBACK = false;
 
-    sal_Bool bReadOnly = READONLY_FALLBACK;
+    bool bReadOnly = READONLY_FALLBACK;
 
     // check for explicit readonly state
     const_iterator pIt = find(MediaDescriptor::PROP_READONLY());
@@ -348,13 +348,13 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const
     // streams based on post data are readonly by definition
     pIt = find(MediaDescriptor::PROP_POSTDATA());
     if (pIt != end())
-        return sal_True;
+        return true;
 
     // A XStream capsulate XInputStream and XOutputStream ...
     // If it exists - the file must be open in read/write mode!
     pIt = find(MediaDescriptor::PROP_STREAM());
     if (pIt != end())
-        return sal_False;
+        return false;
 
     // Only file system content provider is able to provide XStream
     // so for this content impossibility to create XStream triggers
@@ -370,7 +370,7 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const
                 aScheme = xId->getContentProviderScheme();
 
             if (aScheme.equalsIgnoreAsciiCase(CONTENTSCHEME_FILE))
-                bReadOnly = sal_True;
+                bReadOnly = true;
             else
             {
                 ::ucbhelper::Content aContent(xContent, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext());
@@ -473,25 +473,25 @@ void MediaDescriptor::clearComponentDataEntry( const OUString& rName )
     return aEncryptionData;
 }
 
-sal_Bool MediaDescriptor::addInputStream()
+bool MediaDescriptor::addInputStream()
 {
-    return impl_addInputStream( sal_True );
+    return impl_addInputStream( true );
 }
 
 /*-----------------------------------------------*/
-sal_Bool MediaDescriptor::addInputStreamOwnLock()
+bool MediaDescriptor::addInputStreamOwnLock()
 {
     return impl_addInputStream(
         officecfg::Office::Common::Misc::UseDocumentSystemFileLocking::get());
 }
 
 /*-----------------------------------------------*/
-sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile )
+bool MediaDescriptor::impl_addInputStream( bool bLockFile )
 {
     // check for an already existing stream item first
     const_iterator pIt = find(MediaDescriptor::PROP_INPUTSTREAM());
     if (pIt != end())
-        return sal_True;
+        return true;
 
     try
     {
@@ -524,7 +524,7 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile )
     }
 }
 
-sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference< css::io::XInputStream >& _rxPostData )
+bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference< css::io::XInputStream >& _rxPostData )
     throw(::com::sun::star::uno::RuntimeException)
 {
     if ( !_rxPostData.is() )
@@ -586,15 +586,15 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference
     if ( !xResultStream.is() )
     {
         OSL_FAIL( "no valid reply to the HTTP-Post" );
-        return sal_False;
+        return false;
     }
 
     (*this)[MediaDescriptor::PROP_INPUTSTREAM()] <<= xResultStream;
-    return sal_True;
+    return true;
 }
 
 /*-----------------------------------------------*/
-sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool bLockFile )
+bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, bool bLockFile )
     throw(::com::sun::star::uno::RuntimeException)
 {
     OUString referer(getUnpackedValueOrDefault(PROP_REFERRER(), OUString()));
@@ -631,7 +631,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
                 "unotools.misc",
                 "caught ContentCreationException \"" << e.Message
                     << "\" while opening <" << sURL << ">");
-            return sal_False; // TODO error handling
+            return false; // TODO error handling
         }
     catch(const css::uno::Exception& e)
         {
@@ -639,7 +639,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
                 "unotools.misc",
                 "caught Exception \"" << e.Message << "\" while opening <"
                     << sURL << ">");
-            return sal_False; // TODO error handling
+            return false; // TODO error handling
         }
 
     // try to open the file in read/write mode
@@ -649,13 +649,13 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
     css::uno::Reference< css::io::XStream >      xStream     ;
     css::uno::Reference< css::io::XInputStream > xInputStream;
 
-    sal_Bool bReadOnly = sal_False;
-    sal_Bool bModeRequestedExplicitly = sal_False;
+    bool bReadOnly = false;
+    bool bModeRequestedExplicitly = false;
     const_iterator pIt = find(MediaDescriptor::PROP_READONLY());
     if (pIt != end())
     {
         pIt->second >>= bReadOnly;
-        bModeRequestedExplicitly = sal_True;
+        bModeRequestedExplicitly = true;
     }
 
     if ( !bReadOnly && bLockFile )
@@ -682,7 +682,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
                         "unotools.misc",
                         "caught Exception \"" << e.Message
                             << "\" while opening <" << sURL << ">");
-                    return sal_False;
+                    return false;
                 }
                 xStream.clear();
                 xInputStream.clear();
@@ -707,13 +707,13 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
             // so for this content impossibility to create XStream triggers
             // switch to readonly mode in case of opening with locking on
             if( bLockFile && aScheme.equalsIgnoreAsciiCase("file") )
-                bReadOnly = sal_True;
+                bReadOnly = true;
             else
             {
-                sal_Bool bRequestReadOnly = bReadOnly;
+                bool bRequestReadOnly = bReadOnly;
                 aContent.getPropertyValue("IsReadOnly") >>= bReadOnly;
                 if ( bReadOnly && !bRequestReadOnly && bModeRequestedExplicitly )
-                        return sal_False; // the document is explicitly requested with WRITEABLE mode
+                        return false; // the document is explicitly requested with WRITEABLE mode
             }
         }
         catch(const css::uno::RuntimeException&)
@@ -742,7 +742,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
                     "unotools.misc",
                     "caught Exception \"" << e.Message << "\" while opening <"
                         << sURL << ">");
-                return sal_False;
+                return false;
             }
     }
 
diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx
index 4798af6d825f..e54c2455e04c 100644
--- a/unotools/source/streaming/streamwrap.cxx
+++ b/unotools/source/streaming/streamwrap.cxx
@@ -35,14 +35,14 @@ DBG_NAME(OInputStreamWrapper)
 //------------------------------------------------------------------
 OInputStreamWrapper::OInputStreamWrapper( SvStream& _rStream )
                  :m_pSvStream(&_rStream)
-                 ,m_bSvStreamOwner(sal_False)
+                 ,m_bSvStreamOwner(false)
 {
     DBG_CTOR(OInputStreamWrapper,NULL);
 
 }
 
 //------------------------------------------------------------------
-OInputStreamWrapper::OInputStreamWrapper( SvStream* pStream, sal_Bool bOwner )
+OInputStreamWrapper::OInputStreamWrapper( SvStream* pStream, bool bOwner )
                  :m_pSvStream( pStream )
                  ,m_bSvStreamOwner( bOwner )
 {
@@ -163,11 +163,11 @@ void OInputStreamWrapper::checkError() const
 //------------------------------------------------------------------------------
 OSeekableInputStreamWrapper::OSeekableInputStreamWrapper(SvStream& _rStream)
 {
-    SetStream( &_rStream, sal_False );
+    SetStream( &_rStream, false );
 }
 
 //------------------------------------------------------------------------------
-OSeekableInputStreamWrapper::OSeekableInputStreamWrapper(SvStream* _pStream, sal_Bool _bOwner)
+OSeekableInputStreamWrapper::OSeekableInputStreamWrapper(SvStream* _pStream, bool _bOwner)
 {
     SetStream( _pStream, _bOwner );
 }
@@ -318,7 +318,7 @@ sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getLength(  ) throw (IOExceptio
 //------------------------------------------------------------------------------
 OStreamWrapper::OStreamWrapper(SvStream& _rStream)
 {
-    SetStream( &_rStream, sal_False );
+    SetStream( &_rStream, false );
 }
 
 //------------------------------------------------------------------------------
diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx
index ca98e23b915f..c11ae0d5ebcf 100644
--- a/unotools/source/ucbhelper/XTempFile.hxx
+++ b/unotools/source/ucbhelper/XTempFile.hxx
@@ -50,12 +50,12 @@ protected:
     ::utl::TempFile*    mpTempFile;
     ::osl::Mutex        maMutex;
     SvStream*           mpStream;
-    sal_Bool            mbRemoveFile;
-    sal_Bool            mbInClosed;
-    sal_Bool            mbOutClosed;
+    bool            mbRemoveFile;
+    bool            mbInClosed;
+    bool            mbOutClosed;
 
     sal_Int64           mnCachedPos;
-    sal_Bool            mbHasCachedPos;
+    bool            mbHasCachedPos;
 
     void checkError () const;
     void checkConnected ();
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index 25b2adfdbfbf..665f6526d42f 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::ucb;
 namespace utl
 {
 
-sal_Bool LocalFileHelper::ConvertSystemPathToURL( const OUString& rName, const OUString& rBaseURL, OUString& rReturn )
+bool LocalFileHelper::ConvertSystemPathToURL( const OUString& rName, const OUString& rBaseURL, OUString& rReturn )
 {
     rReturn = "";
 
@@ -50,13 +50,13 @@ sal_Bool LocalFileHelper::ConvertSystemPathToURL( const OUString& rName, const O
     }
     catch ( ::com::sun::star::uno::RuntimeException& )
     {
-        return sal_False;
+        return false;
     }
 
     return !rReturn.isEmpty();
 }
 
-sal_Bool LocalFileHelper::ConvertURLToSystemPath( const OUString& rName, OUString& rReturn )
+bool LocalFileHelper::ConvertURLToSystemPath( const OUString& rName, OUString& rReturn )
 {
     rReturn = "";
     Reference< XUniversalContentBroker > pBroker(
@@ -111,13 +111,13 @@ bool LocalFileHelper::ConvertURLToPhysicalName(const OUString& rName, OUString&
     return !rReturn.isEmpty();
 }
 
-sal_Bool LocalFileHelper::IsLocalFile(const OUString& rName)
+bool LocalFileHelper::IsLocalFile(const OUString& rName)
 {
     OUString aTmp;
     return ConvertURLToPhysicalName(rName, aTmp);
 }
 
-sal_Bool LocalFileHelper::IsFileContent(const OUString& rName)
+bool LocalFileHelper::IsFileContent(const OUString& rName)
 {
     OUString aTmp;
     return ConvertURLToSystemPath(rName, aTmp);
@@ -125,7 +125,7 @@ sal_Bool LocalFileHelper::IsFileContent(const OUString& rName)
 
 typedef ::std::vector< OUString* > StringList_Impl;
 
-::com::sun::star::uno::Sequence < OUString > LocalFileHelper::GetFolderContents( const OUString& rFolder, sal_Bool bFolder )
+::com::sun::star::uno::Sequence < OUString > LocalFileHelper::GetFolderContents( const OUString& rFolder, bool bFolder )
 {
     StringList_Impl* pFiles = NULL;
     try
diff --git a/unotools/source/ucbhelper/progresshandlerwrap.cxx b/unotools/source/ucbhelper/progresshandlerwrap.cxx
index 0d8920bf9e64..904781a18f22 100644
--- a/unotools/source/ucbhelper/progresshandlerwrap.cxx
+++ b/unotools/source/ucbhelper/progresshandlerwrap.cxx
@@ -31,16 +31,16 @@ ProgressHandlerWrap::ProgressHandlerWrap( ::com::sun::star::uno::Reference< ::co
 {
 }
 
-sal_Bool getStatusFromAny_Impl( const Any& aAny, OUString& aText, sal_Int32& nNum )
+bool getStatusFromAny_Impl( const Any& aAny, OUString& aText, sal_Int32& nNum )
 {
-    sal_Bool bNumIsSet = sal_False;
+    bool bNumIsSet = false;
 
     Sequence< Any > aSetList;
     if( ( aAny >>= aSetList ) && aSetList.getLength() )
         for( int ind = 0; ind < aSetList.getLength(); ind++ )
         {
             if( !bNumIsSet && ( aSetList[ind] >>= nNum ) )
-                bNumIsSet = sal_True;
+                bNumIsSet = true;
             else
                 aText.isEmpty() && ( aSetList[ind] >>= aText );
         }
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index 42f482d5608a..84e38ae6f75a 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx
@@ -51,7 +51,7 @@ static SvStream* lcl_CreateStream( const OUString& rFileName, StreamMode eOpenMo
     UcbLockBytesRef xLockBytes;
     if ( eOpenMode & STREAM_WRITE )
     {
-        sal_Bool bTruncate = ( eOpenMode & STREAM_TRUNC ) != 0;
+        bool bTruncate = ( eOpenMode & STREAM_TRUNC ) != 0;
         if ( bTruncate )
         {
             try
@@ -60,7 +60,7 @@ static SvStream* lcl_CreateStream( const OUString& rFileName, StreamMode eOpenMo
                 ::ucbhelper::Content aCnt(
                     rFileName, Reference < XCommandEnvironment >(),
                     comphelper::getProcessComponentContext() );
-                aCnt.executeCommand( OUString("delete"), makeAny( sal_Bool( sal_True ) ) );
+                aCnt.executeCommand( OUString("delete"), makeAny( true ) );
             }
 
             catch ( const CommandAbortedException& )
@@ -193,7 +193,7 @@ SvStream* UcbStreamHelper::CreateStream( Reference < XStream > xStream )
     return pStream;
 }
 
-SvStream* UcbStreamHelper::CreateStream( Reference < XInputStream > xStream, sal_Bool bCloseStream )
+SvStream* UcbStreamHelper::CreateStream( Reference < XInputStream > xStream, bool bCloseStream )
 {
     SvStream* pStream = NULL;
     UcbLockBytesRef xLockBytes = UcbLockBytes::CreateInputLockBytes( xStream );
@@ -210,7 +210,7 @@ SvStream* UcbStreamHelper::CreateStream( Reference < XInputStream > xStream, sal
     return pStream;
 };
 
-SvStream* UcbStreamHelper::CreateStream( Reference < XStream > xStream, sal_Bool bCloseStream )
+SvStream* UcbStreamHelper::CreateStream( Reference < XStream > xStream, bool bCloseStream )
 {
     SvStream* pStream = NULL;
     if ( xStream->getOutputStream().is() )
diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx
index 8c4c6f0e0827..3b31e529e789 100644
--- a/unotools/source/ucbhelper/xtempfile.cxx
+++ b/unotools/source/ucbhelper/xtempfile.cxx
@@ -31,11 +31,11 @@ OTempFileService::OTempFileService(css::uno::Reference< css::uno::XComponentCont
     , static_cast< Implements >( IMPLEMENTS_PROPERTY_SET | IMPLEMENTS_FAST_PROPERTY_SET | IMPLEMENTS_PROPERTY_ACCESS )
     , com::sun::star::uno::Sequence< OUString >() )
 , mpStream( NULL )
-, mbRemoveFile( sal_True )
-, mbInClosed( sal_False )
-, mbOutClosed( sal_False )
+, mbRemoveFile( true )
+, mbInClosed( false )
+, mbOutClosed( false )
 , mnCachedPos( 0 )
-, mbHasCachedPos( sal_False )
+, mbHasCachedPos( false )
 
 {
     mpTempFile = new ::utl::TempFile;
@@ -179,7 +179,7 @@ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css
         // usually that means that the stream was read till the end
         // TODO/LATER: it is better to get rid of this optimization by avoiding using of multiple temporary files ( there should be only one temporary file? )
         mnCachedPos = mpStream->Tell();
-        mbHasCachedPos = sal_True;
+        mbHasCachedPos = true;
 
         mpStream = NULL;
         if ( mpTempFile )
@@ -249,7 +249,7 @@ throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeE
     if ( mbInClosed )
         throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak  * > ( static_cast < const css::uno::XWeak * > (this ) ) );
 
-    mbInClosed = sal_True;
+    mbInClosed = true;
 
     if ( mbOutClosed )
     {
@@ -297,13 +297,13 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs
     if ( mbOutClosed )
         throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
 
-    mbOutClosed = sal_True;
+    mbOutClosed = true;
 
     // TODO/LATER: it is better to get rid of this optimization by avoiding using of multiple temporary files ( there should be only one temporary file? )
     if ( mpStream )
     {
         mnCachedPos = mpStream->Tell();
-        mbHasCachedPos = sal_True;
+        mbHasCachedPos = true;
 
         mpStream = NULL;
         if ( mpTempFile )
@@ -339,7 +339,7 @@ void OTempFileService::checkConnected ()
             mpStream->Seek( sal::static_int_cast<sal_Size>(mnCachedPos) );
             if ( mpStream->SvStream::GetError () == ERRCODE_NONE )
             {
-                mbHasCachedPos = sal_False;
+                mbHasCachedPos = false;
                 mnCachedPos = 0;
             }
             else