summaryrefslogtreecommitdiff
path: root/toolkit/source/controls
diff options
context:
space:
mode:
authorNoel <noel.grandin@collabora.co.uk>2021-02-23 09:41:33 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-02-23 09:25:07 +0100
commita079e9010398ba2c33cf2509ff511e711b5e5b37 (patch)
tree70c7513515f3e827694c2084318237131f6ae7c9 /toolkit/source/controls
parent0bbb687d37f6493956259fe8486820618a28af0b (diff)
loplugin:refcounting in toolkit
Change-Id: I4a65ee848eed7c48340c73d3144b4a1e29ab867c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111370 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit/source/controls')
-rw-r--r--toolkit/source/controls/accessiblecontrolcontext.cxx6
-rw-r--r--toolkit/source/controls/controlmodelcontainerbase.cxx6
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx8
-rw-r--r--toolkit/source/controls/roadmapcontrol.cxx8
4 files changed, 14 insertions, 14 deletions
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx
index cf4cf7207749..5b4be7ed0d84 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -85,9 +85,9 @@ namespace toolkit
}
- OAccessibleControlContext* OAccessibleControlContext::create( const Reference< XAccessible >& _rxCreator )
+ rtl::Reference<OAccessibleControlContext> OAccessibleControlContext::create( const Reference< XAccessible >& _rxCreator )
{
- OAccessibleControlContext* pNew = nullptr;
+ rtl::Reference<OAccessibleControlContext> pNew;
try
{
pNew = new OAccessibleControlContext;
@@ -170,7 +170,7 @@ namespace toolkit
::osl::MutexGuard aGuard( GetMutex() );
// no OContextEntryGuard here, as we do not want to throw an exception in case we're not alive anymore
- ::utl::AccessibleStateSetHelper* pStateSet = nullptr;
+ rtl::Reference<::utl::AccessibleStateSetHelper> pStateSet;
if ( isAlive() )
{
// no own states, only the ones which are foreign controlled
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 6c5aedde4776..42ccde3b6592 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -265,7 +265,7 @@ void ControlModelContainerBase::Clone_Impl(ControlModelContainerBase& _rClone) c
rtl::Reference<UnoControlModel> ControlModelContainerBase::Clone() const
{
// clone the container itself
- ControlModelContainerBase* pClone = new ControlModelContainerBase( *this );
+ rtl::Reference<ControlModelContainerBase> pClone = new ControlModelContainerBase( *this );
Clone_Impl(*pClone);
return pClone;
@@ -281,7 +281,7 @@ Reference< XInterface > ControlModelContainerBase::createInstance( const OUStrin
{
SolarMutexGuard aGuard;
- OGeometryControlModel_Base* pNewModel = nullptr;
+ rtl::Reference<OGeometryControlModel_Base> pNewModel;
if ( aServiceSpecifier == "com.sun.star.awt.UnoControlEditModel" )
pNewModel = new OGeometryControlModel< UnoControlEditModel >( m_xContext );
@@ -360,7 +360,7 @@ Reference< XInterface > ControlModelContainerBase::createInstance( const OUStrin
}
}
- Reference< XInterface > xNewModel = static_cast<cppu::OWeakObject*>(pNewModel);
+ Reference< XInterface > xNewModel = static_cast<cppu::OWeakObject*>(pNewModel.get());
return xNewModel;
}
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index bf035e3bcfa6..b2563f4e8261 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -211,7 +211,7 @@ UnoControlDialogModel::UnoControlDialogModel( const UnoControlDialogModel& rMode
rtl::Reference<UnoControlModel> UnoControlDialogModel::Clone() const
{
// clone the container itself
- UnoControlDialogModel* pClone = new UnoControlDialogModel( *this );
+ rtl::Reference<UnoControlDialogModel> pClone = new UnoControlDialogModel( *this );
Clone_Impl(*pClone);
@@ -870,7 +870,7 @@ UnoMultiPageModel::~UnoMultiPageModel()
rtl::Reference<UnoControlModel> UnoMultiPageModel::Clone() const
{
// clone the container itself
- UnoMultiPageModel* pClone = new UnoMultiPageModel( *this );
+ rtl::Reference<UnoMultiPageModel> pClone = new UnoMultiPageModel( *this );
Clone_Impl( *pClone );
return pClone;
}
@@ -976,7 +976,7 @@ UnoPageModel::~UnoPageModel()
rtl::Reference<UnoControlModel> UnoPageModel::Clone() const
{
// clone the container itself
- UnoPageModel* pClone = new UnoPageModel( *this );
+ rtl::Reference<UnoPageModel> pClone = new UnoPageModel( *this );
Clone_Impl( *pClone );
return pClone;
}
@@ -1122,7 +1122,7 @@ UnoFrameModel::~UnoFrameModel()
rtl::Reference<UnoControlModel> UnoFrameModel::Clone() const
{
// clone the container itself
- UnoFrameModel* pClone = new UnoFrameModel( *this );
+ rtl::Reference<UnoFrameModel> pClone = new UnoFrameModel( *this );
Clone_Impl( *pClone );
return pClone;
}
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 0a0006014981..4bf888811ee2 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -128,8 +128,8 @@ static void lcl_throwIndexOutOfBoundsException( )
Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstance( )
{
- ORoadmapEntry* pRoadmapItem = new ORoadmapEntry();
- Reference< XInterface > xNewRoadmapItem = static_cast<cppu::OWeakObject*>(pRoadmapItem);
+ rtl::Reference<ORoadmapEntry> pRoadmapItem = new ORoadmapEntry();
+ Reference< XInterface > xNewRoadmapItem = static_cast<cppu::OWeakObject*>(pRoadmapItem.get());
return xNewRoadmapItem;
}
@@ -137,8 +137,8 @@ static void lcl_throwIndexOutOfBoundsException( )
Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstanceWithArguments( const Sequence< Any >& /*aArguments*/ )
{
// Todo: implementation of the arguments handling
- ORoadmapEntry* pRoadmapItem = new ORoadmapEntry();
- Reference< XInterface > xNewRoadmapItem = static_cast<cppu::OWeakObject*>(pRoadmapItem);
+ rtl::Reference<ORoadmapEntry> pRoadmapItem = new ORoadmapEntry();
+ Reference< XInterface > xNewRoadmapItem = static_cast<cppu::OWeakObject*>(pRoadmapItem.get());
return xNewRoadmapItem;
}