ucb: sal_Bool->bool

Change-Id: If79913653f22387ab6d5a376d9cf26751525168a

83 files changed, 946 insertions, 947 deletions

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index bed708c4b823..5d4310929190 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -71,7 +71,7 @@ template<typename T> T CachedContentResultSet::rowOriginGet(
         aGuard.reacquire();
         if( !m_aCache.hasRow( nRow ) )
         {
-            m_bLastReadWasFromCache = sal_False;
+            m_bLastReadWasFromCache = false;
             aGuard.clear();
             applyPositionToOrigin( nRow );
             impl_init_xRowOrigin();
@@ -80,7 +80,7 @@ template<typename T> T CachedContentResultSet::rowOriginGet(
     }
     const Any& rValue = m_aCache.getAny( nRow, columnIndex );
     T aRet = T();
-    m_bLastReadWasFromCache = sal_True;
+    m_bLastReadWasFromCache = true;
     m_bLastCachedReadWasNull = !( rValue >>= aRet );
     /* Last chance. Try type converter service... */
     if ( m_bLastCachedReadWasNull && rValue.hasValue() )
@@ -144,11 +144,11 @@ void SAL_CALL CachedContentResultSet::CCRS_Cache
     m_pResult = new FetchResult( rResult );
 }
 
-sal_Bool SAL_CALL CachedContentResultSet::CCRS_Cache
+bool SAL_CALL CachedContentResultSet::CCRS_Cache
     ::hasRow( sal_Int32 row )
 {
     if( !m_pResult )
-        return sal_False;
+        return false;
     long nStart = m_pResult->StartIndex;
     long nEnd = nStart;
     if( m_pResult->Orientation )
@@ -171,27 +171,27 @@ sal_Int32 SAL_CALL CachedContentResultSet::CCRS_Cache
         return nEnd;
 }
 
-sal_Bool SAL_CALL CachedContentResultSet::CCRS_Cache
+bool SAL_CALL CachedContentResultSet::CCRS_Cache
     ::hasKnownLast()
 {
     if( !m_pResult )
-        return sal_False;
+        return false;
 
     if( ( m_pResult->FetchError & FetchError::ENDOFDATA )
         && m_pResult->Orientation
         && m_pResult->Rows.getLength() )
-        return sal_True;
+        return true;
 
-    return sal_False;
+    return false;
 }
 
-sal_Bool SAL_CALL CachedContentResultSet::CCRS_Cache
+bool SAL_CALL CachedContentResultSet::CCRS_Cache
     ::hasCausedException( sal_Int32 nRow )
 {
     if( !m_pResult )
-        return sal_False;
+        return false;
     if( !( m_pResult->FetchError & FetchError::EXCEPTION ) )
-        return sal_False;
+        return false;
 
     long nEnd = m_pResult->StartIndex;
     if( m_pResult->Orientation )
@@ -233,17 +233,17 @@ void SAL_CALL CachedContentResultSet::CCRS_Cache
         (*pMappedReminder)[nDiff] = sal_True;
 }
 
-sal_Bool SAL_CALL CachedContentResultSet::CCRS_Cache
+bool SAL_CALL CachedContentResultSet::CCRS_Cache
     ::isRowMapped( sal_Int32 nRow )
 {
     if( !m_pMappedReminder || !m_pResult )
-        return sal_False;
+        return false;
     long nDiff = nRow - m_pResult->StartIndex;
     if( nDiff < 0 )
         nDiff *= -1;
     if( nDiff < m_pMappedReminder->getLength() )
         return (*m_pMappedReminder)[nDiff];
-    return sal_False;
+    return false;
 }
 
 void SAL_CALL CachedContentResultSet::CCRS_Cache
@@ -394,14 +394,14 @@ private:
     sal_Int32 SAL_CALL
     impl_getRemainedHandle() const;
 
-    sal_Bool SAL_CALL
+    bool SAL_CALL
     impl_queryProperty(
             const OUString& rName
             , com::sun::star::beans::Property& rProp ) const;
     sal_Int32 SAL_CALL
     impl_getPos( const OUString& rName ) const;
 
-    static sal_Bool SAL_CALL
+    static bool SAL_CALL
     impl_isMyPropertyName( const OUString& rName );
 
 public:
@@ -602,7 +602,7 @@ sal_Int32 SAL_CALL CCRS_PropertySetInfo
     return -1;
 }
 
-sal_Bool SAL_CALL CCRS_PropertySetInfo
+bool SAL_CALL CCRS_PropertySetInfo
         ::impl_queryProperty( const OUString& rName, Property& rProp ) const
 {
     for( sal_Int32 nN = m_pProperties->getLength(); nN--; )
@@ -615,14 +615,14 @@ sal_Bool SAL_CALL CCRS_PropertySetInfo
             rProp.Type = rMyProp.Type;
             rProp.Attributes = rMyProp.Attributes;
 
-            return sal_True;
+            return true;
         }
     }
-    return sal_False;
+    return false;
 }
 
 //static
-sal_Bool SAL_CALL CCRS_PropertySetInfo
+bool SAL_CALL CCRS_PropertySetInfo
         ::impl_isMyPropertyName( const OUString& rPropertyName )
 {
     return ( rPropertyName == m_aPropertyNameForCount
@@ -641,15 +641,15 @@ sal_Int32 SAL_CALL CCRS_PropertySetInfo
         OSL_FAIL( "Properties not initialized yet" );
         return nHandle;
     }
-    sal_Bool bFound = sal_True;
+    bool bFound = true;
     while( bFound )
     {
-        bFound = sal_False;
+        bFound = false;
         for( sal_Int32 nN = m_pProperties->getLength(); nN--; )
         {
             if( nHandle == (*m_pProperties)[nN].Handle )
             {
-                bFound = sal_True;
+                bFound = true;
                 nHandle++;
                 break;
             }
@@ -680,23 +680,23 @@ CachedContentResultSet::CachedContentResultSet(
 
                 , m_xContentIdentifierMapping( xContentIdentifierMapping )
                 , m_nRow( 0 ) // Position is one-based. Zero means: before first element.
-                , m_bAfterLast( sal_False )
+                , m_bAfterLast( false )
                 , m_nLastAppliedPos( 0 )
-                , m_bAfterLastApplied( sal_False )
+                , m_bAfterLastApplied( false )
                 , m_nKnownCount( 0 )
-                , m_bFinalCount( sal_False )
+                , m_bFinalCount( false )
                 , m_nFetchSize(
                     COMSUNSTARUCBCCRS_DEFAULT_FETCH_SIZE )
                 , m_nFetchDirection(
                     COMSUNSTARUCBCCRS_DEFAULT_FETCH_DIRECTION )
 
-                , m_bLastReadWasFromCache( sal_False )
-                , m_bLastCachedReadWasNull( sal_True )
+                , m_bLastReadWasFromCache( false )
+                , m_bLastCachedReadWasNull( true )
                 , m_aCache( m_xContentIdentifierMapping )
                 , m_aCacheContentIdentifierString( m_xContentIdentifierMapping )
                 , m_aCacheContentIdentifier( m_xContentIdentifierMapping )
                 , m_aCacheContent( m_xContentIdentifierMapping )
-                , m_bTriedToGetTypeConverter( sal_False )
+                , m_bTriedToGetTypeConverter( false )
                 , m_xTypeConverter( NULL )
 {
     m_xFetchProvider = Reference< XFetchProvider >( m_xResultSetOrigin, UNO_QUERY );
@@ -718,7 +718,7 @@ CachedContentResultSet::~CachedContentResultSet()
 // impl_ methods.
 
 
-sal_Bool SAL_CALL CachedContentResultSet
+bool SAL_CALL CachedContentResultSet
     ::applyPositionToOrigin( sal_Int32 nRow )
     throw( SQLException,
            RuntimeException )
@@ -736,13 +736,13 @@ sal_Bool SAL_CALL CachedContentResultSet
     if( !m_xResultSetOrigin.is() )
     {
         OSL_FAIL( "broadcaster was disposed already" );
-        return sal_False;
+        return false;
     }
 //  OSL_ENSURE( nRow <= m_nKnownCount, "don't step into regions you don't know with this method" );
 
     sal_Int32 nLastAppliedPos = m_nLastAppliedPos;
-    sal_Bool bAfterLastApplied = m_bAfterLastApplied;
-    sal_Bool bAfterLast = m_bAfterLast;
+    bool bAfterLastApplied = m_bAfterLastApplied;
+    bool bAfterLast = m_bAfterLast;
     sal_Int32 nForwardOnly = m_nForwardOnly;
 
     aGuard.clear();
@@ -774,8 +774,8 @@ sal_Bool SAL_CALL CachedContentResultSet
 
             aGuard.reacquire();
             m_nLastAppliedPos = 0;
-            m_bAfterLastApplied = sal_False;
-            return sal_False;
+            m_bAfterLastApplied = false;
+            return false;
         }
         try
         {
@@ -783,7 +783,7 @@ sal_Bool SAL_CALL CachedContentResultSet
             //because move relative would throw exception
             if( !nLastAppliedPos || bAfterLast || bAfterLastApplied )
             {
-                sal_Bool bValid = m_xResultSetOrigin->absolute( nRow );
+                bool bValid = m_xResultSetOrigin->absolute( nRow );
 
                 aGuard.reacquire();
                 m_nLastAppliedPos = nRow;
@@ -792,7 +792,7 @@ sal_Bool SAL_CALL CachedContentResultSet
             }
             else
             {
-                sal_Bool bValid = m_xResultSetOrigin->relative( nRow - nLastAppliedPos );
+                bool bValid = m_xResultSetOrigin->relative( nRow - nLastAppliedPos );
 
                 aGuard.reacquire();
                 m_nLastAppliedPos += ( nRow - nLastAppliedPos );
@@ -822,7 +822,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 
         return nRow == m_nLastAppliedPos;
     }
-    return sal_True;
+    return true;
 };
 
 
@@ -832,7 +832,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 
 
 #define FETCH_XXX( aCache, fetchInterface, fetchMethod )            \
-sal_Bool bDirection = !!(                                           \
+bool bDirection = !!(                                           \
     nFetchDirection != FetchDirection::REVERSE );                   \
 FetchResult aResult =                                               \
     fetchInterface->fetchMethod( nRow, nFetchSize, bDirection );    \
@@ -840,8 +840,8 @@ osl::ClearableGuard< osl::Mutex > aGuard2( m_aMutex );              \
 aCache.loadData( aResult );                                         \
 sal_Int32 nMax = aCache.getMaxRow();                                \
 sal_Int32 nCurCount = m_nKnownCount;                                \
-sal_Bool bIsFinalCount = aCache.hasKnownLast();                     \
-sal_Bool bCurIsFinalCount = m_bFinalCount;                          \
+bool bIsFinalCount = aCache.hasKnownLast();                     \
+bool bCurIsFinalCount = m_bFinalCount;                          \
 aGuard2.clear();                                                    \
 if( nMax > nCurCount )                                              \
     impl_changeRowCount( nCurCount, nMax );                         \
@@ -880,7 +880,7 @@ void SAL_CALL CachedContentResultSet
 }
 
 void SAL_CALL CachedContentResultSet
-    ::impl_changeIsRowCountFinal( sal_Bool bOld, sal_Bool bNew )
+    ::impl_changeIsRowCountFinal( bool bOld, bool bNew )
 {
     OSL_ENSURE( !bOld && bNew, "This change is not allowed for IsRowCountFinal" );
     if( ! (!bOld && bNew ) )
@@ -902,20 +902,20 @@ void SAL_CALL CachedContentResultSet
     impl_notifyPropertyChangeListeners( aEvt );
 }
 
-sal_Bool SAL_CALL CachedContentResultSet
+bool SAL_CALL CachedContentResultSet
     ::impl_isKnownValidPosition( sal_Int32 nRow )
 {
     return m_nKnownCount && nRow
             && nRow <= m_nKnownCount;
 }
 
-sal_Bool SAL_CALL CachedContentResultSet
+bool SAL_CALL CachedContentResultSet
     ::impl_isKnownInvalidPosition( sal_Int32 nRow )
 {
     if( !nRow )
-        return sal_True;
+        return true;
     if( !m_bFinalCount )
-        return sal_False;
+        return false;
     return nRow > m_nKnownCount;
 }
 
@@ -1232,7 +1232,7 @@ void SAL_CALL CachedContentResultSet
         {//IsRowCountFinal changed
 
             //check value
-            sal_Bool bNew = sal_False;
+            bool bNew = false;
             if( !( aEvt.NewValue >>= bNew ) )
             {
                 OSL_FAIL( "PropertyChangeEvent contains wrong data" );
@@ -1358,7 +1358,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     {
         aGuard.reacquire();
         m_nRow++;
-        m_bAfterLast = sal_True;
+        m_bAfterLast = true;
         return sal_False;
     }
     aGuard.reacquire();
@@ -1373,7 +1373,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     sal_Int32 nRow = m_nRow;
     aGuard.clear();
 
-    sal_Bool bValid = applyPositionToOrigin( nRow + 1 );
+    bool bValid = applyPositionToOrigin( nRow + 1 );
 
     aGuard.reacquire();
     m_nRow = nRow + 1;
@@ -1400,25 +1400,25 @@ sal_Bool SAL_CALL CachedContentResultSet
     if( !m_bAfterLast && m_nKnownCount && m_nRow == 1 )
     {
         m_nRow--;
-        m_bAfterLast = sal_False;
+        m_bAfterLast = false;
         return sal_False;
     }
     //known valid position ?:
     if( impl_isKnownValidPosition( m_nRow - 1 ) )
     {
         m_nRow--;
-        m_bAfterLast = sal_False;
+        m_bAfterLast = false;
         return sal_True;
     }
     //unknown position:
     sal_Int32 nRow = m_nRow;
     aGuard.clear();
 
-    sal_Bool bValid = applyPositionToOrigin( nRow - 1  );
+    bool bValid = applyPositionToOrigin( nRow - 1  );
 
     aGuard.reacquire();
     m_nRow = nRow - 1;
-    m_bAfterLast = sal_False;
+    m_bAfterLast = false;
     return bValid;
 }
 
@@ -1448,14 +1448,14 @@ sal_Bool SAL_CALL CachedContentResultSet
         if( m_bFinalCount )
         {
             sal_Int32 nNewRow = m_nKnownCount + 1 + row;
-            sal_Bool bValid = sal_True;
+            bool bValid = true;
             if( nNewRow <= 0 )
             {
                 nNewRow = 0;
-                bValid = sal_False;
+                bValid = false;
             }
             m_nRow = nNewRow;
-            m_bAfterLast = sal_False;
+            m_bAfterLast = false;
             return bValid;
         }
         //unknown final count:
@@ -1464,7 +1464,7 @@ sal_Bool SAL_CALL CachedContentResultSet
         // Solaris has problems catching or propagating derived exceptions
         // when only the base class is known, so make ResultSetException
         // (derived from SQLException) known here:
-        sal_Bool bValid;
+        bool bValid;
         try
         {
             bValid = m_xResultSetOrigin->absolute( row );
@@ -1482,7 +1482,7 @@ sal_Bool SAL_CALL CachedContentResultSet
                 nNewRow = 0;
             m_nLastAppliedPos = nNewRow;
             m_nRow = nNewRow;
-            m_bAfterLastApplied = m_bAfterLast = sal_False;
+            m_bAfterLastApplied = m_bAfterLast = false;
             return bValid;
         }
         aGuard.clear();
@@ -1492,7 +1492,7 @@ sal_Bool SAL_CALL CachedContentResultSet
         aGuard.reacquire();
         m_nLastAppliedPos = nCurRow;
         m_nRow = nCurRow;
-        m_bAfterLast = sal_False;
+        m_bAfterLast = false;
         return nCurRow != 0;
     }
     //row > 0:
@@ -1501,17 +1501,17 @@ sal_Bool SAL_CALL CachedContentResultSet
         if( row > m_nKnownCount )
         {
             m_nRow = m_nKnownCount + 1;
-            m_bAfterLast = sal_True;
+            m_bAfterLast = true;
             return sal_False;
         }
         m_nRow = row;
-        m_bAfterLast = sal_False;
+        m_bAfterLast = false;
         return sal_True;
     }
     //unknown new position:
     aGuard.clear();
 
-    sal_Bool bValid = m_xResultSetOrigin->absolute( row );
+    bool bValid = m_xResultSetOrigin->absolute( row );
 
     aGuard.reacquire();
     if( m_bFinalCount )
@@ -1520,10 +1520,10 @@ sal_Bool SAL_CALL CachedContentResultSet
         if( nNewRow > m_nKnownCount )
         {
             nNewRow = m_nKnownCount + 1;
-            m_bAfterLastApplied = m_bAfterLast = sal_True;
+            m_bAfterLastApplied = m_bAfterLast = true;
         }
         else
-            m_bAfterLastApplied = m_bAfterLast = sal_False;
+            m_bAfterLastApplied = m_bAfterLast = false;
 
         m_nLastAppliedPos = nNewRow;
         m_nRow = nNewRow;
@@ -1532,7 +1532,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     aGuard.clear();
 
     sal_Int32 nCurRow = m_xResultSetOrigin->getRow();
-    sal_Bool bIsAfterLast = m_xResultSetOrigin->isAfterLast();
+    bool bIsAfterLast = m_xResultSetOrigin->isAfterLast();
 
     aGuard.reacquire();
     m_nLastAppliedPos = nCurRow;
@@ -1566,7 +1566,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     if( impl_isKnownValidPosition( nNewRow ) )
     {
         m_nRow = nNewRow;
-        m_bAfterLast = sal_False;
+        m_bAfterLast = false;
         return sal_True;
     }
     else
@@ -1574,19 +1574,19 @@ sal_Bool SAL_CALL CachedContentResultSet
         //known invalid new position:
         if( nNewRow == 0 )
         {
-            m_bAfterLast = sal_False;
+            m_bAfterLast = false;
             m_nRow = 0;
             return sal_False;
         }
         if( m_bFinalCount && nNewRow > m_nKnownCount )
         {
-            m_bAfterLast = sal_True;
+            m_bAfterLast = true;
             m_nRow = m_nKnownCount + 1;
             return sal_False;
         }
         //unknown new position:
         aGuard.clear();
-        sal_Bool bValid = applyPositionToOrigin( nNewRow );
+        bool bValid = applyPositionToOrigin( nNewRow );
 
         aGuard.reacquire();
         m_nRow = nNewRow;
@@ -1611,23 +1611,23 @@ sal_Bool SAL_CALL CachedContentResultSet
     if( impl_isKnownValidPosition( 1 ) )
     {
         m_nRow = 1;
-        m_bAfterLast = sal_False;
+        m_bAfterLast = false;
         return sal_True;
     }
     if( impl_isKnownInvalidPosition( 1 ) )
     {
         m_nRow = 1;
-        m_bAfterLast = sal_False;
+        m_bAfterLast = false;
         return sal_False;
     }
     //unknown position
     aGuard.clear();
 
-    sal_Bool bValid = applyPositionToOrigin( 1 );
+    bool bValid = applyPositionToOrigin( 1 );
 
     aGuard.reacquire();
     m_nRow = 1;
-    m_bAfterLast = sal_False;
+    m_bAfterLast = false;
     return bValid;
 }
 
@@ -1646,7 +1646,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     if( m_bFinalCount )
     {
         m_nRow = m_nKnownCount;
-        m_bAfterLast = sal_False;
+        m_bAfterLast = false;
         return m_nKnownCount != 0;
     }
     //unknown position
@@ -1657,10 +1657,10 @@ sal_Bool SAL_CALL CachedContentResultSet
     }
     aGuard.clear();
 
-    sal_Bool bValid = m_xResultSetOrigin->last();
+    bool bValid = m_xResultSetOrigin->last();
 
     aGuard.reacquire();
-    m_bAfterLastApplied = m_bAfterLast = sal_False;
+    m_bAfterLastApplied = m_bAfterLast = false;
     if( m_bFinalCount )
     {
         m_nLastAppliedPos = m_nKnownCount;
@@ -1676,7 +1676,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     m_nRow = nCurRow;
     OSL_ENSURE( nCurRow >= m_nKnownCount, "position of last row < known Count, that could not be" );
     m_nKnownCount = nCurRow;
-    m_bFinalCount = sal_True;
+    m_bFinalCount = true;
     return nCurRow != 0;
 }
 
@@ -1693,7 +1693,7 @@ void SAL_CALL CachedContentResultSet
 
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     m_nRow = 0;
-    m_bAfterLast = sal_False;
+    m_bAfterLast = false;
 }
 
 //virtual
@@ -1709,7 +1709,7 @@ void SAL_CALL CachedContentResultSet
 
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     m_nRow = 1;
-    m_bAfterLast = sal_True;
+    m_bAfterLast = true;
 }
 
 //virtual
@@ -1739,7 +1739,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     m_xResultSetOrigin->afterLast();
 
     aGuard.reacquire();
-    m_bAfterLastApplied = sal_True;
+    m_bAfterLastApplied = true;
     aGuard.clear();
 
     return m_xResultSetOrigin->isAfterLast();
@@ -1774,7 +1774,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     m_xResultSetOrigin->beforeFirst();
 
     aGuard.reacquire();
-    m_bAfterLastApplied = sal_False;
+    m_bAfterLastApplied = false;
     m_nLastAppliedPos = 0;
     aGuard.clear();
 
@@ -2111,7 +2111,7 @@ Any SAL_CALL CachedContentResultSet
         aGuard.reacquire();
         if( !m_aCache.hasRow( nRow ) )
         {
-            m_bLastReadWasFromCache = sal_False;
+            m_bLastReadWasFromCache = false;
             aGuard.clear();
             applyPositionToOrigin( nRow );
             impl_init_xRowOrigin();
@@ -2121,7 +2121,7 @@ Any SAL_CALL CachedContentResultSet
     //@todo: pay attention to typeMap
     const Any& rValue = m_aCache.getAny( nRow, columnIndex );
     Any aRet;
-    m_bLastReadWasFromCache = sal_True;
+    m_bLastReadWasFromCache = true;
     m_bLastCachedReadWasNull = !( rValue >>= aRet );
     return aRet;
 }
@@ -2176,7 +2176,7 @@ const Reference< XTypeConverter >& CachedContentResultSet::getTypeConverter()
 
     if ( !m_bTriedToGetTypeConverter && !m_xTypeConverter.is() )
     {
-        m_bTriedToGetTypeConverter = sal_True;
+        m_bTriedToGetTypeConverter = true;
         m_xTypeConverter = Reference< XTypeConverter >( Converter::create(m_xContext) );
 
         OSL_ENSURE( m_xTypeConverter.is(),
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index 7d0d69ba2841..d4de26951ed0 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -66,7 +66,7 @@ class CachedContentResultSet
 
 
         void SAL_CALL remindMapped( sal_Int32 nRow );
-        sal_Bool SAL_CALL isRowMapped( sal_Int32 nRow );
+        bool SAL_CALL isRowMapped( sal_Int32 nRow );
         void SAL_CALL clearMappedReminder();
         com::sun::star::uno::Sequence< sal_Bool >* SAL_CALL getMappedReminder();
 
@@ -78,16 +78,16 @@ class CachedContentResultSet
         void SAL_CALL loadData(
             const com::sun::star::ucb::FetchResult& rResult );
 
-        sal_Bool SAL_CALL
+        bool SAL_CALL
         hasRow( sal_Int32 nRow );
 
-        sal_Bool SAL_CALL
+        bool SAL_CALL
         hasCausedException( sal_Int32 nRow );
 
         sal_Int32 SAL_CALL
         getMaxRow();
 
-        sal_Bool SAL_CALL
+        bool SAL_CALL
         hasKnownLast();
 
 
@@ -135,19 +135,19 @@ class CachedContentResultSet
 
     //some Properties and helping variables
     sal_Int32               m_nRow;
-    sal_Bool                m_bAfterLast; // TRUE, if m_nRow is after final count; can be TRUE without knowing the exact final count
+    bool                m_bAfterLast; // TRUE, if m_nRow is after final count; can be TRUE without knowing the exact final count
 
     sal_Int32               m_nLastAppliedPos;
-    sal_Bool                m_bAfterLastApplied;
+    bool                m_bAfterLastApplied;
 
     sal_Int32               m_nKnownCount; // count we know from the Origin
-    sal_Bool                m_bFinalCount; // TRUE if the Origin has reached final count and we got that count in m_nKnownCount
+    bool                m_bFinalCount; // TRUE if the Origin has reached final count and we got that count in m_nKnownCount
 
     sal_Int32               m_nFetchSize;
     sal_Int32               m_nFetchDirection;
 
-    sal_Bool                m_bLastReadWasFromCache;
-    sal_Bool                m_bLastCachedReadWasNull;
+    bool                m_bLastReadWasFromCache;
+    bool                m_bLastCachedReadWasNull;
 
     //cache:
     CCRS_Cache              m_aCache;
@@ -163,7 +163,7 @@ private:
 
 
 
-    sal_Bool SAL_CALL
+    bool SAL_CALL
     applyPositionToOrigin( sal_Int32 nRow )
         throw( com::sun::star::sdbc::SQLException,
         com::sun::star::uno::RuntimeException );
@@ -173,17 +173,17 @@ private:
                     , sal_Int32 nFetchDirection )
         throw( com::sun::star::uno::RuntimeException );
 
-    sal_Bool SAL_CALL
+    bool SAL_CALL
     impl_isKnownValidPosition( sal_Int32 nRow );
 
-    sal_Bool SAL_CALL
+    bool SAL_CALL
     impl_isKnownInvalidPosition( sal_Int32 nRow );
 
     void SAL_CALL
     impl_changeRowCount( sal_Int32 nOld, sal_Int32 nNew );
 
     void SAL_CALL
-    impl_changeIsRowCountFinal( sal_Bool bOld, sal_Bool bNew );
+    impl_changeIsRowCountFinal( bool bOld, bool bNew );
 
 public:
     CachedContentResultSet(
@@ -469,7 +469,7 @@ public:
 
 
 private:
-    sal_Bool m_bTriedToGetTypeConverter;
+    bool m_bTriedToGetTypeConverter;
     com::sun::star::uno::Reference<
         com::sun::star::script::XTypeConverter > m_xTypeConverter;
 
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index ea830d38bd7b..03f66fc897a3 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -35,11 +35,11 @@ using namespace cppu;
 CachedContentResultSetStub::CachedContentResultSetStub( Reference< XResultSet > xOrigin )
                 : ContentResultSetWrapper( xOrigin )
                 , m_nColumnCount( 0 )
-                , m_bColumnCountCached( sal_False )
-                , m_bNeedToPropagateFetchSize( sal_True )
-                , m_bFirstFetchSizePropagationDone( sal_False )
+                , m_bColumnCountCached( false )
+                , m_bNeedToPropagateFetchSize( true )
+                , m_bFirstFetchSizePropagationDone( false )
                 , m_nLastFetchSize( 1 )//this value is not important at all
-                , m_bLastFetchDirection( sal_True )//this value is not important at all
+                , m_bLastFetchDirection( true )//this value is not important at all
                 , m_aPropertyNameForFetchSize( OUString("FetchSize") )
                 , m_aPropertyNameForFetchDirection( OUString("FetchDirection") )
 {
@@ -217,11 +217,11 @@ if( impl_isForwardOnly() ) \
     return aRet; \
 } \
 aRet.Rows.realloc( nRowCount ); \
-sal_Bool bOldOriginal_AfterLast = sal_False; \
+bool bOldOriginal_AfterLast = false; \
 if( !nOldOriginal_Pos ) \
     bOldOriginal_AfterLast = m_xResultSetOrigin->isAfterLast(); \
 sal_Int32 nN = 1; \
-sal_Bool bValidNewPos = sal_False; \
+bool bValidNewPos = false; \
 try \
 { \
     try \
@@ -304,7 +304,7 @@ sal_Int32 SAL_CALL CachedContentResultSetStub
     ::impl_getColumnCount()
 {
     sal_Int32 nCount;
-    sal_Bool bCached;
+    bool bCached;
     {
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
         nCount = m_nColumnCount;
@@ -326,7 +326,7 @@ sal_Int32 SAL_CALL CachedContentResultSetStub
     }
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     m_nColumnCount = nCount;
-    m_bColumnCountCached = sal_True;
+    m_bColumnCountCached = true;
     return m_nColumnCount;
 }
 
@@ -347,7 +347,7 @@ void SAL_CALL CachedContentResultSetStub
 }
 
 void SAL_CALL CachedContentResultSetStub
-    ::impl_propagateFetchSizeAndDirection( sal_Int32 nFetchSize, sal_Bool bFetchDirection )
+    ::impl_propagateFetchSizeAndDirection( sal_Int32 nFetchSize, bool bFetchDirection )
         throw ( RuntimeException )
 {
     //this is done only for the case, that there is another CachedContentResultSet in the chain of underlying ResulSets
@@ -360,10 +360,10 @@ void SAL_CALL CachedContentResultSetStub
     if( !m_bNeedToPropagateFetchSize )
         return;
 
-    sal_Bool bNeedAction;
+    bool bNeedAction;
     sal_Int32 nLastSize;
-    sal_Bool bLastDirection;
-    sal_Bool bFirstPropagationDone;
+    bool bLastDirection;
+    bool bFirstPropagationDone;
     {
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
         bNeedAction             = m_bNeedToPropagateFetchSize;
@@ -375,7 +375,7 @@ void SAL_CALL CachedContentResultSetStub
     {
         if( nLastSize == nFetchSize
             && bLastDirection == bFetchDirection
-            && bFirstPropagationDone == sal_True )
+            && bFirstPropagationDone )
             return;
 
         if(!bFirstPropagationDone)
@@ -383,23 +383,23 @@ void SAL_CALL CachedContentResultSetStub
             //check whether the properties 'FetchSize' and 'FetchDirection' do exist
 
             Reference< XPropertySetInfo > xPropertySetInfo = getPropertySetInfo();
-            sal_Bool bHasSize = xPropertySetInfo->hasPropertyByName( m_aPropertyNameForFetchSize );
-            sal_Bool bHasDirection = xPropertySetInfo->hasPropertyByName( m_aPropertyNameForFetchDirection );
+            bool bHasSize = xPropertySetInfo->hasPropertyByName( m_aPropertyNameForFetchSize );
+            bool bHasDirection = xPropertySetInfo->hasPropertyByName( m_aPropertyNameForFetchDirection );
 
             if(!bHasSize || !bHasDirection)
             {
                 osl::Guard< osl::Mutex > aGuard( m_aMutex );
-                m_bNeedToPropagateFetchSize = sal_False;
+                m_bNeedToPropagateFetchSize = false;
                 return;
             }
         }
 
-        sal_Bool bSetSize       = ( nLastSize       !=nFetchSize        ) || !bFirstPropagationDone;
-        sal_Bool bSetDirection  = ( bLastDirection  !=bFetchDirection   ) || !bFirstPropagationDone;
+        bool bSetSize       = ( nLastSize       !=nFetchSize        ) || !bFirstPropagationDone;
+        bool bSetDirection  = ( bLastDirection  !=bFetchDirection   ) || !bFirstPropagationDone;
 
         {
             osl::Guard< osl::Mutex > aGuard( m_aMutex );
-            m_bFirstFetchSizePropagationDone = sal_True;
+            m_bFirstFetchSizePropagationDone = true;
             m_nLastFetchSize        = nFetchSize;
             m_bLastFetchDirection   = bFetchDirection;
         }
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index 18aa30a869c0..f99b1affde36 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -41,13 +41,13 @@ class CachedContentResultSetStub
 {
 private:
     sal_Int32       m_nColumnCount;
-    sal_Bool        m_bColumnCountCached;
+    bool        m_bColumnCountCached;
 
     //members to propagate fetchsize and direction:
-    sal_Bool        m_bNeedToPropagateFetchSize;
-    sal_Bool        m_bFirstFetchSizePropagationDone;
+    bool        m_bNeedToPropagateFetchSize;
+    bool        m_bFirstFetchSizePropagationDone;
     sal_Int32       m_nLastFetchSize;
-    sal_Bool        m_bLastFetchDirection;
+    bool        m_bLastFetchDirection;
     const OUString     m_aPropertyNameForFetchSize;
     const OUString     m_aPropertyNameForFetchDirection;
 
@@ -85,7 +85,7 @@ private:
             throw ( com::sun::star::uno::RuntimeException );
 
     void SAL_CALL
-    impl_propagateFetchSizeAndDirection( sal_Int32 nFetchSize, sal_Bool bFetchDirection )
+    impl_propagateFetchSizeAndDirection( sal_Int32 nFetchSize, bool bFetchDirection )
         throw ( com::sun::star::uno::RuntimeException );
 
 public:
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index aca8dc38c983..17eeb0932fce 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -51,8 +51,8 @@ ContentResultSetWrapper::ContentResultSetWrapper(
                 , m_xPropertySetInfo( NULL )
                 , m_nForwardOnly( 2 )
                 , m_xMetaDataFromOrigin( NULL )
-                , m_bDisposed( sal_False )
-                , m_bInDispose( sal_False )
+                , m_bDisposed( false )
+                , m_bInDispose( false )
                 , m_pDisposeEventListeners( NULL )
                 , m_pPropertyChangeListeners( NULL )
                 , m_pVetoableChangeListeners( NULL )
@@ -283,7 +283,7 @@ void SAL_CALL ContentResultSetWrapper
     }
 }
 
-sal_Bool SAL_CALL ContentResultSetWrapper
+bool SAL_CALL ContentResultSetWrapper
     ::impl_isForwardOnly()
 {
     //m_nForwardOnly == 2 -> don't know
@@ -365,7 +365,7 @@ void SAL_CALL ContentResultSetWrapper
     ReacquireableGuard aGuard( m_aMutex );
     if( m_bInDispose || m_bDisposed )
         return;
-    m_bInDispose = sal_True;
+    m_bInDispose = true;
 
     if( m_xPropertySetOrigin.is() )
     {
@@ -425,8 +425,8 @@ void SAL_CALL ContentResultSetWrapper
     }
 
     aGuard.reacquire();
-    m_bDisposed = sal_True;
-    m_bInDispose = sal_False;
+    m_bDisposed = true;
+    m_bInDispose = false;
 }
 
 
@@ -583,7 +583,7 @@ void SAL_CALL ContentResultSetWrapper
     }
 
     impl_getPropertyChangeListenerContainer();
-    sal_Bool bNeedRegister = !m_pPropertyChangeListeners->
+    bool bNeedRegister = !m_pPropertyChangeListeners->
                         getContainedTypes().getLength();
     m_pPropertyChangeListeners->addInterface( aPropertyName, xListener );
     if( bNeedRegister )
@@ -634,7 +634,7 @@ void SAL_CALL ContentResultSetWrapper
     }
 
     impl_getVetoableChangeListenerContainer();
-    sal_Bool bNeedRegister = !m_pVetoableChangeListeners->
+    bool bNeedRegister = !m_pVetoableChangeListeners->
                         getContainedTypes().getLength();
     m_pVetoableChangeListeners->addInterface( rPropertyName, xListener );
     if( bNeedRegister )
diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx
index 23accd81d4b2..73a1fbaaacaf 100644
--- a/ucb/source/cacher/contentresultsetwrapper.hxx
+++ b/ucb/source/cacher/contentresultsetwrapper.hxx
@@ -129,8 +129,8 @@ private:
                             m_xMetaDataFromOrigin; //XResultSetMetaData from m_xOrigin
 
     //management of listeners
-    sal_Bool                m_bDisposed; ///Dispose call ready.
-    sal_Bool                m_bInDispose;///In dispose call
+    bool                m_bDisposed; ///Dispose call ready.
+    bool                m_bInDispose;///In dispose call
     osl::Mutex              m_aContainerMutex;
     cppu::OInterfaceContainerHelper*
                             m_pDisposeEventListeners;
@@ -184,7 +184,7 @@ protected:
             throw( com::sun::star::beans::PropertyVetoException,
                    com::sun::star::uno::RuntimeException );
 
-    sal_Bool SAL_CALL impl_isForwardOnly();
+    bool SAL_CALL impl_isForwardOnly();
 
 public:
 
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index b0c510b11920..aa4e7d9b8404 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -43,12 +43,12 @@ DynamicResultSetWrapper::DynamicResultSetWrapper(
                     Reference< XDynamicResultSet > xOrigin
                     , const Reference< XComponentContext > & rxContext )
 
-                : m_bDisposed( sal_False )
-                , m_bInDispose( sal_False )
+                : m_bDisposed( false )
+                , m_bInDispose( false )
                 , m_pDisposeEventListeners( NULL )
                 , m_xContext( rxContext )
-                , m_bStatic( sal_False )
-                , m_bGotWelcome( sal_False )
+                , m_bStatic( false )
+                , m_bGotWelcome( false )
                 , m_xSource( xOrigin )
                 , m_xSourceResultOne( NULL )
                 , m_xSourceResultTwo( NULL )
@@ -147,7 +147,7 @@ void SAL_CALL DynamicResultSetWrapper
         osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
         if( m_bInDispose || m_bDisposed )
             return;
-        m_bInDispose = sal_True;
+        m_bInDispose = true;
 
         xSourceComponent = Reference< XComponent >(m_xSource, UNO_QUERY);
 
@@ -167,8 +167,8 @@ void SAL_CALL DynamicResultSetWrapper
     */
 
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
-    m_bDisposed = sal_True;
-    m_bInDispose = sal_False;
+    m_bDisposed = true;
+    m_bInDispose = false;
 }
 
 
