diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-03 19:04:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-04 08:53:37 +0200 |
| commit | 53df91adab37a65d87a44aa724b28128f32e9de5 (patch) | |
| tree | 1d7b31ee1eeeb9691ccb732f0cb0e06aad4ae5b6 /vcl/source/control | |
| parent | 89c0b79911c469518c8872a4ec06b3d2c61c357c (diff) | |
loplugin:singlevalfields
Change-Id: Ic74b400f0b929b4c57ad70d0b0936983a3d46360
Reviewed-on: https://gerrit.libreoffice.org/80154
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/ctrl.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 8b3237c7c9c7..522446561a79 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -436,10 +436,9 @@ tools::Rectangle Control::DrawControlText( OutputDevice& _rTargetDevice, const t OUString rPStr = _rStr; DrawTextFlags nPStyle = _nStyle; - bool accel = ImplGetSVData()->maNWFData.mbEnableAccel; bool autoacc = ImplGetSVData()->maNWFData.mbAutoAccel; - if (!accel || (autoacc && !mbShowAccelerator)) + if (autoacc && !mbShowAccelerator) { rPStr = GetNonMnemonicString( _rStr ); nPStyle &= ~DrawTextFlags::HideMnemonic; @@ -462,10 +461,9 @@ tools::Rectangle Control::GetControlTextRect( OutputDevice& _rTargetDevice, cons OUString rPStr = _rStr; DrawTextFlags nPStyle = _nStyle; - bool accel = ImplGetSVData()->maNWFData.mbEnableAccel; bool autoacc = ImplGetSVData()->maNWFData.mbAutoAccel; - if (!accel || (autoacc && !mbShowAccelerator)) + if (autoacc && !mbShowAccelerator) { rPStr = GetNonMnemonicString( _rStr ); nPStyle &= ~DrawTextFlags::HideMnemonic; |