svtools/source/control/valueacc.cxx | 43 +----------------------------------- svtools/source/control/valueimp.hxx | 15 +----------- 2 files changed, 4 insertions(+), 54 deletions(-)
New commits: commit 02fc71edd607a5eec722841c0e2b0f1ce820c85e Author: Noel Grandin <[email protected]> AuthorDate: Tue Jan 17 16:08:19 2023 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Jan 18 11:39:41 2023 +0000 XUnoTunnel->dynamic_cast in ValueSetAcc Change-Id: I0ae633a29eda0658dfb92e92f498dc5fe1673219 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145701 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 6c8020e4bfdd..9e496f6adcc8 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -434,24 +434,10 @@ void ValueSetAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue } } -const uno::Sequence< sal_Int8 >& ValueSetAcc::getUnoTunnelId() -{ - static const comphelper::UnoIdInit theValueSetAccUnoTunnelId; - return theValueSetAccUnoTunnelId.getSeq(); -} - - ValueSetAcc* ValueSetAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) noexcept { - try - { - return comphelper::getFromUnoTunnel<ValueSetAcc>(rxData); - } - catch(const css::uno::Exception&) - { - return nullptr; - } + return dynamic_cast<ValueSetAcc*>(rxData.get()); } @@ -900,12 +886,6 @@ void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int64 nChildIndex ) } -sal_Int64 SAL_CALL ValueSetAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) -{ - return comphelper::getSomethingImpl(rId, this); -} - - void ValueSetAcc::disposing(std::unique_lock<std::mutex>& rGuard) { // Make a copy of the list and clear the original. diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 6c61c437a0db..ed34aa35995b 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -23,7 +23,6 @@ #include <vcl/image.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/compbase.hxx> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleComponent.hpp> @@ -71,8 +70,7 @@ typedef comphelper::WeakComponentImplHelper< css::accessibility::XAccessibleEventBroadcaster, css::accessibility::XAccessibleContext, css::accessibility::XAccessibleComponent, - css::accessibility::XAccessibleSelection, - css::lang::XUnoTunnel > + css::accessibility::XAccessibleSelection > ValueSetAccComponentBase; class ValueSetAcc final : public ValueSetAccComponentBase @@ -138,10 +136,6 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; - // XUnoTunnel - static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override; - private: ::std::vector< css::uno::Reference< css::accessibility::XAccessibleEventListener > > mxEventListeners; commit 5afc1bcbda535aca71a54cf5067f19e9df5aea49 Author: Noel Grandin <[email protected]> AuthorDate: Tue Jan 17 16:07:18 2023 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Jan 18 11:39:34 2023 +0000 XUnoTunnel->dynamic_cast in ValueItemAcc Change-Id: I51450d2bc611b888b5b2f77293eed7ea3f5cbce1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145700 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index e6cc64411f1c..6c8020e4bfdd 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -76,24 +76,10 @@ void ValueItemAcc::ParentDestroyed() mpParent = nullptr; } -const uno::Sequence< sal_Int8 >& ValueItemAcc::getUnoTunnelId() -{ - static const comphelper::UnoIdInit theValueItemAccUnoTunnelId; - return theValueItemAccUnoTunnelId.getSeq(); -} - - ValueItemAcc* ValueItemAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) noexcept { - try - { - return comphelper::getFromUnoTunnel<ValueItemAcc>(rxData); - } - catch(const css::uno::Exception&) - { - return nullptr; - } + return dynamic_cast<ValueItemAcc*>(rxData.get()); } @@ -392,11 +378,6 @@ sal_Int32 SAL_CALL ValueItemAcc::getBackground( ) return static_cast<sal_Int32>(nColor); } -sal_Int64 SAL_CALL ValueItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) -{ - return comphelper::getSomethingImpl(rId, this); -} - void ValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue, const uno::Any& rNewValue ) { if( !nEventId ) diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 21e65305914b..6c61c437a0db 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -189,8 +189,7 @@ private: class ValueItemAcc : public ::cppu::WeakImplHelper< css::accessibility::XAccessible, css::accessibility::XAccessibleEventBroadcaster, css::accessibility::XAccessibleContext, - css::accessibility::XAccessibleComponent, - css::lang::XUnoTunnel > + css::accessibility::XAccessibleComponent > { private: @@ -242,10 +241,6 @@ public: virtual void SAL_CALL grabFocus( ) override; virtual sal_Int32 SAL_CALL getForeground( ) override; virtual sal_Int32 SAL_CALL getBackground( ) override; - - // XUnoTunnel - static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override; };
