ucbhelper: sal_Bool -> bool

Change-Id: Iee327c3dd75bebb35d99de01eaa7103956e08974

12 files changed, 102 insertions, 102 deletions

diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx
index c0ac7bc9559c..234158c3fc01 100644
--- a/include/ucbhelper/content.hxx
+++ b/include/ucbhelper/content.hxx
@@ -177,7 +177,7 @@ public:
       * @param rContent will be filled by this method with the content created.
       * @return true, if the operation was successful - false, otherwise.
       */
-    static sal_Bool
+    static bool
     create( const OUString& rURL,
             const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment >& rEnv,
@@ -520,7 +520,7 @@ public:
       * @param rSink is the implementation of an XActiveDataSink interface,
       *        which shall be used by the content to deliver the data.
       */
-    sal_Bool
+    bool
     openStream( const ::com::sun::star::uno::Reference<
                     ::com::sun::star::io::XActiveDataSink >& rSink )
         throw( ::com::sun::star::ucb::CommandAbortedException,
@@ -534,7 +534,7 @@ public:
       * @param rStream is the implementation of an XOutputStream interface,
       *        which shall be used by the content to deliver the data.
       */
-    sal_Bool
+    bool
     openStream( const ::com::sun::star::uno::Reference<
                     ::com::sun::star::io::XOutputStream >& rStream )
         throw( ::com::sun::star::ucb::CommandAbortedException,
@@ -553,7 +553,7 @@ public:
     void
     writeStream( const ::com::sun::star::uno::Reference<
                             ::com::sun::star::io::XInputStream >& rStream,
-                 sal_Bool bReplaceExisting )
+                 bool bReplaceExisting )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
@@ -594,7 +594,7 @@ public:
       * @param rNewContent will be filled by the implementation of this method
       *        with the new content.
       */
-    sal_Bool
+    bool
     insertNewContent( const OUString& rContentType,
                       const ::com::sun::star::uno::Sequence<
                         OUString >& rPropertyNames,
@@ -630,7 +630,7 @@ public:
       * @param rNewContent will be filled by the implementation of this method
       *        with the new content.
       */
-    sal_Bool
+    bool
     insertNewContent( const OUString& rContentType,
                       const ::com::sun::star::uno::Sequence<
                         OUString >& rPropertyNames,
@@ -672,7 +672,7 @@ public:
       *        case there was a change (introduced for the checkin operation)
       * @param rDocumentId is the document Id ( in case of CMIS ).
       */
-    sal_Bool
+    bool
     transferContent( const Content& rSourceContent,
                      InsertOperation eOperation,
                      const OUString & rTitle,
@@ -696,7 +696,7 @@ public:
       * @return true, if the content is a folder ( it can contain other
       *         UCB contents). false, otherwise.
       */
-    sal_Bool
+    bool
     isFolder()
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
@@ -707,7 +707,7 @@ public:
       * @return true, if the content is a document ( it has a content stream ).
       *         false, otherwise.
       */
-    sal_Bool
+    bool
     isDocument()
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx
index 98e1e6b5ae3c..3f9e31221485 100644
--- a/include/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
@@ -166,7 +166,7 @@ protected:
     com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >
     getPropertySetInfo( const com::sun::star::uno::Reference<
                             com::sun::star::ucb::XCommandEnvironment > & xEnv,
-                        sal_Bool bCache = sal_True );
+                        bool bCache = true );
 
     /**
       * This method returns complete meta data for the commands supported by
@@ -182,7 +182,7 @@ protected:
     com::sun::star::uno::Reference< com::sun::star::ucb::XCommandInfo >
     getCommandInfo( const com::sun::star::uno::Reference<
                             com::sun::star::ucb::XCommandEnvironment > & xEnv,
-                    sal_Bool bCache = sal_True );
+                    bool bCache = true );
 
     /**
       * This method can be used to propagate changes of property values.
@@ -238,7 +238,7 @@ protected:
       * @param  rNewId is the new content identifier for the contant.
       * @return a success indicator.
       */
-    sal_Bool exchange( const com::sun::star::uno::Reference<
+    bool exchange( const com::sun::star::uno::Reference<
                         com::sun::star::ucb::XContentIdentifier >& rNewId );
 
     /**
@@ -254,7 +254,7 @@ protected:
       */
     com::sun::star::uno::Reference<
         com::sun::star::ucb::XPersistentPropertySet >
-    getAdditionalPropertySet( sal_Bool bCreate );
+    getAdditionalPropertySet( bool bCreate );
 
     /**
       * This method renames the propertyset containing the Additional Core
@@ -266,9 +266,9 @@ protected:
       *         children described by rOldKey shall be renamed too.
       * @return True, if the operation succeeded - False, otherwise.
       */
-    sal_Bool renameAdditionalPropertySet( const OUString& rOldKey,
+    bool renameAdditionalPropertySet( const OUString& rOldKey,
                                           const OUString& rNewKey,
-                                          sal_Bool bRecursive );
+                                          bool bRecursive );
 
     /**
       * This method copies the propertyset containing the Additional Core
@@ -280,9 +280,9 @@ protected:
       *         children described by rSourceKey shall be copied too.
       * @return True, if the operation succeeded - False, otherwise.
       */
-    sal_Bool copyAdditionalPropertySet( const OUString& rSourceKey,
+    bool copyAdditionalPropertySet( const OUString& rSourceKey,
                                         const OUString& rTargetKey,
-                                        sal_Bool bRecursive );
+                                        bool bRecursive );
 
     /**
       * This method removes the propertyset containing the Additional Core
@@ -292,7 +292,7 @@ protected:
       *         children described by rOldKey shall be removed too.
       * @return True, if the operation succeeded - False, otherwise.
       */
-    sal_Bool removeAdditionalPropertySet( sal_Bool bRecursive );
+    bool removeAdditionalPropertySet( bool bRecursive );
 
 public:
     /**
diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx
index 95314adedfc3..5665c32be59e 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -58,7 +58,7 @@ class PropertySetInfo :
     ContentImplHelper*          m_pContent;
 
 private:
-    sal_Bool queryProperty( const OUString& rName,
+    bool queryProperty( const OUString& rName,
                             com::sun::star::beans::Property& rProp );
 
 public:
@@ -114,9 +114,9 @@ class CommandProcessorInfo :
     ContentImplHelper*          m_pContent;
 
 private:
-    sal_Bool queryCommand( const OUString& rName,
+    bool queryCommand( const OUString& rName,
                            com::sun::star::ucb::CommandInfo& rCommand );
-    sal_Bool queryCommand( sal_Int32 nHandle,
+    bool queryCommand( sal_Int32 nHandle,
                            com::sun::star::ucb::CommandInfo& rCommand );
 
 public:
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index 50e8fda8cd28..9abd5df481fe 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -345,13 +345,13 @@ class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication :
     com::sun::star::ucb::RememberAuthentication m_eDefaultRememberPasswordMode;
     com::sun::star::ucb::RememberAuthentication m_eRememberAccountMode;
     com::sun::star::ucb::RememberAuthentication m_eDefaultRememberAccountMode;
-    unsigned m_bCanSetRealm    : 1;
-    unsigned m_bCanSetUserName : 1;
-    unsigned m_bCanSetPassword : 1;
-    unsigned m_bCanSetAccount  : 1;
-    unsigned m_bCanUseSystemCredentials     : 1;
-    unsigned m_bDefaultUseSystemCredentials : 1;
-    unsigned m_bUseSystemCredentials        : 1;
+    bool m_bCanSetRealm    : 1;
+    bool m_bCanSetUserName : 1;
+    bool m_bCanSetPassword : 1;
+    bool m_bCanSetAccount  : 1;
+    bool m_bCanUseSystemCredentials     : 1;
+    bool m_bDefaultUseSystemCredentials : 1;
+    bool m_bUseSystemCredentials        : 1;
 
 public:
     /**
@@ -371,10 +371,10 @@ public:
       */
     inline InteractionSupplyAuthentication(
                     InteractionRequest * pRequest,
-                    sal_Bool bCanSetRealm,
-                    sal_Bool bCanSetUserName,
-                    sal_Bool bCanSetPassword,
-                    sal_Bool bCanSetAccount);
+                    bool bCanSetRealm,
+                    bool bCanSetUserName,
+                    bool bCanSetPassword,
+                    bool bCanSetAccount);
     /**
       * Constructor.
       *
@@ -411,10 +411,10 @@ public:
       */
     inline InteractionSupplyAuthentication(
                     InteractionRequest * pRequest,
-                    sal_Bool bCanSetRealm,
-                    sal_Bool bCanSetUserName,
-                    sal_Bool bCanSetPassword,
-                    sal_Bool bCanSetAccount,
+                    bool bCanSetRealm,
+                    bool bCanSetUserName,
+                    bool bCanSetPassword,
+                    bool bCanSetAccount,
                     const com::sun::star::uno::Sequence<
                         com::sun::star::ucb::RememberAuthentication > &
                             rRememberPasswordModes,
@@ -425,8 +425,8 @@ public:
                             rRememberAccountModes,
                     const com::sun::star::ucb::RememberAuthentication
                         eDefaultRememberAccountMode,
-                    sal_Bool bCanUseSystemCredentials,
-                    sal_Bool bDefaultUseSystemCredentials );
+                    bool bCanUseSystemCredentials,
+                    bool bDefaultUseSystemCredentials );
 
     // XInterface
     virtual com::sun::star::uno::Any SAL_CALL
@@ -554,16 +554,16 @@ public:
     const com::sun::star::ucb::RememberAuthentication &
     getRememberAccountMode() const { return m_eRememberAccountMode; }
 
-    sal_Bool getUseSystemCredentials() const { return m_bUseSystemCredentials; }
+    bool getUseSystemCredentials() const { return m_bUseSystemCredentials; }
 };
 
 //============================================================================
 inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
                     InteractionRequest * pRequest,
-                    sal_Bool bCanSetRealm,
-                    sal_Bool bCanSetUserName,
-                    sal_Bool bCanSetPassword,
-                    sal_Bool bCanSetAccount )
+                    bool bCanSetRealm,
+                    bool bCanSetUserName,
+                    bool bCanSetPassword,
+                    bool bCanSetAccount )
 : InteractionContinuation( pRequest ),
   m_aRememberPasswordModes( com::sun::star::uno::Sequence<
                 com::sun::star::ucb::RememberAuthentication >( 1 ) ),
