loplugin:salbool: Automatic rewrite of sal_False/True

Change-Id: Ib340ec1731cba5a4409f0e8d8bdde48753312672

16 files changed, 97 insertions, 97 deletions

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 7a9274d34744..ddc0ab2b9a39 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -230,7 +230,7 @@ void SAL_CALL CachedContentResultSet::CCRS_Cache
         nDiff *= -1;
     Sequence< sal_Bool >* pMappedReminder = getMappedReminder();
     if( nDiff < pMappedReminder->getLength() )
-        (*pMappedReminder)[nDiff] = sal_True;
+        (*pMappedReminder)[nDiff] = true;
 }
 
 bool SAL_CALL CachedContentResultSet::CCRS_Cache
@@ -261,7 +261,7 @@ Sequence< sal_Bool >* SAL_CALL CachedContentResultSet::CCRS_Cache
         sal_Int32 nCount = m_pResult->Rows.getLength();
         m_pMappedReminder = new Sequence< sal_Bool >( nCount );
         for( ;nCount; nCount-- )
-            (*m_pMappedReminder)[nCount] = sal_False;
+            (*m_pMappedReminder)[nCount] = false;
     }
     return m_pMappedReminder;
 }
@@ -861,7 +861,7 @@ void SAL_CALL CachedContentResultSet
     {
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
         aEvt.Source =  static_cast< XPropertySet * >( this );
-        aEvt.Further = sal_False;
+        aEvt.Further = false;
         aEvt.OldValue <<= nOld;
         aEvt.NewValue <<= nNew;
 
@@ -884,7 +884,7 @@ void SAL_CALL CachedContentResultSet
     {
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
         aEvt.Source =  static_cast< XPropertySet * >( this );
-        aEvt.Further = sal_False;
+        aEvt.Further = false;
         aEvt.OldValue <<= bOld;
         aEvt.NewValue <<= bNew;
 
@@ -1043,7 +1043,7 @@ void SAL_CALL CachedContentResultSet
             osl::Guard< osl::Mutex > aGuard( m_aMutex );
             aEvt.Source =  static_cast< XPropertySet * >( this );
             aEvt.PropertyName = aPropertyName;
-            aEvt.Further = sal_False;
+            aEvt.Further = false;
             aEvt.PropertyHandle = m_pMyPropSetInfo->
                                     m_nFetchDirectionPropertyHandle;
             aEvt.OldValue <<= m_nFetchDirection;
@@ -1076,7 +1076,7 @@ void SAL_CALL CachedContentResultSet
             osl::Guard< osl::Mutex > aGuard( m_aMutex );
             aEvt.Source =  static_cast< XPropertySet * >( this );
             aEvt.PropertyName = aPropertyName;
-            aEvt.Further = sal_False;
+            aEvt.Further = false;
             aEvt.PropertyHandle = m_pMyPropSetInfo->
                                     m_nFetchSizePropertyHandle;
             aEvt.OldValue <<= m_nFetchSize;
@@ -1187,7 +1187,7 @@ void SAL_CALL CachedContentResultSet
 
     PropertyChangeEvent aEvt( rEvt );
     aEvt.Source = static_cast< XPropertySet * >( this );
-    aEvt.Further = sal_False;
+    aEvt.Further = false;
 
 
     if( CCRS_PropertySetInfo
@@ -1254,7 +1254,7 @@ void SAL_CALL CachedContentResultSet
 
     PropertyChangeEvent aEvt( rEvt );
     aEvt.Source = static_cast< XPropertySet * >( this );
-    aEvt.Further = sal_False;
+    aEvt.Further = false;
 
     impl_notifyVetoableChangeListeners( aEvt );
 }
@@ -1352,7 +1352,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     ReacquireableGuard aGuard( m_aMutex );
     //after last
     if( m_bAfterLast )
-        return sal_False;
+        return false;
     //last
     aGuard.clear();
     if( isLast() )
@@ -1360,14 +1360,14 @@ sal_Bool SAL_CALL CachedContentResultSet
         aGuard.reacquire();
         m_nRow++;
         m_bAfterLast = true;
-        return sal_False;
+        return false;
     }
     aGuard.reacquire();
     //known valid position
     if( impl_isKnownValidPosition( m_nRow + 1 ) )
     {
         m_nRow++;
-        return sal_True;
+        return true;
     }
 
     //unknown position
@@ -1396,20 +1396,20 @@ sal_Bool SAL_CALL CachedContentResultSet
     ReacquireableGuard aGuard( m_aMutex );
     //before first ?:
     if( !m_bAfterLast && !m_nRow )
-        return sal_False;
+        return false;
     //first ?:
     if( !m_bAfterLast && m_nKnownCount && m_nRow == 1 )
     {
         m_nRow--;
         m_bAfterLast = false;
-        return sal_False;
+        return false;
     }
     //known valid position ?:
     if( impl_isKnownValidPosition( m_nRow - 1 ) )
     {
         m_nRow--;
         m_bAfterLast = false;
-        return sal_True;
+        return true;
     }
     //unknown position:
     sal_Int32 nRow = m_nRow;
@@ -1442,7 +1442,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     if( !m_xResultSetOrigin.is() )
     {
         OSL_FAIL( "broadcaster was disposed already" );
-        return sal_False;
+        return false;
     }
     if( row < 0 )
     {
@@ -1503,11 +1503,11 @@ sal_Bool SAL_CALL CachedContentResultSet
         {
             m_nRow = m_nKnownCount + 1;
             m_bAfterLast = true;
-            return sal_False;
+            return false;
         }
         m_nRow = row;
         m_bAfterLast = false;
-        return sal_True;
+        return true;
     }
     //unknown new position:
     aGuard.clear();
@@ -1558,7 +1558,7 @@ sal_Bool SAL_CALL CachedContentResultSet
         throw SQLException();
 
     if( !rows )
-        return sal_True;
+        return true;
 
     sal_Int32 nNewRow = m_nRow + rows;
         if( nNewRow < 0 )
@@ -1568,7 +1568,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     {
         m_nRow = nNewRow;
         m_bAfterLast = false;
-        return sal_True;
+        return true;
     }
     else
     {
@@ -1577,13 +1577,13 @@ sal_Bool SAL_CALL CachedContentResultSet
         {
             m_bAfterLast = false;
             m_nRow = 0;
-            return sal_False;
+            return false;
         }
         if( m_bFinalCount && nNewRow > m_nKnownCount )
         {
             m_bAfterLast = true;
             m_nRow = m_nKnownCount + 1;
-            return sal_False;
+            return false;
         }
         //unknown new position:
         aGuard.clear();
@@ -1613,13 +1613,13 @@ sal_Bool SAL_CALL CachedContentResultSet
     {
         m_nRow = 1;
         m_bAfterLast = false;
-        return sal_True;
+        return true;
     }
     if( impl_isKnownInvalidPosition( 1 ) )
     {
         m_nRow = 1;
         m_bAfterLast = false;
-        return sal_False;
+        return false;
     }
     //unknown position
     aGuard.clear();
@@ -1654,7 +1654,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     if( !m_xResultSetOrigin.is() )
     {
         OSL_FAIL( "broadcaster was disposed already" );
-        return sal_False;
+        return false;
     }
     aGuard.clear();
 
@@ -1723,16 +1723,16 @@ sal_Bool SAL_CALL CachedContentResultSet
 
     ReacquireableGuard aGuard( m_aMutex );
     if( !m_bAfterLast )
-        return sal_False;
+        return false;
     if( m_nKnownCount )
         return m_bAfterLast;
     if( m_bFinalCount )
-        return sal_False;
+        return false;
 
     if( !m_xResultSetOrigin.is() )
     {
         OSL_FAIL( "broadcaster was disposed already" );
-        return sal_False;
+        return false;
     }
     aGuard.clear();
 
@@ -1756,18 +1756,18 @@ sal_Bool SAL_CALL CachedContentResultSet
 
     ReacquireableGuard aGuard( m_aMutex );
     if( m_bAfterLast )
-        return sal_False;
+        return false;
     if( m_nRow )
-        return sal_False;
+        return false;
     if( m_nKnownCount )
         return !m_nRow;
     if( m_bFinalCount )
-        return sal_False;
+        return false;
 
     if( !m_xResultSetOrigin.is() )
     {
         OSL_FAIL( "broadcaster was disposed already" );
-        return sal_False;
+        return false;
     }
     aGuard.clear();
 
@@ -1796,13 +1796,13 @@ sal_Bool SAL_CALL CachedContentResultSet
     {
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
         if( m_bAfterLast )
-            return sal_False;
+            return false;
         if( m_nRow != 1 )
-            return sal_False;
+            return false;
         if( m_nKnownCount )
             return m_nRow == 1;
         if( m_bFinalCount )
-            return sal_False;
+            return false;
 
         nRow = m_nRow;
         xResultSetOrigin = m_xResultSetOrigin;
@@ -1813,7 +1813,7 @@ sal_Bool SAL_CALL CachedContentResultSet
         if( applyPositionToOrigin( nRow ) )
             return xResultSetOrigin->isFirst();
         else
-            return sal_False;
+            return false;
     }
 }
 
@@ -1830,9 +1830,9 @@ sal_Bool SAL_CALL CachedContentResultSet
     {
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
         if( m_bAfterLast )
-            return sal_False;
+            return false;
         if( m_nRow < m_nKnownCount )
-            return sal_False;
+            return false;
         if( m_bFinalCount )
             return m_nKnownCount && m_nRow == m_nKnownCount;
 
@@ -1845,7 +1845,7 @@ sal_Bool SAL_CALL CachedContentResultSet
         if( applyPositionToOrigin( nRow ) )
             return xResultSetOrigin->isLast();
         else
-            return sal_False;
+            return false;
     }
 }
 
