diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-27 08:55:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-28 11:13:21 +0100 |
| commit | de6f36cc2fb359332205ba836f8396a1cdbe44c2 (patch) | |
| tree | a7b4dfcd77bffe4ca90c2f5763aa5ef9b20a5c39 /sd | |
| parent | 1d39c5aa7bd6419060ed10d9fbdc2a643000f363 (diff) | |
simplify reset(nullptr) -> reset()
Change-Id: Iec5e93d9c59dde44571376e46fb98ea854e16b6c
Reviewed-on: https://gerrit.libreoffice.org/69784
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/futext.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/view/OutlinerIterator.cxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/view/outlview.cxx | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index c43afe218495..48a9c7d36dfa 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -158,7 +158,7 @@ void FuText::disposing() if(mpView) { if(mpView->SdrEndTextEdit() == SdrEndTextEditKind::Deleted) - mxTextObj.reset( nullptr ); + mxTextObj.reset(nullptr); // reset the RequestHandler of the used Outliner to the handler of the document ::Outliner* pOutliner = mpView->GetTextEditOutliner(); @@ -280,7 +280,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) list. The call MarkObj further below accesses then the dead object. As a simple fix, we determine eHit after SdrEndTextEdit again, this returns then SdrHitKind::NONE. */ - mxTextObj.reset( nullptr ); + mxTextObj.reset(nullptr); eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); } @@ -632,7 +632,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) if (bReset) { - mxTextObj.reset( nullptr ); + mxTextObj.reset(nullptr); } } diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx index 7064b00fae00..f4a8cb06460d 100644 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx @@ -656,7 +656,7 @@ void ViewIteratorImpl::SetPage (sal_Int32 nPageIndex) if (mpObjectIterator!=nullptr && mpObjectIterator->IsMore()) maPosition.mxObject.reset( mpObjectIterator->Next() ); else - maPosition.mxObject.reset( nullptr ); + maPosition.mxObject.reset(nullptr); maPosition.mnText = 0; if( !mbDirectionIsForward && maPosition.mxObject.is() ) @@ -679,8 +679,7 @@ void ViewIteratorImpl::Reverse() mpObjectIterator.reset(); // Move iterator to the current object. - ::tools::WeakReference<SdrObject> xObject = maPosition.mxObject; - maPosition.mxObject.reset(nullptr); + ::tools::WeakReference<SdrObject> xObject = std::move(maPosition.mxObject); if (!mpObjectIterator) return; diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index b6eb10851aab..1b8b91e0804a 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -757,7 +757,7 @@ IMPL_LINK_NOARG(OutlineView, BeginDropHdl, EditView*, void) IMPL_LINK_NOARG(OutlineView, EndDropHdl, EditView*, void) { - maDragAndDropModelGuard.reset(nullptr); + maDragAndDropModelGuard.reset(); } /** |