summaryrefslogtreecommitdiffstats
path: root/desktop
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-02-09 09:49:36 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-10 06:05:09 +0000
commit7cf66202f233043fff2ece108e877e885bf99ace (patch)
tree1fea94539f7a31277398f43f0a47a79f713d07ec /desktop
parentconvert Orientation to scoped enum (diff)
downloadcore-7cf66202f233043fff2ece108e877e885bf99ace.tar.gz
core-7cf66202f233043fff2ece108e877e885bf99ace.zip
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 'desktop')
-rw-r--r--desktop/source/migration/migration.cxx2
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 2efae5aa59d3..2f93f8ae756f 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 f59e0c05e012..7645e13926a4 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;