@@ -1885,7 +1885,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     impl_EnsureNotDisposed();
 
     //the ContentResultSet is static and will not change
-    return sal_False;
+    return false;
 }
 //virtual
 sal_Bool SAL_CALL CachedContentResultSet
@@ -1896,7 +1896,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     impl_EnsureNotDisposed();
 
     //the ContentResultSet is static and will not change
-    return sal_False;
+    return false;
 }
 
 //virtual
@@ -1908,7 +1908,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     impl_EnsureNotDisposed();
 
     //the ContentResultSet is static and will not change
-    return sal_False;
+    return false;
 }
 
 //virtual
@@ -1941,7 +1941,7 @@ sal_Bool SAL_CALL CachedContentResultSet
         if( !m_xRowOrigin.is() )
         {
             OSL_FAIL( "broadcaster was disposed already" );
-            return sal_False;
+            return false;
         }
     }
     return m_xRowOrigin->wasNull();
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index ba0c5758b8cd..251ca288dc00 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -104,7 +104,7 @@ void SAL_CALL CachedContentResultSetStub
 
     PropertyChangeEvent aEvt( rEvt );
     aEvt.Source = static_cast< XPropertySet * >( this );
-    aEvt.Further = sal_False;
+    aEvt.Further = false;
 
     impl_notifyPropertyChangeListeners( aEvt );
 }
