[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Aug 20 08:37:39 PDT 2012


 sc/source/filter/xml/xmlfilti.cxx |    2 --
 sc/source/filter/xml/xmlfilti.hxx |    1 -
 2 files changed, 3 deletions(-)

New commits:
commit f1c26949e29278a3eae0c167f172a0fd4895fd2f
Author: Noel Power <noel.power at suse.com>
Date:   Thu Aug 16 17:43:40 2012 +0100

    fix for fdo#48200.diff import regrex state for filter
    
    Change-Id: If05b53602a8d8ea260093b3f6a9c0fca45cb74b9
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
index 65c9420..faee78f 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -61,7 +61,6 @@ ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport,
     pDatabaseRangeContext(pTempDatabaseRangeContext),
     bSkipDuplicates(false),
     bCopyOutputData(false),
-    bUseRegularExpressions(false),
     bConditionSourceRange(false)
 {
     ScDocument* pDoc(GetScImport().GetDocument());
@@ -152,7 +151,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;


More information about the Libreoffice-commits mailing list