@@ -579,9 +579,9 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
   m_bCanSetUserName( bCanSetUserName ),
   m_bCanSetPassword( bCanSetPassword ),
   m_bCanSetAccount( bCanSetAccount ),
-  m_bCanUseSystemCredentials( sal_False ),
-  m_bDefaultUseSystemCredentials( sal_False ),
-  m_bUseSystemCredentials( sal_False )
+  m_bCanUseSystemCredentials( false ),
+  m_bDefaultUseSystemCredentials( false ),
+  m_bUseSystemCredentials( false )
 {
     m_aRememberPasswordModes[ 0 ]
         = com::sun::star::ucb::RememberAuthentication_NO;
@@ -592,10 +592,10 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
 //============================================================================
 inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
     InteractionRequest * pRequest,
-    sal_Bool bCanSetRealm,
-    sal_Bool bCanSetUserName,
-    sal_Bool bCanSetPassword,
-    sal_Bool bCanSetAccount,
+    bool bCanSetRealm,
+    bool bCanSetUserName,
+    bool bCanSetPassword,
+    bool bCanSetAccount,
     const com::sun::star::uno::Sequence<
         com::sun::star::ucb::RememberAuthentication > & rRememberPasswordModes,
     const com::sun::star::ucb::RememberAuthentication
@@ -604,8 +604,8 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
         com::sun::star::ucb::RememberAuthentication > & rRememberAccountModes,
     const com::sun::star::ucb::RememberAuthentication
         eDefaultRememberAccountMode,
-    sal_Bool bCanUseSystemCredentials,
-    sal_Bool bDefaultUseSystemCredentials )
+    bool bCanUseSystemCredentials,
+    bool bDefaultUseSystemCredentials )
 : InteractionContinuation( pRequest ),
   m_aRememberPasswordModes( rRememberPasswordModes ),
   m_aRememberAccountModes( rRememberAccountModes ),
