diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-06-28 05:47:16 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-06-28 11:06:54 +0200 |
| commit | 67c807ada5d7930f262ace9798629c06f0175a86 (patch) | |
| tree | 3e6c7d7c0e35f4893cedb91e83601e7514506f38 /vcl | |
| parent | b1ce8bb078904db1df542f7a1c2ed527dde1a2d3 (diff) | |
Drop i18nutil::SearchOptions
It was mostly unused by now, only remained in a couple of function
arguments, where callers actually passed SearchOptions2, and where
internally it was converted back to SearchOptions2.
Change-Id: Ib188ec3bf0de6d1f70a04eb90fb3a577df8b3d98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153687
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/edit/textview.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/edit/xtextedt.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 128db7f7b088..ad1d28d1997b 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -2071,7 +2071,7 @@ void TextView::CenterPaM( const TextPaM& rPaM ) Scroll(0, (nVisStartY + nVisEndY) / 2 - aRect.TopLeft().getY()); } -bool TextView::Search( const i18nutil::SearchOptions& rSearchOptions, bool bForward ) +bool TextView::Search( const i18nutil::SearchOptions2& rSearchOptions, bool bForward ) { bool bFound = false; TextSelection aSel( GetSelection() ); @@ -2099,7 +2099,7 @@ bool TextView::Search( const i18nutil::SearchOptions& rSearchOptions, bool bForw return bFound; } -sal_uInt16 TextView::Replace( const i18nutil::SearchOptions& rSearchOptions, bool bAll, bool bForward ) +sal_uInt16 TextView::Replace( const i18nutil::SearchOptions2& rSearchOptions, bool bAll, bool bForward ) { sal_uInt16 nFound = 0; diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx index 106ad69bf425..87097a5be27b 100644 --- a/vcl/source/edit/xtextedt.cxx +++ b/vcl/source/edit/xtextedt.cxx @@ -137,7 +137,7 @@ TextSelection ExtTextEngine::MatchGroup( const TextPaM& rCursor ) const return aSel; } -bool ExtTextEngine::Search( TextSelection& rSel, const i18nutil::SearchOptions& rSearchOptions, bool bForward ) const +bool ExtTextEngine::Search( TextSelection& rSel, const i18nutil::SearchOptions2& rSearchOptions, bool bForward ) const { TextSelection aSel( rSel ); aSel.Justify(); @@ -160,9 +160,9 @@ bool ExtTextEngine::Search( TextSelection& rSel, const i18nutil::SearchOptions& const sal_uInt32 nStartNode = aStartPaM.GetPara(); - i18nutil::SearchOptions aOptions( rSearchOptions ); + i18nutil::SearchOptions2 aOptions( rSearchOptions ); aOptions.Locale = Application::GetSettings().GetLanguageTag().getLocale(); - utl::TextSearch aSearcher( utl::TextSearch::UpgradeToSearchOptions2(aOptions) ); + utl::TextSearch aSearcher(aOptions); // iterate over the paragraphs for ( sal_uInt32 nNode = nStartNode; |