sc/inc/docoptio.hxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit d77081946f59127aab4b017f455b0c5b489dcb84
Author: Eike Rathke <er...@redhat.com>
Date: Wed Jul 20 23:08:32 2016 +0200
RegularExpressions and Wildcards are mutually exclusive, tdf#88581 follow-up
... so treat them as such.
This fixes the UNO API JunitTest that tries to enable RegularExpressions
with the now default enabled Wildcards config, which then overrode the
RegularExpressions when queried and returned false.
Change-Id: I85f7617a20d4cc392e1ce34bcb2d14792f6d4170
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index 529135b..3c2a8c7 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -106,6 +106,8 @@ public:
{
bFormulaRegexEnabled = bVal;
eFormulaSearchType = eSearchTypeUnknown;
+ if (bVal)
+ bFormulaWildcardsEnabled = false;
}
bool IsFormulaRegexEnabled() const { return
GetFormulaSearchType() == utl::SearchParam::SRCH_REGEXP; }
@@ -113,6 +115,8 @@ public:
{
bFormulaWildcardsEnabled = bVal;
eFormulaSearchType = eSearchTypeUnknown;
+ if (bVal)
+ bFormulaRegexEnabled = false;
}
bool IsFormulaWildcardsEnabled() const { return
GetFormulaSearchType() == utl::SearchParam::SRCH_WILDCARD; }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
