summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2012-08-16 17:43:12 +0100
committerNoel Power <noel.power@suse.com>2012-08-16 17:43:12 +0100
commitd88325f73e6912928913eb41297e6aa4643655f5 (patch)
tree61b91a97ac06b00444920a832de8a04c1b5fcd5a /sc
parent094654fcebe35af07a9e12137becdf85277ef706 (diff)
Revert "fix for fdo#48200.diff import regrex state for filter"
This reverts commit 094654fcebe35af07a9e12137becdf85277ef706.
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/xml/xmlfilti.cxx2
-rw-r--r--sc/source/filter/xml/xmlfilti.hxx1
2 files changed, 3 insertions, 0 deletions
diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
index ff4d2a3eddf1..c3db5be4df73 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 052829ecdc8b..8a9715dc8183 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;