diff options
author | Eike Rathke <erack@redhat.com> | 2016-02-19 13:20:09 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2016-02-20 00:40:44 +0100 |
commit | 59a175b692fd26200bf2dfbe411a969eef3e00f5 (patch) | |
tree | 14fa773c6f04841f4aba8ca3bab41f30aa52e02e | |
parent | ef02de2698d90fd874bddf3146165cbe85487bc5 (diff) |
read ODF table:use-wildcards, tdf#72196
Change-Id: I37dc8d6c75378fabda88930f6cc3f0508587207c
-rw-r--r-- | sc/source/filter/xml/XMLCalculationSettingsContext.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index 4110b5e44e0a..b99b58e5251b 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -89,9 +89,15 @@ ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& r } else if (IsXMLToken(aLocalName, XML_USE_REGULAR_EXPRESSIONS)) { - if (IsXMLToken(sValue, XML_FALSE)) + // Overwrite only the default (regex true) value, not wildcard. + if (eSearchType == utl::SearchParam::SRCH_REGEXP && IsXMLToken(sValue, XML_FALSE)) eSearchType = utl::SearchParam::SRCH_NORMAL; } + else if (IsXMLToken(aLocalName, XML_USE_WILDCARDS)) + { + if (IsXMLToken(sValue, XML_TRUE)) + eSearchType = utl::SearchParam::SRCH_WILDCARD; + } } } } |