[Libreoffice-commits] core.git: connectivity/source desktop/source include/unotools sc/inc sc/source svx/source unotools/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Feb 10 06:05:40 UTC 2017
connectivity/source/drivers/mork/MQueryHelper.cxx | 2 -
desktop/source/migration/migration.cxx | 2 -
desktop/source/migration/services/oo3extensionmigration.cxx | 4 +--
include/unotools/textsearch.hxx | 13 +++------
sc/inc/docoptio.hxx | 8 ++----
sc/source/core/data/dociter.cxx | 4 +--
sc/source/core/data/dpcache.cxx | 2 -
sc/source/core/data/table3.cxx | 4 +--
sc/source/core/tool/chgviset.cxx | 2 -
sc/source/core/tool/compare.cxx | 6 ++--
sc/source/core/tool/docoptio.cxx | 10 +++----
sc/source/core/tool/doubleref.cxx | 2 -
sc/source/core/tool/interpr1.cxx | 14 +++++-----
sc/source/core/tool/queryparam.cxx | 4 +--
sc/source/filter/xml/XMLCalculationSettingsContext.cxx | 8 +++---
sc/source/filter/xml/XMLExportDataPilot.cxx | 4 +--
sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 4 +--
sc/source/filter/xml/xmlfilti.cxx | 16 ++++++------
sc/source/filter/xml/xmlfilti.hxx | 2 -
sc/source/ui/dbgui/filtdlg.cxx | 2 -
sc/source/ui/dbgui/foptmgr.cxx | 2 -
sc/source/ui/dbgui/pfiltdlg.cxx | 4 +--
sc/source/ui/dbgui/sfiltdlg.cxx | 4 +--
sc/source/ui/miscdlgs/acredlin.cxx | 2 -
sc/source/ui/unoobj/datauno.cxx | 6 ++--
sc/source/ui/view/gridwin.cxx | 4 +--
svx/source/dialog/ctredlin.cxx | 2 -
unotools/source/i18n/textsearch.cxx | 16 ++----------
28 files changed, 69 insertions(+), 84 deletions(-)
New commits:
commit 7cf66202f233043fff2ece108e877e885bf99ace
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Feb 9 09:49:36 2017 +0200
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 at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx
index 5fd79bc..e13e689 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -303,7 +303,7 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression
} else if (evStr->getCond() == MQueryOp::RegExp) {
SAL_INFO("connectivity.mork", "MQueryOp::RegExp; done");
utl::SearchParam param(
- searchedValue, utl::SearchParam::SRCH_REGEXP);
+ searchedValue, utl::SearchParam::SearchType::Regexp);
utl::TextSearch ts(param, LANGUAGE_DONTKNOW);
sal_Int32 start = 0;
sal_Int32 end = currentValue.getLength();
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 2efae5a..2f93f8a 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -590,7 +590,7 @@ strings_vr MigrationImpl::applyPatterns(const strings_v& vSet, const strings_v&
while (i_pat != vPatterns.end()) {
// find matches for this pattern in input set
// and copy them to the result
- SearchParam param(*i_pat, SearchParam::SRCH_REGEXP);
+ SearchParam param(*i_pat, SearchParam::SearchType::Regexp);
TextSearch ts(param, LANGUAGE_DONTKNOW);
i_set = vSet.begin();
sal_Int32 start = 0;
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index f59e0c0..7645e13 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -229,7 +229,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const OUString& sDescriptionXmlU
// scan extension identifier and try to match with our black list entries
for (OUString & i : m_aBlackList)
{
- utl::SearchParam param(i, utl::SearchParam::SRCH_REGEXP);
+ utl::SearchParam param(i, utl::SearchParam::SearchType::Regexp);
utl::TextSearch ts(param, LANGUAGE_DONTKNOW);
sal_Int32 start = 0;
@@ -254,7 +254,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const OUString& sDescriptionXmlU
// description.xml!
for (OUString & i : m_aBlackList)
{
- utl::SearchParam param(i, utl::SearchParam::SRCH_REGEXP);
+ utl::SearchParam param(i, utl::SearchParam::SearchType::Regexp);
utl::TextSearch ts(param, LANGUAGE_DONTKNOW);
sal_Int32 start = 0;
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 0a6185e..9efa5d2 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -47,9 +47,7 @@ namespace utl
class UNOTOOLS_DLLPUBLIC SearchParam
{
public:
- enum SearchType: int { SRCH_NORMAL, SRCH_REGEXP, SRCH_LEVDIST, SRCH_WILDCARD };
- // fix underlying type (as int, arbitrarily), so that
- // ScDocOptions::eSearchTypeUnknown = -1 does not cause -fsanitize=enum
+ enum class SearchType { Normal, Regexp, Wildcard, Unknown = -1 };
/** Convert configuration and document boolean settings to SearchType.
If bWildcard is true it takes precedence over rbRegExp.
@@ -63,9 +61,9 @@ public:
{
if (rbRegExp)
rbRegExp = false;
- return SRCH_WILDCARD;
+ return SearchType::Wildcard;
}
- return rbRegExp ? SRCH_REGEXP : SRCH_NORMAL;
+ return rbRegExp ? SearchType::Regexp : SearchType::Normal;
}
/** Convert SearchType to configuration and document boolean settings.
@@ -74,16 +72,15 @@ public:
{
switch (eSearchType)
{
- case SRCH_WILDCARD:
+ case SearchType::Wildcard:
rbWildcard = true;
rbRegExp = false;
break;
- case SRCH_REGEXP:
+ case SearchType::Regexp:
rbWildcard = false;
rbRegExp = true;
break;
default:
- // SRCH_LEVDIST is not a persistent setting.
rbWildcard = false;
rbRegExp = false;
break;
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index 51e2717..69bf710 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; }
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index f773937..a223b48 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1287,7 +1287,7 @@ bool ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol,
SetStopOnMismatch( true ); // assume sorted keys
SetTestEqualCondition( true );
bIgnoreMismatchOnLeadingStrings = true;
- bool bLiteral = mpParam->eSearchType == utl::SearchParam::SRCH_NORMAL &&
+ bool bLiteral = mpParam->eSearchType == utl::SearchParam::SearchType::Normal &&
mpParam->GetEntry(0).GetQueryItem().meType == ScQueryEntry::ByString;
bool bBinary = bLiteral && mpParam->bByRow && (mpParam->GetEntry(0).eOp ==
SC_LESS_EQUAL || mpParam->GetEntry(0).eOp == SC_GREATER_EQUAL);
@@ -1404,7 +1404,7 @@ bool ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol,
maCurPos = aPosSave;
return true;
}
- if ( (mpParam->eSearchType != utl::SearchParam::SRCH_NORMAL) &&
+ if ( (mpParam->eSearchType != utl::SearchParam::SearchType::Normal) &&
StoppedOnMismatch() )
{
// Assume found entry to be the last value less than respectively
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index fd41b12..48dfa09 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -512,7 +512,7 @@ bool ScDPCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam) const
{ // by String
OUString aCellStr = pCellData->GetString();
- bool bRealWildOrRegExp = (rParam.eSearchType != utl::SearchParam::SRCH_NORMAL &&
+ bool bRealWildOrRegExp = (rParam.eSearchType != utl::SearchParam::SearchType::Normal &&
((rEntry.eOp == SC_EQUAL) || (rEntry.eOp == SC_NOT_EQUAL)));
bool bTestWildOrRegExp = false;
if (bRealWildOrRegExp || bTestWildOrRegExp)
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index db2c8de..e5f0739 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -2268,7 +2268,7 @@ class QueryEvaluator
bool isRealWildOrRegExp(const ScQueryEntry& rEntry) const
{
- if (mrParam.eSearchType == utl::SearchParam::SRCH_NORMAL)
+ if (mrParam.eSearchType == utl::SearchParam::SearchType::Normal)
return false;
return isTextMatchOp(rEntry);
@@ -2279,7 +2279,7 @@ class QueryEvaluator
if (!mpTestEqualCondition)
return false;
- if (mrParam.eSearchType == utl::SearchParam::SRCH_NORMAL)
+ if (mrParam.eSearchType == utl::SearchParam::SearchType::Normal)
return false;
return (rEntry.eOp == SC_LESS_EQUAL || rEntry.eOp == SC_GREATER_EQUAL);
diff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxx
index a9016d1..d5f13a12 100644
--- a/sc/source/core/tool/chgviset.cxx
+++ b/sc/source/core/tool/chgviset.cxx
@@ -100,7 +100,7 @@ void ScChangeViewSettings::SetTheComment(const OUString& rString)
if(!rString.isEmpty())
{
utl::SearchParam aSearchParam( rString,
- utl::SearchParam::SRCH_REGEXP,false );
+ utl::SearchParam::SearchType::Regexp,false );
pCommentSearcher.reset( new utl::TextSearch( aSearchParam, *ScGlobal::pCharClass ) );
}
diff --git a/sc/source/core/tool/compare.cxx b/sc/source/core/tool/compare.cxx
index 4135953..bbc5bba 100644
--- a/sc/source/core/tool/compare.cxx
+++ b/sc/source/core/tool/compare.cxx
@@ -38,9 +38,9 @@ CompareOptions::CompareOptions( ScDocument* pDoc, const ScQueryEntry& rEntry, ut
bMatchWholeCell(pDoc->GetDocOptions().IsMatchWholeCell())
{
// Wildcard and Regex search work only with equal or not equal.
- if (eSearchType != utl::SearchParam::SRCH_NORMAL &&
+ if (eSearchType != utl::SearchParam::SearchType::Normal &&
!(aQueryEntry.eOp == SC_EQUAL || aQueryEntry.eOp == SC_NOT_EQUAL))
- eSearchType = utl::SearchParam::SRCH_NORMAL;
+ eSearchType = utl::SearchParam::SearchType::Normal;
// Interpreter functions usually are case insensitive, except the simple
// comparison operators, for which these options aren't used. Override in
@@ -136,7 +136,7 @@ double CompareFunc( const Compare& rComp, CompareOptions* pOptions )
// regex to work through GetSearchTextPtr().
ScQueryEntry& rEntry = pOptions->aQueryEntry;
OSL_ENSURE(rEntry.GetQueryItem().maString == rCell2.maStr, "ScInterpreter::CompareFunc: broken options");
- if (pOptions->eSearchType != utl::SearchParam::SRCH_NORMAL)
+ if (pOptions->eSearchType != utl::SearchParam::SearchType::Normal)
{
sal_Int32 nStart = 0;
sal_Int32 nStop = rCell1.maStr.getLength();
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index 1aa0fae..cbc6172 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -98,7 +98,7 @@ void ScDocOptions::ResetDocOptions()
bLookUpColRowNames = true;
bFormulaRegexEnabled= false;
bFormulaWildcardsEnabled= true;
- eFormulaSearchType = utl::SearchParam::SRCH_WILDCARD;
+ eFormulaSearchType = utl::SearchParam::SearchType::Wildcard;
bWriteCalcConfig = true;
}
@@ -108,14 +108,14 @@ void ScDocOptions::SetFormulaRegexEnabled( bool bVal )
{
bFormulaRegexEnabled = true;
bFormulaWildcardsEnabled = false;
- eFormulaSearchType = utl::SearchParam::SRCH_REGEXP;
+ eFormulaSearchType = utl::SearchParam::SearchType::Regexp;
}
else if (!bFormulaRegexEnabled)
; // nothing changes for setting false to false
else
{
bFormulaRegexEnabled = false;
- eFormulaSearchType = eSearchTypeUnknown;
+ eFormulaSearchType = utl::SearchParam::SearchType::Unknown;
}
}
@@ -125,14 +125,14 @@ void ScDocOptions::SetFormulaWildcardsEnabled( bool bVal )
{
bFormulaRegexEnabled = false;
bFormulaWildcardsEnabled = true;
- eFormulaSearchType = utl::SearchParam::SRCH_WILDCARD;
+ eFormulaSearchType = utl::SearchParam::SearchType::Wildcard;
}
else if (!bFormulaWildcardsEnabled)
; // nothing changes for setting false to false
else
{
bFormulaWildcardsEnabled = false;
- eFormulaSearchType = eSearchTypeUnknown;
+ eFormulaSearchType = utl::SearchParam::SearchType::Unknown;
}
}
diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx
index 51b7c54..76d9d87 100644
--- a/sc/source/core/tool/doubleref.cxx
+++ b/sc/source/core/tool/doubleref.cxx
@@ -264,7 +264,7 @@ void ScDBRangeBase::fillQueryOptions(ScQueryParamBase* pParam)
pParam->bByRow = true;
pParam->bInplace = true;
pParam->bCaseSens = false;
- pParam->eSearchType = utl::SearchParam::SRCH_NORMAL;
+ pParam->eSearchType = utl::SearchParam::SearchType::Normal;
pParam->bDuplicate = true;
}
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index d9d0658..bc0407e 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -4469,7 +4469,7 @@ void ScInterpreter::ScMatch()
bool bIsVBAMode = pDok->IsInVBAMode();
if ( bIsVBAMode )
- rParam.eSearchType = utl::SearchParam::SRCH_WILDCARD;
+ rParam.eSearchType = utl::SearchParam::SearchType::Wildcard;
else
rParam.eSearchType = DetectSearchType(rEntry.GetQueryItem().maString.getString(), pDok);
}
@@ -6908,7 +6908,7 @@ std::unique_ptr<ScDBQueryParamBase> ScInterpreter::GetDBParams( bool& rMissingFi
aQueryStr, nIndex, rItem.mfVal);
rItem.meType = bNumber ? ScQueryEntry::ByValue : ScQueryEntry::ByString;
- if (!bNumber && pParam->eSearchType == utl::SearchParam::SRCH_NORMAL)
+ if (!bNumber && pParam->eSearchType == utl::SearchParam::SearchType::Normal)
pParam->eSearchType = DetectSearchType(aQueryStr, pDok);
}
return pParam;
@@ -8671,19 +8671,19 @@ utl::SearchParam::SearchType ScInterpreter::DetectSearchType( const OUString& rS
if (pDoc)
{
if (pDoc->GetDocOptions().IsFormulaWildcardsEnabled())
- return MayBeWildcard( rStr ) ? utl::SearchParam::SRCH_WILDCARD : utl::SearchParam::SRCH_NORMAL;
+ return MayBeWildcard( rStr ) ? utl::SearchParam::SearchType::Wildcard : utl::SearchParam::SearchType::Normal;
if (pDoc->GetDocOptions().IsFormulaRegexEnabled())
- return MayBeRegExp( rStr ) ? utl::SearchParam::SRCH_REGEXP : utl::SearchParam::SRCH_NORMAL;
+ return MayBeRegExp( rStr ) ? utl::SearchParam::SearchType::Regexp : utl::SearchParam::SearchType::Normal;
}
else
{
/* TODO: obtain the global config for this rare case? */
if (MayBeRegExp( rStr, true))
- return utl::SearchParam::SRCH_REGEXP;
+ return utl::SearchParam::SearchType::Regexp;
if (MayBeWildcard( rStr ))
- return utl::SearchParam::SRCH_WILDCARD;
+ return utl::SearchParam::SearchType::Wildcard;
}
- return utl::SearchParam::SRCH_NORMAL;
+ return utl::SearchParam::SearchType::Normal;
}
static bool lcl_LookupQuery( ScAddress & o_rResultPos, ScDocument * pDoc,
diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx
index 5131a31..eee6cf7 100644
--- a/sc/source/core/tool/queryparam.cxx
+++ b/sc/source/core/tool/queryparam.cxx
@@ -64,7 +64,7 @@ ScQueryParamBase::const_iterator ScQueryParamBase::end() const
}
ScQueryParamBase::ScQueryParamBase() :
- eSearchType(utl::SearchParam::SRCH_NORMAL),
+ eSearchType(utl::SearchParam::SearchType::Normal),
bHasHeader(true),
bByRow(true),
bInplace(true),
@@ -299,7 +299,7 @@ void ScQueryParam::Clear()
nCol1=nCol2 = 0;
nRow1=nRow2 = 0;
nTab = SCTAB_MAX;
- eSearchType = utl::SearchParam::SRCH_NORMAL;
+ eSearchType = utl::SearchParam::SearchType::Normal;
bHasHeader = bCaseSens = false;
bInplace = bByRow = bDuplicate = true;
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index c995a6a..452cd3f 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -39,7 +39,7 @@ ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& r
fIterationEpsilon(0.001),
nIterationCount(100),
nYear2000(1930),
- eSearchType(utl::SearchParam::SRCH_REGEXP),
+ eSearchType(utl::SearchParam::SearchType::Regexp),
bIsIterationEnabled(false),
bCalcAsShown(false),
bIgnoreCase(false),
@@ -89,13 +89,13 @@ ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& r
else if (IsXMLToken(aLocalName, XML_USE_REGULAR_EXPRESSIONS))
{
// Overwrite only the default (regex true) value, not wildcard.
- if (eSearchType == utl::SearchParam::SRCH_REGEXP && IsXMLToken(sValue, XML_FALSE))
- eSearchType = utl::SearchParam::SRCH_NORMAL;
+ if (eSearchType == utl::SearchParam::SearchType::Regexp && IsXMLToken(sValue, XML_FALSE))
+ eSearchType = utl::SearchParam::SearchType::Normal;
}
else if (IsXMLToken(aLocalName, XML_USE_WILDCARDS))
{
if (IsXMLToken(sValue, XML_TRUE))
- eSearchType = utl::SearchParam::SRCH_WILDCARD;
+ eSearchType = utl::SearchParam::SearchType::Wildcard;
}
}
}
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
index 475bd12..54accf6 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -73,14 +73,14 @@ OUString ScXMLExportDataPilot::getDPOperatorXML(
{
case SC_EQUAL :
{
- if (eSearchType == utl::SearchParam::SRCH_REGEXP)
+ if (eSearchType == utl::SearchParam::SearchType::Regexp)
return GetXMLToken(XML_MATCH);
else
return OUString("=");
}
case SC_NOT_EQUAL :
{
- if (eSearchType == utl::SearchParam::SRCH_REGEXP)
+ if (eSearchType == utl::SearchParam::SearchType::Regexp)
return GetXMLToken(XML_NOMATCH);
else
return OUString("!=");
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index a0d1ede..d1a1691 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -391,7 +391,7 @@ private:
else if (rEntry.IsQueryByNonEmpty())
return GetXMLToken(XML_NOEMPTY);
- if (eSearchType == utl::SearchParam::SRCH_REGEXP)
+ if (eSearchType == utl::SearchParam::SearchType::Regexp)
return GetXMLToken(XML_MATCH);
else
return OUString("=");
@@ -405,7 +405,7 @@ private:
case SC_LESS_EQUAL:
return OUString("<=");
case SC_NOT_EQUAL:
- if (eSearchType == utl::SearchParam::SRCH_REGEXP)
+ if (eSearchType == utl::SearchParam::SearchType::Regexp)
return GetXMLToken(XML_NOMATCH);
else
return OUString("!=");
diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
index 944d7f2..2a846cd 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -380,15 +380,15 @@ SvXMLImportContext *ScXMLConditionContext::CreateChildContext( sal_uInt16 nPrefi
void ScXMLConditionContext::GetOperator(
const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry)
{
- rParam.eSearchType = utl::SearchParam::SRCH_NORMAL;
+ rParam.eSearchType = utl::SearchParam::SearchType::Normal;
if (IsXMLToken(aOpStr, XML_MATCH))
{
- rParam.eSearchType = utl::SearchParam::SRCH_REGEXP;
+ rParam.eSearchType = utl::SearchParam::SearchType::Regexp;
rEntry.eOp = SC_EQUAL;
}
else if (IsXMLToken(aOpStr, XML_NOMATCH))
{
- rParam.eSearchType = utl::SearchParam::SRCH_REGEXP;
+ rParam.eSearchType = utl::SearchParam::SearchType::Regexp;
rEntry.eOp = SC_NOT_EQUAL;
}
else if (aOpStr == "=")
@@ -522,7 +522,7 @@ ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport,
ScXMLImportContext( rImport, nPrfx, rLName ),
pDataPilotTable(pTempDataPilotTableContext),
aFilterFields(),
- eSearchType(utl::SearchParam::SRCH_NORMAL),
+ eSearchType(utl::SearchParam::SearchType::Normal),
nFilterFieldCount(0),
bSkipDuplicates(false),
bCopyOutputData(false),
@@ -802,15 +802,15 @@ SvXMLImportContext *ScXMLDPConditionContext::CreateChildContext( sal_uInt16 nPre
void ScXMLDPConditionContext::getOperatorXML(
const OUString& sTempOperator, ScQueryOp& aFilterOperator, utl::SearchParam::SearchType& rSearchType)
{
- rSearchType = utl::SearchParam::SRCH_NORMAL;
+ rSearchType = utl::SearchParam::SearchType::Normal;
if (IsXMLToken(sTempOperator, XML_MATCH))
{
- rSearchType = utl::SearchParam::SRCH_REGEXP;
+ rSearchType = utl::SearchParam::SearchType::Regexp;
aFilterOperator = SC_EQUAL;
}
else if (IsXMLToken(sTempOperator, XML_NOMATCH))
{
- rSearchType = utl::SearchParam::SRCH_REGEXP;
+ rSearchType = utl::SearchParam::SearchType::Regexp;
aFilterOperator = SC_NOT_EQUAL;
}
else if (sTempOperator == "=")
@@ -849,7 +849,7 @@ void ScXMLDPConditionContext::EndElement()
aFilterField.SetQueryByNonEmpty();
else
{
- utl::SearchParam::SearchType eSearchType = utl::SearchParam::SRCH_NORMAL;
+ utl::SearchParam::SearchType eSearchType = utl::SearchParam::SearchType::Normal;
getOperatorXML(sOperator, aFilterField.eOp, eSearchType);
pFilterContext->SetSearchType(eSearchType);
aFilterField.nField = nField;
diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx
index 3679ef8..7577581 100644
--- a/sc/source/filter/xml/xmlfilti.hxx
+++ b/sc/source/filter/xml/xmlfilti.hxx
@@ -205,7 +205,7 @@ public:
void SetIsCaseSensitive(const bool bTemp) { bIsCaseSensitive = bTemp; }
void SetSearchType(const utl::SearchParam::SearchType eTemp)
{
- if (eSearchType == utl::SearchParam::SRCH_NORMAL)
+ if (eSearchType == utl::SearchParam::SearchType::Normal)
eSearchType = eTemp;
}
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 5021cf2..d4bc252 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -649,7 +649,7 @@ ScQueryItem* ScFilterDlg::GetOutputItem()
theParam.bByRow = true;
theParam.bDuplicate = !pBtnUnique->IsChecked();
theParam.bCaseSens = pBtnCase->IsChecked();
- theParam.eSearchType = pBtnRegExp->IsChecked() ? utl::SearchParam::SRCH_REGEXP : utl::SearchParam::SRCH_NORMAL;
+ theParam.eSearchType = pBtnRegExp->IsChecked() ? utl::SearchParam::SearchType::Regexp : utl::SearchParam::SearchType::Normal;
theParam.bDestPers = pBtnDestPers->IsChecked();
// only set the three - reset everything else
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index f495b9b..e29b91f 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -83,7 +83,7 @@ void ScFilterOptionsMgr::Init()
pBtnCase ->Check( rQueryData.bCaseSens );
pBtnHeader ->Check( rQueryData.bHasHeader );
- pBtnRegExp ->Check( rQueryData.eSearchType == utl::SearchParam::SRCH_REGEXP );
+ pBtnRegExp ->Check( rQueryData.eSearchType == utl::SearchParam::SearchType::Regexp );
pBtnUnique ->Check( !rQueryData.bDuplicate );
if ( pViewData && pDoc )
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 33e7dfe..07a2c7c 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -127,7 +127,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
m_pLbConnect2->SetSelectHdl( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
m_pBtnCase->Check( theQueryData.bCaseSens );
- m_pBtnRegExp->Check( theQueryData.eSearchType == utl::SearchParam::SRCH_REGEXP );
+ m_pBtnRegExp->Check( theQueryData.eSearchType == utl::SearchParam::SearchType::Regexp );
m_pBtnUnique->Check( !theQueryData.bDuplicate );
pViewData = rQueryItem.GetViewData();
@@ -419,7 +419,7 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem()
theParam.bDuplicate = !m_pBtnUnique->IsChecked();
theParam.bCaseSens = m_pBtnCase->IsChecked();
- theParam.eSearchType = m_pBtnRegExp->IsChecked() ? utl::SearchParam::SRCH_REGEXP : utl::SearchParam::SRCH_NORMAL;
+ theParam.eSearchType = m_pBtnRegExp->IsChecked() ? utl::SearchParam::SearchType::Regexp : utl::SearchParam::SearchType::Normal;
if ( pOutItem ) DELETEZ( pOutItem );
pOutItem = new ScQueryItem( nWhichQuery, &theParam );
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index d3622bc..dedb788 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -360,8 +360,8 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn, void )
theOutParam.bHasHeader = pBtnHeader->IsChecked();
theOutParam.bByRow = true;
theOutParam.bCaseSens = pBtnCase->IsChecked();
- theOutParam.eSearchType = pBtnRegExp->IsChecked() ? utl::SearchParam::SRCH_REGEXP :
- utl::SearchParam::SRCH_NORMAL;
+ theOutParam.eSearchType = pBtnRegExp->IsChecked() ? utl::SearchParam::SearchType::Regexp :
+ utl::SearchParam::SearchType::Normal;
theOutParam.bDuplicate = !pBtnUnique->IsChecked();
theOutParam.bDestPers = pBtnDestPers->IsChecked();
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index fe63085..04e8a80 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -272,7 +272,7 @@ void ScAcceptChgDlg::Init()
pTheView->SetFilterComment(pTPFilter->IsComment());
utl::SearchParam aSearchParam( pTPFilter->GetComment(),
- utl::SearchParam::SRCH_REGEXP,false );
+ utl::SearchParam::SearchType::Regexp,false );
pTheView->SetCommentParams(&aSearchParam);
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index d6397b7..449741f 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -1434,8 +1434,8 @@ void SAL_CALL ScFilterDescriptorBase::setPropertyValue(
else if (aPropertyName == SC_UNONAME_SKIPDUP)
aParam.bDuplicate = !(ScUnoHelpFunctions::GetBoolFromAny( aValue ));
else if (aPropertyName == SC_UNONAME_USEREGEX)
- aParam.eSearchType = ScUnoHelpFunctions::GetBoolFromAny( aValue ) ? utl::SearchParam::SRCH_REGEXP :
- utl::SearchParam::SRCH_NORMAL;
+ aParam.eSearchType = ScUnoHelpFunctions::GetBoolFromAny( aValue ) ? utl::SearchParam::SearchType::Regexp :
+ utl::SearchParam::SearchType::Normal;
PutData(aParam);
}
@@ -1475,7 +1475,7 @@ uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const OUString& aPro
else if (aPropertyName == SC_UNONAME_SKIPDUP )
aRet <<= !(aParam.bDuplicate);
else if (aPropertyName == SC_UNONAME_USEREGEX )
- aRet <<= (aParam.eSearchType == utl::SearchParam::SRCH_REGEXP);
+ aRet <<= (aParam.eSearchType == utl::SearchParam::SearchType::Regexp);
return aRet;
}
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 66c05b5..8f1697c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1295,7 +1295,7 @@ void ScGridWindow::ExecFilter( sal_uLong nSel,
bool bFound = false;
if (!aParam.bInplace)
bDeleteOld = true;
- if (aParam.eSearchType != utl::SearchParam::SRCH_NORMAL)
+ if (aParam.eSearchType != utl::SearchParam::SearchType::Normal)
bDeleteOld = true;
SCSIZE nCount = aParam.GetEntryCount();
for (SCSIZE i = 0; i < nCount && !bDeleteOld; ++i) // current filter settings
@@ -1326,7 +1326,7 @@ void ScGridWindow::ExecFilter( sal_uLong nSel,
aParam.GetEntry(i).Clear();
nQueryPos = 0;
aParam.bInplace = true;
- aParam.eSearchType = utl::SearchParam::SRCH_NORMAL;
+ aParam.eSearchType = utl::SearchParam::SearchType::Normal;
}
if ( nQueryPos < nCount || SC_AUTOFILTER_ALL == nSel ) // delete is always possible
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 80fcd2a..cc0f774 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -977,7 +977,7 @@ void SvxTPFilter::DeactivatePage()
pRedlinTable->SetFilterComment(IsComment());
utl::SearchParam aSearchParam( m_pEdComment->GetText(),
- utl::SearchParam::SRCH_REGEXP,false );
+ utl::SearchParam::SearchType::Regexp,false );
pRedlinTable->SetCommentParams(&aSearchParam);
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index 6cab875..d147765 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -199,7 +199,7 @@ void TextSearch::Init( const SearchParam & rParam,
switch( rParam.GetSrchType() )
{
- case SearchParam::SRCH_WILDCARD:
+ case SearchParam::SearchType::Wildcard:
aSOpt.AlgorithmType2 = SearchAlgorithms2::WILDCARD;
aSOpt.algorithmType = SearchAlgorithms_MAKE_FIXED_SIZE; // no old enum for that
aSOpt.WildcardEscapeCharacter = rParam.GetWildEscChar();
@@ -207,7 +207,7 @@ void TextSearch::Init( const SearchParam & rParam,
aSOpt.searchFlag |= SearchFlags::WILD_MATCH_SELECTION;
break;
- case SearchParam::SRCH_REGEXP:
+ case SearchParam::SearchType::Regexp:
aSOpt.AlgorithmType2 = SearchAlgorithms2::REGEXP;
aSOpt.algorithmType = SearchAlgorithms_REGEXP;
if( rParam.IsSrchInSelection() )
@@ -215,17 +215,7 @@ void TextSearch::Init( const SearchParam & rParam,
SearchFlags::REG_NOT_ENDOFLINE;
break;
- case SearchParam::SRCH_LEVDIST:
- aSOpt.AlgorithmType2 = SearchAlgorithms2::APPROXIMATE;
- aSOpt.algorithmType = SearchAlgorithms_APPROXIMATE;
- aSOpt.changedChars = rParam.GetLEVOther();
- aSOpt.deletedChars = rParam.GetLEVLonger();
- aSOpt.insertedChars = rParam.GetLEVShorter();
- if( rParam.IsSrchRelaxed() )
- aSOpt.searchFlag |= SearchFlags::LEV_RELAXED;
- break;
-
- case SearchParam::SRCH_NORMAL:
+ case SearchParam::SearchType::Normal:
aSOpt.AlgorithmType2 = SearchAlgorithms2::ABSOLUTE;
aSOpt.algorithmType = SearchAlgorithms_ABSOLUTE;
if( rParam.IsSrchWordOnly() )
More information about the Libreoffice-commits
mailing list