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

Explicit close/disposing.

Browse Source 
Change-Id: Idcd89bd5f879a38f4c06f3602313672fb20bd098
This commit is contained in:
Andrzej J.R. Hunt
2013-08-07 22:37:59 +01:00
parent 6044f52c5e
commit 6e11164d57
4 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
connectivity/source/drivers/firebird/PreparedStatement.cxx
View File

@@ -177,14 +177,14 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData()
void SAL_CALL OPreparedStatement::close() throw(SQLException, RuntimeException)
{
SAL_INFO("connectivity.firebird", "close()");
MutexGuard aGuard( m_pConnection->getMutex() );
checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
OStatementCommonBase::close();
}
void SAL_CALL OPreparedStatement::disposing()
{
close();
}
void SAL_CALL OPreparedStatement::setString(sal_Int32 nParameterIndex,
const OUString& x)
throw(SQLException, RuntimeException)

7
connectivity/source/drivers/firebird/PreparedStatement.hxx
View File

@@ -154,7 +154,12 @@ namespace connectivity
::com::sun::star::uno::RuntimeException);
// XCloseable
virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL close()
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
// OComponentHelper
virtual void SAL_CALL disposing();
// XResultSetMetaDataSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);

9
connectivity/source/drivers/firebird/Statement.cxx
View File

@@ -181,4 +181,13 @@ uno::Sequence< Type > SAL_CALL OStatement::getTypes()
OStatementCommonBase::getTypes());
}
void SAL_CALL OStatement::close() throw(SQLException, RuntimeException)
{
OStatementCommonBase::close();
}
void SAL_CALL OStatement::disposing()
{
close();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

7
connectivity/source/drivers/firebird/Statement.hxx
View File

@@ -77,6 +77,13 @@ namespace connectivity
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
getTypes()
throw(::com::sun::star::uno::RuntimeException);
// XCloseable
virtual void SAL_CALL close()
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
// OComponentHelper
virtual void SAL_CALL disposing();
};
}