@@ -257,7 +257,7 @@ void SAL_CALL DynamicResultSetWrapper
                     {
                         impl_InitResultSetOne( aWelcome.Old );
                         impl_InitResultSetTwo( aWelcome.New );
-                        m_bGotWelcome = sal_True;
+                        m_bGotWelcome = true;
 
                         aWelcome.Old = m_xMyResultOne;
                         aWelcome.New = m_xMyResultTwo;
@@ -313,7 +313,7 @@ void SAL_CALL DynamicResultSetWrapper
     Reference< XDynamicResultSetListener > xListener = NULL;
     Reference< XDynamicResultSetListener > xMyListenerImpl = NULL;
 
-    sal_Bool bStatic = sal_False;
+    bool bStatic = false;
     {
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
         m_xSource = xSourceDynamic;
@@ -349,7 +349,7 @@ Reference< XResultSet > SAL_CALL DynamicResultSetWrapper
             throw ListenerAlreadySetException();
 
         xSource = m_xSource;
-        m_bStatic = sal_True;
+        m_bStatic = true;
         xMyListenerImpl = Reference< XEventListener > ::query( m_xMyListenerImpl );
     }
 
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx
index 798a545340f3..610867372b03 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.hxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx
@@ -46,8 +46,8 @@ class DynamicResultSetWrapper
 {
 private:
     //management of listeners
-    sal_Bool                m_bDisposed; ///Dispose call ready.
-    sal_Bool                m_bInDispose;///In dispose call
+    bool                m_bDisposed; ///Dispose call ready.
+    bool                m_bInDispose;///In dispose call
     osl::Mutex              m_aContainerMutex;
     cppu::OInterfaceContainerHelper*
                             m_pDisposeEventListeners;
@@ -61,8 +61,8 @@ protected:
                             m_xContext;
 
     osl::Mutex              m_aMutex;
-    sal_Bool                m_bStatic;
-    sal_Bool                m_bGotWelcome;
+    bool                m_bStatic;
+    bool                m_bGotWelcome;
 
     //different Interfaces from Origin:
     com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSet >
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index e0a998efee04..158caeb0d06b 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -83,7 +83,7 @@ class OFileAccess : public FileAccessHelper
     Reference< XCommandEnvironment > mxEnvironment;
     OCommandEnvironment* mpEnvironment;
 
-    void transferImpl( const OUString& rSource, const OUString& rDest, sal_Bool bMoveData )
+    void transferImpl( const OUString& rSource, const OUString& rDest, bool bMoveData )
         throw(CommandAbortedException, Exception, RuntimeException);
     bool createNewFile( const OUString & rParentURL,
                         const OUString & rTitle,
@@ -206,7 +206,7 @@ Reference< XProgressHandler > OCommandEnvironment::getProgressHandler()
 
 void OFileAccess::transferImpl( const OUString& rSource,
                                 const OUString& rDest,
-                                sal_Bool bMoveData )
+                                bool bMoveData )
     throw(CommandAbortedException, Exception, RuntimeException)
 {
     // SfxContentHelper::Transfer_Impl
@@ -282,13 +282,13 @@ void OFileAccess::transferImpl( const OUString& rSource,
 void OFileAccess::copy( const OUString& SourceURL, const OUString& DestURL )
     throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
-    transferImpl( SourceURL, DestURL, sal_False );
+    transferImpl( SourceURL, DestURL, false );
 }
 
 void OFileAccess::move( const OUString& SourceURL, const OUString& DestURL )
     throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
-    transferImpl( SourceURL, DestURL, sal_True );
+    transferImpl( SourceURL, DestURL, true );
 }
 
 void OFileAccess::kill( const OUString& FileURL )
@@ -299,7 +299,7 @@ void OFileAccess::kill( const OUString& FileURL )
     ucbhelper::Content aCnt( aDeleteObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
     try
     {
-        aCnt.executeCommand( OUString("delete" ), makeAny( sal_Bool( sal_True ) ) );
+        aCnt.executeCommand( OUString("delete" ), makeAny( true ) );
     }
     catch ( ::com::sun::star::ucb::CommandFailedException const & )
     {
@@ -310,7 +310,7 @@ void OFileAccess::kill( const OUString& FileURL )
 sal_Bool OFileAccess::isFolder( const OUString& FileURL )
     throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     try
     {
         INetURLObject aURLObj( FileURL, INET_PROT_FILE );
@@ -327,7 +327,7 @@ sal_Bool OFileAccess::isReadOnly( const OUString& FileURL )
     INetURLObject aURLObj( FileURL, INET_PROT_FILE );
     ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
     Any aRetAny = aCnt.getPropertyValue("IsReadOnly");
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     aRetAny >>= bRet;
     return bRet;
 }
@@ -507,7 +507,7 @@ Sequence< OUString > OFileAccess::getFolderContents( const OUString& FolderURL,
 sal_Bool OFileAccess::exists( const OUString& FileURL )
     throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     try
     {
         bRet = isFolder( FileURL );
@@ -534,7 +534,7 @@ Reference< XInputStream > OFileAccess::openFileRead( const OUString& FileURL )
 
     try
     {
-        sal_Bool bRet = aCnt.openStream( xSink );
+        bool bRet = aCnt.openStream( xSink );
         if( bRet )
             xRet = xSink->getInputStream();
     }
@@ -743,7 +743,7 @@ sal_Bool OFileAccess::isHidden( const OUString& FileURL )
     INetURLObject aURLObj( FileURL, INET_PROT_FILE );
     ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
     Any aRetAny = aCnt.getPropertyValue("IsHidden");
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     aRetAny >>= bRet;
     return bRet;
 }
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index 746b52f874e6..63fd79fc586f 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -92,8 +92,8 @@ UcbContentProviderProxy::UcbContentProviderProxy(
                         const Reference< XMultiServiceFactory >& rxSMgr,
                         const OUString& Service )
 : m_aService( Service ),
-  m_bReplace( sal_False ),
-  m_bRegister( sal_False ),
+  m_bReplace( false ),
+  m_bRegister( false ),
   m_xSMgr( rxSMgr )
 {
 }
@@ -255,7 +255,7 @@ UcbContentProviderProxy::registerInstance( const OUString& Template,
         m_aArguments = Arguments;
         m_bReplace   = ReplaceExisting;
 
-        m_bRegister  = sal_True;
+        m_bRegister  = true;
     }
     return this;
 }
@@ -273,7 +273,7 @@ UcbContentProviderProxy::deregisterInstance( const OUString& Template,
     // registerInstance called at proxy and at original?
     if ( m_bRegister && m_xTargetProvider.is() )
     {
-        m_bRegister       = sal_False;
+        m_bRegister       = false;
         m_xTargetProvider = 0;
 
         Reference< XParameterizedContentProvider >
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index eafe22ab86a7..88cf5c1fda8d 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -98,8 +98,8 @@ class UcbContentProviderProxy :
     OUString m_aService;
     OUString m_aTemplate;
     OUString m_aArguments;
-    sal_Bool        m_bReplace;
-    sal_Bool        m_bRegister;
+    bool        m_bReplace;
+    bool        m_bRegister;
 
     com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
                                 m_xSMgr;
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 0f3308f6b9d6..e6a3427325c9 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -526,7 +526,7 @@ Reference< XContentProvider > SAL_CALL
                                                           Identifier )
     throw( com::sun::star::uno::RuntimeException, std::exception )
 {
-    return queryContentProvider( Identifier, sal_False );
+    return queryContentProvider( Identifier, false );
 }
 
 
@@ -549,7 +549,7 @@ Reference< XContent > SAL_CALL UniversalContentBroker::queryContent(
         return Reference< XContent >();
 
     Reference< XContentProvider > xProv =
-        queryContentProvider( Identifier->getContentIdentifier(), sal_True );
+        queryContentProvider( Identifier->getContentIdentifier(), true );
     if ( xProv.is() )
         return  xProv->queryContent( Identifier );
 
@@ -567,9 +567,9 @@ sal_Int32 SAL_CALL UniversalContentBroker::compareContentIds(
     OUString aURI2( Id2->getContentIdentifier() );
 
     Reference< XContentProvider > xProv1
-                            = queryContentProvider( aURI1, sal_True );
+                            = queryContentProvider( aURI1, true );
     Reference< XContentProvider > xProv2
-                            = queryContentProvider( aURI2, sal_True );
+                            = queryContentProvider( aURI2, true );
 
     // When both identifiers belong to the same provider, let that provider
     // compare them; otherwise, simply compare the URI strings (which must
@@ -602,7 +602,7 @@ Reference< XContentIdentifier > SAL_CALL
     Reference< XContentIdentifier > xIdentifier;
 
     Reference< XContentProvider > xProv
-                            = queryContentProvider( ContentId, sal_True );
+                            = queryContentProvider( ContentId, true );
     if ( xProv.is() )
     {
         Reference< XContentIdentifierFactory > xFac( xProv, UNO_QUERY );
@@ -812,7 +812,7 @@ void SAL_CALL UniversalContentBroker::disposing(const lang::EventObject&)
 
 Reference< XContentProvider > UniversalContentBroker::queryContentProvider(
                                 const OUString& Identifier,
-                                sal_Bool bResolved )
+                                bool bResolved )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index 1cb32e9de8df..fb3d1d07f21f 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -190,7 +190,7 @@ public:
 private:
     com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >
     queryContentProvider( const OUString& Identifier,
-                          sal_Bool bResolved );
+                          bool bResolved );
 
     com::sun::star::uno::Reference< com::sun::star::ucb::XCommandInfo >
     getCommandInfo();
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 86caca9f405a..0a73f7c6e7a9 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -525,9 +525,9 @@ bool setTitle(
 uno::Reference< ucb::XContent > createNew(
                     const TransferCommandContext & rContext,
                     const uno::Reference< ucb::XContent > & xTarget,
-                    sal_Bool bSourceIsFolder,
-                    sal_Bool bSourceIsDocument,
-                    sal_Bool bSourceIsLink )
+                    bool bSourceIsFolder,
+                    bool bSourceIsDocument,
+                    bool bSourceIsLink )
     throw( uno::Exception )
 {
 
@@ -640,7 +640,7 @@ uno::Reference< ucb::XContent > createNew(
     for ( sal_Int32 n = 0; n < nCount; ++n )
     {
         sal_Int32 nAttribs = aTypesInfo[ n ].Attributes;
-        sal_Bool  bMatch   = sal_False;
+        bool  bMatch   = false;
 
         if ( rContext.aArg.Operation == ucb::TransferCommandOperation_LINK )
         {
@@ -649,7 +649,7 @@ uno::Reference< ucb::XContent > createNew(
             if ( nAttribs & ucb::ContentInfoAttribute::KIND_LINK )
             {
                 // Match!
-                bMatch = sal_True;
+                bMatch = true;
             }
         }
         else if ( ( rContext.aArg.Operation
@@ -665,7 +665,7 @@ uno::Reference< ucb::XContent > createNew(
                 if ( nAttribs & ucb::ContentInfoAttribute::KIND_LINK )
                 {
                     // Match!
-                    bMatch = sal_True;
+                    bMatch = true;
                 }
             }
             else
@@ -683,7 +683,7 @@ uno::Reference< ucb::XContent > createNew(
                    )
                 {
                     // Match!
-                    bMatch = sal_True;
+                    bMatch = true;
                 }
             }
         }
@@ -817,8 +817,8 @@ void transferProperties(
     uno::Sequence< beans::PropertyValue > aPropValues(
                                                 aAllProps.getLength() + 2 );
 
-    sal_Bool bHasTitle = rContext.aArg.NewTitle.isEmpty();
-    sal_Bool bHasTargetURL = ( rContext.aArg.Operation
+    bool bHasTitle = rContext.aArg.NewTitle.isEmpty();
+    bool bHasTargetURL = ( rContext.aArg.Operation
                                 != ucb::TransferCommandOperation_LINK );
 
     sal_Int32 nWritePos = 0;
@@ -834,7 +834,7 @@ void transferProperties(
             // Supply new title, if given.
             if ( !bHasTitle )
             {
-                bHasTitle = sal_True;
+                bHasTitle = true;
                 aValue <<= rContext.aArg.NewTitle;
             }
         }
@@ -843,7 +843,7 @@ void transferProperties(
             // Supply source URL as link target for the new link to create.
             if ( !bHasTargetURL )
             {
-                bHasTargetURL = sal_True;
+                bHasTargetURL = true;
                 aValue <<= rContext.aArg.SourceURL;
             }
         }
@@ -1108,7 +1108,7 @@ void handleNameClashRename(
     if ( nPos > 0 )
         aOldTitlePre += "_";
 
-    sal_Bool bContinue = sal_True;
+    bool bContinue = true;
     do
     {
         nTry++;
@@ -1185,7 +1185,7 @@ void handleNameClashRename(
             xCommandProcessorN->execute( aInsertCommand, 0, rContext.xEnv );
 
             // Success!
-            bContinue = sal_False;
+            bContinue = false;
         }
         catch ( uno::RuntimeException const & )
         {
@@ -1219,7 +1219,7 @@ void globalTransfer_(
     throw( uno::Exception )
 {
     // IsFolder: property is required.
-    sal_Bool bSourceIsFolder = xSourceProps->getBoolean( 1 );
+    bool bSourceIsFolder = xSourceProps->getBoolean( 1 );
     if ( !bSourceIsFolder && xSourceProps->wasNull() )
     {
         ucbhelper::cancelCommandExecution(
@@ -1232,7 +1232,7 @@ void globalTransfer_(
     }
 
     // IsDocument: property is required.
-    sal_Bool bSourceIsDocument = xSourceProps->getBoolean( 2 );
+    bool bSourceIsDocument = xSourceProps->getBoolean( 2 );
     if ( !bSourceIsDocument && xSourceProps->wasNull() )
     {
         ucbhelper::cancelCommandExecution(
@@ -1245,7 +1245,7 @@ void globalTransfer_(
     }
 
     // TargetURL: property is optional.
-    sal_Bool bSourceIsLink = !xSourceProps->getString( 3 ).isEmpty();
+    bool bSourceIsLink = !xSourceProps->getString( 3 ).isEmpty();
 
 
 
@@ -2017,7 +2017,7 @@ void UniversalContentBroker::globalTransfer(
             ucb::Command aCommand(
                 OUString("delete"), // Name
                 -1,                                         // Handle
-                uno::makeAny( sal_Bool( sal_True ) ) );     // Argument
+                uno::makeAny( true ) );     // Argument
 
             xCommandProcessor->execute( aCommand, 0, xLocalEnv );
         }
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index 6bb31ff41223..120c6b80b6cd 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -406,7 +406,7 @@ sal_Bool SAL_CALL UcbPropertiesManager::hasPropertyByName( const OUString& Name
 
 
 
-sal_Bool UcbPropertiesManager::queryProperty(
+bool UcbPropertiesManager::queryProperty(
                                 const OUString& rName, Property& rProp )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -421,11 +421,11 @@ sal_Bool UcbPropertiesManager::queryProperty(
         if ( rCurrProp.Name == rName )
         {
             rProp = rCurrProp;
-            return sal_True;
+            return true;
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index d0c146114d61..3708f06fb05f 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -47,7 +47,7 @@ class UcbPropertiesManager : public cppu::WeakImplHelper2 <
     osl::Mutex m_aMutex;
 
 private:
-    sal_Bool queryProperty( const OUString& rName,
+    bool queryProperty( const OUString& rName,
                             com::sun::star::beans::Property& rProp );
 
 public:
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index d6ba6e7fe1e2..a4fad5a44c20 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -251,13 +251,13 @@ struct PropertySetRegistry_Impl
     Reference< XInterface >           m_xRootReadAccess;
     Reference< XInterface >           m_xRootWriteAccess;
     osl::Mutex                        m_aMutex;
-    sal_Bool                          m_bTriedToGetRootReadAccess;  // #82494#
-    sal_Bool                          m_bTriedToGetRootWriteAccess; // #82494#
+    bool                          m_bTriedToGetRootReadAccess;  // #82494#
+    bool                          m_bTriedToGetRootWriteAccess; // #82494#
 
     PropertySetRegistry_Impl( const Sequence< Any > &rInitArgs )
     : m_aInitArgs( rInitArgs ),
-      m_bTriedToGetRootReadAccess( sal_False ),
-      m_bTriedToGetRootWriteAccess( sal_False )
+      m_bTriedToGetRootReadAccess( false ),
+      m_bTriedToGetRootWriteAccess( false )
     {
     }
 };
@@ -1000,7 +1000,7 @@ Reference< XInterface > PropertySetRegistry::getRootConfigReadAccess()
                     <<= OUString( STORE_CONTENTPROPERTIES_KEY  );
                 aArguments[ 0 ] <<= aProperty;
 
-                m_pImpl->m_bTriedToGetRootReadAccess = sal_True;
+                m_pImpl->m_bTriedToGetRootReadAccess = true;
 
                 m_pImpl->m_xRootReadAccess =
                     m_pImpl->m_xConfigProvider->createInstanceWithArguments(
@@ -1062,7 +1062,7 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess(
                 aProperty.Value <<= sal_True;
                 aArguments[ 1 ] <<= aProperty;
 
-                m_pImpl->m_bTriedToGetRootWriteAccess = sal_True;
+                m_pImpl->m_bTriedToGetRootWriteAccess = true;
 
                 m_pImpl->m_xRootWriteAccess =
                     m_pImpl->m_xConfigProvider->createInstanceWithArguments(
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index c2226383f50b..66457efbab10 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -75,9 +75,9 @@ SortedDynamicResultSet::SortedDynamicResultSet(
     mpOne = NULL;
     mpTwo = NULL;
 
-    mbGotWelcome    = sal_False;
-    mbUseOne        = sal_True;
-    mbStatic        = sal_False;
+    mbGotWelcome    = false;
+    mbUseOne        = true;
+    mbStatic        = false;
 }
 
 
@@ -148,7 +148,7 @@ void SAL_CALL SortedDynamicResultSet::dispose()
 
     mpOne = NULL;
     mpTwo = NULL;
-    mbUseOne = sal_True;
+    mbUseOne = true;
 }
 
 void SAL_CALL SortedDynamicResultSet::addEventListener(
@@ -186,7 +186,7 @@ SortedDynamicResultSet::getStaticResultSet()
     if ( mxListener.is() )
         throw ListenerAlreadySetException();
 
-    mbStatic = sal_True;
+    mbStatic = true;
 
     if ( mxOriginal.is() )
     {
@@ -292,8 +292,8 @@ void SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
-    sal_Bool bHasNew = sal_False;
-    sal_Bool bHasModified = sal_False;
+    bool bHasNew = false;
+    bool bHasModified = false;
 
     SortedResultSet *pCurSet = NULL;
 
@@ -303,13 +303,13 @@ void SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
     {
         if ( mbUseOne )
         {
-            mbUseOne = sal_False;
+            mbUseOne = false;
             mpTwo->CopyData( mpOne );
             pCurSet = mpTwo;
         }
         else
         {
-            mbUseOne = sal_True;
+            mbUseOne = true;
             mpOne->CopyData( mpTwo );
             pCurSet = mpOne;
         }
@@ -327,7 +327,7 @@ void SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
     catch (const WrappedTargetException&) {}
 
     long nOldCount = pCurSet->GetCount();
-    sal_Bool bWasFinal = false;
+    bool bWasFinal = false;
 
     aRet >>= bWasFinal;
 
@@ -347,8 +347,8 @@ void SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
                         mpOne = new SortedResultSet( aWelcome.New );
                         mxOne = mpOne;
                         mpOne->Initialize( maOptions, mxCompFac );
-                        mbGotWelcome = sal_True;
-                        mbUseOne = sal_True;
+                        mbGotWelcome = true;
+                        mbUseOne = true;
                         pCurSet = mpOne;
 
                         aWelcome.Old = mxTwo;
@@ -371,7 +371,7 @@ void SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
             case ListActionType::INSERTED:
                 {
                     pCurSet->InsertNew( aAction.Position, aAction.Count );
-                    bHasNew = sal_True;
+                    bHasNew = true;
                     break;
                 }
             case ListActionType::REMOVED:
@@ -395,7 +395,7 @@ void SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
             case ListActionType::PROPERTIES_CHANGED:
                 {
                     pCurSet->SetChanged( aAction.Position, aAction.Count );
-                    bHasModified = sal_True;
+                    bHasModified = true;
                     break;
                 }
             default: break;
diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx
index 659defc3ae97..718719f3ae15 100644
--- a/ucb/source/sorter/sortdynres.hxx
+++ b/ucb/source/sorter/sortdynres.hxx
@@ -63,9 +63,9 @@ class SortedDynamicResultSet: public cppu::WeakImplHelper2 <
 
     EventList                           maActions;
     osl::Mutex                          maMutex;
-    sal_Bool                            mbGotWelcome:1;
-    sal_Bool                            mbUseOne:1;
-    sal_Bool                            mbStatic:1;
+    bool                            mbGotWelcome:1;
+    bool                            mbUseOne:1;
+    bool                            mbStatic:1;
 
 private:
     void                SendNotify();
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 85eb0e84bf25..ac4668524517 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -65,9 +65,9 @@ static osl::Mutex& getContainerMutex()
 
 struct SortInfo
 {
-    sal_Bool    mbUseOwnCompare;
-    sal_Bool    mbAscending;
-    sal_Bool    mbCaseSensitive;
+    bool    mbUseOwnCompare;
+    bool    mbAscending;
+    bool    mbCaseSensitive;
     sal_Int32   mnColumn;
     sal_Int32   mnType;
     SortInfo*   mpNext;
@@ -78,11 +78,11 @@ struct SortInfo
 
 struct SortListData
 {
-    sal_Bool    mbModified;
+    bool    mbModified;
     sal_IntPtr  mnCurPos;
     sal_IntPtr  mnOldPos;
 
-    SortListData( sal_IntPtr nPos, sal_Bool bModified = sal_False );
+    SortListData( sal_IntPtr nPos, bool bModified = false );
 };
 
 
@@ -134,7 +134,7 @@ SortedResultSet::SortedResultSet( Reference< XResultSet > aResult )
     mnLastSort  = 0;
     mnCurEntry  = 0;
     mnCount     = 0;
-    mbIsCopy    = sal_False;
+    mbIsCopy    = false;
 }
 
 
@@ -881,10 +881,10 @@ Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName )
     }
     else if ( PropertyName.equalsAscii( "IsRowCountFinal" ) )
     {
-        sal_Bool    bOrgFinal = false;
+        bool    bOrgFinal = false;
         Any         aOrgRet;
 
-        aRet <<= (sal_Bool) sal_False;
+        aRet <<= false;
 
         aOrgRet = Reference< XPropertySet >::query(mxOriginal)->
                         getPropertyValue( PropertyName );
@@ -897,7 +897,7 @@ Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName )
             sal_uInt32  nOrgCount = 0;
             aOrgRet >>= nOrgCount;
             if ( nOrgCount == maS2O.Count() )
-                aRet <<= (sal_Bool) sal_True;
+                aRet <<= true;
         }
     }
     else
@@ -1373,7 +1373,7 @@ void SortedResultSet::CopyData( SortedResultSet *pSource )
     if ( !mpSortInfo )
     {
         mpSortInfo = pSource->GetSortInfo();
-        mbIsCopy = sal_True;
+        mbIsCopy = true;
     }
 }
 
@@ -1426,7 +1426,7 @@ void SortedResultSet::Initialize(
 }
 
 
-void SortedResultSet::CheckProperties( sal_IntPtr nOldCount, sal_Bool bWasFinal )
+void SortedResultSet::CheckProperties( sal_IntPtr nOldCount, bool bWasFinal )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -1437,7 +1437,7 @@ void SortedResultSet::CheckProperties( sal_IntPtr nOldCount, sal_Bool bWasFinal
         // check for propertyChangeEvents
         if ( nOldCount != GetCount() )
         {
-            sal_Bool bIsFinal = sal_False;
+            bool bIsFinal = false;
             PropertyChangeEvent aEvt;
 
             aEvt.PropertyName = "RowCount";
@@ -1455,8 +1455,8 @@ void SortedResultSet::CheckProperties( sal_IntPtr nOldCount, sal_Bool bWasFinal
                 aEvt.PropertyName = aName;
                 aEvt.Further = sal_False;
                 aEvt.PropertyHandle = -1;
-                aEvt.OldValue <<= (sal_Bool) bWasFinal;
-                aEvt.NewValue <<= (sal_Bool) bIsFinal;
+                aEvt.OldValue <<= bWasFinal;
+                aEvt.NewValue <<= bIsFinal;
                 PropertyChanged( aEvt );
             }
         }
@@ -1662,12 +1662,12 @@ void SortedResultSet::BuildSortInfo(
 
         if ( pInfo->mxCompareFunction.is() )
         {
-            pInfo->mbUseOwnCompare = sal_False;
+            pInfo->mbUseOwnCompare = false;
             pInfo->mnType = 0;
         }
         else
         {
-            pInfo->mbUseOwnCompare = sal_True;
+            pInfo->mbUseOwnCompare = true;
             pInfo->mnType = xData->getColumnType( nColumn );
         }
 
@@ -1690,7 +1690,7 @@ void SortedResultSet::SetChanged( sal_IntPtr nPos, sal_IntPtr nCount )
             SortListData *pData = maS2O.GetData( nSortPos );
             if ( ! pData->mbModified )
             {
-                pData->mbModified = sal_True;
+                pData->mbModified = true;
                 maModList.Append( pData );
             }
         }
@@ -1713,7 +1713,7 @@ void SortedResultSet::ResortModified( EventList* pList )
             pData = (SortListData*) maModList.GetObject( i );
             nCompare = CompareImpl( mxOther, mxOriginal,
                                     pData->mnOldPos, pData->mnCurPos );
-            pData->mbModified = sal_False;
+            pData->mbModified = false;
             if ( nCompare != 0 )
             {
                 nCurPos = (sal_IntPtr) maO2S.GetObject( (sal_uInt32) pData->mnCurPos );
@@ -1808,7 +1808,7 @@ void SortedResultSet::ResortNew( EventList* pList )
 // SortListData
 
 
-SortListData::SortListData( sal_IntPtr nPos, sal_Bool bModified )
+SortListData::SortListData( sal_IntPtr nPos, bool bModified )
 {
     mbModified = bModified;
     mnCurPos = nPos;
@@ -1905,14 +1905,14 @@ void SimpleList::Remove( sal_uInt32 nPos )
 
 void SimpleList::Remove( void* pData )
 {
-    sal_Bool    bFound = sal_False;
+    bool    bFound = false;
     sal_uInt32  i;
 
     for ( i = 0; i < (sal_uInt32) maData.size(); i++ )
     {
         if ( maData[ i ] == pData )
         {
-            bFound = sal_True;
+            bFound = true;
             break;
         }
     }
diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx
index 3ed794ebbdc4..43c9f45772b7 100644
--- a/ucb/source/sorter/sortresult.hxx
+++ b/ucb/source/sorter/sortresult.hxx
@@ -139,7 +139,7 @@ class SortedResultSet: public cppu::WeakImplHelper8 <
     sal_IntPtr                mnLastSort;     // index of the last sorted entry;
     sal_IntPtr                mnCurEntry;     // index of the current entry
     sal_IntPtr                mnCount;        // total count of the elements
-    sal_Bool            mbIsCopy;
+    bool            mbIsCopy;
 
 
 private:
@@ -176,7 +176,7 @@ public:
     void                CopyData( SortedResultSet* pSource );
     void                Initialize( const css::uno::Sequence < css::ucb::NumberedSortingInfo > &xSortInfo,
                                     const css::uno::Reference< css::ucb::XAnyCompareFactory > &xCompFac );
-    void                CheckProperties( sal_IntPtr nOldCount, sal_Bool bWasFinal );
+    void                CheckProperties( sal_IntPtr nOldCount, bool bWasFinal );
 
     void                InsertNew( sal_IntPtr nPos, sal_IntPtr nCount );
     void                SetChanged( sal_IntPtr nPos, sal_IntPtr nCount );
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index a7c2d942b45a..a37606c92609 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -233,7 +233,7 @@ namespace cmis
 
     Content::Content( const uno::Reference< uno::XComponentContext >& rxContext, ContentProvider *pProvider,
         const uno::Reference< ucb::XContentIdentifier >& Identifier,
-        sal_Bool bIsFolder )
+        bool bIsFolder )
             throw ( ucb::ContentCreationException )
         : ContentImplHelper( rxContext, pProvider, Identifier ),
         m_pProvider( pProvider ),
@@ -621,10 +621,10 @@ namespace cmis
                 else if ( rProp.Name == "IsReadOnly" )
                 {
                     boost::shared_ptr< libcmis::AllowableActions > allowableActions = getObject( xEnv )->getAllowableActions( );
-                    sal_Bool bReadOnly = sal_False;
+                    bool bReadOnly = false;
                     if ( !allowableActions->isAllowed( libcmis::ObjectAction::SetContentStream ) &&
                          !allowableActions->isAllowed( libcmis::ObjectAction::CheckIn ) )
-                        bReadOnly = sal_True;
+                        bReadOnly = true;
 
                     xRow->appendBoolean( rProp, bReadOnly );
                 }
@@ -763,7 +763,7 @@ namespace cmis
                     try
                     {
                         libcmis::ObjectPtr object = getObject( xEnv );
-                        sal_Bool bIsVersionable = object->getTypeDescription( )->isVersionable( );
+                        bool bIsVersionable = object->getTypeDescription( )->isVersionable( );
                         xRow->appendBoolean( rProp, bIsVersionable );
                     }
                     catch ( const libcmis::Exception& )
@@ -859,7 +859,7 @@ namespace cmis
 
         uno::Any aRet;
 
-        sal_Bool bOpenFolder = (
+        bool bOpenFolder = (
             ( rOpenCommand.Mode == ucb::OpenMode::ALL ) ||
             ( rOpenCommand.Mode == ucb::OpenMode::FOLDERS ) ||
             ( rOpenCommand.Mode == ucb::OpenMode::DOCUMENTS )
@@ -1135,7 +1135,7 @@ namespace cmis
     }
 
     void Content::insert( const uno::Reference< io::XInputStream > & xInputStream,
-        sal_Bool bReplaceExisting, const OUString& rMimeType,
+        bool bReplaceExisting, const OUString& rMimeType,
         const uno::Reference< ucb::XCommandEnvironment >& xEnv )
             throw( uno::Exception )
     {
@@ -1389,18 +1389,18 @@ namespace cmis
         return aRet;
     }
 
-    sal_Bool Content::feedSink( uno::Reference< uno::XInterface> xSink,
+    bool Content::feedSink( uno::Reference< uno::XInterface> xSink,
         const uno::Reference< ucb::XCommandEnvironment >& xEnv )
     {
         if ( !xSink.is() )
-            return sal_False;
+            return false;
 
         uno::Reference< io::XOutputStream > xOut = uno::Reference< io::XOutputStream >(xSink, uno::UNO_QUERY );
         uno::Reference< io::XActiveDataSink > xDataSink = uno::Reference< io::XActiveDataSink >(xSink, uno::UNO_QUERY );
         uno::Reference< io::XActiveDataStreamer > xDataStreamer = uno::Reference< io::XActiveDataStreamer >( xSink, uno::UNO_QUERY );
 
         if ( !xOut.is() && !xDataSink.is() && ( !xDataStreamer.is() || !xDataStreamer->getStream().is() ) )
-            return sal_False;
+            return false;
 
         if ( xDataStreamer.is() && !xOut.is() )
             xOut = xDataStreamer->getStream()->getOutputStream();
@@ -1410,13 +1410,13 @@ namespace cmis
             libcmis::Document* document = dynamic_cast< libcmis::Document* >( getObject( xEnv ).get() );
 
             if (!document)
-                return sal_False;
+                return false;
 
             boost::shared_ptr< istream > aIn = document->getContentStream( );
 
             uno::Reference< io::XInputStream > xIn = new ucbhelper::StdInputStream( aIn );
             if( !xIn.is( ) )
-                return sal_False;
+                return false;
 
             if ( xDataSink.is() )
                 xDataSink->setInputStream( xIn );
@@ -1433,7 +1433,7 @@ namespace cmis
                                 OUString::createFromAscii( e.what() ) );
         }
 
-        return sal_True;
+        return true;
     }
 
     uno::Sequence< beans::Property > Content::getProperties(
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index e596842f7fc3..f7430bdcf0f1 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -94,7 +94,7 @@ private:
             throw( com::sun::star::uno::Exception );
 
     void insert( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & xInputStream,
-        sal_Bool bReplaceExisting, const OUString & rMimeType,
+        bool bReplaceExisting, const OUString & rMimeType,
         const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv )
             throw( com::sun::star::uno::Exception );
 
@@ -124,7 +124,7 @@ private:
             throw(com::sun::star::uno::Exception,
                   std::exception);
 
-    sal_Bool feedSink( com::sun::star::uno::Reference< com::sun::star::uno::XInterface> aSink,
+    bool feedSink( com::sun::star::uno::Reference< com::sun::star::uno::XInterface> aSink,
         const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv );
 
 public:
@@ -137,7 +137,7 @@ public:
     Content( const com::sun::star::uno::Reference<
         com::sun::star::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
         const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier,
-        sal_Bool bIsFolder)
+        bool bIsFolder)
             throw ( com::sun::star::ucb::ContentCreationException );
 
     virtual ~Content();
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 081ee0627b93..d5fa68e05e0d 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -257,7 +257,7 @@ namespace ucb { namespace ucp { namespace ext
                 // unreachable
             }
 
-            sal_Bool bOpenFolder =
+            bool bOpenFolder =
                 ( ( aOpenCommand.Mode == OpenMode::ALL ) ||
                   ( aOpenCommand.Mode == OpenMode::FOLDERS ) ||
                   ( aOpenCommand.Mode == OpenMode::DOCUMENTS ) );
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index de2f777b0a57..e444d31db0b5 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -79,7 +79,7 @@ public:
 
 BaseContent::BaseContent( shell* pMyShell,
                           const OUString& parentName,
-                          sal_Bool bFolder )
+                          bool bFolder )
     : m_pMyShell( pMyShell ),
       m_xContentIdentifier( 0 ),
       m_aUncPath( parentName ),
@@ -510,7 +510,7 @@ BaseContent::getContentType()
                                           getCppuType( static_cast< sal_Bool* >(0) ),
                                           0 );
                 Reference< sdbc::XRow > xRow = getPropertyValues( -1,seq );
-                sal_Bool IsDocument = xRow->getBoolean( 1 );
+                bool IsDocument = xRow->getBoolean( 1 );
 
                 if ( !xRow->wasNull() )
                 {
@@ -625,7 +625,7 @@ BaseContent::createNewContent(
     if ( Info.Type.isEmpty() )
         return Reference< XContent >();
 
-    sal_Bool bFolder
+    bool bFolder
         = ( Info.Type.compareTo( m_pMyShell->FolderContentType ) == 0 );
     if ( !bFolder )
     {
@@ -637,7 +637,7 @@ BaseContent::createNewContent(
     }
 
     // Who am I ?
-    sal_Bool IsDocument = false;
+    bool IsDocument = false;
 
     try
     {
@@ -720,7 +720,7 @@ BaseContent::getParent(
     OUString ParentUrl;
 
 
-    sal_Bool err = m_pMyShell->getUrlFromUnq( ParentUnq, ParentUrl );
+    bool err = m_pMyShell->getUrlFromUnq( ParentUnq, ParentUrl );
     if( err )
         return Reference< XInterface >( 0 );
 
@@ -817,7 +817,7 @@ BaseContent::getPropertyValues(
             }
             else if ( rProp.Name == "IsDocument" )
             {
-                rValue <<= sal_Bool( !m_bFolder );
+                rValue <<= !m_bFolder;
             }
         }
 
@@ -1000,7 +1000,7 @@ BaseContent::open(
                                   outputStream );
             }
 
-            sal_Bool bLock = ( aCommandArgument.Mode != OpenMode::DOCUMENT_SHARE_DENY_NONE );
+            bool bLock = ( aCommandArgument.Mode != OpenMode::DOCUMENT_SHARE_DENY_NONE );
 
             Reference< io::XActiveDataSink > activeDataSink( aCommandArgument.Sink,UNO_QUERY );
             if( activeDataSink.is() )
@@ -1104,7 +1104,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier,
                               getCppuType( static_cast< sal_Bool* >(0) ),
                               0 );
     Reference< sdbc::XRow > xRow = getPropertyValues( nMyCommandIdentifier,seq );
-    sal_Bool IsDocument = xRow->getBoolean( 1 );
+    bool IsDocument = xRow->getBoolean( 1 );
     if( xRow->wasNull() )
     {   // Destination file type could not be determined
         m_pMyShell->installError( nMyCommandIdentifier,
@@ -1165,7 +1165,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
     }
 
     // Inserting a document or a file?
-    sal_Bool bDocument = false;
+    bool bDocument = false;
 
     Sequence< beans::Property > seq(1);
     seq[0] = beans::Property( OUString("IsDocument"),
@@ -1197,7 +1197,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
     }
 
 
-    sal_Bool success = false;
+    bool success = false;
     if( bDocument )
         success = m_pMyShell->mkfil( nMyCommandIdentifier,
                                      m_aUncPath,
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index 01e54b350b38..824827ce08ed 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -76,7 +76,7 @@ namespace fileaccess {
         // A special creator for inserted contents; Creates an ugly object
         BaseContent( shell* pMyShell,
                      const OUString& parentName,
-                     sal_Bool bFolder );
+                     bool bFolder );
 
     public:
         BaseContent(
@@ -277,7 +277,7 @@ namespace fileaccess {
                      Deleted = 4,
                      FullFeatured = 8,
                      Connected = 16 };
-        sal_Bool                                                                    m_bFolder;
+        bool                                                                    m_bFolder;
         sal_uInt16                                                                  m_nState;
 
         osl::Mutex                         m_aMutex;
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index bc19533b0b55..5111594e6c87 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -62,7 +62,7 @@ namespace {
     {
         OUString aResourceName;
         OUString aResourceType;
-        sal_Bool      bRemovable;
+        bool      bRemovable;
         bool bResourceName = false;
         bool bResourceType = false;
         bool bRemoveProperty = false;
@@ -153,7 +153,7 @@ namespace {
 namespace fileaccess {
 
 
-    sal_Bool isChild( const OUString& srcUnqPath,
+    bool isChild( const OUString& srcUnqPath,
                       const OUString& dstUnqPath )
     {
         static sal_Unicode slash = '/';
@@ -211,7 +211,7 @@ namespace fileaccess {
 
     osl::FileBase::RC osl_File_copy( const OUString& strPath,
                                      const OUString& strDestPath,
-                                     sal_Bool test )
+                                     bool test )
     {
         if( test )
         {
@@ -226,7 +226,7 @@ namespace fileaccess {
 
     osl::FileBase::RC osl_File_move( const OUString& strPath,
                                      const OUString& strDestPath,
-                                     sal_Bool test )
+                                     bool test )
     {
         if( test )
         {
diff --git a/ucb/source/ucp/file/filglob.hxx b/ucb/source/ucp/file/filglob.hxx
index 025db753cde4..2792e74b48e4 100644
--- a/ucb/source/ucp/file/filglob.hxx
+++ b/ucb/source/ucp/file/filglob.hxx
@@ -37,7 +37,7 @@ namespace fileaccess {
 
     // Returns true if dstUnqPath is a child from srcUnqPath or both are equal
 
-    extern sal_Bool isChild( const OUString& srcUnqPath,
+    extern bool isChild( const OUString& srcUnqPath,
                                       const OUString& dstUnqPath );
 
 
@@ -63,7 +63,7 @@ namespace fileaccess {
 
     extern osl::FileBase::RC osl_File_copy( const OUString& strPath,
                                             const OUString& strDestPath,
-                                            sal_Bool test = false );
+                                            bool test = false );
 
     /**
      *  special move:
@@ -74,7 +74,7 @@ namespace fileaccess {
 
     extern osl::FileBase::RC osl_File_move( const OUString& strPath,
                                             const OUString& strDestPath,
-                                            sal_Bool test = false );
+                                            bool test = false );
 
     // This function implements the global exception handler of the file_ucp;
     // It never returns;
diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx
index b33c63b05d1b..383589ef7cc2 100644
--- a/ucb/source/ucp/file/filid.cxx
+++ b/ucb/source/ucp/file/filid.cxx
@@ -28,7 +28,7 @@ using namespace com::sun::star::ucb;
 FileContentIdentifier::FileContentIdentifier(
     shell* pMyShell,
     const OUString& aUnqPath,
-    sal_Bool IsNormalized )
+    bool IsNormalized )
     : m_pMyShell( pMyShell )
 {
     if( IsNormalized )
diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx
index 0be43e92f0b9..8c2ba156450a 100644
--- a/ucb/source/ucp/file/filid.hxx
+++ b/ucb/source/ucp/file/filid.hxx
@@ -38,7 +38,7 @@ namespace fileaccess {
     public:
         FileContentIdentifier( shell* pMyShell,
                                const OUString& aUnqPath,
-                               sal_Bool IsNormalized = true );
+                               bool IsNormalized = true );
 
         virtual ~FileContentIdentifier();
 
diff --git a/ucb/source/ucp/file/filinl.hxx b/ucb/source/ucp/file/filinl.hxx
index 9dad70fff0a2..4ad0a6623961 100644
--- a/ucb/source/ucp/file/filinl.hxx
+++ b/ucb/source/ucp/file/filinl.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILINL_HXX
 #define INCLUDED_UCB_SOURCE_UCP_FILE_FILINL_HXX
 
-inline const sal_Bool& SAL_CALL shell::MyProperty::IsNative() const
+inline const bool& SAL_CALL shell::MyProperty::IsNative() const
 {
     return isNative;
 }
diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx
index 376bbe99d42c..ee9fdd720e05 100644
--- a/ucb/source/ucp/file/filinpstr.cxx
+++ b/ucb/source/ucp/file/filinpstr.cxx
@@ -32,7 +32,7 @@ using namespace com::sun::star::ucb;
 #define THROW_WHERE ""
 #endif
 
-XInputStream_impl::XInputStream_impl( shell* pMyShell,const OUString& aUncPath, sal_Bool bLock )
+XInputStream_impl::XInputStream_impl( shell* pMyShell,const OUString& aUncPath, bool bLock )
     : m_xProvider( pMyShell->m_pProvider ),
       m_aFile( aUncPath ),
       m_nErrorCode( TASKHANDLER_NO_ERROR ),
diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx
index da99a448043d..5acb3bc05cd7 100644
--- a/ucb/source/ucp/file/filinpstr.hxx
+++ b/ucb/source/ucp/file/filinpstr.hxx
@@ -45,7 +45,7 @@ namespace fileaccess {
     {
     public:
 
-        XInputStream_impl( shell* pMyShell,const OUString& aUncPath, sal_Bool bLock );
+        XInputStream_impl( shell* pMyShell,const OUString& aUncPath, bool bLock );
 
         virtual ~XInputStream_impl();
 
@@ -142,7 +142,7 @@ namespace fileaccess {
 
         com::sun::star::uno::Reference<
         com::sun::star::ucb::XContentProvider >            m_xProvider;
-        sal_Bool                                           m_nIsOpen;
+        bool                                           m_nIsOpen;
 
         ReconnectingFile                                   m_aFile;
 
diff --git a/ucb/source/ucp/file/filrec.cxx b/ucb/source/ucp/file/filrec.cxx
index 5526a791ccc9..5af520bc351d 100644
--- a/ucb/source/ucp/file/filrec.cxx
+++ b/ucb/source/ucp/file/filrec.cxx
@@ -25,20 +25,20 @@ namespace fileaccess {
 void ReconnectingFile::disconnect()
 {
     m_aFile.close();
-    m_bDisconnect = sal_True;
+    m_bDisconnect = true;
 }
 
-sal_Bool ReconnectingFile::reconnect()
+bool ReconnectingFile::reconnect()
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
     if ( m_bFlagsSet )
     {
         disconnect();
         if ( m_aFile.open( m_nFlags ) == ::osl::FileBase::E_None
           || m_aFile.open( osl_File_OpenFlag_Read ) == ::osl::FileBase::E_None )
         {
-            m_bDisconnect = sal_False;
-            bResult = sal_True;
+            m_bDisconnect = false;
+            bResult = true;
         }
     }
 
@@ -55,7 +55,7 @@ sal_Bool ReconnectingFile::reconnect()
         else
             m_nFlags = uFlags;
 
-        m_bFlagsSet = sal_True;
+        m_bFlagsSet = true;
     }
 
     return nResult;
@@ -64,8 +64,8 @@ sal_Bool ReconnectingFile::reconnect()
 ::osl::FileBase::RC ReconnectingFile::close()
 {
     m_nFlags = 0;
-    m_bFlagsSet = sal_False;
-    m_bDisconnect = sal_False;
+    m_bFlagsSet = false;
+    m_bDisconnect = false;
 
     return m_aFile.close();
 }
diff --git a/ucb/source/ucp/file/filrec.hxx b/ucb/source/ucp/file/filrec.hxx
index 29fe74b8d2c8..6591ca9351a0 100644
--- a/ucb/source/ucp/file/filrec.hxx
+++ b/ucb/source/ucp/file/filrec.hxx
@@ -29,9 +29,9 @@ class ReconnectingFile
     ::osl::File     m_aFile;
 
     sal_uInt32      m_nFlags;
-    sal_Bool        m_bFlagsSet;
+    bool        m_bFlagsSet;
 
-    sal_Bool        m_bDisconnect;
+    bool        m_bDisconnect;
 
     ReconnectingFile( ReconnectingFile& );
 
@@ -42,8 +42,8 @@ public:
     ReconnectingFile( const OUString& aFileURL )
         : m_aFile( aFileURL )
         , m_nFlags( 0 )
-        , m_bFlagsSet( sal_False )
-        , m_bDisconnect( sal_False )
+        , m_bFlagsSet( false )
+        , m_bDisconnect( false )
     {}
 
     ~ReconnectingFile()
@@ -52,7 +52,7 @@ public:
     }
 
     void disconnect();
-    sal_Bool reconnect();
+    bool reconnect();
 
     ::osl::FileBase::RC open( sal_uInt32 uFlags );
 
diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx
index e779c6083be6..cccd5047b581 100644
--- a/ucb/source/ucp/file/filrow.cxx
+++ b/ucb/source/ucp/file/filrow.cxx
@@ -36,13 +36,13 @@ using namespace com::sun::star::uno;
 // Function for TypeConverting
 
 template< class _type_ >
-sal_Bool convert( shell* pShell,
+bool convert( shell* pShell,
                   uno::Reference< script::XTypeConverter >& xConverter,
                   uno::Any& rValue,
                   _type_& aReturn  )
 {
     // Try first without converting
-    sal_Bool no_success = ! ( rValue >>= aReturn );
+    bool no_success = ! ( rValue >>= aReturn );
 
     if ( no_success )
     {
@@ -60,15 +60,15 @@ sal_Bool convert( shell* pShell,
                 no_success = ! ( aConvertedValue >>= aReturn );
             }
             else
-                no_success = sal_True;
+                no_success = true;
         }
         catch (const lang::IllegalArgumentException&)
         {
-            no_success = sal_True;
+            no_success = true;
         }
         catch (const script::CannotConvertException&)
         {
-            no_success = sal_True;
+            no_success = true;
         }
     }
     return no_success;
@@ -121,9 +121,9 @@ XRow_impl::getBoolean(
 {
     if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
         throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
-    sal_Bool  Value( false );
+    bool  Value( false );
     osl::MutexGuard aGuard( m_aMutex );
-    m_nWasNull = ::convert<sal_Bool>( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value );
+    m_nWasNull = ::convert<bool>( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value );
     return Value;
 }
 
diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx
index 4ded72637f49..180766118721 100644
--- a/ucb/source/ucp/file/filrow.hxx
+++ b/ucb/source/ucp/file/filrow.hxx
@@ -160,7 +160,7 @@ namespace fileaccess {
     private:
         osl::Mutex                                                              m_aMutex;
         com::sun::star::uno::Sequence< com::sun::star::uno::Any >                m_aValueMap;
-        sal_Bool                                                                 m_nWasNull;
+        bool                                                                 m_nWasNull;
         shell*                                                                   m_pMyShell;
         com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >  m_xProvider;
         com::sun::star::uno::Reference< com::sun::star::script::XTypeConverter > m_xTypeConverter;
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index e49f5d99d78f..cdc668231a41 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -207,8 +207,8 @@ void XResultSet_impl::isFinalChanged()
     aEv.PropertyName = "IsRowCountFinal";
     aEv.Further = false;
     aEv.PropertyHandle = -1;
-    sal_Bool fval = false;
-    sal_Bool tval = true;
+    bool fval = false;
+    bool tval = true;
     aEv.OldValue <<= fval;
     aEv.NewValue <<= tval;
     for( sal_Int32 i = 0; i < seq.getLength(); ++i )
@@ -221,7 +221,7 @@ void XResultSet_impl::isFinalChanged()
 }
 
 
-sal_Bool SAL_CALL
+bool SAL_CALL
 XResultSet_impl::OneMore(
     void )
     throw( sdbc::SQLException,
@@ -231,7 +231,7 @@ XResultSet_impl::OneMore(
         return false;
 
     osl::FileBase::RC err;
-    sal_Bool IsRegular;
+    bool IsRegular;
     OUString aUnqPath;
     osl::DirectoryItem  m_aDirIte;
     uno::Reference< sdbc::XRow > aRow;
@@ -308,7 +308,7 @@ XResultSet_impl::next(
     throw( sdbc::SQLException,
            uno::RuntimeException, std::exception )
 {
-    sal_Bool test;
+    bool test;
     if( ++m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) test = true;
     else
         test = OneMore();
@@ -712,7 +712,7 @@ XResultSet_impl::getMetaData(
              == 0 )
         {
             // @@@ #82177# - Determine correct value!
-            sal_Bool bCaseSensitiveChildren = sal_False;
+            bool bCaseSensitiveChildren = false;
 
             std::vector< ::ucbhelper::ResultSetColumnData >
                                     aColumnData( m_sProperty.getLength() );
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index 0dcb2ff1908e..531f95cb8d18 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -595,11 +595,11 @@ class XResultSet_impl : public Notifier,
 
         shell*                              m_pMyShell;
         com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >  m_xProvider;
-        sal_Bool                            m_nIsOpen;
+        bool                            m_nIsOpen;
         sal_Int32                           m_nRow;
-        sal_Bool                            m_nWasNull;
+        bool                            m_nWasNull;
         sal_Int32                           m_nOpenMode;
-        sal_Bool                            m_bRowCountFinal;
+        bool                            m_bRowCountFinal;
 
         typedef std::vector< com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > > IdentSet;
         typedef std::vector< com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > >         ItemSet;
@@ -622,13 +622,13 @@ class XResultSet_impl : public Notifier,
         cppu::OInterfaceContainerHelper*    m_pIsFinalListeners;
 
         com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSetListener >       m_xListener;
-        sal_Bool                            m_bStatic;
+        bool                            m_bStatic;
 
         sal_Int32                                          m_nErrorCode;
         sal_Int32                                          m_nMinorErrorCode;
 
         // Methods
-        sal_Bool SAL_CALL OneMore( void )
+        bool SAL_CALL OneMore( void )
             throw( com::sun::star::sdbc::SQLException,
                    com::sun::star::uno::RuntimeException );
 
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index dd439e7d4af7..effcc9a07ad8 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -40,7 +40,7 @@ using namespace com::sun::star::ucb;
 /*                                                                            */
 /******************************************************************************/
 
-XStream_impl::XStream_impl( shell* pMyShell,const OUString& aUncPath, sal_Bool bLock )
+XStream_impl::XStream_impl( shell* pMyShell,const OUString& aUncPath, bool bLock )
     : m_bInputStreamCalled( false ),
       m_bOutputStreamCalled( false ),
       m_pMyShell( pMyShell ),
diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx
index ccfd3ae0ee7b..12968c9febe2 100644
--- a/ucb/source/ucp/file/filstr.hxx
+++ b/ucb/source/ucp/file/filstr.hxx
@@ -49,7 +49,7 @@ class XStream_impl :  public cppu::WeakImplHelper6<
 
     public:
 
-        XStream_impl( shell* pMyShell,const OUString& aUncPath, sal_Bool bLock );
+        XStream_impl( shell* pMyShell,const OUString& aUncPath, bool bLock );
 
         /**
          *  Returns an error code as given by filerror.hxx
@@ -181,7 +181,7 @@ class XStream_impl :  public cppu::WeakImplHelper6<
 
         shell*       m_pMyShell;
         com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider;
-        sal_Bool     m_nIsOpen;
+        bool     m_nIsOpen;
 
         ReconnectingFile    m_aFile;
 
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 0a1ebf14cf00..223d4c8ad720 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -101,7 +101,7 @@ FileProvider::~FileProvider()
 void SAL_CALL FileProvider::init()
 {
     if( ! m_pMyShell )
-        m_pMyShell = new shell( m_xContext, this, sal_True );
+        m_pMyShell = new shell( m_xContext, this, true );
 }
 
 
@@ -115,9 +115,9 @@ FileProvider::initialize(
         if( aArguments.getLength() > 0 &&
             (aArguments[0] >>= config) &&
             config.equalsAscii("NoConfig") )
-            m_pMyShell = new shell( m_xContext, this, sal_False );
+            m_pMyShell = new shell( m_xContext, this, false );
         else
-            m_pMyShell = new shell( m_xContext, this, sal_True );
+            m_pMyShell = new shell( m_xContext, this, true );
     }
 }
 
@@ -201,7 +201,7 @@ FileProvider::queryContent(
 {
     init();
     OUString aUnc;
-    sal_Bool err = m_pMyShell->getUnqFromUrl( xIdentifier->getContentIdentifier(),
+    bool err = m_pMyShell->getUnqFromUrl( xIdentifier->getContentIdentifier(),
                                               aUnc );
 
     if(  err )
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 906278e8ff11..87b9f5ac722c 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -121,8 +121,8 @@ shell::MyProperty::MyProperty( const OUString&                         __Propert
     // empty
 }
 
-shell::MyProperty::MyProperty( const sal_Bool&                              __isNative,
-                               const OUString&                         __PropertyName,
+shell::MyProperty::MyProperty( const bool&                                  __isNative,
+                               const OUString&                              __PropertyName,
                                const sal_Int32&                             __Handle,
                                const com::sun::star::uno::Type&              __Typ,
                                const com::sun::star::uno::Any&              __Value,
@@ -149,7 +149,7 @@ shell::MyProperty::~MyProperty()
 
 
 shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
-              FileProvider* pProvider, sal_Bool bWithConfig )
+              FileProvider* pProvider, bool bWithConfig )
     : TaskManager(),
       m_bWithConfig( bWithConfig ),
       m_pProvider( pProvider ),
@@ -660,7 +660,7 @@ void SAL_CALL shell::page( sal_Int32 CommandId,
 uno::Reference< io::XInputStream > SAL_CALL
 shell::open( sal_Int32 CommandId,
              const OUString& aUnqPath,
-             sal_Bool bLock )
+             bool bLock )
     throw()
 {
     XInputStream_impl* xInputStream = new XInputStream_impl( this, aUnqPath, bLock ); // from filinpstr.hxx
@@ -697,7 +697,7 @@ shell::open( sal_Int32 CommandId,
 uno::Reference< io::XStream > SAL_CALL
 shell::open_rw( sal_Int32 CommandId,
                 const OUString& aUnqPath,
-                sal_Bool bLock )
+                bool bLock )
     throw()
 {
     XStream_impl* xStream = new XStream_impl( this, aUnqPath, bLock );  // from filstr.hxx
@@ -912,7 +912,7 @@ shell::setv( const OUString& aUnqPath,
             else if(values[i].Name == IsReadOnly ||
                     values[i].Name == IsHidden)
             {
-                sal_Bool value = sal_False;
+                bool value = false;
                 if( values[i].Value >>= value )
                 {
                     osl::DirectoryItem aDirItem;
@@ -1266,7 +1266,7 @@ shell::move( sal_Int32 CommandId,
                       nError );
         return;
     }
-    sal_Bool isDocument = ( aStatus.getFileType() == osl::FileStatus::Regular );
+    bool isDocument = ( aStatus.getFileType() == osl::FileStatus::Regular );
 
 
     copyPersistentSet( srcUnqPath,dstUnqPath,!isDocument );
@@ -1355,7 +1355,7 @@ shell::copy(
         rslvdSrcUnqPath = srcUnqPath;
     }
 
-    sal_Bool isDocument
+    bool isDocument
         = type != osl::FileStatus::Directory && type != osl::FileStatus::Volume;
     sal_Int32 IsWhat = isDocument ? -1 : 1;
 
@@ -1376,7 +1376,7 @@ shell::copy(
         case NameClash::OVERWRITE:
         {
             // remove (..., MustExist = sal_False).
-            remove( CommandId, dstUnqPath, IsWhat, sal_False );
+            remove( CommandId, dstUnqPath, IsWhat, false );
 
             // copy.
             nError = copy_recursive( rslvdSrcUnqPath,dstUnqPath,IsWhat,false );
@@ -1492,11 +1492,11 @@ shell::copy(
 
 
 
-sal_Bool SAL_CALL
+bool SAL_CALL
 shell::remove( sal_Int32 CommandId,
                const OUString& aUnqPath,
                sal_Int32 IsWhat,
-               sal_Bool  MustExist )
+               bool  MustExist )
     throw()
 {
     sal_Int32 nMask = osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL;
@@ -1525,7 +1525,7 @@ shell::remove( sal_Int32 CommandId,
             installError( CommandId,
                           TASKHANDLING_VALIDFILESTATUS_FOR_REMOVE,
                           nError != osl::FileBase::E_None ? nError : TASKHANDLER_NO_ERROR );
-            return sal_False;
+            return false;
         }
 
         if( aStatus.getFileType() == osl::FileStatus::Regular ||
@@ -1572,7 +1572,7 @@ shell::remove( sal_Int32 CommandId,
             return (!MustExist);
         }
 
-        sal_Bool whileSuccess = sal_True;
+        bool whileSuccess = true;
         sal_Int32 recurse = 0;
         OUString name;
 
@@ -1585,7 +1585,7 @@ shell::remove( sal_Int32 CommandId,
                 installError( CommandId,
                               TASKHANDLING_VALIDFILESTATUSWHILE_FOR_REMOVE,
                               nError != osl::FileBase::E_None ? nError : TASKHANDLER_NO_ERROR );
-                whileSuccess = sal_False;
+                whileSuccess = false;
                 break;
             }
 
@@ -1608,14 +1608,14 @@ shell::remove( sal_Int32 CommandId,
         aDirectory.close();
 
         if( ! whileSuccess )
-            return sal_False;     // error code is installed
+            return false;     // error code is installed
 
         if( nError != osl::FileBase::E_NOENT )
         {
             installError( CommandId,
                           TASKHANDLING_DIRECTORYEXHAUSTED_FOR_REMOVE,
                           nError );
-            return sal_False;
+            return false;
         }
 
         nError = osl::Directory::remove( aUnqPath );
@@ -1639,10 +1639,10 @@ shell::remove( sal_Int32 CommandId,
     {
         installError( CommandId,
                       TASKHANDLING_FILETYPE_FOR_REMOVE );
-        return sal_False;
+        return false;
     }
 
-    return sal_True;
+    return true;
 }
 
 
@@ -1656,10 +1656,10 @@ shell::remove( sal_Int32 CommandId,
 //  Return:: success of operation
 
 
-sal_Bool SAL_CALL
+bool SAL_CALL
 shell::mkdir( sal_Int32 CommandId,
               const OUString& rUnqPath,
-              sal_Bool OverWrite )
+              bool OverWrite )
     throw()
 {
     OUString aUnqPath;
@@ -1680,22 +1680,22 @@ shell::mkdir( sal_Int32 CommandId,
             {
                 installError( CommandId,
                               TASKHANDLING_FOLDER_EXISTS_MKDIR );
-                return sal_False;
+                return false;
             }
             else
-                return sal_True;
+                return true;
         }
         case osl::FileBase::E_INVAL:
         {
             installError(CommandId,
                          TASKHANDLING_INVALID_NAME_MKDIR);
-            return sal_False;
+            return false;
         }
         case osl::FileBase::E_None:
         {
             OUString aPrtPath = getParentName( aUnqPath );
             notifyInsert( getContentEventListeners( aPrtPath ),aUnqPath );
-            return sal_True;
+            return true;
         }
         default:
             return ensuredir(
@@ -1717,15 +1717,15 @@ shell::mkdir( sal_Int32 CommandId,
 //  Return:: success of operation
 
 
-sal_Bool SAL_CALL
+bool SAL_CALL
 shell::mkfil( sal_Int32 CommandId,
               const OUString& aUnqPath,
-              sal_Bool Overwrite,
+              bool Overwrite,
               const uno::Reference< io::XInputStream >& aInputStream )
     throw()
 {
     // return value unimportant
-    sal_Bool bSuccess = write( CommandId,
+    bool bSuccess = write( CommandId,
                                aUnqPath,
                                Overwrite,
                                aInputStream );
@@ -1749,10 +1749,10 @@ shell::mkfil( sal_Int32 CommandId,
 //  Return:: success of operation
 
 
-sal_Bool SAL_CALL
+bool SAL_CALL
 shell::write( sal_Int32 CommandId,
               const OUString& aUnqPath,
-              sal_Bool OverWrite,
+              bool OverWrite,
               const uno::Reference< io::XInputStream >& aInputStream )
     throw()
 {
@@ -1760,14 +1760,14 @@ shell::write( sal_Int32 CommandId,
     {
         installError( CommandId,
                       TASKHANDLING_INPUTSTREAM_FOR_WRITE );
-        return sal_False;
+        return false;
     }
 
     // Create parent path, if necessary.
     if ( ! ensuredir( CommandId,
                       getParentName( aUnqPath ),
                       TASKHANDLING_ENSUREDIR_FOR_WRITE ) )
-        return sal_False;
+        return false;
 
     osl::FileBase::RC err;
     osl::File aFile( aUnqPath );
@@ -1786,7 +1786,7 @@ shell::write( sal_Int32 CommandId,
                 installError( CommandId,
                               TASKHANDLING_NO_OPEN_FILE_FOR_OVERWRITE,
                               err );
-                return sal_False;
+                return false;
             }
 
             // the existing file was just opened and should be overwritten now,
@@ -1798,7 +1798,7 @@ shell::write( sal_Int32 CommandId,
                 installError( CommandId,
                               TASKHANDLING_FILESIZE_FOR_WRITE,
                               err );
-                return sal_False;
+                return false;
             }
         }
     }
@@ -1812,7 +1812,7 @@ shell::write( sal_Int32 CommandId,
                           err );
 
             aFile.close();
-            return sal_False;
+            return false;
         }
 
         // as a temporary solution the creation does not lock the file at all
@@ -1825,11 +1825,11 @@ shell::write( sal_Int32 CommandId,
             installError( CommandId,
                           TASKHANDLING_NO_OPEN_FILE_FOR_WRITE,
                           err );
-            return sal_False;
+            return false;
         }
     }
 
-    sal_Bool bSuccess = sal_True;
+    bool bSuccess = true;
 
     sal_uInt64 nWrittenBytes;
     sal_Int32 nReadBytes = 0, nRequestedBytes = 32768 /*32k*/;
@@ -1846,21 +1846,21 @@ shell::write( sal_Int32 CommandId,
         {
             installError( CommandId,
                           TASKHANDLING_NOTCONNECTED_FOR_WRITE );
-            bSuccess = sal_False;
+            bSuccess = false;
             break;
         }
         catch( const io::BufferSizeExceededException& )
         {
             installError( CommandId,
                           TASKHANDLING_BUFFERSIZEEXCEEDED_FOR_WRITE );
-            bSuccess = sal_False;
+            bSuccess = false;
             break;
         }
         catch( const io::IOException& )
         {
             installError( CommandId,
                           TASKHANDLING_IOEXCEPTION_FOR_WRITE );
-            bSuccess = sal_False;
+            bSuccess = false;
             break;
         }
 
@@ -1877,14 +1877,14 @@ shell::write( sal_Int32 CommandId,
                 installError( CommandId,
                               TASKHANDLING_FILEIOERROR_FOR_WRITE,
                               err );
-                bSuccess = sal_False;
+                bSuccess = false;
                 break;
             }
             else if( nWrittenBytes != sal_uInt64( nReadBytes ) )
             {
                 installError( CommandId,
                               TASKHANDLING_FILEIOERROR_FOR_NO_SPACE );
-                bSuccess = sal_False;
+                bSuccess = false;
                 break;
             }
         }
@@ -1896,7 +1896,7 @@ shell::write( sal_Int32 CommandId,
         installError( CommandId,
                       TASKHANDLING_FILEIOERROR_FOR_WRITE,
                       err );
-        bSuccess = sal_False;
+        bSuccess = false;
     }
 
     return bSuccess;
@@ -1923,7 +1923,7 @@ void SAL_CALL shell::insertDefaultProperties( const OUString& aUnqPath )
     MyProperty ContentTProperty( ContentType );
 
     PropertySet& properties = *(it->second.properties);
-    sal_Bool ContentNotDefau = properties.find( ContentTProperty ) != properties.end();
+    bool ContentNotDefau = properties.find( ContentTProperty ) != properties.end();
 
     shell::PropertySet::iterator it1 = m_aDefaultProperties.begin();
     while( it1 != m_aDefaultProperties.end() )
@@ -1949,7 +1949,7 @@ void SAL_CALL shell::insertDefaultProperties( const OUString& aUnqPath )
 /******************************************************************************/
 
 
-sal_Bool SAL_CALL shell::getUnqFromUrl( const OUString& Url, OUString& Unq )
+bool SAL_CALL shell::getUnqFromUrl( const OUString& Url, OUString& Unq )
 {
     if ( Url == "file:///" || Url == "file://localhost/" || Url == "file://127.0.0.1/" )
     {
@@ -1957,7 +1957,7 @@ sal_Bool SAL_CALL shell::getUnqFromUrl( const OUString& Url, OUString& Unq )
         return false;
     }
 
-    sal_Bool err = osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( Url,Unq );
+    bool err = osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( Url,Unq );
 
     Unq = Url;
 
@@ -1971,9 +1971,9 @@ sal_Bool SAL_CALL shell::getUnqFromUrl( const OUString& Url, OUString& Unq )
 
 
 
-sal_Bool SAL_CALL shell::getUrlFromUnq( const OUString& Unq,OUString& Url )
+bool SAL_CALL shell::getUrlFromUnq( const OUString& Unq,OUString& Url )
 {
-    sal_Bool err = osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( Unq,Url );
+    bool err = osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( Unq,Url );
 
     Url = Unq;
 
@@ -1988,7 +1988,7 @@ osl::FileBase::RC SAL_CALL
 shell::copy_recursive( const OUString& srcUnqPath,
                        const OUString& dstUnqPath,
                        sal_Int32 TypeToCopy,
-                       sal_Bool testExistBeforeCopy )
+                       bool testExistBeforeCopy )
     throw()
 {
     osl::FileBase::RC err = osl::FileBase::E_None;
@@ -2012,7 +2012,7 @@ shell::copy_recursive( const OUString& srcUnqPath,
 
             while( err == osl::FileBase::E_None && ( next = aDir.getNextItem( aDirItem ) ) == osl::FileBase::E_None )
             {
-                sal_Bool IsDoc = false;
+                bool IsDoc = false;
                 osl::FileStatus aFileStatus( n_Mask );
                 aDirItem.getFileStatus( aFileStatus );
                 if( aFileStatus.isValid( osl_FileStatus_Mask_Type ) )
@@ -2058,7 +2058,7 @@ shell::copy_recursive( const OUString& srcUnqPath,
 // returns success of the operation
 
 
-sal_Bool SAL_CALL shell::ensuredir( sal_Int32 CommandId,
+bool SAL_CALL shell::ensuredir( sal_Int32 CommandId,
                                     const OUString& rUnqPath,
                                     sal_Int32 errorCode )
     throw()
@@ -2066,7 +2066,7 @@ sal_Bool SAL_CALL shell::ensuredir( sal_Int32 CommandId,
     OUString aPath;
 
     if ( rUnqPath.isEmpty() )
-        return sal_False;
+        return false;
 
     if ( rUnqPath.endsWith("/") )
         aPath = rUnqPath.copy( 0, rUnqPath.getLength() - 1 );
@@ -2098,14 +2098,14 @@ sal_Bool SAL_CALL shell::ensuredir( sal_Int32 CommandId,
     aDirectory.close();
 
     if( nError == osl::File::E_None )
-        return sal_True;
+        return true;
 
     nError = osl::Directory::create( aPath );
 
     if( nError == osl::File::E_None )
         notifyInsert( getContentEventListeners( getParentName( aPath ) ),aPath );
 
-    sal_Bool  bSuccess = ( nError == osl::File::E_None || nError == osl::FileBase::E_EXIST );
+    bool  bSuccess = ( nError == osl::File::E_None || nError == osl::FileBase::E_EXIST );
 
     if( ! bSuccess )
     {
@@ -2194,7 +2194,7 @@ shell::getMaskFromProperties(
 
 
 void SAL_CALL
-shell::load( const ContentMap::iterator& it, sal_Bool create )
+shell::load( const ContentMap::iterator& it, bool create )
 {
     if( ! it->second.properties )
         it->second.properties = new PropertySet;
@@ -2289,7 +2289,7 @@ shell::commit( const shell::ContentMap::iterator& it,
     }
 
 
-    sal_Bool isDirectory,isFile,isVolume,isRemoveable,isRemote,isFloppy,isCompactDisc;
+    bool isDirectory,isFile,isVolume,isRemoveable,isRemote,isFloppy,isCompactDisc;
 
     sal_Int64 dirSize = 0;
 
@@ -2381,7 +2381,7 @@ shell::commit( const shell::ContentMap::iterator& it,
         }
         else
         {
-            sal_Bool dummy = false;
+            bool dummy = false;
             aAny <<= dummy;
             it1 = properties.find( MyProperty( IsRemote ) );
             if( it1 != properties.end() )
@@ -2402,7 +2402,7 @@ shell::commit( const shell::ContentMap::iterator& it,
     }
     else
     {
-        isDirectory = sal_False;
+        isDirectory = false;
     }
 
     it1 = properties.find( MyProperty( Size ) );
@@ -2415,7 +2415,7 @@ shell::commit( const shell::ContentMap::iterator& it,
         if( aFileStatus.isValid( osl_FileStatus_Mask_Attributes ) )
         {
             sal_uInt64 Attr = aFileStatus.getAttributes();
-            sal_Bool readonly = ( Attr & osl_File_Attribute_ReadOnly ) != 0;
+            bool readonly = ( Attr & osl_File_Attribute_ReadOnly ) != 0;
             it1->setValue( uno::makeAny( readonly ) );
         }
     }
@@ -2426,7 +2426,7 @@ shell::commit( const shell::ContentMap::iterator& it,
         if( aFileStatus.isValid( osl_FileStatus_Mask_Attributes ) )
         {
             sal_uInt64 Attr = aFileStatus.getAttributes();
-            sal_Bool ishidden = ( Attr & osl_File_Attribute_Hidden ) != 0;
+            bool ishidden = ( Attr & osl_File_Attribute_Hidden ) != 0;
             it1->setValue( uno::makeAny( ishidden ) );
         }
     }
@@ -2476,7 +2476,7 @@ shell::getv(
     const uno::Sequence< beans::Property >& properties,
     osl::DirectoryItem& aDirItem,
     OUString& aUnqPath,
-    sal_Bool& aIsRegular )
+    bool& aIsRegular )
 {
     uno::Sequence< uno::Any > seq( properties.getLength() );
 
@@ -2709,7 +2709,7 @@ shell::notifyPropertyRemoved( std::list< PropertySetInfoChangeNotifier* >* liste
 std::vector< std::list< ContentEventNotifier* >* >* SAL_CALL
 shell::getContentExchangedEventListeners( const OUString& aOldPrefix,
                                           const OUString& aNewPrefix,
-                                          sal_Bool withChildren )
+                                          bool withChildren )
 {
 
     std::vector< std::list< ContentEventNotifier* >* >* aVectorOnHeap =
@@ -2879,7 +2879,7 @@ void SAL_CALL shell::notifyPropertyChanges( std::list< PropertyChangeNotifier* >
 
 void SAL_CALL
 shell::erasePersistentSet( const OUString& aUnqPath,
-                           sal_Bool withChildren )
+                           bool withChildren )
 {
     if( ! m_xFileRegistry.is() )
     {
@@ -2942,7 +2942,7 @@ shell::erasePersistentSet( const OUString& aUnqPath,
 void SAL_CALL
 shell::copyPersistentSet( const OUString& srcUnqPath,
                           const OUString& dstUnqPath,
-                          sal_Bool withChildren )
+                          bool withChildren )
 {
     if( ! m_xFileRegistry.is() )
     {
diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx
index b86ad9b97c07..7582bc81df4c 100644
--- a/ucb/source/ucp/file/shell.hxx
+++ b/ucb/source/ucp/file/shell.hxx
@@ -81,16 +81,16 @@ namespace fileaccess {
         private:
             OUString                          PropertyName;
             sal_Int32                              Handle;
-            sal_Bool                               isNative;
+            bool                               isNative;
             com::sun::star::uno::Type              Typ;        // Duplicates information in Value
             com::sun::star::uno::Any               Value;
             com::sun::star::beans::PropertyState   State;
             sal_Int16                              Attributes;
         public:
             MyProperty();
-            MyProperty( const OUString&                         __PropertyName );
-            MyProperty( const sal_Bool&                              __isNative,
-                        const OUString&                         __PropertyName,
+            MyProperty( const OUString&                              __PropertyName );
+            MyProperty( const bool&                                  __isNative,
+                        const OUString&                              __PropertyName,
                         const sal_Int32&                             __Handle,
                         const com::sun::star::uno::Type&             __Typ,
                         const com::sun::star::uno::Any&              __Value,
@@ -98,7 +98,7 @@ namespace fileaccess {
                         const sal_Int16&                             __Attributes );
 
             ~MyProperty();
-            inline const sal_Bool& SAL_CALL IsNative() const;
+            inline const bool& SAL_CALL IsNative() const;
             inline const OUString& SAL_CALL getPropertyName() const { return PropertyName; }
             inline const sal_Int32& SAL_CALL getHandle() const;
             inline const com::sun::star::uno::Type& SAL_CALL getType() const;
@@ -157,7 +157,7 @@ namespace fileaccess {
 
         // MethodenDefinitionen
         shell( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
-               FileProvider* pProvider,sal_Bool bWithConfig );
+               FileProvider* pProvider, bool bWithConfig );
 
         virtual ~shell();
 
@@ -221,7 +221,7 @@ namespace fileaccess {
         com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL
         open( sal_Int32 CommandId,
               const OUString& aUnqPath,
-              sal_Bool bLock )
+              bool bLock )
             throw();
 
 
@@ -233,7 +233,7 @@ namespace fileaccess {
         com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL
         open_rw( sal_Int32 CommandId,
                  const OUString& aUnqPath,
-                 sal_Bool bLock )
+                 bool bLock )
             throw();
 
 
@@ -322,11 +322,11 @@ namespace fileaccess {
          *  Deletes the content belonging to fileURL aUnqPath( recursively in case of directory )
          */
 
-        sal_Bool SAL_CALL
+        bool SAL_CALL
         remove( sal_Int32 CommandId,
                 const OUString& aUnqPath,
                 sal_Int32 TypeToMove = RemoveUnknown,
-                sal_Bool  MustExist  = sal_True )
+                bool  MustExist  = true )
             throw();
 
 #undef RemoveUnknown
@@ -343,10 +343,10 @@ namespace fileaccess {
          *  Return:: success of operation
          */
 
-        sal_Bool SAL_CALL
+        bool SAL_CALL
         mkdir( sal_Int32 CommandId,
                const OUString& aDirectoryName,
-               sal_Bool OverWrite )
+               bool OverWrite )
             throw();
 
 
@@ -356,10 +356,10 @@ namespace fileaccess {
          *  Return:: success of operation
          */
 
-        sal_Bool SAL_CALL
+        bool SAL_CALL
         mkfil( sal_Int32 CommandId,
                const OUString& aFileName,
-               sal_Bool OverWrite,
+               bool OverWrite,
                const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream )
             throw();
 
@@ -369,10 +369,10 @@ namespace fileaccess {
          *  The content of aInputStream becomes the content of the file
          *  Return:: success of operation
          */
-        sal_Bool SAL_CALL
+        bool SAL_CALL
         write( sal_Int32 CommandId,
                const OUString& aUnqPath,
-               sal_Bool OverWrite,
+               bool OverWrite,
                const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream )
             throw();
 
@@ -391,12 +391,12 @@ namespace fileaccess {
         /*                                                                            */
         /******************************************************************************/
 
-        sal_Bool SAL_CALL getUnqFromUrl( const OUString& Url, OUString& Unq );
+        bool SAL_CALL getUnqFromUrl( const OUString& Url, OUString& Unq );
 
-        sal_Bool SAL_CALL getUrlFromUnq( const OUString& Unq, OUString& Url );
+        bool SAL_CALL getUrlFromUnq( const OUString& Unq, OUString& Url );
 
 
-        sal_Bool m_bWithConfig;
+        bool m_bWithConfig;
         FileProvider*                                                                   m_pProvider;
         com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >        m_xContext;
         com::sun::star::uno::Reference< com::sun::star::ucb::XPropertySetRegistry >     m_xFileRegistry;
@@ -416,7 +416,7 @@ namespace fileaccess {
         std::vector< std::list< ContentEventNotifier* >* >* SAL_CALL
         getContentExchangedEventListeners( const OUString& aOldPrefix,
                                            const OUString& aNewPrefix,
-                                           sal_Bool withChildren );
+                                           bool withChildren );
 
         std::list< PropertyChangeNotifier* >* SAL_CALL
         getPropertyChangeNotifier( const OUString& aName );
@@ -460,7 +460,7 @@ namespace fileaccess {
         /********************************************************************************/
 
         void SAL_CALL erasePersistentSet( const OUString& aUnqPath,
-                                          sal_Bool withChildren = false );
+                                          bool withChildren = false );
 
         /********************************************************************************/
         /*                       copy persistent propertyset                            */
@@ -469,7 +469,7 @@ namespace fileaccess {
 
         void SAL_CALL copyPersistentSet( const OUString& srcUnqPath,
                                          const OUString& dstUnqPath,
-                                         sal_Bool withChildren = false );
+                                         bool withChildren = false );
 
 
         // Special optimized method for getting the properties of a directoryitem, which
@@ -480,7 +480,7 @@ namespace fileaccess {
               const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& properties,
               osl::DirectoryItem& DirItem,
               OUString& aUnqPath,
-              sal_Bool&      bIsRegular );
+              bool&      bIsRegular );
 
 
         /**
@@ -489,7 +489,7 @@ namespace fileaccess {
          */
 
         void SAL_CALL load( const shell::ContentMap::iterator& it,
-                            sal_Bool create );
+                            bool create );
 
         /**
          *  Commit inserts the determined properties in the filestatus object into
@@ -528,7 +528,7 @@ namespace fileaccess {
             const OUString& srcUnqPath,
             const OUString& dstUnqPath,
             sal_Int32 TypeToCopy,
-            sal_Bool  testExistence )
+            bool  testExistence )
             throw();
 
 
@@ -538,7 +538,7 @@ namespace fileaccess {
         // The calle determines the errorCode, which should be used to install
         // any error
 
-        sal_Bool SAL_CALL
+        bool SAL_CALL
         ensuredir( sal_Int32 CommandId,
                    const OUString& aDirectoryName,
                    sal_Int32 errorCode )
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index f1d72c72daf3..24c63ffbad2f 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -857,12 +857,12 @@ Reference< XRow > FTPContent::getPropertyValues(
                                     : 1 );
             else if(Name.equalsAscii("IsDocument"))
                 xRow->appendBoolean(seqProp[i],
-                                    ! sal_Bool(aDirEntry.m_nMode &
-                                               INETCOREFTP_FILEMODE_ISDIR));
+                                    (aDirEntry.m_nMode &
+                                               INETCOREFTP_FILEMODE_ISDIR) != INETCOREFTP_FILEMODE_ISDIR);
             else if(Name.equalsAscii("IsFolder"))
                 xRow->appendBoolean(seqProp[i],
-                                    sal_Bool(aDirEntry.m_nMode &
-                                             INETCOREFTP_FILEMODE_ISDIR));
+                                    (aDirEntry.m_nMode &
+                                             INETCOREFTP_FILEMODE_ISDIR) == INETCOREFTP_FILEMODE_ISDIR);
             else if(Name.equalsAscii("Size"))
                 xRow->appendLong(seqProp[i],
                                  aDirEntry.m_nSize);
diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx
index 49a659cd39b3..32a6e6dc22ab 100644
--- a/ucb/source/ucp/ftp/ftpdirp.cxx
+++ b/ucb/source/ucp/ftp/ftpdirp.cxx
@@ -31,7 +31,7 @@ using namespace ftp;
 
 typedef sal_uInt32 ULONG;
 
-inline sal_Bool ascii_isWhitespace( sal_Unicode ch )
+inline bool ascii_isWhitespace( sal_Unicode ch )
 {
     return ((ch <= 0x20) && ch);
 }
@@ -59,11 +59,11 @@ inline sal_Bool ascii_isWhitespace( sal_Unicode ch )
  *    interpreted as: size attribs DIR mm-dd-yy hh:mm name
  */
 
-sal_Bool FTPDirectoryParser::parseDOS (
+bool FTPDirectoryParser::parseDOS (
     FTPDirentry &rEntry,
     const sal_Char  *pBuffer)
 {
-    sal_Bool   bDirectory = false;
+    bool   bDirectory = false;
     sal_uInt32 nSize = 0;
     sal_uInt16 nYear = 0;
     sal_uInt16 nMonth = 0;
@@ -505,7 +505,7 @@ sal_Bool FTPDirectoryParser::parseDOS (
                     rEntry.m_aDate.SetHour(nHour);
                     rEntry.m_aDate.SetMin(nMinute);
 
-                    return sal_True;
+                    return true;
                 }
                 break;
             case STATE_ERROR:
@@ -513,7 +513,7 @@ sal_Bool FTPDirectoryParser::parseDOS (
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 /*
@@ -556,14 +556,14 @@ sal_Bool FTPDirectoryParser::parseDOS (
  * order bits truncated to fit into a ULONG.
  *
  */
-sal_Bool FTPDirectoryParser::parseVMS (
+bool FTPDirectoryParser::parseVMS (
     FTPDirentry &rEntry,
     const sal_Char  *pBuffer)
 {
     static OUString aFirstLineName;
-    static sal_Bool bFirstLineDir = sal_False;
+    static bool bFirstLineDir = false;
 
-    for (sal_Bool bFirstLine = sal_True;; bFirstLine = sal_False)
+    for (bool bFirstLine = true;; bFirstLine = false)
     {
         const sal_Char *p = pBuffer;
         if (bFirstLine)
@@ -585,7 +585,7 @@ sal_Bool FTPDirectoryParser::parseVMS (
                 if (!aFirstLineName.isEmpty())
                     continue;
                 else
-                    return sal_False;
+                    return false;
             }
 
             // Parse <filetype ";"> part:
@@ -601,7 +601,7 @@ sal_Bool FTPDirectoryParser::parseVMS (
                 if (!aFirstLineName.isEmpty())
                     continue;
                 else
-                    return sal_False;
+                    return false;
             }
             ++p;
 
@@ -626,14 +626,14 @@ sal_Bool FTPDirectoryParser::parseVMS (
                 if (!aFirstLineName.isEmpty())
                     continue;
                 else
-                    return sal_False;
+                    return false;
             }
             ++p;
             while (*p >= '0' && *p <= '9')
                 ++p;
 
             // Parse <1*lws> or <*lws <NEWLINE>> part:
-            sal_Bool bLWS = false;
+            bool bLWS = false;
             while (*p == '\t' || *p == ' ')
             {
                 bLWS = true;
@@ -646,7 +646,7 @@ sal_Bool FTPDirectoryParser::parseVMS (
                     if (!aFirstLineName.isEmpty())
                         continue;
                     else
-                        return sal_False;
+                        return false;
                 }
             }
             else
@@ -658,7 +658,7 @@ sal_Bool FTPDirectoryParser::parseVMS (
                 aFirstLineName = rEntry.m_aName;
                 bFirstLineDir =
                     ((rEntry.m_nMode & INETCOREFTP_FILEMODE_ISDIR) != 0);
-                return sal_False;
+                return false;
             }
         }
         else
@@ -672,7 +672,7 @@ sal_Bool FTPDirectoryParser::parseVMS (
 
             // Skip <1*lws> part:
             if (*p != '\t' && *p != ' ')
-                return sal_False;
+                return false;
             ++p;
             while (*p == '\t' || *p == ' ')
                 ++p;
@@ -680,7 +680,7 @@ sal_Bool FTPDirectoryParser::parseVMS (
 
         // Parse <size> part and set entry's size:
         if (*p < '0' || *p > '9')
-            return sal_False;
+            return false;
         ULONG nSize = *p - '0';
         if (*p++ != '0')
             while (*p >= '0' && *p <= '9')
@@ -689,7 +689,7 @@ sal_Bool FTPDirectoryParser::parseVMS (
 
         // Skip <1*lws> part:
         if (*p != '\t' && *p != ' ')
-            return sal_False;
+            return false;
         ++p;
         while (*p == '\t' || *p == ' ')
             ++p;
@@ -700,7 +700,7 @@ sal_Bool FTPDirectoryParser::parseVMS (
         {
             ++p;
             if (*p < '1' || *p > '9')
-                return sal_False;
+                return false;
             nDay = *p++ - '0';
         }
         else if (*p == '1' || *p == '2')
@@ -717,11 +717,11 @@ sal_Bool FTPDirectoryParser::parseVMS (
         else if (*p >= '4' && *p <= '9')
             nDay = *p++ - '0';
         else
-            return sal_False;
+            return false;
 
         rEntry.m_aDate.SetDay(nDay);
         if (*p++ != '-')
-            return sal_False;
+            return false;
 
         // Parse <month "-"> part and set entry date's month:
         sal_Char const * pMonth = p;
@@ -729,7 +729,7 @@ sal_Bool FTPDirectoryParser::parseVMS (
         for (int i = 0; i < monthLen; ++i)
         {
             if (!((*p >= 'A' && *p <= 'Z') || (*p >= 'a' && *p <= 'z')))
-                return sal_False;
+                return false;
             ++p;
         }
         if (rtl_str_compareIgnoreAsciiCase_WithLength(
@@ -769,30 +769,30 @@ sal_Bool FTPDirectoryParser::parseVMS (
                      pMonth, monthLen, "DEC", monthLen) == 0)
             rEntry.m_aDate.SetMonth(12);
         else
-            return sal_False;
+            return false;
         if (*p++ != '-')
-            return sal_False;
+            return false;
 
         // Parse <year> part and set entry date's year:
         sal_uInt16 nYear = 0;
         for (int i = 0; i < 2; ++i)
         {
             if (*p < '0' || *p > '9')
-                return sal_False;
+                return false;
             nYear = 10 * nYear + (*p++ - '0');
         }
         if (*p >= '0' && *p <= '9')
         {
             nYear = 10 * nYear + (*p++ - '0');
             if (*p < '0' || *p > '9')
-                return sal_False;
+                return false;
             nYear = 10 * nYear + (*p++ - '0');
         }
         setYear (rEntry.m_aDate, nYear);
 
         // Skip <1*lws> part:
         if (*p != '\t' && *p != ' ')
-            return sal_False;
+            return false;
         ++p;
         while (*p == '\t' || *p == ' ')
             ++p;
@@ -813,22 +813,22 @@ sal_Bool FTPDirectoryParser::parseVMS (
         else if (*p >= '3' && *p <= '9')
             nHour = *p++ - '0';
         else
-            return sal_False;
+            return false;
 
         rEntry.m_aDate.SetHour(nHour);
         if (*p++ != ':')
-            return sal_False;
+            return false;
 
         /*
          * Parse <minute> part and set entry time's minutes,
          * seconds (0), and nanoseconds (0).
          */
         if (*p < '0' || *p > '5')
-            return sal_False;
+            return false;
 
         sal_uInt16 nMinute = *p++ - '0';
         if (*p < '0' || *p > '9')
-            return sal_False;
+            return false;
 
         nMinute = 10 * nMinute + (*p++ - '0');
         rEntry.m_aDate.SetMin(nMinute);
@@ -837,16 +837,16 @@ sal_Bool FTPDirectoryParser::parseVMS (
 
         // Skip <rest> part:
         if (*p && (*p != '\t' && *p != ' '))
-            return sal_False;
+            return false;
 
-        return sal_True;
+        return true;
     }
 }
 
 /*
  * parseUNIX
  */
-sal_Bool FTPDirectoryParser::parseUNIX (
+bool FTPDirectoryParser::parseUNIX (
     FTPDirentry &rEntry,
     const sal_Char  *pBuffer)
 {
@@ -854,7 +854,7 @@ sal_Bool FTPDirectoryParser::parseUNIX (
     p1 = p2 = pBuffer;
 
     if (!((*p1 == '-') || (*p1 == 'd') || (*p1 == 'l')))
-        return sal_False;
+        return false;
 
     // 1st column: FileMode.
     if (*p1 == 'd')
@@ -946,21 +946,21 @@ sal_Bool FTPDirectoryParser::parseUNIX (
         setPath (rEntry.m_aName, p1);
 
         // Done.
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 /*
  * parseUNIX_isSizeField.
  */
-sal_Bool FTPDirectoryParser::parseUNIX_isSizeField (
+bool FTPDirectoryParser::parseUNIX_isSizeField (
     const sal_Char *pStart,
     const sal_Char *pEnd,
     sal_uInt32     &rSize)
 {
     if (!*pStart || !*pEnd || pStart == pEnd)
-        return sal_False;
+        return false;
 
     rSize = 0;
     if (*pStart >= '0' && *pStart <= '9')
@@ -969,8 +969,8 @@ sal_Bool FTPDirectoryParser::parseUNIX_isSizeField (
             if ((*pStart >= '0') && (*pStart <= '9'))
                 rSize = 10 * rSize + (*pStart - '0');
             else
-                return sal_False;
-        return sal_True;
+                return false;
+        return true;
     }
     else
     {
@@ -999,7 +999,7 @@ sal_Bool FTPDirectoryParser::parseUNIX_isSizeField (
                 rSize = 0;
             }
             else
-                return sal_False;
+                return false;
         return ((nNonDigits >= 9) && (nDigits >= 7));
     }
 }
@@ -1007,179 +1007,179 @@ sal_Bool FTPDirectoryParser::parseUNIX_isSizeField (
 /*
  * parseUNIX_isMonthField.
  */
-sal_Bool FTPDirectoryParser::parseUNIX_isMonthField (
+bool FTPDirectoryParser::parseUNIX_isMonthField (
     const sal_Char *pStart,
     const sal_Char *pEnd,
     DateTime       &rDateTime)
 {
     if (!*pStart || !*pEnd || pStart + 3 != pEnd)
-        return sal_False;
+        return false;
 
     if ((pStart[0] == 'j' || pStart[0] == 'J') &&
         (pStart[1] == 'a' || pStart[1] == 'A') &&
         (pStart[2] == 'n' || pStart[2] == 'N')    )
     {
         rDateTime.SetMonth(1);
-        return sal_True;
+        return true;
     }
     if ((pStart[0] == 'f' || pStart[0] == 'F') &&
         (pStart[1] == 'e' || pStart[1] == 'E') &&
         (pStart[2] == 'b' || pStart[2] == 'B')    )
     {
         rDateTime.SetMonth(2);
-        return sal_True;
+        return true;
     }
     if ((pStart[0] == 'm' || pStart[0] == 'M') &&
         (pStart[1] == 'a' || pStart[1] == 'A') &&
         (pStart[2] == 'r' || pStart[2] == 'R')    )
     {
         rDateTime.SetMonth(3);
-        return sal_True;
+        return true;
     }
     if ((pStart[0] == 'a' || pStart[0] == 'A') &&
         (pStart[1] == 'p' || pStart[1] == 'P') &&
         (pStart[2] == 'r' || pStart[2] == 'R')    )
     {
         rDateTime.SetMonth(4);
-        return sal_True;
+        return true;
     }
     if ((pStart[0] == 'm' || pStart[0] == 'M') &&
         (pStart[1] == 'a' || pStart[1] == 'A') &&
         (pStart[2] == 'y' || pStart[2] == 'Y')    )
     {
         rDateTime.SetMonth(5);
-        return sal_True;
+        return true;
     }
     if ((pStart[0] == 'j' || pStart[0] == 'J') &&
         (pStart[1] == 'u' || pStart[1] == 'U') &&
         (pStart[2] == 'n' || pStart[2] == 'N')    )
     {
         rDateTime.SetMonth(6);
-        return sal_True;
+        return true;
     }
     if ((pStart[0] == 'j' || pStart[0] == 'J') &&
         (pStart[1] == 'u' || pStart[1] == 'U') &&
         (pStart[2] == 'l' || pStart[2] == 'L')    )
     {
         rDateTime.SetMonth(7);
-        return sal_True;
+        return true;
     }
     if ((pStart[0] == 'a' || pStart[0] == 'A') &&
         (pStart[1] == 'u' || pStart[1] == 'U') &&
         (pStart[2] == 'g' || pStart[2] == 'G')    )
     {
         rDateTime.SetMonth(8);
-        return sal_True;
+        return true;
     }
     if ((pStart[0] == 's' || pStart[0] == 'S') &&
         (pStart[1] == 'e' || pStart[1] == 'E') &&
         (pStart[2] == 'p' || pStart[2] == 'P')    )
     {
         rDateTime.SetMonth(9);
-        return sal_True;
+        return true;
     }
     if ((pStart[0] == 'o' || pStart[0] == 'O') &&
         (pStart[1] == 'c' || pStart[1] == 'C') &&
         (pStart[2] == 't' || pStart[2] == 'T')    )
     {
         rDateTime.SetMonth(10);
-        return sal_True;
+        return true;
     }
     if ((pStart[0] == 'n' || pStart[0] == 'N') &&
         (pStart[1] == 'o' || pStart[1] == 'O') &&
         (pStart[2] == 'v' || pStart[2] == 'V')    )
     {
         rDateTime.SetMonth(11);
-        return sal_True;
+        return true;
     }
     if ((pStart[0] == 'd' || pStart[0] == 'D') &&
         (pStart[1] == 'e' || pStart[1] == 'E') &&
         (pStart[2] == 'c' || pStart[2] == 'C')    )
     {
         rDateTime.SetMonth(12);
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 /*
  * parseUNIX_isDayField.
  */
-sal_Bool FTPDirectoryParser::parseUNIX_isDayField (
+bool FTPDirectoryParser::parseUNIX_isDayField (
     const sal_Char *pStart,
     const sal_Char *pEnd,
     DateTime       &rDateTime)
 {
     if (!*pStart || !*pEnd || pStart == pEnd)
-        return sal_False;
+        return false;
     if (*pStart < '0' || *pStart > '9')
-        return sal_False;
+        return false;
 
     sal_uInt16 nDay = *pStart - '0';
     if (pStart + 1 < pEnd)
     {
         if (pStart + 2 != pEnd || pStart[1] < '0' || pStart[1] > '9')
-            return sal_False;
+            return false;
         nDay = 10 * nDay + (pStart[1] - '0');
     }
     if (!nDay || nDay > 31)
-        return sal_False;
+        return false;
 
     rDateTime.SetDay(nDay);
-    return sal_True;
+    return true;
 }
 
 /*
  * parseUNIX_isYearTimeField.
  */
-sal_Bool FTPDirectoryParser::parseUNIX_isYearTimeField (
+bool FTPDirectoryParser::parseUNIX_isYearTimeField (
     const sal_Char *pStart,
     const sal_Char *pEnd,
     DateTime       &rDateTime)
 {
     if (!*pStart || !*pEnd || pStart == pEnd ||
         *pStart < '0' || *pStart > '9')
-        return sal_False;
+        return false;
 
     sal_uInt16 nNumber = *pStart - '0';
     ++pStart;
 
     if (pStart == pEnd)
-        return sal_False;
+        return false;
     if (*pStart == ':')
         return parseUNIX_isTime (pStart, pEnd, nNumber, rDateTime);
     if (*pStart < '0' || *pStart > '9')
-        return sal_False;
+        return false;
 
     nNumber = 10 * nNumber + (*pStart - '0');
     ++pStart;
 
     if (pStart == pEnd)
-        return sal_False;
+        return false;
     if (*pStart == ':')
         return parseUNIX_isTime (pStart, pEnd, nNumber, rDateTime);
     if (*pStart < '0' || *pStart > '9')
-        return sal_False;
+        return false;
 
     nNumber = 10 * nNumber + (*pStart - '0');
     ++pStart;
 
     if (pStart == pEnd || *pStart < '0' || *pStart > '9')
-        return sal_False;
+        return false;
 
     nNumber = 10 * nNumber + (*pStart - '0');
     if (pStart + 1 != pEnd || nNumber < 1970)
-        return sal_False;
+        return false;
 
     rDateTime.SetYear(nNumber);
     rDateTime.SetTime(0);
-    return sal_True;
+    return true;
 }
 
 /*
  * parseUNIX_isTime.
  */
-sal_Bool FTPDirectoryParser::parseUNIX_isTime (
+bool FTPDirectoryParser::parseUNIX_isTime (
     const sal_Char *pStart,
     const sal_Char *pEnd,
     sal_uInt16      nHour,
@@ -1188,7 +1188,7 @@ sal_Bool FTPDirectoryParser::parseUNIX_isTime (
     if ((nHour     > 23 ) || (pStart + 3 != pEnd) ||
         (pStart[1] < '0') || (pStart[1] > '5')    ||
         (pStart[2] < '0') || (pStart[2] > '9')       )
-        return sal_False;
+        return false;
 
     sal_uInt16 nMin = 10 * (pStart[1] - '0') + (pStart[2] - '0');
 
@@ -1213,7 +1213,7 @@ sal_Bool FTPDirectoryParser::parseUNIX_isTime (
         rDateTime.SetYear(aCurrDateTime.Year - 1);
     else
         rDateTime.SetYear(aCurrDateTime.Year);
-    return sal_True;
+    return true;
 }
 
 /*
@@ -1224,7 +1224,7 @@ sal_Bool FTPDirectoryParser::parseUNIX_isTime (
  * checked for validity of the given day in the given month and year.
  *
  */
-sal_Bool FTPDirectoryParser::setYear (
+bool FTPDirectoryParser::setYear (
     DateTime &rDateTime, sal_uInt16 nYear)
 {
     if (nYear < 100)
@@ -1254,13 +1254,13 @@ sal_Bool FTPDirectoryParser::setYear (
     }
 
     rDateTime.SetYear(nYear);
-    return sal_True;
+    return true;
 }
 
 /*
  * setPath.
  */
-sal_Bool FTPDirectoryParser::setPath (
+bool FTPDirectoryParser::setPath (
     OUString &rPath, const sal_Char *value, sal_Int32 length)
 {
     if (value)
diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx
index 8c94f4017878..58666324da1a 100644
--- a/ucb/source/ucp/ftp/ftpdirp.hxx
+++ b/ucb/source/ucp/ftp/ftpdirp.hxx
@@ -124,52 +124,52 @@ namespace ftp {
     class FTPDirectoryParser
     {
     public:
-        static sal_Bool parseDOS (
+        static bool parseDOS (
             FTPDirentry &rEntry,
             const sal_Char  *pBuffer );
 
-        static sal_Bool parseVMS (
+        static bool parseVMS (
             FTPDirentry &rEntry,
             const sal_Char  *pBuffer );
 
-        static sal_Bool parseUNIX (
+        static bool parseUNIX (
             FTPDirentry &rEntry,
             const sal_Char  *pBuffer );
 
 
     private:
 
-        static sal_Bool parseUNIX_isSizeField (
+        static bool parseUNIX_isSizeField (
             const sal_Char *pStart,
             const sal_Char *pEnd,
             sal_uInt32     &rSize);
 
-        static sal_Bool parseUNIX_isMonthField (
+        static bool parseUNIX_isMonthField (
             const sal_Char *pStart,
             const sal_Char *pEnd,
             DateTime& rDateTime);
 
-        static sal_Bool parseUNIX_isDayField (
+        static bool parseUNIX_isDayField (
             const sal_Char *pStart,
             const sal_Char *pEnd,
             DateTime& rDateTime);
 
-        static sal_Bool parseUNIX_isYearTimeField (
+        static bool parseUNIX_isYearTimeField (
             const sal_Char *pStart,
             const sal_Char *pEnd,
             DateTime& rDateTime);
 
-        static sal_Bool parseUNIX_isTime (
+        static bool parseUNIX_isTime (
             const sal_Char *pStart,
             const sal_Char *pEnd,
             sal_uInt16      nHour,
             DateTime& rDateTime);
 
-        static sal_Bool setYear (
+        static bool setYear (
             DateTime& rDateTime,
             sal_uInt16  nYear);
 
-        static sal_Bool setPath (
+        static bool setPath (
             OUString& rPath,
             const sal_Char *value,
             sal_Int32       length = -1);
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx
index 3412eb0a3f44..7e6dc3710afa 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx
@@ -67,16 +67,16 @@ ResultSetI::ResultSetI(const Reference<XComponentContext>&  rxContext,
                 xRow->appendString(seqProp[i],dirvec[n].m_aName);
             else if(Name.equalsAscii("IsReadOnly"))
                 xRow->appendBoolean(seqProp[i],
-                                    sal_Bool(dirvec[n].m_nMode &
-                                             INETCOREFTP_FILEMODE_WRITE));
+                                    (dirvec[n].m_nMode &
+                                             INETCOREFTP_FILEMODE_WRITE) == INETCOREFTP_FILEMODE_WRITE);
             else if(Name.equalsAscii("IsDocument"))
                 xRow->appendBoolean(seqProp[i],
-                                    ! sal_Bool(dirvec[n].m_nMode &
-                                               INETCOREFTP_FILEMODE_ISDIR));
+                                    (dirvec[n].m_nMode &
+                                               INETCOREFTP_FILEMODE_ISDIR) != INETCOREFTP_FILEMODE_ISDIR);
             else if(Name.equalsAscii("IsFolder"))
                 xRow->appendBoolean(seqProp[i],
-                                    sal_Bool(dirvec[n].m_nMode &
-                                             INETCOREFTP_FILEMODE_ISDIR));
+                                    ( dirvec[n].m_nMode &
+                                             INETCOREFTP_FILEMODE_ISDIR) == INETCOREFTP_FILEMODE_ISDIR);
             else if(Name.equalsAscii("Size"))
                 xRow->appendLong(seqProp[i],
                                  dirvec[n].m_nSize);
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index 4b92dbbd2004..d37f99128b76 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -161,7 +161,7 @@ ResultSetBase::next(
     throw( sdbc::SQLException,
            uno::RuntimeException, std::exception )
 {
-    sal_Bool test;
+    bool test;
     if( ++m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
         test = true;
     else
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
index 68e7db9d6e22..258b9d67abce 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
@@ -566,9 +566,9 @@ namespace ftp {
         com::sun::star::uno::Reference<
         com::sun::star::ucb::XContentProvider >  m_xProvider;
         sal_Int32                           m_nRow;
-        sal_Bool                            m_nWasNull;
+        bool                            m_nWasNull;
         sal_Int32                           m_nOpenMode;
-        sal_Bool                            m_bRowCountFinal;
+        bool                            m_bRowCountFinal;
 
         typedef std::vector< com::sun::star::uno::Reference<
         com::sun::star::ucb::XContentIdentifier > > IdentSet;
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 69693d6f1533..6b176a524c47 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -492,8 +492,7 @@ std::vector<FTPDirentry> FTPURL::list(
         if( osKind != int(FTP_UNKNOWN) && aDirEntry.m_aName != ".." && aDirEntry.m_aName != "." ) {
             aDirEntry.m_aURL = viewurl + encodePathSegment(aDirEntry.m_aName);
 
-            sal_Bool isDir =
-                sal_Bool(aDirEntry.m_nMode&INETCOREFTP_FILEMODE_ISDIR);
+            bool isDir = (aDirEntry.m_nMode & INETCOREFTP_FILEMODE_ISDIR) == INETCOREFTP_FILEMODE_ISDIR;
             switch(nMode) {
                 case OpenMode::DOCUMENTS:
                     if(!isDir)
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index c5ee29c26a99..294c1d87293a 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -97,7 +97,7 @@ Content::Content(
     const uno::Reference< uno::XComponentContext >& rxContext,
     ContentProvider* pProvider,
     const uno::Reference< ucb::XContentIdentifier >& Identifier,
-    sal_Bool bIsFolder)
+    bool bIsFolder)
         throw ( ucb::ContentCreationException )
     : ContentImplHelper( rxContext, pProvider, Identifier ),
       m_pProvider( pProvider ), mpFile (NULL), mpInfo( NULL ), mbTransient(true)
@@ -578,17 +578,17 @@ void Content::queryChildren( ContentRefList& rChildren )
     }
 }
 
-sal_Bool Content::exchangeIdentity( const uno::Reference< ucb::XContentIdentifier >& xNewId )
+bool Content::exchangeIdentity( const uno::Reference< ucb::XContentIdentifier >& xNewId )
 {
     if ( !xNewId.is() )
-        return sal_False;
+        return false;
 
     uno::Reference< ucb::XContent > xThis = this;
 
     if ( mbTransient )
     {
         m_xIdentifier = xNewId;
-        return sal_False;
+        return false;
     }
 
     OUString aOldURL = m_xIdentifier->getContentIdentifier();
@@ -617,14 +617,14 @@ sal_Bool Content::exchangeIdentity( const uno::Reference< ucb::XContentIdentifie
                 = new ::ucbhelper::ContentIdentifier( aNewChildURL );
 
             if ( !xChild->exchangeIdentity( xNewChildId ) )
-                return sal_False;
+                return false;
 
             ++it;
          }
-         return sal_True;
+         return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 uno::Sequence< uno::Any > Content::setPropertyValues(
@@ -809,17 +809,17 @@ void Content::copyData( uno::Reference< io::XInputStream > xIn,
     xOut->closeOutput();
 }
 
-sal_Bool Content::feedSink( uno::Reference< uno::XInterface > xSink,
+bool Content::feedSink( uno::Reference< uno::XInterface > xSink,
     const uno::Reference< ucb::XCommandEnvironment >& /*xEnv*/ )
 {
     if ( !xSink.is() )
-        return sal_False;
+        return false;
 
     uno::Reference< io::XOutputStream > xOut = uno::Reference< io::XOutputStream >(xSink, uno::UNO_QUERY );
     uno::Reference< io::XActiveDataSink > xDataSink = uno::Reference< io::XActiveDataSink >(xSink, uno::UNO_QUERY );
 
     if ( !xOut.is() && !xDataSink.is() )
-        return sal_False;
+        return false;
 
     GError *pError=NULL;
     GFileInputStream *pStream = g_file_read(getGFile(), NULL, &pError);
@@ -828,7 +828,7 @@ sal_Bool Content::feedSink( uno::Reference< uno::XInterface > xSink,
 
     uno::Reference< io::XInputStream > xIn = new ::gio::InputStream(pStream);
     if ( !xIn.is() )
-        return sal_False;
+        return false;
 
     if ( xOut.is() )
         copyData( xIn, xOut );
@@ -836,7 +836,7 @@ sal_Bool Content::feedSink( uno::Reference< uno::XInterface > xSink,
     if ( xDataSink.is() )
         xDataSink->setInputStream( xIn );
 
-    return sal_True;
+    return true;
 }
 
 uno::Any Content::open(const ucb::OpenCommandArgument2 & rOpenCommand,
@@ -860,7 +860,7 @@ uno::Any Content::open(const ucb::OpenCommandArgument2 & rOpenCommand,
 
     uno::Any aRet;
 
-    sal_Bool bOpenFolder = (
+    bool bOpenFolder = (
         ( rOpenCommand.Mode == ucb::OpenMode::ALL ) ||
         ( rOpenCommand.Mode == ucb::OpenMode::FOLDERS ) ||
         ( rOpenCommand.Mode == ucb::OpenMode::DOCUMENTS )
@@ -970,7 +970,7 @@ uno::Any SAL_CALL Content::execute(
     }
     else if ( aCommand.Name == "delete" )
     {
-        sal_Bool bDeletePhysical = sal_False;
+        bool bDeletePhysical = false;
         aCommand.Argument >>= bDeletePhysical;
 
         //If no delete physical, try and trashcan it, if that doesn't work go
@@ -1004,7 +1004,7 @@ uno::Any SAL_CALL Content::execute(
     return aRet;
 }
 
-void Content::destroy( sal_Bool bDeletePhysical )
+void Content::destroy( bool bDeletePhysical )
     throw( uno::Exception )
 {
     uno::Reference< ucb::XContent > xThis = this;
@@ -1025,7 +1025,7 @@ void Content::destroy( sal_Bool bDeletePhysical )
 }
 
 void Content::insert(const uno::Reference< io::XInputStream > &xInputStream,
-    sal_Bool bReplaceExisting, const uno::Reference< ucb::XCommandEnvironment > &xEnv )
+    bool bReplaceExisting, const uno::Reference< ucb::XCommandEnvironment > &xEnv )
         throw( uno::Exception )
 {
     GError *pError = NULL;
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index c48a95cca98e..fd40d200a234 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -94,10 +94,10 @@ private:
             throw( com::sun::star::uno::Exception );
 
     void insert( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & xInputStream,
-        sal_Bool bReplaceExisting, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv )
+        bool bReplaceExisting, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv )
             throw( com::sun::star::uno::Exception );
 
-    void destroy( sal_Bool bDeletePhysical ) throw( com::sun::star::uno::Exception );
+    void destroy( bool bDeletePhysical ) throw( com::sun::star::uno::Exception );
 
     void copyData( com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xIn,
         com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOut );
@@ -108,14 +108,14 @@ private:
             const com::sun::star::uno::Reference<
             com::sun::star::ucb::XCommandEnvironment >& xEnv );
 
-    sal_Bool feedSink( com::sun::star::uno::Reference< com::sun::star::uno::XInterface> aSink,
+    bool feedSink( com::sun::star::uno::Reference< com::sun::star::uno::XInterface> aSink,
         const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv );
 
     com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
         createInputStream(const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv )
             throw( com::sun::star::uno::Exception );
 
-    sal_Bool exchangeIdentity(const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >&  xNewId);
+    bool exchangeIdentity(const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >&  xNewId);
 
 public:
     Content( const com::sun::star::uno::Reference<
@@ -126,7 +126,7 @@ public:
     Content( const com::sun::star::uno::Reference<
         com::sun::star::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
         const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier,
-        sal_Bool bIsFolder)
+        bool bIsFolder)
             throw ( com::sun::star::ucb::ContentCreationException );
 
     virtual ~Content();
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 0704bc24180f..001b995a8c2d 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -475,7 +475,7 @@ uno::Any SAL_CALL HierarchyContent::execute(
         //  ( Not available at root folder )
 
 
-        sal_Bool bDeletePhysical = sal_False;
+        bool bDeletePhysical = false;
         aCommand.Argument >>= bDeletePhysical;
         destroy( bDeletePhysical, Environment );
 
@@ -598,7 +598,7 @@ HierarchyContent::createNewContent( const ucb::ContentInfo& Info )
         if ( Info.Type.isEmpty() )
             return uno::Reference< ucb::XContent >();
 
-        sal_Bool bCreateFolder = Info.Type == HIERARCHY_FOLDER_CONTENT_TYPE;
+        bool bCreateFolder = Info.Type == HIERARCHY_FOLDER_CONTENT_TYPE;
 
         if ( !bCreateFolder && Info.Type != HIERARCHY_LINK_CONTENT_TYPE )
             return uno::Reference< ucb::XContent >();
@@ -638,7 +638,7 @@ OUString HierarchyContent::getParentURL()
 
 
 //static
-sal_Bool HierarchyContent::hasData(
+bool HierarchyContent::hasData(
             const uno::Reference< uno::XComponentContext >& rxContext,
             HierarchyContentProvider* pProvider,
             const uno::Reference< ucb::XContentIdentifier >& Identifier )
@@ -651,7 +651,7 @@ sal_Bool HierarchyContent::hasData(
     {
         // hasData must always return 'true' for root folder
         // even if no persistent data exist!!!
-        return sal_True;
+        return true;
     }
 
     return HierarchyEntry( rxContext, pProvider, aURL ).hasData();
@@ -659,7 +659,7 @@ sal_Bool HierarchyContent::hasData(
 
 
 //static
-sal_Bool HierarchyContent::loadData(
+bool HierarchyContent::loadData(
             const uno::Reference< uno::XComponentContext >& rxContext,
             HierarchyContentProvider* pProvider,
             const uno::Reference< ucb::XContentIdentifier >& Identifier,
@@ -678,23 +678,23 @@ sal_Bool HierarchyContent::loadData(
         HierarchyEntry aEntry( rxContext, pProvider, aURL );
         HierarchyEntryData aData;
         if ( !aEntry.getData( aData ) )
-            return sal_False;
+            return false;
 
         rProps = HierarchyContentProperties( aData );
     }
-    return sal_True;
+    return true;
 }
 
 
-sal_Bool HierarchyContent::storeData()
+bool HierarchyContent::storeData()
 {
     HierarchyEntry aEntry(
             m_xContext, m_pProvider, m_xIdentifier->getContentIdentifier() );
-    return aEntry.setData( m_aProps.getHierarchyEntryData(), sal_True );
+    return aEntry.setData( m_aProps.getHierarchyEntryData(), true );
 }
 
 
-sal_Bool HierarchyContent::renameData(
+bool HierarchyContent::renameData(
             const uno::Reference< ucb::XContentIdentifier >& xOldId,
             const uno::Reference< ucb::XContentIdentifier >& xNewId )
 {
@@ -705,7 +705,7 @@ sal_Bool HierarchyContent::renameData(
 }
 
 
-sal_Bool HierarchyContent::removeData()
+bool HierarchyContent::removeData()
 {
     HierarchyEntry aEntry(
         m_xContext, m_pProvider, m_xIdentifier->getContentIdentifier() );
@@ -833,11 +833,11 @@ void HierarchyContent::queryChildren( HierarchyContentRefList& rChildren )
 }
 
 
-sal_Bool HierarchyContent::exchangeIdentity(
+bool HierarchyContent::exchangeIdentity(
             const uno::Reference< ucb::XContentIdentifier >& xNewId )
 {
     if ( !xNewId.is() )
-        return sal_False;
+        return false;
 
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
@@ -847,7 +847,7 @@ sal_Bool HierarchyContent::exchangeIdentity(
     if ( m_eState != PERSISTENT )
     {
         OSL_FAIL( "HierarchyContent::exchangeIdentity - Not persistent!" );
-        return sal_False;
+        return false;
     }
 
     // Am I the root folder?
@@ -855,7 +855,7 @@ sal_Bool HierarchyContent::exchangeIdentity(
     {
         OSL_FAIL( "HierarchyContent::exchangeIdentity - "
                                "Not supported by root folder!" );
-        return sal_False;
+        return false;
     }
 
     // Exchange own identitity.
@@ -896,18 +896,18 @@ sal_Bool HierarchyContent::exchangeIdentity(
                         = new ::ucbhelper::ContentIdentifier( aNewChildURL );
 
                     if ( !xChild->exchangeIdentity( xNewChildId ) )
-                        return sal_False;
+                        return false;
 
                     ++it;
                 }
             }
-            return sal_True;
+            return true;
         }
     }
 
     OSL_FAIL( "HierarchyContent::exchangeIdentity - "
                 "Panic! Cannot exchange identity!" );
-    return sal_False;
+    return false;
 }
 
 
@@ -928,7 +928,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues(
     if ( nCount )
     {
         uno::Reference< beans::XPropertySet > xAdditionalPropSet;
-        sal_Bool bTriedToGetAdditionalPropSet = sal_False;
+        bool bTriedToGetAdditionalPropSet = false;
 
         const beans::Property* pProps = rProperties.getConstArray();
         for ( sal_Int32 n = 0; n < nCount; ++n )
@@ -978,7 +978,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues(
                             pProvider->getAdditionalPropertySet( rContentId,
                                                                  false ),
                             uno::UNO_QUERY );
-                    bTriedToGetAdditionalPropSet = sal_True;
+                    bTriedToGetAdditionalPropSet = true;
                 }
 
                 if ( xAdditionalPropSet.is() )
@@ -1097,9 +1097,9 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
     sal_Int32 nCount = rValues.getLength();
 
     uno::Reference< ucb::XPersistentPropertySet > xAdditionalPropSet;
-    sal_Bool bTriedToGetAdditionalPropSet = sal_False;
+    bool bTriedToGetAdditionalPropSet = false;
 
-    sal_Bool bExchange = sal_False;
+    bool bExchange = false;
     OUString aOldTitle;
     OUString aOldName;
     sal_Int32 nTitlePos = -1;
@@ -1156,7 +1156,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
                         {
                             // modified title -> modified URL -> exchange !
                             if ( m_eState == PERSISTENT )
-                                bExchange = sal_True;
+                                bExchange = true;
 
                             aOldTitle = m_aProps.getTitle();
                             aOldName  = m_aProps.getName();
@@ -1253,7 +1253,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
             if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() )
             {
                 xAdditionalPropSet = getAdditionalPropertySet( false );
-                bTriedToGetAdditionalPropSet = sal_True;
+                bTriedToGetAdditionalPropSet = true;
             }
 
             if ( xAdditionalPropSet.is() )
@@ -1494,7 +1494,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve,
     }
 
     // Identifier changed?
-    sal_Bool bNewId = ( xId->getContentIdentifier()
+    bool bNewId = ( xId->getContentIdentifier()
                             != m_xIdentifier->getContentIdentifier() );
     m_xIdentifier = xId;
 
@@ -1526,7 +1526,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve,
 }
 
 
-void HierarchyContent::destroy( sal_Bool bDeletePhysical,
+void HierarchyContent::destroy( bool bDeletePhysical,
                                 const uno::Reference<
                                     ucb::XCommandEnvironment > & xEnv )
     throw( uno::Exception )
@@ -1723,7 +1723,7 @@ void HierarchyContent::transfer(
 
     if ( nCount )
     {
-        sal_Bool bHadTitle = rInfo.NewTitle.isEmpty();
+        bool bHadTitle = rInfo.NewTitle.isEmpty();
 
         // Get all source values.
         uno::Reference< sdbc::XRow > xRow
@@ -1744,7 +1744,7 @@ void HierarchyContent::transfer(
             if ( !bHadTitle && rProp.Name == "Title" )
             {
                 // Set new title instead of original.
-                bHadTitle = sal_True;
+                bHadTitle = true;
                 rValue.Value <<= rInfo.NewTitle;
             }
             else
@@ -1822,7 +1822,7 @@ void HierarchyContent::transfer(
 
     if ( rInfo.MoveData )
     {
-        xSource->destroy( sal_True, xEnv );
+        xSource->destroy( true, xEnv );
 
         // Remove all persistent data of source and its children.
         if ( !xSource->removeData() )
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index 0219a67f094f..12d60d9c8759 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -85,10 +85,10 @@ public:
 
     const OUString & getContentType() const { return m_aContentType; }
 
-    sal_Bool getIsFolder() const
+    bool getIsFolder() const
     { return m_aData.getType() == HierarchyEntryData::FOLDER; }
 
-    sal_Bool getIsDocument() const { return !getIsFolder(); }
+    bool getIsDocument() const { return !getIsFolder(); }
 
     com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo >
     getCreatableContentsInfo() const;
@@ -145,36 +145,36 @@ private:
                     com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE;
     virtual OUString getParentURL() SAL_OVERRIDE;
 
-    static sal_Bool hasData(
+    static bool hasData(
             const com::sun::star::uno::Reference<
                 com::sun::star::uno::XComponentContext >& rxContext,
             HierarchyContentProvider* pProvider,
             const com::sun::star::uno::Reference<
                 com::sun::star::ucb::XContentIdentifier >& Identifier );
-    sal_Bool hasData(
+    bool hasData(
             const com::sun::star::uno::Reference<
                 com::sun::star::ucb::XContentIdentifier >& Identifier )
     { return hasData( m_xContext, m_pProvider, Identifier ); }
-    static sal_Bool loadData(
+    static bool loadData(
             const com::sun::star::uno::Reference<
                 com::sun::star::uno::XComponentContext >& rxContext,
             HierarchyContentProvider* pProvider,
             const com::sun::star::uno::Reference<
                 com::sun::star::ucb::XContentIdentifier >& Identifier,
             HierarchyContentProperties& rProps );
-    sal_Bool storeData();
-    sal_Bool renameData( const com::sun::star::uno::Reference<
+    bool storeData();
+    bool renameData( const com::sun::star::uno::Reference<
                             com::sun::star::ucb::XContentIdentifier >& xOldId,
                          const com::sun::star::uno::Reference<
                             com::sun::star::ucb::XContentIdentifier >& xNewId );
-    sal_Bool removeData();
+    bool removeData();
 
     void setKind( const com::sun::star::uno::Reference<
                     com::sun::star::ucb::XContentIdentifier >& Identifier );
 
     bool isReadOnly();
 
-    sal_Bool isFolder() const { return ( m_eKind > LINK ); }
+    bool isFolder() const { return ( m_eKind > LINK ); }
 
     ::com::sun::star::uno::Reference<
         ::com::sun::star::ucb::XContentIdentifier >
@@ -184,7 +184,7 @@ private:
     typedef std::list< HierarchyContentRef > HierarchyContentRefList;
     void queryChildren( HierarchyContentRefList& rChildren );
 
-    sal_Bool exchangeIdentity(
+    bool exchangeIdentity(
                 const ::com::sun::star::uno::Reference<
                         ::com::sun::star::ucb::XContentIdentifier >& xNewId );
 
@@ -204,7 +204,7 @@ private:
                     ::com::sun::star::ucb::XCommandEnvironment > & xEnv )
         throw( ::com::sun::star::uno::Exception );
 
-    void destroy( sal_Bool bDeletePhysical,
+    void destroy( bool bDeletePhysical,
                   const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment > & xEnv )
         throw( ::com::sun::star::uno::Exception );
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index 69f50726a6e7..774a45be8131 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
@@ -114,7 +114,7 @@ HierarchyEntry::HierarchyEntry(
                 const OUString& rURL )
 : m_xContext( rxContext ),
   m_xOfficeInstDirs( pProvider->getOfficeInstallationDirectories() ),
-  m_bTriedToGetRootReadAccess( sal_False )
+  m_bTriedToGetRootReadAccess( false )
 {
     HierarchyUri aUri( rURL );
     m_aServiceSpecifier = aUri.getService();
@@ -137,7 +137,7 @@ HierarchyEntry::HierarchyEntry(
 }
 
 
-sal_Bool HierarchyEntry::hasData()
+bool HierarchyEntry::hasData()
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     uno::Reference< container::XHierarchicalNameAccess > xRootReadAccess
@@ -148,11 +148,11 @@ sal_Bool HierarchyEntry::hasData()
     if ( xRootReadAccess.is() )
         return xRootReadAccess->hasByHierarchicalName( m_aPath );
 
-    return sal_False;
+    return false;
 }
 
 
-sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData )
+bool HierarchyEntry::getData( HierarchyEntryData& rData )
 {
     try
     {
@@ -174,7 +174,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData )
             //       title value is sufficient here, because if it is
             //       there, the other values will be available too.
             if ( !xRootReadAccess->hasByHierarchicalName( aTitlePath ) )
-                return sal_False;
+                return false;
 
             OUString aValue;
 
@@ -184,7 +184,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData )
             {
                 OSL_FAIL( "HierarchyEntry::getData - "
                             "Got no Title value!" );
-                return sal_False;
+                return false;
             }
 
             rData.setTitle( aValue );
@@ -197,7 +197,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData )
             {
                 OSL_FAIL( "HierarchyEntry::getData - "
                             "Got no TargetURL value!" );
-                return sal_False;
+                return false;
             }
 
             // TargetURL property may contain a reference to the Office
@@ -234,13 +234,13 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData )
                     {
                         OSL_FAIL( "HierarchyEntry::getData - "
                                     "Unknown Type value!" );
-                        return sal_False;
+                        return false;
                     }
                 }
             }
 
             rData.setName( m_aName );
-            return sal_True;
+            return true;
         }
     }
     catch ( uno::RuntimeException const & )
@@ -253,12 +253,12 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData )
 
         OSL_FAIL( "HierarchyEntry::getData - caught NoSuchElementException!" );
     }
-    return sal_False;
+    return false;
 }
 
 
-sal_Bool HierarchyEntry::setData(
-                    const HierarchyEntryData& rData, sal_Bool bCreate )
+bool HierarchyEntry::setData(
+                    const HierarchyEntryData& rData, bool bCreate )
 {
     try
     {
@@ -274,7 +274,7 @@ sal_Bool HierarchyEntry::setData(
             // Create parent's key. It must exist!
 
             OUString aParentPath;
-            sal_Bool bRoot = sal_True;
+            bool bRoot = true;
 
             sal_Int32 nPos = m_aPath.lastIndexOf( '/' );
             if ( nPos != -1 )
@@ -286,7 +286,7 @@ sal_Bool HierarchyEntry::setData(
                             "HierarchyEntry::setData - Wrong path!" );
 
                 aParentPath += m_aPath.copy( 0, nPos );
-                bRoot = sal_False;
+                bRoot = false;
             }
 
             uno::Sequence< uno::Any > aArguments( 1 );
@@ -315,7 +315,7 @@ sal_Bool HierarchyEntry::setData(
             {
                 // Try to create own key. It must not exist!
 
-                sal_Bool bExists = sal_True;
+                bool bExists = true;
                 uno::Any aMyKey;
 
                 try
@@ -336,11 +336,11 @@ sal_Bool HierarchyEntry::setData(
                     if ( xNameAccess->hasByName( m_aName ) )
                         aMyKey = xNameAccess->getByName( m_aName );
                     else
-                        bExists = sal_False;
+                        bExists = false;
                 }
                 catch ( container::NoSuchElementException const & )
                 {
-                    bExists = sal_False;
+                    bExists = false;
                 }
 
                 uno::Reference< container::XNameReplace >   xNameReplace;
@@ -358,7 +358,7 @@ sal_Bool HierarchyEntry::setData(
                 else
                 {
                     if ( !bCreate )
-                        return sal_True;
+                        return true;
 
                     // Key does not exist. Create / fill / insert it.
 
@@ -440,7 +440,7 @@ sal_Bool HierarchyEntry::setData(
 
                     // Commit changes.
                     xBatch->commitChanges();
-                    return sal_True;
+                    return true;
                 }
             }
         }
@@ -485,11 +485,11 @@ sal_Bool HierarchyEntry::setData(
             "HierarchyEntry::setData - caught Exception!" );
     }
 
-    return sal_False;
+    return false;
 }
 
 
-sal_Bool HierarchyEntry::move(
+bool HierarchyEntry::move(
     const OUString& rNewURL, const HierarchyEntryData& rData )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -497,9 +497,9 @@ sal_Bool HierarchyEntry::move(
     OUString aNewPath = createPathFromHierarchyURL( rNewURL );
 
     if ( aNewPath == m_aPath )
-        return sal_True;
+        return true;
 
-    sal_Bool bOldRoot = sal_True;
+    bool bOldRoot = true;
     uno::Reference< util::XChangesBatch > xOldParentBatch;
 
     OUString aNewKey;
@@ -509,13 +509,13 @@ sal_Bool HierarchyEntry::move(
     else
     {
         OSL_FAIL( "HierarchyEntry::move - Invalid URL!" );
-        return sal_False;
+        return false;
     }
 
-    sal_Bool bNewRoot = sal_True;
+    bool bNewRoot = true;
     uno::Reference< util::XChangesBatch > xNewParentBatch;
 
-    sal_Bool bDifferentParents = sal_True;
+    bool bDifferentParents = true;
 
     try
     {
@@ -525,7 +525,7 @@ sal_Bool HierarchyEntry::move(
                 uno::UNO_QUERY );
 
         if ( !m_xConfigProvider.is() )
-            return sal_False;
+            return false;
 
         OUString aOldParentPath;
         sal_Int32 nPos = m_aPath.lastIndexOf( '/' );
@@ -537,7 +537,7 @@ sal_Bool HierarchyEntry::move(
             OSL_ENSURE( nPos != -1, "HierarchyEntry::move - Wrong path!" );
 
             aOldParentPath += m_aPath.copy( 0, nPos );
-            bOldRoot = sal_False;
+            bOldRoot = false;
         }
 
         OUString aNewParentPath;
@@ -550,7 +550,7 @@ sal_Bool HierarchyEntry::move(
             OSL_ENSURE( nPos != -1, "HierarchyEntry::move - Wrong path!" );
 
             aNewParentPath += aNewPath.copy( 0, nPos );
-            bNewRoot = sal_False;
+            bNewRoot = false;
         }
 
         uno::Sequence< uno::Any > aArguments( 1 );
@@ -569,16 +569,16 @@ sal_Bool HierarchyEntry::move(
         OSL_ENSURE( xOldParentBatch.is(), "HierarchyEntry::move - No batch!" );
 
         if ( !xOldParentBatch.is() )
-            return sal_False;
+            return false;
 
         if ( aOldParentPath == aNewParentPath )
         {
-            bDifferentParents = sal_False;
+            bDifferentParents = false;
             xNewParentBatch = xOldParentBatch;
         }
         else
         {
-            bDifferentParents = sal_True;
+            bDifferentParents = true;
 
             aProperty.Name    = OUString( CFGPROPERTY_NODEPATH  );
             aProperty.Value <<= aNewParentPath;
@@ -594,7 +594,7 @@ sal_Bool HierarchyEntry::move(
                 xNewParentBatch.is(), "HierarchyEntry::move - No batch!" );
 
             if ( !xNewParentBatch.is() )
-                return sal_False;
+                return false;
         }
     }
     catch ( uno::RuntimeException const & )
@@ -606,7 +606,7 @@ sal_Bool HierarchyEntry::move(
         // createInstance, createInstanceWithArguments
 
         OSL_FAIL( "HierarchyEntry::move - caught Exception!" );
-        return sal_False;
+        return false;
     }
 
 
@@ -627,7 +627,7 @@ sal_Bool HierarchyEntry::move(
                     "HierarchyEntry::move - No name access!" );
 
         if ( !xOldParentNameAccess.is() )
-            return sal_False;
+            return false;
 
         if ( bOldRoot )
         {
@@ -648,14 +648,14 @@ sal_Bool HierarchyEntry::move(
         // getByName
 
         OSL_FAIL( "HierarchyEntry::move - caught NoSuchElementException!" );
-        return sal_False;
+        return false;
     }
     catch ( lang::WrappedTargetException const & )
     {
         // getByName
 
         OSL_FAIL( "HierarchyEntry::move - caught WrappedTargetException!" );
-        return sal_False;
+        return false;
     }
 
 
@@ -672,7 +672,7 @@ sal_Bool HierarchyEntry::move(
         // getByName, removeByName
 
         OSL_FAIL( "HierarchyEntry::move - caught NoSuchElementException!" );
-        return sal_False;
+        return false;
     }
 
 
@@ -688,7 +688,7 @@ sal_Bool HierarchyEntry::move(
                     "HierarchyEntry::move - No name replace!" );
 
         if ( !xNewNameReplace.is() )
-            return sal_False;
+            return false;
 
         uno::Reference< container::XNameAccess > xNewParentNameAccess;
         if ( bDifferentParents )
@@ -702,7 +702,7 @@ sal_Bool HierarchyEntry::move(
                     "HierarchyEntry::move - No name access!" );
 
         if ( !xNewParentNameAccess.is() )
-            return sal_False;
+            return false;
 
         uno::Reference< container::XNameContainer > xNewNameContainer;
         if ( bDifferentParents )
@@ -724,7 +724,7 @@ sal_Bool HierarchyEntry::move(
             xNewNameContainer = xOldNameContainer;
 
         if ( !xNewNameContainer.is() )
-            return sal_False;
+            return false;
 
         xNewNameReplace->replaceByName(
             OUString("Title"),
@@ -754,7 +754,7 @@ sal_Bool HierarchyEntry::move(
         // replaceByName, insertByName, getByName
 
         OSL_FAIL( "HierarchyEntry::move - caught NoSuchElementException!" );
-        return sal_False;
+        return false;
     }
     catch ( lang::IllegalArgumentException const & )
     {
@@ -762,28 +762,28 @@ sal_Bool HierarchyEntry::move(
 
         OSL_FAIL(
             "HierarchyEntry::move - caught IllegalArgumentException!" );
-        return sal_False;
+        return false;
     }
     catch ( container::ElementExistException const & )
     {
         // insertByName
 
         OSL_FAIL( "HierarchyEntry::move - caught ElementExistException!" );
-        return sal_False;
+        return false;
     }
     catch ( lang::WrappedTargetException const & )
     {
         // replaceByName, insertByName, getByName
 
         OSL_FAIL( "HierarchyEntry::move - caught WrappedTargetException!" );
-        return sal_False;
+        return false;
     }
 
-    return sal_True;
+    return true;
 }
 
 
-sal_Bool HierarchyEntry::remove()
+bool HierarchyEntry::remove()
 {
     try
     {
@@ -799,7 +799,7 @@ sal_Bool HierarchyEntry::remove()
             // Create parent's key. It must exist!
 
             OUString aParentPath;
-            sal_Bool bRoot = sal_True;
+            bool bRoot = true;
 
             sal_Int32 nPos = m_aPath.lastIndexOf( '/' );
             if ( nPos != -1 )
@@ -811,7 +811,7 @@ sal_Bool HierarchyEntry::remove()
                             "HierarchyEntry::remove - Wrong path!" );
 
                 aParentPath += m_aPath.copy( 0, nPos );
-                bRoot = sal_False;
+                bRoot = false;
             }
 
             uno::Sequence< uno::Any > aArguments( 1 );
@@ -864,7 +864,7 @@ sal_Bool HierarchyEntry::remove()
                 {
                     xContainer->removeByName( m_aName );
                     xBatch->commitChanges();
-                    return sal_True;
+                    return true;
                 }
             }
         }
@@ -894,11 +894,11 @@ sal_Bool HierarchyEntry::remove()
         OSL_FAIL( "HierarchyEntry::remove - caught Exception!" );
     }
 
-    return sal_False;
+    return false;
 }
 
 
-sal_Bool HierarchyEntry::first( iterator& it )
+bool HierarchyEntry::first( iterator& it )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -963,14 +963,14 @@ sal_Bool HierarchyEntry::first( iterator& it )
     }
 
     if ( it.m_pImpl->names.getLength() == 0 )
-        return sal_False;
+        return false;
 
     it.m_pImpl->pos = 0;
-    return sal_True;
+    return true;
 }
 
 
-sal_Bool HierarchyEntry::next( iterator& it )
+bool HierarchyEntry::next( iterator& it )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1061,7 +1061,7 @@ HierarchyEntry::getRootReadAccess()
                     aProperty.Value <<= OUString(); // root path
                     aArguments[ 0 ] <<= aProperty;
 
-                    m_bTriedToGetRootReadAccess = sal_True;
+                    m_bTriedToGetRootReadAccess = true;
 
                     m_xRootReadAccess
                         = uno::Reference< container::XHierarchicalNameAccess >(
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx
index 13e668c08368..ff95aaa05e40 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx
@@ -91,7 +91,7 @@ class HierarchyEntry
     ::com::sun::star::uno::Reference<
             ::com::sun::star::util::XOfficeInstallationDirectories >
                                                            m_xOfficeInstDirs;
-    sal_Bool m_bTriedToGetRootReadAccess;  // #82494#
+    bool m_bTriedToGetRootReadAccess;  // #82494#
 
 private:
     OUString createPathFromHierarchyURL( const HierarchyUri & rURI );
@@ -105,16 +105,16 @@ public:
                     HierarchyContentProvider* pProvider,
                     const OUString& rURL );
 
-    sal_Bool hasData();
+    bool hasData();
 
-    sal_Bool getData( HierarchyEntryData& rData );
+    bool getData( HierarchyEntryData& rData );
 
-    sal_Bool setData( const HierarchyEntryData& rData, sal_Bool bCreate );
+    bool setData( const HierarchyEntryData& rData, bool bCreate );
 
-    sal_Bool move( const OUString& rNewURL,
+    bool move( const OUString& rNewURL,
                    const HierarchyEntryData& rData );
 
-    sal_Bool remove();
+    bool remove();
 
     // Iteration.
 
@@ -133,8 +133,8 @@ public:
         const HierarchyEntryData& operator*() const;
     };
 
-    sal_Bool first( iterator& it );
-    sal_Bool next ( iterator& it );
+    bool first( iterator& it );
+    bool next ( iterator& it );
 };
 
 } // namespace hierarchy_ucp
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
index 7be64d2c41f4..38bd19ac55fb 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
@@ -76,7 +76,7 @@ struct DataSupplier_Impl
     HierarchyEntry                                  m_aFolder;
     HierarchyEntry::iterator                        m_aIterator;
     sal_Int32                                       m_nOpenMode;
-    sal_Bool                                        m_bCountFinal;
+    bool                                        m_bCountFinal;
 
     DataSupplier_Impl(
         const uno::Reference< uno::XComponentContext >& rxContext,
@@ -87,7 +87,7 @@ struct DataSupplier_Impl
                  static_cast< HierarchyContentProvider * >(
                      rContent->getProvider().get() ),
                  rContent->getIdentifier()->getContentIdentifier() ),
-      m_nOpenMode( nOpenMode ), m_bCountFinal( sal_False ) {}
+      m_nOpenMode( nOpenMode ), m_bCountFinal( false ) {}
     ~DataSupplier_Impl();
 };
 
@@ -269,7 +269,7 @@ bool HierarchyResultSetDataSupplier::getResult( sal_uInt32 nIndex )
     }
 
     if ( !bFound )
-        m_pImpl->m_bCountFinal = sal_True;
+        m_pImpl->m_bCountFinal = true;
 
     rtl::Reference< ::ucbhelper::ResultSet > xResultSet = getResultSet().get();
     if ( xResultSet.is() )
@@ -306,7 +306,7 @@ sal_uInt32 HierarchyResultSetDataSupplier::totalCount()
             m_pImpl->m_aResults.push_back( new ResultListEntry( rResult ) );
     }
 
-    m_pImpl->m_bCountFinal = sal_True;
+    m_pImpl->m_bCountFinal = true;
 
     rtl::Reference< ::ucbhelper::ResultSet > xResultSet = getResultSet().get();
     if ( xResultSet.is() )
@@ -400,7 +400,7 @@ void HierarchyResultSetDataSupplier::validate()
 }
 
 
-sal_Bool HierarchyResultSetDataSupplier::checkResult(
+bool HierarchyResultSetDataSupplier::checkResult(
                                     const HierarchyEntryData& rResult )
 {
     switch ( m_pImpl->m_nOpenMode )
@@ -409,7 +409,7 @@ sal_Bool HierarchyResultSetDataSupplier::checkResult(
             if ( rResult.getType() == HierarchyEntryData::LINK )
             {
                 // Entry is a link.
-                return sal_False;
+                return false;
             }
             break;
 
@@ -417,7 +417,7 @@ sal_Bool HierarchyResultSetDataSupplier::checkResult(
             if ( rResult.getType() == HierarchyEntryData::FOLDER )
             {
                 // Entry is a folder.
-                return sal_False;
+                return false;
             }
             break;
 
@@ -426,7 +426,7 @@ sal_Bool HierarchyResultSetDataSupplier::checkResult(
             break;
     }
 
-    return sal_True;
+    return true;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
index 7b6e56694d10..c0383f52a7b6 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
@@ -36,7 +36,7 @@ class HierarchyResultSetDataSupplier :
     DataSupplier_Impl*  m_pImpl;
 
 private:
-    sal_Bool checkResult( const HierarchyEntryData& rResult );
+    bool checkResult( const HierarchyEntryData& rResult );
 
 public:
     HierarchyResultSetDataSupplier(
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.hxx b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
index d5489fb09e66..c1467d8a8cfc 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
@@ -48,7 +48,7 @@ public:
     HierarchyUri( const OUString & rUri )
     : m_aUri( rUri ), m_bValid( false ) {}
 
-    sal_Bool isValid() const
+    bool isValid() const
     { init(); return m_bValid; }
 
     const OUString & getUri() const
@@ -69,10 +69,10 @@ public:
     const OUString & getName() const
     { init(); return m_aName; }
 
-    inline sal_Bool isRootFolder() const;
+    inline bool isRootFolder() const;
 };
 
-inline sal_Bool HierarchyUri::isRootFolder() const
+inline bool HierarchyUri::isRootFolder() const
 {
     init();
     return ( ( m_aPath.getLength() == 1 ) &&
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 06d1dc696fae..2c703b057c0f 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -87,9 +87,9 @@ using namespace package_ucp;
 ContentProperties::ContentProperties( const OUString& rContentType )
 : aContentType( rContentType ),
   nSize( 0 ),
-  bCompressed( sal_True ),
-  bEncrypted( sal_False ),
-  bHasEncryptedEntries( sal_False )
+  bCompressed( true ),
+  bEncrypted( false ),
+  bHasEncryptedEntries( false )
 {
     bIsFolder = rContentType == PACKAGE_FOLDER_CONTENT_TYPE || rContentType == PACKAGE_ZIP_FOLDER_CONTENT_TYPE;
     bIsDocument = !bIsFolder;
@@ -116,14 +116,14 @@ ContentProperties::getCreatableContentsInfo( PackageUri const & rUri ) const
 
         // Folder.
         aSeq.getArray()[ 0 ].Type
-            = Content::getContentType( rUri.getScheme(), sal_True );
+            = Content::getContentType( rUri.getScheme(), true );
         aSeq.getArray()[ 0 ].Attributes
             = ucb::ContentInfoAttribute::KIND_FOLDER;
         aSeq.getArray()[ 0 ].Properties = aProps;
 
         // Stream.
         aSeq.getArray()[ 1 ].Type
-            = Content::getContentType( rUri.getScheme(), sal_False );
+            = Content::getContentType( rUri.getScheme(), false );
         aSeq.getArray()[ 1 ].Attributes
             = ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM
               | ucb::ContentInfoAttribute::KIND_DOCUMENT;
@@ -176,21 +176,21 @@ Content* Content::create(
     {
         // resource doesn't exist
 
-        sal_Bool bFolder = sal_False;
+        bool bFolder = false;
 
         // Guess type according to URI.
         sal_Int32 nLastSlash = aURL.lastIndexOf( '/' );
         if ( ( nLastSlash + 1 ) == aURL.getLength() )
-            bFolder = sal_True;
+            bFolder = true;
 
         uno::Reference< ucb::XContentIdentifier > xId
             = new ::ucbhelper::ContentIdentifier( aURI.getUri() );
 
         ucb::ContentInfo aInfo;
         if ( bFolder || aURI.isRootFolder() )
-            aInfo.Type = getContentType( aURI.getScheme(), sal_True );
+            aInfo.Type = getContentType( aURI.getScheme(), true );
         else
-            aInfo.Type = getContentType( aURI.getScheme(), sal_False );
+            aInfo.Type = getContentType( aURI.getScheme(), false );
 
         return new Content( rxContext, pProvider, xId, xPackage, aURI, aInfo );
     }
@@ -210,9 +210,9 @@ Content* Content::create(
     PackageUri aURI( Identifier->getContentIdentifier() );
 
     if ( !Info.Type.equalsIgnoreAsciiCase(
-                getContentType( aURI.getScheme(), sal_True ) ) &&
+                getContentType( aURI.getScheme(), true ) ) &&
          !Info.Type.equalsIgnoreAsciiCase(
-                getContentType( aURI.getScheme(), sal_False ) ) )
+                getContentType( aURI.getScheme(), false ) ) )
         return 0;
 
     uno::Reference< container::XHierarchicalNameAccess > xPackage;
@@ -227,7 +227,7 @@ Content* Content::create(
 
 // static
 OUString Content::getContentType(
-    const OUString& aScheme, sal_Bool bFolder )
+    const OUString& aScheme, bool bFolder )
 {
     return ( OUString("application/")
              + aScheme
@@ -572,7 +572,7 @@ uno::Any SAL_CALL Content::execute(
         // delete
 
 
-        sal_Bool bDeletePhysical = sal_False;
+        bool bDeletePhysical = false;
         aCommand.Argument >>= bDeletePhysical;
         destroy( bDeletePhysical, Environment );
 
@@ -722,16 +722,16 @@ Content::createNewContent( const ucb::ContentInfo& Info )
             return uno::Reference< ucb::XContent >();
 
         if ( !Info.Type.equalsIgnoreAsciiCase(
-                getContentType( m_aUri.getScheme(), sal_True ) ) &&
+                getContentType( m_aUri.getScheme(), true ) ) &&
              !Info.Type.equalsIgnoreAsciiCase(
-                getContentType( m_aUri.getScheme(), sal_False ) ) )
+                getContentType( m_aUri.getScheme(), false ) ) )
             return uno::Reference< ucb::XContent >();
 
         OUString aURL = m_aUri.getUri();
         aURL += "/";
 
         if ( Info.Type.equalsIgnoreAsciiCase(
-                getContentType( m_aUri.getScheme(), sal_True ) ) )
+                getContentType( m_aUri.getScheme(), true ) ) )
             aURL += "New_Folder";
         else
             aURL += "New_Stream";
@@ -816,7 +816,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
     if ( nCount )
     {
         uno::Reference< beans::XPropertySet > xAdditionalPropSet;
-        sal_Bool bTriedToGetAdditionalPropSet = sal_False;
+        bool bTriedToGetAdditionalPropSet = false;
 
         const beans::Property* pProps = rProperties.getConstArray();
         for ( sal_Int32 n = 0; n < nCount; ++n )
@@ -896,7 +896,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                             rProvider->getAdditionalPropertySet( rContentId,
                                                                  false ),
                             uno::UNO_QUERY );
-                    bTriedToGetAdditionalPropSet = sal_True;
+                    bTriedToGetAdditionalPropSet = true;
                 }
 
                 if ( xAdditionalPropSet.is() )
@@ -1061,9 +1061,9 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
     sal_Int32 nCount = rValues.getLength();
 
     uno::Reference< ucb::XPersistentPropertySet > xAdditionalPropSet;
-    sal_Bool bTriedToGetAdditionalPropSet = sal_False;
-    sal_Bool bExchange = sal_False;
-    sal_Bool bStore    = sal_False;
+    bool bTriedToGetAdditionalPropSet = false;
+    bool bExchange = false;
+    bool bStore    = false;
     OUString aNewTitle;
     sal_Int32 nTitlePos = -1;
 
@@ -1125,7 +1125,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                         {
                             // modified title -> modified URL -> exchange !
                             if ( m_eState == PERSISTENT )
-                                bExchange = sal_True;
+                                bExchange = true;
 
                             // new value will be set later...
                             aNewTitle = aNewValue;
@@ -1168,7 +1168,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
                     m_aProps.aMediaType = aNewValue;
                     nChanged++;
-                    bStore = sal_True;
+                    bStore = true;
                     m_nModifiedProps |= MEDIATYPE_MODIFIED;
                 }
             }
@@ -1193,7 +1193,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             // Property only available for streams.
             if ( m_aProps.bIsDocument )
             {
-                sal_Bool bNewValue;
+                bool bNewValue;
                 if ( rValue.Value >>= bNewValue )
                 {
                     if ( bNewValue != m_aProps.bCompressed )
@@ -1204,7 +1204,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
                         m_aProps.bCompressed = bNewValue;
                         nChanged++;
-                        bStore = sal_True;
+                        bStore = true;
                         m_nModifiedProps |= COMPRESSED_MODIFIED;
                     }
                 }
@@ -1229,7 +1229,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             // Property only available for streams.
             if ( m_aProps.bIsDocument )
             {
-                sal_Bool bNewValue;
+                bool bNewValue;
                 if ( rValue.Value >>= bNewValue )
                 {
                     if ( bNewValue != m_aProps.bEncrypted )
@@ -1240,7 +1240,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
                         m_aProps.bEncrypted = bNewValue;
                         nChanged++;
-                        bStore = sal_True;
+                        bStore = true;
                         m_nModifiedProps |= ENCRYPTED_MODIFIED;
                     }
                 }
@@ -1289,7 +1289,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
                         m_aProps.aEncryptionKey = aNewValue;
                         nChanged++;
-                        bStore = sal_True;
+                        bStore = true;
                         m_nModifiedProps |= ENCRYPTIONKEY_MODIFIED;
                     }
                 }
@@ -1316,7 +1316,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() )
             {
                 xAdditionalPropSet = getAdditionalPropertySet( false );
-                bTriedToGetAdditionalPropSet = sal_True;
+                bTriedToGetAdditionalPropSet = true;
             }
 
             if ( xAdditionalPropSet.is() )
@@ -1713,7 +1713,7 @@ void Content::insert(
     }
 
     // Identifier changed?
-    sal_Bool bNewId = ( m_aUri.getUri() != aNewUri.getUri() );
+    bool bNewId = ( m_aUri.getUri() != aNewUri.getUri() );
 
     if ( bNewId )
     {
@@ -1757,7 +1757,7 @@ void Content::insert(
 
 
 void Content::destroy(
-                sal_Bool bDeletePhysical,
+                bool bDeletePhysical,
                 const uno::Reference< ucb::XCommandEnvironment >& xEnv )
     throw( uno::Exception )
 {
@@ -1901,8 +1901,8 @@ void Content::transfer(
 
 
     OUString aType = xSource->isFolder()
-            ? getContentType( m_aUri.getScheme(), sal_True )
-            : getContentType( m_aUri.getScheme(), sal_False );
+            ? getContentType( m_aUri.getScheme(), true )
+            : getContentType( m_aUri.getScheme(), false );
     ucb::ContentInfo aContentInfo;
     aContentInfo.Type = aType;
     aContentInfo.Attributes = 0;
@@ -1938,7 +1938,7 @@ void Content::transfer(
 
     if ( nCount )
     {
-        sal_Bool bHadTitle = rInfo.NewTitle.isEmpty();
+        bool bHadTitle = rInfo.NewTitle.isEmpty();
 
         // Get all source values.
         uno::Reference< sdbc::XRow > xRow
@@ -1959,7 +1959,7 @@ void Content::transfer(
             if ( !bHadTitle && rProp.Name == "Title" )
             {
                 // Set new title instead of original.
-                bHadTitle = sal_True;
+                bHadTitle = true;
                 rValue.Value <<= rInfo.NewTitle;
             }
             else
@@ -2064,7 +2064,7 @@ void Content::transfer(
 
     if ( rInfo.MoveData )
     {
-        xSource->destroy( sal_True, xEnv );
+        xSource->destroy( true, xEnv );
 
         // Remove all persistent data of source and its children.
         if ( !xSource->removeData() )
@@ -2093,11 +2093,11 @@ void Content::transfer(
 }
 
 
-sal_Bool Content::exchangeIdentity(
+bool Content::exchangeIdentity(
             const uno::Reference< ucb::XContentIdentifier >& xNewId )
 {
     if ( !xNewId.is() )
-        return sal_False;
+        return false;
 
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
@@ -2107,7 +2107,7 @@ sal_Bool Content::exchangeIdentity(
     if ( m_eState != PERSISTENT )
     {
         OSL_FAIL( "Content::exchangeIdentity - Not persistent!" );
-        return sal_False;
+        return false;
     }
 
     // Exchange own identitity.
@@ -2150,17 +2150,17 @@ sal_Bool Content::exchangeIdentity(
                         = new ::ucbhelper::ContentIdentifier( aNewChildURL );
 
                     if ( !xChild->exchangeIdentity( xNewChildId ) )
-                        return sal_False;
+                        return false;
 
                     ++it;
                 }
             }
-            return sal_True;
+            return true;
         }
     }
 
     OSL_FAIL( "Content::exchangeIdentity - Panic! Cannot exchange identity!" );
-    return sal_False;
+    return false;
 }
 
 
@@ -2233,7 +2233,7 @@ uno::Reference< container::XHierarchicalNameAccess > Content::getPackage()
 
 
 // static
-sal_Bool Content::hasData(
+bool Content::hasData(
             ContentProvider* pProvider,
             const PackageUri& rURI,
             uno::Reference< container::XHierarchicalNameAccess > & rxPackage )
@@ -2243,7 +2243,7 @@ sal_Bool Content::hasData(
 }
 
 
-sal_Bool Content::hasData( const PackageUri& rURI )
+bool Content::hasData( const PackageUri& rURI )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -2259,7 +2259,7 @@ sal_Bool Content::hasData( const PackageUri& rURI )
 
 
 //static
-sal_Bool Content::loadData(
+bool Content::loadData(
             ContentProvider* pProvider,
             const PackageUri& rURI,
             ContentProperties& rProps,
@@ -2289,26 +2289,26 @@ sal_Bool Content::loadData(
                 {
                     OSL_FAIL( "Content::loadData - "
                                 "Got no HasEncryptedEntries value!" );
-                    return sal_False;
+                    return false;
                 }
             }
             catch ( beans::UnknownPropertyException const & )
             {
                 OSL_FAIL( "Content::loadData - "
                             "Got no HasEncryptedEntries value!" );
-                return sal_False;
+                return false;
             }
             catch ( lang::WrappedTargetException const & )
             {
                 OSL_FAIL( "Content::loadData - "
                             "Got no HasEncryptedEntries value!" );
-                return sal_False;
+                return false;
             }
         }
     }
 
     if ( !rxPackage->hasByHierarchicalName( rURI.getPath() ) )
-        return sal_False;
+        return false;
 
     try
     {
@@ -2321,7 +2321,7 @@ sal_Bool Content::loadData(
             if ( !xPropSet.is() )
             {
                 OSL_FAIL( "Content::loadData - Got no XPropertySet interface!" );
-                return sal_False;
+                return false;
             }
 
             // Title
@@ -2336,18 +2336,18 @@ sal_Bool Content::loadData(
                 if ( !( aMediaType >>= rProps.aMediaType ) )
                 {
                     OSL_FAIL( "Content::loadData - Got no MediaType value!" );
-                    return sal_False;
+                    return false;
                 }
             }
             catch ( beans::UnknownPropertyException const & )
             {
                 OSL_FAIL( "Content::loadData - Got no MediaType value!" );
-                return sal_False;
+                return false;
             }
             catch ( lang::WrappedTargetException const & )
             {
                 OSL_FAIL( "Content::loadData - Got no MediaType value!" );
-                return sal_False;
+                return false;
             }
 
             uno::Reference< container::XEnumerationAccess > xEnumAccess;
@@ -2357,16 +2357,16 @@ sal_Bool Content::loadData(
             if ( xEnumAccess.is() )
             {
                 // folder
-                rProps.aContentType = getContentType( rURI.getScheme(), sal_True );
-                rProps.bIsDocument = sal_False;
-                rProps.bIsFolder = sal_True;
+                rProps.aContentType = getContentType( rURI.getScheme(), true );
+                rProps.bIsDocument = false;
+                rProps.bIsFolder = true;
             }
             else
             {
                 // stream
-                rProps.aContentType = getContentType( rURI.getScheme(), sal_False );
-                rProps.bIsDocument = sal_True;
-                rProps.bIsFolder = sal_False;
+                rProps.aContentType = getContentType( rURI.getScheme(), false );
+                rProps.bIsDocument = true;
+                rProps.bIsFolder = false;
             }
 
             if ( rProps.bIsDocument )
@@ -2380,18 +2380,18 @@ sal_Bool Content::loadData(
                     if ( !( aSize >>= rProps.nSize ) )
                     {
                         OSL_FAIL( "Content::loadData - Got no Size value!" );
-                        return sal_False;
+                        return false;
                     }
                 }
                 catch ( beans::UnknownPropertyException const & )
                 {
                     OSL_FAIL( "Content::loadData - Got no Size value!" );
-                    return sal_False;
+                    return false;
                 }
                 catch ( lang::WrappedTargetException const & )
                 {
                     OSL_FAIL( "Content::loadData - Got no Size value!" );
-                    return sal_False;
+                    return false;
                 }
 
                 // Compressed ( only available for streams )
@@ -2403,18 +2403,18 @@ sal_Bool Content::loadData(
                     if ( !( aCompressed >>= rProps.bCompressed ) )
                     {
                         OSL_FAIL( "Content::loadData - Got no Compressed value!" );
-                        return sal_False;
+                        return false;
                     }
                 }
                 catch ( beans::UnknownPropertyException const & )
                 {
                     OSL_FAIL( "Content::loadData - Got no Compressed value!" );
-                    return sal_False;
+                    return false;
                 }
                 catch ( lang::WrappedTargetException const & )
                 {
                     OSL_FAIL( "Content::loadData - Got no Compressed value!" );
-                    return sal_False;
+                    return false;
                 }
 
                 // Encrypted ( only available for streams )
@@ -2426,21 +2426,21 @@ sal_Bool Content::loadData(
                     if ( !( aEncrypted >>= rProps.bEncrypted ) )
                     {
                         OSL_FAIL( "Content::loadData - Got no Encrypted value!" );
-                        return sal_False;
+                        return false;
                     }
                 }
                 catch ( beans::UnknownPropertyException const & )
                 {
                     OSL_FAIL( "Content::loadData - Got no Encrypted value!" );
-                    return sal_False;
+                    return false;
                 }
                 catch ( lang::WrappedTargetException const & )
                 {
                     OSL_FAIL( "Content::loadData - Got no Encrypted value!" );
-                    return sal_False;
+                    return false;
                 }
             }
-            return sal_True;
+            return true;
         }
     }
     catch ( container::NoSuchElementException const & )
@@ -2448,11 +2448,11 @@ sal_Bool Content::loadData(
         // getByHierarchicalName
     }
 
-    return sal_False;
+    return false;
 }
 
 
-sal_Bool Content::renameData(
+bool Content::renameData(
             const uno::Reference< ucb::XContentIdentifier >& xOldId,
             const uno::Reference< ucb::XContentIdentifier >& xNewId )
 {
@@ -2463,7 +2463,7 @@ sal_Bool Content::renameData(
                                                                         aURI );
 
     if ( !xNA->hasByHierarchicalName( aURI.getPath() ) )
-        return sal_False;
+        return false;
 
     try
     {
@@ -2474,7 +2474,7 @@ sal_Bool Content::renameData(
         if ( !xNamed.is() )
         {
             OSL_FAIL( "Content::renameData - Got no XNamed interface!" );
-            return sal_False;
+            return false;
         }
 
         PackageUri aNewURI( xNewId->getContentIdentifier() );
@@ -2482,18 +2482,18 @@ sal_Bool Content::renameData(
         // No success indicator!? No return value / exceptions specified.
         xNamed->setName( aNewURI.getName() );
 
-        return sal_True;
+        return true;
     }
     catch ( container::NoSuchElementException const & )
     {
         // getByHierarchicalName
     }
 
-    return sal_False;
+    return false;
 }
 
 
-sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
+bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -2506,7 +2506,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
                 "Got no XPropertySet interface from package!" );
 
     if ( !xPackagePropSet.is() )
-        return sal_False;
+        return false;
 
     if ( m_nModifiedProps & ENCRYPTIONKEY_MODIFIED )
     {
@@ -2553,7 +2553,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
             {
                 OSL_FAIL( "Content::storeData - "
                             "Got no XSingleServiceFactory interface!" );
-                return sal_False;
+                return false;
             }
 
             uno::Sequence< uno::Any > aArgs( 1 );
@@ -2565,7 +2565,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
             if ( !xNew.is() )
             {
                 OSL_FAIL( "Content::storeData - createInstance failed!" );
-                return sal_False;
+                return false;
             }
 
             PackageUri aParentUri( getParentURL() );
@@ -2578,7 +2578,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
             {
                 OSL_FAIL( "Content::storeData - "
                             "Got no XNameContainer interface!" );
-                return sal_False;
+                return false;
             }
 
             xParentContainer->insertByName( m_aProps.aTitle,
@@ -2588,7 +2588,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
         {
             // insertByName
             OSL_FAIL( "Content::storeData - insertByName failed!" );
-            return sal_False;
+            return false;
         }
         catch ( uno::RuntimeException const & )
         {
@@ -2598,30 +2598,30 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
         {
             // insertByName
             OSL_FAIL( "Content::storeData - insertByName failed!" );
-            return sal_False;
+            return false;
         }
         catch ( lang::WrappedTargetException const & )
         {
             // insertByName
             OSL_FAIL( "Content::storeData - insertByName failed!" );
-            return sal_False;
+            return false;
         }
         catch ( container::NoSuchElementException const & )
         {
             // getByHierarchicalName
             OSL_FAIL( "Content::storeData - getByHierarchicalName failed!" );
-            return sal_False;
+            return false;
         }
         catch ( uno::Exception const & )
         {
             // createInstanceWithArguments
             OSL_FAIL( "Content::storeData - Error!" );
-            return sal_False;
+            return false;
         }
     }
 
     if ( !xNA->hasByHierarchicalName( m_aUri.getPath() ) )
-        return sal_False;
+        return false;
 
     try
     {
@@ -2631,7 +2631,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
         if ( !xPropSet.is() )
         {
             OSL_FAIL( "Content::storeData - Got no XPropertySet interface!" );
-            return sal_False;
+            return false;
         }
 
 
@@ -2689,13 +2689,13 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
             {
                 OSL_FAIL( "Content::storeData - "
                             "Got no XActiveDataSink interface!" );
-                return sal_False;
+                return false;
             }
 
             xSink->setInputStream( xStream );
         }
 
-        return sal_True;
+        return true;
     }
     catch ( container::NoSuchElementException const & )
     {
@@ -2719,11 +2719,11 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
     }
 
     OSL_FAIL( "Content::storeData - Error!" );
-    return sal_False;
+    return false;
 }
 
 
-sal_Bool Content::removeData()
+bool Content::removeData()
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -2731,7 +2731,7 @@ sal_Bool Content::removeData()
 
     PackageUri aParentUri( getParentURL() );
     if ( !xNA->hasByHierarchicalName( aParentUri.getPath() ) )
-        return sal_False;
+        return false;
 
     try
     {
@@ -2743,11 +2743,11 @@ sal_Bool Content::removeData()
         {
             OSL_FAIL( "Content::removeData - "
                         "Got no XNameContainer interface!" );
-            return sal_False;
+            return false;
         }
 
         xContainer->removeByName( m_aUri.getName() );
-        return sal_True;
+        return true;
     }
     catch ( container::NoSuchElementException const & )
     {
@@ -2759,11 +2759,11 @@ sal_Bool Content::removeData()
     }
 
     OSL_FAIL( "Content::removeData - Error!" );
-    return sal_False;
+    return false;
 }
 
 
-sal_Bool Content::flushData()
+bool Content::flushData()
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -2776,20 +2776,20 @@ sal_Bool Content::flushData()
     if ( !xBatch.is() )
     {
         OSL_FAIL( "Content::flushData - Got no XChangesBatch interface!" );
-        return sal_False;
+        return false;
     }
 
     try
     {
         xBatch->commitChanges();
-        return sal_True;
+        return true;
     }
     catch ( lang::WrappedTargetException const & )
     {
     }
 
     OSL_FAIL( "Content::flushData - Error!" );
-    return sal_False;
+    return false;
 }
 
 
diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx
index 4c70bf55eb2a..9e03fdbc409b 100644
--- a/ucb/source/ucp/package/pkgcontent.hxx
+++ b/ucb/source/ucp/package/pkgcontent.hxx
@@ -71,20 +71,20 @@ struct ContentProperties
 {
     OUString  aTitle;                // Title
     OUString  aContentType;          // ContentType
-    sal_Bool         bIsDocument;           // IsDocument
-    sal_Bool         bIsFolder;             // IsFolder
+    bool         bIsDocument;           // IsDocument
+    bool         bIsFolder;             // IsFolder
     OUString  aMediaType;            // MediaType
     com::sun::star::uno::Sequence <
         sal_Int8 >   aEncryptionKey;        // EncryptionKey
     sal_Int64        nSize;                 // Size
-    sal_Bool         bCompressed;           // Compressed
-    sal_Bool         bEncrypted;            // Encrypted
-    sal_Bool         bHasEncryptedEntries;  // HasEncryptedEntries
+    bool         bCompressed;           // Compressed
+    bool         bEncrypted;            // Encrypted
+    bool         bHasEncryptedEntries;  // HasEncryptedEntries
 
     ContentProperties()
-    : bIsDocument( sal_True ), bIsFolder( sal_False ), nSize( 0 ),
-      bCompressed( sal_True ), bEncrypted( sal_False ),
-      bHasEncryptedEntries( sal_False ) {}
+    : bIsDocument( true ), bIsFolder( false ), nSize( 0 ),
+      bCompressed( true ), bEncrypted( false ),
+      bHasEncryptedEntries( false ) {}
 
     ContentProperties( const OUString& rContentType );
 
@@ -168,41 +168,41 @@ private:
         com::sun::star::container::XHierarchicalNameAccess >
     getPackage();
 
-    static sal_Bool
+    static bool
     loadData( ContentProvider* pProvider,
               const PackageUri& rURI,
               ContentProperties& rProps,
               com::sun::star::uno::Reference<
                 com::sun::star::container::XHierarchicalNameAccess > &
                     rxPackage );
-    static sal_Bool
+    static bool
     hasData( ContentProvider* pProvider,
              const PackageUri& rURI,
              com::sun::star::uno::Reference<
                 com::sun::star::container::XHierarchicalNameAccess > &
                     rxPackage );
 
-    sal_Bool
+    bool
     hasData( const PackageUri& rURI );
-    sal_Bool
+    bool
     renameData( const com::sun::star::uno::Reference<
                     com::sun::star::ucb::XContentIdentifier >& xOldId,
                 const com::sun::star::uno::Reference<
                     com::sun::star::ucb::XContentIdentifier >& xNewId );
-    sal_Bool
+    bool
     storeData( const com::sun::star::uno::Reference<
                     com::sun::star::io::XInputStream >& xStream );
-    sal_Bool
+    bool
     removeData();
 
-    sal_Bool
+    bool
     flushData();
 
     typedef rtl::Reference< Content > ContentRef;
     typedef std::list< ContentRef > ContentRefList;
     void queryChildren( ContentRefList& rChildren );
 
-    sal_Bool
+    bool
     exchangeIdentity( const ::com::sun::star::uno::Reference<
                         ::com::sun::star::ucb::XContentIdentifier >& xNewId );
 
@@ -219,7 +219,7 @@ private:
                     ::com::sun::star::ucb::XCommandEnvironment > & xEnv )
         throw( ::com::sun::star::uno::Exception );
 
-    void destroy( sal_Bool bDeletePhysical,
+    void destroy( bool bDeletePhysical,
                   const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment > & xEnv )
         throw( ::com::sun::star::uno::Exception );
@@ -232,7 +232,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
     getInputStream();
 
-    sal_Bool isFolder() const { return m_aProps.bIsFolder; }
+    bool isFolder() const { return m_aProps.bIsFolder; }
 
 public:
     // Create existing content. Fail, if not already exists.
@@ -327,7 +327,7 @@ public:
     getIterator();
 
     static OUString
-    getContentType( const OUString& aScheme,  sal_Bool bFolder );
+    getContentType( const OUString& aScheme,  bool bFolder );
 };
 
 }
diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx
index ef87c6a19369..9bb4509e91c9 100644
--- a/ucb/source/ucp/package/pkgdatasupplier.cxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.cxx
@@ -80,8 +80,8 @@ struct DataSupplier_Impl
     uno::Reference< uno::XComponentContext >     m_xContext;
     uno::Reference< container::XEnumeration >    m_xFolderEnum;
     sal_Int32                                    m_nOpenMode;
-    sal_Bool                                     m_bCountFinal;
-    sal_Bool                                     m_bThrowException;
+    bool                                     m_bCountFinal;
+    bool                                     m_bThrowException;
 
     DataSupplier_Impl(
             const uno::Reference< uno::XComponentContext >& rxContext,
@@ -282,18 +282,18 @@ bool DataSupplier::getResult( sal_uInt32 nIndex )
         }
         catch ( container::NoSuchElementException const & )
         {
-            m_pImpl->m_bThrowException = sal_True;
+            m_pImpl->m_bThrowException = true;
             break;
         }
         catch ( lang::WrappedTargetException const & )
         {
-            m_pImpl->m_bThrowException = sal_True;
+            m_pImpl->m_bThrowException = true;
             break;
         }
     }
 
     if ( !bFound )
-        m_pImpl->m_bCountFinal = sal_True;
+        m_pImpl->m_bCountFinal = true;
 
     rtl::Reference< ::ucbhelper::ResultSet > xResultSet = getResultSet().get();
     if ( xResultSet.is() )
@@ -351,17 +351,17 @@ sal_uInt32 DataSupplier::totalCount()
         }
         catch ( container::NoSuchElementException const & )
         {
-            m_pImpl->m_bThrowException = sal_True;
+            m_pImpl->m_bThrowException = true;
             break;
         }
         catch ( lang::WrappedTargetException const & )
         {
-            m_pImpl->m_bThrowException = sal_True;
+            m_pImpl->m_bThrowException = true;
             break;
         }
     }
 
-    m_pImpl->m_bCountFinal = sal_True;
+    m_pImpl->m_bCountFinal = true;
 
     rtl::Reference< ::ucbhelper::ResultSet > xResultSet = getResultSet().get();
     if ( xResultSet.is() )
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index 04103c8f7f49..42ee7e789be6 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -290,7 +290,7 @@ ContentProvider::createPackage( const PackageUri & rURI )
 }
 
 
-sal_Bool ContentProvider::removePackage( const OUString & rName )
+bool ContentProvider::removePackage( const OUString & rName )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -300,10 +300,10 @@ sal_Bool ContentProvider::removePackage( const OUString & rName )
         if ( it != m_pPackages->end() )
         {
             m_pPackages->erase( it );
-            return sal_True;
+            return true;
         }
     }
-    return sal_False;
+    return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx
index bbe5431c4a6d..14213abc3d66 100644
--- a/ucb/source/ucp/package/pkgprovider.hxx
+++ b/ucb/source/ucp/package/pkgprovider.hxx
@@ -108,7 +108,7 @@ public:
     ::com::sun::star::uno::Reference<
         ::com::sun::star::container::XHierarchicalNameAccess >
     createPackage( const PackageUri & rParam );
-    sal_Bool
+    bool
     removePackage( const OUString & rName );
 };
 
diff --git a/ucb/source/ucp/package/pkguri.hxx b/ucb/source/ucp/package/pkguri.hxx
index f33b566c78f6..6711fe3f6668 100644
--- a/ucb/source/ucp/package/pkguri.hxx
+++ b/ucb/source/ucp/package/pkguri.hxx
@@ -51,7 +51,7 @@ public:
     PackageUri( const OUString & rPackageUri )
     : m_aUri( rPackageUri ), m_bValid( false ) {}
 
-    sal_Bool isValid() const
+    bool isValid() const
     { init(); return m_bValid; }
 
     const OUString & getUri() const
@@ -78,10 +78,10 @@ public:
     const OUString & getScheme() const
     { init(); return m_aScheme; }
 
-    inline sal_Bool isRootFolder() const;
+    inline bool isRootFolder() const;
 };
 
-inline sal_Bool PackageUri::isRootFolder() const
+inline bool PackageUri::isRootFolder() const
 {
     init();
     return ( ( m_aPath.getLength() == 1 ) &&
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 928601ded7a3..683f0cf175a1 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -539,7 +539,7 @@ uno::Any SAL_CALL Content::execute(
             }
         }
 
-        sal_Bool bDeletePhysical = sal_False;
+        bool bDeletePhysical = false;
         aCommand.Argument >>= bDeletePhysical;
         destroy( bDeletePhysical, Environment );
 
@@ -694,7 +694,7 @@ Content::createNewContent( const ucb::ContentInfo& Info )
         if ( Info.Type.isEmpty() )
             return uno::Reference< ucb::XContent >();
 
-        sal_Bool bCreateFolder = Info.Type == TDOC_FOLDER_CONTENT_TYPE;
+        bool bCreateFolder = Info.Type == TDOC_FOLDER_CONTENT_TYPE;
 
 #ifdef NO_STREAM_CREATION_WITHIN_DOCUMENT_ROOT
         // streams cannot be created as direct children of document root
@@ -818,11 +818,11 @@ void Content::queryChildren( ContentRefList& rChildren )
 }
 
 
-sal_Bool Content::exchangeIdentity(
+bool Content::exchangeIdentity(
             const uno::Reference< ucb::XContentIdentifier >& xNewId )
 {
     if ( !xNewId.is() )
-        return sal_False;
+        return false;
 
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
@@ -832,7 +832,7 @@ sal_Bool Content::exchangeIdentity(
     if ( m_eState != PERSISTENT )
     {
         OSL_FAIL( "Content::exchangeIdentity - Not persistent!" );
-        return sal_False;
+        return false;
     }
 
     // Only folders and streams can be renamed -> exchange identity.
@@ -841,7 +841,7 @@ sal_Bool Content::exchangeIdentity(
     {
         OSL_FAIL( "Content::exchangeIdentity - "
                                "Not supported by root or document!" );
-        return sal_False;
+        return false;
     }
 
     // Exchange own identitity.
@@ -882,18 +882,18 @@ sal_Bool Content::exchangeIdentity(
                         = new ::ucbhelper::ContentIdentifier( aNewChildURL );
 
                     if ( !xChild->exchangeIdentity( xNewChildId ) )
-                        return sal_False;
+                        return false;
 
                     ++it;
                 }
             }
-            return sal_True;
+            return true;
         }
     }
 
     OSL_FAIL( "Content::exchangeIdentity - "
                 "Panic! Cannot exchange identity!" );
-    return sal_False;
+    return false;
 }
 
 
@@ -945,7 +945,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
     if ( nCount )
     {
         uno::Reference< beans::XPropertySet > xAdditionalPropSet;
-        sal_Bool bTriedToGetAdditionalPropSet = sal_False;
+        bool bTriedToGetAdditionalPropSet = false;
 
         const beans::Property* pProps = rProperties.getConstArray();
         for ( sal_Int32 n = 0; n < nCount; ++n )
@@ -1010,7 +1010,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                             pProvider->getAdditionalPropertySet( rContentId,
                                                                  false ),
                             uno::UNO_QUERY );
-                    bTriedToGetAdditionalPropSet = sal_True;
+                    bTriedToGetAdditionalPropSet = true;
                 }
 
                 if ( xAdditionalPropSet.is() )
@@ -1150,9 +1150,9 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
     sal_Int32 nCount = rValues.getLength();
 
     uno::Reference< ucb::XPersistentPropertySet > xAdditionalPropSet;
-    sal_Bool bTriedToGetAdditionalPropSet = sal_False;
+    bool bTriedToGetAdditionalPropSet = false;
 
-    sal_Bool bExchange = sal_False;
+    bool bExchange = false;
     OUString aOldTitle;
     sal_Int32 nTitlePos = -1;
 
@@ -1210,7 +1210,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                         {
                             // modified title -> modified URL -> exchange !
                             if ( m_eState == PERSISTENT )
-                                bExchange = sal_True;
+                                bExchange = true;
 
                             aOldTitle = m_aProps.getTitle();
                             m_aProps.setTitle( aNewValue );
@@ -1280,7 +1280,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() )
             {
                 xAdditionalPropSet = getAdditionalPropertySet( false );
-                bTriedToGetAdditionalPropSet = sal_True;
+                bTriedToGetAdditionalPropSet = true;
             }
 
             if ( xAdditionalPropSet.is() )
@@ -1722,7 +1722,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData,
     }
 
     // Identifier changed?
-    sal_Bool bNewId = ( aUri != aNewUri );
+    bool bNewId = ( aUri != aNewUri );
 
     if ( bNewId )
     {
@@ -1760,7 +1760,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData,
 }
 
 
-void Content::destroy( sal_Bool bDeletePhysical,
+void Content::destroy( bool bDeletePhysical,
                        const uno::Reference<
                            ucb::XCommandEnvironment > & xEnv )
     throw( uno::Exception )
@@ -2203,7 +2203,7 @@ void Content::transfer(
         }
 
         // Propagate destruction (recursively).
-        xSource->destroy( sal_True, xEnv );
+        xSource->destroy( true, xEnv );
 
         // Remove all persistent data of source and its children.
         if ( !xSource->removeData() )
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index ba969830cf0f..ec1a0d7f8142 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -161,7 +161,7 @@ private:
     typedef std::list< ContentRef > ContentRefList;
     void queryChildren( ContentRefList& rChildren );
 
-    sal_Bool exchangeIdentity(
+    bool exchangeIdentity(
                 const ::com::sun::star::uno::Reference<
                         ::com::sun::star::ucb::XContentIdentifier >& xNewId );
 
@@ -189,7 +189,7 @@ private:
                     ::com::sun::star::ucb::XCommandEnvironment > & xEnv )
         throw( ::com::sun::star::uno::Exception );
 
-    void destroy( sal_Bool bDeletePhysical,
+    void destroy( bool bDeletePhysical,
                   const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment > & xEnv )
         throw( ::com::sun::star::uno::Exception );
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
index 25eea05807d0..52f49b2cfd89 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
@@ -587,7 +587,7 @@ bool OfficeDocumentsManager::isDocumentPreview(
 
     ::comphelper::NamedValueCollection aArgs(
         xModel->getArgs() );
-    sal_Bool bIsPreview = aArgs.getOrDefault( "Preview", sal_False );
+    bool bIsPreview = aArgs.getOrDefault( "Preview", sal_False );
     return bIsPreview;
 }
 
diff --git a/ucb/source/ucp/tdoc/tdoc_uri.hxx b/ucb/source/ucp/tdoc/tdoc_uri.hxx
index 7f2ce9a8cc90..8930a9d60a1e 100644
--- a/ucb/source/ucp/tdoc/tdoc_uri.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.hxx
@@ -58,7 +58,7 @@ public:
     bool operator!= ( const Uri & rOther ) const
     { return !operator==( rOther ); }
 
-    sal_Bool isValid() const
+    bool isValid() const
     { init(); return m_eState == VALID; }
 
     const OUString & getUri() const
@@ -84,11 +84,11 @@ public:
     const OUString & getDecodedName() const
     { init(); return m_aDecodedName; }
 
-    inline sal_Bool isRoot() const;
+    inline bool isRoot() const;
 
-    inline sal_Bool isDocument() const;
+    inline bool isDocument() const;
 
-    inline sal_Bool isFolder() const;
+    inline bool isFolder() const;
 };
 
 inline void Uri::setUri( const OUString & rUri )
@@ -99,20 +99,20 @@ inline void Uri::setUri( const OUString & rUri )
         = m_aDecodedName = OUString();
 }
 
-inline sal_Bool Uri::isRoot() const
+inline bool Uri::isRoot() const
 {
     init();
     return ( m_aPath.getLength() == 1 );
 }
 
-inline sal_Bool Uri::isDocument() const
+inline bool Uri::isDocument() const
 {
     init();
     return ( ( !m_aDocId.isEmpty() ) /* not root */
              && ( m_aPath.copy( m_aDocId.getLength() + 1 ).getLength() < 2 ) );
 }
 
-inline sal_Bool Uri::isFolder() const
+inline bool Uri::isFolder() const
 {
     init();
     return m_aPath.isEmpty() || m_aPath.endsWith( "/" );
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.cxx b/ucb/source/ucp/webdav-neon/ContentProperties.cxx
index 0c0c94595ee4..6e6416eb5115 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.cxx
@@ -134,7 +134,7 @@ ContentProperties::ContentProperties( const DAVResource& rResource )
 
 
 ContentProperties::ContentProperties(
-                        const OUString & rTitle, sal_Bool bFolder )
+                        const OUString & rTitle, bool bFolder )
 : m_xProps( new PropertyValueMap ),
   m_bTrailingSlash( false )
 {
@@ -143,7 +143,7 @@ ContentProperties::ContentProperties(
     (*m_xProps)[ OUString("IsFolder") ]
         = PropertyValue( uno::makeAny( bFolder ), true );
     (*m_xProps)[ OUString("IsDocument") ]
-        = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true );
+        = PropertyValue( uno::makeAny( !bFolder ), true );
 }
 
 
@@ -235,11 +235,11 @@ void ContentProperties::UCBNamesToDAVNames(
     // resourcetype     <- IsFolder, IsDocument, ContentType
     // (taken from URI) <- Title
 
-    sal_Bool bCreationDate  = sal_False;
-    sal_Bool bLastModified  = sal_False;
-    sal_Bool bContentType   = sal_False;
-    sal_Bool bContentLength = sal_False;
-    sal_Bool bResourceType  = sal_False;
+    bool bCreationDate  = false;
+    bool bLastModified  = false;
+    bool bContentType   = false;
+    bool bContentLength = false;
+    bool bResourceType  = false;
 
     sal_Int32 nCount = rProps.getLength();
     for ( sal_Int32 n = 0; n < nCount; ++n )
@@ -256,7 +256,7 @@ void ContentProperties::UCBNamesToDAVNames(
             if ( !bCreationDate )
             {
                     propertyNames.push_back( DAVProperties::CREATIONDATE );
-                bCreationDate = sal_True;
+                bCreationDate = true;
             }
         }
         else if ( rProp.Name == "DateModified" || rProp.Name == DAVProperties::GETLASTMODIFIED )
@@ -265,7 +265,7 @@ void ContentProperties::UCBNamesToDAVNames(
             {
                     propertyNames.push_back(
                     DAVProperties::GETLASTMODIFIED );
-                bLastModified = sal_True;
+                bLastModified = true;
             }
         }
         else if ( rProp.Name == "MediaType" || rProp.Name == DAVProperties::GETCONTENTTYPE )
@@ -274,7 +274,7 @@ void ContentProperties::UCBNamesToDAVNames(
             {
                     propertyNames.push_back(
                         DAVProperties::GETCONTENTTYPE );
-                bContentType = sal_True;
+                bContentType = true;
             }
         }
         else if ( rProp.Name == "Size" || rProp.Name == DAVProperties::GETCONTENTLENGTH )
@@ -283,7 +283,7 @@ void ContentProperties::UCBNamesToDAVNames(
             {
                     propertyNames.push_back(
                     DAVProperties::GETCONTENTLENGTH );
-                bContentLength = sal_True;
+                bContentLength = true;
             }
         }
         else if ( rProp.Name == "ContentType" || rProp.Name == "IsDocument" || rProp.Name == "IsFolder" || rProp.Name == DAVProperties::RESOURCETYPE )
@@ -291,7 +291,7 @@ void ContentProperties::UCBNamesToDAVNames(
             if ( !bResourceType )
             {
                     propertyNames.push_back( DAVProperties::RESOURCETYPE );
-                bResourceType = sal_True;
+                bResourceType = true;
             }
         }
         else
@@ -498,12 +498,12 @@ void ContentProperties::addProperty( const OUString & rName,
         rValue >>= aValue;
 
         // Map DAV:resourceype to UCP:IsFolder, UCP:IsDocument, UCP:ContentType
-        sal_Bool bFolder = aValue.equalsIgnoreAsciiCase( "collection" );
+        bool bFolder = aValue.equalsIgnoreAsciiCase( "collection" );
 
         (*m_xProps)[ OUString("IsFolder") ]
             = PropertyValue( uno::makeAny( bFolder ), true );
         (*m_xProps)[ OUString("IsDocument") ]
-            = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true );
+            = PropertyValue( uno::makeAny( !bFolder ), true );
         (*m_xProps)[ OUString("ContentType") ]
             = PropertyValue( uno::makeAny( bFolder
                 ? OUString( WEBDAV_COLLECTION_TYPE )
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
index 97e90a03371b..4ae32ecedd84 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
@@ -109,7 +109,7 @@ public:
     ContentProperties( const DAVResource& rResource );
 
     // Mini props for transient contents.
-    ContentProperties( const OUString & rTitle, sal_Bool bFolder );
+    ContentProperties( const OUString & rTitle, bool bFolder );
 
     // Micro props for non-existing contents.
     ContentProperties( const OUString & rTitle );
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
index ff8bc305f1a5..457e0e93d277 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
@@ -96,7 +96,7 @@ int DAVAuthListener_Impl::authenticate(
                         ucbhelper::InteractionSupplyAuthentication > & xSupp
                         = xRequest->getAuthenticationSupplier();
 
-                    sal_Bool bUseSystemCredentials = sal_False;
+                    bool bUseSystemCredentials = false;
 
                     if ( bCanUseSystemCredentials )
                         bUseSystemCredentials
@@ -798,7 +798,7 @@ void DAVResourceAccess::MKCOL(
 void DAVResourceAccess::COPY(
     const OUString & rSourcePath,
     const OUString & rDestinationURI,
-    sal_Bool bOverwrite,
+    bool bOverwrite,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
   throw( DAVException )
 {
@@ -840,7 +840,7 @@ void DAVResourceAccess::COPY(
 void DAVResourceAccess::MOVE(
     const OUString & rSourcePath,
     const OUString & rDestinationURI,
-    sal_Bool bOverwrite,
+    bool bOverwrite,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
   throw( DAVException )
 {
@@ -1155,7 +1155,7 @@ void DAVResourceAccess::getUserRequestHeaders(
 }
 
 
-sal_Bool DAVResourceAccess::detectRedirectCycle(
+bool DAVResourceAccess::detectRedirectCycle(
                                 const OUString& rRedirectURL )
     throw ( DAVException )
 {
@@ -1169,12 +1169,12 @@ sal_Bool DAVResourceAccess::detectRedirectCycle(
     while ( it != end )
     {
         if ( aUri == (*it) )
-            return sal_True;
+            return true;
 
         ++it;
     }
 
-    return sal_False;
+    return false;
 }
 
 
@@ -1193,7 +1193,7 @@ void DAVResourceAccess::resetUri()
 }
 
 
-sal_Bool DAVResourceAccess::handleException( const DAVException & e, int errorCount )
+bool DAVResourceAccess::handleException( const DAVException & e, int errorCount )
     throw ( DAVException )
 {
     switch ( e.getError() )
@@ -1204,9 +1204,9 @@ sal_Bool DAVResourceAccess::handleException( const DAVException & e, int errorCo
             // set new URL and path.
             setURL( e.getData() );
             initialize();
-            return sal_True;
+            return true;
         }
-        return sal_False;
+        return false;
     // #67048# copy & paste images doesn't display.
     // if we have a bad connection try again. Up to three times.
     case DAVException::DAV_HTTP_ERROR:
@@ -1214,14 +1214,14 @@ sal_Bool DAVResourceAccess::handleException( const DAVException & e, int errorCo
         if ( ( e.getStatus() < 400 || e.getStatus() >= 500 ) &&
              errorCount < 3 )
         {
-            return sal_True;
+            return true;
         }
-        return sal_False;
+        return false;
     // if connection has said retry then retry!
     case DAVException::DAV_HTTP_RETRY:
-        return sal_True;
+        return true;
     default:
-        return sal_False; // Abort
+        return false; // Abort
     }
 }
 
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
index c6cc056232ac..a82ecd52ddf3 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
@@ -192,7 +192,7 @@ public:
     void
     COPY( const OUString & rSourcePath,
           const OUString & rDestinationURI,
-          sal_Bool bOverwrite,
+          bool bOverwrite,
           const com::sun::star::uno::Reference<
               com::sun::star::ucb::XCommandEnvironment > & xEnv )
         throw ( DAVException );
@@ -200,7 +200,7 @@ public:
     void
     MOVE( const OUString & rSourcePath,
           const OUString & rDestinationURI,
-          sal_Bool bOverwrite,
+          bool bOverwrite,
           const com::sun::star::uno::Reference<
               com::sun::star::ucb::XCommandEnvironment > & xEnv )
         throw ( DAVException );
@@ -246,9 +246,9 @@ public:
 
 private:
     const OUString & getRequestURI() const;
-    sal_Bool detectRedirectCycle( const OUString& rRedirectURL )
+    bool detectRedirectCycle( const OUString& rRedirectURL )
         throw ( DAVException );
-    sal_Bool handleException( const DAVException & e, int errorCount )
+    bool handleException( const DAVException & e, int errorCount )
         throw ( DAVException );
     void initialize()
         throw ( DAVException );
diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx b/ucb/source/ucp/webdav-neon/DAVSession.hxx
index 4cc0aa7b181f..5065a01d5092 100644
--- a/ucb/source/ucp/webdav-neon/DAVSession.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx
@@ -68,10 +68,10 @@ public:
         }
     }
 
-    virtual sal_Bool CanUse( const OUString & inPath,
+    virtual bool CanUse( const OUString & inPath,
                              const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ) = 0;
 
-    virtual sal_Bool UsesProxy() = 0;
+    virtual bool UsesProxy() = 0;
 
     // DAV methods
 
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index e481d6a40cb5..0f8963501392 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -798,8 +798,8 @@ void NeonSession::Init()
     }
 }
 
-sal_Bool NeonSession::CanUse( const OUString & inUri,
-                              const uno::Sequence< beans::NamedValue >& rFlags )
+bool NeonSession::CanUse( const OUString & inUri,
+                          const uno::Sequence< beans::NamedValue >& rFlags )
 {
     try
     {
@@ -808,16 +808,16 @@ sal_Bool NeonSession::CanUse( const OUString & inUri,
              ( theUri.GetHost() == m_aHostName ) &&
              ( theUri.GetScheme() == m_aScheme ) &&
              ( rFlags == m_aFlags ) )
-            return sal_True;
+            return true;
     }
     catch ( DAVException const & )
     {
-        return sal_False;
+        return false;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool NeonSession::UsesProxy()
+bool NeonSession::UsesProxy()
 {
     Init();
     return  !m_aProxyName.isEmpty() ;
@@ -2022,13 +2022,13 @@ NeonSession::getDataFromInputStream(
     return false;
 }
 
-sal_Bool
+bool
 NeonSession::isDomainMatch( const OUString& certHostName )
 {
     OUString hostName = getHostName();
 
     if (hostName.equalsIgnoreAsciiCase( certHostName ) )
-        return sal_True;
+        return true;
 
     if ( certHostName.startsWith( "*" ) &&
          hostName.getLength() >= certHostName.getLength()  )
@@ -2037,9 +2037,9 @@ NeonSession::isDomainMatch( const OUString& certHostName )
 
         if ( hostName.matchIgnoreAsciiCase(
                 cmpStr, hostName.getLength() -  cmpStr.getLength() ) )
-            return sal_True;
+            return true;
     }
-    return sal_False;
+    return false;
 }
 
 OUString NeonSession::makeAbsoluteURL( OUString const & rURL ) const
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx
index 9d9fc0f5eda0..49b1782cf907 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx
@@ -78,10 +78,10 @@ public:
         throw ( std::exception );
 
     // DAVSession methods
-    virtual sal_Bool CanUse( const OUString & inPath,
-                             const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ) SAL_OVERRIDE;
+    virtual bool CanUse( const OUString & inPath,
+                         const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ) SAL_OVERRIDE;
 
-    virtual sal_Bool UsesProxy() SAL_OVERRIDE;
+    virtual bool UsesProxy() SAL_OVERRIDE;
 
     const DAVRequestEnvironment & getRequestEnvironment() const
     { return m_aEnv; }
@@ -227,7 +227,7 @@ public:
 
     const void * getRequestData() const { return m_pRequestData; }
 
-    sal_Bool isDomainMatch( const OUString& certHostName );
+    bool isDomainMatch( const OUString& certHostName );
 
 private:
     friend class NeonLockStore;
diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
index a4082b7b9229..b37b4e97b6e2 100644
--- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx
@@ -378,9 +378,9 @@ bool UCBDeadPropertyValue::createFromXML( const OString & rInData,
                 {
                     if ( aStringValue.equalsIgnoreAsciiCase(
                             OUString("true") ) )
-                        rOutData <<= sal_Bool( sal_True );
+                        rOutData <<= true;
                     else
-                        rOutData <<= sal_Bool( sal_False );
+                        rOutData <<= false;
                 }
                 else if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeChar ) )
                 {
@@ -455,7 +455,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
     else if ( rType == getCppuBooleanType() )
     {
         // boolean
-        sal_Bool bValue = false;
+        bool bValue = false;
         rInData >>= bValue;
         aStringValue = OUString::boolean( bValue );
         aStringType = aTypeBoolean;
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index d8a26fa1c623..18d772fa0f63 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -138,7 +138,7 @@ Content::Content(
             ContentProvider* pProvider,
             const uno::Reference< ucb::XContentIdentifier >& Identifier,
             rtl::Reference< DAVSessionFactory > const & rSessionFactory,
-            sal_Bool isCollection )
+            bool isCollection )
   throw ( ucb::ContentCreationException )
 : ContentImplHelper( rxContext, pProvider, Identifier ),
   m_eResourceType( UNKNOWN ),
@@ -241,7 +241,7 @@ XTYPEPROVIDER_COMMON_IMPL( Content );
 uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
     throw( uno::RuntimeException, std::exception )
 {
-    sal_Bool bFolder = sal_False;
+    bool bFolder = false;
     try
     {
         bFolder
@@ -359,7 +359,7 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
 OUString SAL_CALL Content::getContentType()
     throw( uno::RuntimeException, std::exception )
 {
-    sal_Bool bFolder = sal_False;
+    bool bFolder = false;
     try
     {
         bFolder
@@ -531,7 +531,7 @@ uno::Any SAL_CALL Content::execute(
         // delete
 
 
-        sal_Bool bDeletePhysical = sal_False;
+        bool bDeletePhysical = false;
         aCommand.Argument >>= bDeletePhysical;
 
 //  KSO: Ignore parameter and destroy the content, if you don't support
@@ -556,7 +556,7 @@ uno::Any SAL_CALL Content::execute(
         }
         catch ( DAVException const & e )
         {
-            cancelCommandExecution( e, Environment, sal_True );
+            cancelCommandExecution( e, Environment, true );
             // Unreachable
         }
 //      }
@@ -1075,16 +1075,16 @@ Content::createNewContent( const ucb::ContentInfo& Info )
     if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
         aURL += "/";
 
-    sal_Bool isCollection;
+    bool isCollection;
     if ( Info.Type == WEBDAV_COLLECTION_TYPE )
     {
         aURL += "New_Collection";
-        isCollection = sal_True;
+        isCollection = true;
     }
     else
     {
         aURL += "New_Content";
-        isCollection = sal_False;
+        isCollection = false;
     }
 
     uno::Reference< ucb::XContentIdentifier > xId(
@@ -1158,7 +1158,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
     if ( nCount )
     {
         uno::Reference< beans::XPropertySet > xAdditionalPropSet;
-        sal_Bool bTriedToGetAdditionalPropSet = sal_False;
+        bool bTriedToGetAdditionalPropSet = false;
 
         const beans::Property* pProps = rProperties.getConstArray();
         for ( sal_Int32 n = 0; n < nCount; ++n )
@@ -1181,7 +1181,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                             rProvider->getAdditionalPropertySet( rContentId,
                                                                  false ),
                             uno::UNO_QUERY );
-                    bTriedToGetAdditionalPropSet = sal_True;
+                    bTriedToGetAdditionalPropSet = true;
                 }
 
                 if ( !xAdditionalPropSet.is() ||
@@ -1501,7 +1501,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
         else if ( rName == "CreatableContentsInfo" )
         {
             // Add CreatableContentsInfo property, if requested.
-            sal_Bool bFolder = sal_False;
+            bool bFolder = false;
             xProps->getValue(
                 OUString(  "IsFolder"  ) )
                     >>= bFolder;
@@ -1544,7 +1544,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 {
     uno::Reference< ucb::XContentIdentifier >    xIdentifier;
     rtl::Reference< ContentProvider >            xProvider;
-    sal_Bool bTransient;
+    bool bTransient;
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     std::auto_ptr< DAVResourceAccess > xResAccess;
     SAL_WNODEPRECATED_DECLARATIONS_POP
@@ -1574,9 +1574,9 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
     std::vector< sal_Int32 > aProppatchPropsPositions;
 
     uno::Reference< ucb::XPersistentPropertySet > xAdditionalPropSet;
-    sal_Bool bTriedToGetAdditionalPropSet = sal_False;
+    bool bTriedToGetAdditionalPropSet = false;
 
-    sal_Bool bExchange = sal_False;
+    bool bExchange = false;
     OUString aNewTitle;
     OUString aOldTitle;
     sal_Int32 nTitlePos = -1;
@@ -1644,7 +1644,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                         {
                             // modified title -> modified URL -> exchange !
                             if ( !bTransient )
-                                bExchange = sal_True;
+                                bExchange = true;
 
                             // new value will be set later...
                             aNewTitle = aNewValue;
@@ -1759,7 +1759,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                     {
                         xAdditionalPropSet
                             = getAdditionalPropertySet( false );
-                        bTriedToGetAdditionalPropSet = sal_True;
+                        bTriedToGetAdditionalPropSet = true;
                     }
 
                     if ( xAdditionalPropSet.is() )
@@ -1863,7 +1863,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             targetURI.SetScheme( sourceURI.GetScheme() );
 
             xResAccess->MOVE(
-                sourceURI.GetPath(), targetURI.GetURI(), sal_False, xEnv );
+                sourceURI.GetPath(), targetURI.GetURI(), false, xEnv );
             // @@@ Should check for resources that could not be moved
             //     (due to source access or target overwrite) and send
             //     this information through the interaction handler.
@@ -1901,7 +1901,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             aNewTitle = "";
 
             // Set error .
-            aRet[ nTitlePos ] <<= MapDAVException( e, sal_True );
+            aRet[ nTitlePos ] <<= MapDAVException( e, true );
         }
     }
 
@@ -1941,7 +1941,7 @@ uno::Any Content::open(
 {
     uno::Any aRet;
 
-    sal_Bool bOpenFolder = ( ( rArg.Mode == ucb::OpenMode::ALL ) ||
+    bool bOpenFolder = ( ( rArg.Mode == ucb::OpenMode::ALL ) ||
                              ( rArg.Mode == ucb::OpenMode::FOLDERS ) ||
                              ( rArg.Mode == ucb::OpenMode::DOCUMENTS ) );
     if ( bOpenFolder )
@@ -2154,7 +2154,7 @@ void Content::post(
         }
         catch ( DAVException const & e )
         {
-            cancelCommandExecution( e, xEnv, sal_True );
+            cancelCommandExecution( e, xEnv, true );
             // Unreachable
         }
     }
@@ -2188,7 +2188,7 @@ void Content::post(
             }
             catch ( DAVException const & e )
             {
-                cancelCommandExecution( e, xEnv, sal_True );
+                cancelCommandExecution( e, xEnv, true );
                 // Unreachable
             }
         }
@@ -2260,11 +2260,11 @@ void Content::queryChildren( ContentRefList& rChildren )
 
 void Content::insert(
         const uno::Reference< io::XInputStream > & xInputStream,
-        sal_Bool bReplaceExisting,
+        bool bReplaceExisting,
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
     throw( uno::Exception )
 {
-    sal_Bool bTransient, bCollection;
+    bool bTransient, bCollection;
     OUString aEscapedTitle;
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     std::auto_ptr< DAVResourceAccess > xResAccess;
@@ -2348,7 +2348,7 @@ void Content::insert(
 
                     case ucbhelper::CONTINUATION_APPROVE:
                         // Continue -> Overwrite.
-                        bReplaceExisting = sal_True;
+                        bReplaceExisting = true;
                         break;
 
                     case ucbhelper::CONTINUATION_DISAPPROVE:
@@ -2414,7 +2414,7 @@ void Content::insert(
                         }
                         catch ( DAVException const & e )
                         {
-                            cancelCommandExecution( e, Environment, sal_True );
+                            cancelCommandExecution( e, Environment, true );
                             // Unreachable
                         }
 
@@ -2455,7 +2455,7 @@ void Content::insert(
                 }
             }
 
-            cancelCommandExecution( except, Environment, sal_True );
+            cancelCommandExecution( except, Environment, true );
             // Unreachable
         }
 
@@ -2490,7 +2490,7 @@ void Content::insert(
         }
         catch ( DAVException const & e )
         {
-            cancelCommandExecution( e, Environment, sal_True );
+            cancelCommandExecution( e, Environment, true );
             // Unreachable
         }
     }
@@ -2638,7 +2638,7 @@ void Content::transfer(
             if ( xSource.is() )
             {
                 // Propagate destruction to listeners.
-                xSource->destroy( sal_True );
+                xSource->destroy( true );
             }
 
 // DAV resources store all additional props on server!
@@ -2727,7 +2727,7 @@ void Content::transfer(
             }
         }
 
-        cancelCommandExecution( e, Environment, sal_True );
+        cancelCommandExecution( e, Environment, true );
         // Unreachable
     }
 
@@ -2738,7 +2738,7 @@ void Content::transfer(
 }
 
 
-void Content::destroy( sal_Bool bDeletePhysical )
+void Content::destroy( bool bDeletePhysical )
     throw( uno::Exception )
 {
     // @@@ take care about bDeletePhysical -> trashcan support
@@ -2826,7 +2826,7 @@ void Content::lock(
     }
     catch ( DAVException const & e )
     {
-        cancelCommandExecution( e, Environment, sal_False );
+        cancelCommandExecution( e, Environment, false );
         // Unreachable
     }
 }
@@ -2855,17 +2855,17 @@ void Content::unlock(
     }
     catch ( DAVException const & e )
     {
-        cancelCommandExecution( e, Environment, sal_False );
+        cancelCommandExecution( e, Environment, false );
         // Unreachable
     }
 }
 
 
-sal_Bool Content::exchangeIdentity(
+bool Content::exchangeIdentity(
     const uno::Reference< ucb::XContentIdentifier >& xNewId )
 {
     if ( !xNewId.is() )
-        return sal_False;
+        return false;
 
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
@@ -2875,7 +2875,7 @@ sal_Bool Content::exchangeIdentity(
     if ( m_bTransient )
     {
         OSL_FAIL( "Content::exchangeIdentity - Not persistent!" );
-        return sal_False;
+        return false;
     }
 
     // Exchange own identitity.
@@ -2914,21 +2914,21 @@ sal_Bool Content::exchangeIdentity(
                     = new ::ucbhelper::ContentIdentifier( aNewChildURL );
 
                 if ( !xChild->exchangeIdentity( xNewChildId ) )
-                    return sal_False;
+                    return false;
 
                 ++it;
             }
-            return sal_True;
+            return true;
         }
     }
 
     OSL_FAIL( "Content::exchangeIdentity - "
                 "Panic! Cannot exchange identity!" );
-    return sal_False;
+    return false;
 }
 
 
-sal_Bool Content::isFolder(
+bool Content::isFolder(
             const uno::Reference< ucb::XCommandEnvironment >& xEnv )
     throw( uno::Exception )
 {
@@ -2954,11 +2954,11 @@ sal_Bool Content::isFolder(
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 
-uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
+uno::Any Content::MapDAVException( const DAVException & e, bool bWrite )
 {
     // Map DAVException...
     uno::Any aException;
@@ -3135,7 +3135,7 @@ bool Content::shouldAccessNetworkAfterException( const DAVException & e )
 void Content::cancelCommandExecution(
                 const DAVException & e,
                 const uno::Reference< ucb::XCommandEnvironment > & xEnv,
-                sal_Bool bWrite /* = sal_False */ )
+                bool bWrite /* = sal_False */ )
     throw ( uno::Exception )
 {
     ucbhelper::cancelCommandExecution( MapDAVException( e, bWrite ), xEnv );
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index 7cc1bfe199ca..9bb4f7a74180 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -104,7 +104,7 @@ private:
                      com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE;
     virtual OUString getParentURL() SAL_OVERRIDE;
 
-    sal_Bool isFolder( const ::com::sun::star::uno::Reference<
+    bool isFolder( const ::com::sun::star::uno::Reference<
                            ::com::sun::star::ucb::XCommandEnvironment >& xEnv )
         throw ( ::com::sun::star::uno::Exception );
 
@@ -126,7 +126,7 @@ private:
     typedef std::list< ContentRef > ContentRefList;
     void queryChildren( ContentRefList& rChildren);
 
-    sal_Bool
+    bool
     exchangeIdentity( const ::com::sun::star::uno::Reference<
                           ::com::sun::star::ucb::XContentIdentifier >& xNewId );
 
@@ -165,7 +165,7 @@ private:
     // Command "insert"
     void insert( const ::com::sun::star::uno::Reference<
                      ::com::sun::star::io::XInputStream > & xInputStream,
-                 sal_Bool bReplaceExisting,
+                 bool bReplaceExisting,
                  const com::sun::star::uno::Reference<
                      com::sun::star::ucb::XCommandEnvironment >& Environment )
         throw( ::com::sun::star::uno::Exception );
@@ -177,7 +177,7 @@ private:
         throw( ::com::sun::star::uno::Exception );
 
     // Command "delete"
-    void destroy( sal_Bool bDeletePhysical )
+    void destroy( bool bDeletePhysical )
         throw( ::com::sun::star::uno::Exception );
 
     // Command "lock"
@@ -191,12 +191,12 @@ private:
         throw( ::com::sun::star::uno::Exception );
 
     ::com::sun::star::uno::Any MapDAVException( const DAVException & e,
-                                                sal_Bool bWrite );
+                                                bool bWrite );
     void cancelCommandExecution(
                     const DAVException & e,
                     const ::com::sun::star::uno::Reference<
                         com::sun::star::ucb::XCommandEnvironment > & xEnv,
-                    sal_Bool bWrite = sal_False )
+                    bool bWrite = false )
         throw( ::com::sun::star::uno::Exception );
 
     static bool shouldAccessNetworkAfterException( const DAVException & e );
@@ -234,7 +234,7 @@ public:
              const ::com::sun::star::uno::Reference<
                  ::com::sun::star::ucb::XContentIdentifier >& Identifier,
              rtl::Reference< DAVSessionFactory > const & rSessionFactory,
-             sal_Bool isCollection )
+             bool isCollection )
         throw ( ::com::sun::star::ucb::ContentCreationException );
     virtual ~Content();
 
diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
index 6ce9a7ad9a00..5c45dd73d586 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
@@ -298,7 +298,7 @@ bool ContentProvider::getProperty(
 uno::Sequence< beans::Property > Content::getProperties(
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
 {
-    sal_Bool bTransient;
+    bool bTransient;
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     std::auto_ptr< DAVResourceAccess > xResAccess;
     std::auto_ptr< ContentProperties > xCachedProps;
@@ -340,21 +340,21 @@ uno::Sequence< beans::Property > Content::getProperties(
     }
 
     // Add DAV properties, map DAV properties to UCB properties.
-    sal_Bool bHasCreationDate     = sal_False; // creationdate     <-> DateCreated
-    sal_Bool bHasGetLastModified  = sal_False; // getlastmodified  <-> DateModified
-    sal_Bool bHasGetContentType   = sal_False; // getcontenttype   <-> MediaType
-    sal_Bool bHasGetContentLength = sal_False; // getcontentlength <-> Size
-
-    sal_Bool bHasContentType      = sal_False;
-    sal_Bool bHasIsDocument       = sal_False;
-    sal_Bool bHasIsFolder         = sal_False;
-    sal_Bool bHasTitle            = sal_False;
-    sal_Bool bHasBaseURI          = sal_False;
-    sal_Bool bHasDateCreated      = sal_False;
-    sal_Bool bHasDateModified     = sal_False;
-    sal_Bool bHasMediaType        = sal_False;
-    sal_Bool bHasSize             = sal_False;
-    sal_Bool bHasCreatableInfos   = sal_False;
+    bool bHasCreationDate     = false; // creationdate     <-> DateCreated
+    bool bHasGetLastModified  = false; // getlastmodified  <-> DateModified
+    bool bHasGetContentType   = false; // getcontenttype   <-> MediaType
+    bool bHasGetContentLength = false; // getcontentlength <-> Size
+
+    bool bHasContentType      = false;
+    bool bHasIsDocument       = false;
+    bool bHasIsFolder         = false;
+    bool bHasTitle            = false;
+    bool bHasBaseURI          = false;
+    bool bHasDateCreated      = false;
+    bool bHasDateModified     = false;
+    bool bHasMediaType        = false;
+    bool bHasSize             = false;
+    bool bHasCreatableInfos   = false;
 
     {
         std::set< OUString >::const_iterator it  = aPropSet.begin();
@@ -364,62 +364,62 @@ uno::Sequence< beans::Property > Content::getProperties(
             if ( !bHasCreationDate &&
                  ( (*it) == DAVProperties::CREATIONDATE ) )
             {
-                bHasCreationDate = sal_True;
+                bHasCreationDate = true;
             }
             else if ( !bHasGetLastModified &&
                       ( (*it) == DAVProperties::GETLASTMODIFIED ) )
             {
-                bHasGetLastModified = sal_True;
+                bHasGetLastModified = true;
             }
             else if ( !bHasGetContentType &&
                       ( (*it) == DAVProperties::GETCONTENTTYPE ) )
             {
-                bHasGetContentType = sal_True;
+                bHasGetContentType = true;
             }
             else if ( !bHasGetContentLength &&
                       ( (*it) == DAVProperties::GETCONTENTLENGTH ) )
             {
-                bHasGetContentLength = sal_True;
+                bHasGetContentLength = true;
             }
             else if ( !bHasContentType && (*it) == "ContentType" )
             {
-                bHasContentType = sal_True;
+                bHasContentType = true;
             }
             else if ( !bHasIsDocument && (*it) == "IsDocument" )
             {
-                bHasIsDocument = sal_True;
+                bHasIsDocument = true;
             }
             else if ( !bHasIsFolder && (*it) == "IsFolder" )
             {
-                bHasIsFolder = sal_True;
+                bHasIsFolder = true;
             }
             else if ( !bHasTitle && (*it) == "Title" )
             {
-                bHasTitle = sal_True;
+                bHasTitle = true;
             }
             else if ( !bHasBaseURI && (*it) == "BaseURI" )
             {
-                bHasBaseURI = sal_True;
+                bHasBaseURI = true;
             }
             else if ( !bHasDateCreated && (*it) == "DateCreated" )
             {
-                bHasDateCreated = sal_True;
+                bHasDateCreated = true;
             }
             else if ( !bHasDateModified && (*it) == "DateModified" )
             {
-                bHasDateModified = sal_True;
+                bHasDateModified = true;
             }
             else if ( !bHasMediaType && (*it) == "MediaType" )
             {
-                bHasMediaType = sal_True;
+                bHasMediaType = true;
             }
             else if ( !bHasSize && (*it) == "Size" )
             {
-                bHasSize = sal_True;
+                bHasSize = true;
             }
             else if ( !bHasCreatableInfos && (*it) == "CreatableContentsInfo" )
             {
-                bHasCreatableInfos = sal_True;
+                bHasCreatableInfos = true;
             }
             ++it;
         }
@@ -595,7 +595,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
                 getCppuType( static_cast<
                     rtl::OUString * >( 0 ) ) );
 
-    sal_Bool bFolder = sal_False;
+    bool bFolder = false;
 
     try
     {
@@ -606,7 +606,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
         return aCmdInfo;
     }
 
-    sal_Bool bSupportsLocking = supportsExclusiveWriteLock( xEnv );
+    bool bSupportsLocking = supportsExclusiveWriteLock( xEnv );
 
     sal_Int32 nPos = aCmdInfo.getLength();
     sal_Int32 nMoreCmds = ( bFolder ? 2 : 0 ) + ( bSupportsLocking ? 2 : 0 );
diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
index f6217bf2f642..a01b1a0436d2 100644
--- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
@@ -90,15 +90,15 @@ struct DataSupplier_Impl
     rtl::Reference< Content >                    m_xContent;
     uno::Reference< uno::XComponentContext >     m_xContext;
     sal_Int32                                    m_nOpenMode;
-    sal_Bool                                     m_bCountFinal;
-    sal_Bool                                     m_bThrowException;
+    bool                                     m_bCountFinal;
+    bool                                     m_bThrowException;
 
     DataSupplier_Impl(
                 const uno::Reference< uno::XComponentContext >& rxContext,
                 const rtl::Reference< Content >& rContent,
                 sal_Int32 nOpenMode )
     : m_xContent( rContent ), m_xContext( rxContext ), m_nOpenMode( nOpenMode ),
-      m_bCountFinal( sal_False ), m_bThrowException( sal_False ) {}
+      m_bCountFinal( false ), m_bThrowException( false ) {}
 };
 
 }
@@ -337,7 +337,7 @@ void DataSupplier::validate()
 }
 
 
-sal_Bool DataSupplier::getData()
+bool DataSupplier::getData()
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -381,7 +381,7 @@ sal_Bool DataSupplier::getData()
           catch ( DAVException & )
         {
 //          OSL_FAIL( "PROPFIND : DAVException" );
-            m_pImpl->m_bThrowException = sal_True;
+            m_pImpl->m_bThrowException = true;
           }
 
         if ( !m_pImpl->m_bThrowException )
@@ -437,7 +437,7 @@ sal_Bool DataSupplier::getData()
                     {
                     case ucb::OpenMode::FOLDERS:
                         {
-                            sal_Bool bFolder = sal_False;
+                            bool bFolder = false;
 
                             const uno::Any & rValue
                                 = pContentProperties->getValue(
@@ -452,7 +452,7 @@ sal_Bool DataSupplier::getData()
 
                     case ucb::OpenMode::DOCUMENTS:
                         {
-                            sal_Bool bDocument = sal_False;
+                            bool bDocument = false;
 
                             const uno::Any & rValue
                                 = pContentProperties->getValue(
@@ -479,7 +479,7 @@ sal_Bool DataSupplier::getData()
             }
         }
 
-          m_pImpl->m_bCountFinal = sal_True;
+          m_pImpl->m_bCountFinal = true;
 
         // Callback possible, because listeners may be informed!
         aGuard.clear();
diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx
index 4405fa6622b2..08f51d1c61c3 100644
--- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx
@@ -45,7 +45,7 @@ class DataSupplier : public ucbhelper::ResultSetDataSupplier
     boost::scoped_ptr<DataSupplier_Impl> m_pImpl;
 
 private:
-    sal_Bool getData();
+    bool getData();
 
 public:
     DataSupplier( const com::sun::star::uno::Reference<