diff options
| author | Eike Rathke <erack@redhat.com> | 2016-07-20 23:08:32 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-07-20 23:13:49 +0200 |
| commit | d77081946f59127aab4b017f455b0c5b489dcb84 (patch) | |
| tree | dff9c8ef24aef36346247c32f07195328829a2f7 | |
| parent | 74aa685bf35358202efb9e17901be9a232845c2b (diff) | |
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
| -rw-r--r-- | sc/inc/docoptio.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 529135bb9a37..3c2a8c7259a3 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; } |