ucbhelper: sal_Bool -> bool

Change-Id: Iee327c3dd75bebb35d99de01eaa7103956e08974

11 files changed, 192 insertions, 192 deletions

diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 91cea87afed0..4a0718696eb7 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -328,7 +328,7 @@ Content::Content( const Content& rOther )
 
 //=========================================================================
 // static
-sal_Bool Content::create( const OUString& rURL,
+bool Content::create( const OUString& rURL,
                           const Reference< XCommandEnvironment >& rEnv,
                           const Reference< XComponentContext >& rCtx,
                           Content& rContent )
@@ -339,16 +339,16 @@ sal_Bool Content::create( const OUString& rURL,
     Reference< XContentIdentifier > xId
         = getContentIdentifier( pBroker, rURL, false );
     if ( !xId.is() )
-        return sal_False;
+        return false;
 
     Reference< XContent > xContent = getContent( pBroker, xId, false );
     if ( !xContent.is() )
-        return sal_False;
+        return false;
 
     rContent.m_xImpl
         = new Content_Impl( rCtx, xContent, rEnv );
 
-    return sal_True;
+    return true;
 }
 
 //=========================================================================
@@ -791,11 +791,11 @@ Reference< XStream > Content::openWriteableStreamNoLock()
 }
 
 //=========================================================================
-sal_Bool Content::openStream( const Reference< XActiveDataSink >& rSink )
+bool Content::openStream( const Reference< XActiveDataSink >& rSink )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( !isDocument() )
-        return sal_False;
+        return false;
 
     OpenCommandArgument2 aArg;
     aArg.Mode       = OpenMode::DOCUMENT;
@@ -810,15 +810,15 @@ sal_Bool Content::openStream( const Reference< XActiveDataSink >& rSink )
 
     m_xImpl->executeCommand( aCommand );
 
-    return sal_True;
+    return true;
 }
 
 //=========================================================================
-sal_Bool Content::openStream( const Reference< XOutputStream >& rStream )
+bool Content::openStream( const Reference< XOutputStream >& rStream )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( !isDocument() )
-        return sal_False;
+        return false;
 
     OpenCommandArgument2 aArg;
     aArg.Mode       = OpenMode::DOCUMENT;
@@ -833,12 +833,12 @@ sal_Bool Content::openStream( const Reference< XOutputStream >& rStream )
 
     m_xImpl->executeCommand( aCommand );
 
-    return sal_True;
+    return true;
 }
 
 //=========================================================================
 void Content::writeStream( const Reference< XInputStream >& rStream,
-                           sal_Bool bReplaceExisting )
+                           bool bReplaceExisting )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     InsertCommandArgument aArg;
@@ -876,7 +876,7 @@ Sequence< ContentInfo > Content::queryCreatableContentsInfo()
 }
 
 //=========================================================================