@@ -619,7 +619,7 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
   m_bCanSetAccount( bCanSetAccount ),
   m_bCanUseSystemCredentials( bCanUseSystemCredentials ),
   m_bDefaultUseSystemCredentials( bDefaultUseSystemCredentials ),
-  m_bUseSystemCredentials( bDefaultUseSystemCredentials & bCanUseSystemCredentials )
+  m_bUseSystemCredentials( bDefaultUseSystemCredentials && bCanUseSystemCredentials )
 {
 }
 
diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx
index c2e3ab534856..bc36ff5a1dda 100644
--- a/include/ucbhelper/interceptedinteraction.hxx
+++ b/include/ucbhelper/interceptedinteraction.hxx
@@ -78,7 +78,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
                 @attention  This parameter does not influence the check of the continuation
                             type! The continuation must be matched exactly every time ...
              */
-            sal_Bool MatchExact;
+            bool MatchExact;
 
             //-----------------------------------
             /** @short  its an unique identifier, which must be managed by the outside code.
@@ -98,7 +98,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
              */
             InterceptedRequest()
             {
-                MatchExact = sal_False;
+                MatchExact = false;
                 Handle     = INVALID_HANDLE;
             }
 
@@ -124,7 +124,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
             InterceptedRequest(      sal_Int32                    nHandle      ,
                                const ::com::sun::star::uno::Any&  aRequest     ,
                                const ::com::sun::star::uno::Type& aContinuation,
-                                     sal_Bool                     bMatchExact  )
+                                     bool                     bMatchExact  )
             {
                 Handle       = nHandle;
                 Request      = aRequest;
diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index 694fd41183b6..18663e332e08 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -64,8 +64,8 @@ class UCBHELPER_DLLPUBLIC PropertyValueSet :
                                      m_xTypeConverter;
     osl::Mutex      m_aMutex;
     PropertyValues* m_pValues;
-    sal_Bool        m_bWasNull;
-    sal_Bool        m_bTriedToGetTypeConverter;
+    bool        m_bWasNull;
+    bool        m_bTriedToGetTypeConverter;
 
 private:
     UCBHELPER_DLLPRIVATE const com::sun::star::uno::Reference<
@@ -194,12 +194,12 @@ public:
         appendString( rProp.Name, rValue );
     }
 
