diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-09 09:49:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-10 06:05:09 +0000 |
| commit | 7cf66202f233043fff2ece108e877e885bf99ace (patch) | |
| tree | 1fea94539f7a31277398f43f0a47a79f713d07ec /sc/inc/docoptio.hxx | |
| parent | b3b2f2b95070f1a385c51f432a52b9c84470913f (diff) | |
convert SearchParam::SearchType to scoped enum
and drop unused SRCH_LEVDIST enumerator
Change-Id: Ic5118757060656562e04dd7da24a3f143abec3fb
Reviewed-on: https://gerrit.libreoffice.org/34065
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/inc/docoptio.hxx')
| -rw-r--r-- | sc/inc/docoptio.hxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 51e27170deeb..69bf7104e071 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -51,8 +51,6 @@ class SC_DLLPUBLIC ScDocOptions mutable bool bFormulaWildcardsEnabled;///< wildcards in formulas enabled, only when reading settings bool bWriteCalcConfig; ///< (subset of) Calc config will be written to user's profile - static const utl::SearchParam::SearchType eSearchTypeUnknown = static_cast<utl::SearchParam::SearchType>(-1); - public: ScDocOptions(); ScDocOptions( const ScDocOptions& rCpy ); @@ -96,16 +94,16 @@ public: utl::SearchParam::SearchType GetFormulaSearchType() const { - if (eFormulaSearchType == eSearchTypeUnknown || (bFormulaRegexEnabled && bFormulaWildcardsEnabled)) + if (eFormulaSearchType == utl::SearchParam::SearchType::Unknown || (bFormulaRegexEnabled && bFormulaWildcardsEnabled)) eFormulaSearchType = utl::SearchParam::ConvertToSearchType( bFormulaWildcardsEnabled, bFormulaRegexEnabled); return eFormulaSearchType; } void SetFormulaRegexEnabled( bool bVal ); - bool IsFormulaRegexEnabled() const { return GetFormulaSearchType() == utl::SearchParam::SRCH_REGEXP; } + bool IsFormulaRegexEnabled() const { return GetFormulaSearchType() == utl::SearchParam::SearchType::Regexp; } void SetFormulaWildcardsEnabled( bool bVal ); - bool IsFormulaWildcardsEnabled() const { return GetFormulaSearchType() == utl::SearchParam::SRCH_WILDCARD; } + bool IsFormulaWildcardsEnabled() const { return GetFormulaSearchType() == utl::SearchParam::SearchType::Wildcard; } void SetWriteCalcConfig( bool bVal ) { bWriteCalcConfig = bVal; } bool IsWriteCalcConfig() const { return bWriteCalcConfig; } |