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, 3 insertions(+), 18 deletions(-)
New commits:
commit d88325f73e6912928913eb41297e6aa4643655f5
Author: Noel Power <noel.po...@suse.com>
Date: Thu Aug 16 17:43:12 2012 +0100
Revert "fix for fdo#48200.diff import regrex state for filter"
This reverts commit 094654fcebe35af07a9e12137becdf85277ef706.
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx
b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 07ddbee..d12d0c2 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -151,7 +151,6 @@ 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 63e1746..cf0e8c6 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -252,7 +252,6 @@ 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 6c94688..3265547 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
@@ -128,7 +128,6 @@ 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 136f92e..7bf0016 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -615,7 +615,6 @@ 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 ee6f01c..0d810fc 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -169,7 +169,6 @@ 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 d8453dd..5667260 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -285,7 +285,6 @@ 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 5a9ad3c..7dbb6c6 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -140,7 +140,6 @@ 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 c3f0163..a7e24bc 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -220,7 +220,6 @@ 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 4315a7f..26167b3 100644
--- a/connectivity/source/drivers/kab/KPreparedStatement.cxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx
@@ -142,7 +142,6 @@ 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 85c64a9..a84d476 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -394,7 +394,6 @@ 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 bb5275d..79a65cc 100644
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
@@ -155,7 +155,6 @@ 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 4d5ecd2..7ea31f7 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -402,7 +402,6 @@ 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 dfecab7..9a650ef 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
@@ -174,7 +174,6 @@ 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 723788f..c1041d9 100644
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
@@ -305,7 +305,6 @@ 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 4174c14..a5d24dd 100644
--- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
@@ -144,7 +144,6 @@ 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 08a3984..ce92dee 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -331,7 +331,6 @@ 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 e56432e..9c35eef 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -388,7 +388,6 @@ 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 b597832..7304b15 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -897,7 +897,6 @@ 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 ff4d2a3..c3db5be 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -57,6 +57,7 @@ ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport,
pDatabaseRangeContext(pTempDatabaseRangeContext),
bSkipDuplicates(false),
bCopyOutputData(false),
+ bUseRegularExpressions(false),
bConditionSourceRange(false)
{
ScDocument* pDoc(GetScImport().GetDocument());
@@ -147,6 +148,7 @@ 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 052829e..8a9715d 100644
--- a/sc/source/filter/xml/xmlfilti.hxx
+++ b/sc/source/filter/xml/xmlfilti.hxx
@@ -62,6 +62,7 @@ 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
