diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-19 16:02:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-20 07:50:06 +0200 |
| commit | 6ee9f2c188290ba8a8bc6d435f645b31a05783ea (patch) | |
| tree | 60a58e7c8995d64f3b22cf228480284172b6a17c /accessibility | |
| parent | 9c2b43e86fbb7612a58f6e55bc429f674977d6dd (diff) | |
loplugin:oncevar accessibility..basic
Change-Id: I8fb41b658ef0f6ad1774ea897eace3dc9bb12de6
Reviewed-on: https://gerrit.libreoffice.org/38969
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/source/extended/accessiblelistbox.cxx | 18 | ||||
| -rw-r--r-- | accessibility/source/standard/vclxaccessiblecheckbox.cxx | 3 |
2 files changed, 2 insertions, 19 deletions
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index dd96005ee3dd..a79c7a67d4d6 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -120,23 +120,7 @@ namespace accessibility case VclEventId::ListboxTreeFocus: { VclPtr<SvTreeListBox> pBox = getListBox(); - bool bNeedFocus = false; - if (pBox) - { - vcl::Window* pParent = static_cast<vcl::Window*>(pBox)->GetParent(); - if (pParent && pParent->GetType() == WindowType::FLOATINGWINDOW) - { - // MT: ImplGetAppSVData shouldn't be exported from VCL. - // In which scenario is this needed? - // If needed, we need to find an other solution - /* - ImplSVData* pSVData = ImplGetAppSVData(); - if (pSVData && pSVData->maWinData.mpFirstFloat == (FloatingWindow*)pParent) - bNeedFocus = true; - */ - } - } - if( pBox && (pBox->HasFocus() || bNeedFocus) ) + if( pBox && pBox->HasFocus() ) { uno::Any aNewValue; SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() ); diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index c0c9ce262929..5e4adfc6d6c4 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -191,7 +191,6 @@ sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() ); if ( pCheckBox && pVCLXCheckBox ) { - sal_Int32 nValueMin = (sal_Int32) 0; sal_Int32 nValueMax = (sal_Int32) 1; if ( pCheckBox->IsTriStateEnabled() ) @@ -202,7 +201,7 @@ sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) ++nValue; if ( nValue > nValueMax ) - nValue = nValueMin; + nValue = 0; pVCLXCheckBox->setState( (sal_Int16) nValue ); } |