summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-05-28 15:24:29 +0100
committerSzymon Kłos <szymon.klos@collabora.com>2020-11-30 18:17:48 +0100
commit3abfa69992319252c4a3d6fb8612b8a81fb783ee (patch)
tree057aba570438c376d563640aa195480d86c96fae /sc/inc
parent6615eec8e489ae10b9df6b1f33507947ee9ce1db (diff)
weld checklistmenu
rework the "menu" to be a treeview using hover selection instead of a custom set of widgetry, and drop the newly unused custom a11y code Change-Id: Ie7d9b7875ce00843b3f262882816cebb472bf681 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95223 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106870 Tested-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/AccessibleFilterMenu.hxx139
-rw-r--r--sc/inc/AccessibleFilterMenuItem.hxx95
-rw-r--r--sc/inc/AccessibleFilterTopWindow.hxx81
-rw-r--r--sc/inc/strings.hrc4
4 files changed, 0 insertions, 319 deletions
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx
deleted file mode 100644
index 878c27a637c3..000000000000
--- a/sc/inc/AccessibleFilterMenu.hxx
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -*- 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 .
- */
-
-#ifndef INCLUDED_SC_INC_ACCESSIBLEFILTERMENU_HXX
-#define INCLUDED_SC_INC_ACCESSIBLEFILTERMENU_HXX
-
-#include <AccessibleContextBase.hxx>
-#include <cppuhelper/implbase1.hxx>
-
-#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <vcl/vclptr.hxx>
-
-#include <vector>
-
-class ScMenuFloatingWindow;
-
-typedef ::cppu::ImplHelper1<
- css::accessibility::XAccessibleSelection > ScAccessibleFilterMenu_BASE;
-
-class ScAccessibleFilterMenu :
- public ScAccessibleContextBase,
- public ScAccessibleFilterMenu_BASE
-{
-public:
- explicit ScAccessibleFilterMenu(
- const css::uno::Reference< css::accessibility::XAccessible>& rxParent,
- ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos);
- virtual ~ScAccessibleFilterMenu() override;
-
- virtual bool isVisible() override;
-
- /// XAccessibleComponent
-
- virtual css::uno::Reference< css::accessibility::XAccessible >
- SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
-
- virtual void SAL_CALL grabFocus() override;
-
- virtual sal_Int32 SAL_CALL getForeground() override;
-
- virtual sal_Int32 SAL_CALL getBackground() override;
-
- /// XAccessibleContext
-
- virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
-
- virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
- getAccessibleChild(sal_Int32 nIndex) override;
-
- virtual css::uno::Reference<
- css::accessibility::XAccessibleStateSet> SAL_CALL
- getAccessibleStateSet() override;
-
- virtual OUString SAL_CALL getImplementationName() override;
-
- /// XAccessibleEventBroadcaster
- virtual void SAL_CALL
- addAccessibleEventListener(
- const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener) override;
-
- /// Remove an existing event listener.
- virtual void SAL_CALL
- removeAccessibleEventListener(
- const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener) override;
-
- /// XAccessibleSelection
-
- virtual void SAL_CALL selectAccessibleChild(sal_Int32 nChildIndex) override;
-
- virtual sal_Bool SAL_CALL isAccessibleChildSelected(sal_Int32 nChildIndex) override;
-
- virtual void SAL_CALL clearAccessibleSelection() override;
-
- virtual void SAL_CALL selectAllAccessibleChildren() override;
-
- virtual ::sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override;
-
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
- getSelectedAccessibleChild(sal_Int32 nChildIndex) override;
-
- virtual void SAL_CALL deselectAccessibleChild(sal_Int32 nChildIndex) override;
-
- /// XInterface
-
- virtual css::uno::Any SAL_CALL queryInterface(
- css::uno::Type const & rType ) override;
-
- virtual void SAL_CALL acquire() throw () override;
- virtual void SAL_CALL release() throw () override;
-
- /// XTypeProvider
-
- virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
-
- /// non-UNO methods
-
- void appendMenuItem(const OUString& rName, size_t nMenuPos);
- void setMenuPos(size_t nMenuPos);
-
-protected:
-
- sal_Int32 getMenuItemCount() const;
-
- virtual tools::Rectangle GetBoundingBoxOnScreen() const override;
-
- virtual tools::Rectangle GetBoundingBox() const override;
-
-private:
- bool isSelected() const;
-
- void updateStates();
-
-private:
- ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > maMenuItems;
- css::uno::Reference< css::accessibility::XAccessibleStateSet > mxStateSet;
-
- size_t mnMenuPos;
- VclPtr<ScMenuFloatingWindow> mpWindow;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx
deleted file mode 100644
index 20003ed13444..000000000000
--- a/sc/inc/AccessibleFilterMenuItem.hxx
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- 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 .
- */
-
-#ifndef INCLUDED_SC_INC_ACCESSIBLEFILTERMENUITEM_HXX
-#define INCLUDED_SC_INC_ACCESSIBLEFILTERMENUITEM_HXX
-
-#include <AccessibleContextBase.hxx>
-#include <cppuhelper/implbase1.hxx>
-
-#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#include <vcl/vclptr.hxx>
-
-class ScMenuFloatingWindow;
-
-typedef ::cppu::ImplHelper1<
- css::accessibility::XAccessibleAction > ScAccessibleFilterMenuItem_BASE;
-
-class ScAccessibleFilterMenuItem final :
- public ScAccessibleContextBase,
- public ScAccessibleFilterMenuItem_BASE
-{
-public:
- explicit ScAccessibleFilterMenuItem(
- const css::uno::Reference< css::accessibility::XAccessible>& rxParent,
- ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos);
-
- virtual ~ScAccessibleFilterMenuItem() override;
-
- /// XAccessibleContext
-
- virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
-
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
- getAccessibleChild(sal_Int32 nIndex) override;
-
- virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL
- getAccessibleStateSet() override;
-
- virtual OUString SAL_CALL getImplementationName() override;
-
- /// XAccessibleAction
-
- virtual ::sal_Int32 SAL_CALL getAccessibleActionCount() 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;
-
- /// XInterface
-
- virtual css::uno::Any SAL_CALL queryInterface(
- css::uno::Type const & rType ) override;
-
- virtual void SAL_CALL acquire() throw () override;
- virtual void SAL_CALL release() throw () override;
-
- /// Non-UNO Methods
-
-private:
-
- virtual tools::Rectangle GetBoundingBoxOnScreen() const override;
-
- virtual tools::Rectangle GetBoundingBox() const override;
-
- bool isSelected() const;
- void updateStateSet();
-
- css::uno::Reference< css::accessibility::XAccessibleStateSet > mxStateSet;
-
- VclPtr<ScMenuFloatingWindow> mpWindow;
- size_t const mnMenuPos;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx
deleted file mode 100644
index 90dd9bbbfd30..000000000000
--- a/sc/inc/AccessibleFilterTopWindow.hxx
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- 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 .
- */
-
-#ifndef INCLUDED_SC_INC_ACCESSIBLEFILTERTOPWINDOW_HXX
-#define INCLUDED_SC_INC_ACCESSIBLEFILTERTOPWINDOW_HXX
-
-#include "AccessibleFilterMenu.hxx"
-
-class ScCheckListMenuWindow;
-
-class ScAccessibleFilterTopWindow final : public ScAccessibleFilterMenu
-{
-public:
- ScAccessibleFilterTopWindow(
- const css::uno::Reference< css::accessibility::XAccessible>& rxParent,
- ScCheckListMenuWindow* pWin,
- const OUString& rName);
- virtual ~ScAccessibleFilterTopWindow() override;
-
- // XAccessibleContext
-
- virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
-
- virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
- getAccessibleChild(sal_Int32 nIndex) override;
-
- virtual OUString SAL_CALL getImplementationName() override;
-
- // Non-UNO Methods
-
- enum ChildControlType {
- EDIT_SEARCH_BOX, LISTBOX, TOGGLE_ALL, SINGLE_ON_BTN, SINGLE_OFF_BTN, OK_BTN, CANCEL_BTN
- };
- void setAccessibleChild(
- const css::uno::Reference< css::accessibility::XAccessible >& rAccessible,
- ChildControlType eType);
-
-private:
- /** Edit search box for searching field members */
- css::uno::Reference< css::accessibility::XAccessible >
- mxAccEditSearchBox;
- /** check list box for field member visibility */
- css::uno::Reference< css::accessibility::XAccessible >
- mxAccListBox;
-
- /** check box for toggling all field member's visibility. */
- css::uno::Reference< css::accessibility::XAccessible >
- mxAccToggleAll;
-
- css::uno::Reference< css::accessibility::XAccessible >
- mxAccSingleOnBtn;
-
- css::uno::Reference< css::accessibility::XAccessible >
- mxAccSingleOffBtn;
-
- css::uno::Reference< css::accessibility::XAccessible >
- mxAccOkBtn;
-
- css::uno::Reference< css::accessibility::XAccessible >
- mxAccCancelBtn;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 9a44676ffbd3..90fe300736a7 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -166,10 +166,6 @@
#define STR_MENU_SORT_ASC NC_("STR_MENU_SORT_ASC", "Sort Ascending")
#define STR_MENU_SORT_DESC NC_("STR_MENU_SORT_DESC", "Sort Descending")
#define STR_MENU_SORT_CUSTOM NC_("STR_MENU_SORT_CUSTOM", "Custom Sort")
-#define STR_BTN_TOGGLE_ALL NC_("STR_BTN_TOGGLE_ALL", "All")
-#define STR_BTN_SELECT_CURRENT NC_("STR_BTN_SELECT_CURRENT", "Show only the current item.")
-#define STR_BTN_UNSELECT_CURRENT NC_("STR_BTN_UNSELECT_CURRENT", "Hide only the current item.")
-#define STR_EDIT_SEARCH_ITEMS NC_("STR_EDIT_SEARCH_ITEMS", "Search items...")
#define SCSTR_QHELP_POSWND NC_("SCSTR_QHELP_POSWND", "Name Box")
#define SCSTR_QHELP_INPUTWND NC_("SCSTR_QHELP_INPUTWND", "Input line")