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

[Noel Grandin (via logerrit)]

 connectivity/source/drivers/dbase/DIndex.cxx    |    3 +--
 connectivity/source/drivers/file/FResultSet.cxx |   13 -------------
 connectivity/source/inc/file/FResultSet.hxx     |    6 +-----
 3 files changed, 2 insertions(+), 20 deletions(-)

New commits:
commit 0dbc1bd6b7806f9d7a5c12daf57a8099c54d25a5
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jan 16 12:08:59 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Jan 16 11:30:45 2023 +0000

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

diff --git a/connectivity/source/drivers/dbase/DIndex.cxx 
b/connectivity/source/drivers/dbase/DIndex.cxx
index ad1f9a5090cf..89013ab58481 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -551,8 +551,7 @@ void ODbaseIndex::CreateImpl()
 
     if(xSet->last())
     {
-        Reference< XUnoTunnel> xTunnel(xSet, UNO_QUERY_THROW);
-        ODbaseResultSet* pDbaseRes = 
comphelper::getFromUnoTunnel<ODbaseResultSet>(xTunnel);
+        ODbaseResultSet* pDbaseRes = 
dynamic_cast<ODbaseResultSet*>(xSet.getTyped().get());
         assert(pDbaseRes); //"No dbase resultset found? What's going on here!
         nRowsLeft = xSet->getRow();
 
diff --git a/connectivity/source/drivers/file/FResultSet.cxx 
b/connectivity/source/drivers/file/FResultSet.cxx
index 3268349a61d9..5612c68feedf 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1381,19 +1381,6 @@ void OResultSet::OpenImpl()
     m_nFilePos  = 0;
 }
 
-const Sequence< sal_Int8 > & OResultSet::getUnoTunnelId()
-{
-    static const comphelper::UnoIdInit implId;
-    return implId.getSeq();
-}
-
-// css::lang::XUnoTunnel
-
-sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId )
-{
-    return comphelper::getSomethingImpl(rId, this);
-}
-
 void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
                                    const OValueRefRow& _rSelectRow,
                                    const 
::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,
diff --git a/connectivity/source/inc/file/FResultSet.hxx 
b/connectivity/source/inc/file/FResultSet.hxx
index 62a52fe2bc82..16371531fb3b 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -54,8 +54,7 @@ namespace connectivity::file
                                                   css::sdbc::XCloseable,
                                                   css::sdbc::XColumnLocate,
                                                   css::lang::XServiceInfo,
-                                                  css::lang::XEventListener,
-                                                  css::lang::XUnoTunnel> 
OResultSet_BASE;
+                                                  css::lang::XEventListener> 
OResultSet_BASE;
 
         class OOO_DLLPUBLIC_FILE OResultSet :
                             public  cppu::BaseMutex,
@@ -246,9 +245,6 @@ namespace connectivity::file
             virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, 
const css::uno::Any& x, sal_Int32 scale ) override;
             // XColumnLocate
             virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName 
) override;
-            // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< 
sal_Int8 >& aIdentifier ) override;
-            static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
             //XEventlistener
             virtual void SAL_CALL disposing( const css::lang::EventObject& 
Source ) override;