[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/filter/xml/XMLCalculationSettingsContext.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 59a175b692fd26200bf2dfbe411a969eef3e00f5
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Feb 19 13:20:09 2016 +0100

    read ODF table:use-wildcards, tdf#72196
    
    Change-Id: I37dc8d6c75378fabda88930f6cc3f0508587207c

diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index 4110b5e..b99b58e 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;
+            }
         }
     }
 }