168512dce7
Adjust VCLXAccessibleComponent and subclasses to take
a vcl::Window arg instead of a VCLXWindow in the ctor
and drop the VCLXAccessibleComponent::m_xVCLXWindow member
that used to hold a reference to the VCLXWindow.
(VCLXAccessibleComponent still holds a VclPtr
to the corresponding vcl::Window.)
Instead of passing the UNO/toolkit peer (VCLXWindow
and subclasses) to the AccessibleFactory to create
an XAccessibleContext context for the underlying VCL
widget, pass the underlying vcl widget, which can
now be passed as is to the corresponding ctors
of VCLXAccessibleComponent and specialized subclasses.
This follows earlier commits replacing the use of the
VCLXWindow classes by direct uses of the vcl::Window
subclasses inside VCLXAccessibleComponent and subclasses
and is the next step in reducing the UNO/toolkit
dependency in the accessibility implementation for
vcl widgets.
For now, the logic where those accessible objects
are created remains in VCLXWindow::CreateAccessibleContext
and overrides, but that can change in the future.
`IAccessibleFactory::createAccessibleContext(VCLXMultiLineEdit*)`
is just dropped and doesn't need its own replacement:
The previous VCLXMultiLineEdit variant was
creating a VCLXAccessibleEdit like the variant
taking a VCLXEdit, but VCLXMultiLineEdit doesn't
subclass VCLXEdit.
The vcl MultiLineEdit however subclasses Edit,
so VCLXMultiLineEdit::CreateAccessibleContext can make
use of `IAccessibleFactory::createAccessibleContext(Edit*)`
as well now.
This also implements what was mentioned in earlier
commit
Change-Id: I67bb7a6a237e57d0c522790c09a595c02ac06325
Author: Michael Weghorn <m.weghorn@posteo.de>
Date: Thu Dec 12 17:16:29 2024 +0100
sw annotation win a11y: Skip VCLXWindow logic
:
> Drop the comment about the code being dodgy from
> SwAnnotationWin::CreateAccessible. This commit partially
> addresses it and switching VCLXAccessibleComponent
> to using the vcl::Window will take care of the rest,
> see upcoming commit
> Change-Id If0894e733273eecad268c6a932ecee7c2e34b4c2
> ("a11y: Stop using VCLXWindow in vcl a11y classes").
Now that the VCLXAccessibleComponent ctor takes a
vcl::Window, the sw::annotation::SwAnnotationWin
can be passed directly.
From a user perspective, no change in behavior is
intended by this commit.
Change-Id: If0894e733273eecad268c6a932ecee7c2e34b4c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178385
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
87 lines
3.4 KiB
C++
87 lines
3.4 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 .
|
|
*/
|
|
|
|
#include <JAccess.hxx>
|
|
#include <JoinTableView.hxx>
|
|
#include <TableWindow.hxx>
|
|
#include <com/sun/star/accessibility/AccessibleRole.hpp>
|
|
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
|
|
#include <TableConnection.hxx>
|
|
#include <o3tl/safeint.hxx>
|
|
|
|
namespace dbaui
|
|
{
|
|
using namespace ::com::sun::star::accessibility;
|
|
using namespace ::com::sun::star::uno;
|
|
using namespace ::com::sun::star::lang;
|
|
|
|
OJoinDesignViewAccess::OJoinDesignViewAccess(OJoinTableView* _pTableView)
|
|
:ImplInheritanceHelper(_pTableView)
|
|
,m_pTableView(_pTableView)
|
|
{
|
|
}
|
|
OUString SAL_CALL OJoinDesignViewAccess::getImplementationName()
|
|
{
|
|
return u"org.openoffice.comp.dbu.JoinViewAccessibility"_ustr;
|
|
}
|
|
void OJoinDesignViewAccess::clearTableView()
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
m_pTableView = nullptr;
|
|
}
|
|
// XAccessibleContext
|
|
sal_Int64 SAL_CALL OJoinDesignViewAccess::getAccessibleChildCount( )
|
|
{
|
|
// TODO may be this will change to only visible windows
|
|
// this is the same assumption mt implements
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
sal_Int64 nChildCount = 0;
|
|
if ( m_pTableView )
|
|
nChildCount = m_pTableView->GetTabWinCount() + m_pTableView->getTableConnections().size();
|
|
return nChildCount;
|
|
}
|
|
Reference< XAccessible > SAL_CALL OJoinDesignViewAccess::getAccessibleChild( sal_Int64 i )
|
|
{
|
|
Reference< XAccessible > aRet;
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
if(i < 0 || i >= getAccessibleChildCount() || !m_pTableView)
|
|
throw IndexOutOfBoundsException();
|
|
// check if we should return a table window or a connection
|
|
sal_Int64 nTableWindowCount = m_pTableView->GetTabWinCount();
|
|
if( i < nTableWindowCount )
|
|
{
|
|
OJoinTableView::OTableWindowMap::const_iterator aIter = std::next(m_pTableView->GetTabWinMap().begin(), i);
|
|
aRet = aIter->second->GetAccessible();
|
|
}
|
|
else if( o3tl::make_unsigned(i - nTableWindowCount) < m_pTableView->getTableConnections().size() )
|
|
aRet = m_pTableView->getTableConnections()[i - nTableWindowCount]->GetAccessible();
|
|
return aRet;
|
|
}
|
|
sal_Int16 SAL_CALL OJoinDesignViewAccess::getAccessibleRole( )
|
|
{
|
|
return AccessibleRole::VIEW_PORT;
|
|
}
|
|
Reference< XAccessibleContext > SAL_CALL OJoinDesignViewAccess::getAccessibleContext( )
|
|
{
|
|
return this;
|
|
}
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|