mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:useuniqueptr in ScAccessibleDocument

Browse Source 
Change-Id: I199b5f3bd0d8555dc01d6f51208ebe4526a32f9a
Reviewed-on: https://gerrit.libreoffice.org/56559
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-06-27 13:56:55 +02:00
parent 4baf5adc8f
commit 2037e85b79
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sc/source/ui/Accessibility/AccessibleDocument.cxx
View File

@@ -1417,7 +1417,7 @@ void ScAccessibleDocument::PreInit()
void ScAccessibleDocument::Init() void ScAccessibleDocument::Init()
{ {
if(!mpChildrenShapes) if(!mpChildrenShapes)
mpChildrenShapes = new ScChildrenShapes(this, mpViewShell, meSplitPos); mpChildrenShapes.reset( new ScChildrenShapes(this, mpViewShell, meSplitPos) );
} }
ScAccessibleDocument::~ScAccessibleDocument() ScAccessibleDocument::~ScAccessibleDocument()
@@ -1443,8 +1443,7 @@ void SAL_CALL ScAccessibleDocument::disposing()
mpViewShell->RemoveAccessibilityObject(*this); mpViewShell->RemoveAccessibilityObject(*this);
mpViewShell = nullptr; mpViewShell = nullptr;
} }
if (mpChildrenShapes) mpChildrenShapes.reset();
DELETEZ(mpChildrenShapes);
ScAccessibleDocumentBase::disposing(); ScAccessibleDocumentBase::disposing();
} }
@@ -1539,9 +1538,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
// Shapes / form controls after reload not accessible, rebuild the // Shapes / form controls after reload not accessible, rebuild the
// mpChildrenShapes variable. // mpChildrenShapes variable.
if (mpChildrenShapes) mpChildrenShapes.reset( new ScChildrenShapes( this, mpViewShell, meSplitPos ) );
DELETEZ(mpChildrenShapes);
mpChildrenShapes = new ScChildrenShapes( this, mpViewShell, meSplitPos );
AccessibleEventObject aEvent; AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::INVALIDATE_ALL_CHILDREN; aEvent.EventId = AccessibleEventId::INVALIDATE_ALL_CHILDREN;

2
sc/source/ui/inc/AccessibleDocument.hxx
View File

@@ -229,7 +229,7 @@ private:
ScTabViewShell* mpViewShell; ScTabViewShell* mpViewShell;
ScSplitPos meSplitPos; ScSplitPos meSplitPos;
rtl::Reference<ScAccessibleSpreadsheet> mpAccessibleSpreadsheet; rtl::Reference<ScAccessibleSpreadsheet> mpAccessibleSpreadsheet;
ScChildrenShapes* mpChildrenShapes; std::unique_ptr<ScChildrenShapes> mpChildrenShapes;
ScAccessibleEditObject* mpTempAccEdit; ScAccessibleEditObject* mpTempAccEdit;
css::uno::Reference<css::accessibility::XAccessible> mxTempAcc; css::uno::Reference<css::accessibility::XAccessible> mxTempAcc;
tools::Rectangle maVisArea; tools::Rectangle maVisArea;