-    void appendBoolean( const OUString& rPropName, sal_Bool bValue );
-    void appendBoolean( const sal_Char* pAsciiPropName, sal_Bool bValue )
+    void appendBoolean( const OUString& rPropName, bool bValue );
+    void appendBoolean( const sal_Char* pAsciiPropName, bool bValue )
     {
         appendBoolean( OUString::createFromAscii( pAsciiPropName ), bValue );
     }
-    void appendBoolean( const ::com::sun::star::beans::Property& rProp, sal_Bool bValue )
+    void appendBoolean( const ::com::sun::star::beans::Property& rProp, bool bValue )
     {
         appendBoolean( rProp.Name, bValue );
     }
@@ -262,7 +262,7 @@ public:
        *    @return False, if the property value cannot be obtained from the
       *         given property pet. True, otherwise.
        */
-    sal_Bool appendPropertySetValue(
+    bool appendPropertySetValue(
                         const ::com::sun::star::uno::Reference<
                             ::com::sun::star::beans::XPropertySet >& rSet,
                         const ::com::sun::star::beans::Property& rProperty );
diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index 3f7165053d4f..f8fade48877e 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -226,7 +226,7 @@ public:
       */
     ::com::sun::star::uno::Reference<
         com::sun::star::ucb::XPersistentPropertySet >
-    getAdditionalPropertySet( const OUString& rKey, sal_Bool bCreate );
+    getAdditionalPropertySet( const OUString& rKey, bool bCreate );
 
     /**
       * This method renames the propertyset containing the Additional Core
@@ -238,9 +238,9 @@ public:
       *         children described by rOldKey shall be renamed, too.
       * @return True, if the operation succeeded - False, otherwise.
       */
-    sal_Bool renameAdditionalPropertySet( const OUString& rOldKey,
+    bool renameAdditionalPropertySet( const OUString& rOldKey,
                                           const OUString& rNewKey,
-                                          sal_Bool bRecursive );
+                                          bool bRecursive );
 
     /**
       * This method copies the propertyset containing the Additional Core
@@ -252,9 +252,9 @@ public:
       *         children described by rSourceKey shall be copied, too.
       * @return True, if the operation succeeded - False, otherwise.
       */
-    sal_Bool copyAdditionalPropertySet( const OUString& rSourceKey,
+    bool copyAdditionalPropertySet( const OUString& rSourceKey,
                                         const OUString& rTargetKey,
-                                        sal_Bool bRecursive );
+                                        bool bRecursive );
 
     /**
       * This method removes the propertyset containing the Additional Core
@@ -265,8 +265,8 @@ public:
       *         children described by rOldKey shall be removed, too.
       * @return True, if the operation succeeded - False, otherwise.
       */
-    sal_Bool removeAdditionalPropertySet( const OUString& rKey,
-                                          sal_Bool bRecursive );
+    bool removeAdditionalPropertySet( const OUString& rKey,
+                                          bool bRecursive );
 };
 
 } // namespace ucbhelper
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 46269a15738f..668a85e5d706 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -478,7 +478,7 @@ public:
      *               of the supplier; must be non-negative.
      * @return true, if there is a content at the given index.
      */
