diff options
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/source/core/api/FixedLine.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/core/api/FixedText.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/core/api/FormattedField.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/core/api/Group.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/core/api/ImageControl.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/core/api/ReportComponent.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/core/api/ReportDefinition.cxx | 12 | ||||
-rw-r--r-- | reportdesign/source/core/api/Shape.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/core/sdr/PropertyForward.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/core/sdr/UndoEnv.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/misc/toolboxcontroller.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportControllerObserver.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/StartMarker.cxx | 4 |
13 files changed, 30 insertions, 30 deletions
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index dee328a2c085..4cd06eeae952 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -166,7 +166,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex DBG_CTOR(rpt_OFixedLine,NULL); m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDLINE,m_aProps.aComponent.m_xContext->getServiceManager()); m_aProps.aComponent.m_xFactory = _xFactory; - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); try { awt::Size aSize = _xShape->getSize(); @@ -189,7 +189,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex { OSL_FAIL("OFixedLine::OFixedLine: Exception caught!"); } - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } // ----------------------------------------------------------------------------- OFixedLine::~OFixedLine() diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index aff7ff79acc4..dd47a11cb54f 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -73,11 +73,11 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContex m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDTEXT,m_aProps.aComponent.m_xContext->getServiceManager()); m_aProps.aComponent.m_nBorder = 0; // no border m_aProps.aComponent.m_xFactory = _xFactory; - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); { m_aProps.aComponent.setShape(_xShape,this,m_refCount); } - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } // ----------------------------------------------------------------------------- OFixedText::~OFixedText() diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index 95a2243b6a59..ddd4125a6a84 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -80,11 +80,11 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const DBG_CTOR( rpt_OFormattedField,NULL); m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FORMATTEDFIELD,m_aProps.aComponent.m_xContext->getServiceManager()); m_aProps.aComponent.m_xFactory = _xFactory; - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); { m_aProps.aComponent.setShape(_xShape,this,m_refCount); } - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } // ----------------------------------------------------------------------------- OFormattedField::~OFormattedField() diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index fbcad5aeb276..c11bb7e43606 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -54,11 +54,11 @@ OGroup::OGroup(const uno::Reference< report::XGroups >& _xParent ,m_xParent(_xParent) { DBG_CTOR( rpt_OGroup,NULL); - osl_incrementInterlockedCount(&m_refCount); + osl_atomic_increment(&m_refCount); { m_xFunctions = new OFunctions(this,m_xContext); } - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } //-------------------------------------------------------------------------- // TODO: VirtualFunctionFinder: This is virtual function! diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index 71d2a22f874c..0b7e55cbc1fb 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -146,11 +146,11 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x DBG_CTOR( rpt_OImageControl,NULL); m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_IMAGECONTROL,m_aProps.aComponent.m_xContext->getServiceManager()); m_aProps.aComponent.m_xFactory = _xFactory; - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); { m_aProps.aComponent.setShape(_xShape,this,m_refCount); } - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } // ----------------------------------------------------------------------------- OImageControl::~OImageControl() diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 6160ff898158..f7105362e596 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -104,7 +104,7 @@ OFormatProperties::OFormatProperties() // ----------------------------------------------------------------------------- void OReportComponentProperties::setShape(uno::Reference< drawing::XShape >& _xShape,const uno::Reference< report::XReportComponent>& _xTunnel,oslInterlockedCount& _rRefCount) { - osl_incrementInterlockedCount( &_rRefCount ); + osl_atomic_increment( &_rRefCount ); { m_xProxy.set(_xShape,uno::UNO_QUERY); ::comphelper::query_aggregation(m_xProxy,m_xShape); @@ -118,7 +118,7 @@ void OReportComponentProperties::setShape(uno::Reference< drawing::XShape >& _xS if ( m_xProxy.is() ) m_xProxy->setDelegator( _xTunnel ); } - osl_decrementInterlockedCount( &_rRefCount ); + osl_atomic_decrement( &_rRefCount ); } // ----------------------------------------------------------------------------- OReportComponentProperties::~OReportComponentProperties() diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 41adfc60c476..7e9f4f584f0e 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -658,14 +658,14 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co { DBG_CTOR( rpt_OReportDefinition,NULL); m_aProps->m_sName = RPT_RESSTRING(RID_STR_REPORT,m_aProps->m_xContext->getServiceManager()); - osl_incrementInterlockedCount(&m_refCount); + osl_atomic_increment(&m_refCount); { init(); m_pImpl->m_xGroups = new OGroups(this,m_aProps->m_xContext); m_pImpl->m_xDetail = OSection::createOSection(this,m_aProps->m_xContext); m_pImpl->m_xDetail->setName(RPT_RESSTRING(RID_STR_DETAIL,m_aProps->m_xContext->getServiceManager())); } - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } // ----------------------------------------------------------------------------- OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > const & _xContext @@ -678,7 +678,7 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co { m_aProps->m_sName = RPT_RESSTRING(RID_STR_REPORT,m_aProps->m_xContext->getServiceManager()); m_aProps->m_xFactory = _xFactory; - osl_incrementInterlockedCount(&m_refCount); + osl_atomic_increment(&m_refCount); { m_aProps->setShape(_xShape,this,m_refCount); init(); @@ -686,7 +686,7 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co m_pImpl->m_xDetail = OSection::createOSection(this,m_aProps->m_xContext); m_pImpl->m_xDetail->setName(RPT_RESSTRING(RID_STR_DETAIL,m_aProps->m_xContext->getServiceManager())); } - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } // ----------------------------------------------------------------------------- OReportDefinition::OReportDefinition(const OReportDefinition& _rCopy) @@ -698,7 +698,7 @@ OReportDefinition::OReportDefinition(const OReportDefinition& _rCopy) ,m_pImpl(new OReportDefinitionImpl(m_aMutex,*_rCopy.m_pImpl)) { DBG_CTOR( rpt_OReportDefinition,NULL); - osl_incrementInterlockedCount(&m_refCount); + osl_atomic_increment(&m_refCount); { init(); OGroups* pGroups = new OGroups(this,m_aProps->m_xContext); @@ -716,7 +716,7 @@ OReportDefinition::OReportDefinition(const OReportDefinition& _rCopy) OSection::lcl_copySection(_rCopy.m_pImpl->m_xReportHeader,m_pImpl->m_xReportHeader); OSection::lcl_copySection(_rCopy.m_pImpl->m_xReportFooter,m_pImpl->m_xReportFooter); } - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } // ----------------------------------------------------------------------------- OReportDefinition::~OReportDefinition() diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index 2685b12f2c8d..b92a23382f9a 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -87,7 +87,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext DBG_CTOR( rpt_OShape,NULL); m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_SHAPE,m_aProps.aComponent.m_xContext->getServiceManager()); m_aProps.aComponent.m_xFactory = _xFactory; - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); { uno::Reference<beans::XPropertySet> xProp(_xShape,uno::UNO_QUERY); if ( xProp.is() ) @@ -97,7 +97,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext } m_aProps.aComponent.setShape(_xShape,this,m_refCount); } - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } // ----------------------------------------------------------------------------- OShape::~OShape() diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index 23b9543ba501..9c8cc05162f5 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -55,7 +55,7 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource ,m_bInChange(sal_False) { DBG_CTOR( rpt_OPropertyMediator,NULL); - osl_incrementInterlockedCount(&m_refCount); + osl_atomic_increment(&m_refCount); OSL_ENSURE(m_xDest.is(),"Dest is NULL!"); OSL_ENSURE(m_xSource.is(),"Source is NULL!"); if ( m_xDest.is() && m_xSource.is() ) @@ -96,7 +96,7 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource (void)e; } } - osl_decrementInterlockedCount(&m_refCount); + osl_atomic_decrement(&m_refCount); } // ----------------------------------------------------------------------------- OPropertyMediator::~OPropertyMediator() diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index cfb35bce51cf..bda520b8afb6 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -150,13 +150,13 @@ OXUndoEnvironment::~OXUndoEnvironment() void OXUndoEnvironment::Lock() { OSL_ENSURE(m_refCount,"Illegal call to dead object!"); - osl_incrementInterlockedCount( &m_pImpl->m_nLocks ); + osl_atomic_increment( &m_pImpl->m_nLocks ); } void OXUndoEnvironment::UnLock() { OSL_ENSURE(m_refCount,"Illegal call to dead object!"); - osl_decrementInterlockedCount( &m_pImpl->m_nLocks ); + osl_atomic_decrement( &m_pImpl->m_nLocks ); } sal_Bool OXUndoEnvironment::IsLocked() const { return m_pImpl->m_nLocks != 0; } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 61219dc0531e..ebe551c0ca23 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -109,9 +109,9 @@ OToolboxController::OToolboxController(const Reference< XMultiServiceFactory >& ,m_nSlotId(0) { DBG_CTOR(rpt_OToolboxController,NULL); - osl_incrementInterlockedCount(&m_refCount); + osl_atomic_increment(&m_refCount); m_xServiceManager = _rxORB; - osl_decrementInterlockedCount(&m_refCount); + osl_atomic_decrement(&m_refCount); } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 9d28856f13b2..53dd211bb05c 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -189,13 +189,13 @@ public: void OXReportControllerObserver::Lock() { OSL_ENSURE(m_refCount,"Illegal call to dead object!"); - osl_incrementInterlockedCount( &m_pImpl->m_nLocks ); + osl_atomic_increment( &m_pImpl->m_nLocks ); } void OXReportControllerObserver::UnLock() { OSL_ENSURE(m_refCount,"Illegal call to dead object!"); - osl_decrementInterlockedCount( &m_pImpl->m_nLocks ); + osl_atomic_decrement( &m_pImpl->m_nLocks ); } sal_Bool OXReportControllerObserver::IsLocked() const { return m_pImpl->m_nLocks != 0; } diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 8a191bae5ca5..fe52a140e123 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -65,7 +65,7 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const ::rtl::OUString& _sCol DBG_CTOR( rpt_OStartMarker,NULL); SetUniqueId(HID_RPT_STARTMARKER); - osl_incrementInterlockedCount(&s_nImageRefCount); + osl_atomic_increment(&s_nImageRefCount); initDefaultNodeImages(); ImplInitSettings(); m_aText.SetHelpId(HID_RPT_START_TITLE); @@ -90,7 +90,7 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const ::rtl::OUString& _sCol OStartMarker::~OStartMarker() { DBG_DTOR( rpt_OStartMarker,NULL); - if ( osl_decrementInterlockedCount(&s_nImageRefCount) == 0 ) + if ( osl_atomic_decrement(&s_nImageRefCount) == 0 ) { DELETEZ(s_pDefCollapsed); DELETEZ(s_pDefExpanded); |