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 /svtools | |
| 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 'svtools')
| -rw-r--r-- | svtools/source/control/valueset.cxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 0df2623e2523..3cd358f3759e 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -63,9 +63,6 @@ ValueSet::ValueSet( vcl::Window* pParent, WinBits nWinStyle ) : Control( pParent, nWinStyle ), maColor( COL_TRANSPARENT ) { - mpNoneItem.reset(nullptr); - mxScrollBar.reset(nullptr); - mnItemWidth = 0; mnItemHeight = 0; mnTextOffset = 0; @@ -400,9 +397,7 @@ void ValueSet::Format(vcl::RenderContext& rRenderContext) { nNoneHeight = 0; nNoneSpace = 0; - - if (mpNoneItem) - mpNoneItem.reset(nullptr); + mpNoneItem.reset(); } // calculate ScrollBar width @@ -2196,8 +2191,6 @@ SvtValueSet::SvtValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow) { maVirDev->SetBackground(Application::GetSettings().GetStyleSettings().GetFaceColor()); - mpNoneItem.reset(nullptr); - mnItemWidth = 0; mnItemHeight = 0; mnTextOffset = 0; @@ -2944,9 +2937,7 @@ void SvtValueSet::Format(vcl::RenderContext const & rRenderContext) { nNoneHeight = 0; nNoneSpace = 0; - - if (mpNoneItem) - mpNoneItem.reset(nullptr); + mpNoneItem.reset(); } // calculate number of columns |