-    virtual sal_Bool getResult( sal_uInt32 nIndex ) = 0;
+    virtual bool getResult( sal_uInt32 nIndex ) = 0;
 
     /**
      * This method returns the total count of objects in the logical data array
@@ -515,7 +515,7 @@ public:
      * @return true, if the value returned by currentCount() won't change
                anymore.
      */
-    virtual sal_Bool isCountFinal() = 0;
+    virtual bool isCountFinal() = 0;
 
     /**
      * This method returns an object for accessing the property values at
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index 898280ffc040..2d070115b60d 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -59,8 +59,8 @@ class UCBHELPER_DLLPUBLIC ResultSetImplHelper :
                 public com::sun::star::ucb::XDynamicResultSet
 {
     cppu::OInterfaceContainerHelper* m_pDisposeEventListeners;
-    sal_Bool                         m_bStatic;
-    sal_Bool                         m_bInitDone;
+    bool                         m_bStatic;
+    bool                         m_bInitDone;
 
 protected:
     osl::Mutex                                           m_aMutex;
@@ -78,7 +78,7 @@ protected:
         com::sun::star::ucb::XDynamicResultSetListener > m_xListener;
 
 private:
-    UCBHELPER_DLLPRIVATE void init( sal_Bool bStatic );
+    UCBHELPER_DLLPRIVATE void init( bool bStatic );
 
     /**
       * Your implementation of this method has to fill the protected member
@@ -194,7 +194,7 @@ public:
       *
       * @return true, if the resultset type is "static". False, otherwise.
       */
