[Libreoffice-commits] core.git: 55 commits - config_host.mk.in configure.ac connectivity/Configuration_firebird.mk connectivity/Library_firebird_sdbc.mk connectivity/Module_connectivity.mk connectivity/registry connectivity/source cppunit/unxlngx6 dbaccess/Library_dba.mk dbaccess/source download.lst firebird/ExternalPackage_firebird.mk firebird/ExternalProject_firebird.mk firebird/firebird-cygwin-msvc.patch.1 firebird/firebird-icu.patch.1 firebird/firebird-macosx.patch.1 firebird/Makefile firebird/Module_firebird.mk firebird/UnpackedTarball_firebird.mk include/sal libatomic_ops/ExternalPackage_libatomic_ops.mk libatomic_ops/ExternalProject_libatomic_ops.mk libatomic_ops/Makefile libatomic_ops/Module_libatomic_ops.mk libatomic_ops/README libatomic_ops/UnpackedTarball_libatomic_ops.mk Library_merged.mk Makefile.fetch postprocess/CustomTarget_images.mk postprocess/CustomTarget_registry.mk postprocess/Rdb_services.mk RepositoryExternal.mk Repository.mk RepositoryModule_build.mk RepositoryModu le_host.mk scp2/InstallModule_firebird.mk scp2/InstallScript_setup_osl.mk scp2/Module_scp2.mk scp2/source setup_native/source solenv/bin
Andrzej J.R. Hunt
andrzej at ahunt.org
Tue Jul 16 07:43:19 PDT 2013
Library_merged.mk | 2
Makefile.fetch | 2
Repository.mk | 1
RepositoryExternal.mk | 101
RepositoryModule_build.mk | 1
RepositoryModule_host.mk | 2
config_host.mk.in | 7
configure.ac | 87
connectivity/Configuration_firebird.mk | 20
connectivity/Library_firebird_sdbc.mk | 51
connectivity/Module_connectivity.mk | 7
connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu | 117
connectivity/source/drivers/firebird/FConnection.cxx | 682 +++++
connectivity/source/drivers/firebird/FConnection.hxx | 184 +
connectivity/source/drivers/firebird/FDatabaseMetaData.cxx | 1084 ++++++++
connectivity/source/drivers/firebird/FDatabaseMetaData.hxx | 220 +
connectivity/source/drivers/firebird/FDriver.cxx | 237 +
connectivity/source/drivers/firebird/FDriver.hxx | 89
connectivity/source/drivers/firebird/FPreparedStatement.cxx | 523 ++++
connectivity/source/drivers/firebird/FPreparedStatement.hxx | 155 +
connectivity/source/drivers/firebird/FResultSet.cxx | 1064 ++++++++
connectivity/source/drivers/firebird/FResultSet.hxx | 235 +
connectivity/source/drivers/firebird/FResultSetMetaData.cxx | 191 +
connectivity/source/drivers/firebird/FResultSetMetaData.hxx | 93
connectivity/source/drivers/firebird/FServices.cxx | 148 +
connectivity/source/drivers/firebird/FStatement.cxx | 602 ++++
connectivity/source/drivers/firebird/FStatement.hxx | 189 +
connectivity/source/drivers/firebird/FSubComponent.hxx | 227 +
connectivity/source/drivers/firebird/firebird_sdbc.component | 17
connectivity/source/drivers/firebird/propertyids.cxx | 185 +
connectivity/source/drivers/firebird/propertyids.hxx | 163 +
cppunit/unxlngx6/bin/DllPlugInTester |binary
dbaccess/Library_dba.mk | 6
dbaccess/source/core/api/FilteredContainer.cxx | 18
dbaccess/source/core/misc/dsntypes.cxx | 10
dbaccess/source/inc/dsntypes.hxx | 1
dbaccess/source/ui/dlg/generalpage.cxx | 3
download.lst | 6
firebird/ExternalPackage_firebird.mk | 29
firebird/ExternalProject_firebird.mk | 53
firebird/Makefile | 7
firebird/Module_firebird.mk | 20
firebird/UnpackedTarball_firebird.mk | 29
firebird/firebird-cygwin-msvc.patch.1 | 1230 ++++++++++
firebird/firebird-icu.patch.1 | 58
firebird/firebird-macosx.patch.1 | 153 +
include/sal/log-areas.dox | 1
libatomic_ops/ExternalPackage_libatomic_ops.mk | 20
libatomic_ops/ExternalProject_libatomic_ops.mk | 26
libatomic_ops/Makefile | 7
libatomic_ops/Module_libatomic_ops.mk | 22
libatomic_ops/README | 4
libatomic_ops/UnpackedTarball_libatomic_ops.mk | 14
postprocess/CustomTarget_images.mk | 1
postprocess/CustomTarget_registry.mk | 5
postprocess/Rdb_services.mk | 3
scp2/InstallModule_firebird.mk | 17
scp2/InstallScript_setup_osl.mk | 1
scp2/Module_scp2.mk | 3
scp2/source/firebird/file_firebird.scp | 71
scp2/source/firebird/module_firebird.scp | 37
setup_native/source/packinfo/packinfo_office.txt | 15
solenv/bin/macosx-change-install-names.pl | 4
63 files changed, 8555 insertions(+), 5 deletions(-)
New commits:
commit 6af7d0675d1c95c92e387424a91732e90382f462
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 3385abe00b1635a09cc54d2b5a79d4c56f7a0c14
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 bf4e358c84ffb3b46a3e39f7827ecf6b40cc4d3b
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: */
commit f32dc63b5219e3b8ff99b3b04ec06b48b3c20eab
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Mon Jul 15 21:11:22 2013 +0200
Make firebird-sdbc install consistent with other drivers.
Change-Id: I01673bda5a08ca793f4fba89ddae036e3f1483e2
diff --git a/Repository.mk b/Repository.mk
index c606288..95ad515 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -251,7 +251,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
flat \
file \
filterconfig \
- $(if $(ENABLE_FIREBIRD_SDBC),firebird_sdbc) \
+ $(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE),firebird_sdbc) \
fpicker \
fps_office \
for \
diff --git a/connectivity/Configuration_firebird.mk b/connectivity/Configuration_firebird.mk
index 49b95b5..47873c7 100644
--- a/connectivity/Configuration_firebird.mk
+++ b/connectivity/Configuration_firebird.mk
@@ -7,12 +7,14 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Configuration_Configuration,driver_firebird))
+$(eval $(call gb_Configuration_Configuration,driver_firebird_sdbc))
-$(eval $(call gb_Configuration_add_spool_modules,driver_firebird,connectivity/registry/firebird,\
+$(eval $(call gb_Configuration_add_spool_modules,driver_firebird_sdbc,connectivity/registry/firebird,\
org/openoffice/Office/DataAccess/Drivers-firebird.xcu \
))
-$(eval $(call gb_Configuration_add_localized_datas,driver_firebird,connectivity/registry/firebird,\
+$(eval $(call gb_Configuration_add_localized_datas,driver_firebird_sdbc,connectivity/registry/firebird,\
org/openoffice/Office/DataAccess/Drivers.xcu \
))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index ad2401b..f52b809 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -88,7 +88,6 @@ ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_firebird \
Library_firebird_sdbc \
- Rdb_firebird_sdbc \
))
endif
diff --git a/connectivity/Rdb_firebird_sdbc.mk b/connectivity/Rdb_firebird_sdbc.mk
deleted file mode 100644
index 2679186..0000000
--- a/connectivity/Rdb_firebird_sdbc.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Rdb_Rdb,firebird_sdbc))
-
-$(eval $(call gb_Rdb_add_components,firebird_sdbc,\
- connectivity/source/drivers/firebird/firebird_sdbc \
-))
diff --git a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
index 3179fd2..2c3fc4f 100644
--- a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -32,10 +32,10 @@
*
************************************************************************ -->
<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed" install:module="firebird">
+ <node oor:name="Installed" install:module="firebird_sdbc">
<node oor:name="sdbc:embedded:firebird" oor:op="replace">
<prop oor:name="Driver">
- <value>com.sun.star.comp.sdbc.FirebirdDriver</value>
+ <value>com.sun.star.comp.sdbc.firebird.Driver</value>
</prop>
<prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
<value xml:lang="en-US">Firebird</value>
@@ -63,7 +63,7 @@
</node>
<node oor:name="sdbc:firebird:*" oor:op="replace">
<prop oor:name="Driver">
- <value>com.sun.star.comp.sdbc.FirebirdDriver</value>
+ <value>com.sun.star.comp.sdbc.firebird.Driver</value>
</prop>
<prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
<value xml:lang="en-US">Firebird</value>
diff --git a/connectivity/source/drivers/firebird/FDriver.cxx b/connectivity/source/drivers/firebird/FDriver.cxx
index 112a5d5..1b4faf6 100644
--- a/connectivity/source/drivers/firebird/FDriver.cxx
+++ b/connectivity/source/drivers/firebird/FDriver.cxx
@@ -89,7 +89,7 @@ void FirebirdDriver::disposing()
//------------------------------------------------------------------------------
rtl::OUString FirebirdDriver::getImplementationName_Static( ) throw(RuntimeException)
{
- return rtl::OUString("com.sun.star.comp.sdbc.FirebirdDriver");
+ 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.
}
diff --git a/connectivity/source/drivers/firebird/FServices.cxx b/connectivity/source/drivers/firebird/FServices.cxx
index 9cc8197..42f34c5 100644
--- a/connectivity/source/drivers/firebird/FServices.cxx
+++ b/connectivity/source/drivers/firebird/FServices.cxx
@@ -118,7 +118,7 @@ struct ProviderRequest
};
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL firebird_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL firebird_sdbc_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* pRegistryKey)
diff --git a/connectivity/source/drivers/firebird/firebird_sdbc.component b/connectivity/source/drivers/firebird/firebird_sdbc.component
index 2624f2e..ea4e4de 100644
--- a/connectivity/source/drivers/firebird/firebird_sdbc.component
+++ b/connectivity/source/drivers/firebird/firebird_sdbc.component
@@ -8,9 +8,10 @@
*
-->
-<component loader="com.sun.star.loader.SharedLibrary" prefix="firebird"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="firebird_sdbc"
xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.comp.sdbc.FirebirdDriver">
+ <implementation name="com.sun.star.comp.sdbc.firebird.Driver">
<service name="com.sun.star.sdbc.Driver"/>
</implementation>
</component>
+
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index aa24ed9..6eeec00 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -300,9 +300,7 @@ Sequence<PropertyValue> ODsnTypeCollection::getDefaultDBSettings( const OUString
//-------------------------------------------------------------------------
bool ODsnTypeCollection::isEmbeddedDatabase( const OUString& _sURL ) const
{
- const OUString sEmbeddedDatabaseURL = getEmbeddedDatabase();
- WildCard aWildCard(sEmbeddedDatabaseURL);
- return aWildCard.Matches(_sURL);
+ return _sURL.startsWith( "sdbc:embedded:" );
}
// -----------------------------------------------------------------------------
OUString ODsnTypeCollection::getEmbeddedDatabase() const
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index 8dcc689..2e16ad8 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -49,6 +49,7 @@ $(packimages_DIR)/%.zip : \
-l $(dir $(call gb_UIConfig_get_imagelist_target)) \
-l $(dir $(call gb_UIConfig_get_imagelist_target,modules/)) \
$(call gb_Helper_optional,DBCONNECTIVITY,$(if $(SOLAR_JAVA),-l $(SRCDIR)/connectivity/source/drivers/hsqldb)) \
+ $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_FIREBIRD_SDBC),-l $(SRCDIR)/connectivity/source/drivers/firebird)) \
-s $< -o $@ \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 6963c97..85abfd0 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -339,6 +339,11 @@ postprocess_FILES_main += \
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu
postprocess_DRIVERS += hsqldb jdbc
endif
+ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
+postprocess_FILES_main += \
+ $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-firebird.xcu
+postprocess_DRIVERS += firebird_sdbc
+endif
ifeq ($(ENABLE_TDEAB),TRUE)
postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-tdeab.xcu
endif
@@ -426,13 +431,6 @@ postprocess_FILES_postgresqlsdbc := $(postprocess_MOD)/org/openoffice/Office/Dat
postprocess_DRIVERS += postgresql
endif
-ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
-postprocess_XCDS += firebirdsdbc.xcd
-postprocess_DEPS_firebirdsdbc := main
-postprocess_FILES_firebirdsdbc := $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-firebird.xcu
-postprocess_DRIVERS += firebird
-endif
-
ifeq (unx,$(GUIBASE))
ifneq (,$(or $(filter TRUEYES,$(ENABLE_GCONF)$(ENABLE_LOCKDOWN))$(filter TRUE,$(ENABLE_GIO))))
postprocess_XCDS += gnome.xcd
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 4bc5f12..10ce2d4 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -240,6 +240,9 @@ $(eval $(call gb_Rdb_add_components,services,\
wizards/com/sun/star/wizards/report/report \
wizards/com/sun/star/wizards/table/table \
) \
+ $(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE), \
+ connectivity/source/drivers/firebird/firebird_sdbc \
+ ) \
))
ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
commit 35f02179210929fc125f69c6989a53610bd115df
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Mon Jul 15 07:10:18 2013 +0200
Fix --disable-firebird-sdbc.
Change-Id: I040049b4c034858f4be4aa580a17fd8bb5986396
diff --git a/Repository.mk b/Repository.mk
index 593f38b..c606288 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -251,7 +251,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
flat \
file \
filterconfig \
- firebird_sdbc \
+ $(if $(ENABLE_FIREBIRD_SDBC),firebird_sdbc) \
fpicker \
fps_office \
for \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index dcec656..bd30477 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -17,7 +17,9 @@ $(eval $(call gb_Module_add_targets,scp2,\
InstallModule_calc \
InstallModule_draw \
InstallModule_extensions \
- InstallModule_firebird \
+ $(if $(filter TRUE,$(ENABLE_FIREBIRD_SDBC)),\
+ InstallModule_firebird \
+ ) \
InstallModule_graphicfilter \
InstallModule_impress \
InstallModule_math \
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index b2bfe4a..7a46408 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -37,29 +37,9 @@ Module gid_Module_Prg_Base_Bin
Styles = (HIDDEN_ROOT);
Files = (auto_base_ALL,
gid_File_Share_Registry_Base_Xcd
-/* This should be conditional, but the condition is not working!! */
-/* #if defined ENABLE_FIREBIRD_SDBC */
- ,gid_File_FirebirdSdbc_Rdb
- ,gid_File_FirebirdSdbc_Xcd
-/* #endif */
);
End
-File gid_File_FirebirdSdbc_Rdb
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program_Services;
- Name = "firebird_sdbc.rdb";
- Styles = (PACKED);
-End
-
-File gid_File_FirebirdSdbc_Xcd
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Share_Registry;
- Name = "firebirdsdbc.xcd";
- Styles = (PACKED);
-End
-
-
Module gid_Module_Brand_Prg_Base
PackageInfo = "packinfo_brand.txt";
Name = "gid_Module_Brand_Prg_Base";
commit 5b73917ce5cf4d074109c79e43828b132eb9b66e
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Mon Jul 15 13:07:14 2013 +0200
Patch firebird to build on Mac.
Change-Id: I47ac500922d7e834f5915cc8fb1e19d584675620
diff --git a/firebird/ExternalPackage_firebird.mk b/firebird/ExternalPackage_firebird.mk
index 8039bec..43127b5 100644
--- a/firebird/ExternalPackage_firebird.mk
+++ b/firebird/ExternalPackage_firebird.mk
@@ -15,9 +15,15 @@ ifeq ($(OS)-$(COM),WNT-MSC)
$(eval $(call gb_ExternalPackage_add_file,firebird,bin/ifbembed.dll,gen/firebird/bin/ifbembed.dll))
$(eval $(call gb_ExternalPackage_add_file,firebird,lib/ifbembed.lib,gen/firebird/bin/ifbembed.lib))
else
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.2.5.2.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2))
+$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.2.5.dylib,gen/firebird/lib/libfbembed.dylib.2.5))
+$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib))
+else
$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2))
$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5))
$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so))
endif
+endif
# vim: set noet sw=4 ts=4:
diff --git a/firebird/ExternalProject_firebird.mk b/firebird/ExternalProject_firebird.mk
index 7f43d17..b0f639c 100644
--- a/firebird/ExternalProject_firebird.mk
+++ b/firebird/ExternalProject_firebird.mk
@@ -38,7 +38,8 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-L$(OUTDIR)/lib \
-L$(call gb_UnpackedTarball_get_dir,boost)/source/lib" \
&& export LD_LIBRARY_PATH="$(OUTDIR)/lib:$(call gb_UnpackedTarball_get_dir,boost)/source/lib" \
- && export PATH="$(PATH):$(shell cygpath $(OUTDIR)/lib):$(shell cygpath $(call gb_UnpackedTarball_get_dir,icu)/source/lib)" \
+ && export DYLD_LIBRARY_PATH="$(OUTDIR)/lib:$(call gb_UnpackedTarball_get_dir,boost)/source/lib" \
+ $(if $(filter WNT,$(OS)), && export PATH="$(PATH):$(shell cygpath $(OUTDIR)/lib):$(shell cygpath $(call gb_UnpackedTarball_get_dir,icu)/source/lib)") \
&& ./configure \
--without-editline \
--disable-superserver \
@@ -46,6 +47,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
+ && export CHANGE_INSTALL_NAMES="$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl fb OOO" \
&& $(MAKE) firebird_embedded \
)
# vim: set noet sw=4 ts=4:
diff --git a/firebird/UnpackedTarball_firebird.mk b/firebird/UnpackedTarball_firebird.mk
index b37cebb..b474b00 100644
--- a/firebird/UnpackedTarball_firebird.mk
+++ b/firebird/UnpackedTarball_firebird.mk
@@ -20,4 +20,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
firebird/firebird-cygwin-msvc.patch.1 \
))
endif
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_UnpackedTarball_add_patches,firebird,\
+ firebird/firebird-macosx.patch.1 \
+))
+endif
# vim: set noet sw=4 ts=4:
diff --git a/firebird/firebird-macosx.patch.1 b/firebird/firebird-macosx.patch.1
new file mode 100644
index 0000000..5794a96
--- /dev/null
+++ b/firebird/firebird-macosx.patch.1
@@ -0,0 +1,153 @@
+Only in firebird: Makefile
+Only in firebird: build.log
+diff -ur firebird.org/builds/posix/Makefile.in.codes firebird/builds/posix/Makefile.in.codes
+--- firebird.org/builds/posix/Makefile.in.codes 2013-07-12 20:55:46.000000000 +0200
++++ firebird/builds/posix/Makefile.in.codes 2013-07-15 11:43:26.000000000 +0200
+@@ -63,7 +63,7 @@
+
+ $(BIN)/codes$(EXEC_EXT): $(CODES_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
+ $(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS)
+-
++ $(CHANGE_INSTALL_NAMES) $@
+
+ # Rebuild ids.h
+ $(SRC_ROOT)/include/gen/ids.h: $(SRC_ROOT)/misc/ids.m $(SRC_ROOT)/jrd/relations.h
+diff -ur firebird.org/builds/posix/Makefile.in.examples firebird/builds/posix/Makefile.in.examples
+--- firebird.org/builds/posix/Makefile.in.examples 2013-07-12 20:55:46.000000000 +0200
++++ firebird/builds/posix/Makefile.in.examples 2013-07-15 11:50:37.000000000 +0200
+@@ -129,6 +129,7 @@
+
+ $(EXAMPLES_DEST)/empbuild$(EXEC_EXT): $(EMPBLD_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
+ $(EXE_LINK) $(LINK_OPTS) $(EMPBLD_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
++ $(CHANGE_INSTALL_NAMES) $@
+
+ $(EXAMPLES_DEST)/empbuild.c: $(EXAMPLES_DEST)/empbuild.fdb $(EXAMPLES_DEST)/empbuild.e
+
+@@ -147,6 +148,7 @@
+
+ $(EXAMPLES_DEST)/intlbld$(EXEC_EXT): $(INTLBLD_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
+ $(EXE_LINK) $(LINK_OPTS) $(INTLBLD_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
++ $(CHANGE_INSTALL_NAMES) $@
+
+ $(EXAMPLES_DEST)/intlbld.c: $(EXAMPLES_DEST)/intlbuild.fdb $(EXAMPLES_DEST)/intlbld.e
+
+diff -ur firebird.org/builds/posix/Makefile.in.msgs firebird/builds/posix/Makefile.in.msgs
+--- firebird.org/builds/posix/Makefile.in.msgs 2013-07-12 20:55:46.000000000 +0200
++++ firebird/builds/posix/Makefile.in.msgs 2013-07-15 11:37:17.000000000 +0200
+@@ -107,6 +107,7 @@
+ $(BUILD_FILE): $(BUILD_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
+ $(STATICEXE_LINK) $(LINK_OPTS) $(BUILD_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
+ $(CHMOD_7) $@
++ $(CHANGE_INSTALL_NAMES) $@
+
+
+ enter_messages : $(ENTER_MESSAGES)
+@@ -114,6 +115,7 @@
+ $(ENTER_MESSAGES): $(ENTER_Objects) $(LIBFBSTATIC_A)
+ $(STATICEXE_LINK) $(LINK_OPTS) $(ENTER_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
+ $(CHMOD_7) $@
++ $(CHANGE_INSTALL_NAMES) $@
+
+
+ modify_messages: $(MODIFY_MESSAGES)
+@@ -121,6 +123,7 @@
+ $(MODIFY_MESSAGES): $(MODIFY_Objects) $(LIBFBSTATIC_A)
+ $(STATICEXE_LINK) $(LINK_OPTS) $(MODIFY_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
+ $(CHMOD_7) $@
++ $(CHANGE_INSTALL_NAMES) $@
+
+
+ change_messages: $(CHANGE_MESSAGES)
+@@ -128,6 +131,7 @@
+ $(CHANGE_MESSAGES): $(CHANGE_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
+ $(STATICEXE_LINK) $(LINK_OPTS) $(CHANGE_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
+ $(CHMOD_7) $@
++ $(CHANGE_INSTALL_NAMES) $@
+
+
+
+diff -ur firebird.org/builds/posix/Makefile.in.static.createdb firebird/builds/posix/Makefile.in.static.createdb
+--- firebird.org/builds/posix/Makefile.in.static.createdb 2013-07-12 20:55:46.000000000 +0200
++++ firebird/builds/posix/Makefile.in.static.createdb 2013-07-15 10:12:21.000000000 +0200
+@@ -59,6 +59,7 @@
+
+ $(CREATE_DB): $(CREATEDB_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
+ $(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS)
++ $(CHANGE_INSTALL_NAMES) $(CREATE_DB)
+
+
+ include $(ROOT)/gen/make.shared.targets
+diff -ur firebird.org/builds/posix/Makefile.in.static.gbak firebird/builds/posix/Makefile.in.static.gbak
+--- firebird.org/builds/posix/Makefile.in.static.gbak 2013-07-12 20:55:46.000000000 +0200
++++ firebird/builds/posix/Makefile.in.static.gbak 2013-07-15 11:25:41.000000000 +0200
+@@ -60,7 +60,7 @@
+
+ $(GBAK_STATIC) : $(AllObjects) $(LIBFBSTATIC_A)
+ $(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS)
+-
++ $(CHANGE_INSTALL_NAMES) $@
+
+ include $(ROOT)/gen/make.shared.targets
+
+diff -ur firebird.org/builds/posix/Makefile.in.static.gpre firebird/builds/posix/Makefile.in.static.gpre
+--- firebird.org/builds/posix/Makefile.in.static.gpre 2013-07-12 20:55:46.000000000 +0200
++++ firebird/builds/posix/Makefile.in.static.gpre 2013-07-15 10:12:34.000000000 +0200
+@@ -61,6 +61,7 @@
+ $(GPRE_STATIC): $(GPRESTATIC_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
+ $(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS)
+ -$(RM) $(GPRE_CURRENT)
++ $(CHANGE_INSTALL_NAMES) $(GPRE_STATIC)
+ (cd $(@D); $(LN) $(@F) $(notdir $(GPRE_CURRENT)))
+
+
+diff -ur firebird.org/builds/posix/Makefile.in.static.isql firebird/builds/posix/Makefile.in.static.isql
+--- firebird.org/builds/posix/Makefile.in.static.isql 2013-07-12 20:55:46.000000000 +0200
++++ firebird/builds/posix/Makefile.in.static.isql 2013-07-15 11:27:32.000000000 +0200
+@@ -60,7 +60,7 @@
+
+ $(ISQL_STATIC): $(ISQL_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
+ $(STATICEXE_LINK) $(LINK_OPTS) $(ISQL_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LIBEDITLINE) $(LINK_LIBS) $(ICU_LIBS)
+-
++ $(CHANGE_INSTALL_NAMES) $@
+
+ include $(ROOT)/gen/make.shared.targets
+
+diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix.darwin
+--- firebird.org/builds/posix/postfix.darwin 2013-07-12 20:55:46.000000000 +0200
++++ firebird/builds/posix/postfix.darwin 2013-07-15 12:07:36.000000000 +0200
+@@ -54,9 +54,9 @@
+ cp -r ../gen/firebird/include $(FB_FW)/Versions/A/Headers
+ cp ../gen/firebird/lib/libfbembed.dylib $(FB_FW)/Versions/A/Firebird
+ cp ../gen/firebird/lib/libfbclient.dylib $(FB_FW)/Versions/A/Libraries/libfbclient.dylib
+- cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib
+- cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib
+- cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib
++ #cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib
++ #cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib
++ #cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib
+ cp ../gen/firebird/lib/libib_util.dylib $(FB_FW)/Versions/A/Libraries/libib_util.dylib
+ cp ../gen/firebird/firebird.msg \
+ $(FB_FW)/Resources/English.lproj/var/firebird.msg
+@@ -68,8 +68,8 @@
+ $(FB_FW)/Resources/English.lproj/var/intl/fbintl.conf
+ chmod a+rx $(FB_FW)/Resources/English.lproj/var/intl/fbintl
+ mkdir -p $(FB_FW)/Resources/English.lproj/var/plugins
+- cp ../gen/firebird/plugins/libfbtrace.dylib \
+- $(FB_FW)/Resources/English.lproj/var/plugins/libfbtrace.dylib
++# cp ../gen/firebird/plugins/libfbtrace.dylib \
++# $(FB_FW)/Resources/English.lproj/var/plugins/libfbtrace.dylib
+ cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help
+ cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var
+ mkdir -p $(FB_FW)/Resources/doc
+Only in firebird: config.log
+Only in firebird: config.status
+Only in firebird/extern/btyacc: btyacc
+Only in firebird: gen
+Only in firebird: libtool
+Only in firebird/src/dsql: dsql.tab.h
+Only in firebird/src/dsql: parse.cpp
+Only in firebird/src/gpre: gpre_meta.cpp
+Only in firebird/src/include/gen: autoconfig.h
+Only in firebird/src/include/gen: blrtable.h
+Only in firebird/src/misc: codes.cpp
+Only in firebird: temp
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index 7a42afc..cd76e80 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -56,6 +56,8 @@ sub action($$$)
'shl/URELIB/URELIB' => '@loader_path',
'shl/OOO/URELIB' => '@loader_path/../ure-link/lib',
'shl/OOO/OOO' => '@loader_path',
+ 'fb/OOO/URELIB' => '@rpath/../ure-link/lib',
+ 'fb/OOO/OOO' => '@rpath',
'shl/OXT/URELIB' => '@executable_path/urelibs',
'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
'shl/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
@@ -66,7 +68,7 @@ sub action($$$)
return $act;
}
- at ARGV >= 2 or die 'Usage: app|shl UREBIN|URELIB|OOO|SDKBIN|OXT|NONE <filepath>*';
+ at ARGV >= 2 or die 'Usage: app|shl|fb UREBIN|URELIB|OOO|SDKBIN|OXT|NONE <filepath>*';
$type = shift @ARGV;
$loc = shift @ARGV;
foreach $file (@ARGV)
commit 70e7e92755a12543ac3e4509d590a5d7d5de48c3
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Sun Jul 14 22:13:34 2013 +0200
Further firebird-sdbc windows build fixes.
Change-Id: I9cb0bbd45b19cb9ef6aa4b8f6d0538484060c6a0
diff --git a/connectivity/Library_firebird_sdbc.mk b/connectivity/Library_firebird_sdbc.mk
index b05870f..bada0a8 100644
--- a/connectivity/Library_firebird_sdbc.mk
+++ b/connectivity/Library_firebird_sdbc.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Library_Library,firebird_sdbc))
$(eval $(call gb_Library_use_sdk_api,firebird_sdbc))
$(eval $(call gb_Library_use_externals,firebird_sdbc,\
+ boost_headers \
libfbembed \
))
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index fbc2bb1..b2bfe4a 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -39,16 +39,12 @@ Module gid_Module_Prg_Base_Bin
gid_File_Share_Registry_Base_Xcd
/* This should be conditional, but the condition is not working!! */
/* #if defined ENABLE_FIREBIRD_SDBC */
- ,gid_File_Lib_FirebirdSdbc
,gid_File_FirebirdSdbc_Rdb
,gid_File_FirebirdSdbc_Xcd
/* #endif */
);
End
-/* This could be moved to a std location */
-STD_LIB_FILE(gid_File_Lib_FirebirdSdbc, firebird_sdbc)
-
File gid_File_FirebirdSdbc_Rdb
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program_Services;
commit c7b074ace067559cf810ecde22a8bdf751151dbb
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Fri Jul 12 19:17:08 2013 +0100
Fix libicuin naming in firebird cygwin patch.
Change-Id: Ia58e2b3f55b2cbccb35cdcb6da04bd7d67ad4d5c
diff --git a/firebird/firebird-cygwin-msvc.patch.1 b/firebird/firebird-cygwin-msvc.patch.1
index f723dda..91a0ede 100644
--- a/firebird/firebird-cygwin-msvc.patch.1
+++ b/firebird/firebird-cygwin-msvc.patch.1
@@ -30,7 +30,7 @@ diff -u firebird/builds/posix/make.defaults firebird/builds/posix/make.defaults
LINK_LIBS = @LIBS@
+ifeq ($(PLATFORM),win32)
-+ICU_LIBS = -licuuc -licudt -licui
++ICU_LIBS = -licuuc -licudt -licuin
+else
ICU_LIBS = -licuuc -licudata -licui18n
+endif
commit 2d2147742e9c79265e98d0e370981944fa49c7fb
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Fri Jul 12 15:09:22 2013 +0100
Implement first part of FDatabaseMetaData.
Change-Id: I6dae1f2ecf265333c121f419c0041dd7525efa9e
diff --git a/connectivity/source/drivers/firebird/FConnection.cxx b/connectivity/source/drivers/firebird/FConnection.cxx
index 0735d24..d506d29 100644
--- a/connectivity/source/drivers/firebird/FConnection.cxx
+++ b/connectivity/source/drivers/firebird/FConnection.cxx
@@ -89,7 +89,8 @@ OConnection::OConnection(FirebirdDriver* _pDriver)
OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this),
m_xMetaData(NULL),
m_bIsEmbedded(sal_False),
- m_aURL(),
+ m_sConnectionURL(),
+ m_sURL(),
m_sUser(),
m_pDriver(_pDriver),
m_bClosed(sal_False),
@@ -147,6 +148,8 @@ void OConnection::construct(const ::rtl::OUString& url, const Sequence< Property
osl_atomic_increment( &m_refCount );
+ m_sConnectionURL = url;
+
bool bIsNewDatabase = false;
OUString aStorageURL;
if (url.equals("sdbc:embedded:firebird"))
@@ -176,10 +179,10 @@ void OConnection::construct(const ::rtl::OUString& url, const Sequence< Property
bIsNewDatabase = !m_xEmbeddedStorage->hasElements();
- m_aURL = utl::TempFile::CreateTempName() + ".fdb";
+ m_sURL = utl::TempFile::CreateTempName() + ".fdb";
SAL_INFO("connectivity.firebird", "Temporary .fdb location: "
- << OUStringToOString(m_aURL,RTL_TEXTENCODING_UTF8 ).getStr());
+ << OUStringToOString(m_sURL,RTL_TEXTENCODING_UTF8 ).getStr());
if (!bIsNewDatabase)
{
SAL_INFO("connectivity.firebird", "Extracting .fdb from .odb" );
@@ -204,7 +207,7 @@ void OConnection::construct(const ::rtl::OUString& url, const Sequence< Property
::dbtools::throwGenericSQLException(sMessage ,*this);
}
try {
- xFileAccess->writeFile(m_aURL,xDBStream->getInputStream());
+ xFileAccess->writeFile(m_sURL,xDBStream->getInputStream());
}
catch (...)
{
@@ -224,7 +227,7 @@ void OConnection::construct(const ::rtl::OUString& url, const Sequence< Property
if (bIsNewDatabase)
{
- if (isc_create_database(status, m_aURL.getLength(), OUStringToOString(m_aURL, RTL_TEXTENCODING_UTF8).getStr(),
+ if (isc_create_database(status, m_sURL.getLength(), OUStringToOString(m_sURL, RTL_TEXTENCODING_UTF8).getStr(),
&m_DBHandler, 0, NULL, 0))
{
if(pr_error(status, "create new database"))
@@ -233,7 +236,7 @@ void OConnection::construct(const ::rtl::OUString& url, const Sequence< Property
}
else
{
- if (isc_attach_database(status, m_aURL.getLength(), OUStringToOString(m_aURL, RTL_TEXTENCODING_UTF8).getStr(),
+ if (isc_attach_database(status, m_sURL.getLength(), OUStringToOString(m_sURL, RTL_TEXTENCODING_UTF8).getStr(),
&m_DBHandler, 0, NULL))
if (pr_error(status, "attach database"))
return;
@@ -577,7 +580,7 @@ void SAL_CALL OConnection::documentEventOccured( const DocumentEvent& _Event )
Reference< XInputStream > xInputStream;
if (xContext.is())
xInputStream =
- OStorageHelper::GetInputStreamFromURL(m_aURL, xContext);
+ OStorageHelper::GetInputStreamFromURL(m_sURL, xContext);
if (xInputStream.is())
OStorageHelper::CopyInputToOutput( xInputStream,
xDBStream->getOutputStream());
diff --git a/connectivity/source/drivers/firebird/FConnection.hxx b/connectivity/source/drivers/firebird/FConnection.hxx
index e91aef6..1e5168f 100644
--- a/connectivity/source/drivers/firebird/FConnection.hxx
+++ b/connectivity/source/drivers/firebird/FConnection.hxx
@@ -99,7 +99,8 @@ namespace connectivity
::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by
// an operation
sal_Bool m_bIsEmbedded;
- ::rtl::OUString m_aURL; // URL of connection
+ ::rtl::OUString m_sConnectionURL;
+ ::rtl::OUString m_sURL; // URL of connection
// or file path
::rtl::OUString m_sUser; // the user name
FirebirdDriver* m_pDriver; // Pointer to the owning
@@ -170,6 +171,9 @@ namespace connectivity
inline isc_db_handle getDBHandler() const { return m_DBHandler; }
inline FirebirdDriver* getDriver() const { return m_pDriver;}
inline rtl_TextEncoding getTextEncoding() const { return m_nTextEncoding; }
+
+ ::rtl::OUString getConnectionURL() const { return m_sConnectionURL; }
+ sal_Bool isEmbedded() const { return m_bIsEmbedded; }
};
}
}
diff --git a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
index 0bdcc17..5ea1aac 100644
--- a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
@@ -42,6 +42,10 @@
#include <com/sun/star/sdbc/XParameters.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
+#include <gen/autoconfig.h>
+#include <fb_types.h>
+#include <constants.h>
+
using namespace connectivity::firebird;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -68,78 +72,111 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon)
ODatabaseMetaData::~ODatabaseMetaData()
{
}
-// -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator( ) throw(SQLException, RuntimeException)
+
+//----- Catalog Info ---------------------------------------------------------
+OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator() throw(SQLException, RuntimeException)
{
- ::rtl::OUString aVal;
+ return OUString();
+}
- return aVal;
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength() throw(SQLException, RuntimeException)
+{
+ return 0;
}
-// -------------------------------------------------------------------------
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException)
+
+OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return OUString();
}
-// -------------------------------------------------------------------------
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException)
+
+sal_Bool SAL_CALL ODatabaseMetaData::isCatalogAtStart() throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return sal_False;
}
-// -------------------------------------------------------------------------
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException)
+
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInTableDefinitions() throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return sal_False;
}
-// -------------------------------------------------------------------------
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException)
+
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions() throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return sal_False;
}
-// -------------------------------------------------------------------------
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException)
+
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInDataManipulation( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return sal_False;
}
-// -------------------------------------------------------------------------
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException)
+
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs() throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;
}
-// -------------------------------------------------------------------------
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list