[Libreoffice-commits] .: accessibility/source basctl/source basic/source binaryurp/source bridges/inc bridges/source bridges/test canvas/source chart2/source cli_ure/source codemaker/source comphelper/inc comphelper/source connectivity/inc connectivity/source dbaccess/source editeng/source embeddedobj/source embedserv/source extensions/source filter/source forms/source fpicker/source framework/inc framework/source io/source linguistic/source mysqlc/source o3tl/inc odk/examples rdbmaker/inc rdbmaker/source reportdesign/source salhelper/inc sal/inc sal/osl sal/rtl scripting/source sc/source sd/source sd/workben sfx2/workben stoc/source stoc/test svtools/source svx/source sw/source testtools/source toolkit/source ucb/source ucb/workben xmloff/inc xmloff/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Sep 24 18:56:02 PDT 2012
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 2
accessibility/source/extended/AccessibleGridControlBase.cxx | 2
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 6 +-
accessibility/source/extended/accessiblelistbox.cxx | 2
accessibility/source/extended/accessiblelistboxentry.cxx | 2
accessibility/source/extended/accessibletablistbox.cxx | 6 +-
accessibility/source/extended/accessibletablistboxtable.cxx | 2
accessibility/source/helper/acc_factory.cxx | 4 -
basctl/source/basicide/doceventnotifier.cxx | 4 -
basic/source/classes/sbxmod.cxx | 8 +--
basic/source/uno/namecont.cxx | 4 -
binaryurp/source/proxy.cxx | 4 -
bridges/inc/bridges/cpp_uno/bridge.hxx | 12 ++---
bridges/source/cpp_uno/shared/bridge.cxx | 4 -
bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx | 4 -
bridges/source/cpp_uno/shared/unointerfaceproxy.cxx | 4 -
bridges/source/jni_uno/jni_bridge.cxx | 4 -
bridges/source/jni_uno/jni_uno2java.cxx | 4 -
bridges/test/java_uno/acquire/testacquire.cxx | 4 -
bridges/test/performance/testperformance.cxx | 2
bridges/test/testcomp.cxx | 4 -
canvas/source/null/null_usagecounter.hxx | 4 -
chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx | 8 +--
chart2/source/controller/main/ShapeToolbarController.cxx | 4 -
chart2/source/model/main/Axis.cxx | 4 -
chart2/source/model/main/ChartModel.cxx | 8 +--
cli_ure/source/uno_bridge/cli_bridge.cxx | 4 -
cli_ure/source/uno_bridge/cli_proxy.cxx | 4 -
codemaker/source/codemaker/typemanager.cxx | 4 -
comphelper/inc/comphelper/uno3.hxx | 4 -
comphelper/source/misc/SelectionMultiplex.cxx | 4 -
comphelper/source/misc/accessiblewrapper.cxx | 4 -
comphelper/source/misc/asyncnotification.cxx | 4 -
comphelper/source/misc/componentmodule.cxx | 4 -
comphelper/source/misc/proxyaggregation.cxx | 8 +--
comphelper/source/misc/weakeventlistener.cxx | 4 -
connectivity/inc/connectivity/CommonTools.hxx | 4 -
connectivity/source/commontools/ConnectionWrapper.cxx | 8 +--
connectivity/source/commontools/TDatabaseMetaDataBase.cxx | 4 -
connectivity/source/commontools/TPrivilegesResultSet.cxx | 4 -
connectivity/source/commontools/dbtools.cxx | 6 +-
connectivity/source/cpool/ZConnectionWrapper.cxx | 2
connectivity/source/cpool/ZDriverWrapper.cxx | 4 -
connectivity/source/cpool/ZPoolCollection.cxx | 4 -
connectivity/source/drivers/ado/AConnection.cxx | 10 ++--
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx | 4 -
connectivity/source/drivers/ado/APreparedStatement.cxx | 4 -
connectivity/source/drivers/ado/AResultSet.cxx | 6 +-
connectivity/source/drivers/ado/AStatement.cxx | 4 -
connectivity/source/drivers/calc/CConnection.cxx | 6 +-
connectivity/source/drivers/evoab2/NConnection.cxx | 4 -
connectivity/source/drivers/file/FConnection.cxx | 6 +-
connectivity/source/drivers/file/FResultSet.cxx | 6 +-
connectivity/source/drivers/file/FStatement.cxx | 2
connectivity/source/drivers/flat/EConnection.cxx | 4 -
connectivity/source/drivers/hsqldb/HConnection.cxx | 2
connectivity/source/drivers/jdbc/ConnectionLog.cxx | 2
connectivity/source/drivers/jdbc/Object.cxx | 4 -
connectivity/source/drivers/jdbc/ResultSet.cxx | 6 +-
connectivity/source/drivers/kab/KConnection.cxx | 4 -
connectivity/source/drivers/kab/KDatabaseMetaData.cxx | 4 -
connectivity/source/drivers/kab/KDriver.cxx | 4 -
connectivity/source/drivers/macab/MacabConnection.cxx | 4 -
connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx | 4 -
connectivity/source/drivers/macab/MacabDriver.cxx | 4 -
connectivity/source/drivers/mork/MCatalog.cxx | 4 -
connectivity/source/drivers/mozab/MCatalog.cxx | 4 -
connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx | 4 -
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 6 +-
connectivity/source/drivers/odbcbase/OResultSet.cxx | 8 +--
connectivity/source/drivers/odbcbase/OStatement.cxx | 4 -
connectivity/source/resource/sharedresources.cxx | 4 -
connectivity/source/simpledbt/refbase.cxx | 4 -
dbaccess/source/core/api/RowSet.cxx | 2
dbaccess/source/core/api/RowSetRow.hxx | 4 -
dbaccess/source/core/api/definitioncolumn.cxx | 8 +--
dbaccess/source/core/api/query.cxx | 4 -
dbaccess/source/core/dataaccess/ModelImpl.cxx | 4 -
dbaccess/source/core/dataaccess/connection.cxx | 4 -
dbaccess/source/core/dataaccess/databasecontext.cxx | 4 -
dbaccess/source/core/dataaccess/databasedocument.cxx | 4 -
dbaccess/source/core/dataaccess/datasource.cxx | 8 +--
dbaccess/source/core/dataaccess/documentdefinition.cxx | 8 +--
dbaccess/source/core/dataaccess/documenteventexecutor.cxx | 4 -
dbaccess/source/core/dataaccess/documenteventnotifier.cxx | 4 -
dbaccess/source/core/inc/FilteredContainer.hxx | 4 -
dbaccess/source/core/misc/ContainerMediator.cxx | 4 -
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 4 -
dbaccess/source/core/misc/PropertyForward.cxx | 4 -
dbaccess/source/core/misc/apitools.cxx | 4 -
dbaccess/source/core/recovery/settingsimport.cxx | 4 -
dbaccess/source/core/recovery/subcomponentloader.cxx | 8 +--
dbaccess/source/ui/app/AppController.cxx | 2
dbaccess/source/ui/browser/dbexchange.cxx | 8 +--
dbaccess/source/ui/browser/genericcontroller.cxx | 4 -
dbaccess/source/ui/browser/unodatbr.cxx | 2
dbaccess/source/ui/control/toolboxcontroller.cxx | 4 -
dbaccess/source/ui/misc/TokenWriter.cxx | 4 -
dbaccess/source/ui/querydesign/querycontroller.cxx | 2
dbaccess/source/ui/uno/ColumnPeer.cxx | 4 -
editeng/source/xml/xmltxtexp.cxx | 4 -
embeddedobj/source/msole/advisesink.cxx | 2
embeddedobj/source/msole/olewrapclient.cxx | 2
embedserv/source/embed/ed_ipersiststr.cxx | 4 -
embedserv/source/embed/iipaobj.cxx | 4 -
embedserv/source/embed/servprov.cxx | 2
extensions/source/logging/logger.cxx | 8 +--
extensions/source/ole/servprov.cxx | 4 -
extensions/source/ole/unoconversionutilities.hxx | 2
extensions/source/propctrlr/composeduiupdate.cxx | 8 +--
extensions/source/propctrlr/formcomponenthandler.cxx | 4 -
extensions/source/propctrlr/formcontroller.cxx | 4 -
extensions/source/propctrlr/formgeometryhandler.cxx | 4 -
extensions/source/propctrlr/formmetadata.cxx | 4 -
extensions/source/propctrlr/genericpropertyhandler.cxx | 8 +--
extensions/source/propctrlr/propcontroller.cxx | 4 -
extensions/source/propctrlr/propertycomposer.cxx | 4 -
extensions/source/propctrlr/sqlcommanddesign.cxx | 4 -
extensions/source/propctrlr/xsddatatypes.cxx | 4 -
filter/source/config/cache/lateinitlistener.cxx | 4 -
forms/source/component/DatabaseForm.cxx | 8 +--
forms/source/component/Date.cxx | 4 -
forms/source/component/FormComponent.cxx | 4 -
forms/source/component/FormattedFieldWrapper.cxx | 4 -
forms/source/component/FormsCollection.cxx | 4 -
forms/source/component/Grid.cxx | 4 -
forms/source/component/ImageControl.cxx | 4 -
forms/source/component/clickableimage.cxx | 4 -
forms/source/helper/windowstateguard.cxx | 4 -
forms/source/richtext/rtattributehandler.cxx | 4 -
fpicker/source/office/asyncfilepicker.cxx | 4 -
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx | 2
framework/inc/helper/shareablemutex.hxx | 4 -
framework/source/fwe/helper/documentundoguard.cxx | 14 +++---
framework/source/uiconfiguration/imagemanagerimpl.cxx | 4 -
io/source/acceptor/acc_pipe.cxx | 2
io/source/acceptor/acc_socket.cxx | 2
io/source/connector/ctr_pipe.cxx | 2
io/source/connector/ctr_socket.cxx | 2
linguistic/source/lngopt.cxx | 6 +-
mysqlc/source/mysqlc_databasemetadata.cxx | 4 -
mysqlc/source/mysqlc_driver.cxx | 6 +-
o3tl/inc/o3tl/cow_wrapper.hxx | 4 -
odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx | 4 -
odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx | 4 -
odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx | 4 -
odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx | 6 +-
rdbmaker/inc/codemaker/registry.hxx | 4 -
rdbmaker/source/codemaker/dependency.cxx | 4 -
rdbmaker/source/codemaker/typemanager.cxx | 4 -
reportdesign/source/core/api/FixedLine.cxx | 4 -
reportdesign/source/core/api/FixedText.cxx | 4 -
reportdesign/source/core/api/FormattedField.cxx | 4 -
reportdesign/source/core/api/Group.cxx | 4 -
reportdesign/source/core/api/ImageControl.cxx | 4 -
reportdesign/source/core/api/ReportComponent.cxx | 4 -
reportdesign/source/core/api/ReportDefinition.cxx | 12 ++---
reportdesign/source/core/api/Shape.cxx | 4 -
reportdesign/source/core/sdr/PropertyForward.cxx | 4 -
reportdesign/source/core/sdr/UndoEnv.cxx | 4 -
reportdesign/source/ui/misc/toolboxcontroller.cxx | 4 -
reportdesign/source/ui/report/ReportControllerObserver.cxx | 4 -
reportdesign/source/ui/report/StartMarker.cxx | 4 -
sal/inc/rtl/unload.h | 2
sal/osl/all/debugbase.cxx | 4 -
sal/osl/unx/pipe.c | 4 -
sal/osl/unx/socket.c | 4 -
sal/osl/w32/pipe.c | 8 +--
sal/osl/w32/socket.cxx | 4 -
sal/osl/w32/thread.c | 2
sal/rtl/source/byteseq.cxx | 8 +--
sal/rtl/source/unload.cxx | 4 -
salhelper/inc/salhelper/simplereferenceobject.hxx | 4 -
sc/source/ui/Accessibility/AccessibleCell.cxx | 2
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 2
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 2
sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx | 4 -
sc/source/ui/Accessibility/AccessibleDocument.cxx | 2
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 2
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 2
sc/source/ui/Accessibility/AccessiblePageHeader.cxx | 2
sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 2
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx | 2
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx | 2
sc/source/ui/unoobj/fielduno.cxx | 4 -
sc/source/ui/vba/vbawindow.cxx | 4 -
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 8 +--
sd/source/core/stlsheet.cxx | 4 -
sd/source/helper/simplereferencecomponent.cxx | 4 -
sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 4 -
sd/source/ui/unoidl/unomodel.cxx | 4 -
sd/workben/custompanel/ctp_panel.cxx | 4 -
sfx2/workben/custompanel/ctp_panel.cxx | 4 -
stoc/source/invocation_adapterfactory/iafactory.cxx | 4 -
stoc/source/proxy_factory/proxyfac.cxx | 4 -
stoc/source/security/access_controller.cxx | 4 -
stoc/test/security/test_security.cxx | 4 -
svtools/source/contnr/svimpbox.cxx | 4 -
svtools/source/java/javacontext.cxx | 4 -
svtools/source/java/javainteractionhandler.cxx | 4 -
svtools/source/misc/svtaccessiblefactory.cxx | 8 +--
svtools/source/misc/transfer.cxx | 4 -
svtools/source/table/mousefunction.cxx | 4 -
svtools/source/toolpanel/refbase.cxx | 4 -
svx/source/accessibility/AccessibleControlShape.cxx | 8 +--
svx/source/accessibility/charmapacc.cxx | 12 ++---
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 4 -
svx/source/form/ParseContext.cxx | 4 -
svx/source/form/fmscriptingenv.cxx | 4 -
svx/source/form/fmtextcontrolfeature.cxx | 4 -
svx/source/form/fmtextcontrolshell.cxx | 8 +--
svx/source/form/formcontrolling.cxx | 4 -
svx/source/inc/fmundo.hxx | 4 -
svx/source/sdr/overlay/overlaymanager.cxx | 4 -
svx/source/unodraw/unoshape.cxx | 4 -
svx/source/unodraw/unoshcol.cxx | 4 -
svx/source/unodraw/unoshtxt.cxx | 4 -
sw/source/core/doc/doc.cxx | 4 -
sw/source/core/docnode/observablethread.cxx | 4 -
sw/source/core/inc/threadmanager.hxx | 2
sw/source/ui/uno/unomailmerge.cxx | 4 -
testtools/source/performance/pseudo.cxx | 8 +--
testtools/source/performance/ubobject.cxx | 4 -
toolkit/source/controls/formattedcontrol.cxx | 4 -
toolkit/source/controls/grid/gridcontrol.cxx | 4 -
toolkit/source/controls/spinningprogress.cxx | 4 -
toolkit/source/controls/unocontrols.cxx | 4 -
toolkit/source/helper/accessibilityclient.cxx | 8 +--
ucb/source/ucp/tdoc/tdoc_stgelems.cxx | 22 +++++-----
ucb/source/ucp/tdoc/tdoc_storage.cxx | 6 +-
ucb/source/ucp/webdav/DAVSession.hxx | 4 -
ucb/source/ucp/webdav/DAVSessionFactory.cxx | 6 +-
ucb/workben/cachemap/cachemapobject1.cxx | 2
ucb/workben/cachemap/cachemapobject1.hxx | 2
ucb/workben/cachemap/cachemapobject3.cxx | 8 +--
ucb/workben/cachemap/cachemapobject3.hxx | 2
xmloff/inc/xmloff/uniref.hxx | 3 -
xmloff/source/forms/handler/property_handler_base.cxx | 8 ---
xmloff/source/style/uniref.cxx | 2
239 files changed, 529 insertions(+), 532 deletions(-)
New commits:
commit 750fc206113a796035cbc05fb904fbae0eb771a8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Sep 22 01:51:12 2012 -0500
replace remaining InterlockedCount() with inlined version
Change-Id: Ifcfa48fc87f905a91470a5b0fd597b02f220784c
Reviewed-on: https://gerrit.libreoffice.org/671
Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 3e8848f..42d7150 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 a5f78a4..4583363 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 f791ba2..7de4248 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 d96754d..6f8a464 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 3b05336..b491aa9 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 ab353d3..cca3a44 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 1c25217..0c0570d 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 5125ba4..1f14f7d 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;
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx
index a36ce20..56559e5 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -105,9 +105,9 @@ namespace basctl
m_pListener(&rListener),
m_xModel(rxDocument)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
impl_listenerAction_nothrow( RegisterListener );
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
//--------------------------------------------------------------------
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index f851b5a..3257a4a 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -173,7 +173,7 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pV
if ( m_xAggProxy.is() )
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
/* i35609 - Fix crash on Solaris. The setDelegator call needs
to be in its own block to ensure that all temporary Reference
@@ -183,7 +183,7 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pV
m_xAggProxy->setDelegator( static_cast< cppu::OWeakObject * >( this ) );
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
}
}
@@ -192,13 +192,13 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pV
void SAL_CALL
DocObjectWrapper::acquire() throw ()
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
OSL_TRACE("DocObjectWrapper::acquire(%s) 0x%x refcount is now %d", rtl::OUStringToOString( mName, RTL_TEXTENCODING_UTF8 ).getStr(), this, m_refCount );
}
void SAL_CALL
DocObjectWrapper::release() throw ()
{
- if ( osl_decrementInterlockedCount( &m_refCount ) == 0 )
+ if ( osl_atomic_decrement( &m_refCount ) == 0 )
{
OSL_TRACE("DocObjectWrapper::release(%s) 0x%x refcount is now %d", rtl::OUStringToOString( mName, RTL_TEXTENCODING_UTF8 ).getStr(), this, m_refCount );
delete this;
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 091f04f..f8d946e 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -578,9 +578,9 @@ void SfxLibraryContainer::init( const OUString& rInitialDocumentURL, const uno::
// this might be called from within the ctor, and the impl_init might (indirectly) create
// an UNO reference to ourself.
// Ensure that we're not destroyed while we're in here
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
init_Impl( rInitialDocumentURL, rxInitialStorage );
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx
index 4d01b2b..fde8b31 100644
--- a/binaryurp/source/proxy.cxx
+++ b/binaryurp/source/proxy.cxx
@@ -84,13 +84,13 @@ css::uno::TypeDescription Proxy::getType() const {
}
void Proxy::do_acquire() {
- if (osl_incrementInterlockedCount(&references_) == 1) {
+ if (osl_atomic_increment(&references_) == 1) {
bridge_->resurrectProxy(*this);
}
}
void Proxy::do_release() {
- if (osl_decrementInterlockedCount(&references_) == 0) {
+ if (osl_atomic_decrement(&references_) == 0) {
bridge_->revokeProxy(*this);
}
}
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx
index 1412664..96af924 100644
--- a/bridges/inc/bridges/cpp_uno/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/bridge.hxx
@@ -102,7 +102,7 @@ inline void SAL_CALL cppu_Mapping_uno2cpp(
//__________________________________________________________________________________________________
inline void cppu_cppInterfaceProxy::acquireProxy() SAL_THROW(())
{
- if (1 == osl_incrementInterlockedCount( &nRef ))
+ if (1 == osl_atomic_increment( &nRef ))
{
// rebirth of proxy zombie
// register at cpp env
@@ -116,7 +116,7 @@ inline void cppu_cppInterfaceProxy::acquireProxy() SAL_THROW(())
//__________________________________________________________________________________________________
inline void cppu_cppInterfaceProxy::releaseProxy() SAL_THROW(())
{
- if (! osl_decrementInterlockedCount( &nRef )) // last release
+ if (! osl_atomic_decrement( &nRef )) // last release
{
// revoke from cpp env
(*pBridge->pCppEnv->revokeInterface)(
@@ -170,7 +170,7 @@ inline void SAL_CALL cppu_unoInterfaceProxy_free( uno_ExtEnvironment * pEnv, voi
//--------------------------------------------------------------------------------------------------
inline void SAL_CALL cppu_unoInterfaceProxy_acquire( uno_Interface * pUnoI ) SAL_THROW(())
{
- if (1 == osl_incrementInterlockedCount( & static_cast< cppu_unoInterfaceProxy * >( pUnoI )->nRef ))
+ if (1 == osl_atomic_increment( & static_cast< cppu_unoInterfaceProxy * >( pUnoI )->nRef ))
{
// rebirth of proxy zombie
// register at uno env
@@ -191,7 +191,7 @@ inline void SAL_CALL cppu_unoInterfaceProxy_acquire( uno_Interface * pUnoI ) SAL
//--------------------------------------------------------------------------------------------------
inline void SAL_CALL cppu_unoInterfaceProxy_release( uno_Interface * pUnoI ) SAL_THROW(())
{
- if (! osl_decrementInterlockedCount( & static_cast< cppu_unoInterfaceProxy * >( pUnoI )->nRef ))
+ if (! osl_atomic_decrement( & static_cast< cppu_unoInterfaceProxy * >( pUnoI )->nRef ))
{
// revoke from uno env on last release
(*static_cast< cppu_unoInterfaceProxy * >( pUnoI )->pBridge->pUnoEnv->revokeInterface)(
@@ -320,7 +320,7 @@ inline void SAL_CALL cppu_Bridge_free( uno_Mapping * pMapping ) SAL_THROW(())
//__________________________________________________________________________________________________
inline void cppu_Bridge::acquire() SAL_THROW(())
{
- if (1 == osl_incrementInterlockedCount( &nRef ))
+ if (1 == osl_atomic_increment( &nRef ))
{
if (bExportCpp2Uno)
{
@@ -341,7 +341,7 @@ inline void cppu_Bridge::acquire() SAL_THROW(())
//__________________________________________________________________________________________________
inline void cppu_Bridge::release() SAL_THROW(())
{
- if (! osl_decrementInterlockedCount( &nRef ))
+ if (! osl_atomic_decrement( &nRef ))
{
::uno_revokeMapping( bExportCpp2Uno ? &aCpp2Uno : &aUno2Cpp );
}
diff --git a/bridges/source/cpp_uno/shared/bridge.cxx b/bridges/source/cpp_uno/shared/bridge.cxx
index 4523f20..cefb62e 100644
--- a/bridges/source/cpp_uno/shared/bridge.cxx
+++ b/bridges/source/cpp_uno/shared/bridge.cxx
@@ -153,7 +153,7 @@ uno_Mapping * Bridge::createMapping(
void Bridge::acquire() SAL_THROW(())
{
- if (1 == osl_incrementInterlockedCount( &nRef ))
+ if (1 == osl_atomic_increment( &nRef ))
{
if (bExportCpp2Uno)
{
@@ -174,7 +174,7 @@ void Bridge::acquire() SAL_THROW(())
void Bridge::release() SAL_THROW(())
{
- if (! osl_decrementInterlockedCount( &nRef ))
+ if (! osl_atomic_decrement( &nRef ))
{
::uno_revokeMapping( bExportCpp2Uno ? &aCpp2Uno : &aUno2Cpp );
}
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
index 3694248..cc8c4d9 100644
--- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
@@ -129,7 +129,7 @@ com::sun::star::uno::XInterface * CppInterfaceProxy::create(
void CppInterfaceProxy::acquireProxy() SAL_THROW(())
{
- if (1 == osl_incrementInterlockedCount( &nRef ))
+ if (1 == osl_atomic_increment( &nRef ))
{
// rebirth of proxy zombie
// register at cpp env
@@ -143,7 +143,7 @@ void CppInterfaceProxy::acquireProxy() SAL_THROW(())
void CppInterfaceProxy::releaseProxy() SAL_THROW(())
{
- if (! osl_decrementInterlockedCount( &nRef )) // last release
+ if (! osl_atomic_decrement( &nRef )) // last release
{
// revoke from cpp env
(*pBridge->getCppEnv()->revokeInterface)(
diff --git a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
index 247b314..81353cf 100644
--- a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
@@ -54,7 +54,7 @@ void freeUnoInterfaceProxy(uno_ExtEnvironment * pEnv, void * pProxy)
void acquireProxy(uno_Interface * pUnoI)
{
- if (1 == osl_incrementInterlockedCount(
+ if (1 == osl_atomic_increment(
& static_cast< UnoInterfaceProxy * >( pUnoI )->nRef ))
{
// rebirth of proxy zombie
@@ -76,7 +76,7 @@ void acquireProxy(uno_Interface * pUnoI)
void releaseProxy(uno_Interface * pUnoI)
{
- if (! osl_decrementInterlockedCount(
+ if (! osl_atomic_decrement(
& static_cast< UnoInterfaceProxy * >( pUnoI )->nRef ))
{
// revoke from uno env on last release
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx
index be46d1d..51ab459 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -214,7 +214,7 @@ namespace jni_uno
//______________________________________________________________________________
void Bridge::acquire() const SAL_THROW(())
{
- if (1 == osl_incrementInterlockedCount( &m_ref ))
+ if (1 == osl_atomic_increment( &m_ref ))
{
if (m_registered_java2uno)
{
@@ -236,7 +236,7 @@ void Bridge::acquire() const SAL_THROW(())
//______________________________________________________________________________
void Bridge::release() const SAL_THROW(())
{
- if (! osl_decrementInterlockedCount( &m_ref ))
+ if (! osl_atomic_decrement( &m_ref ))
{
uno_revokeMapping(
m_registered_java2uno
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index b38aad9..a7ae60c 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -479,7 +479,7 @@ inline UNO_proxy::UNO_proxy(
//______________________________________________________________________________
inline void UNO_proxy::acquire() const
{
- if (1 == osl_incrementInterlockedCount( &m_ref ))
+ if (1 == osl_atomic_increment( &m_ref ))
{
// rebirth of proxy zombie
void * that = const_cast< UNO_proxy * >( this );
@@ -497,7 +497,7 @@ inline void UNO_proxy::acquire() const
//______________________________________________________________________________
inline void UNO_proxy::release() const
{
- if (0 == osl_decrementInterlockedCount( &m_ref ))
+ if (0 == osl_atomic_decrement( &m_ref ))
{
// revoke from uno env on last release
(*m_bridge->m_uno_env->revokeInterface)(
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx
index fcf7fde..f3216fb 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -99,7 +99,7 @@ public:
throw (css::uno::RuntimeException);
virtual void SAL_CALL acquire() throw ()
- { osl_incrementInterlockedCount(&m_refCount); }
+ { osl_atomic_increment(&m_refCount); }
virtual void SAL_CALL release() throw ();
@@ -125,7 +125,7 @@ css::uno::Any Interface::queryInterface(css::uno::Type const & type)
}
void Interface::release() throw () {
- if (osl_decrementInterlockedCount(&m_refCount) == 0) {
+ if (osl_atomic_decrement(&m_refCount) == 0) {
delete this;
}
}
diff --git a/bridges/test/performance/testperformance.cxx b/bridges/test/performance/testperformance.cxx
index 87fcd91..36102ac 100644
--- a/bridges/test/performance/testperformance.cxx
+++ b/bridges/test/performance/testperformance.cxx
@@ -95,7 +95,7 @@ void main()
oslInterlockedCount count;
for( int i = 0 ; i < 1000*10000 ; i ++ )
{
- osl_incrementInterlockedCount( &count );
+ osl_atomic_increment( &count );
}
}
{
diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx
index 26885b2..16fa2d4 100644
--- a/bridges/test/testcomp.cxx
+++ b/bridges/test/testcomp.cxx
@@ -157,9 +157,9 @@ public:
return aRet;
}
virtual void SAL_CALL acquire() throw()
- { osl_incrementInterlockedCount( &_nRef ); }
+ { osl_atomic_increment( &_nRef ); }
virtual void SAL_CALL release() throw()
- { if (! osl_decrementInterlockedCount( &_nRef )) delete this; }
+ { if (! osl_atomic_decrement( &_nRef )) delete this; }
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (RuntimeException);
diff --git a/canvas/source/null/null_usagecounter.hxx b/canvas/source/null/null_usagecounter.hxx
index 154857c..5a3260e 100644
--- a/canvas/source/null/null_usagecounter.hxx
+++ b/canvas/source/null/null_usagecounter.hxx
@@ -38,12 +38,12 @@ namespace nullcanvas
{
OSL_TRACE( "%s, %d objects currently in use.\n",
BOOST_CURRENT_FUNCTION,
- osl_incrementInterlockedCount( &s_nCount ) );
+ osl_atomic_increment( &s_nCount ) );
}
~UsageCounter()
{
- const sal_Int32 nCount( osl_decrementInterlockedCount( &s_nCount ) );
+ const sal_Int32 nCount( osl_atomic_decrement( &s_nCount ) );
if( !nCount )
{
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 17d9044..83ceca4 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -414,9 +414,9 @@ ChartDataWrapper::ChartDataWrapper( ::boost::shared_ptr< Chart2ModelContact > sp
m_spChart2ModelContact( spChart2ModelContact ),
m_aEventListenerContainer( m_aMutex )
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
initDataAccess();
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
ChartDataWrapper::ChartDataWrapper( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
@@ -424,10 +424,10 @@ ChartDataWrapper::ChartDataWrapper( ::boost::shared_ptr< Chart2ModelContact > sp
m_spChart2ModelContact( spChart2ModelContact ),
m_aEventListenerContainer( m_aMutex )
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
lcl_AllOperator aOperator( xNewData );
applyData( aOperator );
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
ChartDataWrapper::~ChartDataWrapper()
diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx
index e951a2a..e56ce12 100644
--- a/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -76,9 +76,9 @@ ShapeToolbarController::ShapeToolbarController( const Reference< lang::XMultiSer
,m_nToolBoxId( 1 )
,m_nSlotId( 0 )
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
m_xServiceManager = rxFact;
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
ShapeToolbarController::~ShapeToolbarController()
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 67a1080..5e0d07e 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -312,7 +312,7 @@ Axis::Axis( Reference< uno::XComponentContext > const & /* xContext */ ) :
m_aSubGridProperties(),
m_xTitle()
{
- osl_incrementInterlockedCount(&m_refCount);
+ osl_atomic_increment(&m_refCount);
setFastPropertyValue_NoBroadcast(
::chart::LineProperties::PROP_LINE_COLOR, uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30
@@ -322,7 +322,7 @@ Axis::Axis( Reference< uno::XComponentContext > const & /* xContext */ ) :
ModifyListenerHelper::addListener( m_aScaleData.Categories, m_xModifyEventForwarder );
AllocateSubGrids();
- osl_decrementInterlockedCount(&m_refCount);
+ osl_atomic_decrement(&m_refCount);
}
Axis::Axis( const Axis & rOther ) :
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 01f2776..ff09525 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -108,7 +108,7 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext)
{
OSL_TRACE( "ChartModel: CTOR called" );
- osl_incrementInterlockedCount(&m_refCount);
+ osl_atomic_increment(&m_refCount);
{
m_xOldModelAgg.set(
m_xContext->getServiceManager()->createInstanceWithContext(
@@ -122,7 +122,7 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext)
m_xChartTypeManager.set( xContext->getServiceManager()->createInstanceWithContext(
C2U( "com.sun.star.chart2.ChartTypeManager" ), m_xContext ), uno::UNO_QUERY );
}
- osl_decrementInterlockedCount(&m_refCount);
+ osl_atomic_decrement(&m_refCount);
}
ChartModel::ChartModel( const ChartModel & rOther )
@@ -148,7 +148,7 @@ ChartModel::ChartModel( const ChartModel & rOther )
{
OSL_TRACE( "ChartModel: Copy-CTOR called" );
- osl_incrementInterlockedCount(&m_refCount);
+ osl_atomic_increment(&m_refCount);
{
m_xOldModelAgg.set(
m_xContext->getServiceManager()->createInstanceWithContext(
@@ -178,7 +178,7 @@ ChartModel::ChartModel( const ChartModel & rOther )
ModifyListenerHelper::addListener( xNewPageBackground, xListener );
xListener.clear();
}
- osl_decrementInterlockedCount(&m_refCount);
+ osl_atomic_decrement(&m_refCount);
}
ChartModel::~ChartModel()
diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx
index aed48df..53329e8 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.cxx
+++ b/cli_ure/source/uno_bridge/cli_bridge.cxx
@@ -187,7 +187,7 @@ namespace cli_uno
*/
void Bridge::acquire() const SAL_THROW(())
{
- if (1 == osl_incrementInterlockedCount( &m_ref ))
+ if (1 == osl_atomic_increment( &m_ref ))
{
if (m_registered_cli2uno)
{
@@ -206,7 +206,7 @@ void Bridge::acquire() const SAL_THROW(())
//__________________________________________________________________________________________________
void Bridge::release() const SAL_THROW(())
{
- if (! osl_decrementInterlockedCount( &m_ref ))
+ if (! osl_atomic_decrement( &m_ref ))
{
uno_revokeMapping(
m_registered_cli2uno
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx
index 76a58dd..2fd70fc 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -909,7 +909,7 @@ void SAL_CALL CliProxy::uno_DispatchMethod(
}
inline void CliProxy::acquire() const
{
- if (1 == osl_incrementInterlockedCount( &m_ref ))
+ if (1 == osl_atomic_increment( &m_ref ))
{
// rebirth of proxy zombie
void * that = const_cast< CliProxy * >( this );
@@ -926,7 +926,7 @@ inline void CliProxy::acquire() const
//---------------------------------------------------------------------------
inline void CliProxy::release() const
{
- if (0 == osl_decrementInterlockedCount( &m_ref ))
+ if (0 == osl_atomic_decrement( &m_ref ))
{
// revoke from uno env on last release,
// The proxy can be resurrected if acquire is called before the uno
diff --git a/codemaker/source/codemaker/typemanager.cxx b/codemaker/source/codemaker/typemanager.cxx
index c5add3e..d223e48 100644
--- a/codemaker/source/codemaker/typemanager.cxx
+++ b/codemaker/source/codemaker/typemanager.cxx
@@ -41,13 +41,13 @@ TypeManager::~TypeManager()
sal_Int32 TypeManager::acquire()
{
- return osl_incrementInterlockedCount(&m_pImpl->m_refCount);
+ return osl_atomic_increment(&m_pImpl->m_refCount);
}
sal_Int32 TypeManager::release()
{
sal_Int32 refCount = 0;
- if (0 == (refCount = osl_decrementInterlockedCount(&m_pImpl->m_refCount)) )
+ if (0 == (refCount = osl_atomic_decrement(&m_pImpl->m_refCount)) )
{
delete m_pImpl;
}
diff --git a/comphelper/inc/comphelper/uno3.hxx b/comphelper/inc/comphelper/uno3.hxx
index 935221c..1b83c73 100644
--- a/comphelper/inc/comphelper/uno3.hxx
+++ b/comphelper/inc/comphelper/uno3.hxx
@@ -35,8 +35,8 @@ namespace comphelper
//=========================================================================
/// manipulate ref counts without calling acquire/release
- inline oslInterlockedCount increment(oslInterlockedCount& _counter) { return osl_incrementInterlockedCount(&_counter); }
- inline oslInterlockedCount decrement(oslInterlockedCount& _counter) { return osl_decrementInterlockedCount(&_counter); }
+ inline oslInterlockedCount increment(oslInterlockedCount& _counter) { return osl_atomic_increment(&_counter); }
+ inline oslInterlockedCount decrement(oslInterlockedCount& _counter) { return osl_atomic_decrement(&_counter); }
//=========================================================================
diff --git a/comphelper/source/misc/SelectionMultiplex.cxx b/comphelper/source/misc/SelectionMultiplex.cxx
index aa3092d..d4cca73 100644
--- a/comphelper/source/misc/SelectionMultiplex.cxx
+++ b/comphelper/source/misc/SelectionMultiplex.cxx
@@ -76,12 +76,12 @@ OSelectionChangeMultiplexer::OSelectionChangeMultiplexer(OSelectionChangeListene
,m_bAutoSetRelease(_bAutoReleaseSet)
{
m_pListener->setAdapter(this);
- osl_incrementInterlockedCount(&m_refCount);
+ osl_atomic_increment(&m_refCount);
{
Reference< XSelectionChangeListener> xPreventDelete(this);
m_xSet->addSelectionChangeListener(xPreventDelete);
}
- osl_decrementInterlockedCount(&m_refCount);
+ osl_atomic_decrement(&m_refCount);
}
//------------------------------------------------------------------
diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx
index 26e85c6..2027606 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -401,13 +401,13 @@ namespace comphelper
componentAggregateProxyFor( xInnerComponent, _rRefCount, _rDelegator );
// add as event listener to the inner context, because we want to multiplex the AccessibleEvents
- osl_incrementInterlockedCount( &_rRefCount );
+ osl_atomic_increment( &_rRefCount );
{
Reference< XAccessibleEventBroadcaster > xBroadcaster( m_xInner, UNO_QUERY );
if ( xBroadcaster.is() )
xBroadcaster->addEventListener( this );
}
- osl_decrementInterlockedCount( &_rRefCount );
+ osl_atomic_decrement( &_rRefCount );
}
//--------------------------------------------------------------------
diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx
index 9b799d2..308ba4a 100644
--- a/comphelper/source/misc/asyncnotification.cxx
+++ b/comphelper/source/misc/asyncnotification.cxx
@@ -50,13 +50,13 @@ namespace comphelper
//--------------------------------------------------------------------
oslInterlockedCount SAL_CALL AnyEvent::acquire()
{
- return osl_incrementInterlockedCount( &m_refCount );
+ return osl_atomic_increment( &m_refCount );
}
//--------------------------------------------------------------------
oslInterlockedCount SAL_CALL AnyEvent::release()
{
- if ( 0 == osl_decrementInterlockedCount( &m_refCount ) )
+ if ( 0 == osl_atomic_decrement( &m_refCount ) )
{
delete this;
return 0;
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index 4097148..8a4cc74 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.cxx
@@ -85,7 +85,7 @@ namespace comphelper
void OModule::registerClient( OModule::ClientAccess )
{
::osl::MutexGuard aGuard(m_aMutex);
- if ( 1 == osl_incrementInterlockedCount( &m_nClients ) )
+ if ( 1 == osl_atomic_increment( &m_nClients ) )
onFirstClient();
}
@@ -93,7 +93,7 @@ namespace comphelper
void OModule::revokeClient( OModule::ClientAccess )
{
::osl::MutexGuard aGuard(m_aMutex);
- if ( 0 == osl_decrementInterlockedCount( &m_nClients ) )
+ if ( 0 == osl_atomic_decrement( &m_nClients ) )
onLastClient();
}
diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx
index e98b21e..6d190ff 100644
--- a/comphelper/source/misc/proxyaggregation.cxx
+++ b/comphelper/source/misc/proxyaggregation.cxx
@@ -59,7 +59,7 @@ namespace comphelper
m_xProxyAggregate->queryAggregation( ::getCppuType( &m_xProxyTypeAccess ) ) >>= m_xProxyTypeAccess;
// aggregate the proxy
- osl_incrementInterlockedCount( &_rRefCount );
+ osl_atomic_increment( &_rRefCount );
if ( m_xProxyAggregate.is() )
{
// At this point in time, the proxy has a ref count of exactly two - in m_xControlContextProxy,
@@ -67,7 +67,7 @@ namespace comphelper
// Remember to _not_ reset these members unless the delegator of the proxy has been reset, too!
m_xProxyAggregate->setDelegator( _rDelegator );
}
- osl_decrementInterlockedCount( &_rRefCount );
+ osl_atomic_decrement( &_rRefCount );
}
}
@@ -124,12 +124,12 @@ namespace comphelper
baseAggregateProxyFor( m_xInner.get(), _rRefCount, _rDelegator );
// add as event listener to the inner context, because we want to be notified of disposals
- osl_incrementInterlockedCount( &_rRefCount );
+ osl_atomic_increment( &_rRefCount );
{
if ( m_xInner.is() )
m_xInner->addEventListener( this );
}
- osl_decrementInterlockedCount( &_rRefCount );
+ osl_atomic_decrement( &_rRefCount );
}
//-------------------------------------------------------------------------
diff --git a/comphelper/source/misc/weakeventlistener.cxx b/comphelper/source/misc/weakeventlistener.cxx
index 288b159..db176d4 100644
--- a/comphelper/source/misc/weakeventlistener.cxx
+++ b/comphelper/source/misc/weakeventlistener.cxx
@@ -48,11 +48,11 @@ namespace comphelper
OSL_ENSURE( _rxBroadcaster.is(), "OWeakEventListenerAdapter::OWeakEventListenerAdapter: invalid broadcaster!" );
if ( _rxBroadcaster.is() )
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
{
_rxBroadcaster->addEventListener( this );
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
OSL_ENSURE( m_refCount > 0, "OWeakEventListenerAdapter::OWeakEventListenerAdapter: oops - not to be used with implementations which hold their listeners weak!" );
// the one and only reason for this adapter class (A) is to add as listener to a component (C) which
// holds its listeners hard, and forward all calls then to another listener (L) which is
diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/connectivity/inc/connectivity/CommonTools.hxx
index ac1c0d9..6a1dfc9 100644
--- a/connectivity/inc/connectivity/CommonTools.hxx
+++ b/connectivity/inc/connectivity/CommonTools.hxx
@@ -101,11 +101,11 @@ namespace connectivity
void acquire()
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
}
void release()
{
- if (! osl_decrementInterlockedCount( &m_refCount ))
+ if (! osl_atomic_decrement( &m_refCount ))
delete this;
}
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index 79df786..7b3f14f 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -45,7 +45,7 @@ OConnectionWrapper::OConnectionWrapper()
void OConnectionWrapper::setDelegation(Reference< XAggregation >& _rxProxyConnection,oslInterlockedCount& _rRefCount)
{
OSL_ENSURE(_rxProxyConnection.is(),"OConnectionWrapper: Connection must be valid!");
- osl_incrementInterlockedCount( &_rRefCount );
+ osl_atomic_increment( &_rRefCount );
if (_rxProxyConnection.is())
{
// transfer the (one and only) real ref to the aggregate to our member
@@ -61,7 +61,7 @@ void OConnectionWrapper::setDelegation(Reference< XAggregation >& _rxProxyConnec
m_xProxyConnection->setDelegator( xIf );
}
- osl_decrementInterlockedCount( &_rRefCount );
+ osl_atomic_decrement( &_rRefCount );
}
// -----------------------------------------------------------------------------
void OConnectionWrapper::setDelegation(const Reference< XConnection >& _xConnection
@@ -69,7 +69,7 @@ void OConnectionWrapper::setDelegation(const Reference< XConnection >& _xConnect
,oslInterlockedCount& _rRefCount)
{
OSL_ENSURE(_xConnection.is(),"OConnectionWrapper: Connection must be valid!");
- osl_incrementInterlockedCount( &_rRefCount );
+ osl_atomic_increment( &_rRefCount );
m_xConnection = _xConnection;
m_xTypeProvider.set(m_xConnection,UNO_QUERY);
@@ -88,7 +88,7 @@ void OConnectionWrapper::setDelegation(const Reference< XConnection >& _xConnect
m_xProxyConnection->setDelegator( xIf );
}
- osl_decrementInterlockedCount( &_rRefCount );
+ osl_atomic_decrement( &_rRefCount );
}
// -----------------------------------------------------------------------------
void OConnectionWrapper::disposing()
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 1d10e77..f72748e 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -54,14 +54,14 @@ ODatabaseMetaDataBase::ODatabaseMetaDataBase(const Reference< XConnection >& _rx
,m_storesMixedCaseQuotedIdentifiers(false,sal_False)
, m_xConnection(_rxConnection)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
{
m_xListenerHelper = new OEventListenerHelper(this);
Reference<XComponent> xCom(m_xConnection,UNO_QUERY);
if(xCom.is())
xCom->addEventListener(m_xListenerHelper);
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// -------------------------------------------------------------------------
ODatabaseMetaDataBase::~ODatabaseMetaDataBase()
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index ce5f446..f911f3e 100644
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -35,7 +35,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>&
: ODatabaseMetaDataResultSet(eTablePrivileges)
, m_bResetValues(sal_True)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
{
::rtl::OUString sUserWorkingFor;
Sequence< ::rtl::OUString > sTableTypes(3);
@@ -79,7 +79,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>&
setRows(aRows);
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
//------------------------------------------------------------------------------
const ORowSetValue& OResultSetPrivileges::getValue(sal_Int32 columnIndex)
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 96639c6..f175c3e 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -2063,9 +2063,9 @@ void release(oslInterlockedCount& _refCount,
Reference< XInterface >& _xInterface,
::com::sun::star::lang::XComponent* _pObject)
{
- if (osl_decrementInterlockedCount( &_refCount ) == 0)
+ if (osl_atomic_decrement( &_refCount ) == 0)
{
- osl_incrementInterlockedCount( &_refCount );
+ osl_atomic_increment( &_refCount );
if (!rBHelper.bDisposed && !rBHelper.bInDispose)
{
@@ -2095,7 +2095,7 @@ void release(oslInterlockedCount& _refCount,
}
}
else
- osl_incrementInterlockedCount( &_refCount );
+ osl_atomic_increment( &_refCount );
}
void checkDisposed(sal_Bool _bThrow) throw ( DisposedException )
diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx
index ada53c1..5666afc 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.cxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.cxx
@@ -43,7 +43,7 @@ OConnectionWeakWrapper::~OConnectionWeakWrapper()
{
if ( !OConnectionWeakWrapper_BASE::rBHelper.bDisposed )
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
dispose();
}
}
diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx
index d2d7126..1288763 100644
--- a/connectivity/source/cpool/ZDriverWrapper.cxx
+++ b/connectivity/source/cpool/ZDriverWrapper.cxx
@@ -43,7 +43,7 @@ namespace connectivity
if (m_pConnectionPool)
m_pConnectionPool->acquire();
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
if (_rxAggregateDriver.is())
{
// transfer the (one and only) real ref to the aggregate to our member
@@ -57,7 +57,7 @@ namespace connectivity
// set ourself as delegator
m_xDriverAggregate->setDelegator( static_cast< XWeak* >( this ) );
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
//--------------------------------------------------------------------
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 9b7fa73..7740379 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -88,7 +88,7 @@ OPoolCollection::OPoolCollection(const Reference< XMultiServiceFactory >& _rxF
if ( xProp.is() )
xProp->addPropertyChangeListener(getEnablePoolingNodeName(),this);
// attach as desktop listener to know when we have to release our pools
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
{
m_xDesktop = Reference< ::com::sun::star::frame::XDesktop>( m_xServiceFactory->createInstance(::rtl::OUString("com.sun.star.frame.Desktop") ), UNO_QUERY);
@@ -96,7 +96,7 @@ OPoolCollection::OPoolCollection(const Reference< XMultiServiceFactory >& _rxF
m_xDesktop->addTerminateListener(this);
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// -----------------------------------------------------------------------------
OPoolCollection::~OPoolCollection()
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index f893bca..2b24b24 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -56,7 +56,7 @@ OConnection::OConnection(ODriver* _pDriver) throw(SQLException, RuntimeExcepti
m_bClosed(sal_False),
m_bAutocommit(sal_True)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
IClassFactory2* pIUnknown = NULL;
IUnknown *pOuter = NULL;
@@ -90,7 +90,7 @@ OConnection::OConnection(ODriver* _pDriver) throw(SQLException, RuntimeExcepti
pIUnknown->Release();
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
//-----------------------------------------------------------------------------
OConnection::~OConnection()
@@ -99,7 +99,7 @@ OConnection::~OConnection()
//-----------------------------------------------------------------------------
void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
setConnectionInfo(info);
@@ -152,10 +152,10 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
}
catch(const Exception& )
{
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
throw;
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
//-----------------------------------------------------------------------------
void SAL_CALL OConnection::release() throw()
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 31bb5ec..61ec5d5 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -60,7 +60,7 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(ADORecordset* _pRecordSet
,m_bEOF(sal_False)
,m_bOnFirstAfterOpen(sal_False)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
m_aColMapping.push_back(-1);
if(_pRecordSet)
{
@@ -71,7 +71,7 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(ADORecordset* _pRecordSet
}
else
m_bOnFirstAfterOpen = sal_False;
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
// allocBuffer();
}
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index d12d0c2..fd1e0b1 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -57,7 +57,7 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInf
: OStatement_Base( _pConnection )
,m_aTypeInfo(_TypeInfo)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
OSQLParser aParser(_pConnection->getDriver()->getORB());
::rtl::OUString sErrorMessage;
@@ -80,7 +80,7 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInf
m_pParameters->AddRef();
m_pParameters->Refresh();
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index b1dc872..2e10ea9 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -104,19 +104,19 @@ OResultSet::OResultSet(ADORecordset* _pRecordSet) : OResultSet_BASE(m_aMutex)
// -----------------------------------------------------------------------------
void OResultSet::construct()
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
if (!m_pRecordSet)
{
OSL_FAIL( "OResultSet::construct: no RecordSet!" );
Reference< XInterface > xInt( *this );
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
::dbtools::throwFunctionSequenceException( xInt );
}
m_pRecordSet->AddRef();
VARIANT_BOOL bIsAtBOF;
CHECK_RETURN(m_pRecordSet->get_BOF(&bIsAtBOF))
m_bOnFirstAfterOpen = bIsAtBOF != VARIANT_TRUE;
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// -------------------------------------------------------------------------
OResultSet::~OResultSet()
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index cf0e8c6..71e9d4d 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -61,7 +61,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) : OStatement_BASE(
,m_eLockType(adLockReadOnly)
,m_eCursorType(adOpenForwardOnly)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
m_Command.Create();
if(m_Command.IsValid())
@@ -74,7 +74,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) : OStatement_BASE(
m_pConnection->acquire();
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
//------------------------------------------------------------------------------
void OStatement_Base::disposeResultSet()
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index ab7d60f..6576fc1 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -108,7 +108,7 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcConnection::acquireDoc" );
if ( m_xDoc.is() )
{
- osl_incrementInterlockedCount(&m_nDocCount);
+ osl_atomic_increment(&m_nDocCount);
return m_xDoc;
}
// open read-only as long as updating isn't implemented
@@ -172,14 +172,14 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
) );
::dbtools::throwGenericSQLException( sError, *this, aErrorDetails );
}
- osl_incrementInterlockedCount(&m_nDocCount);
+ osl_atomic_increment(&m_nDocCount);
return m_xDoc;
}
// -----------------------------------------------------------------------------
void OCalcConnection::releaseDoc()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcConnection::releaseDoc" );
- if ( osl_decrementInterlockedCount(&m_nDocCount) == 0 )
+ if ( osl_atomic_decrement(&m_nDocCount) == 0 )
::comphelper::disposeComponent( m_xDoc );
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 5d1140f..528508d 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -95,7 +95,7 @@ IMPLEMENT_SERVICE_INFO(OEvoabConnection, "com.sun.star.sdbc.drivers.evoab.Connec
//-----------------------------------------------------------------------------
void OEvoabConnection::construct(const ::rtl::OUString& url, const Sequence< PropertyValue >& info) throw(SQLException)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
SAL_INFO("evoab2", "OEvoabConnection::construct()::url = " << url );
::rtl::OUString sPassword;
@@ -120,7 +120,7 @@ void OEvoabConnection::construct(const ::rtl::OUString& url, const Sequence< Pro
setSDBCAddressType(SDBCAddress::EVO_LOCAL);
setURL(url);
setPassword(::rtl::OUStringToOString(sPassword,RTL_TEXTENCODING_UTF8));
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// --------------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index 2fa26d5..5f0beab 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -96,7 +96,7 @@ sal_Bool OConnection::matchesExtension( const String& _rExt ) const
//-----------------------------------------------------------------------------
void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) throw(SQLException)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
::rtl::OUString aExt;
const PropertyValue *pIter = info.getConstArray();
@@ -206,11 +206,11 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
}
catch(const Exception&)
{
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
throw;
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// XServiceInfo
// --------------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 43c23e8..33b9f65 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -116,7 +116,7 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIte
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OResultSet::OResultSet" );
DBG_CTOR( file_OResultSet, NULL );
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
m_bIsCount = (m_pParseTree &&
m_pParseTree->count() > 2 &&
SQL_ISRULE(m_pParseTree->getChild(2),scalar_exp_commalist) &&
@@ -128,14 +128,14 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIte
m_nResultSetConcurrency = isCount() ? ResultSetConcurrency::READ_ONLY : ResultSetConcurrency::UPDATABLE;
construct();
m_aSkipDeletedSet.SetDeletedVisible(m_bShowDeleted);
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// -------------------------------------------------------------------------
OResultSet::~OResultSet()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OResultSet::~OResultSet" );
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
disposing();
DBG_DTOR( file_OResultSet, NULL );
}
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 5667260..c606bbf 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -95,7 +95,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
// -----------------------------------------------------------------------------
OStatement_Base::~OStatement_Base()
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
disposing();
delete m_pSQLAnalyzer;
diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx
index e28a82f..8122f4c 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -61,7 +61,7 @@ IMPLEMENT_SERVICE_INFO(OFlatConnection, "com.sun.star.sdbc.drivers.flat.Connecti
//-----------------------------------------------------------------------------
void OFlatConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) throw(SQLException)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
const PropertyValue *pBegin = info.getConstArray();
const PropertyValue *pEnd = pBegin + info.getLength();
@@ -99,7 +99,7 @@ void OFlatConnection::construct(const ::rtl::OUString& url,const Sequence< Prope
}
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
OConnection::construct(url,info);
m_bShowDeleted = sal_True; // we do not supported rows for this type
}
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 685db4c..2d447af 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -133,7 +133,7 @@ namespace connectivity { namespace hsqldb
{
if ( !OHsqlConnection_BASE::rBHelper.bDisposed )
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
dispose();
}
}
diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
index 2a43f9b..4afc43a 100644
--- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx
+++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
@@ -41,7 +41,7 @@ namespace connectivity { namespace java { namespace sql {
sal_Int32 lcl_getFreeID( ConnectionLog::ObjectType _eType )
{
static oslInterlockedCount s_nCounts[ ConnectionLog::ObjectTypeCount ] = { 0, 0 };
- return osl_incrementInterlockedCount( s_nCounts + _eType );
+ return osl_atomic_increment( s_nCounts + _eType );
}
}
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index 4d0bdc9..5f1093a 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -79,12 +79,12 @@ oslInterlockedCount& getJavaVMRefCount()
// -----------------------------------------------------------------------------
void SDBThreadAttach::addRef()
{
- osl_incrementInterlockedCount(&getJavaVMRefCount());
+ osl_atomic_increment(&getJavaVMRefCount());
}
// -----------------------------------------------------------------------------
void SDBThreadAttach::releaseRef()
{
- osl_decrementInterlockedCount(&getJavaVMRefCount());
+ osl_atomic_decrement(&getJavaVMRefCount());
if ( getJavaVMRefCount() == 0 )
{
getJavaVM2(::rtl::Reference< jvmaccess::VirtualMachine >(),sal_True);
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 160edcd..035b330 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -72,11 +72,11 @@ java_sql_ResultSet::java_sql_ResultSet( JNIEnv * pEnv, jobject myObj, const java
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen at sun.com", "java_sql_ResultSet::java_sql_ResultSet" );
SDBThreadAttach::addRef();
- osl_incrementInterlockedCount(&m_refCount);
+ osl_atomic_increment(&m_refCount);
if ( pStmt )
m_xStatement = *pStmt;
- osl_decrementInterlockedCount(&m_refCount);
+ osl_atomic_decrement(&m_refCount);
}
// -----------------------------------------------------------------------------
java_sql_ResultSet::~java_sql_ResultSet()
@@ -84,7 +84,7 @@ java_sql_ResultSet::~java_sql_ResultSet()
if ( !java_sql_ResultSet_BASE::rBHelper.bDisposed && !java_sql_ResultSet_BASE::rBHelper.bInDispose )
{
// increment ref count to prevent double call of Dtor
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
dispose();
}
}
diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx
index 95e6642..ffabd1e 100644
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
@@ -63,7 +63,7 @@ void SAL_CALL KabConnection::release() throw()
// -----------------------------------------------------------------------------
void KabConnection::construct(const ::rtl::OUString&, const Sequence< PropertyValue >&) throw(SQLException)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
// create a KDE address book object
m_pAddressBook = KABC::StdAddressBook::self();
@@ -71,7 +71,7 @@ void KabConnection::construct(const ::rtl::OUString&, const Sequence< PropertyVa
// perharps we should analyze the URL to know whether the addressbook is local, over LDAP, etc...
// perharps we should get some user and password information from "info" properties
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// XServiceInfo
// --------------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index 7283b98..304ef30 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
@@ -40,9 +40,9 @@ KabDatabaseMetaData::KabDatabaseMetaData(KabConnection* _pCon)
{
OSL_ENSURE(_pCon,"KabDatabaseMetaData::KabDatabaseMetaData: No connection set!");
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable());
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// -------------------------------------------------------------------------
KabDatabaseMetaData::~KabDatabaseMetaData()
diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index 88c3702..04ee119 100644
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
@@ -311,7 +311,7 @@ KabDriver::KabDriver(
if ( !m_xMSFactory.is() )
throw NullPointerException();
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
try
{
Reference< XDesktop > xDesktop(
@@ -323,7 +323,7 @@ KabDriver::KabDriver(
{
DBG_UNHANDLED_EXCEPTION();
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// --------------------------------------------------------------------------------
void KabDriver::disposing()
diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx
index f546d26..5b4db40 100644
--- a/connectivity/source/drivers/macab/MacabConnection.cxx
+++ b/connectivity/source/drivers/macab/MacabConnection.cxx
@@ -61,12 +61,12 @@ void SAL_CALL MacabConnection::release() throw()
// -----------------------------------------------------------------------------
void MacabConnection::construct(const ::rtl::OUString&, const Sequence< PropertyValue >&) throw(SQLException)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
// get the Mac OS X shared address book
m_pAddressBook = new MacabAddressBook();
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// XServiceInfo
// --------------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index 994f67d..7ce6363 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -45,9 +45,9 @@ MacabDatabaseMetaData::MacabDatabaseMetaData(MacabConnection* _pCon)
{
OSL_ENSURE(_pCon,"MacabDatabaseMetaData::MacabDatabaseMetaData: No connection set!");
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable());
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// -------------------------------------------------------------------------
MacabDatabaseMetaData::~MacabDatabaseMetaData()
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index 9c318ad..be82f62 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -180,7 +180,7 @@ MacabDriver::MacabDriver(
if ( !m_xMSFactory.is() )
throw NullPointerException();
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
try
{
Reference< XDesktop > xDesktop(
@@ -192,7 +192,7 @@ MacabDriver::MacabDriver(
{
DBG_UNHANDLED_EXCEPTION();
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// --------------------------------------------------------------------------------
void MacabDriver::disposing()
diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx
index 005037c..87edf95 100644
--- a/connectivity/source/drivers/mork/MCatalog.cxx
+++ b/connectivity/source/drivers/mork/MCatalog.cxx
@@ -39,12 +39,12 @@ OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon)
,m_pConnection(_pCon)
,m_xMetaData(m_pConnection->getMetaData( ))
{
-// osl_incrementInterlockedCount( &m_refCount );
+// osl_atomic_increment( &m_refCount );
// refreshTables();
// refreshViews();
// refreshGroups();
// refreshUsers();
-// osl_decrementInterlockedCount( &m_refCount );
+// osl_atomic_decrement( &m_refCount );
}
// -------------------------------------------------------------------------
void OCatalog::refreshTables()
diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx
index 1b0c05a..c08bae1 100644
--- a/connectivity/source/drivers/mozab/MCatalog.cxx
+++ b/connectivity/source/drivers/mozab/MCatalog.cxx
@@ -39,12 +39,12 @@ OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon)
,m_pConnection(_pCon)
,m_xMetaData(m_pConnection->getMetaData( ))
{
-// osl_incrementInterlockedCount( &m_refCount );
+// osl_atomic_increment( &m_refCount );
// refreshTables();
// refreshViews();
// refreshGroups();
// refreshUsers();
-// osl_decrementInterlockedCount( &m_refCount );
+// osl_atomic_decrement( &m_refCount );
}
// -------------------------------------------------------------------------
void OCatalog::refreshTables()
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
index fd4b5b1..45d891f 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
@@ -46,7 +46,7 @@ ODatabaseMetaData::ODatabaseMetaData(const SQLHANDLE _pHandle,OConnection* _pCon
OSL_ENSURE(m_pConnection,"ODatabaseMetaData::ODatabaseMetaData: No connection set!");
if(!m_pConnection->isCatalogUsed())
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
try
{
m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable());
@@ -56,7 +56,7 @@ ODatabaseMetaData::ODatabaseMetaData(const SQLHANDLE _pHandle,OConnection* _pCon
catch(SQLException& )
{ // doesn't matter here
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
}
// -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index 37040d4..c8e4156 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -71,10 +71,10 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(OConnection* _pConnection
if( SQL_NULL_HANDLE == m_aStatementHandle )
throw RuntimeException();
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
m_pConnection->acquire();
m_pRowStatusArray = new SQLUSMALLINT[1]; // the default value
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
// allocBuffer();
}
@@ -84,7 +84,7 @@ ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet()
OSL_ENSURE(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed,"Object wasn't disposed!");
if(!ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
dispose();
}
delete [] m_pRowStatusArray;
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index ccb45e5..7cfebcb 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -105,7 +105,7 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) :
,m_bRowDeleted(sal_False)
,m_bUseFetchScroll(sal_False)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
try
{
m_pRowStatusArray = new SQLUSMALLINT[1]; // the default value
@@ -149,7 +149,7 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) :
m_bUseFetchScroll = sal_False;
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// -------------------------------------------------------------------------
OResultSet::~OResultSet()
@@ -160,9 +160,9 @@ OResultSet::~OResultSet()
// -----------------------------------------------------------------------------
void OResultSet::construct()
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
allocBuffer();
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// -------------------------------------------------------------------------
void OResultSet::disposing(void)
diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx
index ce92dee..fabc0f2 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -66,7 +66,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
,m_pRowStatusArray(0)
,rBHelper(OStatement_BASE::rBHelper)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
m_pConnection->acquire();
m_aStatementHandle = m_pConnection->createStatementHandle();
@@ -80,7 +80,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
// If we ever again encounter a ODBC driver which needs this option, then we should introduce a data source
// setting for it, instead of unconditionally doing it.
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// -----------------------------------------------------------------------------
OStatement_Base::~OStatement_Base()
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index 1fc4a66..2465910 100644
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
@@ -110,14 +110,14 @@ namespace connectivity
//--------------------------------------------------------------------
void SharedResources_Impl::registerClient()
{
- osl_incrementInterlockedCount( &s_nClients );
+ osl_atomic_increment( &s_nClients );
}
//--------------------------------------------------------------------
void SharedResources_Impl::revokeClient()
{
::osl::MutexGuard aGuard( getMutex() );
- if ( 0 == osl_decrementInterlockedCount( &s_nClients ) )
+ if ( 0 == osl_atomic_decrement( &s_nClients ) )
{
delete s_pInstance;
s_pInstance = NULL;
diff --git a/connectivity/source/simpledbt/refbase.cxx b/connectivity/source/simpledbt/refbase.cxx
index 9af0ada..7c9fe5e 100644
--- a/connectivity/source/simpledbt/refbase.cxx
+++ b/connectivity/source/simpledbt/refbase.cxx
@@ -35,13 +35,13 @@ namespace connectivity
//----------------------------------------------------------------
oslInterlockedCount SAL_CALL ORefBase::acquire()
{
- return osl_incrementInterlockedCount(&m_refCount);
+ return osl_atomic_increment(&m_refCount);
}
//----------------------------------------------------------------
oslInterlockedCount SAL_CALL ORefBase::release()
{
- oslInterlockedCount nNewRefCount = osl_decrementInterlockedCount(&m_refCount);
+ oslInterlockedCount nNewRefCount = osl_atomic_decrement(&m_refCount);
if (0 == nNewRefCount)
delete this;
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index c2e4959..e8bc774 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -216,7 +216,7 @@ ORowSet::~ORowSet()
if ( !m_rBHelper.bDisposed && !m_rBHelper.bInDispose )
{
OSL_FAIL("Please check who doesn't dispose this component!");
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
dispose();
}
}
diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx
index e36657e..80a2dac 100644
--- a/dbaccess/source/core/api/RowSetRow.hxx
+++ b/dbaccess/source/core/api/RowSetRow.hxx
@@ -46,11 +46,11 @@ namespace dbaccess
void acquire()
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
}
void release()
{
- if (! osl_decrementInterlockedCount( &m_refCount ))
+ if (! osl_atomic_decrement( &m_refCount ))
delete this;
}
inline ORowSetRow getRow() const { return m_aRow; }
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index 1c378df..190da60 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -210,11 +210,11 @@ OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, co
}
// determine the table column we're based on
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
{
m_xOriginalTableColumn = impl_determineOriginalTableColumn( _rxConnection );
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
OQueryColumn::~OQueryColumn()
@@ -568,7 +568,7 @@ OTableColumnWrapper::OTableColumnWrapper( const Reference< XPropertySet >& rCol,
const bool _bPureWrap )
:OTableColumnDescriptorWrapper( rCol, _bPureWrap, false )
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
if ( _xColDefintion.is() )
{
try
@@ -580,7 +580,7 @@ OTableColumnWrapper::OTableColumnWrapper( const Reference< XPropertySet >& rCol,
DBG_UNHANDLED_EXCEPTION();
}
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
OTableColumnWrapper::~OTableColumnWrapper()
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index 8ace09d..e89d80e 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -88,7 +88,7 @@ OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition
registerProperties();
ODataSettings::registerPropertiesFor(this);
- osl_incrementInterlockedCount(&m_refCount);
+ osl_atomic_increment(&m_refCount);
OSL_ENSURE(m_xCommandDefinition.is(), "OQuery::OQuery : invalid CommandDefinition object !");
if ( m_xCommandDefinition.is() )
{
@@ -106,7 +106,7 @@ OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition
m_xCommandPropInfo = m_xCommandDefinition->getPropertySetInfo();
}
OSL_ENSURE(m_xConnection.is(), "OQuery::OQuery : invalid connection !");
- osl_decrementInterlockedCount(&m_refCount);
+ osl_atomic_decrement(&m_refCount);
}
OQuery::~OQuery()
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index bc4f690..66745a5 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1015,12 +1015,12 @@ Reference< XModel > ODatabaseModelImpl::createNewModel_deliverOwnership( bool _b
oslInterlockedCount SAL_CALL ODatabaseModelImpl::acquire()
{
- return osl_incrementInterlockedCount(&m_refCount);
+ return osl_atomic_increment(&m_refCount);
}
oslInterlockedCount SAL_CALL ODatabaseModelImpl::release()
{
- if ( osl_decrementInterlockedCount(&m_refCount) == 0 )
+ if ( osl_atomic_decrement(&m_refCount) == 0 )
{
acquire(); // prevent multiple releases
m_pDBContext->removeFromTerminateListener(*this);
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 44a4299..8e5d5c4 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -301,7 +301,7 @@ OConnection::OConnection(ODatabaseSource& _rDB
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::OConnection" );
DBG_CTOR(OConnection,NULL);
- osl_incrementInterlockedCount(&m_refCount);
+ osl_atomic_increment(&m_refCount);
try
{
@@ -377,7 +377,7 @@ OConnection::OConnection(ODatabaseSource& _rDB
{
DBG_UNHANDLED_EXCEPTION();
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
OConnection::~OConnection()
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index bb37110..4d8f3ba 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -178,14 +178,14 @@ ODatabaseContext::ODatabaseContext( const Reference< XComponentContext >& _rxCon
::basic::BasicManagerRepository::registerCreationListener( *this );
#endif
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
{
m_xDBRegistrationAggregate.set( createDataSourceRegistrations( m_aContext ), UNO_SET_THROW );
m_xDatabaseRegistrations.set( m_xDBRegistrationAggregate, UNO_QUERY_THROW );
m_xDBRegistrationAggregate->setDelegator( *this );
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
ODatabaseContext::~ODatabaseContext()
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index e2c4c03..9b49dc4 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -174,7 +174,7 @@ ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>&
DBG_CTOR(ODatabaseDocument,NULL);
OSL_TRACE( "DD: ctor: %p: %p", this, m_pImpl.get() );
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
{
impl_reparent_nothrow( m_xForms );
impl_reparent_nothrow( m_xReports );
@@ -183,7 +183,7 @@ ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>&
m_pEventExecutor = new DocumentEventExecutor( m_pImpl->m_aContext, this );
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
// if there previously was a document instance for the same Impl which was already initialized,
// then consider ourself initialized, too.
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index df2153e..061d873 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -141,12 +141,12 @@ FlushNotificationAdapter::FlushNotificationAdapter( const Reference< XFlushable
DBG_CTOR( FlushNotificationAdapter, NULL );
OSL_ENSURE( _rxBroadcaster.is(), "FlushNotificationAdapter::FlushNotificationAdapter: invalid flushable!" );
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
{
if ( _rxBroadcaster.is() )
_rxBroadcaster->addFlushListener( this );
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
OSL_ENSURE( m_refCount == 1, "FlushNotificationAdapter::FlushNotificationAdapter: broadcaster isn't holding by hard ref!?" );
}
@@ -341,7 +341,7 @@ void SAL_CALL OSharedConnectionManager::disposing( const ::com::sun::star::lang:
TSharedConnectionMap::iterator aFind = m_aSharedConnection.find(xConnection);
if ( m_aSharedConnection.end() != aFind )
{
- osl_decrementInterlockedCount(&aFind->second->second.nALiveCount);
+ osl_atomic_decrement(&aFind->second->second.nALiveCount);
if ( !aFind->second->second.nALiveCount )
{
::comphelper::disposeComponent(aFind->second->second.xMasterConnection);
@@ -404,7 +404,7 @@ void OSharedConnectionManager::addEventListener(const Reference<XConnection>& _r
Reference<XComponent> xComp(_rxConnection,UNO_QUERY);
xComp->addEventListener(this);
OSL_ENSURE( m_aConnections.end() != _rIter , "Iterator is end!");
- osl_incrementInterlockedCount(&_rIter->second.nALiveCount);
+ osl_atomic_increment(&_rIter->second.nALiveCount);
}
namespace
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 1f39d32..4593269 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -183,12 +183,12 @@ namespace dbaccess
,m_bInStateChange(false)
,m_bInChangingState(false)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
{
if ( m_xBroadCaster.is() )
m_xBroadCaster->addStateChangeListener(this);
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException);
@@ -329,11 +329,11 @@ namespace dbaccess
:m_xClient( _rxClient )
{
OSL_ENSURE( _rxActor.is(), "LifetimeCoupler::LifetimeCoupler: this will crash!" );
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
{
_rxActor->addEventListener( this );
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
OSL_ENSURE( m_refCount, "LifetimeCoupler::LifetimeCoupler: the actor is not holding us by hard ref - this won't work!" );
}
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
index 7d41a9e..0d835a0 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
@@ -128,11 +128,11 @@ namespace dbaccess
{
Reference< XDocumentEventBroadcaster > xBroadcaster( _rxDocument, UNO_QUERY_THROW );
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
{
xBroadcaster->addDocumentEventListener( this );
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
try
{
diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
index bfa12a5..1bd4229 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
@@ -137,12 +137,12 @@ namespace dbaccess
void SAL_CALL DocumentEventNotifier_Impl::acquire()
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
}
void SAL_CALL DocumentEventNotifier_Impl::release()
{
- if ( 0 == osl_decrementInterlockedCount( &m_refCount ) )
+ if ( 0 == osl_atomic_decrement( &m_refCount ) )
delete this;
}
diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx
index c1b525e..049bdbc 100644
--- a/dbaccess/source/core/inc/FilteredContainer.hxx
+++ b/dbaccess/source/core/inc/FilteredContainer.hxx
@@ -72,12 +72,12 @@ namespace dbaccess
EnsureReset( oslInterlockedCount& _rValueLocation)
:m_rValue( _rValueLocation )
{
- osl_incrementInterlockedCount(&m_rValue);
+ osl_atomic_increment(&m_rValue);
}
~EnsureReset()
{
- osl_decrementInterlockedCount(&m_rValue);
+ osl_atomic_decrement(&m_rValue);
}
private:
diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx
index bd153d5..de4dfa5 100644
--- a/dbaccess/source/core/misc/ContainerMediator.cxx
+++ b/dbaccess/source/core/misc/ContainerMediator.cxx
@@ -53,7 +53,7 @@ OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContain
if ( _xSettings.is() && _xContainer.is() )
{
- osl_incrementInterlockedCount(&m_refCount);
+ osl_atomic_increment(&m_refCount);
try
{
m_xContainer->addContainerListener(this);
@@ -65,7 +65,7 @@ OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContain
{
OSL_FAIL("OContainerMediator::OContainerMediator: caught an exception!");
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
else
{
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index 64eeb96..80bb599 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -70,7 +70,7 @@ DatabaseDataProvider::DatabaseDataProvider(uno::Reference< uno::XComponentContex
m_xRangeConversion.set(m_xInternal,uno::UNO_QUERY);
m_xComplexDescriptionAccess.set(m_xInternal,uno::UNO_QUERY);
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
{
m_xRowSet.set( m_xContext->getServiceManager()->createInstanceWithContext(SERVICE_SDB_ROWSET,m_xContext ), uno::UNO_QUERY );
m_xAggregate.set(m_xRowSet,uno::UNO_QUERY);
@@ -81,7 +81,7 @@ DatabaseDataProvider::DatabaseDataProvider(uno::Reference< uno::XComponentContex
m_xAggregateSet->setPropertyValue(PROPERTY_COMMAND_TYPE,uno::makeAny(m_CommandType));
m_xAggregateSet->setPropertyValue(PROPERTY_ESCAPE_PROCESSING,uno::makeAny(m_EscapeProcessing));
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// -----------------------------------------------------------------------------
void SAL_CALL DatabaseDataProvider::disposing()
diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx
index 428942f..2894a7f 100644
--- a/dbaccess/source/core/misc/PropertyForward.cxx
+++ b/dbaccess/source/core/misc/PropertyForward.cxx
@@ -53,7 +53,7 @@ namespace dbaccess
{
DBG_CTOR(OPropertyForward,NULL);
- osl_incrementInterlockedCount(&m_refCount);
+ osl_atomic_increment(&m_refCount);
try
{
if ( _aPropertyList.empty() )
@@ -70,7 +70,7 @@ namespace dbaccess
{
DBG_UNHANDLED_EXCEPTION();
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx
index fa67810..cdf690b 100644
--- a/dbaccess/source/core/misc/apitools.cxx
+++ b/dbaccess/source/core/misc/apitools.cxx
@@ -78,7 +78,7 @@ void OSubComponent::release() throw ( )
Reference< XInterface > x( xDelegator );
if (! x.is())
{
- if (osl_decrementInterlockedCount( &m_refCount ) == 0 )
+ if (osl_atomic_decrement( &m_refCount ) == 0 )
{
if (! rBHelper.bDisposed)
{
@@ -115,7 +115,7 @@ void OSubComponent::release() throw ( )
}
}
// restore the reference count
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
}
// as we cover the job of the componenthelper we use the ...
diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx
index 0f92f49..614c268 100644
--- a/dbaccess/source/core/recovery/settingsimport.cxx
+++ b/dbaccess/source/core/recovery/settingsimport.cxx
@@ -60,13 +60,13 @@ namespace dbaccess
//--------------------------------------------------------------------
oslInterlockedCount SAL_CALL SettingsImport::acquire()
{
- return osl_incrementInterlockedCount( &m_refCount );
+ return osl_atomic_increment( &m_refCount );
}
//--------------------------------------------------------------------
oslInterlockedCount SAL_CALL SettingsImport::release()
{
- oslInterlockedCount newCount = osl_decrementInterlockedCount( &m_refCount );
+ oslInterlockedCount newCount = osl_atomic_decrement( &m_refCount );
if ( newCount == 0 )
delete this;
return newCount;
diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx
index 5e3e867..7238b39 100644
--- a/dbaccess/source/core/recovery/subcomponentloader.cxx
+++ b/dbaccess/source/core/recovery/subcomponentloader.cxx
@@ -120,11 +120,11 @@ namespace dbaccess
Reference< XController2 > xController( i_rApplicationController, UNO_QUERY_THROW );
m_pData->xAppComponentWindow.set( xController->getComponentWindow(), UNO_SET_THROW );
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
{
m_pData->xAppComponentWindow->addWindowListener( this );
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
//--------------------------------------------------------------------
@@ -136,11 +136,11 @@ namespace dbaccess
Reference< XController2 > xController( i_rApplicationController, UNO_QUERY_THROW );
m_pData->xAppComponentWindow.set( xController->getComponentWindow(), UNO_SET_THROW );
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
{
m_pData->xAppComponentWindow->addWindowListener( this );
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
//--------------------------------------------------------------------
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 9fd4d3a..aaa71c3 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -320,7 +320,7 @@ OApplicationController::~OApplicationController()
{
OSL_FAIL("Please check who doesn't dispose this component!");
// increment ref count to prevent double call of Dtor
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
dispose();
}
SAL_WNODEPRECATED_DECLARATIONS_PUSH
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx
index 39502a4..fa2abaa 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -71,13 +71,13 @@ namespace dbaui
,m_pHtml(NULL)
,m_pRtf(NULL)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
lcl_setListener( _rxConnection, this, true );
m_pHtml.set( new OHTMLImportExport( getDescriptor(), _rxORB, _rxFormatter ) );
m_pRtf.set( new ORTFImportExport( getDescriptor(), _rxORB, _rxFormatter ) );
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// -----------------------------------------------------------------------------
@@ -106,7 +106,7 @@ namespace dbaui
{
OSL_PRECOND( i_rORB.is(), "ODataClipboard::ODataClipboard: having no factory is not good ..." );
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
Reference<XConnection> xConnection;
getDescriptor()[ daConnection ] >>= xConnection;
@@ -136,7 +136,7 @@ namespace dbaui
}
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 11178af..cb8d8b9 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -189,11 +189,11 @@ OGenericUnoController::OGenericUnoController(const Reference< XMultiServiceFacto
,m_bCurrentlyModified(sal_False)
,m_bExternalTitle(sal_False)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
{
m_pData.reset( new OGenericUnoController_Data( *this, getMutex() ) );
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
DBG_CTOR(OGenericUnoController,NULL);
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index e50a64e..0be575a 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -247,7 +247,7 @@ SbaTableQueryBrowser::~SbaTableQueryBrowser()
{
OSL_FAIL("Please check who doesn't dispose this component!");
// increment ref count to prevent double call of Dtor
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
dispose();
}
}
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index cf9242e..d768adf 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -71,9 +71,9 @@ namespace dbaui
OToolboxController::OToolboxController(const Reference< XMultiServiceFactory >& _rxORB)
: m_nToolBoxId(1)
{
- osl_incrementInterlockedCount(&m_refCount);
+ osl_atomic_increment(&m_refCount);
m_xServiceManager = _rxORB;
- osl_decrementInterlockedCount(&m_refCount);
+ osl_atomic_decrement(&m_refCount);
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index ad091cc..36c922c 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -108,7 +108,7 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor&
m_eDestEnc = osl_getThreadTextEncoding();
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
impl_initFromDescriptor( _aDataDescriptor, false );
xub_StrLen nCount = comphelper::string::getTokenCount(rExchange, char(11));
@@ -118,7 +118,7 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor&
for(xub_StrLen i=SBA_FORMAT_SELECTION_COUNT;i<nCount;++i)
m_pRowMarker[i-SBA_FORMAT_SELECTION_COUNT] = rExchange.GetToken(i,char(11)).ToInt32();
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// -----------------------------------------------------------------------------
// import data
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index eb67823..7ae2348 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -352,7 +352,7 @@ OQueryController::~OQueryController()
{
OSL_FAIL("Please check who doesn't dispose this component!");
// increment ref count to prevent double call of Dtor
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
dispose();
}
}
diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx
index 4329e16..c5613a7 100644
--- a/dbaccess/source/ui/uno/ColumnPeer.cxx
+++ b/dbaccess/source/ui/uno/ColumnPeer.cxx
@@ -37,13 +37,13 @@ OColumnPeer::OColumnPeer(Window* _pParent,const Reference<XMultiServiceFactory>&
:m_xORB(_rxFactory)
,m_pActFieldDescr(NULL)
{
- osl_incrementInterlockedCount( &m_refCount );
+ osl_atomic_increment( &m_refCount );
{
OColumnControlWindow* pFieldControl = new OColumnControlWindow(_pParent,m_xORB);
pFieldControl->SetComponentInterface(this);
pFieldControl->Show();
}
- osl_decrementInterlockedCount( &m_refCount );
+ osl_atomic_decrement( &m_refCount );
}
// -----------------------------------------------------------------------------
void OColumnPeer::setEditWidth(sal_Int32 _nWidth)
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 99af4b5..382965d 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -114,14 +114,14 @@ SvxEditEngineSourceImpl::~SvxEditEngineSourceImpl()
void SAL_CALL SvxEditEngineSourceImpl::acquire()
{
- osl_incrementInterlockedCount( &maRefCount );
+ osl_atomic_increment( &maRefCount );
}
//------------------------------------------------------------------------
void SAL_CALL SvxEditEngineSourceImpl::release()
{
- if( ! osl_decrementInterlockedCount( &maRefCount ) )
+ if( ! osl_atomic_decrement( &maRefCount ) )
delete this;
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list