@@ -126,7 +126,7 @@ void SAL_CALL CachedContentResultSetStub
 
     PropertyChangeEvent aEvt( rEvt );
     aEvt.Source = static_cast< XPropertySet * >( this );
-    aEvt.Further = sal_False;
+    aEvt.Further = false;
 
     impl_notifyVetoableChangeListeners( aEvt );
 }
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 95203c023582..a0f4437a9bd0 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -781,7 +781,7 @@ void SAL_CALL ContentResultSetWrapper::impl_propertyChange( const PropertyChange
 
     PropertyChangeEvent aEvt( rEvt );
     aEvt.Source = static_cast< XPropertySet * >( this );
-    aEvt.Further = sal_False;
+    aEvt.Further = false;
     impl_notifyPropertyChangeListeners( aEvt );
 }
 
@@ -794,7 +794,7 @@ void SAL_CALL ContentResultSetWrapper::impl_vetoableChange( const PropertyChange
 
     PropertyChangeEvent aEvt( rEvt );
     aEvt.Source = static_cast< XPropertySet * >( this );
-    aEvt.Further = sal_False;
+    aEvt.Further = false;
 
     impl_notifyVetoableChangeListeners( aEvt );
 }
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index 6ec2fefc423d..a330c2f5632a 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -607,7 +607,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL )
             Reference< XInputStream > xInput( pInput );
             InsertCommandArgument aInsertArg;
             aInsertArg.Data = xInput;
