diff options
Diffstat (limited to 'connectivity')
13 files changed, 0 insertions, 34 deletions
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index b6878f0e4c5e..754630e5d93f 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -46,9 +46,6 @@ #include <tools/debug.hxx> #include <rtl/logfile.hxx> -#define THROW_SQL(x) \ - OTools::ThrowException(x,m_aStatementHandle,SQL_HANDLE_STMT,*this) - namespace connectivity { namespace file diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index b80deebee243..7877c583008e 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::connectivity::hsqldb; -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define ThrowException(env, type, msg) { \ env->ThrowNew(env->FindClass(type), msg); } diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx index ce87529ceec4..2a276d9ba2a4 100644 --- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx +++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::connectivity::hsqldb; -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) /*****************************************************************************/ /* exception macros */ diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx index a222d52dcf2f..84cf3de94947 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx @@ -56,7 +56,6 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::connectivity::hsqldb; -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) /*****************************************************************************/ /* exception macros */ diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx index a1434336947f..396facf50790 100644 --- a/connectivity/source/drivers/odbcbase/OStatement.cxx +++ b/connectivity/source/drivers/odbcbase/OStatement.cxx @@ -54,18 +54,6 @@ using namespace ::comphelper; #define THROW_SQL(x) \ OTools::ThrowException(m_pConnection,x,m_aStatementHandle,SQL_HANDLE_STMT,*this) -#if OSL_DEBUG_LEVEL > 1 -#define DEBUG_THROW \ - try \ - { \ - THROW_SQL(nRetCode); \ - } \ - catch(const SQLException&) \ - { \ - OSL_FAIL("Exception in odbc caught"); \ - } -#endif - using namespace connectivity::odbc; diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx index 180c3c60a261..0401c55f2805 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx @@ -110,8 +110,6 @@ using com::sun::star::beans::Property; namespace pq_sdbc_driver { -#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) - static ::cppu::IPropertyArrayHelper & getResultSetPropertyArrayHelper() { static ::cppu::IPropertyArrayHelper *pArrayHelper; diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx index 8fde1d13fcb9..f6089cc01398 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx @@ -97,8 +97,6 @@ using com::sun::star::beans::XPropertySet; using com::sun::star::container::XNameAccess; -#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) - namespace pq_sdbc_driver { diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx index f16e9252fb00..3a46800fb73c 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx @@ -69,8 +69,6 @@ using com::sun::star::beans::XPropertySet; namespace pq_sdbc_driver { -#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) - Column::Column( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< com::sun::star::sdbc::XConnection > & connection, ConnectionSettings *pSettings) diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx b/connectivity/source/drivers/postgresql/pq_xindex.cxx index 5c529e4e2683..11d7b421de12 100644 --- a/connectivity/source/drivers/postgresql/pq_xindex.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindex.cxx @@ -109,8 +109,6 @@ using com::sun::star::sdbc::SQLException; namespace pq_sdbc_driver { -#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) - Index::Index( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< com::sun::star::sdbc::XConnection > & connection, ConnectionSettings *pSettings, diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx index b51a795c9e65..ea9c196a853a 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx @@ -69,8 +69,6 @@ using com::sun::star::beans::XPropertySet; namespace pq_sdbc_driver { -#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) - IndexColumn::IndexColumn( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< com::sun::star::sdbc::XConnection > & connection, ConnectionSettings *pSettings ) diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx b/connectivity/source/drivers/postgresql/pq_xkey.cxx index db9f2406f275..a89dc114e478 100644 --- a/connectivity/source/drivers/postgresql/pq_xkey.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkey.cxx @@ -109,8 +109,6 @@ using com::sun::star::sdbc::SQLException; namespace pq_sdbc_driver { -#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) - Key::Key( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< com::sun::star::sdbc::XConnection > & connection, ConnectionSettings *pSettings, diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx index 9ae9333e87bb..8d48711d0f50 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx @@ -69,8 +69,6 @@ using com::sun::star::beans::XPropertySet; namespace pq_sdbc_driver { -#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) - KeyColumn::KeyColumn( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< com::sun::star::sdbc::XConnection > & connection, ConnectionSettings *pSettings) diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx index 606299e4f33d..e0eb97b03b7a 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx @@ -114,8 +114,6 @@ using com::sun::star::sdbc::SQLException; namespace pq_sdbc_driver { -#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) - Table::Table( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< com::sun::star::sdbc::XConnection > & connection, ConnectionSettings *pSettings) |