mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XUnoTunnel->dynamic_cast in file::OResultSet

Browse Source 
Change-Id: Icfb3760b05e80925833f2ecaa294a81c85b6c672
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145561
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2023-01-16 12:08:59 +02:00
parent d466df5bc2
commit 0dbc1bd6b7
3 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
connectivity/source/drivers/dbase/DIndex.cxx
View File

@@ -551,8 +551,7 @@ void ODbaseIndex::CreateImpl()
if(xSet->last()) if(xSet->last())
{ {
Reference< XUnoTunnel> xTunnel(xSet, UNO_QUERY_THROW); ODbaseResultSet* pDbaseRes = dynamic_cast<ODbaseResultSet*>(xSet.getTyped().get());
ODbaseResultSet* pDbaseRes = comphelper::getFromUnoTunnel<ODbaseResultSet>(xTunnel);
assert(pDbaseRes); //"No dbase resultset found? What's going on here! assert(pDbaseRes); //"No dbase resultset found? What's going on here!
nRowsLeft = xSet->getRow(); nRowsLeft = xSet->getRow();

13
connectivity/source/drivers/file/FResultSet.cxx
View File

@@ -1381,19 +1381,6 @@ void OResultSet::OpenImpl()
m_nFilePos = 0; 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, void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
const OValueRefRow& _rSelectRow, const OValueRefRow& _rSelectRow,
const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns, const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,

6
connectivity/source/inc/file/FResultSet.hxx
View File

@@ -54,8 +54,7 @@ namespace connectivity::file
css::sdbc::XCloseable, css::sdbc::XCloseable,
css::sdbc::XColumnLocate, css::sdbc::XColumnLocate,
css::lang::XServiceInfo, css::lang::XServiceInfo,
css::lang::XEventListener, css::lang::XEventListener> OResultSet_BASE;
css::lang::XUnoTunnel> OResultSet_BASE;
class OOO_DLLPUBLIC_FILE OResultSet : class OOO_DLLPUBLIC_FILE OResultSet :
public cppu::BaseMutex, 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; virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override;
// XColumnLocate // XColumnLocate
virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; 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 //XEventlistener
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;