-sal_Bool Content::insertNewContent( const OUString& rContentType,
+bool Content::insertNewContent( const OUString& rContentType,
                                     const Sequence< OUString >&
                                         rPropertyNames,
                                     const Sequence< Any >& rPropertyValues,
@@ -891,7 +891,7 @@ sal_Bool Content::insertNewContent( const OUString& rContentType,
 }
 
 //=========================================================================
-sal_Bool Content::insertNewContent( const OUString& rContentType,
+bool Content::insertNewContent( const OUString& rContentType,
                                     const Sequence< OUString >&
                                         rPropertyNames,
                                     const Sequence< Any >& rPropertyValues,
@@ -900,7 +900,7 @@ sal_Bool Content::insertNewContent( const OUString& rContentType,
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( rContentType.isEmpty() )
-        return sal_False;
+        return false;
 
     // First, try it using "createNewContent" command -> the "new" way.
     ContentInfo aInfo;
@@ -932,12 +932,12 @@ sal_Bool Content::insertNewContent( const OUString& rContentType,
         Reference< XContentCreator > xCreator( m_xImpl->getContent(), UNO_QUERY );
 
         if ( !xCreator.is() )
-            return sal_False;
+            return false;
 
         xNew = xCreator->createNewContent( aInfo );
 
         if ( !xNew.is() )
-            return sal_False;
+            return false;
     }
 
     Content aNewContent(
@@ -951,11 +951,11 @@ sal_Bool Content::insertNewContent( const OUString& rContentType,
     aNewContent.m_xImpl->inserted();
 
     rNewContent = aNewContent;
-    return sal_True;
+    return true;
 }
 
 //=========================================================================
-sal_Bool Content::transferContent( const Content& rSourceContent,
+bool Content::transferContent( const Content& rSourceContent,
                                    InsertOperation eOperation,
                                    const OUString & rTitle,
                                    const sal_Int32 nNameClashAction,
@@ -1030,14 +1030,14 @@ sal_Bool Content::transferContent( const Content& rSourceContent,
     Any aRet = pBroker->execute( aCommand, 0, m_xImpl->getEnvironment() );
     if ( pResultURL != NULL )
         aRet >>= *pResultURL;
-    return sal_True;
+    return true;
 }
 
 //=========================================================================
-sal_Bool Content::isFolder()
+bool Content::isFolder()
     throw( CommandAbortedException, RuntimeException, Exception )
 {
-    sal_Bool bFolder = sal_False;
+    bool bFolder = false;
     if ( getPropertyValue("IsFolder")
         >>= bFolder )
         return bFolder;
@@ -1052,7 +1052,7 @@ sal_Bool Content::isFolder()
 #if !(defined(_MSC_VER) && defined(ENABLE_LTO))
     // Unreachable - cancelCommandExecution always throws an exception.
     // But some compilers complain...
-    return sal_False;
+    return false;
 #endif
 }
 
@@ -1060,10 +1060,10 @@ sal_Bool Content::isFolder()
 
 SAL_WNOUNREACHABLE_CODE_PUSH
 
-sal_Bool Content::isDocument()
+bool Content::isDocument()
     throw( CommandAbortedException, RuntimeException, Exception )
 {
-    sal_Bool bDoc = sal_False;
+    bool bDoc = false;
     if ( getPropertyValue("IsDocument")
         >>= bDoc )
         return bDoc;
@@ -1077,7 +1077,7 @@ sal_Bool Content::isDocument()
 
     // Unreachable - cancelCommandExecution always throws an exception,
     // But some compilers complain...
-    return sal_False;
+    return false;
 }
 
 SAL_WNOUNREACHABLE_CODE_POP
diff --git a/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx
index 3558d5922df1..f98cc784d29a 100644
--- a/ucbhelper/source/client/interceptedinteraction.cxx
+++ b/ucbhelper/source/client/interceptedinteraction.cxx
@@ -114,7 +114,7 @@ InterceptedInteraction::EInterceptionState InterceptedInteraction::impl_intercep
         css::uno::Type aInterceptedType = rInterception.Request.getValueType();
 
         // check the request
-        sal_Bool bMatch = sal_False;
+        bool bMatch = false;
         if (rInterception.MatchExact)
             bMatch = aInterceptedType.equals(aRequestType);
         else
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index d698e87716ef..b19a077313f8 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -433,7 +433,7 @@ void SAL_CALL ContentImplHelper::addProperty(
     // Add a new dynamic property.
     // Open/create persistent property set.
     uno::Reference< com::sun::star::ucb::XPersistentPropertySet > xSet(
-                                    getAdditionalPropertySet( sal_True ) );
+                                    getAdditionalPropertySet( true ) );
 
     OSL_ENSURE( xSet.is(),
                 "ContentImplHelper::addProperty - No property set!" );
@@ -528,7 +528,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const OUString& Name )
     // Try to remove property from dynamic property set.
     // Open persistent property set, if exists.
     uno::Reference< com::sun::star::ucb::XPersistentPropertySet > xSet(
-        getAdditionalPropertySet( sal_False ) );
+        getAdditionalPropertySet( false ) );
     if ( xSet.is() )
     {
         uno::Reference< beans::XPropertyContainer > xContainer(
@@ -651,32 +651,32 @@ void SAL_CALL ContentImplHelper::setParent(
 }
 
 uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
-ContentImplHelper::getAdditionalPropertySet( sal_Bool bCreate )
+ContentImplHelper::getAdditionalPropertySet( bool bCreate )
 {
     // Get propertyset from provider.
     return m_xProvider->getAdditionalPropertySet(
                             m_xIdentifier->getContentIdentifier(), bCreate );
 }
 
-sal_Bool ContentImplHelper::renameAdditionalPropertySet(
+bool ContentImplHelper::renameAdditionalPropertySet(
     const OUString& rOldKey,
     const OUString& rNewKey,
-    sal_Bool bRecursive )
+    bool bRecursive )
 {
     return m_xProvider->renameAdditionalPropertySet(
                                             rOldKey, rNewKey, bRecursive );
 }
 
-sal_Bool ContentImplHelper::copyAdditionalPropertySet(
+bool ContentImplHelper::copyAdditionalPropertySet(
     const OUString& rSourceKey,
     const OUString& rTargetKey,
-    sal_Bool bRecursive )
+    bool bRecursive )
 {
     return m_xProvider->copyAdditionalPropertySet(
                                         rSourceKey, rTargetKey, bRecursive );
 }
 
-sal_Bool ContentImplHelper::removeAdditionalPropertySet( sal_Bool bRecursive )
+bool ContentImplHelper::removeAdditionalPropertySet( bool bRecursive )
 {
     return m_xProvider->removeAdditionalPropertySet(
                     m_xIdentifier->getContentIdentifier(), bRecursive );
@@ -855,7 +855,7 @@ void ContentImplHelper::deleted()
     m_xProvider->removeContent( this );
 }
 
-sal_Bool ContentImplHelper::exchange(
+bool ContentImplHelper::exchange(
     const uno::Reference< com::sun::star::ucb::XContentIdentifier >& rNewId )
 {
     uno::Reference< com::sun::star::ucb::XContent > xThis = this;
@@ -869,7 +869,7 @@ sal_Bool ContentImplHelper::exchange(
         // @@@
         // Big trouble. Another object with the new identity exists.
         // How shall I mutate to / merge with the other object?
-        return sal_False;
+        return false;
     }
 
     uno::Reference< com::sun::star::ucb::XContentIdentifier > xOldId
@@ -889,13 +889,13 @@ sal_Bool ContentImplHelper::exchange(
         this,
         xOldId );
     notifyContentEvent( aEvt );
-    return sal_True;
+    return true;
 }
 
 uno::Reference< com::sun::star::ucb::XCommandInfo >
 ContentImplHelper::getCommandInfo(
     const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv,
-    sal_Bool bCache )
+    bool bCache )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -912,7 +912,7 @@ ContentImplHelper::getCommandInfo(
 uno::Reference< beans::XPropertySetInfo >
 ContentImplHelper::getPropertySetInfo(
     const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv,
-    sal_Bool bCache )
+    bool bCache )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx
index b9e8a258ed0d..feb31f7b7ec0 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.cxx
@@ -117,7 +117,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
             //////////////////////////////////////////////////////////////
 
             uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
-                xSet ( m_pContent->getAdditionalPropertySet( sal_False ) );
+                xSet ( m_pContent->getAdditionalPropertySet( false ) );
 
             if ( xSet.is() )
             {
@@ -185,7 +185,7 @@ void PropertySetInfo::reset()
 }
 
 //=========================================================================
-sal_Bool PropertySetInfo::queryProperty(
+bool PropertySetInfo::queryProperty(
     const OUString& rName, beans::Property& rProp )
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -200,11 +200,11 @@ sal_Bool PropertySetInfo::queryProperty(
         if ( rCurrProp.Name == rName )
         {
             rProp = rCurrProp;
-            return sal_True;
+            return true;
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 //=========================================================================
@@ -357,7 +357,7 @@ void CommandProcessorInfo::reset()
 
 
 //=========================================================================
-sal_Bool CommandProcessorInfo::queryCommand(
+bool CommandProcessorInfo::queryCommand(
     const OUString& rName,
     com::sun::star::ucb::CommandInfo& rCommand )
 {
@@ -374,15 +374,15 @@ sal_Bool CommandProcessorInfo::queryCommand(
         if ( rCurrCommand.Name == rName )
         {
             rCommand = rCurrCommand;
-            return sal_True;
+            return true;
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 //=========================================================================
-sal_Bool CommandProcessorInfo::queryCommand(
+bool CommandProcessorInfo::queryCommand(
     sal_Int32 nHandle,
     com::sun::star::ucb::CommandInfo& rCommand )
 {
@@ -399,11 +399,11 @@ sal_Bool CommandProcessorInfo::queryCommand(
         if ( rCurrCommand.Handle == nHandle )
         {
             rCommand = rCurrCommand;
-            return sal_True;
+            return true;
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 } // namespace ucbhelper
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 5e7172e1bbd3..c0ab9002bfc1 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -83,7 +83,7 @@ struct PropertyValue
     sal_uInt32  nOrigValue;
 
     OUString    aString;    // getString
-    sal_Bool    bBoolean;   // getBoolean
+    bool    bBoolean;   // getBoolean
     sal_Int8    nByte;      // getByte
     sal_Int16   nShort;     // getShort
     sal_Int32   nInt;       // getInt
@@ -145,7 +145,7 @@ class PropertyValues : public PropertyValuesVector {};
                                                                               \
     _type_ aValue = _type_();   /* default ctor */                            \
                                                                               \
-    m_bWasNull = sal_True;                                                    \
+    m_bWasNull = true;                                                    \
                                                                               \
     if ( ( columnIndex < 1 )                                                  \
          || ( columnIndex > sal_Int32( m_pValues->size() ) ) )                \
@@ -163,7 +163,7 @@ class PropertyValues : public PropertyValuesVector {};
             {                                                                 \
                 /* Values is present natively... */                           \
                 aValue = rValue._member_name_;                                \
-                m_bWasNull = sal_False;                                       \
+                m_bWasNull = false;                                       \
             }                                                                 \
             else                                                              \
             {                                                                 \
@@ -184,7 +184,7 @@ class PropertyValues : public PropertyValuesVector {};
                         {                                                     \
                             rValue._member_name_ = aValue;                    \
                             rValue.nPropsSet |= _type_name_;                  \
-                            m_bWasNull = sal_False;                           \
+                            m_bWasNull = false;                           \
                         }                                                     \
                         else                                                  \
                         {                                                     \
@@ -204,7 +204,7 @@ class PropertyValues : public PropertyValuesVector {};
                                     {                                         \
                                         rValue._member_name_ = aValue;        \
                                         rValue.nPropsSet |= _type_name_;      \
-                                        m_bWasNull = sal_False;               \
+                                        m_bWasNull = false;               \
                                     }                                         \
                                 }                                             \
                                 catch (const IllegalArgumentException&)       \
@@ -255,8 +255,8 @@ PropertyValueSet::PropertyValueSet(
                     const Reference< XComponentContext >& rxContext )
 :  m_xContext( rxContext ),
   m_pValues( new PropertyValues ),
-  m_bWasNull( sal_False ),
-  m_bTriedToGetTypeConverter( sal_False )
+  m_bWasNull( false ),
+  m_bTriedToGetTypeConverter( false )
 
 {
 }
@@ -320,7 +320,7 @@ sal_Bool SAL_CALL PropertyValueSet::getBoolean( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
     GETVALUE_IMPL_TYPE(
-            sal_Bool, BOOLEAN_VALUE_SET, bBoolean, getCppuBooleanType() );
+            bool, BOOLEAN_VALUE_SET, bBoolean, getCppuBooleanType() );
 }
 
 //=========================================================================
@@ -435,7 +435,7 @@ Any SAL_CALL PropertyValueSet::getObject(
 
     Any aValue;
 
-    m_bWasNull = sal_True;
+    m_bWasNull = true;
 
     if ( ( columnIndex < 1 )
          || ( columnIndex > sal_Int32( m_pValues->size() ) ) )
@@ -451,7 +451,7 @@ Any SAL_CALL PropertyValueSet::getObject(
         {
             // Values is present natively...
             aValue = rValue.aObject;
-            m_bWasNull = sal_False;
+            m_bWasNull = false;
         }
         else
         {
@@ -546,7 +546,7 @@ Any SAL_CALL PropertyValueSet::getObject(
             {
                 rValue.aObject = aValue;
                 rValue.nPropsSet |= OBJECT_VALUE_SET;
-                m_bWasNull = sal_False;
+                m_bWasNull = false;
             }
         }
      }
@@ -622,7 +622,7 @@ const Reference< XTypeConverter >& PropertyValueSet::getTypeConverter()
 
     if ( !m_bTriedToGetTypeConverter && !m_xTypeConverter.is() )
     {
-        m_bTriedToGetTypeConverter = sal_True;
+        m_bTriedToGetTypeConverter = true;
         m_xTypeConverter = Converter::create(m_xContext);
 
         OSL_ENSURE( m_xTypeConverter.is(),
@@ -641,7 +641,7 @@ void PropertyValueSet::appendString( const OUString& rPropName,
 
 //=========================================================================
 void PropertyValueSet::appendBoolean( const OUString& rPropName,
-                                      sal_Bool bValue )
+                                      bool bValue )
 {
     SETVALUE_IMPL( rPropName, BOOLEAN_VALUE_SET, bBoolean, bValue );
 }
@@ -744,7 +744,7 @@ void PropertyValueSet::appendPropertySet(
 }
 
 //=========================================================================
-sal_Bool PropertyValueSet::appendPropertySetValue(
+bool PropertyValueSet::appendPropertySetValue(
                                 const Reference< XPropertySet >& rxSet,
                                 const Property& rProperty )
 {
@@ -756,7 +756,7 @@ sal_Bool PropertyValueSet::appendPropertySetValue(
             if ( aValue.hasValue() )
             {
                 appendObject( rProperty, aValue );
-                return sal_True;
+                return true;
             }
         }
         catch (const UnknownPropertyException&)
@@ -768,7 +768,7 @@ sal_Bool PropertyValueSet::appendPropertySetValue(
     }
 
     // Error.
-    return sal_False;
+    return false;
 }
 
 } // namespace ucbhelper
diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx
index 5fc0312cac88..b5b50c255642 100644
--- a/ucbhelper/source/provider/providerhelper.cxx
+++ b/ucbhelper/source/provider/providerhelper.cxx
@@ -258,7 +258,7 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry()
 
 uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
 ContentProviderImplHelper::getAdditionalPropertySet(
-    const OUString& rKey, sal_Bool bCreate )
+    const OUString& rKey, bool bCreate )
 {
     // Get propertyset registry.
     getAdditionalPropertySetRegistry();
@@ -274,13 +274,13 @@ ContentProviderImplHelper::getAdditionalPropertySet(
     return uno::Reference< com::sun::star::ucb::XPersistentPropertySet >();
 }
 
-sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet(
+bool ContentProviderImplHelper::renameAdditionalPropertySet(
     const OUString& rOldKey,
     const OUString& rNewKey,
-    sal_Bool bRecursive )
+    bool bRecursive )
 {
     if ( rOldKey == rNewKey )
-        return sal_True;
+        return true;
 
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -324,23 +324,23 @@ sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet(
                                 = rKey.replaceAt(
                                     0, rOldKey.getLength(), rNewKey );
                             if ( !renameAdditionalPropertySet(
-                                    rKey, aNewKey, sal_False ) )
-                                return sal_False;
+                                    rKey, aNewKey, false ) )
+                                return false;
                         }
                     }
                 }
             }
             else
-                return sal_False;
+                return false;
         }
         else
-            return sal_False;
+            return false;
     }
     else
     {
         // Get old property set, if exists.
         uno::Reference< com::sun::star::ucb::XPersistentPropertySet > xOldSet
-            = getAdditionalPropertySet( rOldKey, sal_False );
+            = getAdditionalPropertySet( rOldKey, false );
         if ( xOldSet.is() )
         {
             // Rename property set.
@@ -352,19 +352,19 @@ sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet(
                 xNamed->setName( rNewKey );
             }
             else
-                return sal_False;
+                return false;
         }
     }
-    return sal_True;
+    return true;
 }
 
-sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet(
+bool ContentProviderImplHelper::copyAdditionalPropertySet(
     const OUString& rSourceKey,
     const OUString& rTargetKey,
-    sal_Bool bRecursive )
+    bool bRecursive )
 {
     if ( rSourceKey == rTargetKey )
-        return sal_True;
+        return true;
 
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -408,35 +408,35 @@ sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet(
                                 = rKey.replaceAt(
                                     0, rSourceKey.getLength(), rTargetKey );
                             if ( !copyAdditionalPropertySet(
-                                    rKey, aNewKey, sal_False ) )
-                                return sal_False;
+                                    rKey, aNewKey, false ) )
+                                return false;
                         }
                     }
                 }
             }
             else
-                return sal_False;
+                return false;
         }
         else
-            return sal_False;
+            return false;
     }
     else
     {
         // Get old property set, if exists.
         uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
-            xOldPropSet = getAdditionalPropertySet( rSourceKey, sal_False );
+            xOldPropSet = getAdditionalPropertySet( rSourceKey, false );
         if ( !xOldPropSet.is() )
-            return sal_False;
+            return false;
 
         uno::Reference< beans::XPropertySetInfo > xPropSetInfo
             = xOldPropSet->getPropertySetInfo();
         if ( !xPropSetInfo.is() )
-            return sal_False;
+            return false;
 
         uno::Reference< beans::XPropertyAccess > xOldPropAccess(
             xOldPropSet, uno::UNO_QUERY );
         if ( !xOldPropAccess.is() )
-            return sal_False;
+            return false;
 
         // Obtain all values from old set.
         uno::Sequence< beans::PropertyValue > aValues
@@ -451,19 +451,19 @@ sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet(
             // Fail, if property set with new key already exists.
             uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
                 xNewPropSet
-                    = getAdditionalPropertySet( rTargetKey, sal_False );
+                    = getAdditionalPropertySet( rTargetKey, false );
             if ( xNewPropSet.is() )
-                return sal_False;
+                return false;
 
             // Create new, empty set.
-            xNewPropSet = getAdditionalPropertySet( rTargetKey, sal_True );
+            xNewPropSet = getAdditionalPropertySet( rTargetKey, true );
             if ( !xNewPropSet.is() )
-                return sal_False;
+                return false;
 
             uno::Reference< beans::XPropertyContainer > xNewPropContainer(
                 xNewPropSet, uno::UNO_QUERY );
             if ( !xNewPropContainer.is() )
-                return sal_False;
+                return false;
 
             for ( sal_Int32 n = 0; n < nCount; ++n )
             {
@@ -496,11 +496,11 @@ sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet(
             }
         }
     }
-    return sal_True;
+    return true;
 }
 
-sal_Bool ContentProviderImplHelper::removeAdditionalPropertySet(
-    const OUString& rKey, sal_Bool bRecursive )
+bool ContentProviderImplHelper::removeAdditionalPropertySet(
+    const OUString& rKey, bool bRecursive )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -541,17 +541,17 @@ sal_Bool ContentProviderImplHelper::removeAdditionalPropertySet(
                              || rCurrKey.equals( aKeyWithoutSlash ) )
                         {
                             if ( !removeAdditionalPropertySet(
-                                     rCurrKey, sal_False ) )
-                                return sal_False;
+                                     rCurrKey, false ) )
+                                return false;
                         }
                     }
                 }
             }
             else
-                return sal_False;
+                return false;
         }
         else
-            return sal_False;
+            return false;
     }
     else
     {
@@ -561,9 +561,9 @@ sal_Bool ContentProviderImplHelper::removeAdditionalPropertySet(
         if ( m_pImpl->m_xPropertySetRegistry.is() )
             m_pImpl->m_xPropertySetRegistry->removePropertySet( rKey );
         else
-            return sal_False;
+            return false;
     }
-    return sal_True;
+    return true;
 }
 
 } // namespace ucbhelper
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index beed2f1873c2..662fc1c3995c 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -89,7 +89,7 @@ class PropertySetInfo :
     uno::Sequence< beans::Property >*            m_pProps;
 
 private:
-    sal_Bool queryProperty(
+    bool queryProperty(
         const OUString& aName, beans::Property& rProp );
 
 public:
@@ -164,8 +164,8 @@ struct ResultSet_Impl
     cppu::OInterfaceContainerHelper*    m_pDisposeEventListeners;
     PropertyChangeListeners*            m_pPropertyChangeListeners;
     sal_Int32                           m_nPos;
-    sal_Bool                            m_bWasNull;
-    sal_Bool                            m_bAfterLast;
+    bool                            m_bWasNull;
+    bool                            m_bAfterLast;
 
     inline ResultSet_Impl(
         const uno::Reference< uno::XComponentContext >& rxContext,
@@ -188,8 +188,8 @@ inline ResultSet_Impl::ResultSet_Impl(
   m_pDisposeEventListeners( 0 ),
   m_pPropertyChangeListeners( 0 ),
   m_nPos( 0 ), // Position is one-based. Zero means: before first element.
-  m_bWasNull( sal_False ),
-  m_bAfterLast( sal_False )
+  m_bWasNull( false ),
+  m_bAfterLast( false )
 {
 }
 
@@ -383,7 +383,7 @@ sal_Bool SAL_CALL ResultSet::next()
     // getResult works zero-based!
     if ( !m_pImpl->m_xDataSupplier->getResult( m_pImpl->m_nPos ) )
     {
-        m_pImpl->m_bAfterLast = sal_True;
+        m_pImpl->m_bAfterLast = true;
         m_pImpl->m_xDataSupplier->validate();
         return sal_False;
     }
@@ -467,7 +467,7 @@ void SAL_CALL ResultSet::beforeFirst()
     throw( sdbc::SQLException, uno::RuntimeException )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
-    m_pImpl->m_bAfterLast = sal_False;
+    m_pImpl->m_bAfterLast = false;
     m_pImpl->m_nPos = 0;
     m_pImpl->m_xDataSupplier->validate();
 }
@@ -478,7 +478,7 @@ void SAL_CALL ResultSet::afterLast()
     throw( sdbc::SQLException, uno::RuntimeException )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
-    m_pImpl->m_bAfterLast = sal_True;
+    m_pImpl->m_bAfterLast = true;
     m_pImpl->m_xDataSupplier->validate();
 }
 
@@ -491,7 +491,7 @@ sal_Bool SAL_CALL ResultSet::first()
     if ( m_pImpl->m_xDataSupplier->getResult( 0 ) )
     {
         osl::MutexGuard aGuard( m_pImpl->m_aMutex );
-        m_pImpl->m_bAfterLast = sal_False;
+        m_pImpl->m_bAfterLast = false;
         m_pImpl->m_nPos = 1;
         m_pImpl->m_xDataSupplier->validate();
         return sal_True;
@@ -510,7 +510,7 @@ sal_Bool SAL_CALL ResultSet::last()
     if ( nCount )
     {
         osl::MutexGuard aGuard( m_pImpl->m_aMutex );
-        m_pImpl->m_bAfterLast = sal_False;
+        m_pImpl->m_bAfterLast = false;
         m_pImpl->m_nPos = nCount;
         m_pImpl->m_xDataSupplier->validate();
         return sal_True;
@@ -564,7 +564,7 @@ sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row )
         if ( ( row * -1 ) > nCount )
         {
             osl::MutexGuard aGuard( m_pImpl->m_aMutex );
-            m_pImpl->m_bAfterLast = sal_False;
+            m_pImpl->m_bAfterLast = false;
             m_pImpl->m_nPos = 0;
             m_pImpl->m_xDataSupplier->validate();
             return sal_False;
@@ -572,7 +572,7 @@ sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row )
         else // |row| <= nCount
         {
             osl::MutexGuard aGuard( m_pImpl->m_aMutex );
-            m_pImpl->m_bAfterLast = sal_False;
+            m_pImpl->m_bAfterLast = false;
             m_pImpl->m_nPos = ( nCount + row + 1 );
             m_pImpl->m_xDataSupplier->validate();
             return sal_True;
@@ -591,7 +591,7 @@ sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row )
         if ( row <= nCount )
         {
             osl::MutexGuard aGuard( m_pImpl->m_aMutex );
-            m_pImpl->m_bAfterLast = sal_False;
+            m_pImpl->m_bAfterLast = false;
             m_pImpl->m_nPos = row;
             m_pImpl->m_xDataSupplier->validate();
             return sal_True;
@@ -599,7 +599,7 @@ sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row )
         else // row > nCount
         {
             osl::MutexGuard aGuard( m_pImpl->m_aMutex );
-            m_pImpl->m_bAfterLast = sal_True;
+            m_pImpl->m_bAfterLast = true;
             m_pImpl->m_xDataSupplier->validate();
             return sal_False;
         }
@@ -635,7 +635,7 @@ sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows )
         if ( ( m_pImpl->m_nPos + rows ) > 0 )
         {
             osl::MutexGuard aGuard( m_pImpl->m_aMutex );
-            m_pImpl->m_bAfterLast = sal_False;
+            m_pImpl->m_bAfterLast = false;
             m_pImpl->m_nPos = ( m_pImpl->m_nPos + rows );
             m_pImpl->m_xDataSupplier->validate();
             return sal_True;
@@ -643,7 +643,7 @@ sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows )
         else
         {
             osl::MutexGuard aGuard( m_pImpl->m_aMutex );
-            m_pImpl->m_bAfterLast = sal_False;
+            m_pImpl->m_bAfterLast = false;
             m_pImpl->m_nPos = 0;
             m_pImpl->m_xDataSupplier->validate();
             return sal_False;
@@ -661,7 +661,7 @@ sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows )
         if ( ( m_pImpl->m_nPos + rows ) <= nCount )
         {
             osl::MutexGuard aGuard( m_pImpl->m_aMutex );
-            m_pImpl->m_bAfterLast = sal_False;
+            m_pImpl->m_bAfterLast = false;
             m_pImpl->m_nPos = ( m_pImpl->m_nPos + rows );
             m_pImpl->m_xDataSupplier->validate();
             return sal_True;
@@ -669,7 +669,7 @@ sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows )
         else
         {
             osl::MutexGuard aGuard( m_pImpl->m_aMutex );
-            m_pImpl->m_bAfterLast = sal_True;
+            m_pImpl->m_bAfterLast = true;
             m_pImpl->m_xDataSupplier->validate();
             return sal_False;
         }
@@ -691,7 +691,7 @@ sal_Bool SAL_CALL ResultSet::previous()
 
     if ( m_pImpl->m_bAfterLast )
     {
-        m_pImpl->m_bAfterLast = sal_False;
+        m_pImpl->m_bAfterLast = false;
         sal_Int32 nCount = m_pImpl->m_xDataSupplier->totalCount();
         m_pImpl->m_nPos = nCount;
     }
@@ -803,13 +803,13 @@ OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getString( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return OUString();
 }
@@ -826,13 +826,13 @@ sal_Bool SAL_CALL ResultSet::getBoolean( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getBoolean( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return sal_False;
 }
@@ -849,13 +849,13 @@ sal_Int8 SAL_CALL ResultSet::getByte( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getByte( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return 0;
 }
@@ -872,13 +872,13 @@ sal_Int16 SAL_CALL ResultSet::getShort( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getShort( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return 0;
 }
@@ -895,13 +895,13 @@ sal_Int32 SAL_CALL ResultSet::getInt( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getInt( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return 0;
 }
@@ -918,13 +918,13 @@ sal_Int64 SAL_CALL ResultSet::getLong( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getLong( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return 0;
 }
@@ -941,13 +941,13 @@ float SAL_CALL ResultSet::getFloat( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getFloat( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return 0;
 }
@@ -964,13 +964,13 @@ double SAL_CALL ResultSet::getDouble( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getDouble( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return 0;
 }
@@ -988,13 +988,13 @@ ResultSet::getBytes( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getBytes( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return uno::Sequence< sal_Int8 >();
 }
@@ -1011,13 +1011,13 @@ util::Date SAL_CALL ResultSet::getDate( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getDate( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return util::Date();
 }
@@ -1034,13 +1034,13 @@ util::Time SAL_CALL ResultSet::getTime( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getTime( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return util::Time();
 }
@@ -1058,13 +1058,13 @@ ResultSet::getTimestamp( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getTimestamp( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return util::DateTime();
 }
@@ -1082,13 +1082,13 @@ ResultSet::getBinaryStream( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getBinaryStream( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return uno::Reference< io::XInputStream >();
 }
@@ -1106,13 +1106,13 @@ ResultSet::getCharacterStream( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getCharacterStream( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return uno::Reference< io::XInputStream >();
 }
@@ -1131,13 +1131,13 @@ uno::Any SAL_CALL ResultSet::getObject(
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getObject( columnIndex, typeMap );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return uno::Any();
 }
@@ -1155,13 +1155,13 @@ ResultSet::getRef( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getRef( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return uno::Reference< sdbc::XRef >();
 }
@@ -1179,13 +1179,13 @@ ResultSet::getBlob( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getBlob( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return uno::Reference< sdbc::XBlob >();
 }
@@ -1203,13 +1203,13 @@ ResultSet::getClob( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getClob( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return uno::Reference< sdbc::XClob >();
 }
@@ -1227,13 +1227,13 @@ ResultSet::getArray( sal_Int32 columnIndex )
                                                         m_pImpl->m_nPos - 1 );
         if ( xValues.is() )
         {
-            m_pImpl->m_bWasNull = sal_False;
+            m_pImpl->m_bWasNull = false;
             m_pImpl->m_xDataSupplier->validate();
             return xValues->getArray( columnIndex );
         }
     }
 
-    m_pImpl->m_bWasNull = sal_True;
+    m_pImpl->m_bWasNull = true;
     m_pImpl->m_xDataSupplier->validate();
     return uno::Reference< sdbc::XArray >();
 }
@@ -1643,7 +1643,7 @@ sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName(
 }
 
 //=========================================================================
-sal_Bool PropertySetInfo::queryProperty(
+bool PropertySetInfo::queryProperty(
     const OUString& aName, beans::Property& rProp )
 {
     sal_Int32 nCount = m_pProps->getLength();
@@ -1654,11 +1654,11 @@ sal_Bool PropertySetInfo::queryProperty(
         if ( rCurr.Name == aName )
         {
             rProp = rCurr;
-            return sal_True;
+            return true;
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 } // namespace ucbhelper_impl
diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx
index 53a667b3c6c5..c0618c871f47 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.cxx
@@ -53,8 +53,8 @@ ResultSetImplHelper::ResultSetImplHelper(
     const uno::Reference< uno::XComponentContext >& rxContext,
     const com::sun::star::ucb::OpenCommandArgument2& rCommand )
 : m_pDisposeEventListeners( 0 ),
-  m_bStatic( sal_False ),
-  m_bInitDone( sal_False ),
+  m_bStatic( false ),
+  m_bInitDone( false ),
   m_aCommand( rCommand ),
   m_xContext( rxContext )
 {
@@ -166,7 +166,7 @@ ResultSetImplHelper::getStaticResultSet()
     if ( m_xListener.is() )
         throw com::sun::star::ucb::ListenerAlreadySetException();
 
-    init( sal_True );
+    init( true );
     return m_xResultSet1;
 }
 
@@ -194,7 +194,7 @@ void SAL_CALL ResultSetImplHelper::setListener(
     //       are a fake. This implementation will never call "notify" at the
     //       listener to propagate any changes!!!
 
-    init( sal_False );
+    init( false );
 
     uno::Any aInfo;
     aInfo <<= com::sun::star::ucb::WelcomeDynamicResultSetStruct(
@@ -273,7 +273,7 @@ void SAL_CALL ResultSetImplHelper::connectToCache(
 //
 //=========================================================================
 
-void ResultSetImplHelper::init( sal_Bool bStatic )
+void ResultSetImplHelper::init( bool bStatic )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -286,7 +286,7 @@ void ResultSetImplHelper::init( sal_Bool bStatic )
 
             OSL_ENSURE( m_xResultSet1.is(),
                         "ResultSetImplHelper::init - No 1st result set!" );
-            m_bStatic = sal_True;
+            m_bStatic = true;
         }
         else
         {
@@ -297,9 +297,9 @@ void ResultSetImplHelper::init( sal_Bool bStatic )
                         "ResultSetImplHelper::init - No 1st result set!" );
             OSL_ENSURE( m_xResultSet2.is(),
                         "ResultSetImplHelper::init - No 2nd result set!" );
-            m_bStatic = sal_False;
+            m_bStatic = false;
         }
-        m_bInitDone = sal_True;
+        m_bInitDone = true;
     }
 }
 
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index 8329c2c86dc1..6ef6ce6711b2 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -55,17 +55,17 @@ struct ResultSetMetaData_Impl
 {
     osl::Mutex                                      m_aMutex;
     std::vector< ::ucbhelper::ResultSetColumnData > m_aColumnData;
-    sal_Bool                                        m_bObtainedTypes;
-    sal_Bool                                        m_bGlobalReadOnlyValue;
+    bool                                        m_bObtainedTypes;
+    bool                                        m_bGlobalReadOnlyValue;
 
     ResultSetMetaData_Impl( sal_Int32 nSize )
-    : m_aColumnData( nSize ), m_bObtainedTypes( sal_False ),
-      m_bGlobalReadOnlyValue( sal_True ) {}
+    : m_aColumnData( nSize ), m_bObtainedTypes( false ),
+      m_bGlobalReadOnlyValue( true ) {}
 
     ResultSetMetaData_Impl(
         const std::vector< ::ucbhelper::ResultSetColumnData >& rColumnData )
-    : m_aColumnData( rColumnData ), m_bObtainedTypes( sal_False ),
-      m_bGlobalReadOnlyValue( sal_False ) {}
+    : m_aColumnData( rColumnData ), m_bObtainedTypes( false ),
+      m_bGlobalReadOnlyValue( false ) {}
 };
 
 }
@@ -85,7 +85,7 @@ namespace ucbhelper {
 ResultSetMetaData::ResultSetMetaData(
                         const Reference< XComponentContext >& rxContext,
                         const Sequence< Property >& rProps,
-                        sal_Bool bReadOnly )
+                        bool bReadOnly )
 : m_pImpl( new ResultSetMetaData_Impl( rProps.getLength() ) ),
   m_xContext( rxContext ),
   m_aProps( rProps ),
@@ -101,7 +101,7 @@ ResultSetMetaData::ResultSetMetaData(
 : m_pImpl( new ResultSetMetaData_Impl( rColumnData ) ),
   m_xContext( rxContext ),
   m_aProps( rProps ),
-  m_bReadOnly( sal_True )
+  m_bReadOnly( true )
 {
     OSL_ENSURE( rColumnData.size() == sal_uInt32( rProps.getLength() ),
                 "ResultSetMetaData ctor - different array sizes!" );
@@ -435,7 +435,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
                 // createInstance
             }
 
-            m_pImpl->m_bObtainedTypes = sal_True;
+            m_pImpl->m_bObtainedTypes = true;
         }
     }
 
diff --git a/ucbhelper/source/provider/simpleauthenticationrequest.cxx b/ucbhelper/source/provider/simpleauthenticationrequest.cxx
index b66980f2422b..ea036be0816b 100644
--- a/ucbhelper/source/provider/simpleauthenticationrequest.cxx
+++ b/ucbhelper/source/provider/simpleauthenticationrequest.cxx
@@ -32,8 +32,8 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest(
                                       const OUString & rUserName,
                                       const OUString & rPassword,
                                       const OUString & rAccount,
-                                      sal_Bool bAllowPersistentStoring,
-                                      sal_Bool bAllowUseSystemCredentials )
+                                      bool bAllowPersistentStoring,
+                                      bool bAllowUseSystemCredentials )
 {
 
     // Fill request...
@@ -56,9 +56,9 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest(
     aRequest.URL = rURL;
 
     initialize(aRequest,
-       sal_False,
-       sal_True,
-       sal_True,
+       false,
+       true,
+       true,
        aRequest.HasAccount,
        bAllowPersistentStoring,
        bAllowUseSystemCredentials );
@@ -103,19 +103,19 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest(
        eUserNameType == ENTITY_MODIFY,
        ePasswordType == ENTITY_MODIFY,
        eAccountType == ENTITY_MODIFY,
-       sal_True,
-       sal_False );
+       true,
+       false );
 }
 
 //=========================================================================
 void SimpleAuthenticationRequest::initialize(
       const ucb::URLAuthenticationRequest & rRequest,
-      sal_Bool bCanSetRealm,
-      sal_Bool bCanSetUserName,
-      sal_Bool bCanSetPassword,
-      sal_Bool bCanSetAccount,
-      sal_Bool bAllowPersistentStoring,
-      sal_Bool bAllowUseSystemCredentials )
+      bool bCanSetRealm,
+      bool bCanSetUserName,
+      bool bCanSetPassword,
+      bool bCanSetAccount,
+      bool bAllowPersistentStoring,
+      bool bAllowUseSystemCredentials )
 {
     setRequest( uno::makeAny( rRequest ) );
 
diff --git a/ucbhelper/source/provider/simplenameclashresolverequest.cxx b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
index fe7e42d2cebf..eb0c001d73cc 100644
--- a/ucbhelper/source/provider/simplenameclashresolverequest.cxx
+++ b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
@@ -28,7 +28,7 @@ SimpleNameClashResolveRequest::SimpleNameClashResolveRequest(
                                     const OUString & rTargetFolderURL,
                                     const OUString & rClashingName,
                                     const OUString & rProposedNewName,
-                                    sal_Bool bSupportsOverwriteData )
+                                    bool bSupportsOverwriteData )
 {
     // Fill request...
     ucb::NameClashResolveRequest aRequest;