diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-17 09:40:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-17 18:17:57 +0000 |
| commit | 74600e794903daf0e9be5ba20df1680c715f63c9 (patch) | |
| tree | 40e4d2a761d6125c196562264ce46e20d1f81ba6 /sfx2 | |
| parent | 924005b06732d6d7aea2437a9edf2550878f9324 (diff) | |
XUnoTunnel->dynamic_cast in ThumbnailViewItemAcc
Change-Id: Iba0a4a002b261e7b75e20e25d676a6a846b73647
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145669
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/thumbnailviewacc.cxx | 20 | ||||
| -rw-r--r-- | sfx2/source/control/thumbnailviewacc.hxx | 7 |
2 files changed, 2 insertions, 25 deletions
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index 70b898e9dacb..f157b155cddd 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -539,23 +539,10 @@ void ThumbnailViewAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOld } } -const uno::Sequence< sal_Int8 >& ThumbnailViewItemAcc::getUnoTunnelId() -{ - static const comphelper::UnoIdInit theValueItemAccUnoTunnelId; - return theValueItemAccUnoTunnelId.getSeq(); -} - ThumbnailViewItemAcc* ThumbnailViewItemAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) noexcept { - try - { - return comphelper::getFromUnoTunnel<ThumbnailViewItemAcc>(rxData); - } - catch(const css::uno::Exception&) - { - return nullptr; - } + return dynamic_cast<ThumbnailViewItemAcc*>(rxData.get()); } void ThumbnailViewAcc::GetFocus() @@ -862,9 +849,4 @@ sal_Int32 SAL_CALL ThumbnailViewItemAcc::getBackground( ) return static_cast<sal_Int32>(Application::GetSettings().GetStyleSettings().GetWindowColor()); } -sal_Int64 SAL_CALL ThumbnailViewItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) -{ - return comphelper::getSomethingImpl(rId, this); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index 9a6abfb6bd09..1fcf9d3ac9a6 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -147,8 +147,7 @@ private: class ThumbnailViewItemAcc : public ::cppu::WeakImplHelper< css::accessibility::XAccessible, css::accessibility::XAccessibleEventBroadcaster, css::accessibility::XAccessibleContext, - css::accessibility::XAccessibleComponent, - css::lang::XUnoTunnel > + css::accessibility::XAccessibleComponent> { private: @@ -198,10 +197,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; }; #endif // INCLUDED_SFX2_SOURCE_CONTROL_THUMBNAILVIEWACC_HXX |