comphelper: sal_Bool -> bool

Change-Id: I6fc331ae0706f4bb193543011c8d4ae0a385fcc0

30 files changed, 122 insertions, 122 deletions

diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx
index c11e2ccdd6ba..7ba220c7ebff 100644
--- a/include/comphelper/MasterPropertySet.hxx
+++ b/include/comphelper/MasterPropertySet.hxx
@@ -35,10 +35,10 @@ namespace comphelper
     {
         ChainablePropertySet * mpSlave;
         ::com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > mxSlave;
-        sal_Bool mbInit;
+        bool mbInit;
         SlaveData ( ChainablePropertySet *pSlave);
-        inline sal_Bool IsInit () { return mbInit;}
-        inline void SetInit ( sal_Bool bInit) { mbInit = bInit; }
+        inline bool IsInit () { return mbInit;}
+        inline void SetInit ( bool bInit) { mbInit = bInit; }
     };
 }
 typedef std::map < sal_uInt8, comphelper::SlaveData* > SlaveMap;
diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx
index 114373df8db0..e9ceb1b6246d 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -70,15 +70,15 @@ namespace comphelper
          ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier>  m_xSet;
         OSelectionChangeListener*                   m_pListener;
         sal_Int32                                   m_nLockCount;
-        sal_Bool                                    m_bListening        : 1;
-        sal_Bool                                    m_bAutoSetRelease   : 1;
+        bool                                    m_bListening        : 1;
+        bool                                    m_bAutoSetRelease   : 1;
 
         OSelectionChangeMultiplexer(const OSelectionChangeMultiplexer&);
         OSelectionChangeMultiplexer& operator=(const OSelectionChangeMultiplexer&);
     protected:
         virtual ~OSelectionChangeMultiplexer();
     public:
-        OSelectionChangeMultiplexer(OSelectionChangeListener* _pListener, const  ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier>& _rxSet, sal_Bool _bAutoReleaseSet = sal_True);
+        OSelectionChangeMultiplexer(OSelectionChangeListener* _pListener, const  ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier>& _rxSet, bool _bAutoReleaseSet = true);
 
     // XEventListener
         virtual void SAL_CALL disposing( const  ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException);
diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx
index b352371537fe..090c5076f7e4 100644
--- a/include/comphelper/accessiblecomponenthelper.hxx
+++ b/include/comphelper/accessiblecomponenthelper.hxx
@@ -54,7 +54,7 @@ namespace comphelper
             note: getLocationOnScreen relies on a valid parent (XAccessibleContext::getParent()->getAccessibleContext()),
                  which itself implements XAccessibleComponent
         */
-        sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+        bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
         ::com::sun::star::awt::Point SAL_CALL getLocation(  ) throw (::com::sun::star::uno::RuntimeException);
         ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(  ) throw (::com::sun::star::uno::RuntimeException);
         ::com::sun::star::awt::Size SAL_CALL getSize(  ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx
index 3cab201feabb..7790db4d02c6 100644
--- a/include/comphelper/accessiblecontexthelper.hxx
+++ b/include/comphelper/accessiblecontexthelper.hxx
@@ -217,7 +217,7 @@ namespace comphelper
 
         // life time control
         /// checks whether the object is alive (returns <TRUE/> then) or disposed
-        sal_Bool    isAlive() const;
+        bool    isAlive() const;
         /// checks for beeing alive. If the object is already disposed (i.e. not alive), an exception is thrown.
         void        ensureAlive() const SAL_THROW( ( ::com::sun::star::lang::DisposedException ) );
 
diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx
index 4876ace41739..bbffc9347342 100644
--- a/include/comphelper/accessibleselectionhelper.hxx
+++ b/include/comphelper/accessibleselectionhelper.hxx
@@ -56,7 +56,7 @@ namespace comphelper
             throw ( ::com::sun::star::uno::RuntimeException ) = 0;
 
         // return if the specified child is visible => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx)
-        virtual sal_Bool
+        virtual bool
             implIsSelected( sal_Int32 nAccessibleChildIndex )
             throw (::com::sun::star::uno::RuntimeException) = 0;
 
@@ -70,7 +70,7 @@ namespace comphelper
         /** non-virtual versions of the methods which can be implemented using <method>implIsSelected</method> and <method>implSelect</method>
         */
         void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
         void SAL_CALL clearAccessibleSelection(  ) throw (::com::sun::star::uno::RuntimeException);
         void SAL_CALL selectAllAccessibleChildren(  ) throw (::com::sun::star::uno::RuntimeException);
         sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx
index c307d00cf3e1..e2c832c7104d 100644
--- a/include/comphelper/accessibletexthelper.hxx
+++ b/include/comphelper/accessibletexthelper.hxx
@@ -52,14 +52,14 @@ namespace comphelper
 
         ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator >             implGetBreakIterator();
         ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification >   implGetCharacterClassification();
-        sal_Bool                                implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength );
-        virtual sal_Bool                        implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength );
-        virtual sal_Bool                        implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength );
+        bool                                implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength );
+        virtual bool                        implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength );
+        virtual bool                        implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength );
         virtual OUString                 implGetText() = 0;
         virtual ::com::sun::star::lang::Locale  implGetLocale() = 0;
         virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) = 0;
         virtual void                            implGetGlyphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
-        virtual sal_Bool                        implGetWordBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
+        virtual bool                        implGetWordBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
         virtual void                            implGetSentenceBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
         virtual void                            implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
         virtual void                            implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx
