ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

gtk3 a11y: Drop unused DocumentFocusListener class

Browse Source 
Code calling the ctor was dropped in

    commit 4aa2cc878d
    Date:   Thu Jun 20 10:46:59 2024 +0200

        loplugin:unusedmethods

which dropped GtkSalData::GetDocumentFocusListener
unused since

    commit c45c64aeb5
    Author: Michael Weghorn <m.weghorn@posteo.de>
    Date:   Mon May 6 14:44:36 2024 +0200

        tdf#160806 tdf#160837 gtk3 a11y: Drop handling of some VclEventIds

Change-Id: Iee8134371fce26cb21481695ab8379d4fc61065c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174988
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2024-10-16 09:37:41 +02:00
parent ef36357ee9
commit 71d69554b2
6 changed files with 0 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
solenv/clang-format/excludelist
-1
View File
@@ -14950,7 +14950,6 @@ vcl/unx/gtk3/a11y/atkselection.cxx
vcl/unx/gtk3/a11y/atktable.cxx
vcl/unx/gtk3/a11y/atktext.cxx
vcl/unx/gtk3/a11y/atktextattributes.cxx
vcl/unx/gtk3/a11y/atkutil.cxx
vcl/unx/gtk3/a11y/atkvalue.cxx
vcl/unx/gtk3/a11y/atkwrapper.cxx
vcl/unx/gtk3/gtkcairo.cxx
vcl/Library_vclplug_gtk3.mk
-1
View File
@@ -94,7 +94,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
vcl/unx/gtk3/a11y/atktablecell \
vcl/unx/gtk3/a11y/atktextattributes \
vcl/unx/gtk3/a11y/atktext \
vcl/unx/gtk3/a11y/atkutil \
vcl/unx/gtk3/a11y/atkvalue \
vcl/unx/gtk3/a11y/atkwrapper \
vcl/unx/gtk3/fpicker/resourceprovider \
vcl/Library_vclplug_gtk3_kde5.mk
-1
View File
@@ -100,7 +100,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3_kde5,\
vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktablecell \
vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktextattributes \
vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktext \
vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkutil \
vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkvalue \
vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkwrapper \
vcl/unx/gtk3_kde5/gtk3_kde5_customcellrenderer \
vcl/inc/unx/gtk/gtkdata.hxx
-59
View File
@@ -41,12 +41,10 @@
#include <exception>
#include <string_view>
#include <vector>
namespace com::sun::star::accessibility { class XAccessibleEventListener; }
class GtkSalDisplay;
class DocumentFocusListener;
#if !GTK_CHECK_VERSION(4,0,0)
typedef GdkWindow GdkSurface;
@@ -218,63 +216,6 @@ public:
sal_uLong m_nTimeoutMS;
};
class DocumentFocusListener final :
public ::cppu::WeakImplHelper< css::accessibility::XAccessibleEventListener >
{
o3tl::sorted_vector< css::uno::Reference< css::uno::XInterface > > m_aRefList;
public:
/// @throws lang::IndexOutOfBoundsException
/// @throws uno::RuntimeException
void attachRecursive(
const css::uno::Reference< css::accessibility::XAccessible >& xAccessible
);
/// @throws lang::IndexOutOfBoundsException
/// @throws uno::RuntimeException
void attachRecursive(
const css::uno::Reference< css::accessibility::XAccessible >& xAccessible,
const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext
);
/// @throws lang::IndexOutOfBoundsException
/// @throws uno::RuntimeException
void attachRecursive(
const css::uno::Reference< css::accessibility::XAccessible >& xAccessible,
const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext,
sal_Int64 nStateSet
);
/// @throws lang::IndexOutOfBoundsException
/// @throws uno::RuntimeException
void detachRecursive(
const css::uno::Reference< css::accessibility::XAccessible >& xAccessible
);
/// @throws lang::IndexOutOfBoundsException
/// @throws uno::RuntimeException
void detachRecursive(
const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext
);
/// @throws lang::IndexOutOfBoundsException
/// @throws uno::RuntimeException
void detachRecursive(
const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext,
sal_Int64 nStateSet
);
/// @throws lang::IndexOutOfBoundsException
/// @throws uno::RuntimeException
static css::uno::Reference< css::accessibility::XAccessible > getAccessible(const css::lang::EventObject& aEvent );
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
// XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
};
class GtkSalData final : public GenericUnixSalData
{
vcl/unx/gtk3/a11y/atkutil.cxx
-273
View File
@@ -1,273 +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 .
*/
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/XAccessibleText.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <sal/log.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/menu.hxx>
#include <vcl/toolbox.hxx>
#include <unx/gtk/gtkdata.hxx>
#include "atkwrapper.hxx"
using namespace ::com::sun::star;
static void
atk_wrapper_notify_focus_change(const uno::Reference<accessibility::XAccessible>& xAccessible)
{
AtkObject *atk_obj = xAccessible.is() ? atk_object_wrapper_ref( xAccessible ) : nullptr;
// Gail does not notify focus changes to NULL, so do we ..
if( atk_obj )
{
atk_object_notify_state_change(atk_obj, ATK_STATE_FOCUSED, true);
// #i93269#
// emit text_caret_moved event for <XAccessibleText> object,
// if cursor is inside the <XAccessibleText> object.
{
AtkObjectWrapper* wrapper_obj = ATK_OBJECT_WRAPPER (atk_obj);
if( wrapper_obj && !wrapper_obj->mpText.is() )
{
wrapper_obj->mpText.set(wrapper_obj->mpContext, css::uno::UNO_QUERY);
if ( wrapper_obj->mpText.is() )
{
gint caretPos = -1;
try {
caretPos = wrapper_obj->mpText->getCaretPosition();
}
catch(const uno::Exception&) {
g_warning( "Exception in getCaretPosition()" );
}
if ( caretPos != -1 )
{
g_signal_emit_by_name( atk_obj, "text_caret_moved", caretPos );
}
}
}
}
g_object_unref(atk_obj);
}
}
void DocumentFocusListener::disposing( const lang::EventObject& aEvent )
{
// Unref the object here, but do not remove as listener since the object
// might no longer be in a state that safely allows this.
if( aEvent.Source.is() )
m_aRefList.erase(aEvent.Source);
}
/*****************************************************************************/
void DocumentFocusListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent )
{
try {
switch( aEvent.EventId )
{
case accessibility::AccessibleEventId::STATE_CHANGED:
{
sal_Int64 nState = accessibility::AccessibleStateType::INVALID;
aEvent.NewValue >>= nState;
if( accessibility::AccessibleStateType::FOCUSED == nState )
atk_wrapper_notify_focus_change(getAccessible(aEvent));
break;
}
case accessibility::AccessibleEventId::CHILD:
{
uno::Reference< accessibility::XAccessible > xChild;
if( (aEvent.OldValue >>= xChild) && xChild.is() )
detachRecursive(xChild);
if( (aEvent.NewValue >>= xChild) && xChild.is() )
attachRecursive(xChild);
break;
}
case accessibility::AccessibleEventId::INVALIDATE_ALL_CHILDREN:
{
if (uno::Reference< accessibility::XAccessible > xAcc = getAccessible(aEvent))
detachRecursive(xAcc);
break;
}
default:
break;
}
}
catch( const lang::IndexOutOfBoundsException& )
{
g_warning("DocumentFocusListener: Focused object has invalid index in parent");
}
}
/*****************************************************************************/
uno::Reference< accessibility::XAccessible > DocumentFocusListener::getAccessible(const lang::EventObject& aEvent )
{
uno::Reference< accessibility::XAccessible > xAccessible(aEvent.Source, uno::UNO_QUERY);
if( xAccessible.is() )
return xAccessible;
uno::Reference< accessibility::XAccessibleContext > xContext(aEvent.Source, uno::UNO_QUERY);
if( xContext.is() )
{
uno::Reference< accessibility::XAccessible > xParent( xContext->getAccessibleParent() );
if( xParent.is() )
{
uno::Reference< accessibility::XAccessibleContext > xParentContext( xParent->getAccessibleContext() );
if( xParentContext.is() )
{
return xParentContext->getAccessibleChild( xContext->getAccessibleIndexInParent() );
}
}
}
return uno::Reference< accessibility::XAccessible >();
}
/*****************************************************************************/
void DocumentFocusListener::attachRecursive(
const uno::Reference< accessibility::XAccessible >& xAccessible
)
{
uno::Reference< accessibility::XAccessibleContext > xContext =
xAccessible->getAccessibleContext();
if( xContext.is() )
attachRecursive(xAccessible, xContext);
}
/*****************************************************************************/
void DocumentFocusListener::attachRecursive(
const uno::Reference< accessibility::XAccessible >& xAccessible,
const uno::Reference< accessibility::XAccessibleContext >& xContext
)
{
sal_Int64 nStateSet = xContext->getAccessibleStateSet();
attachRecursive(xAccessible, xContext, nStateSet);
}
/*****************************************************************************/
void DocumentFocusListener::attachRecursive(
const uno::Reference< accessibility::XAccessible >& xAccessible,
const uno::Reference< accessibility::XAccessibleContext >& xContext,
sal_Int64 nStateSet
)
{
if( nStateSet & accessibility::AccessibleStateType::FOCUSED )
atk_wrapper_notify_focus_change(xAccessible);
uno::Reference< accessibility::XAccessibleEventBroadcaster > xBroadcaster(xContext, uno::UNO_QUERY);
if (!xBroadcaster.is())
return;
// If not already done, add the broadcaster to the list and attach as listener.
const uno::Reference< uno::XInterface >& xInterface = xBroadcaster;
if( !m_aRefList.insert(xInterface).second )
return;
xBroadcaster->addAccessibleEventListener(static_cast< accessibility::XAccessibleEventListener *>(this));
if( ! (nStateSet & accessibility::AccessibleStateType::MANAGES_DESCENDANTS) )
{
sal_Int64 n, nmax = xContext->getAccessibleChildCount();
for( n = 0; n < nmax; n++ )
{
uno::Reference< accessibility::XAccessible > xChild( xContext->getAccessibleChild( n ) );
if( xChild.is() )
attachRecursive(xChild);
}
}
}
/*****************************************************************************/
void DocumentFocusListener::detachRecursive(
const uno::Reference< accessibility::XAccessible >& xAccessible
)
{
uno::Reference< accessibility::XAccessibleContext > xContext =
xAccessible->getAccessibleContext();
if( xContext.is() )
detachRecursive(xContext);
}
/*****************************************************************************/
void DocumentFocusListener::detachRecursive(
const uno::Reference< accessibility::XAccessibleContext >& xContext
)
{
sal_Int64 nStateSet = xContext->getAccessibleStateSet();
detachRecursive(xContext, nStateSet);
}
/*****************************************************************************/
void DocumentFocusListener::detachRecursive(
const uno::Reference< accessibility::XAccessibleContext >& xContext,
sal_Int64 nStateSet
)
{
uno::Reference< accessibility::XAccessibleEventBroadcaster > xBroadcaster(xContext, uno::UNO_QUERY);
if( !xBroadcaster.is() || 0 >= m_aRefList.erase(xBroadcaster) )
return;
xBroadcaster->removeAccessibleEventListener(static_cast< accessibility::XAccessibleEventListener *>(this));
if( ! (nStateSet & accessibility::AccessibleStateType::MANAGES_DESCENDANTS) )
{
sal_Int64 n, nmax = xContext->getAccessibleChildCount();
for( n = 0; n < nmax; n++ )
{
uno::Reference< accessibility::XAccessible > xChild( xContext->getAccessibleChild( n ) );
if( xChild.is() )
detachRecursive(xChild);
}
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkutil.cxx
-12
View File
@@ -1,12 +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/.
*/
#include "../../gtk3/a11y/atkutil.cxx"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */