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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/sidebar/line/LinePropertyPanelBase.cxx | 6 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index e8de20e68a1f..5f21530637e4 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -283,7 +283,7 @@ void LinePropertyPanelBase::updateLineStyle(bool bDisabled, bool bSetOrDefault, } else { - mpStyleItem.reset(nullptr); + mpStyleItem.reset(); } SelectLineStyle(); @@ -392,7 +392,7 @@ void LinePropertyPanelBase::updateLineStart(bool bDisabled, bool bSetOrDefault, return; } - mpStartItem.reset(nullptr); + mpStartItem.reset(); SelectEndStyle(true); } @@ -416,7 +416,7 @@ void LinePropertyPanelBase::updateLineEnd(bool bDisabled, bool bSetOrDefault, return; } - mpEndItem.reset(nullptr); + mpEndItem.reset(); SelectEndStyle(false); } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 63f24d0f9e30..b7790cd1a25d 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -239,7 +239,7 @@ void SvxShape::InvalidateSdrObject() if (HasSdrObjectOwnership()) return; - mpSdrObjectWeakReference.reset( nullptr ); + mpSdrObjectWeakReference.reset(nullptr); }; bool SvxShape::HasSdrObjectOwnership() const @@ -1029,7 +1029,7 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw() if( !xSelf.is() ) { EndListening(GetSdrObject()->getSdrModelFromSdrObject()); - mpSdrObjectWeakReference.reset( nullptr ); + mpSdrObjectWeakReference.reset(nullptr); return; } |