index 8bcb914bcc29..7aa4b4418523 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -339,7 +339,7 @@ namespace comphelper
         ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible >
                                 m_aOwningAccessible;    // the XAccessible which belongs to the XAccessibleContext which we work for
         AccessibleMap           m_aChildrenMap;         // for caching children
-        sal_Bool                m_bTransientChildren;   // are we prohibited to cache our children?
+        bool                m_bTransientChildren;   // are we prohibited to cache our children?
 
     public:
         /// ctor
@@ -350,7 +350,7 @@ namespace comphelper
         /** specifies if the children are to be consideren transient (i.e.: not cached)
             <p>to be called only once per lifetime</p>
         */
-        void    setTransientChildren( sal_Bool _bSet = sal_True );
+        void    setTransientChildren( bool _bSet = true );
 
         /** sets the XAccessible which belongs to the XAccessibleContext which we work for
             <p>to be called only once per lifetime</p>
@@ -361,7 +361,7 @@ namespace comphelper
         ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
                 getAccessibleWrapperFor(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxKey,
-                    sal_Bool _bCreate = sal_True
+                    bool _bCreate = true
                 );
 
         /// erases the given key from the map (if it is present there)
diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx
index defc617fe66c..29f905d4de0e 100644
--- a/include/comphelper/accimplaccess.hxx
+++ b/include/comphelper/accimplaccess.hxx
@@ -120,7 +120,7 @@ namespace comphelper
             <TRUE/> in case of success, <FALSE/> otherwise. For error condition please look at
             <method>getImplementation</method>.
         */
-        static sal_Bool setAccessibleParent(
+        static bool setAccessibleParent(
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxComponent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxNewParent
         );
diff --git a/include/comphelper/basicio.hxx b/include/comphelper/basicio.hxx
index 119608d8d48e..7b0c35410825 100644
--- a/include/comphelper/basicio.hxx
+++ b/include/comphelper/basicio.hxx
@@ -33,9 +33,9 @@ namespace stario    = ::com::sun::star::io;
 namespace staruno   = ::com::sun::star::uno;
 namespace starawt   = ::com::sun::star::awt;
 
-// sal_Bool
-COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Bool& _rVal);
-COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Bool _bVal);
+// bool
+COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, bool& _rVal);
+COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, bool _bVal);
 
 // OUString
 COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, OUString& _rStr);
diff --git a/include/comphelper/container.hxx b/include/comphelper/container.hxx
index 715424fcbc27..6739f90312b4 100644
--- a/include/comphelper/container.hxx
+++ b/include/comphelper/container.hxx
@@ -60,14 +60,14 @@ public:
     virtual void Invalidate() { m_xCurrentObject = NULL; }
 
 protected:
-    virtual sal_Bool ShouldHandleElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& /*rElement*/) { return sal_True; }
+    virtual bool ShouldHandleElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& /*rElement*/) { return true; }
 
         // This can be used to exclude certain elements; elements for which
         // this function returns sal_True will be simply skipped.
         // If this element is returned from Next(), then one can get
         // here get a little more information on the element.
         // That's why this method is not const.
-    virtual sal_Bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& /*xContainer*/) const { return sal_True; }
+    virtual bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& /*xContainer*/) const { return true; }
 };
 
 //.........................................................................
diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx
index 92b2731166c2..b275be2d93ab 100644
--- a/include/comphelper/docpasswordhelper.hxx
+++ b/include/comphelper/docpasswordhelper.hxx
@@ -129,7 +129,7 @@ public:
             <FALSE/> otherwise
       */
 
-    static sal_Bool IsModifyPasswordCorrect(
+    static bool IsModifyPasswordCorrect(
                 const OUString& aPassword,
                 const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aInfo );
 
diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx
index 1360a4342e13..f2c13d87e076 100644
--- a/include/comphelper/docpasswordrequest.hxx
+++ b/include/comphelper/docpasswordrequest.hxx
@@ -48,7 +48,7 @@ public:
     explicit    SimplePasswordRequest( com::sun::star::task::PasswordRequestMode eMode );
     virtual     ~SimplePasswordRequest();
 
-    sal_Bool            isPassword() const;
+    bool            isPassword() const;
 
     OUString     getPassword() const;
 
@@ -77,15 +77,15 @@ public:
                             DocPasswordRequestType eType,
                             ::com::sun::star::task::PasswordRequestMode eMode,
                             const OUString& rDocumentName,
-                            sal_Bool bPasswordToModify = sal_False );
+                            bool bPasswordToModify = false );
     virtual             ~DocPasswordRequest();
 
-    sal_Bool            isPassword() const;
+    bool            isPassword() const;
 
     OUString     getPassword() const;
 
     OUString     getPasswordToModify() const;
-    sal_Bool            getRecommendReadOnly() const;
+    bool            getRecommendReadOnly() const;
 
 private:
     // XInteractionRequest
diff --git a/include/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx
index dd1de2074014..742ae4a2d56f 100644
--- a/include/comphelper/embeddedobjectcontainer.hxx
+++ b/include/comphelper/embeddedobjectcontainer.hxx
@@ -58,7 +58,7 @@ class COMPHELPER_DLLPUBLIC EmbeddedObjectContainer
 
 public:
     // add an embedded object to the container storage
-    sal_Bool            StoreEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString&, sal_Bool );
+    bool            StoreEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString&, bool );
 
     // add an embedded object that has been imported from the container storage - should only be called by filters!
     void                AddEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, const OUString& );
@@ -70,7 +70,7 @@ public:
                         ~EmbeddedObjectContainer();
 
     void                SwitchPersistence( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& );
