connectivity/source/drivers/ado/APreparedStatement.cxx | 1 + connectivity/source/drivers/ado/AStatement.cxx | 1 + connectivity/source/drivers/evoab2/NPreparedStatement.cxx | 1 + connectivity/source/drivers/evoab2/NStatement.cxx | 1 + connectivity/source/drivers/file/FPreparedStatement.cxx | 1 + connectivity/source/drivers/file/FStatement.cxx | 1 + connectivity/source/drivers/file/fcomp.cxx | 1 + connectivity/source/drivers/jdbc/JStatement.cxx | 1 + connectivity/source/drivers/kab/KPreparedStatement.cxx | 1 + connectivity/source/drivers/kab/KStatement.cxx | 1 + connectivity/source/drivers/macab/MacabPreparedStatement.cxx | 1 + connectivity/source/drivers/macab/MacabStatement.cxx | 1 + connectivity/source/drivers/mozab/MPreparedStatement.cxx | 1 + connectivity/source/drivers/mozab/MStatement.cxx | 1 + connectivity/source/drivers/odbcbase/OPreparedStatement.cxx | 1 + connectivity/source/drivers/odbcbase/OStatement.cxx | 1 + connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 1 + connectivity/source/drivers/postgresql/pq_statement.cxx | 1 + sc/source/filter/xml/xmlfilti.cxx | 2 -- sc/source/filter/xml/xmlfilti.hxx | 1 - 20 files changed, 18 insertions(+), 3 deletions(-)
New commits: commit 094654fcebe35af07a9e12137becdf85277ef706 Author: Noel Power <noel.po...@suse.com> Date: Thu Aug 16 17:38:47 2012 +0100 fix for fdo#48200.diff import regrex state for filter Change-Id: I46b07341e96d78130e6301e40fa32df6ed2c7879 diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index d12d0c2..07ddbee 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -151,6 +151,7 @@ void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException) { + printf("OPreparedStatement::execute"); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index cf0e8c6..63e1746 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -252,6 +252,7 @@ void OStatement_Base::assignRecordSet( ADORecordset* _pRS ) // ------------------------------------------------------------------------- sal_Bool SAL_CALL OStatement_Base::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) { + printf("OStatement_Base::execute\n"); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx index 3265547..6c94688 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx @@ -128,6 +128,7 @@ void SAL_CALL OEvoabPreparedStatement::close( ) throw(SQLException, RuntimeExce sal_Bool SAL_CALL OEvoabPreparedStatement::execute( ) throw(SQLException, RuntimeException) { + printf("OEvoabPreparedStatement::execute()\n"); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 7bf0016..136f92e 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -615,6 +615,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OCommonStatement, OStatement_IBase // ------------------------------------------------------------------------- sal_Bool SAL_CALL OStatement::execute( const ::rtl::OUString& _sql ) throw(SQLException, RuntimeException) { + printf("OStatement::execute()\n"); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 0d810fc..ee6f01c 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -169,6 +169,7 @@ void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException) { + printf("OPreparedStatement::execute() #2\n"); RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "ocke.jans...@sun.com", "OPreparedStatement::execute" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 5667260..d8453dd 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -285,6 +285,7 @@ void SAL_CALL OStatement::release() throw() // ------------------------------------------------------------------------- sal_Bool SAL_CALL OStatement::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) { + printf("OStatement::execute() #2\n"); ::osl::MutexGuard aGuard( m_aMutex ); executeQuery(sql); diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index 7dbb6c6..5a9ad3c 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -140,6 +140,7 @@ void OPredicateCompiler::start(OSQLParseNode* pSQLParseNode) //------------------------------------------------------------------ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode) { + printf("OPredicateCompiler::execute()\n"); OOperand* pOperand = NULL; if (pPredicateNode->count() == 3 && // Expression is bracketed SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"(") && diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index a7e24bc..c3f0163 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -220,6 +220,7 @@ void SAL_CALL java_sql_Statement::clearBatch( ) throw(::com::sun::star::sdbc::S sal_Bool SAL_CALL java_sql_Statement_Base::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) { + printf("java_sql_Statement_Base::execute() #2\n"); m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTE_STATEMENT, sql ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx index 26167b3..4315a7f 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.cxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx @@ -142,6 +142,7 @@ void SAL_CALL KabPreparedStatement::close() throw(SQLException, RuntimeException // ------------------------------------------------------------------------- sal_Bool SAL_CALL KabPreparedStatement::execute() throw(SQLException, RuntimeException) { + printf("KabPreparedStatement::execute() #4\n"); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx index a84d476..85c64a9 100644 --- a/connectivity/source/drivers/kab/KStatement.cxx +++ b/connectivity/source/drivers/kab/KStatement.cxx @@ -394,6 +394,7 @@ void SAL_CALL KabCommonStatement::close( ) throw(SQLException, RuntimeException sal_Bool SAL_CALL KabCommonStatement::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) { + printf("KabCommonStatement::execute() #4\n"); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx index 79a65cc..bb5275d 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx @@ -155,6 +155,7 @@ void SAL_CALL MacabPreparedStatement::close() throw(SQLException, RuntimeExcepti // ------------------------------------------------------------------------- sal_Bool SAL_CALL MacabPreparedStatement::execute() throw(SQLException, RuntimeException) { + printf("MacabPreparedStatement::execute\n"); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index 7ea31f7..4d5ecd2 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx @@ -402,6 +402,7 @@ void SAL_CALL MacabCommonStatement::close( ) throw(SQLException, RuntimeExcepti sal_Bool SAL_CALL MacabCommonStatement::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) { + printf("MacabCommonStatement::execute\n"); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx index 9a650ef..dfecab7 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx @@ -174,6 +174,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) thr // ------------------------------------------------------------------------- sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException) { + printf("--- OPreparedStatement::execute\n"); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx index c1041d9..723788f 100644 --- a/connectivity/source/drivers/mozab/MStatement.cxx +++ b/connectivity/source/drivers/mozab/MStatement.cxx @@ -305,6 +305,7 @@ void OCommonStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _pR // ------------------------------------------------------------------------- sal_Bool SAL_CALL OCommonStatement::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) { + printf("--- OCommentStatement::execute\n"); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx index a5d24dd..4174c14 100644 --- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx @@ -144,6 +144,7 @@ void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException) { + printf("--- OPreparedStatement::execute\n"); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx index ce92dee..08a3984 100644 --- a/connectivity/source/drivers/odbcbase/OStatement.cxx +++ b/connectivity/source/drivers/odbcbase/OStatement.cxx @@ -331,6 +331,7 @@ sal_Int32 OStatement_Base::getColumnCount () throw( SQLException) sal_Bool SAL_CALL OStatement_Base::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) { + printf("--- OStatement_Base::execute\n"); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); m_sSqlStatement = sql; diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index 9c35eef..e56432e 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -388,6 +388,7 @@ sal_Int32 PreparedStatement::executeUpdate( ) sal_Bool PreparedStatement::execute( ) throw (SQLException, RuntimeException) { + printf("--- PreparedStatement::execute\n"); osl::MutexGuard guard( m_refMutex->mutex ); OStringBuffer buf( m_stmt.getLength() *2 ); diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index 7304b15..b597832 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -897,6 +897,7 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert( sal_Bool Statement::execute( const OUString& sql ) throw (SQLException, RuntimeException) { + printf("--- Statement::execute\n"); osl::MutexGuard guard( m_refMutex->mutex ); checkClosed(); OString cmd = OUStringToOString( sql, m_pSettings ); diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index c3db5be..ff4d2a3 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -57,7 +57,6 @@ ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport, pDatabaseRangeContext(pTempDatabaseRangeContext), bSkipDuplicates(false), bCopyOutputData(false), - bUseRegularExpressions(false), bConditionSourceRange(false) { ScDocument* pDoc(GetScImport().GetDocument()); @@ -148,7 +147,6 @@ SvXMLImportContext *ScXMLFilterContext::CreateChildContext( sal_uInt16 nPrefix, void ScXMLFilterContext::EndElement() { - mrQueryParam.bRegExp = bUseRegularExpressions; mrQueryParam.bInplace = !bCopyOutputData; mrQueryParam.bDuplicate = !bSkipDuplicates; diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index 8a9715d..052829e 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -62,7 +62,6 @@ class ScXMLFilterContext : public SvXMLImportContext sal_Int16 nUserListIndex; bool bSkipDuplicates; bool bCopyOutputData; - bool bUseRegularExpressions; bool bEnabledUserList; bool bConditionSourceRange; std::vector<ConnStackItem> maConnStack; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits