diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-07-01 10:33:48 -0500 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-02 07:31:30 +0000 |
| commit | 6a08067902ddc0ec61a7c7b4b0035b303f643a50 (patch) | |
| tree | cd49d1824cd169d9d224925b836eaa70de27414e /desktop/source/migration | |
| parent | 82a1d75ee59c46e6bb361b98c520cc4eff2e770c (diff) | |
OUString convertion for unotools
Change-Id: Ifae7f344e3827875e32afa3cda23c771f5735707
Reviewed-on: https://gerrit.libreoffice.org/4659
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'desktop/source/migration')
| -rw-r--r-- | desktop/source/migration/migration.cxx | 8 | ||||
| -rw-r--r-- | desktop/source/migration/services/oo3extensionmigration.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 2b361135da8d..932c9fb59853 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -647,12 +647,12 @@ strings_vr MigrationImpl::applyPatterns(const strings_v& vSet, const strings_v& SearchParam param(*i_pat, SearchParam::SRCH_REGEXP); TextSearch ts(param, LANGUAGE_DONTKNOW); i_set = vSet.begin(); - xub_StrLen start = 0; - xub_StrLen end = 0; + sal_Int32 start = 0; + sal_Int32 end = 0; while (i_set != vSet.end()) { - end = (xub_StrLen)(i_set->getLength()); - if (ts.SearchFrwrd(*i_set, &start, &end)) + end = i_set->getLength(); + if (ts.SearchForward(*i_set, &start, &end)) vrResult->push_back(*i_set); ++i_set; } diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index 75590a806f81..0f039d36b069 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -287,9 +287,9 @@ bool OO3ExtensionMigration::scanDescriptionXml( const OUString& sDescriptionXmlU utl::SearchParam param(m_aBlackList[i], utl::SearchParam::SRCH_REGEXP); utl::TextSearch ts(param, LANGUAGE_DONTKNOW); - xub_StrLen start = 0; - xub_StrLen end = static_cast<sal_uInt16>(sDescriptionXmlURL.getLength()); - if (ts.SearchFrwrd(sDescriptionXmlURL, &start, &end)) + sal_Int32 start = 0; + sal_Int32 end = sDescriptionXmlURL.getLength(); + if (ts.SearchForward(sDescriptionXmlURL, &start, &end)) return false; } } |