-    sal_Bool            CommitImageSubStorage();
+    bool            CommitImageSubStorage();
     void                ReleaseImageSubStorage();
 
     OUString     CreateUniqueObjectName();
@@ -79,12 +79,12 @@ public:
     com::sun::star::uno::Sequence < OUString > GetObjectNames();
 
     // check for existence of objects at all
-    sal_Bool            HasEmbeddedObjects();
+    bool            HasEmbeddedObjects();
 
     // check existence of an object - either by identity or by name
-    sal_Bool            HasEmbeddedObject( const OUString& );
-    sal_Bool            HasEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );
-    sal_Bool            HasInstantiatedEmbeddedObject( const OUString& );
+    bool            HasEmbeddedObject( const OUString& );
+    bool            HasEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );
+    bool            HasInstantiatedEmbeddedObject( const OUString& );
 
     // get the object name of an object - this is the persist name if the object has persistence
     OUString     GetEmbeddedObjectName( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );
@@ -101,7 +101,7 @@ public:
                         const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, OUString& );
 
     // insert an embedded object into the container - objects persistent representation will be added to the storage
-    sal_Bool            InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString& );
+    bool            InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString& );
 
     // load an embedded object from a MediaDescriptor and insert it into the container
     // a new object will be created from the new content and returned
@@ -122,18 +122,18 @@ public:
     ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, /* TODO const OUString& aOrigName,*/ OUString& rName );
 
     // move an embedded object from one container to another one
-    sal_Bool MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString& );
+    bool MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString& );
 
     // remove an embedded object from the container and from the storage; if object can't be closed
     // #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary storage+
-    sal_Bool            RemoveEmbeddedObject( const OUString& rName, sal_Bool bClose = sal_True, sal_Bool bKeepToTempStorage = sal_True );
-    sal_Bool            RemoveEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, sal_Bool bClose = sal_True, sal_Bool bKeepToTempStorage = sal_True );
+    bool            RemoveEmbeddedObject( const OUString& rName, bool bClose = true, bool bKeepToTempStorage = true );
+    bool            RemoveEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, bool bClose = true, bool bKeepToTempStorage = true );
 
     // close and remove an embedded object from the container without removing it from the storage
-    sal_Bool            CloseEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );
+    bool            CloseEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );
 
     // move an embedded object to another container (keep the persistent name)
-    sal_Bool            MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& );
+    bool            MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& );
 
     // get the stored graphical representation for the object
     com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetGraphicStream( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString* pMediaType=0 );
@@ -142,23 +142,23 @@ public:
     com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetGraphicStream( const OUString& aName, OUString* pMediaType=0 );
 
     // add a graphical representation for an object
-    sal_Bool            InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType );
+    bool            InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType );
 
     // try to add a graphical representation for an object in optimized way ( might fail )
-    sal_Bool            InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType );
+    bool            InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType );
 
     // remove a graphical representation for an object
-    sal_Bool            RemoveGraphicStream( const OUString& rObjectName );
+    bool            RemoveGraphicStream( const OUString& rObjectName );
 
     // copy the graphical representation from different container
