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 /sd/source | |
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 'sd/source')
-rw-r--r-- | sd/source/core/stlsheet.cxx | 4 | ||||
-rw-r--r-- | sd/source/helper/simplereferencecomponent.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index e85e8ca78d52..4bedcc0fdbfc 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -764,10 +764,10 @@ SdStyleSheet* SdStyleSheet::CreateEmptyUserStyle( SfxStyleSheetBasePool& rPool, void SAL_CALL SdStyleSheet::release( ) throw () { - if (osl_decrementInterlockedCount( &m_refCount ) == 0) + if (osl_atomic_decrement( &m_refCount ) == 0) { // restore reference count: - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); if (! mrBHelper.bDisposed) try { dispose(); diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx index 353a9e996b00..3dbb39daee47 100644 --- a/sd/source/helper/simplereferencecomponent.cxx +++ b/sd/source/helper/simplereferencecomponent.cxx @@ -51,7 +51,7 @@ SimpleReferenceComponent::~SimpleReferenceComponent() void SimpleReferenceComponent::acquire() { - osl_incrementInterlockedCount(&m_nCount); + osl_atomic_increment(&m_nCount); } void SimpleReferenceComponent::release() @@ -75,7 +75,7 @@ void SimpleReferenceComponent::release() } } - if(osl_decrementInterlockedCount(&m_nCount) == 0) delete this; + if(osl_atomic_decrement(&m_nCount) == 0) delete this; } void SimpleReferenceComponent::Dispose() diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index fae7729860c7..0f75235624ee 100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -297,11 +297,11 @@ ConfigurationListener::ConfigurationListener( ToolPanelViewShell_Impl& i_rShellI xBroadcaster.set( pFrameworkHelper->GetConfigurationController().get() ); ENSURE_OR_THROW( pFrameworkHelper.get(), "no access to the config controller" ); - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); { xBroadcaster->addConfigurationChangeListener( this, ::rtl::OUString(), Any() ); } - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } // --------------------------------------------------------------------------------------------------------------------- diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 264fdec356eb..88b43ad7e4c8 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -284,10 +284,10 @@ void SAL_CALL SdXImpressDocument::acquire() throw ( ) void SAL_CALL SdXImpressDocument::release() throw ( ) { - if (osl_decrementInterlockedCount( &m_refCount ) == 0) + if (osl_atomic_decrement( &m_refCount ) == 0) { // restore reference count: - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); if(!mbDisposed) { try |