diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-09-22 01:51:12 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-09-25 01:55:38 +0000 |
| commit | 750fc206113a796035cbc05fb904fbae0eb771a8 (patch) | |
| tree | 4ea1f0378c2b6d7f50480d3b9051de91780219cd /accessibility | |
| parent | bcd2b017088822ea95e9d33d1d0dc360c0ec8d74 (diff) | |
replace remaining InterlockedCount() with inlined version
Change-Id: Ifcfa48fc87f905a91470a5b0fd597b02f220784c
Reviewed-on: https://gerrit.libreoffice.org/671
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'accessibility')
8 files changed, 13 insertions, 13 deletions
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index 3e8848ff86ca..42d71501435c 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -99,7 +99,7 @@ AccessibleBrowseBoxBase::~AccessibleBrowseBoxBase() if( isAlive() ) { // increment ref count to prevent double call of Dtor - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); dispose(); } } diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index a5f78a440002..4583363da7e5 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -74,7 +74,7 @@ AccessibleGridControlBase::~AccessibleGridControlBase() if( isAlive() ) { // increment ref count to prevent double call of Dtor - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); dispose(); } } diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index f791ba2e827f..7de4248be5aa 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -84,13 +84,13 @@ namespace accessibility m_xParent ( _xParent ) { - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); { Reference< XComponent > xComp( m_xParent, UNO_QUERY ); if ( xComp.is() ) xComp->addEventListener( this ); } - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } // ----------------------------------------------------------------------------- void AccessibleIconChoiceCtrlEntry::disposing( const EventObject& _rSource ) @@ -108,7 +108,7 @@ throw(RuntimeException) if ( IsAlive_Impl() ) { // increment ref count to prevent double call of Dtor - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); dispose(); } } diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index d96754d7b18f..6f8a4649718d 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -59,7 +59,7 @@ namespace accessibility if ( isAlive() ) { // increment ref count to prevent double call of Dtor - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); dispose(); } } diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 3b05336dd3be..b491aa99edb4 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -92,7 +92,7 @@ namespace accessibility if ( IsAlive_Impl() ) { // increment ref count to prevent double call of Dtor - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); dispose(); } } diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx index ab353d3ceaa1..cca3a4431078 100644 --- a/accessibility/source/extended/accessibletablistbox.cxx +++ b/accessibility/source/extended/accessibletablistbox.cxx @@ -52,11 +52,11 @@ namespace accessibility ,m_pTabListBox( &rBox ) { - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); { setCreator( this ); } - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } // ----------------------------------------------------------------------------- @@ -65,7 +65,7 @@ namespace accessibility if ( isAlive() ) { // increment ref count to prevent double call of Dtor - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); dispose(); } } diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index 1c252177c537..0c0570d24624 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -65,7 +65,7 @@ namespace accessibility m_pTabListBox = NULL; // increment ref count to prevent double call of Dtor - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); dispose(); } } diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 5125ba45e7e1..1f14f7dd5800 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -254,13 +254,13 @@ inline bool hasFloatingChild(Window *pWindow) //-------------------------------------------------------------------- oslInterlockedCount SAL_CALL AccessibleFactory::acquire() { - return osl_incrementInterlockedCount( &m_refCount ); + return osl_atomic_increment( &m_refCount ); } //-------------------------------------------------------------------- oslInterlockedCount SAL_CALL AccessibleFactory::release() { - if ( 0 == osl_decrementInterlockedCount( &m_refCount ) ) + if ( 0 == osl_atomic_decrement( &m_refCount ) ) { delete this; return 0; |