diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-25 13:46:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-26 07:30:07 +0100 |
| commit | 9e23683b4c91c60e39839a03cfa6adc436a9afeb (patch) | |
| tree | c63efbe4a1b51c495dae1867cf04f4cf2c617f8d /vcl/source | |
| parent | 55febfff803fd0a49a8b24fd7dc16253e70bd28e (diff) | |
loplugin:singlevalfields
Change-Id: I4a56a27ebce927b8e21cf37bb2c527caf1317bcc
Reviewed-on: https://gerrit.libreoffice.org/69681
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 27 | ||||
| -rw-r--r-- | vcl/source/window/toolbox2.cxx | 1 |
2 files changed, 3 insertions, 25 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 671814e2c646..c7bc19f089c1 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -2988,33 +2988,12 @@ void ToolBox::ImplFloatControl( bool bStart, FloatingWindow* pFloatWindow ) void ToolBox::ShowLine( bool bNext ) { - mbFormat = true; - if ( mpData->mbPageScroll ) - { - ImplToolItems::size_type delta = mnVisLines; - if ( bNext ) - { - mnCurLine = mnCurLine + delta; - if ( mnCurLine+mnVisLines-1 > mnCurLines ) - mnCurLine = mnCurLines - mnVisLines+1; - } - else - { - if( mnCurLine >= delta+1 ) - mnCurLine = mnCurLine - delta; - else - mnCurLine = 1; - } - } + if ( bNext ) + mnCurLine++; else - { - if ( bNext ) - mnCurLine++; - else - mnCurLine--; - } + mnCurLine--; ImplFormat(); } diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 2fab40a8f120..3d7b0de98ea9 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -62,7 +62,6 @@ ImplToolBoxPrivateData::ImplToolBoxPrivateData() mbAssumeFloating = false; mbKeyInputDisabled = false; mbMenubuttonSelected = false; - mbPageScroll = false; mbWillUsePopupMode = false; mbDropDownByKeyboard = false; } |