cppu: sal_Bool -> bool

Change-Id: I1288f1f6f38d1475b4eb5272509e479bd9f2552d

5 files changed, 131 insertions, 131 deletions

diff --git a/cppu/source/uno/assign.hxx b/cppu/source/uno/assign.hxx
index 655fe4c6d2e4..bd65d72df3d0 100644
--- a/cppu/source/uno/assign.hxx
+++ b/cppu/source/uno/assign.hxx
@@ -62,13 +62,13 @@ inline void * _queryInterface(
     return pSource;
 }
 //==================================================================================================
-sal_Bool assignStruct(
+bool assignStruct(
     void * pDest, void * pSource,
     typelib_CompoundTypeDescription * pTypeDescr,
     uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
     SAL_THROW(());
 //--------------------------------------------------------------------------------------------------
-inline sal_Bool _assignStruct(
+inline bool _assignStruct(
     void * pDest, void * pSource,
     typelib_CompoundTypeDescription * pTypeDescr,
     uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
@@ -80,7 +80,7 @@ inline sal_Bool _assignStruct(
         if (! assignStruct( pDest, pSource, pTypeDescr->pBaseTypeDescription,
                             queryInterface, acquire, release ))
         {
-            return sal_False;
+            return false;
         }
     }
     // then copy members
@@ -95,13 +95,13 @@ inline sal_Bool _assignStruct(
                                      ppTypeRefs[nDescr],
                                      queryInterface, acquire, release ))
         {
-            return sal_False;
+            return false;
         }
     }
-    return sal_True;
+    return true;
 }
 //--------------------------------------------------------------------------------------------------
-inline sal_Bool _assignData(
+inline bool _assignData(
     void * pDest,
     typelib_TypeDescriptionReference * pDestType, typelib_TypeDescription * pDestTypeDescr,
     void * pSource,
@@ -116,7 +116,7 @@ inline sal_Bool _assignData(
     {
         _destructData( pDest, pDestType, pDestTypeDescr, release );
         _defaultConstructData( pDest, pDestType, pDestTypeDescr );
-        return sal_True;
+        return true;
     }
     while (typelib_TypeClass_ANY == pSourceType->eTypeClass)
     {
@@ -124,7 +124,7 @@ inline sal_Bool _assignData(
         pSourceType = ((uno_Any *)pSource)->pType;
         pSource = ((uno_Any *)pSource)->pData;
         if (pDest == pSource)
-            return sal_True;
+            return true;
     }
 
     switch (pDestType->eTypeClass)
@@ -136,195 +136,195 @@ inline sal_Bool _assignData(
         {
         case typelib_TypeClass_CHAR:
             *(sal_Unicode *)pDest = *(sal_Unicode *)pSource;
-            return sal_True;
+            return true;
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_BOOLEAN:
         switch (pSourceType->eTypeClass)
         {
         case typelib_TypeClass_BOOLEAN:
             *(sal_Bool *)pDest = (*(sal_Bool *)pSource != sal_False);
-            return sal_True;
+            return true;
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_BYTE:
         switch (pSourceType->eTypeClass)
         {
         case typelib_TypeClass_BYTE:
             *(sal_Int8 *)pDest = *(sal_Int8 *)pSource;
-            return sal_True;
+            return true;
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_SHORT:
         switch (pSourceType->eTypeClass)
         {
         case typelib_TypeClass_BYTE:
             *(sal_Int16 *)pDest = *(sal_Int8 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_SHORT:
         case typelib_TypeClass_UNSIGNED_SHORT:
             *(sal_Int16 *)pDest = *(sal_Int16 *)pSource;
-            return sal_True;
+            return true;
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_UNSIGNED_SHORT:
         switch (pSourceType->eTypeClass)
         {
         case typelib_TypeClass_BYTE:
             *(sal_uInt16 *)pDest = *(sal_Int8 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_SHORT:
         case typelib_TypeClass_UNSIGNED_SHORT:
             *(sal_uInt16 *)pDest = *(sal_uInt16 *)pSource;
-            return sal_True;
+            return true;
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_LONG:
         switch (pSourceType->eTypeClass)
         {
         case typelib_TypeClass_BYTE:
             *(sal_Int32 *)pDest = *(sal_Int8 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_SHORT:
             *(sal_Int32 *)pDest = *(sal_Int16 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_UNSIGNED_SHORT:
             *(sal_Int32 *)pDest = *(sal_uInt16 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_LONG:
         case typelib_TypeClass_UNSIGNED_LONG:
             *(sal_Int32 *)pDest = *(sal_Int32 *)pSource;
-            return sal_True;
+            return true;
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_UNSIGNED_LONG:
         switch (pSourceType->eTypeClass)
         {
         case typelib_TypeClass_BYTE:
             *(sal_uInt32 *)pDest = *(sal_Int8 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_SHORT:
             *(sal_uInt32 *)pDest = *(sal_Int16 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_UNSIGNED_SHORT:
             *(sal_uInt32 *)pDest = *(sal_uInt16 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_LONG:
         case typelib_TypeClass_UNSIGNED_LONG:
             *(sal_uInt32 *)pDest = *(sal_uInt32 *)pSource;
-            return sal_True;
+            return true;
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_HYPER:
         switch (pSourceType->eTypeClass)
         {
         case typelib_TypeClass_BYTE:
             *(sal_Int64 *)pDest = *(sal_Int8 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_SHORT:
             *(sal_Int64 *)pDest = *(sal_Int16 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_UNSIGNED_SHORT:
             *(sal_Int64 *)pDest = *(sal_uInt16 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_LONG:
             *(sal_Int64 *)pDest = *(sal_Int32 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_UNSIGNED_LONG:
             *(sal_Int64 *)pDest = *(sal_uInt32 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_HYPER:
         case typelib_TypeClass_UNSIGNED_HYPER:
             *(sal_Int64 *)pDest = *(sal_Int64 *)pSource;
-            return sal_True;
+            return true;
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_UNSIGNED_HYPER:
         switch (pSourceType->eTypeClass)
         {
         case typelib_TypeClass_BYTE:
             *(sal_uInt64 *)pDest = *(sal_Int8 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_SHORT:
             *(sal_uInt64 *)pDest = *(sal_Int16 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_UNSIGNED_SHORT:
             *(sal_uInt64 *)pDest = *(sal_uInt16 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_LONG:
             *(sal_uInt64 *)pDest = *(sal_Int32 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_UNSIGNED_LONG:
             *(sal_uInt64 *)pDest = *(sal_uInt32 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_HYPER:
         case typelib_TypeClass_UNSIGNED_HYPER:
             *(sal_uInt64 *)pDest = *(sal_uInt64 *)pSource;
-            return sal_True;
+            return true;
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_FLOAT:
         switch (pSourceType->eTypeClass)
         {
         case typelib_TypeClass_BYTE:
             *(float *)pDest = *(sal_Int8 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_SHORT:
             *(float *)pDest = *(sal_Int16 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_UNSIGNED_SHORT:
             *(float *)pDest = *(sal_uInt16 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_FLOAT:
             *(float *)pDest = *(float *)pSource;
-            return sal_True;
+            return true;
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_DOUBLE:
         switch (pSourceType->eTypeClass)
         {
         case typelib_TypeClass_BYTE:
             *(double *)pDest = *(sal_Int8 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_SHORT:
             *(double *)pDest = *(sal_Int16 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_UNSIGNED_SHORT:
             *(double *)pDest = *(sal_uInt16 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_LONG:
             *(double *)pDest = *(sal_Int32 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_UNSIGNED_LONG:
             *(double *)pDest = *(sal_uInt32 *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_FLOAT:
             *(double *)pDest = *(float *)pSource;
-            return sal_True;
+            return true;
         case typelib_TypeClass_DOUBLE:
             *(double *)pDest = *(double *)pSource;
-            return sal_True;
+            return true;
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_STRING:
         switch (pSourceType->eTypeClass)
         {
         case typelib_TypeClass_STRING:
             ::rtl_uString_assign( (rtl_uString **)pDest, *(rtl_uString **)pSource );
-            return sal_True;
+            return true;
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_TYPE:
         switch (pSourceType->eTypeClass)
@@ -335,28 +335,28 @@ inline sal_Bool _assignData(
             ::typelib_typedescriptionreference_release( *pp );
             *pp = *(typelib_TypeDescriptionReference **)pSource;
             TYPE_ACQUIRE( *pp );
-            return sal_True;
+            return true;
         }
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_ANY:
         _destructAny( (uno_Any *)pDest, release );
         _copyConstructAny( (uno_Any *)pDest, pSource, pSourceType, pSourceTypeDescr, acquire, 0 );
-        return sal_True;
+        return true;
     case typelib_TypeClass_ENUM:
         if (_type_equals( pDestType, pSourceType ))
         {
             *(sal_Int32 *)pDest = *(sal_Int32 *)pSource;
-            return sal_True;
+            return true;
         }
-        return sal_False;
+        return false;
     case typelib_TypeClass_STRUCT:
     case typelib_TypeClass_EXCEPTION:
         if (typelib_TypeClass_STRUCT == pSourceType->eTypeClass ||
             typelib_TypeClass_EXCEPTION == pSourceType->eTypeClass)
         {
-            sal_Bool bRet = sal_False;
+            bool bRet = false;
             if (pSourceTypeDescr)
             {
                 typelib_CompoundTypeDescription * pTypeDescr =
@@ -393,29 +393,29 @@ inline sal_Bool _assignData(
             }
             return bRet;
         }
-        return sal_False;
+        return false;
     case typelib_TypeClass_SEQUENCE:
         if (typelib_TypeClass_SEQUENCE != pSourceType->eTypeClass)
-            return sal_False;
+            return false;
         // self assignment:
         if (*(uno_Sequence **)pSource == *(uno_Sequence **)pDest)
-            return sal_True;
+            return true;
         if (_type_equals( pDestType, pSourceType ))
         {
             osl_atomic_increment( &(*(uno_Sequence **)pSource)->nRefCount );
             idestructSequence(
                 *(uno_Sequence **)pDest, pDestType, pDestTypeDescr, release );
             *(uno_Sequence **)pDest = *(uno_Sequence **)pSource;
-            return sal_True;
+            return true;
         }
-        return sal_False;
+        return false;
     case typelib_TypeClass_INTERFACE:
         if (typelib_TypeClass_INTERFACE != pSourceType->eTypeClass)
-            return sal_False;
+            return false;
         if (_type_equals( pDestType, pSourceType ))
         {
             _assignInterface( (void **)pDest, *(void **)pSource, acquire, release );
-            return sal_True;
+            return true;
         }
         else if (*static_cast< void ** >(pSource) == 0)
         {
@@ -455,7 +455,7 @@ inline sal_Bool _assignData(
         }
     default:
         OSL_ASSERT(false);
-        return sal_False;
+        return false;
     }
 }
 
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index 5c29088a049f..da358d62a141 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -140,7 +140,7 @@ void destructStruct(
     _destructStruct( pValue, pTypeDescr, release );
 }
 //==================================================================================================
-sal_Bool equalStruct(
+bool equalStruct(
     void * pDest, void *pSource,
     typelib_CompoundTypeDescription * pTypeDescr,
     uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
@@ -149,7 +149,7 @@ sal_Bool equalStruct(
     return _equalStruct( pDest, pSource, pTypeDescr, queryInterface, release );
 }
 //==================================================================================================
-sal_Bool assignStruct(
+bool assignStruct(
     void * pDest, void * pSource,
     typelib_CompoundTypeDescription * pTypeDescr,
     uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
@@ -178,7 +178,7 @@ void destructSequence(
 }
 
 //==================================================================================================
-sal_Bool equalSequence(
+bool equalSequence(
     uno_Sequence * pDest, uno_Sequence * pSource,
     typelib_TypeDescriptionReference * pElementType,
     uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx
index c1496cb77900..482a1979d1b8 100644
--- a/cppu/source/uno/eq.hxx
+++ b/cppu/source/uno/eq.hxx
@@ -33,16 +33,16 @@ namespace cppu
 //##################################################################################################
 
 //--------------------------------------------------------------------------------------------------
-inline sal_Bool _equalObject(
+inline bool _equalObject(
     void * pI1, void * pI2,
     uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
     SAL_THROW(())
 {
     if (pI1 == pI2)
-        return sal_True;
+        return true;
     if ((0 == pI1) || (0 == pI2))
-        return sal_False;
-    sal_Bool bRet = sal_False;
+        return false;
+    bool bRet = false;
 
     typelib_TypeDescriptionReference * type_XInterface =
         * typelib_static_type_getByTypeClass( typelib_TypeClass_INTERFACE );
@@ -63,13 +63,13 @@ inline sal_Bool _equalObject(
 }
 
 //==================================================================================================
-sal_Bool equalStruct(
+bool equalStruct(
     void * pDest, void *pSource,
     typelib_CompoundTypeDescription * pTypeDescr,
     uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
     SAL_THROW(());
 //--------------------------------------------------------------------------------------------------
-inline sal_Bool _equalStruct(
+inline bool _equalStruct(
     void * pDest, void *pSource,
     typelib_CompoundTypeDescription * pTypeDescr,
     uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
@@ -78,7 +78,7 @@ inline sal_Bool _equalStruct(
     if (pTypeDescr->pBaseTypeDescription &&
         !equalStruct( pDest, pSource, pTypeDescr->pBaseTypeDescription, queryInterface, release ))
     {
-        return sal_False;
+        return false;
     }
 
     typelib_TypeDescriptionReference ** ppTypeRefs = pTypeDescr->ppTypeRefs;
@@ -94,31 +94,31 @@ inline sal_Bool _equalStruct(
                                     ppTypeRefs[nDescr],
                                     queryInterface, release ))
         {
-            return sal_False;
+            return false;
         }
     }
-    return sal_True;
+    return true;
 }
 //==================================================================================================
-sal_Bool equalSequence(
+bool equalSequence(
     uno_Sequence * pDest, uno_Sequence * pSource,
     typelib_TypeDescriptionReference * pElementType,
     uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
     SAL_THROW(());
 //--------------------------------------------------------------------------------------------------
-inline sal_Bool _equalSequence(
+inline bool _equalSequence(
     uno_Sequence * pDest, uno_Sequence * pSource,
     typelib_TypeDescriptionReference * pElementType,
     uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
     SAL_THROW(())
 {
     if (pDest == pSource)
-        return sal_True;
+        return true;
     sal_Int32 nElements = pDest->nElements;
     if (nElements != pSource->nElements)
-        return sal_False;
+        return false;
     if (! nElements)
-        return sal_True;
+        return true;
 
     void * pDestElements = pDest->elements;
     void * pSourceElements = pSource->elements;
@@ -134,10 +134,10 @@ inline sal_Bool _equalSequence(
             if ((((sal_Bool *)pDestElements)[nPos] != sal_False) !=
                 (((sal_Bool *)pSourceElements)[nPos] != sal_False))
             {
-                return sal_False;
+                return false;
             }
         }
-        return sal_True;
+        return true;
     }
     case typelib_TypeClass_BYTE:
         return (0 == memcmp( pDestElements, pSourceElements, sizeof(sal_Int8) * nElements ));
@@ -155,27 +155,27 @@ inline sal_Bool _equalSequence(
         for ( sal_Int32 nPos = nElements; nPos--; )
         {
             if (((float *)pDestElements)[nPos] != ((float *)pSourceElements)[nPos])
-                return sal_False;
+                return false;
         }
-        return sal_True;
+        return true;
     }
     case typelib_TypeClass_DOUBLE:
     {
         for ( sal_Int32 nPos = nElements; nPos--; )
         {
             if (((double *)pDestElements)[nPos] != ((double *)pSourceElements)[nPos])
-                return sal_False;
+                return false;
         }
-        return sal_True;
+        return true;
     }
     case typelib_TypeClass_STRING:
     {
         for ( sal_Int32 nPos = nElements; nPos--; )
         {
             if (! ((::rtl::OUString *)pDestElements +nPos)->equals( ((const ::rtl::OUString *)pSourceElements)[nPos] ))
-                return sal_False;
+                return false;
         }
-        return sal_True;
+        return true;
     }
     case typelib_TypeClass_TYPE:
     {
@@ -184,10 +184,10 @@ inline sal_Bool _equalSequence(
             if (! _type_equals( ((typelib_TypeDescriptionReference **)pDestElements)[nPos],
                                 ((typelib_TypeDescriptionReference **)pSourceElements)[nPos] ))
             {
-                return sal_False;
+                return false;
             }
         }
-        return sal_True;
+        return true;
     }
     case typelib_TypeClass_ANY:
     {
@@ -199,10 +199,10 @@ inline sal_Bool _equalSequence(
                                         pSource2->pData, pSource2->pType,
                                         queryInterface, release ))
             {
-                return sal_False;
+                return false;
             }
         }
-        return sal_True;
+        return true;
     }
     case typelib_TypeClass_ENUM:
         return (0 == memcmp( pDestElements, pSourceElements, sizeof(sal_Int32) * nElements ));
@@ -220,11 +220,11 @@ inline sal_Bool _equalSequence(
                                 queryInterface, release ))
             {
                 TYPELIB_DANGER_RELEASE( pElementTypeDescr );
-                return sal_False;
+                return false;
             }
         }
         TYPELIB_DANGER_RELEASE( pElementTypeDescr );
-        return sal_True;
+        return true;
     }
     case typelib_TypeClass_SEQUENCE: // sequence of sequence
     {
@@ -239,11 +239,11 @@ inline sal_Bool _equalSequence(
                                  pSeqElementType, queryInterface, release ))
             {
                 TYPELIB_DANGER_RELEASE( pElementTypeDescr );
-                return sal_False;
+                return false;
             }
         }
         TYPELIB_DANGER_RELEASE( pElementTypeDescr );
-        return sal_True;
+        return true;
     }
     case typelib_TypeClass_INTERFACE:
     {
@@ -252,18 +252,18 @@ inline sal_Bool _equalSequence(
             if (! _equalObject( ((void **)pDestElements)[nPos], ((void **)pSourceElements)[nPos],
                                 queryInterface, release ))
             {
-                return sal_False;
+                return false;
             }
         }
-        return sal_True;
+        return true;
     }
     default:
         OSL_ASSERT(false);
-        return sal_False;
+        return false;
     }
 }
 //--------------------------------------------------------------------------------------------------
-inline sal_Bool _equalData(
+inline bool _equalData(
     void * pDest,
     typelib_TypeDescriptionReference * pDestType, typelib_TypeDescription * pDestTypeDescr,
     void * pSource,
@@ -318,7 +318,7 @@ inline sal_Bool _equalData(
         case typelib_TypeClass_DOUBLE:
             return ((double)*(sal_Int8 *)pDest == *(double *)pSource);
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_SHORT:
         switch (eSourceTypeClass)
@@ -343,7 +343,7 @@ inline sal_Bool _equalData(
         case typelib_TypeClass_DOUBLE:
             return ((double)*(sal_Int16 *)pDest == *(double *)pSource);
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_UNSIGNED_SHORT:
         switch (eSourceTypeClass)
@@ -367,7 +367,7 @@ inline sal_Bool _equalData(
         case typelib_TypeClass_DOUBLE:
             return ((double)*(sal_uInt16 *)pDest == *(double *)pSource);
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_LONG:
         switch (eSourceTypeClass)
@@ -392,7 +392,7 @@ inline sal_Bool _equalData(
         case typelib_TypeClass_DOUBLE:
             return ((double)*(sal_Int32 *)pDest == *(double *)pSource);
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_UNSIGNED_LONG:
         switch (eSourceTypeClass)
@@ -416,7 +416,7 @@ inline sal_Bool _equalData(
         case typelib_TypeClass_DOUBLE:
             return ((double)*(sal_uInt32 *)pDest == *(double *)pSource);
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_HYPER:
         switch (eSourceTypeClass)
@@ -441,7 +441,7 @@ inline sal_Bool _equalData(
         case typelib_TypeClass_DOUBLE:
             return ((double)*(sal_Int64 *)pDest == *(double *)pSource);
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_UNSIGNED_HYPER:
         switch (eSourceTypeClass)
@@ -466,14 +466,14 @@ inline sal_Bool _equalData(
             return (*(sal_uInt64 *)pDest == *(sal_uInt64 *)pSource);
         case typelib_TypeClass_FLOAT:
             if (::floor( *(float *)pSource ) != *(float *)pSource || *(float *)pSource < 0)
-                return sal_False;
+                return false;
             return (*(sal_uInt64 *)pDest == (sal_uInt64)*(float *)pSource);
         case typelib_TypeClass_DOUBLE:
             if (::floor( *(double *)pSource ) != *(double *)pSource || *(double *)pSource < 0)
-                return sal_False;
+                return false;
             return (*(sal_uInt64 *)pDest == (sal_uInt64)*(double *)pSource);
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_FLOAT:
         switch (eSourceTypeClass)
@@ -492,14 +492,14 @@ inline sal_Bool _equalData(
             return (*(float *)pDest == (float)*(sal_Int64 *)pSource);
         case typelib_TypeClass_UNSIGNED_HYPER:
             if (::floor( *(float *)pDest ) != *(float *)pDest || *(float *)pDest < 0)
-                return sal_False;
+                return false;
             return ((sal_uInt64)*(float *)pDest == *(sal_uInt64 *)pSource);
         case typelib_TypeClass_FLOAT:
             return (*(float *)pDest == *(float *)pSource);
         case typelib_TypeClass_DOUBLE:
             return ((double)*(float *)pDest == *(double *)pSource);
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_DOUBLE:
         switch (eSourceTypeClass)
@@ -518,14 +518,14 @@ inline sal_Bool _equalData(
             return (*(double *)pDest == (double)*(sal_Int64 *)pSource);
         case typelib_TypeClass_UNSIGNED_HYPER:
             if (::floor( *(double *)pDest ) != *(double *)pDest || *(double *)pDest < 0)
-                return sal_False;
+                return false;
             return ((sal_uInt64)*(double *)pDest == *(sal_uInt64 *)pSource);
         case typelib_TypeClass_FLOAT:
             return (*(double *)pDest == (double)*(float *)pSource);
         case typelib_TypeClass_DOUBLE:
             return (*(double *)pDest == *(double *)pSource);
         default:
-            return sal_False;
+            return false;
         }
     case typelib_TypeClass_STRING:
         return eSourceTypeClass == typelib_TypeClass_STRING
@@ -542,7 +542,7 @@ inline sal_Bool _equalData(
     case typelib_TypeClass_STRUCT:
     case typelib_TypeClass_EXCEPTION:
         if (! _type_equals( pDestType, pSourceType ))
-            return sal_False;
+            return false;
         if (pDestTypeDescr)
         {
             return _equalStruct(
@@ -553,7 +553,7 @@ inline sal_Bool _equalData(
         else
         {
             TYPELIB_DANGER_GET( &pDestTypeDescr, pDestType );
-            sal_Bool bRet = _equalStruct(
+            bool bRet = _equalStruct(
                 pDest, pSource,
                 (typelib_CompoundTypeDescription *)pDestTypeDescr,
                 queryInterface, release );
@@ -573,7 +573,7 @@ inline sal_Bool _equalData(
             else
             {
                 TYPELIB_DANGER_GET( &pDestTypeDescr, pDestType );
-                sal_Bool bRet = _equalSequence(
+                bool bRet = _equalSequence(
                     *(uno_Sequence **)pDest, *(uno_Sequence **)pSource,
                     ((typelib_IndirectTypeDescription *)pDestTypeDescr)->pType,
                     queryInterface, release );
@@ -581,7 +581,7 @@ inline sal_Bool _equalData(
                 return bRet;
             }
         }
-        return sal_False;
+        return false;
     case typelib_TypeClass_INTERFACE:
         if (typelib_TypeClass_INTERFACE == eSourceTypeClass)
             return _equalObject( *(void **)pDest, *(void **)pSource, queryInterface, release );
@@ -590,7 +590,7 @@ inline sal_Bool _equalData(
         OSL_ASSERT(false);
         break;
     }
-    return sal_False;
+    return false;
 }
 
 }
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index e380248bf6bb..aa8cde9dde7c 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -68,7 +68,7 @@ public:
         { return operator = ( rMapping._pMapping ); }
     inline uno_Mapping * SAL_CALL get() const SAL_THROW(())
         { return _pMapping; }
-    inline sal_Bool SAL_CALL is() const SAL_THROW(())
+    inline bool SAL_CALL is() const SAL_THROW(())
         { return (_pMapping != 0); }
 };
 //__________________________________________________________________________________________________
@@ -356,7 +356,7 @@ static uno_ext_getMappingFunc selectMapFunc( const OUString & rBridgeName )
 static inline oslModule loadModule( const OUString & rBridgeName )
     SAL_THROW(())
 {
-    sal_Bool bNeg;
+    bool bNeg;
     {
     MappingsData & rData = getMappingsData();
     MutexGuard aGuard( rData.aNegativeLibsMutex );
diff --git a/cppu/source/uno/prim.hxx b/cppu/source/uno/prim.hxx
index 5be342a6ca25..c0b6804babbb 100644
--- a/cppu/source/uno/prim.hxx
+++ b/cppu/source/uno/prim.hxx
@@ -151,7 +151,7 @@ extern "C" void * binuno_queryInterface(
     void * pUnoI, typelib_TypeDescriptionReference * pDestType );
 
 //--------------------------------------------------------------------------------------------------
-inline sal_Bool _type_equals(
+inline bool _type_equals(
     typelib_TypeDescriptionReference * pType1, typelib_TypeDescriptionReference * pType2 )
     SAL_THROW(())
 {