Kaydet (Commit) a3818b52 authored tarafından Andrzej J.R. Hunt's avatar Andrzej J.R. Hunt

Cleanup warnings in FConnection.

Unused parameter warnings remain as these methods are still to be implemented.

Change-Id: I38ec0a895112766ecae322fdf9c07dea11e60c59
üst fcfe056f
...@@ -82,20 +82,23 @@ using namespace com::sun::star::sdbc; ...@@ -82,20 +82,23 @@ using namespace com::sun::star::sdbc;
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
OConnection::OConnection(FirebirdDriver* _pDriver) 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_pDriver(_pDriver),
m_bClosed(sal_False), m_bClosed(sal_False),
m_xMetaData(NULL),
m_bUseCatalog(sal_False), m_bUseCatalog(sal_False),
m_bUseOldDateFormat(sal_False) m_bUseOldDateFormat(sal_False),
m_DBHandler(0)
{ {
SAL_INFO("connectivity.firebird", "=> OConnection::OConnection()."); SAL_INFO("connectivity.firebird", "=> OConnection::OConnection().");
m_pDriver->acquire(); m_pDriver->acquire();
m_DBHandler = NULL;
} }
//-----------------------------------------------------------------------------
OConnection::~OConnection() OConnection::~OConnection()
{ {
SAL_INFO("connectivity.firebird", "=> OConnection::~OConnection()."); SAL_INFO("connectivity.firebird", "=> OConnection::~OConnection().");
...@@ -105,7 +108,7 @@ OConnection::~OConnection() ...@@ -105,7 +108,7 @@ OConnection::~OConnection()
m_pDriver->release(); m_pDriver->release();
m_pDriver = NULL; m_pDriver = NULL;
} }
//-----------------------------------------------------------------------------
void SAL_CALL OConnection::release() throw() void SAL_CALL OConnection::release() throw()
{ {
SAL_INFO("connectivity.firebird", "=> OConnection::release()."); SAL_INFO("connectivity.firebird", "=> OConnection::release().");
...@@ -118,7 +121,7 @@ void SAL_CALL OConnection::release() throw() ...@@ -118,7 +121,7 @@ void SAL_CALL OConnection::release() throw()
/* Print the status, the SQLCODE, and exit. /* Print the status, the SQLCODE, and exit.
* Also, indicate which operation the error occured on. * 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()."); SAL_WARN("connectivity.firebird", "=> OConnection static pr_error().");
......
...@@ -98,20 +98,20 @@ namespace connectivity ...@@ -98,20 +98,20 @@ namespace connectivity
::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by ::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by
// an operation // an operation
bool m_bIsEmbedded; sal_Bool m_bIsEmbedded;
::rtl::OUString m_aURL; // URL of connection ::rtl::OUString m_aURL; // URL of connection
// or file path // or file path
::rtl::OUString m_sUser; // the user name ::rtl::OUString m_sUser; // the user name
FirebirdDriver* m_pDriver; // Pointer to the owning FirebirdDriver* m_pDriver; // Pointer to the owning
// driver object // driver object
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xEmbeddedStorage;
sal_Bool m_bClosed; sal_Bool m_bClosed;
sal_Bool m_bUseCatalog; // should we use the catalog on filebased databases sal_Bool m_bUseCatalog; // should we use the catalog on filebased databases
sal_Bool m_bUseOldDateFormat; sal_Bool m_bUseOldDateFormat;
isc_db_handle m_DBHandler; 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); void buildTypeInfo() throw( ::com::sun::star::sdbc::SQLException);
public: public:
......
...@@ -107,8 +107,11 @@ namespace connectivity ...@@ -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); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException);
// XPreparedStatement // 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); 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); 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 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); 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 // XParameters
......
...@@ -89,6 +89,7 @@ namespace connectivity ...@@ -89,6 +89,7 @@ namespace connectivity
// OPropertyArrayUsageHelper // OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
// OPropertySetHelper // OPropertySetHelper
using OPropertySetHelper::getFastPropertyValue;
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
virtual sal_Bool SAL_CALL convertFastPropertyValue( virtual sal_Bool SAL_CALL convertFastPropertyValue(
::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rConvertedValue,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment