[Libreoffice-commits] core.git: comphelper/source include/comphelper

Stephan Bergmann sbergman at redhat.com
Wed Jul 2 09:55:30 PDT 2014


 comphelper/source/misc/accessibleselectionhelper.cxx |    8 ++++----
 comphelper/source/misc/accimplaccess.cxx             |    2 +-
 include/comphelper/accessibleselectionhelper.hxx     |    2 +-
 include/comphelper/accimplaccess.hxx                 |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 37b18359728b06091de02156053f2e0eecc556ed
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jul 2 18:54:32 2014 +0200

    Revert "comphelper: sal_Bool -> bool"
    
    Oops, this reverts commit c95ff75df274e3d84458e928ee96870bc8b663b3.

diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx
index 814faa1..35c6622 100644
--- a/comphelper/source/misc/accessibleselectionhelper.cxx
+++ b/comphelper/source/misc/accessibleselectionhelper.cxx
@@ -42,7 +42,7 @@ namespace comphelper
 
     void SAL_CALL OCommonAccessibleSelection::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
-        implSelect( nChildIndex, true );
+        implSelect( nChildIndex, sal_True );
     }
 
 
@@ -54,13 +54,13 @@ namespace comphelper
 
     void SAL_CALL OCommonAccessibleSelection::clearAccessibleSelection(  ) throw (RuntimeException)
     {
-        implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, false );
+        implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, sal_False );
     }
 
 
     void SAL_CALL OCommonAccessibleSelection::selectAllAccessibleChildren(  ) throw (RuntimeException)
     {
-        implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, true );
+        implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, sal_True );
     }
 
 
@@ -102,7 +102,7 @@ namespace comphelper
 
     void SAL_CALL OCommonAccessibleSelection::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
-        implSelect( nSelectedChildIndex, false );
+        implSelect( nSelectedChildIndex, sal_False );
     }
 
 
diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx
index 96f255d..6cf5637 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -84,7 +84,7 @@ namespace comphelper
     }
 
 
-    void OAccessibleImplementationAccess::setStateBit( const sal_Int16 _nState, const bool _bSet )
+    void OAccessibleImplementationAccess::setStateBit( const sal_Int16 _nState, const sal_Bool _bSet )
     {
         OSL_ENSURE( _nState >= 0 && static_cast< sal_uInt16 >(_nState) < sizeof( sal_Int64 ) * 8, "OAccessibleImplementationAccess::setStateBit: no more bits (shutting down the universe now)!" );
 
diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx
index 4bb64a9..dbc4c20 100644
--- a/include/comphelper/accessibleselectionhelper.hxx
+++ b/include/comphelper/accessibleselectionhelper.hxx
@@ -62,7 +62,7 @@ namespace comphelper
 
         // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx)
         virtual void
-            implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect )
+            implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect )
             throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) = 0;
 
     protected:
diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx
index 2c6f159..f416e14 100644
--- a/include/comphelper/accimplaccess.hxx
+++ b/include/comphelper/accimplaccess.hxx
@@ -85,7 +85,7 @@ namespace comphelper
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxAccParent );
 
         /// sets or resets a bit of the foreign controlled states
-        void setStateBit( const sal_Int16 _nState, const bool _bSet );
+        void setStateBit( const sal_Int16 _nState, const sal_Bool _bSet );
 
     protected:
         OAccessibleImplementationAccess( );


More information about the Libreoffice-commits mailing list