-            aInsertArg.ReplaceExisting = sal_False;
+            aInsertArg.ReplaceExisting = false;
 
             aCmdArg <<= aInsertArg;
             aCnt.executeCommand( "insert", aCmdArg );
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index ca6c0d07ee0f..9a9db759069a 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -296,10 +296,10 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName(
     for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n )
     {
         if ( (*m_pInfo)[ n ].Name == Name )
-            return sal_True;
+            return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 
@@ -310,10 +310,10 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByHandle( sal_Int32 Handle )
     for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n )
     {
         if ( (*m_pInfo)[ n ].Handle == Handle )
-            return sal_True;
+            return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 
@@ -1146,7 +1146,7 @@ void handleNameClashRename(
 
             ucb::InsertCommandArgument2 aArg;
             aArg.Data = xInputStream;
-            aArg.ReplaceExisting = sal_False;
+            aArg.ReplaceExisting = false;
 
             ucb::Command aInsertCommand(
                         OUString("insert"),
@@ -1325,18 +1325,18 @@ void globalTransfer_(
     switch ( rContext.aArg.NameClash )
     {
         case ucb::NameClash::OVERWRITE:
-            aArg.ReplaceExisting = sal_True;
+            aArg.ReplaceExisting = true;
             break;
 
         case ucb::NameClash::ERROR:
         case ucb::NameClash::RENAME:
         case ucb::NameClash::KEEP: // deprecated
         case ucb::NameClash::ASK:
-            aArg.ReplaceExisting = sal_False;
+            aArg.ReplaceExisting = false;
             break;
 
         default:
-            aArg.ReplaceExisting = sal_False;
+            aArg.ReplaceExisting = false;
             OSL_FAIL( "Unknown nameclash directive!" );
             break;
     }
@@ -1456,7 +1456,7 @@ void globalTransfer_(
                                 OSL_ENSURE( !aArg.ReplaceExisting,
                                             "Hu? ReplaceExisting already true?"
                                           );
-                                aArg.ReplaceExisting = sal_True;
+                                aArg.ReplaceExisting = true;
                                 bRetry = true;
                                 break;
 
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 04d28a2aa3ae..96ba17f5726a 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -466,7 +466,7 @@ sal_Bool SAL_CALL PropertySetRegistry::hasElements()
     if ( xElemAccess.is() )
         return xElemAccess->hasElements();
 
-    return sal_False;
+    return false;
 }
 
 
@@ -531,7 +531,7 @@ sal_Bool SAL_CALL PropertySetRegistry::hasByName( const OUString& aName )
         return xNameAccess->hasByName( aName );
     }
 
-    return sal_False;
+    return false;
 }
 
 
@@ -999,7 +999,7 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess(
                 aArguments[ 0 ] <<= aProperty;
 
                 aProperty.Name = CFGPROPERTY_LAZYWRITE;
-                aProperty.Value <<= sal_True;
+                aProperty.Value <<= true;
                 aArguments[ 1 ] <<= aProperty;
 
                 m_pImpl->m_bTriedToGetRootWriteAccess = true;
@@ -1275,7 +1275,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aProperty
                         aEvt.Source         = static_cast<OWeakObject*>(this);
                         aEvt.PropertyName   = aPropertyName;
                         aEvt.PropertyHandle = nHandle;
-                        aEvt.Further        = sal_False;
+                        aEvt.Further        = false;
                         aEvt.OldValue       = aOldValue;
                         aEvt.NewValue       = aValue;
 
@@ -2001,7 +2001,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValues(
                             aEvt.Source         = static_cast<OWeakObject*>(this);
                             aEvt.PropertyName   = rNewValue.Name;
                             aEvt.PropertyHandle = rNewValue.Handle;
-                            aEvt.Further        = sal_False;
+                            aEvt.Further        = false;
                             aEvt.OldValue       = aOldValue;
                             aEvt.NewValue       = rNewValue.Value;
 
@@ -2401,7 +2401,7 @@ sal_Bool SAL_CALL PropertySetInfo_Impl::hasPropertyByName(
         return xRootHierNameAccess->hasByHierarchicalName( aFullPropName );
     }
 
-    return sal_False;
+    return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 55271af4cf5c..f65b89a27c56 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -302,7 +302,7 @@ sal_Bool SAL_CALL SortedResultSet::next()
             mnCurEntry = mnCount + 1;
         }
     }
-    return sal_False;
+    return false;
 }
 
 
@@ -310,9 +310,9 @@ sal_Bool SAL_CALL SortedResultSet::isBeforeFirst()
     throw ( SQLException, RuntimeException, std::exception )
 {
     if ( mnCurEntry )
-        return sal_False;
+        return false;
     else
-        return sal_True;
+        return true;
 }
 
 
@@ -320,9 +320,9 @@ sal_Bool SAL_CALL SortedResultSet::isAfterLast()
     throw ( SQLException, RuntimeException, std::exception )
 {
     if ( mnCurEntry > mnCount )
-        return sal_True;
+        return true;
     else
-        return sal_False;
+        return false;
 }
 
 
@@ -330,9 +330,9 @@ sal_Bool SAL_CALL SortedResultSet::isFirst()
     throw ( SQLException, RuntimeException, std::exception )
 {
     if ( mnCurEntry == 1 )
-        return sal_True;
+        return true;
     else
-        return sal_False;
+        return false;
 }
 
 
@@ -340,9 +340,9 @@ sal_Bool SAL_CALL SortedResultSet::isLast()
     throw ( SQLException, RuntimeException, std::exception )
 {
     if ( mnCurEntry == mnCount )
-        return sal_True;
+        return true;
     else
-        return sal_False;
+        return false;
 }
 
 
@@ -378,7 +378,7 @@ sal_Bool SAL_CALL SortedResultSet::first()
     else
     {
         mnCurEntry = 0;
-        return sal_False;
+        return false;
     }
 }
 
