[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc2' - connectivity/source
Andrzej J.R. Hunt
andrzej at ahunt.org
Thu Jul 11 12:19:31 PDT 2013
connectivity/source/drivers/firebird/FConnection.cxx | 19 ++++++------
connectivity/source/drivers/firebird/FConnection.hxx | 6 +--
connectivity/source/drivers/firebird/FPreparedStatement.hxx | 3 +
connectivity/source/drivers/firebird/FStatement.hxx | 1
4 files changed, 18 insertions(+), 11 deletions(-)
New commits:
commit 9849301c48c552820a4929ac1406a5da293712b3
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Thu Jul 11 20:15:41 2013 +0100
Cleanup warnings in FConnection.
Unused parameter warnings remain as these methods are still to be implemented.
Change-Id: I38ec0a895112766ecae322fdf9c07dea11e60c59
diff --git a/connectivity/source/drivers/firebird/FConnection.cxx b/connectivity/source/drivers/firebird/FConnection.cxx
index 8c81847..5576d1f 100644
--- a/connectivity/source/drivers/firebird/FConnection.cxx
+++ b/connectivity/source/drivers/firebird/FConnection.cxx
@@ -82,20 +82,23 @@ using namespace com::sun::star::sdbc;
using namespace com::sun::star::uno;
OConnection::OConnection(FirebirdDriver* _pDriver)
- : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this),
- OMetaConnection_BASE(m_aMutex),
+ :OMetaConnection_BASE(m_aMutex),
+ OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this),
+ m_xMetaData(NULL),
+ m_bIsEmbedded(sal_False),
+ m_aURL(),
+ m_sUser(),
m_pDriver(_pDriver),
m_bClosed(sal_False),
- m_xMetaData(NULL),
m_bUseCatalog(sal_False),
- m_bUseOldDateFormat(sal_False)
+ m_bUseOldDateFormat(sal_False),
+ m_DBHandler(0)
{
SAL_INFO("connectivity.firebird", "=> OConnection::OConnection().");
m_pDriver->acquire();
- m_DBHandler = NULL;
}
-//-----------------------------------------------------------------------------
+
OConnection::~OConnection()
{
SAL_INFO("connectivity.firebird", "=> OConnection::~OConnection().");
@@ -105,7 +108,7 @@ OConnection::~OConnection()
m_pDriver->release();
m_pDriver = NULL;
}
-//-----------------------------------------------------------------------------
+
void SAL_CALL OConnection::release() throw()
{
SAL_INFO("connectivity.firebird", "=> OConnection::release().");
@@ -118,7 +121,7 @@ void SAL_CALL OConnection::release() throw()
/* Print the status, the SQLCODE, and exit.
* Also, indicate which operation the error occured on.
*/
-static int pr_error(const ISC_STATUS* status, char* operation)
+static int pr_error(const ISC_STATUS* status, const char* operation)
{
SAL_WARN("connectivity.firebird", "=> OConnection static pr_error().");
diff --git a/connectivity/source/drivers/firebird/FConnection.hxx b/connectivity/source/drivers/firebird/FConnection.hxx
index d6f284b..e72bb19 100644
--- a/connectivity/source/drivers/firebird/FConnection.hxx
+++ b/connectivity/source/drivers/firebird/FConnection.hxx
@@ -98,20 +98,20 @@ namespace connectivity
::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by
// an operation
- bool m_bIsEmbedded;
+ sal_Bool m_bIsEmbedded;
::rtl::OUString m_aURL; // URL of connection
// or file path
::rtl::OUString m_sUser; // the user name
FirebirdDriver* m_pDriver; // Pointer to the owning
// driver object
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xEmbeddedStorage;
-
sal_Bool m_bClosed;
sal_Bool m_bUseCatalog; // should we use the catalog on filebased databases
sal_Bool m_bUseOldDateFormat;
isc_db_handle m_DBHandler;
+ ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xEmbeddedStorage;
+
void buildTypeInfo() throw( ::com::sun::star::sdbc::SQLException);
public:
diff --git a/connectivity/source/drivers/firebird/FPreparedStatement.hxx b/connectivity/source/drivers/firebird/FPreparedStatement.hxx
index d6c6fb0..f1b7854 100644
--- a/connectivity/source/drivers/firebird/FPreparedStatement.hxx
+++ b/connectivity/source/drivers/firebird/FPreparedStatement.hxx
@@ -107,8 +107,11 @@ namespace connectivity
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException);
// XPreparedStatement
+ using OStatement_Base::executeQuery;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ using OStatement_Base::executeUpdate;
virtual sal_Int32 SAL_CALL executeUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ using OStatement_Base::execute;
virtual sal_Bool SAL_CALL execute( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
// XParameters
diff --git a/connectivity/source/drivers/firebird/FStatement.hxx b/connectivity/source/drivers/firebird/FStatement.hxx
index ba7fa0d..7ec28a0 100644
--- a/connectivity/source/drivers/firebird/FStatement.hxx
+++ b/connectivity/source/drivers/firebird/FStatement.hxx
@@ -89,6 +89,7 @@ namespace connectivity
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
// OPropertySetHelper
+ using OPropertySetHelper::getFastPropertyValue;
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
virtual sal_Bool SAL_CALL convertFastPropertyValue(
::com::sun::star::uno::Any & rConvertedValue,
More information about the Libreoffice-commits
mailing list