-    sal_Bool            TryToCopyGraphReplacement( EmbeddedObjectContainer& rSrc,
+    bool            TryToCopyGraphReplacement( EmbeddedObjectContainer& rSrc,
                                                     const OUString& aOrigName,
                                                     const OUString& aTargetName );
 
     void                CloseEmbeddedObjects();
-    sal_Bool            StoreChildren(sal_Bool _bOasisFormat,sal_Bool _bObjectsOnly);
-    sal_Bool            StoreAsChildren( sal_Bool _bOasisFormat
-                                        ,sal_Bool _bCreateEmbedded
+    bool            StoreChildren(bool _bOasisFormat,bool _bObjectsOnly);
+    bool            StoreAsChildren( bool _bOasisFormat
+                                        ,bool _bCreateEmbedded
                                         ,const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& _xStorage);
 
     static com::sun::star::uno::Reference< com::sun::star::io::XInputStream > GetGraphicReplacementStream(
@@ -172,7 +172,7 @@ public:
     * \param _bClearModifedFlag If <TRUE/> then the modified flag will be set to <FALSE/> otherwise nothing happen.
     * \return <FALSE/> if no error occurred, otherwise <TRUE/>.
     */
-    sal_Bool             SetPersistentEntries(const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& _xStorage,bool _bClearModifedFlag = true);
+    bool             SetPersistentEntries(const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& _xStorage,bool _bClearModifedFlag = true);
 };
 
 }
diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx
index 3753772bd4d0..97eb69c6979b 100644
--- a/include/comphelper/enumhelper.hxx
+++ b/include/comphelper/enumhelper.hxx
@@ -61,7 +61,7 @@ class COMPHELPER_DLLPUBLIC OEnumerationByName : private OEnumerationLock
     staruno::Sequence< OUString >                m_aNames;
     sal_Int32                                           m_nPos;
     staruno::Reference< starcontainer::XNameAccess >    m_xAccess;
-    sal_Bool                                            m_bListening;
+    bool                                            m_bListening;
 
 public:
     OEnumerationByName(const staruno::Reference< starcontainer::XNameAccess >& _rxAccess);
@@ -92,7 +92,7 @@ class COMPHELPER_DLLPUBLIC OEnumerationByIndex : private OEnumerationLock
 {
     sal_Int32                                         m_nPos;
     staruno::Reference< starcontainer::XIndexAccess > m_xAccess;
-    sal_Bool                                          m_bListening;
+    bool                                          m_bListening;
 
 public:
     OEnumerationByIndex(const staruno::Reference< starcontainer::XIndexAccess >& _rxAccess);
diff --git a/include/comphelper/extract.hxx b/include/comphelper/extract.hxx
index 04be9ec3f55b..6d401e66ae16 100644
--- a/include/comphelper/extract.hxx
+++ b/include/comphelper/extract.hxx
@@ -54,12 +54,12 @@ inline ::com::sun::star::uno::Any SAL_CALL int2enum(
  * @param rAny          enum or int
  * @param sal_True if enum or int value was set else sal_False.
  */
-inline sal_Bool SAL_CALL enum2int( sal_Int32 & rnEnum, const ::com::sun::star::uno::Any & rAny )
+inline bool SAL_CALL enum2int( sal_Int32 & rnEnum, const ::com::sun::star::uno::Any & rAny )
 {
     if (rAny.getValueTypeClass() == ::com::sun::star::uno::TypeClass_ENUM)
     {
         rnEnum = * reinterpret_cast< const int * >( rAny.getValue() );
-        return sal_True;
+        return true;
     }
 
     return rAny >>= rnEnum;
@@ -110,7 +110,7 @@ inline ::com::sun::star::uno::Any SAL_CALL enum2any( E eEnum )
  * @return sal_True if any reference (including the null ref) was retrieved from any else sal_False.
  */
 template< class T >
-inline sal_Bool SAL_CALL extractInterface(
+inline bool SAL_CALL extractInterface(
     ::com::sun::star::uno::Reference< T > & rxOut,
     const ::com::sun::star::uno::Any & rAny )
 {
@@ -124,7 +124,7 @@ inline sal_Bool SAL_CALL extractInterface(
  * a ::com::sun::star::lang::IllegalArgumentException is thrown
  *
  */
-inline sal_Bool SAL_CALL any2bool( const ::com::sun::star::uno::Any & rAny )
+inline bool SAL_CALL any2bool( const ::com::sun::star::uno::Any & rAny )
     throw( ::com::sun::star::lang::IllegalArgumentException )
 {
     if (rAny.getValueTypeClass() == ::com::sun::star::uno::TypeClass_BOOLEAN)
@@ -146,7 +146,7 @@ inline sal_Bool SAL_CALL any2bool( const ::com::sun::star::uno::Any & rAny )
  * @DEPRECATED : use makeAny< sal_Bool >()
  *
  */
-inline ::com::sun::star::uno::Any SAL_CALL bool2any( sal_Bool bBool )
+inline ::com::sun::star::uno::Any SAL_CALL bool2any( bool bBool )
 {
     return ::com::sun::star::uno::Any( &bBool, ::getCppuBooleanType() );
 }
diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx
index 85cbc6acddb8..09e30e7d90af 100644
--- a/include/comphelper/interaction.hxx
+++ b/include/comphelper/interaction.hxx
@@ -43,19 +43,19 @@ namespace comphelper
     */
     class OInteractionSelect
     {
-        sal_Bool    m_bSelected : 1;    /// indicates if the select event occurred
+        bool    m_bSelected : 1;    /// indicates if the select event occurred
 
     protected:
-        OInteractionSelect() : m_bSelected(sal_False) { }
+        OInteractionSelect() : m_bSelected(false) { }
 
     public:
         /// determines whether or not this handler was selected
-        sal_Bool    wasSelected() const { return m_bSelected; }
+        bool    wasSelected() const { return m_bSelected; }
         /// resets the state to "not selected", so you may reuse the handler
-        void        reset() { m_bSelected = sal_False; }
+        void        reset() { m_bSelected = false; }
 
     protected:
-        void    implSelected() { m_bSelected = sal_True; }
+        void    implSelected() { m_bSelected = true; }
     };
 
     //=========================================================================
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index a9ebc86f1103..ce7b829e3779 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -57,7 +57,7 @@ namespace comphelper
         inline OUString convertLogArgToString( sal_Int32   _nValue ) { return OUString::number( _nValue ); }
         inline OUString convertLogArgToString( sal_Int16   _nValue ) { return OUString::number( _nValue ); }
         inline OUString convertLogArgToString( sal_Unicode _nValue ) { return OUString( _nValue ); }
-        inline OUString convertLogArgToString( sal_Bool    _bValue ) { return OUString::boolean( _bValue ); }
+        inline OUString convertLogArgToString( bool    _bValue ) { return OUString::boolean( _bValue ); }
 
     } } // namespace log::convert
 
diff --git a/include/comphelper/mimeconfighelper.hxx b/include/comphelper/mimeconfighelper.hxx
index c8fcfddaf81b..1203c2b6847e 100644
--- a/include/comphelper/mimeconfighelper.hxx
+++ b/include/comphelper/mimeconfighelper.hxx
@@ -73,7 +73,7 @@ public:
                         const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xObjectProps );
 
-    sal_Bool GetVerbByShortcut( const OUString& aVerbShortcut,
+    bool GetVerbByShortcut( const OUString& aVerbShortcut,
                                 ::com::sun::star::embed::VerbDescriptor& aDescriptor );
 
     OUString GetExplicitlyRegisteredObjClassID( const OUString& aMediaType );
@@ -106,7 +106,7 @@ public:
 
     OUString UpdateMediaDescriptorWithFilterName(
                         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr,
-                        sal_Bool bIgnoreType );
+                        bool bIgnoreType );
     OUString UpdateMediaDescriptorWithFilterName(
                         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr,
                         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObject );
@@ -127,7 +127,7 @@ public:
                         sal_Int32 nMustFlags,
                         sal_Int32 nDontFlags );
 
-    static sal_Bool ClassIDsEqual( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID1,
+    static bool ClassIDsEqual( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID1,
                         const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID2 );
     static ::com::sun::star::uno::Sequence< sal_Int8 > GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
                                                 sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11,
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index 78be2ee22151..ad7cb4e3f528 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -154,7 +154,7 @@ public:
 
     /** returns information about a property given by handle
     */
-    sal_Bool getPropertyByHandle( sal_Int32 _nHandle, ::com::sun::star::beans::Property& _rProperty ) const;
+    bool getPropertyByHandle( sal_Int32 _nHandle, ::com::sun::star::beans::Property& _rProperty ) const;
 
 
     enum PropertyOrigin
@@ -206,7 +206,7 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet>    m_xAggregateFastSet;
 
     internal::PropertyForwarder*    m_pForwarder;
-    sal_Bool                        m_bListening : 1;
+    bool                        m_bListening : 1;
 
 public:
     OPropertySetAggregationHelper( ::cppu::OBroadcastHelper& rBHelper );
diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx
index 911df7fd9f56..ab2e795902c2 100644
--- a/include/comphelper/property.hxx
+++ b/include/comphelper/property.hxx
@@ -94,7 +94,7 @@ COMPHELPER_DLLPUBLIC void ModifyPropertyAttributes(staruno::Sequence<starbeans::
 //------------------------------------------------------------------
 /** check if the given set has the given property.
 */
-COMPHELPER_DLLPUBLIC sal_Bool hasProperty(const OUString& _rName, const staruno::Reference<starbeans::XPropertySet>& _rxSet);
+COMPHELPER_DLLPUBLIC bool hasProperty(const OUString& _rName, const staruno::Reference<starbeans::XPropertySet>& _rxSet);
 
 //------------------------------------------------------------------
 /** copy properties between property sets, in compliance with the property
@@ -117,16 +117,16 @@ COMPHELPER_DLLPUBLIC void copyProperties(const staruno::Reference<starbeans::XPr
     @exception      InvalidArgumentException thrown if the value could not be converted to the requested type (which is the template argument)
 */
 template <typename T>
-sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, const T& _rCurrentValue)
+bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, const T& _rCurrentValue)
 {
-    sal_Bool bModified(sal_False);
+    bool bModified(false);
     T aNewValue = T();
     ::cppu::convertPropertyValue(aNewValue, _rValueToSet);
     if (aNewValue != _rCurrentValue)
     {
         _rConvertedValue <<= aNewValue;
         _rOldValue <<= _rCurrentValue;
-        bModified = sal_True;
+        bModified = true;
     }
     return bModified;
 }
@@ -141,13 +141,13 @@ sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /
     @exception      InvalidArgumentException thrown if the value could not be converted to the requested type (which is the template argument)
 */
 template <class ENUMTYPE>
-sal_Bool tryPropertyValueEnum(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, const ENUMTYPE& _rCurrentValue)
+bool tryPropertyValueEnum(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, const ENUMTYPE& _rCurrentValue)
 {
     if (cppu::getTypeFavourUnsigned(&_rCurrentValue).getTypeClass()
         != staruno::TypeClass_ENUM)
         return tryPropertyValue(_rConvertedValue, _rOldValue, _rValueToSet, _rCurrentValue);
 
-    sal_Bool bModified(sal_False);
+    bool bModified(false);
     ENUMTYPE aNewValue;
     ::cppu::any2enum(aNewValue, _rValueToSet);
         // will throw an exception if not convertible
@@ -156,7 +156,7 @@ sal_Bool tryPropertyValueEnum(staruno::Any& /*out*/_rConvertedValue, staruno::An
     {
         _rConvertedValue <<= aNewValue;
         _rOldValue <<= _rCurrentValue;
-        bModified = sal_True;
+        bModified = true;
     }
     return bModified;
 }
@@ -170,16 +170,16 @@ sal_Bool tryPropertyValueEnum(staruno::Any& /*out*/_rConvertedValue, staruno::An
                     sal_False, if the value could be converted and has not changed
     @exception      InvalidArgumentException thrown if the value could not be converted to a boolean type
 */
-inline sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, sal_Bool _bCurrentValue)
+inline bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, bool _bCurrentValue)
 {
-    sal_Bool bModified(sal_False);
+    bool bModified(false);
     sal_Bool bNewValue(sal_False);
     ::cppu::convertPropertyValue(bNewValue, _rValueToSet);
-    if (bNewValue != _bCurrentValue)
+    if (bool(bNewValue) != _bCurrentValue)
     {
         _rConvertedValue.setValue(&bNewValue, ::getBooleanCppuType());
         _rOldValue.setValue(&_bCurrentValue, ::getBooleanCppuType());
-        bModified = sal_True;
+        bModified = true;
     }
     return bModified;
 }
@@ -194,7 +194,7 @@ inline sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno:
                     sal_False, if the value could be converted and has not changed
     @exception      InvalidArgumentException thrown if the value could not be converted to the requested type (which is the template argument)
 */
-COMPHELPER_DLLPUBLIC sal_Bool tryPropertyValue(staruno::Any& _rConvertedValue, staruno::Any& _rOldValue, const staruno::Any& _rValueToSet, const staruno::Any& _rCurrentValue, const staruno::Type& _rExpectedType);
+COMPHELPER_DLLPUBLIC bool tryPropertyValue(staruno::Any& _rConvertedValue, staruno::Any& _rOldValue, const staruno::Any& _rValueToSet, const staruno::Any& _rCurrentValue, const staruno::Type& _rExpectedType);
 
 //.........................................................................
 }
diff --git a/include/comphelper/propertycontainerhelper.hxx b/include/comphelper/propertycontainerhelper.hxx
index a70b73aea26c..821903de3639 100644
--- a/include/comphelper/propertycontainerhelper.hxx
+++ b/include/comphelper/propertycontainerhelper.hxx
@@ -85,7 +85,7 @@ private:
     typedef Properties::const_iterator              ConstPropertiesIterator;
     Properties      m_aProperties;
 
-    sal_Bool        m_bUnused;
+    bool        m_bUnused;
 
 protected:
     OPropertyContainerHelper();
@@ -139,14 +139,14 @@ protected:
 
 
     /// checkes whether a property with the given handle has been registered
-    sal_Bool    isRegisteredProperty( sal_Int32 _nHandle ) const;
+    bool    isRegisteredProperty( sal_Int32 _nHandle ) const;
 
     /// checkes whether a property with the given name has been registered
-    sal_Bool    isRegisteredProperty( const OUString& _rName ) const;
+    bool    isRegisteredProperty( const OUString& _rName ) const;
 
 
     // helper for implementing OPropertySetHelper overridables
-    sal_Bool    convertFastPropertyValue(
+    bool    convertFastPropertyValue(
                     ::com::sun::star::uno::Any & rConvertedValue,
                     ::com::sun::star::uno::Any & rOldValue,
                     sal_Int32 nHandle,
diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx
index 02799f9ab049..83b9a905c2cf 100644
--- a/include/comphelper/propmultiplex.hxx
+++ b/include/comphelper/propmultiplex.hxx
@@ -75,13 +75,13 @@ namespace comphelper
          ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>   m_xSet;
         OPropertyChangeListener*                    m_pListener;
         sal_Int32                                   m_nLockCount;
-        sal_Bool                                    m_bListening        : 1;
-        sal_Bool                                    m_bAutoSetRelease   : 1;
+        bool                                    m_bListening        : 1;
+        bool                                    m_bAutoSetRelease   : 1;
 
 
         virtual ~OPropertyChangeMultiplexer();
     public:
-        OPropertyChangeMultiplexer(OPropertyChangeListener* _pListener, const  ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxSet, sal_Bool _bAutoReleaseSet = sal_True);
+        OPropertyChangeMultiplexer(OPropertyChangeListener* _pListener, const  ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxSet, bool _bAutoReleaseSet = true);
 
     // XEventListener
         virtual void SAL_CALL disposing( const  ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException);
diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index ecc9e9030914..00677549ab96 100644
--- a/include/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.hxx
@@ -87,7 +87,7 @@ protected:
         // the size of the virtual stream. This is not the size of the sequence, but the number of bytes written
         // into the stream at a given moment.
 
-    sal_Bool                                        m_bConnected;
+    bool                                        m_bConnected;
         // closeOutput has been called ?
 
     ::osl::Mutex                                    m_aMutex;
diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx
index 3cafedf0f622..38947231b713 100644
--- a/include/comphelper/sequence.hxx
+++ b/include/comphelper/sequence.hxx
@@ -38,7 +38,7 @@ namespace comphelper
     /** search the given string within the given sequence, return the positions where it was found.
         if _bOnlyFirst is sal_True, only the first occurrence will be returned.
     */
-    COMPHELPER_DLLPUBLIC staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< OUString >& _rList, const OUString& _rValue, sal_Bool _bOnlyFirst = sal_False);
+    COMPHELPER_DLLPUBLIC staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< OUString >& _rList, const OUString& _rValue, bool _bOnlyFirst = false);
 
     namespace internal
     {
@@ -126,7 +126,7 @@ namespace comphelper
         */
         OSequenceIterator(const ::com::sun::star::uno::Any& _rSequenceAny);
 
-        sal_Bool hasMoreElements() const;
+        bool hasMoreElements() const;
         ::com::sun::star::uno::Any  nextElement();
 
     private:
@@ -151,7 +151,7 @@ namespace comphelper
         ,m_pCurrent(NULL)
     {
         ::com::sun::star::uno::Sequence< TYPE > aContainer;
-        sal_Bool bSuccess = _rSequenceAny >>= aContainer;
+        bool bSuccess = _rSequenceAny >>= aContainer;
         OSL_ENSURE(bSuccess, "OSequenceIterator::OSequenceIterator: invalid Any!");
         (void)bSuccess;
         construct(aContainer);
@@ -168,7 +168,7 @@ namespace comphelper
 
     //---------------------------------------------------------------------
     template <class TYPE>
-    sal_Bool OSequenceIterator<TYPE>::hasMoreElements() const
+    bool OSequenceIterator<TYPE>::hasMoreElements() const
     {
         return m_pCurrent - m_pElements < m_nLen;
     }
diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx
index f33bdd52360c..f5e495f2e1cc 100644
--- a/include/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
@@ -172,7 +172,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
             @return A const Any, which
                     contains all items of this map.
          */
-        const ::com::sun::star::uno::Any getAsConstAny(::sal_Bool bAsPropertyValue) const;
+        const ::com::sun::star::uno::Any getAsConstAny(bool bAsPropertyValue) const;
 
         //---------------------------------------
         /** @short  return this map instance to as a
@@ -262,16 +262,16 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
                     FALSE if it already exists.
          */
         template< class TValueType >
-        sal_Bool createItemIfMissing(const OUString& sKey  ,
+        bool createItemIfMissing(const OUString& sKey  ,
                                      const TValueType&      aValue)
         {
             if (find(sKey) == end())
             {
                 (*this)[sKey] = ::com::sun::star::uno::makeAny(aValue);
-                return sal_True;
+                return true;
             }
 
-            return sal_False;
+            return false;
         }
 
         //---------------------------------------
@@ -290,7 +290,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
                     TRUE if all items of Rcheck could be found
                     in these map; FALSE otherwise.
          */
-        sal_Bool match(const SequenceAsHashMap& rCheck) const;
+        bool match(const SequenceAsHashMap& rCheck) const;
 
         //---------------------------------------
         /** @short  merge all values from the given map into
diff --git a/include/comphelper/stillreadwriteinteraction.hxx b/include/comphelper/stillreadwriteinteraction.hxx
index dee1cfaa0f31..2b758ed3fc28 100644
--- a/include/comphelper/stillreadwriteinteraction.hxx
+++ b/include/comphelper/stillreadwriteinteraction.hxx
@@ -34,16 +34,16 @@ private:
     static const sal_Int32 HANDLE_INTERACTIVEIOEXCEPTION       = 0;
     static const sal_Int32 HANDLE_UNSUPPORTEDDATASINKEXCEPTION = 1;
 
-    sal_Bool m_bUsed;
-    sal_Bool m_bHandledByMySelf;
-    sal_Bool m_bHandledByInternalHandler;
+    bool m_bUsed;
+    bool m_bHandledByMySelf;
+    bool m_bHandledByInternalHandler;
 
 public:
     StillReadWriteInteraction(const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xHandler);
 
     void resetInterceptions();
     void resetErrorStates();
-    sal_Bool wasWriteError();
+    bool wasWriteError();
 
 private:
     virtual ucbhelper::InterceptedInteraction::EInterceptionState intercepted(const ::ucbhelper::InterceptedInteraction::InterceptedRequest&                         aRequest,
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 52a558760a7b..73726f7c7564 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -60,15 +60,15 @@ public:
 //------------------------------------------------------------------------
 class UStringMixEqual: public std::binary_function<OUString, OUString, bool>
 {
-    sal_Bool m_bCaseSensitive;
+    bool m_bCaseSensitive;
 
 public:
-    UStringMixEqual(sal_Bool bCaseSensitive = sal_True):m_bCaseSensitive(bCaseSensitive){}
+    UStringMixEqual(bool bCaseSensitive = true):m_bCaseSensitive(bCaseSensitive){}
     bool operator() (const OUString& lhs, const OUString& rhs) const
     {
         return m_bCaseSensitive ? lhs.equals( rhs ) : lhs.equalsIgnoreAsciiCase( rhs );
     }
-    sal_Bool isCaseSensitive() const {return m_bCaseSensitive;}
+    bool isCaseSensitive() const {return m_bCaseSensitive;}
 };
 //------------------------------------------------------------------------
 class TPropertyValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::PropertyValue,OUString,bool>
diff --git a/include/comphelper/storagehelper.hxx b/include/comphelper/storagehelper.hxx
index 1bf5f9a5b8c3..35255ada5185 100644
--- a/include/comphelper/storagehelper.hxx
+++ b/include/comphelper/storagehelper.hxx
@@ -148,7 +148,7 @@ public:
             sal_Int32 nStorageMode,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
                             = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >(),
-            sal_Bool bRepairStorage = sal_False )
+            bool bRepairStorage = false )
         throw ( ::com::sun::star::uno::Exception );
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
@@ -157,7 +157,7 @@ public:
             const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >& xStream,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
                             = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >(),
-            sal_Bool bRepairStorage = sal_False )
+            bool bRepairStorage = false )
         throw ( ::com::sun::star::uno::Exception );
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
@@ -167,17 +167,17 @@ public:
             sal_Int32 nStorageMode = ::com::sun::star::embed::ElementModes::READWRITE,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
                             = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >(),
-            sal_Bool bRepairStorage = sal_False )
+            bool bRepairStorage = false )
         throw ( ::com::sun::star::uno::Exception );
 
     static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >
         CreatePackageEncryptionData(
             const OUString& aPassword );
 
-    static sal_Bool IsValidZipEntryFileName( const OUString& aName, sal_Bool bSlashAllowed );
-    static sal_Bool IsValidZipEntryFileName( const sal_Unicode *pChar, sal_Int32 nLength, sal_Bool bSlashAllowed );
+    static bool IsValidZipEntryFileName( const OUString& aName, bool bSlashAllowed );
+    static bool IsValidZipEntryFileName( const sal_Unicode *pChar, sal_Int32 nLength, bool bSlashAllowed );
 
-    static sal_Bool PathHasSegment( const OUString& aPath, const OUString& aSegment );
+    static bool PathHasSegment( const OUString& aPath, const OUString& aSegment );
 
     // Methods to allow easy use of hierachical names inside storages
 
diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx
index b57ff3595c89..3adf5cc290d6 100644
--- a/include/comphelper/types.hxx
+++ b/include/comphelper/types.hxx
@@ -51,20 +51,20 @@ namespace comphelper
         The comparison is deep, means if one of the Any's contains an Any which contains an Any ..., this is resolved <br/>
         Other types recognized currently : FontDescriptor, ::com::sun::star::util::Date/Tim/DateTime, staruno::Sequence<sal_Int8>
     */
-    COMPHELPER_DLLPUBLIC sal_Bool compare(const staruno::Any& rLeft, const staruno::Any& rRight);
+    COMPHELPER_DLLPUBLIC bool compare(const staruno::Any& rLeft, const staruno::Any& rRight);
 
     //-------------------------------------------------------------------------
     /** compare two FontDescriptor's
     */
-    COMPHELPER_DLLPUBLIC sal_Bool   operator ==(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight);
-    inline  sal_Bool    operator !=(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight)
+    COMPHELPER_DLLPUBLIC bool   operator ==(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight);
+    inline  bool    operator !=(const starawt::FontDescriptor& _rLeft, const starawt::FontDescriptor& _rRight)
     {
         return !(_rLeft == _rRight);
     }
 
     //-------------------------------------------------------------------------
     /// returns sal_True if objects of the types given are "compatible"
-    COMPHELPER_DLLPUBLIC sal_Bool isAssignableFrom(const staruno::Type& _rAssignable, const staruno::Type& _rFrom);
+    COMPHELPER_DLLPUBLIC bool isAssignableFrom(const staruno::Type& _rAssignable, const staruno::Type& _rFrom);
 
     //-------------------------------------------------------------------------
     /** just a small shortcut ...
@@ -75,7 +75,7 @@ namespace comphelper
         So this function is nearly senseless ....
     */
     template <class TYPE>
-    sal_Bool isA(const staruno::Type& _rType, TYPE* pDummy)
+    bool isA(const staruno::Type& _rType, TYPE* pDummy)
     {
         return  _rType.equals(cppu::getTypeFavourUnsigned(pDummy));
     }
@@ -85,7 +85,7 @@ namespace comphelper
         same comment as for the other isA ....
     */
     template <class TYPE>
-    sal_Bool isA(const staruno::Any& _rVal, TYPE* pDummy)
+    bool isA(const staruno::Any& _rVal, TYPE* pDummy)
     {
         return  _rVal.getValueType().equals(
             cppu::getTypeFavourUnsigned(pDummy));
@@ -95,7 +95,7 @@ namespace comphelper
     /** check if a type you have at hand at runtime is equal to another type you have at compile time
     */
     template <class TYPE>
-    sal_Bool isAReference(const staruno::Any& _rVal, TYPE*)
+    bool isAReference(const staruno::Any& _rVal, TYPE*)
     {
         return  _rVal.getValueType().equals(
             cppu::getTypeFavourUnsigned(
@@ -117,7 +117,7 @@ namespace comphelper
     }
     //-------------------------------------------------------------------------
     template <class TYPE>
-    sal_Bool getImplementation(TYPE*& _pObject, const staruno::Reference< staruno::XInterface >& _rxIFace)
+    bool getImplementation(TYPE*& _pObject, const staruno::Reference< staruno::XInterface >& _rxIFace)
     {
         _pObject = NULL;
         staruno::Reference< starlang::XUnoTunnel > xTunnel(_rxIFace, staruno::UNO_QUERY);
@@ -153,16 +153,16 @@ namespace comphelper
     COMPHELPER_DLLPUBLIC double         getDouble(const staruno::Any& _rAny);
     COMPHELPER_DLLPUBLIC float          getFloat(const staruno::Any& _rAny);
     COMPHELPER_DLLPUBLIC OUString    getString(const staruno::Any& _rAny);
-    COMPHELPER_DLLPUBLIC sal_Bool       getBOOL(const staruno::Any& _rAny);
+    COMPHELPER_DLLPUBLIC bool       getBOOL(const staruno::Any& _rAny);
 
     COMPHELPER_DLLPUBLIC sal_Int32      getEnumAsINT32(const staruno::Any& _rAny) throw(starlang::IllegalArgumentException);
 
 //= replacement of some former UsrAny.setXXX methods - can be used with rvalues
-    inline void setBOOL(staruno::Any& _rAny, sal_Bool _b)
+    inline void setBOOL(staruno::Any& _rAny, bool _b)
     { _rAny.setValue(&_b, ::getBooleanCppuType()); }
 
 //= extension of ::cppu::makeAny()
-    inline staruno::Any makeBoolAny(sal_Bool _b)
+    inline staruno::Any makeBoolAny(bool _b)
     { return staruno::Any(&_b, ::getBooleanCppuType()); }
 
 //.........................................................................
diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx
index eb159b8b7662..ffe0be0a6a99 100644
--- a/include/comphelper/uno3.hxx
+++ b/include/comphelper/uno3.hxx
@@ -230,7 +230,7 @@ namespace comphelper
                 ....
     */
     template <class iface>
-    sal_Bool query_aggregation(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >& _rxAggregate, ::com::sun::star::uno::Reference<iface>& _rxOut)
+    bool query_aggregation(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >& _rxAggregate, ::com::sun::star::uno::Reference<iface>& _rxOut)
     {
         _rxOut = static_cast<iface*>(NULL);
         if (_rxAggregate.is())
@@ -250,7 +250,7 @@ namespace comphelper
                 ....
     */
     template <class iface>
-    sal_Bool query_interface(const InterfaceRef& _rxObject, ::com::sun::star::uno::Reference<iface>& _rxOut)
+    bool query_interface(const InterfaceRef& _rxObject, ::com::sun::star::uno::Reference<iface>& _rxOut)
     {
         _rxOut = static_cast<iface*>(NULL);
         if (_rxObject.is())
@@ -263,7 +263,7 @@ namespace comphelper
                 return _rxOut.is();
             }
         }
-        return sal_False;
+        return false;
     }
 
 //.........................................................................