@@ -397,7 +397,7 @@ sal_Bool SAL_CALL SortedResultSet::last()
     else
     {
         mnCurEntry = 0;
-        return sal_False;
+        return false;
     }
 }
 
@@ -452,7 +452,7 @@ sal_Bool SAL_CALL SortedResultSet::absolute( sal_Int32 row )
         else
         {
             mnCurEntry = mnCount + 1;
-            return sal_False;
+            return false;
         }
     }
     else if ( row == 0 )
@@ -470,7 +470,7 @@ sal_Bool SAL_CALL SortedResultSet::absolute( sal_Int32 row )
         else
         {
             mnCurEntry = 0;
-            return sal_False;
+            return false;
         }
     }
 }
@@ -508,19 +508,19 @@ sal_Bool SAL_CALL SortedResultSet::relative( sal_Int32 rows )
     }
 
     if ( rows == 0 )
-        return sal_True;
+        return true;
 
     sal_Int32 nTmp = mnCurEntry + rows;
 
     if ( nTmp <= 0 )
     {
         mnCurEntry = 0;
-        return sal_False;
+        return false;
     }
     else if ( nTmp > mnCount )
     {
         mnCurEntry = mnCount + 1;
-        return sal_False;
+        return false;
     }
     else
     {
@@ -560,7 +560,7 @@ sal_Bool SAL_CALL SortedResultSet::previous()
     else
         mnCurEntry = 0;
 
-    return sal_False;
+    return false;
 }
 
 
@@ -1430,7 +1430,7 @@ void SortedResultSet::CheckProperties( sal_IntPtr nOldCount, bool bWasFinal )
             PropertyChangeEvent aEvt;
 
             aEvt.PropertyName = "RowCount";
-            aEvt.Further = sal_False;
+            aEvt.Further = false;
             aEvt.PropertyHandle = -1;
             aEvt.OldValue <<= nOldCount;
             aEvt.NewValue <<= GetCount();
