eef4d5cbd1
Add reporting for the new CHECKABLE a11y state introduced in
commit d6c6472bbe
Author: Michael Weghorn <m.weghorn@posteo.de>
Date: Mon Nov 13 15:53:44 2023 +0100
tdf#123864 a11y: Add new AccessibleStateType::CHECKABLE
for `VCLXAccessibleMenuItem`.
`MenuItemData::HasCheck` looks like it already provides
what's needed to say whether an item is checkable, therefore
add a `Menu::IsItemCheckable` that makes use of this and
and a `VCLXAccessibleMenuItem::IsCheckable` that
makes use of that in turn.
Extend `VCLXAccessibleMenuItem::FillAccessibleStateSet` to
use the latter to report the CHECKABLE state accordingly.
Change-Id: Id23196ef2527a71a338102a5143a8bd6fd41db84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160902
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
101 lines
5.1 KiB
C++
101 lines
5.1 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <standard/accessiblemenuitemcomponent.hxx>
|
|
|
|
#include <com/sun/star/accessibility/AccessibleScrollType.hpp>
|
|
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
|
|
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
|
|
|
|
#include <cppuhelper/implbase.hxx>
|
|
#include <comphelper/accessibletexthelper.hxx>
|
|
|
|
|
|
|
|
|
|
class VCLXAccessibleMenuItem : public cppu::ImplInheritanceHelper<
|
|
OAccessibleMenuItemComponent,
|
|
css::accessibility::XAccessibleText,
|
|
css::accessibility::XAccessibleAction,
|
|
css::accessibility::XAccessibleValue>,
|
|
public ::comphelper::OCommonAccessibleText
|
|
{
|
|
protected:
|
|
virtual bool IsFocused() override;
|
|
virtual bool IsSelected() override;
|
|
virtual bool IsCheckable();
|
|
virtual bool IsChecked() override;
|
|
|
|
virtual bool IsHighlighted() override;
|
|
|
|
virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override;
|
|
|
|
// OCommonAccessibleText
|
|
virtual OUString implGetText() final override;
|
|
virtual css::lang::Locale implGetLocale() override;
|
|
virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override final;
|
|
|
|
public:
|
|
VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = nullptr );
|
|
|
|
// XServiceInfo
|
|
virtual OUString SAL_CALL getImplementationName() override;
|
|
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
|
|
|
|
// XAccessibleContext
|
|
virtual sal_Int16 SAL_CALL getAccessibleRole( ) override;
|
|
|
|
// XAccessibleText
|
|
virtual sal_Int32 SAL_CALL getCaretPosition() override;
|
|
virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
|
|
virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) final override;
|
|
virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
|
|
virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
|
|
virtual sal_Int32 SAL_CALL getCharacterCount() final override;
|
|
virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
|
|
virtual OUString SAL_CALL getSelectedText() override final;
|
|
virtual sal_Int32 SAL_CALL getSelectionStart() override final;
|
|
virtual sal_Int32 SAL_CALL getSelectionEnd() override final;
|
|
virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
|
|
virtual OUString SAL_CALL getText() final override;
|
|
virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
|
|
virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
|
|
virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
|
|
virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
|
|
virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
|
|
virtual sal_Bool SAL_CALL scrollSubstringTo( sal_Int32 nStartIndex, sal_Int32 nEndIndex, css::accessibility::AccessibleScrollType aScrollType) override;
|
|
|
|
// XAccessibleAction
|
|
virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) final override;
|
|
virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override;
|
|
virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
|
|
virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
|
|
|
|
// XAccessibleValue
|
|
virtual css::uno::Any SAL_CALL getCurrentValue( ) override;
|
|
virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override;
|
|
virtual css::uno::Any SAL_CALL getMaximumValue( ) override;
|
|
virtual css::uno::Any SAL_CALL getMinimumValue( ) override;
|
|
virtual css::uno::Any SAL_CALL getMinimumIncrement( ) override;
|
|
};
|
|
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|