[Libreoffice-commits] core.git: sfx2/source

[Noel Grandin (via logerrit)]

 sfx2/source/control/thumbnailviewacc.cxx |   20 +-------------------
 sfx2/source/control/thumbnailviewacc.hxx |    8 +-------
 2 files changed, 2 insertions(+), 26 deletions(-)

New commits:
commit 23e6c378b6d3045d295ad665ae32de65f7f8a47f
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Jan 17 09:42:16 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Jan 17 16:10:23 2023 +0000

    XUnoTunnel->dynamic_cast in ThumbnailViewAcc
    
    Change-Id: I0d7e98c45ff4b15c646ba90f7bd1f363300dcdb5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145670
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sfx2/source/control/thumbnailviewacc.cxx 
b/sfx2/source/control/thumbnailviewacc.cxx
index adc6b30f454f..70b898e9dacb 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -44,23 +44,10 @@ ThumbnailViewAcc::~ThumbnailViewAcc()
 {
 }
 
-const uno::Sequence< sal_Int8 >& ThumbnailViewAcc::getUnoTunnelId()
-{
-    static const comphelper::UnoIdInit theSfxValueSetAccUnoTunnelId;
-    return theSfxValueSetAccUnoTunnelId.getSeq();
-}
-
 ThumbnailViewAcc* ThumbnailViewAcc::getImplementation( const uno::Reference< 
uno::XInterface >& rxData )
     noexcept
 {
-    try
-    {
-        return comphelper::getFromUnoTunnel<ThumbnailViewAcc>(rxData);
-    }
-    catch(const css::uno::Exception&)
-    {
-        return nullptr;
-    }
+    return dynamic_cast<ThumbnailViewAcc*>(rxData.get());
 }
 
 uno::Reference< accessibility::XAccessibleContext > SAL_CALL 
ThumbnailViewAcc::getAccessibleContext()
@@ -450,11 +437,6 @@ void SAL_CALL ThumbnailViewAcc::deselectAccessibleChild( 
sal_Int64 nChildIndex)
 //FIXME TODO        ;
 }
 
-sal_Int64 SAL_CALL ThumbnailViewAcc::getSomething( const uno::Sequence< 
sal_Int8 >& rId )
-{
-    return comphelper::getSomethingImpl(rId, this);
-}
-
 void ThumbnailViewAcc::disposing(std::unique_lock<std::mutex>& rGuard)
 {
     ::std::vector<uno::Reference<accessibility::XAccessibleEventListener> > 
aListenerListCopy;
diff --git a/sfx2/source/control/thumbnailviewacc.hxx 
b/sfx2/source/control/thumbnailviewacc.hxx
index 11f5cf4fa3b6..9a6abfb6bd09 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -23,7 +23,6 @@
 #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>
@@ -40,8 +39,7 @@ typedef comphelper::WeakComponentImplHelper<
     css::accessibility::XAccessibleEventBroadcaster,
     css::accessibility::XAccessibleContext,
     css::accessibility::XAccessibleComponent,
-    css::accessibility::XAccessibleSelection,
-    css::lang::XUnoTunnel >
+    css::accessibility::XAccessibleSelection >
     ValueSetAccComponentBase;
 
 class ThumbnailViewAcc :
@@ -110,10 +108,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;