@@ -1442,7 +1442,7 @@ void SortedResultSet::CheckProperties( sal_IntPtr nOldCount, bool bWasFinal )
             if ( (aRet >>= bIsFinal) && bIsFinal != bWasFinal )
             {
                 aEvt.PropertyName = aName;
-                aEvt.Further = sal_False;
+                aEvt.Further = false;
                 aEvt.PropertyHandle = -1;
                 aEvt.OldValue <<= bWasFinal;
                 aEvt.NewValue <<= bIsFinal;
@@ -1974,11 +1974,11 @@ SRSPropertySetInfo::hasPropertyByName( const OUString& Name )
     throw( RuntimeException, std::exception )
 {
     if ( Name == "RowCount" )
-        return sal_True;
+        return true;
     else if ( Name == "IsRowCountFinal" )
-        return sal_True;
+        return true;
     else
-        return sal_False;
+        return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 8ec03c1fb869..e7f52419935b 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -512,7 +512,7 @@ namespace ucb { namespace ucp { namespace ext
 
         PropertyChangeEvent aEvent;
         aEvent.Source         = static_cast< cppu::OWeakObject * >( this );
-        aEvent.Further        = sal_False;
+        aEvent.Further        = false;
         aEvent.PropertyHandle = -1;
 
         const PropertyValue* pValues = i_rValues.getConstArray();
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 4152428caeb9..16be9c03045b 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -673,7 +673,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
     beans::PropertyChangeEvent aEvent;
     aEvent.Source = static_cast< cppu::OWeakObject * >( this );
-    aEvent.Further = sal_False;
+    aEvent.Further = false;
     aEvent.PropertyHandle = -1;
 
     sal_Int32 nChanged = 0, nTitlePos = -1;
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 99dc529481ba..6ece6a1d308c 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -1068,7 +1068,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
 
     beans::PropertyChangeEvent aEvent;
     aEvent.Source         = static_cast< cppu::OWeakObject * >( this );
-    aEvent.Further        = sal_False;
+    aEvent.Further        = false;
 //    aEvent.PropertyName   =
     aEvent.PropertyHandle = -1;
 //    aEvent.OldValue       =
@@ -1785,7 +1785,7 @@ void HierarchyContent::transfer(
             aChildId += rResult.getName();
 
             ucb::TransferInfo aInfo;
-            aInfo.MoveData  = sal_False;
+            aInfo.MoveData  = false;
             aInfo.NewTitle.clear();
             aInfo.SourceURL = aChildId;
             aInfo.NameClash = rInfo.NameClash;
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 4739574f02b3..c662e650f793 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -491,7 +491,7 @@ HierarchyDataSource::createInstanceWithArguments(
 
                 beans::PropertyValue aProp;
                 aProp.Name = CFGPROPERTY_LAZYWRITE;
-                aProp.Value <<= sal_True;
+                aProp.Value <<= true;
                 aNewArgs[ nLen ] <<= aProp;
             }
 
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 09975a7ce3ce..983d7b54e3f0 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -1026,7 +1026,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
     beans::PropertyChangeEvent aEvent;
     aEvent.Source         = static_cast< cppu::OWeakObject * >( this );
-    aEvent.Further        = sal_False;
+    aEvent.Further        = false;
 //    aEvent.PropertyName   =
     aEvent.PropertyHandle = -1;
 //    aEvent.OldValue       =
@@ -2011,7 +2011,7 @@ void Content::transfer(
                     aChildId += ::ucb_impl::urihelper::encodeSegment( aName );
 
                     ucb::TransferInfo aInfo;
-                    aInfo.MoveData  = sal_False;
+                    aInfo.MoveData  = false;
                     aInfo.NewTitle.clear();
                     aInfo.SourceURL = aChildId;
                     aInfo.NameClash = rInfo.NameClash;
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index a5b7a0d539c6..abd86687ad2f 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -1118,7 +1118,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
     beans::PropertyChangeEvent aEvent;
     aEvent.Source         = static_cast< cppu::OWeakObject * >( this );
-    aEvent.Further        = sal_False;
+    aEvent.Further        = false;
     //    aEvent.PropertyName   =
     aEvent.PropertyHandle = -1;
     //    aEvent.OldValue       =
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
index 1514f270f3f8..b81de10cc4f0 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
@@ -559,7 +559,7 @@ bool OfficeDocumentsManager::isDocumentPreview(
 
     ::comphelper::NamedValueCollection aArgs(
         xModel->getArgs() );
-    bool bIsPreview = aArgs.getOrDefault( "Preview", sal_False );
+    bool bIsPreview = aArgs.getOrDefault( "Preview", false );
     return bIsPreview;
 }
 
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 76a4c0ac24a8..98814330a765 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -473,14 +473,14 @@ extern "C" int NeonSession_CertificationNotify( void *userdata,
                 if ( xApprove.is() )
                 {
                     xCertificateContainer->addCertificate(
-                        pSession->getHostName(), cert_subject,  sal_True );
+                        pSession->getHostName(), cert_subject,  true );
                     return 0;
                 }
                 else
                 {
                     // Don't trust cert
                     xCertificateContainer->addCertificate(
-                        pSession->getHostName(), cert_subject, sal_False );
+                        pSession->getHostName(), cert_subject, false );
                     return 1;
                 }
             }
@@ -489,7 +489,7 @@ extern "C" int NeonSession_CertificationNotify( void *userdata,
         {
             // Don't trust cert
             xCertificateContainer->addCertificate(
-                pSession->getHostName(), cert_subject, sal_False );
+                pSession->getHostName(), cert_subject, false );
             return 1;
         }
     }
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index f91d3cd74713..625e2fe3acd2 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -1546,7 +1546,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
     beans::PropertyChangeEvent aEvent;
     aEvent.Source         = static_cast< cppu::OWeakObject * >( this );
-    aEvent.Further        = sal_False;
+    aEvent.Further        = false;
     // aEvent.PropertyName =
     aEvent.PropertyHandle = -1;
     // aEvent.OldValue   =