From f2c336c5473bad59d970290bc4e7f09580825260 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 25 Jun 2004 17:28:25 +0000 Subject: INTEGRATION: CWS mozab04 (1.6.114); FILE MERGED 2004/04/12 10:15:53 windly 1.6.114.2: #i6883# make mozab driver threadsafe 2004/04/05 09:54:41 windly 1.6.114.1: #i20338# Read and Write access to Address Books --- connectivity/source/drivers/mozab/MPreparedStatement.cxx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'connectivity/source/drivers/mozab/MPreparedStatement.cxx') diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx index b797350f1eea..a29bd9fee671 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx @@ -2,9 +2,9 @@ * * $RCSfile: MPreparedStatement.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: vg $ $Date: 2003-04-15 17:38:05 $ + * last change: $Author: hjs $ $Date: 2004-06-25 18:28:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -146,11 +146,12 @@ void SAL_CALL OPreparedStatement::disposing() } // ----------------------------------------------------------------------------- -void OPreparedStatement::parseSql( const ::rtl::OUString& sql ) throw ( +sal_Bool OPreparedStatement::parseSql( const ::rtl::OUString& sql , sal_Bool bAdjusted ) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) { OSL_TRACE("In/Out :: OPreparedStatement::parseSql()"); - OStatement_Base::parseSql( sql ); + if (!OStatement_Base::parseSql( sql )) + return sal_False; m_xParamColumns = new OSQLColumns(); @@ -214,9 +215,11 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) thr { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); - + sal_Bool bReadOnly= sal_True; + if (m_pResultSet) + bReadOnly = m_pResultSet->determineReadOnly(); if(!m_xMetaData.is()) - m_xMetaData = new OResultSetMetaData( m_aSQLIterator.getSelectColumns(), m_aSQLIterator.getTables().begin()->first ,m_pTable ); + m_xMetaData = new OResultSetMetaData( m_aSQLIterator.getSelectColumns(), m_aSQLIterator.getTables().begin()->first ,m_pTable,bReadOnly ); return m_xMetaData; } // ------------------------------------------------------------------------- -- cgit v1.2.3