-    sal_Bool isStatic() const { return m_bStatic; }
+    bool isStatic() const { return m_bStatic; }
 };
 
 }
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 30795815a98d..91fee4531069 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -52,22 +52,22 @@ namespace ucbhelper
 struct ResultSetColumnData
 {
     /** @see ResultSetMetaData::isAutoIncrement */
-    sal_Bool        isAutoIncrement;
+    bool        isAutoIncrement;
 
     /** @see ResultSetMetaData::isCaseSensitive */
-    sal_Bool        isCaseSensitive;
+    bool        isCaseSensitive;
 
     /** @see ResultSetMetaData::isSearchable */
-    sal_Bool        isSearchable;
+    bool        isSearchable;
 
     /** @see ResultSetMetaData::isCurrency */
-    sal_Bool        isCurrency;
+    bool        isCurrency;
 
     /** @see ResultSetMetaData::isNullable */
     sal_Int32       isNullable;
 
     /** @see ResultSetMetaData::isSigned */
-    sal_Bool        isSigned;
+    bool        isSigned;
 
     /** @see ResultSetMetaData::getColumnDisplaySize */
     sal_Int32       columnDisplaySize;
@@ -94,13 +94,13 @@ struct ResultSetColumnData
     OUString columnTypeName;
 
     /** @see ResultSetMetaData::isReadOnly */
-    sal_Bool        isReadOnly;
+    bool        isReadOnly;
 
     /** @see ResultSetMetaData::isWritable */
-    sal_Bool        isWritable;
+    bool        isWritable;
 
     /** @see ResultSetMetaData::isDefinitelyWritable */
-    sal_Bool        isDefinitelyWritable;
+    bool        isDefinitelyWritable;
 
     /** @see ResultSetMetaData::getColumnServiceName */
     OUString columnServiceName;
@@ -112,18 +112,18 @@ struct ResultSetColumnData
 //       may havily depend on the behaviour of the default constructor.
 
 ResultSetColumnData::ResultSetColumnData()
-: isAutoIncrement( sal_False ),
-  isCaseSensitive( sal_True ),
-  isSearchable( sal_False ),
-  isCurrency( sal_False ),
+: isAutoIncrement( false ),
+  isCaseSensitive( true ),
+  isSearchable( false ),
+  isCurrency( false ),
   isNullable( ::com::sun::star::sdbc::ColumnValue::NULLABLE ),
-  isSigned( sal_False ),
+  isSigned( false ),
   columnDisplaySize( 16 ),
   precision( -1 ),
   scale( 0 ),
-  isReadOnly( sal_True ),
-  isWritable( sal_False ),
-  isDefinitelyWritable( sal_False )
+  isReadOnly( true ),
+  isWritable( false ),
+  isDefinitelyWritable( false )
 {
 }
 
@@ -148,7 +148,7 @@ protected:
         ::com::sun::star::uno::XComponentContext >     m_xContext;
     ::com::sun::star::uno::Sequence<
         ::com::sun::star::beans::Property >            m_aProps;
-    sal_Bool m_bReadOnly;
+    bool m_bReadOnly;
 
 public:
 
@@ -166,7 +166,7 @@ public:
                 ::com::sun::star::uno::XComponentContext >& rxContext,
             const ::com::sun::star::uno::Sequence<
                 ::com::sun::star::beans::Property >& rProps,
-            sal_Bool bReadOnly = sal_True );
+            bool bReadOnly = true );
 
     /**
       * Constructor.
diff --git a/include/ucbhelper/simpleauthenticationrequest.hxx b/include/ucbhelper/simpleauthenticationrequest.hxx
index d51ce6d90d43..85e949e45490 100644
--- a/include/ucbhelper/simpleauthenticationrequest.hxx
+++ b/include/ucbhelper/simpleauthenticationrequest.hxx
@@ -56,12 +56,12 @@ class UCBHELPER_DLLPUBLIC SimpleAuthenticationRequest : public ucbhelper::Intera
 
 private:
     void initialize( const ::com::sun::star::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 );
 
 public:
     /** Specification whether some entity (realm, username, password, account)
@@ -96,8 +96,8 @@ public:
                                  const OUString & rUserName,
                                  const OUString & rPassword,
                                  const OUString & rAccount,
-                                 sal_Bool bAllowPersistentStoring,
-                                 sal_Bool bAllowUseSystemCredentials );
+                                 bool bAllowPersistentStoring,
+                                 bool bAllowUseSystemCredentials );
 
 
     /**
diff --git a/include/ucbhelper/simplenameclashresolverequest.hxx b/include/ucbhelper/simplenameclashresolverequest.hxx
index e5ced512c5f6..33a58b3baed6 100644
--- a/include/ucbhelper/simplenameclashresolverequest.hxx
+++ b/include/ucbhelper/simplenameclashresolverequest.hxx
@@ -58,7 +58,7 @@ public:
     SimpleNameClashResolveRequest( const OUString & rTargetFolderURL,
                                    const OUString & rClashingName,
                                    const OUString & rProposedNewName,
-                                   sal_Bool bSupportsOverwriteData = sal_True );
+                                   bool bSupportsOverwriteData = true );
     /**
       * This method returns the new name that was supplied by the interaction
       * handler.