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

[Noel Grandin (via logerrit)]

 svx/source/fmcomp/gridcell.cxx |   13 -------------
 svx/source/inc/gridcell.hxx    |   10 +---------
 2 files changed, 1 insertion(+), 22 deletions(-)

New commits:
commit 2cad5c39e3d1652e2aaa95dbe032e58369bdaed3
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Jan 17 16:10:16 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Jan 18 11:58:38 2023 +0000

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

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index c231d7415ec6..debea567ada5 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -4491,19 +4491,6 @@ FmXFilterCell::~FmXFilterCell()
 
 }
 
-// XUnoTunnel
-sal_Int64 SAL_CALL FmXFilterCell::getSomething( const Sequence< sal_Int8 >& 
_rIdentifier )
-{
-    return comphelper::getSomethingImpl(_rIdentifier, this);
-}
-
-const Sequence<sal_Int8>& FmXFilterCell::getUnoTunnelId()
-{
-    static const comphelper::UnoIdInit theFmXFilterCellUnoTunnelId;
-    return theFmXFilterCellUnoTunnelId.getSeq();
-}
-
-
 void FmXFilterCell::PaintCell( OutputDevice& rDev, const tools::Rectangle& 
rRect )
 {
     static_cast< DbFilterField* >( m_pCellControl.get() )->PaintCell( rDev, 
rRect );
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 8b62384343f5..f134e306e178 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XCheckBox.hpp>
 #include <com/sun/star/awt/XButton.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/form/XChangeBroadcaster.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
@@ -1013,8 +1012,7 @@ public:
     virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 Lines ) override;
 };
 
-typedef ::cppu::ImplHelper2 <   css::awt::XTextComponent
-                            ,   css::lang::XUnoTunnel
+typedef ::cppu::ImplHelper1 <   css::awt::XTextComponent
                             >   FmXFilterCell_Base;
 class FmXFilterCell final : public FmXGridCell
                     ,public FmXFilterCell_Base
@@ -1028,12 +1026,6 @@ public:
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) 
override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() 
override;
 
-// XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< 
sal_Int8 >& aIdentifier ) override;
-
-// helpers for XUnoTunnel
-    static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
-
 //  painting the filter text
     void PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect);
     void Update(){m_pCellControl->Update();}