accessibility/inc/pch/precompiled_acc.hxx | 1
comphelper/Library_comphelper.mk | 1
comphelper/source/misc/accimplaccess.cxx | 54 --------------
include/IwyuFilter_include.yaml | 3
include/comphelper/accimplaccess.hxx | 73 -------------------
include/toolkit/awt/vclxaccessiblecomponent.hxx | 2
solenv/clang-format/excludelist | 2
toolkit/inc/controls/accessiblecontrolcontext.hxx | 4 -
toolkit/source/awt/vclxaccessiblecomponent.cxx | 3
toolkit/source/controls/accessiblecontrolcontext.cxx | 3
10 files changed, 3 insertions(+), 143 deletions(-)
New commits:
commit f1d00da1bb16330bef9316a3e4f04506f9bb862f
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Jan 9 11:53:17 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Jan 10 10:21:16 2023 +0000
OAccessibleImplementationAccess was apparently effectively unused by now
...as there were no calls to its
OAccessibleImplementationAccess::getUnoTunnelId
so no code apparently made use of that XUnoTunnel
Change-Id: I35d392999f1c28e81f7ff4bf395f63642eb17bce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145250
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/pch/precompiled_acc.hxx
b/accessibility/inc/pch/precompiled_acc.hxx
index 806c944ac6dd..fcbbd9f1f0c1 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -261,7 +261,6 @@
#include <comphelper/accessibleeventnotifier.hxx>
#include <comphelper/accessiblekeybindinghelper.hxx>
#include <comphelper/accessibletexthelper.hxx>
-#include <comphelper/accimplaccess.hxx>
#include <comphelper/comphelperdllapi.h>
#include <comphelper/sequence.hxx>
#include <comphelper/servicehelper.hxx>
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index be60c4dc886c..b6d1d7e39ccf 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -82,7 +82,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
comphelper/source/misc/accessibleselectionhelper \
comphelper/source/misc/accessibletexthelper \
comphelper/source/misc/accessiblewrapper \
- comphelper/source/misc/accimplaccess \
comphelper/source/misc/AccessibleImplementationHelper \
comphelper/source/misc/anycompare \
comphelper/source/misc/anytohash \
diff --git a/comphelper/source/misc/accimplaccess.cxx
b/comphelper/source/misc/accimplaccess.cxx
deleted file mode 100644
index bcf05c926810..000000000000
--- a/comphelper/source/misc/accimplaccess.cxx
+++ /dev/null
@@ -1,54 +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 <comphelper/accimplaccess.hxx>
-#include <comphelper/servicehelper.hxx>
-
-
-namespace comphelper
-{
-
-
- using ::com::sun::star::uno::Sequence;
-
- OAccessibleImplementationAccess::OAccessibleImplementationAccess( )
- {
- }
-
-
- OAccessibleImplementationAccess::~OAccessibleImplementationAccess( )
- {
- }
-
- const Sequence<sal_Int8> &
OAccessibleImplementationAccess::getUnoTunnelId()
- {
- static const comphelper::UnoIdInit implID;
- return implID.getSeq();
- }
-
-
- sal_Int64 SAL_CALL OAccessibleImplementationAccess::getSomething( const
Sequence< sal_Int8 >& _rIdentifier )
- {
- return comphelper::getSomethingImpl(_rIdentifier, this);
- }
-
-} // namespace comphelper
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index cbb76417739a..9fce4b214568 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -132,9 +132,6 @@ excludelist:
- com/sun/star/accessibility/XAccessibleContext.hpp
- com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp
- com/sun/star/accessibility/XAccessibleEventListener.hpp
- include/comphelper/accimplaccess.hxx:
- # base class has to be a complete type
- - com/sun/star/lang/XUnoTunnel.hpp
include/comphelper/attributelist.hxx:
# base class has to be a complete type
- com/sun/star/util/XCloneable.hpp
diff --git a/include/comphelper/accimplaccess.hxx
b/include/comphelper/accimplaccess.hxx
deleted file mode 100644
index e716d4d18905..000000000000
--- a/include/comphelper/accimplaccess.hxx
+++ /dev/null
@@ -1,73 +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_COMPHELPER_ACCIMPLACCESS_HXX
-#define INCLUDED_COMPHELPER_ACCIMPLACCESS_HXX
-
-#include <cppuhelper/implbase1.hxx>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <comphelper/comphelperdllapi.h>
-
-namespace comphelper
-{
- //= OAccessibleImplementationAccess
-
- typedef ::cppu::ImplHelper1 < css::lang::XUnoTunnel
- > OAccImpl_Base;
-
- /** This is a helper class which allows accessing several aspects of the
implementation
- of an AccessibleContext.
-
- <p>For instance, when you want to implement a context which can be
re-parented, you:
- <ul><li>derive your class from OAccessibleImplementationAccess</li>
- <li>use <code>setAccessibleParent( <em>component</em>,
<em>new_parent</em> )</code>
- </ul>
- </p>
-
- <p>Another aspect which can be controlled from the outside are states.
If you have a class which
- has only partial control over it's states, you may consider deriving
from OAccessibleImplementationAccess.<br/>
- For instance, say you have an implementation (say component A) which
is <em>unable</em> to know or to
- determine if the represented object is selected, but another component
(say B) which uses A (and integrates
- it into a tree of accessibility components) is.<br/>
- In this case, if A is derived from OAccessibleImplementationAccess, B
can manipulate this
- foreign-controlled state flag "SELECTED" by using the static helper
methods on this class.</p>
-
- <p>Please note that the support for foreign controlled states is
rather restrictive: You can't have states
- which <em>may be</em> controlled by a foreign instances. This is
implied by the fact that a derived
- class can ask for states which are <em>set</em> only, not for the ones
which are <em>reset</em> currently.
- </p>
- */
- class COMPHELPER_DLLPUBLIC OAccessibleImplementationAccess : public
OAccImpl_Base
- {
- protected:
- OAccessibleImplementationAccess( );
- virtual ~OAccessibleImplementationAccess( );
-
- // XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<
sal_Int8 >& _rIdentifier ) override;
-
- public:
- COMPHELPER_DLLPRIVATE static const css::uno::Sequence<sal_Int8> &
getUnoTunnelId();
- };
-
-} // namespace comphelper
-
-#endif // INCLUDED_COMPHELPER_ACCIMPLACCESS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx
b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index b69f62b6871f..aaf322c6477f 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -23,7 +23,6 @@
#include <toolkit/dllapi.h>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase1.hxx>
-#include <comphelper/accimplaccess.hxx>
#include <comphelper/accessiblecomponenthelper.hxx>
@@ -47,7 +46,6 @@ typedef ::cppu::ImplHelper1<
class TOOLKIT_DLLPUBLIC VCLXAccessibleComponent
:public comphelper::OAccessibleExtendedComponentHelper
- ,public ::comphelper::OAccessibleImplementationAccess
,public VCLXAccessibleComponent_BASE
{
private:
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index fccf3a48d88c..fe6d29b40a68 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -1377,7 +1377,6 @@ comphelper/source/misc/accessiblekeybindinghelper.cxx
comphelper/source/misc/accessibleselectionhelper.cxx
comphelper/source/misc/accessibletexthelper.cxx
comphelper/source/misc/accessiblewrapper.cxx
-comphelper/source/misc/accimplaccess.cxx
comphelper/source/misc/anycompare.cxx
comphelper/source/misc/anytohash.cxx
comphelper/source/misc/anytostring.cxx
@@ -4873,7 +4872,6 @@ include/comphelper/accessiblekeybindinghelper.hxx
include/comphelper/accessibleselectionhelper.hxx
include/comphelper/accessibletexthelper.hxx
include/comphelper/accessiblewrapper.hxx
-include/comphelper/accimplaccess.hxx
include/comphelper/anycompare.hxx
include/comphelper/asyncnotification.hxx
include/comphelper/attributelist.hxx
diff --git a/toolkit/inc/controls/accessiblecontrolcontext.hxx
b/toolkit/inc/controls/accessiblecontrolcontext.hxx
index 14acfe6e3276..8cb168071fcc 100644
--- a/toolkit/inc/controls/accessiblecontrolcontext.hxx
+++ b/toolkit/inc/controls/accessiblecontrolcontext.hxx
@@ -20,7 +20,6 @@
#pragma once
#include <comphelper/accessiblecomponenthelper.hxx>
-#include <comphelper/accimplaccess.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/lang/XEventListener.hpp>
#include <rtl/ref.hxx>
@@ -48,8 +47,7 @@ namespace toolkit
is being disposed.</p>
*/
class OAccessibleControlContext final
- :public ::comphelper::OAccessibleImplementationAccess
- ,public OAccessibleControlContext_Base
+ :public OAccessibleControlContext_Base
,public OAccessibleControlContext_IBase
{
public:
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx
b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index 666ba75bde6a..26dcde5e1b01 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -79,12 +79,11 @@ VCLXAccessibleComponent::~VCLXAccessibleComponent()
DisconnectEvents();
}
-IMPLEMENT_FORWARD_XINTERFACE3( VCLXAccessibleComponent,
OAccessibleExtendedComponentHelper, OAccessibleImplementationAccess,
VCLXAccessibleComponent_BASE )
+IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleComponent,
OAccessibleExtendedComponentHelper, VCLXAccessibleComponent_BASE )
css::uno::Sequence< css::uno::Type > SAL_CALL
VCLXAccessibleComponent::getTypes()
{
return ::comphelper::concatSequences(
OAccessibleExtendedComponentHelper::getTypes(),
- OAccessibleImplementationAccess::getTypes(),
VCLXAccessibleComponent_BASE::getTypes()
);
}
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx
b/toolkit/source/controls/accessiblecontrolcontext.cxx
index 7df9a0c7e34d..345e486db04d 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -59,12 +59,11 @@ namespace toolkit
// (order matters: the first is the class name, the second is the class
doing the ref counting)
- IMPLEMENT_FORWARD_XINTERFACE3( OAccessibleControlContext,
OAccessibleControlContext_Base, OAccessibleImplementationAccess,
OAccessibleControlContext_IBase )
+ IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleControlContext,
OAccessibleControlContext_Base, OAccessibleControlContext_IBase )
css::uno::Sequence< css::uno::Type > SAL_CALL
OAccessibleControlContext::getTypes()
{
return ::comphelper::concatSequences(
OAccessibleControlContext_Base::getTypes(),
- OAccessibleImplementationAccess::getTypes(),
OAccessibleControlContext_IBase::getTypes()
);
}
