[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc3' - 3 commits - connectivity/source
Andrzej J.R. Hunt
andrzej at ahunt.org
Tue Jul 16 02:09:36 PDT 2013
connectivity/source/drivers/firebird/FConnection.cxx | 1
connectivity/source/drivers/firebird/FConnection.hxx | 10
connectivity/source/drivers/firebird/FDatabaseMetaData.cxx | 67 +++
connectivity/source/drivers/firebird/FDriver.cxx | 100 ++--
connectivity/source/drivers/firebird/FPreparedStatement.cxx | 53 ++
connectivity/source/drivers/firebird/FResultSet.cxx | 74 +++
connectivity/source/drivers/firebird/FResultSet.hxx | 3
connectivity/source/drivers/firebird/FResultSetMetaData.cxx | 22 -
connectivity/source/drivers/firebird/FServices.cxx | 3
connectivity/source/drivers/firebird/FStatement.cxx | 17
connectivity/source/drivers/firebird/FStatement.hxx | 2
connectivity/source/drivers/firebird/FSubComponent.hxx | 227 ++++++++++
connectivity/source/drivers/firebird/OSubComponent.hxx | 254 ------------
13 files changed, 507 insertions(+), 326 deletions(-)
New commits:
commit 8c4533de8b998e896c540f20054edb2cd2ab6133
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Tue Jul 16 10:56:17 2013 +0200
Fix warnings for firebird-sdbc.
Mostly unused parameter warnings for unimplemented methods. Done in preparation
for merging to master to allow for building with -Werror.
Change-Id: Ie54f0a642189f5e221919252ec7df5897974ab95
diff --git a/connectivity/source/drivers/firebird/FConnection.cxx b/connectivity/source/drivers/firebird/FConnection.cxx
index d506d29..5cb0200 100644
--- a/connectivity/source/drivers/firebird/FConnection.cxx
+++ b/connectivity/source/drivers/firebird/FConnection.cxx
@@ -591,6 +591,7 @@ void SAL_CALL OConnection::documentEventOccured( const DocumentEvent& _Event )
// XEventListener
void SAL_CALL OConnection::disposing( const EventObject& Source ) throw (RuntimeException)
{
+ (void) Source;
}
//--------------------------------------------------------------------
void OConnection::buildTypeInfo() throw( SQLException)
diff --git a/connectivity/source/drivers/firebird/FConnection.hxx b/connectivity/source/drivers/firebird/FConnection.hxx
index 1e5168f..789b724 100644
--- a/connectivity/source/drivers/firebird/FConnection.hxx
+++ b/connectivity/source/drivers/firebird/FConnection.hxx
@@ -41,7 +41,10 @@
#include <com/sun/star/document/DocumentEvent.hpp>
#include <com/sun/star/document/XDocumentEventListener.hpp>
#include <com/sun/star/embed/XStorage.hpp>
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
+#include "connectivity/CommonTools.hxx"
+#include "FSubComponent.hxx"
+
#include "OTypeInfo.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -50,7 +53,6 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <cppuhelper/compbase4.hxx>
#include <cppuhelper/weakref.hxx>
-
#include <map>
#include <ibase.h>
@@ -77,9 +79,9 @@ namespace connectivity
class OConnection : public OBase_Mutex,
public OConnection_BASE,
- public connectivity::firebird::OSubComponent<OConnection, OConnection_BASE>
+ public connectivity::OSubComponent<OConnection, OConnection_BASE>
{
- friend class connectivity::firebird::OSubComponent<OConnection, OConnection_BASE>;
+ friend class connectivity::OSubComponent<OConnection, OConnection_BASE>;
protected:
static const OUString sDBLocation; // Location within .odb container
diff --git a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
index 5ea1aac..6852c5e 100644
--- a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
@@ -312,6 +312,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException)
{
+ (void) level;
return sal_False;
}
// -------------------------------------------------------------------------
@@ -430,6 +431,8 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQL
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(SQLException, RuntimeException)
{
+ (void) fromType;
+ (void) toType;
return sal_False;
}
// -------------------------------------------------------------------------
@@ -699,56 +702,68 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLExceptio
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException)
{
+ (void) setType;
return sal_False;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(SQLException, RuntimeException)
{
+ (void) setType;
+ (void) concurrency;
return sal_False;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
{
+ (void) setType;
return sal_False;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
{
+ (void) setType;
return sal_False;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
{
+ (void) setType;
return sal_False;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
{
+ (void) setType;
return sal_False;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
{
+ (void) setType;
return sal_False;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
{
+ (void) setType;
return sal_False;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
{
+ (void) setType;
return sal_False;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
{
+ (void) setType;
return sal_False;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
{
+ (void) setType;
return sal_False;
}
// -------------------------------------------------------------------------
@@ -823,6 +838,10 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table,
const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
{
+ (void) catalog;
+ (void) schema;
+ (void) table;
+ (void) columnNamePattern;
return NULL;
}
// -------------------------------------------------------------------------
@@ -830,6 +849,10 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern,
const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
{
+ (void) catalog;
+ (void) schemaPattern;
+ (void) tableNamePattern;
+ (void) columnNamePattern;
return NULL;
}
// -------------------------------------------------------------------------
@@ -837,6 +860,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
const Any& catalog, const ::rtl::OUString& schemaPattern,
const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException)
{
+ (void) catalog;
+ (void) types;
SAL_INFO("connectivity.firebird", "=> ODatabaseMetaData::getTables(). "
"Got called with schemaPattern: " << schemaPattern << " , "
"TableNamePattern: " << tableNamePattern);
@@ -942,6 +967,10 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
const Any& catalog, const ::rtl::OUString& schemaPattern,
const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
{
+ (void) catalog;
+ (void) schemaPattern;
+ (void) procedureNamePattern;
+ (void) columnNamePattern;
return NULL;
}
// -------------------------------------------------------------------------
@@ -949,30 +978,45 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
const Any& catalog, const ::rtl::OUString& schemaPattern,
const ::rtl::OUString& procedureNamePattern ) throw(SQLException, RuntimeException)
{
+ (void) catalog;
+ (void) schemaPattern;
+ (void) procedureNamePattern;
return NULL;
}
// -------------------------------------------------------------------------
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
{
+ (void) catalog;
+ (void) schema;
+ (void) table;
return NULL;
}
// -------------------------------------------------------------------------
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
{
+ (void) catalog;
+ (void) schema;
+ (void) table;
return NULL;
}
// -------------------------------------------------------------------------
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
{
+ (void) catalog;
+ (void) schema;
+ (void) table;
return NULL;
}
// -------------------------------------------------------------------------
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
{
+ (void) catalog;
+ (void) schema;
+ (void) table;
return NULL;
}
// -------------------------------------------------------------------------
@@ -980,6 +1024,11 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table,
sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException)
{
+ (void) catalog;
+ (void) schema;
+ (void) table;
+ (void) unique;
+ (void) approximate;
return NULL;
}
// -------------------------------------------------------------------------
@@ -987,12 +1036,20 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope,
sal_Bool nullable ) throw(SQLException, RuntimeException)
{
+ (void) catalog;
+ (void) schema;
+ (void) table;
+ (void) scope;
+ (void) nullable;
return NULL;
}
// -------------------------------------------------------------------------
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(SQLException, RuntimeException)
{
+ (void) catalog;
+ (void) schemaPattern;
+ (void) tableNamePattern;
return NULL;
}
// -------------------------------------------------------------------------
@@ -1001,11 +1058,21 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
const ::rtl::OUString& primaryTable, const Any& foreignCatalog,
const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(SQLException, RuntimeException)
{
+ (void) primaryCatalog;
+ (void) primarySchema;
+ (void) primaryTable;
+ (void) foreignCatalog;
+ (void) foreignSchema;
+ (void) foreignTable;
return NULL;
}
// -------------------------------------------------------------------------
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException)
{
+ (void) catalog;
+ (void) schemaPattern;
+ (void) typeNamePattern;
+ (void) types;
OSL_FAIL("Not implemented yet!");
throw SQLException();
return NULL;
diff --git a/connectivity/source/drivers/firebird/FPreparedStatement.cxx b/connectivity/source/drivers/firebird/FPreparedStatement.cxx
index 3a285c2..8d8a06a 100644
--- a/connectivity/source/drivers/firebird/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/FPreparedStatement.cxx
@@ -63,7 +63,7 @@ IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.firebird.PreparedS
* 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", "=> OPreparedStatement static pr_error().");
@@ -80,9 +80,9 @@ static int pr_error (const ISC_STATUS* status, char* operation)
OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const TTypeInfoVector& _TypeInfo,const ::rtl::OUString& sql)
:OStatement_BASE2(_pConnection)
,m_aTypeInfo(_TypeInfo)
- ,m_bPrepared(sal_False)
- ,m_sSqlStatement(sql)
,m_nNumParams(0)
+ ,m_sSqlStatement(sql)
+ ,m_bPrepared(sal_False)
{
SAL_INFO("connectivity.firebird", "=> OPreparedStatement::OPreparedStatement_BASE(). "
"sql: " << sql);
@@ -260,6 +260,8 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLE
void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -267,6 +269,8 @@ void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool
// -------------------------------------------------------------------------
void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -276,6 +280,8 @@ void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x
void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& aData ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) aData;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -285,6 +291,8 @@ void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date&
void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const Time& aVal ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) aVal;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -293,6 +301,8 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const Time&
void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& aVal ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) aVal;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -301,6 +311,8 @@ void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const
void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -310,6 +322,8 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x
void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -318,6 +332,8 @@ void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x )
void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -326,6 +342,8 @@ void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x
void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 aVal ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) aVal;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -334,6 +352,8 @@ void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 a
void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) sqlType;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -342,6 +362,8 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 s
void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -350,6 +372,8 @@ void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Refer
void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -358,6 +382,8 @@ void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Refer
void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -366,6 +392,8 @@ void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Refe
void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -374,6 +402,10 @@ void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Refere
void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) x;
+ (void) sqlType;
+ (void) scale;
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
::osl::MutexGuard aGuard( m_aMutex );
@@ -382,6 +414,9 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c
void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) sqlType;
+ (void) typeName;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -390,6 +425,8 @@ void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_I
void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -398,6 +435,8 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any
void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -406,6 +445,8 @@ void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16
void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -415,6 +456,9 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequ
void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) x;
+ (void) length;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -423,6 +467,9 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex,
void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
{
+ (void) parameterIndex;
+ (void) x;
+ (void) length;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/firebird/FResultSet.cxx b/connectivity/source/drivers/firebird/FResultSet.cxx
index 66ac517..4af4698 100644
--- a/connectivity/source/drivers/firebird/FResultSet.cxx
+++ b/connectivity/source/drivers/firebird/FResultSet.cxx
@@ -58,7 +58,7 @@ using namespace com::sun::star::util;
* 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", "=> OResultSet static pr_error().");
@@ -101,10 +101,10 @@ sal_Bool SAL_CALL OResultSet::supportsService( const ::rtl::OUString& _rServiceN
OResultSet::OResultSet(OStatement_Base* pStmt)
: OResultSet_BASE(m_aMutex)
,OPropertySetHelper(OResultSet_BASE::rBHelper)
+ ,m_pStatement(pStmt)
,m_aStatement((OWeakObject*)pStmt)
,m_xMetaData(NULL)
,m_nTextEncoding(pStmt->getOwnConnection()->getTextEncoding())
- ,m_pStatement(pStmt)
,m_bWasNull(sal_True)
,m_row(-1)
{
@@ -204,6 +204,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const ::rtl::OUString& columnName ) t
// -------------------------------------------------------------------------
Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -213,6 +214,7 @@ Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 column
// -------------------------------------------------------------------------
Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -223,6 +225,7 @@ Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 col
// -------------------------------------------------------------------------
sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -232,6 +235,7 @@ sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLExcep
sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -243,7 +247,7 @@ sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLExceptio
Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
-
+ (void) columnIndex;
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
::osl::MutexGuard aGuard( m_aMutex );
@@ -253,6 +257,7 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) thro
Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -264,6 +269,7 @@ Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, R
double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -275,6 +281,7 @@ double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLExceptio
float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -286,6 +293,7 @@ float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException,
sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -305,6 +313,7 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException)
sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -325,6 +334,7 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLEx
// -------------------------------------------------------------------------
Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -335,6 +345,7 @@ Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) throw
Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -343,6 +354,7 @@ Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) throw(S
// -------------------------------------------------------------------------
Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -352,6 +364,7 @@ Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 columnIndex ) throw(S
Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -361,6 +374,8 @@ Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) throw(SQL
Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) typeMap;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -393,6 +408,7 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLExcept
Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
::osl::MutexGuard aGuard( m_aMutex );
@@ -405,6 +421,7 @@ Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, R
DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -669,6 +686,7 @@ void SAL_CALL OResultSet::moveToCurrentRow( ) throw(SQLException, RuntimeExcept
void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
}
@@ -676,6 +694,8 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException
void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -683,6 +703,8 @@ void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) thr
// -------------------------------------------------------------------------
void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) x;
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
::osl::MutexGuard aGuard( m_aMutex );
@@ -691,6 +713,8 @@ void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(
void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -698,6 +722,8 @@ void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) thro
// -------------------------------------------------------------------------
void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) x;
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
::osl::MutexGuard aGuard( m_aMutex );
@@ -705,6 +731,8 @@ void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(
// -------------------------------------------------------------------------
void SAL_CALL OResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -712,6 +740,8 @@ void SAL_CALL OResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw
// -----------------------------------------------------------------------
void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -720,6 +750,8 @@ void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQ
void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -727,6 +759,8 @@ void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(
// -------------------------------------------------------------------------
void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -734,6 +768,8 @@ void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const ::rtl::OUSt
// -------------------------------------------------------------------------
void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -741,6 +777,8 @@ void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sa
// -------------------------------------------------------------------------
void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const Date& x ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -749,6 +787,8 @@ void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const Date& x ) thr
void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const Time& x ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -757,6 +797,8 @@ void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const Time& x ) thr
void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const DateTime& x ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -765,6 +807,9 @@ void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const DateTime
void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) x;
+ (void) length;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -772,6 +817,9 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer
// -------------------------------------------------------------------------
void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) x;
+ (void) length;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -786,6 +834,8 @@ void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException)
// -------------------------------------------------------------------------
void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) x;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -794,6 +844,9 @@ void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) th
void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 scale ) throw(SQLException, RuntimeException)
{
+ (void) columnIndex;
+ (void) x;
+ (void) scale;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -812,6 +865,7 @@ Any SAL_CALL OResultSet::getBookmark( ) throw( SQLException, RuntimeException)
// -------------------------------------------------------------------------
sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException)
{
+ (void) bookmark;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -820,18 +874,21 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw( SQLE
// -------------------------------------------------------------------------
sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException)
{
+ (void) bookmark;
+ (void) rows;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
return sal_False;
}
// -------------------------------------------------------------------------
-sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& first, const Any& second ) throw( SQLException, RuntimeException)
+sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& aFirst, const Any& aSecond ) throw( SQLException, RuntimeException)
{
+ (void) aFirst;
+ (void) aSecond;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
-
return CompareBookmark::NOT_EQUAL;
}
// -------------------------------------------------------------------------
@@ -842,12 +899,14 @@ sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) throw( SQLException, Runt
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& bookmark ) throw( SQLException, RuntimeException)
{
+ (void) bookmark;
throw SQLException();
}
// -------------------------------------------------------------------------
// XDeleteRows
Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& rows ) throw( SQLException, RuntimeException)
{
+ (void) rows;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -881,6 +940,9 @@ sal_Bool OResultSet::convertFastPropertyValue(
const Any& rValue )
throw (::com::sun::star::lang::IllegalArgumentException)
{
+ (void) rConvertedValue;
+ (void) rOldValue;
+ (void) rValue;
switch(nHandle)
{
case PROPERTY_ID_ISBOOKMARKABLE:
@@ -903,6 +965,7 @@ void OResultSet::setFastPropertyValue_NoBroadcast(
)
throw (Exception)
{
+ (void) rValue;
switch(nHandle)
{
case PROPERTY_ID_ISBOOKMARKABLE:
@@ -925,6 +988,7 @@ void OResultSet::getFastPropertyValue(
sal_Int32 nHandle
) const
{
+ (void) rValue;
switch(nHandle)
{
case PROPERTY_ID_ISBOOKMARKABLE:
diff --git a/connectivity/source/drivers/firebird/FResultSet.hxx b/connectivity/source/drivers/firebird/FResultSet.hxx
index bc9b3c1..a27098b 100644
--- a/connectivity/source/drivers/firebird/FResultSet.hxx
+++ b/connectivity/source/drivers/firebird/FResultSet.hxx
@@ -49,7 +49,7 @@
#include <com/sun/star/sdbcx/XDeleteRows.hpp>
#include <cppuhelper/compbase12.hxx>
#include "FStatement.hxx"
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
#include <ibase.h>
diff --git a/connectivity/source/drivers/firebird/FResultSetMetaData.cxx b/connectivity/source/drivers/firebird/FResultSetMetaData.cxx
index 3b02d09..f756bc0 100644
--- a/connectivity/source/drivers/firebird/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/firebird/FResultSetMetaData.cxx
@@ -40,6 +40,7 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::sdbc;
+
// -------------------------------------------------------------------------
OResultSetMetaData::~OResultSetMetaData()
{
@@ -48,12 +49,14 @@ OResultSetMetaData::~OResultSetMetaData()
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return 50;
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
sal_Int32 nType = 0;
return nType;
}
@@ -68,55 +71,65 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, Ru
sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return sal_True;
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return ::rtl::OUString();
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return ::rtl::OUString("Column") + ::rtl::OUString::valueOf(column);
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return ::rtl::OUString();
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return ::rtl::OUString();
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return ::rtl::OUString();
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return ::rtl::OUString();
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return ::rtl::OUString();
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return sal_False;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return sal_False;
}
// -------------------------------------------------------------------------
@@ -124,46 +137,53 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(
sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return sal_False;
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return 0;
}
// -----------------------------------------------------------------------------
sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
+ (void) column;
return 0;
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return 0;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return sal_True;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return sal_True;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return sal_False;
-;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
{
+ (void) column;
return sal_False;
}
// -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/firebird/FServices.cxx b/connectivity/source/drivers/firebird/FServices.cxx
index 42f34c5..9bda80f 100644
--- a/connectivity/source/drivers/firebird/FServices.cxx
+++ b/connectivity/source/drivers/firebird/FServices.cxx
@@ -74,7 +74,7 @@ void REGISTER_PROVIDER(
Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
OSL_ENSURE(xNewKey.is(), "FIREBIRD::component_writeInfo : could not create a registry key !");
- for (sal_uInt32 i=0; i<Services.getLength(); ++i)
+ for (sal_Int32 i=0; i<Services.getLength(); ++i)
xNewKey->createKey(Services[i]);
}
@@ -123,6 +123,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL firebird_sdbc_component_getFactor
void* pServiceManager,
void* pRegistryKey)
{
+ (void) pRegistryKey;
void* pRet = 0;
if (pServiceManager)
{
diff --git a/connectivity/source/drivers/firebird/FStatement.hxx b/connectivity/source/drivers/firebird/FStatement.hxx
index 7ec28a0..824d0a3 100644
--- a/connectivity/source/drivers/firebird/FStatement.hxx
+++ b/connectivity/source/drivers/firebird/FStatement.hxx
@@ -46,7 +46,7 @@
#include <cppuhelper/compbase5.hxx>
#include "FConnection.hxx"
#include <list>
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
#include <com/sun/star/lang/XServiceInfo.hpp>
namespace connectivity
diff --git a/connectivity/source/drivers/firebird/OSubComponent.hxx b/connectivity/source/drivers/firebird/FSubComponent.hxx
similarity index 81%
rename from connectivity/source/drivers/firebird/OSubComponent.hxx
rename to connectivity/source/drivers/firebird/FSubComponent.hxx
index 99bda53..2d98bc0 100644
--- a/connectivity/source/drivers/firebird/OSubComponent.hxx
+++ b/connectivity/source/drivers/firebird/FSubComponent.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef _CONNECTIVITY_OSUBCOMPONENT_HXX_
-#define _CONNECTIVITY_OSUBCOMPONENT_HXX_
+#ifndef _CONNECTIVITY_FSUBCOMPONENT_HXX_
+#define _CONNECTIVITY_FSUBCOMPONENT_HXX_
#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.h>
@@ -219,36 +219,9 @@ namespace connectivity
}
-#define DECLARE_SERVICE_INFO() \
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
-
-#define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname) \
- ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \
- { \
- return ::rtl::OUString::createFromAscii(implasciiname); \
- } \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
- { \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \
- aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \
- return aSupported; \
- } \
- sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \
- { \
- Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \
- const ::rtl::OUString* pSupported = aSupported.getConstArray(); \
- const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); \
- for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) \
- ; \
- \
- return pSupported != pEnd; \
- } \
-
}
}
-#endif // _CONNECTIVITY_OSUBCOMPONENT_HXX_
+#endif // _CONNECTIVITY_FSUBCOMPONENT_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 0bd376c30e89bf0febf0c83abca882f90f674c80
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Tue Jul 16 09:18:35 2013 +0200
Remove warnings for FStatement.
Change-Id: I2969f9d7b6d5757d78aea6f9ec5602f66fd73836
diff --git a/connectivity/source/drivers/firebird/FResultSet.hxx b/connectivity/source/drivers/firebird/FResultSet.hxx
index e1e6fd9..bc9b3c1 100644
--- a/connectivity/source/drivers/firebird/FResultSet.hxx
+++ b/connectivity/source/drivers/firebird/FResultSet.hxx
@@ -109,6 +109,7 @@ namespace connectivity
const ::com::sun::star::uno::Any& rValue
)
throw (::com::sun::star::uno::Exception);
+ using cppu::OPropertySetHelper::getFastPropertyValue;
virtual void SAL_CALL getFastPropertyValue(
::com::sun::star::uno::Any& rValue,
sal_Int32 nHandle
diff --git a/connectivity/source/drivers/firebird/FStatement.cxx b/connectivity/source/drivers/firebird/FStatement.cxx
index 4b16275..7823380 100644
--- a/connectivity/source/drivers/firebird/FStatement.cxx
+++ b/connectivity/source/drivers/firebird/FStatement.cxx
@@ -64,7 +64,7 @@ using namespace com::sun::star::util;
* 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)
{
printf("[\n");
printf("PROBLEM ON \"%s\".\n", operation);
@@ -82,8 +82,8 @@ static int pr_error (const ISC_STATUS* status, char* operation)
OStatement_Base::OStatement_Base(OConnection* _pConnection )
: OStatement_BASE(m_aMutex),
OPropertySetHelper(OStatement_BASE::rBHelper),
- rBHelper(OStatement_BASE::rBHelper),
- m_pConnection(_pConnection)
+ m_pConnection(_pConnection),
+ rBHelper(OStatement_BASE::rBHelper)
{
m_pConnection->acquire();
@@ -102,7 +102,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
m_INsqlda->sqln = 10;
m_INsqlda->sqld = 0;
- m_STMTHandler = NULL; // Set handle to NULL before allocation.
+ m_STMTHandler = 0; // Set handle to NULL before allocation.
if (isc_dsql_allocate_statement(status, &db, &m_STMTHandler))
if (pr_error(status, "allocate statement"))
return;
@@ -235,7 +235,7 @@ sal_Bool SAL_CALL OStatement_Base::execute( const ::rtl::OUString& sql ) throw(S
if (isc_commit_transaction(status, &m_TRANSHandler))
if (pr_error(status, "commit transaction"))
- return NULL;
+ return sal_False;
// returns true when a resultset is available
return sal_False;
@@ -435,6 +435,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException,
sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
{
+ (void) sql;
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -520,6 +521,10 @@ sal_Bool OStatement_Base::convertFastPropertyValue(
const Any& rValue )
throw (::com::sun::star::lang::IllegalArgumentException)
{
+ (void) rConvertedValue;
+ (void) rOldValue;
+ (void) nHandle;
+ (void) rValue;
sal_Bool bConverted = sal_False;
// here we have to try to convert
return bConverted;
@@ -527,6 +532,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue(
// -------------------------------------------------------------------------
void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
{
+ (void) rValue;
// set the value to what ever is necessary
switch(nHandle)
{
@@ -547,6 +553,7 @@ void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const A
// -------------------------------------------------------------------------
void OStatement_Base::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
{
+ (void) rValue;
switch(nHandle)
{
case PROPERTY_ID_QUERYTIMEOUT:
commit 3cff61ff5611a3d6bfdf40713ea0e820211e3811
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Tue Jul 16 08:59:59 2013 +0200
Correct firebird-sdbc version number, cleanup FDriver.
Change-Id: I9b9f13d312667ad2649ecd8f7288db5413d029a7
diff --git a/connectivity/source/drivers/firebird/FDriver.cxx b/connectivity/source/drivers/firebird/FDriver.cxx
index 1b4faf6..be2c3d3 100644
--- a/connectivity/source/drivers/firebird/FDriver.cxx
+++ b/connectivity/source/drivers/firebird/FDriver.cxx
@@ -48,14 +48,16 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::sdbc;
+using namespace ::osl;
+
using namespace connectivity::firebird;
namespace connectivity
{
namespace firebird
{
- //------------------------------------------------------------------
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL FirebirdDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception )
+ Reference< XInterface > SAL_CALL FirebirdDriver_CreateInstance(
+ const Reference< XMultiServiceFactory >& _rxFactory) throw( Exception )
{
SAL_INFO("connectivity.firebird", "=> ODriver_BASE::FirebirdDriver_CreateInstance()" );
(void) _rxFactory;
@@ -63,15 +65,15 @@ namespace connectivity
}
}
}
-// --------------------------------------------------------------------------------
+
FirebirdDriver::FirebirdDriver()
: ODriver_BASE(m_aMutex)
{
}
-// --------------------------------------------------------------------------------
+
void FirebirdDriver::disposing()
{
- ::osl::MutexGuard aGuard(m_aMutex);
+ MutexGuard aGuard(m_aMutex);
// when driver will be destroied so all our connections have to be destroied as well
for (OWeakRefArray::iterator i = m_xConnections.begin(); m_xConnections.end() != i; ++i)
@@ -85,56 +87,53 @@ void FirebirdDriver::disposing()
ODriver_BASE::disposing();
}
-// static ServiceInfo
-//------------------------------------------------------------------------------
-rtl::OUString FirebirdDriver::getImplementationName_Static( ) throw(RuntimeException)
+//----- static ServiceInfo ---------------------------------------------------
+rtl::OUString FirebirdDriver::getImplementationName_Static() throw(RuntimeException)
{
return rtl::OUString("com.sun.star.comp.sdbc.firebird.Driver");
- // this name is referenced in the configuration and in the firebird.xml
- // Please take care when changing it.
}
-//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > FirebirdDriver::getSupportedServiceNames_Static( ) throw (RuntimeException)
+
+Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() throw (RuntimeException)
{
- // which service is supported
- // for more information @see com.sun.star.sdbc.Driver
- Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver");
+ // TODO: add com.sun.star.sdbcx.Driver once all sdbc functionality is implemented
+ Sequence< OUString > aSNS( 1 );
+ aSNS[0] = OUString("com.sun.star.sdbc.Driver");
return aSNS;
}
-//------------------------------------------------------------------
-::rtl::OUString SAL_CALL FirebirdDriver::getImplementationName( ) throw(RuntimeException)
+OUString SAL_CALL FirebirdDriver::getImplementationName() throw(RuntimeException)
{
return getImplementationName_Static();
}
-//------------------------------------------------------------------
-sal_Bool SAL_CALL FirebirdDriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
+sal_Bool SAL_CALL FirebirdDriver::supportsService(const OUString& _rServiceName)
+ throw(RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
- const ::rtl::OUString* pSupported = aSupported.getConstArray();
- const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+ Sequence< OUString > aSupported(getSupportedServiceNames());
+ const OUString* pSupported = aSupported.getConstArray();
+ const OUString* pEnd = pSupported + aSupported.getLength();
for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
;
return pSupported != pEnd;
}
-//------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL FirebirdDriver::getSupportedServiceNames( ) throw(RuntimeException)
+Sequence< OUString > SAL_CALL FirebirdDriver::getSupportedServiceNames()
+ throw(RuntimeException)
{
return getSupportedServiceNames_Static();
}
-// --------------------------------------------------------------------------------
-Reference< XConnection > SAL_CALL FirebirdDriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
+// ---- XDriver -------------------------------------------------------------
+Reference< XConnection > SAL_CALL FirebirdDriver::connect(
+ const OUString& url, const Sequence< PropertyValue >& info )
+ throw(SQLException, RuntimeException)
{
Reference< XConnection > xConnection;
SAL_INFO("connectivity.firebird", "=> ODriver_BASE::connect(), URL: " << url );
- ::osl::MutexGuard aGuard( m_aMutex );
+ MutexGuard aGuard( m_aMutex );
if (ODriver_BASE::rBHelper.bDisposed)
throw DisposedException();
@@ -149,14 +148,16 @@ Reference< XConnection > SAL_CALL FirebirdDriver::connect( const ::rtl::OUString
return xCon;
}
-// --------------------------------------------------------------------------------
-sal_Bool SAL_CALL FirebirdDriver::acceptsURL( const ::rtl::OUString& url )
- throw(SQLException, RuntimeException)
+
+sal_Bool SAL_CALL FirebirdDriver::acceptsURL( const OUString& url )
+ throw(SQLException, RuntimeException)
{
return url.equals("sdbc:embedded:firebird") || url.startsWith("sdbc:firebird:");
}
-// --------------------------------------------------------------------------------
-Sequence< DriverPropertyInfo > SAL_CALL FirebirdDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
+
+Sequence< DriverPropertyInfo > SAL_CALL FirebirdDriver::getPropertyInfo(
+ const OUString& url, const Sequence< PropertyValue >& info )
+ throw(SQLException, RuntimeException)
{
(void) info;
if ( ! acceptsURL(url) )
@@ -164,34 +165,31 @@ Sequence< DriverPropertyInfo > SAL_CALL FirebirdDriver::getPropertyInfo( const :
::connectivity::SharedResources aResources;
const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
::dbtools::throwGenericSQLException(sMessage ,*this);
- } // if ( ! acceptsURL(url) )
+ }
- // if you have somthing special to say, return it here :-)
return Sequence< DriverPropertyInfo >();
}
-// --------------------------------------------------------------------------------
+
sal_Int32 SAL_CALL FirebirdDriver::getMajorVersion( ) throw(RuntimeException)
{
- return 0; // depends on you
+ // The major and minor version are sdbc driver specific. Must begin with 1.0
+ // as per http://api.libreoffice.org/docs/common/ref/com/sun/star/sdbc/XDriver.html
+ return 1;
}
-// --------------------------------------------------------------------------------
+
sal_Int32 SAL_CALL FirebirdDriver::getMinorVersion( ) throw(RuntimeException)
{
- return 1; // depends on you
+ return 0;
}
-// --------------------------------------------------------------------------------
-//.........................................................................
+
namespace connectivity
{
namespace firebird
{
-//.........................................................................
- void release(oslInterlockedCount& _refCount,
- ::cppu::OBroadcastHelper& rBHelper,
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
- ::com::sun::star::lang::XComponent* _pObject)
+ void release(oslInterlockedCount& _refCount, ::cppu::OBroadcastHelper& rBHelper,
+ Reference< XInterface >& _xInterface, XComponent* _pObject)
{
if (osl_atomic_decrement( &_refCount ) == 0)
{
@@ -200,9 +198,9 @@ namespace connectivity
if (!rBHelper.bDisposed && !rBHelper.bInDispose)
{
// remember the parent
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xParent;
+ Reference< XInterface > xParent;
{
- ::osl::MutexGuard aGuard( rBHelper.rMutex );
+ MutexGuard aGuard( rBHelper.rMutex );
xParent = _xInterface;
_xInterface = NULL;
}
@@ -216,7 +214,7 @@ namespace connectivity
// release the parent in the ~
if (xParent.is())
{
- ::osl::MutexGuard aGuard( rBHelper.rMutex );
+ MutexGuard aGuard( rBHelper.rMutex );
_xInterface = xParent;
}
}
@@ -231,9 +229,9 @@ namespace connectivity
throw DisposedException();
}
-//.........................................................................
+
}
} // namespace connectivity
-//.........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list