diff options
author | Noel <noel.grandin@collabora.co.uk> | 2021-02-21 12:33:10 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-02-21 16:13:31 +0100 |
commit | 78040af9acea0ab681aa54ff23844b647bc9b4f3 (patch) | |
tree | 6fb704389c3e98594d6bf2f187bf295aa42c77ef /sc/source/ui/Accessibility | |
parent | 8f231fc5df201c45d16bce0b4b17f727842b2121 (diff) |
loplugin:refcounting in sc
Change-Id: Id0ba24985aab36b931fa74b266dc5bf0bef62bb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111273
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/Accessibility')
11 files changed, 32 insertions, 34 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 734e9e085302..bb434037438a 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -227,7 +227,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL uno::Reference<XAccessibleContext> xParentContext = getAccessibleParent()->getAccessibleContext(); xParentStates = xParentContext->getAccessibleStateSet(); } - utl::AccessibleStateSetHelper* pStateSet = new utl::AccessibleStateSetHelper(); + rtl::Reference<utl::AccessibleStateSetHelper> pStateSet = new utl::AccessibleStateSetHelper(); if (IsDefunc(xParentStates)) pStateSet->AddState(AccessibleStateType::DEFUNC); else @@ -277,13 +277,13 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL { SolarMutexGuard aGuard; IsObjectValid(); - utl::AccessibleRelationSetHelper* pRelationSet = nullptr; + rtl::Reference<utl::AccessibleRelationSetHelper> pRelationSet; if (mpAccDoc) pRelationSet = mpAccDoc->GetRelationSet(&maCellAddress); if (!pRelationSet) pRelationSet = new utl::AccessibleRelationSetHelper(); - FillDependents(pRelationSet); - FillPrecedents(pRelationSet); + FillDependents(pRelationSet.get()); + FillPrecedents(pRelationSet.get()); return pRelationSet; } diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index fc3157cf57a0..6c5867c12093 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -158,10 +158,10 @@ ScCsvControl& ScAccessibleCsvControl::implGetControl() const return *mpControl; } -AccessibleStateSetHelper* ScAccessibleCsvControl::implCreateStateSet() +rtl::Reference<AccessibleStateSetHelper> ScAccessibleCsvControl::implCreateStateSet() { SolarMutexGuard aGuard; - AccessibleStateSetHelper* pStateSet = new AccessibleStateSetHelper(); + rtl::Reference<AccessibleStateSetHelper> pStateSet = new AccessibleStateSetHelper(); if (isAlive()) { const ScCsvControl& rCtrl = implGetControl(); @@ -291,7 +291,7 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvRuler::getAccessible { SolarMutexGuard aGuard; ensureAlive(); - AccessibleRelationSetHelper* pRelationSet = new AccessibleRelationSetHelper(); + rtl::Reference<AccessibleRelationSetHelper> pRelationSet = new AccessibleRelationSetHelper(); ScCsvRuler& rRuler = implGetRuler(); ScCsvTableBox* pTableBox = rRuler.GetTableBox(); @@ -311,7 +311,7 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvRuler::getAccessible Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvRuler::getAccessibleStateSet() { SolarMutexGuard aGuard; - AccessibleStateSetHelper* pStateSet = implCreateStateSet(); + rtl::Reference<AccessibleStateSetHelper> pStateSet = implCreateStateSet(); if( isAlive() ) { pStateSet->AddState( AccessibleStateType::FOCUSABLE ); @@ -851,7 +851,7 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleR { SolarMutexGuard aGuard; ensureAlive(); - AccessibleRelationSetHelper* pRelationSet = new AccessibleRelationSetHelper(); + rtl::Reference<AccessibleRelationSetHelper> pRelationSet = new AccessibleRelationSetHelper(); ScCsvGrid& rGrid = implGetGrid(); ScCsvTableBox* pTableBox = rGrid.GetTableBox(); @@ -874,7 +874,7 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleR Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleStateSet() { SolarMutexGuard aGuard; - AccessibleStateSetHelper* pStateSet = implCreateStateSet(); + rtl::Reference<AccessibleStateSetHelper> pStateSet = implCreateStateSet(); if( isAlive() ) { pStateSet->AddState( AccessibleStateType::FOCUSABLE ); @@ -1358,7 +1358,7 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvCell::getAccessibleR Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvCell::getAccessibleStateSet() { SolarMutexGuard aGuard; - AccessibleStateSetHelper* pStateSet = implCreateStateSet(); + rtl::Reference<AccessibleStateSetHelper> pStateSet = implCreateStateSet(); if( isAlive() ) { const ScCsvGrid& rGrid = implGetGrid(); diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index ef0dd31d337a..2fcd982ae3a2 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -247,7 +247,7 @@ public: SdrPage* GetDrawPage() const; - utl::AccessibleRelationSetHelper* GetRelationSet(const ScAddress* pAddress) const; + rtl::Reference<utl::AccessibleRelationSetHelper> GetRelationSet(const ScAddress* pAddress) const; void VisAreaChanged() const; private: @@ -887,9 +887,9 @@ SdrPage* ScChildrenShapes::GetDrawPage() const return pDrawPage; } -utl::AccessibleRelationSetHelper* ScChildrenShapes::GetRelationSet(const ScAddress* pAddress) const +rtl::Reference<utl::AccessibleRelationSetHelper> ScChildrenShapes::GetRelationSet(const ScAddress* pAddress) const { - utl::AccessibleRelationSetHelper* pRelationSet = nullptr; + rtl::Reference<utl::AccessibleRelationSetHelper> pRelationSet; for (const ScAccessibleShapeData* pAccShapeData : maZOrderedShapes) { if (pAccShapeData && @@ -1136,7 +1136,7 @@ std::optional<ScAddress> ScChildrenShapes::GetAnchor(const uno::Reference<drawin uno::Reference<XAccessibleRelationSet> ScChildrenShapes::GetRelationSet(const ScAccessibleShapeData* pData) const { - utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper(); + rtl::Reference<utl::AccessibleRelationSetHelper> pRelationSet = new utl::AccessibleRelationSetHelper(); if (pData && mpAccessibleDocument) { @@ -1327,7 +1327,6 @@ ScAccessibleDocument::ScAccessibleDocument( : ScAccessibleDocumentBase(rxParent), mpViewShell(pViewShell), meSplitPos(eSplitPos), - mpTempAccEdit(nullptr), mbCompleteSheetSelected(false) { maVisArea = GetVisibleArea_Impl(); @@ -1739,7 +1738,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL uno::Reference<XAccessibleContext> xParentContext = getAccessibleParent()->getAccessibleContext(); xParentStates = xParentContext->getAccessibleStateSet(); } - utl::AccessibleStateSetHelper* pStateSet = new utl::AccessibleStateSetHelper(); + rtl::Reference<utl::AccessibleStateSetHelper> pStateSet = new utl::AccessibleStateSetHelper(); if (IsDefunc(xParentStates)) pStateSet->AddState(AccessibleStateType::DEFUNC); else @@ -2034,9 +2033,9 @@ Size ScAccessibleDocument::LogicToPixel (const Size& rSize) const //===== internal ======================================================== -utl::AccessibleRelationSetHelper* ScAccessibleDocument::GetRelationSet(const ScAddress* pAddress) const +rtl::Reference<utl::AccessibleRelationSetHelper> ScAccessibleDocument::GetRelationSet(const ScAddress* pAddress) const { - utl::AccessibleRelationSetHelper* pRelationSet = nullptr; + rtl::Reference<utl::AccessibleRelationSetHelper> pRelationSet; if (mpChildrenShapes) pRelationSet = mpChildrenShapes->GetRelationSet(pAddress); return pRelationSet; diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 44c36c2a5d77..336fd112af8b 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1429,7 +1429,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::ge uno::Reference<XAccessibleContext> xParentContext = getAccessibleParent()->getAccessibleContext(); xParentStates = xParentContext->getAccessibleStateSet(); } - utl::AccessibleStateSetHelper* pStateSet = new utl::AccessibleStateSetHelper(); + rtl::Reference<utl::AccessibleStateSetHelper> pStateSet = new utl::AccessibleStateSetHelper(); if (IsDefunc(xParentStates)) pStateSet->AddState(AccessibleStateType::DEFUNC); else diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index d0afd2c8196c..d416b452ddfa 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -274,7 +274,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL uno::Reference<XAccessibleContext> xParentContext = getAccessibleParent()->getAccessibleContext(); xParentStates = xParentContext->getAccessibleStateSet(); } - utl::AccessibleStateSetHelper* pStateSet = new utl::AccessibleStateSetHelper(); + rtl::Reference<utl::AccessibleStateSetHelper> pStateSet = new utl::AccessibleStateSetHelper(); if (IsDefunc(xParentStates)) pStateSet->AddState(AccessibleStateType::DEFUNC); else @@ -516,8 +516,7 @@ uno::Reference< XAccessibleRelationSet > ScAccessibleEditObject::getAccessibleRe { SolarMutexGuard aGuard; vcl::Window* pWindow = mpWindow; - utl::AccessibleRelationSetHelper* rRelationSet = new utl::AccessibleRelationSetHelper; - uno::Reference< XAccessibleRelationSet > rSet = rRelationSet; + rtl::Reference<utl::AccessibleRelationSetHelper> rRelationSet = new utl::AccessibleRelationSetHelper; if ( pWindow ) { vcl::Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy(); @@ -532,7 +531,7 @@ uno::Reference< XAccessibleRelationSet > ScAccessibleEditObject::getAccessibleRe uno::Sequence< uno::Reference< uno::XInterface > > aSequence { pMemberOf->GetAccessible() }; rRelationSet->AddRelation( AccessibleRelation( AccessibleRelationType::MEMBER_OF, aSequence ) ); } - return rSet; + return rRelationSet; } return uno::Reference< XAccessibleRelationSet >(); } diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 41d189325f3a..473835441a6e 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -258,7 +258,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePageHeader::getAccess uno::Reference<XAccessibleContext> xParentContext = getAccessibleParent()->getAccessibleContext(); xParentStates = xParentContext->getAccessibleStateSet(); } - utl::AccessibleStateSetHelper* pStateSet = new utl::AccessibleStateSetHelper(); + rtl::Reference<utl::AccessibleStateSetHelper> pStateSet = new utl::AccessibleStateSetHelper(); if (IsDefunc(xParentStates)) pStateSet->AddState(AccessibleStateType::DEFUNC); else diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index f3e8e0c962f3..9ea60780bfea 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -149,7 +149,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL uno::Reference<XAccessibleContext> xParentContext = getAccessibleParent()->getAccessibleContext(); xParentStates = xParentContext->getAccessibleStateSet(); } - utl::AccessibleStateSetHelper* pStateSet = new utl::AccessibleStateSetHelper(); + rtl::Reference<utl::AccessibleStateSetHelper> pStateSet = new utl::AccessibleStateSetHelper(); if (IsDefunc()) pStateSet->AddState(AccessibleStateType::DEFUNC); else diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index e6d28dc83531..544775e79a7a 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -149,7 +149,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewCell::getAccessi uno::Reference<XAccessibleContext> xParentContext = getAccessibleParent()->getAccessibleContext(); xParentStates = xParentContext->getAccessibleStateSet(); } - utl::AccessibleStateSetHelper* pStateSet = new utl::AccessibleStateSetHelper(); + rtl::Reference<utl::AccessibleStateSetHelper> pStateSet = new utl::AccessibleStateSetHelper(); if (IsDefunc(xParentStates)) pStateSet->AddState(AccessibleStateType::DEFUNC); else diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 8d2b6cafcf68..c99fb36e8864 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -233,7 +233,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewHeaderCell::getA uno::Reference<XAccessibleContext> xParentContext = getAccessibleParent()->getAccessibleContext(); xParentStates = xParentContext->getAccessibleStateSet(); } - utl::AccessibleStateSetHelper* pStateSet = new utl::AccessibleStateSetHelper(); + rtl::Reference<utl::AccessibleStateSetHelper> pStateSet = new utl::AccessibleStateSetHelper(); if (IsDefunc(xParentStates)) pStateSet->AddState(AccessibleStateType::DEFUNC); else diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index aced9a883d98..7eea5d79ebc2 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -507,7 +507,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePreviewTable::getAcce uno::Reference<XAccessibleContext> xParentContext = getAccessibleParent()->getAccessibleContext(); xParentStates = xParentContext->getAccessibleStateSet(); } - utl::AccessibleStateSetHelper* pStateSet = new utl::AccessibleStateSetHelper(); + rtl::Reference<utl::AccessibleStateSetHelper> pStateSet = new utl::AccessibleStateSetHelper(); if (IsDefunc(xParentStates)) pStateSet->AddState(AccessibleStateType::DEFUNC); else diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 23de41a4bec4..aee01834103e 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -1002,12 +1002,12 @@ sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getBackground( ) uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleSpreadsheet::getAccessibleRelationSet() { - utl::AccessibleRelationSetHelper* pRelationSet = nullptr; + rtl::Reference<utl::AccessibleRelationSetHelper> pRelationSet; if(mpAccDoc) pRelationSet = mpAccDoc->GetRelationSet(nullptr); - if (!pRelationSet) - pRelationSet = new utl::AccessibleRelationSetHelper(); - return pRelationSet; + if (pRelationSet) + return pRelationSet; + return new utl::AccessibleRelationSetHelper(); } uno::Reference<XAccessibleStateSet> SAL_CALL @@ -1020,7 +1020,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL uno::Reference<XAccessibleContext> xParentContext = getAccessibleParent()->getAccessibleContext(); xParentStates = xParentContext->getAccessibleStateSet(); } - utl::AccessibleStateSetHelper* pStateSet = new utl::AccessibleStateSetHelper(); + rtl::Reference<utl::AccessibleStateSetHelper> pStateSet = new utl::AccessibleStateSetHelper(); if (IsDefunc(xParentStates)) pStateSet->AddState(AccessibleStateType::DEFUNC); else |