diff options
Diffstat (limited to 'connectivity/source')
| -rw-r--r-- | connectivity/source/drivers/file/FStatement.cxx | 14 | ||||
| -rw-r--r-- | connectivity/source/drivers/odbc/OStatement.cxx | 8 | ||||
| -rw-r--r-- | connectivity/source/inc/file/FStatement.hxx | 5 | ||||
| -rw-r--r-- | connectivity/source/inc/odbc/OStatement.hxx | 7 |
4 files changed, 22 insertions, 12 deletions
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index e9fc8e411c99..1f7d987fe472 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -2,9 +2,9 @@ * * $RCSfile: FStatement.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: oj $ $Date: 2001-05-17 06:46:53 $ + * last change: $Author: oj $ $Date: 2001-05-23 14:05:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,6 +149,10 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) : OStatement_BASE( registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, nAttrib,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); } +// ----------------------------------------------------------------------------- +OStatement_Base::~OStatement_Base() +{ +} //------------------------------------------------------------------------------ void OStatement_Base::disposeResultSet() { @@ -296,7 +300,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const ::rtl::OUS aErr = ::rtl::OUString::createFromAscii("Unknown table name in SELECT statement:\n"); aErr += sql; } - throw SQLException(aErr,*this,::rtl::OUString::createFromAscii("HY0000"),1000,Any()); + throw SQLException(aErr,*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any()); } OResultSet* pResult = createResultSet(); @@ -313,13 +317,13 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const ::rtl::OUS aErr = ::rtl::OUString::createFromAscii("Unknown table name in SELECT statement:\n"); aErr += sql; } - throw SQLException(aErr,*this,::rtl::OUString::createFromAscii("HY0000"),1000,Any()); + throw SQLException(aErr,*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any()); } throw SQLException(::rtl::OUString::createFromAscii("Driver does not support this function!"),*this,::rtl::OUString::createFromAscii("IM001"),0,Any()); } } else - throw SQLException(aErr,*this,::rtl::OUString::createFromAscii("HY0000"),1000,Any()); + throw SQLException(aErr,*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any()); // Execute the statement. If execute returns true, a result // set exists. diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index c9589049c07c..9e2820f30d25 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -2,9 +2,9 @@ * * $RCSfile: OStatement.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: oj $ $Date: 2001-05-18 08:33:49 $ + * last change: $Author: oj $ $Date: 2001-05-23 14:05:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -150,6 +150,10 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) : OStatement_BASE( m_pConnection->acquire(); N3SQLAllocHandle(SQL_HANDLE_STMT,m_pConnection->getConnection(),&m_aStatementHandle); } +// ----------------------------------------------------------------------------- +OStatement_Base::~OStatement_Base() +{ +} //------------------------------------------------------------------------------ void OStatement_Base::disposeResultSet() { diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index 30f50766a86f..062df51d98d0 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -2,9 +2,9 @@ * * $RCSfile: FStatement.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: oj $ $Date: 2001-04-30 09:59:56 $ + * last change: $Author: oj $ $Date: 2001-05-23 14:05:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -170,6 +170,7 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ~OStatement_Base(); public: connectivity::OSQLParseNode* getParseTree() const { return m_pParseTree;} diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 874ee59eabea..7924b8f04ac9 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -2,9 +2,9 @@ * * $RCSfile: OStatement.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: oj $ $Date: 2001-05-17 06:46:46 $ + * last change: $Author: oj $ $Date: 2001-05-23 14:05:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -195,7 +195,8 @@ namespace connectivity ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; - ~OStatement_Base(){} + virtual ~OStatement_Base(); + public: ::cppu::OBroadcastHelper& rBHelper; OStatement_Base(OConnection* _pConnection ); |