summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/srchdlg.cxx44
-rw-r--r--svx/source/form/fmsrccfg.cxx107
-rw-r--r--svx/source/form/fmsrcimp.cxx21
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.cxx15
4 files changed, 92 insertions, 95 deletions
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 2b9f124a1810..35903aaf4b5f 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -37,8 +37,6 @@
#include <svl/ctloptions.hxx>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/i18n/TransliterationModules.hpp>
-#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
@@ -270,7 +268,7 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWi
, pFamilyController(nullptr)
, pSearchSetController(nullptr)
, pReplaceSetController(nullptr)
- , nTransliterationFlags(0x00000000)
+ , nTransliterationFlags(TransliterationFlags::NONE)
{
get(m_pSearchFrame, "searchframe");
get(m_pSearchLB, "searchterm");
@@ -581,16 +579,16 @@ bool SvxSearchDialog::Close()
}
-sal_Int32 SvxSearchDialog::GetTransliterationFlags() const
+TransliterationFlags SvxSearchDialog::GetTransliterationFlags() const
{
if (!m_pMatchCaseCB->IsChecked())
- nTransliterationFlags |= TransliterationModules_IGNORE_CASE;
+ nTransliterationFlags |= TransliterationFlags::IGNORE_CASE;
else
- nTransliterationFlags &= ~TransliterationModules_IGNORE_CASE;
+ nTransliterationFlags &= ~TransliterationFlags::IGNORE_CASE;
if ( !m_pJapMatchFullHalfWidthCB->IsChecked())
- nTransliterationFlags |= TransliterationModules_IGNORE_WIDTH;
+ nTransliterationFlags |= TransliterationFlags::IGNORE_WIDTH;
else
- nTransliterationFlags &= ~TransliterationModules_IGNORE_WIDTH;
+ nTransliterationFlags &= ~TransliterationFlags::IGNORE_WIDTH;
return nTransliterationFlags;
}
@@ -600,12 +598,12 @@ void SvxSearchDialog::SetSaveToModule(bool b)
}
-void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings )
+void SvxSearchDialog::ApplyTransliterationFlags_Impl( TransliterationFlags nSettings )
{
nTransliterationFlags = nSettings;
- bool bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE);
- m_pMatchCaseCB->Check(!bVal );
- bVal = 0 != (nSettings & TransliterationModules_IGNORE_WIDTH);
+ bool bVal(nSettings & TransliterationFlags::IGNORE_CASE);
+ m_pMatchCaseCB->Check( !bVal );
+ bVal = bool(nSettings & TransliterationFlags::IGNORE_WIDTH);
m_pJapMatchFullHalfWidthCB->Check( !bVal );
}
@@ -1332,14 +1330,14 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void )
pSearchItem->SetPattern(GetCheckBoxValue(m_pLayoutBtn));
pSearchItem->SetSelection(GetCheckBoxValue(m_pSelectionBtn));
pSearchItem->SetUseAsianOptions(GetCheckBoxValue(m_pJapOptionsCB));
- sal_Int32 nFlags = GetTransliterationFlags();
+ TransliterationFlags nFlags = GetTransliterationFlags();
if( !pSearchItem->IsUseAsianOptions())
- nFlags &= (TransliterationModules_IGNORE_CASE |
- TransliterationModules_IGNORE_WIDTH );
+ nFlags &= (TransliterationFlags::IGNORE_CASE |
+ TransliterationFlags::IGNORE_WIDTH );
if (GetCheckBoxValue(m_pIgnoreDiacritics))
- nFlags |= TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
+ nFlags |= TransliterationFlags::IGNORE_DIACRITICS_CTL;
if (GetCheckBoxValue(m_pIgnoreKashida))
- nFlags |= TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
+ nFlags |= TransliterationFlags::IGNORE_KASHIDA_CTL;
pSearchItem->SetTransliterationFlags( nFlags );
if ( !bWriter )
@@ -1424,7 +1422,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void )
int nRet = aDlg->Execute();
if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true
{
- sal_Int32 nFlags = aDlg->GetTransliterationFlags();
+ TransliterationFlags nFlags = aDlg->GetTransliterationFlags();
pSearchItem->SetTransliterationFlags( nFlags );
ApplyTransliterationFlags_Impl( nFlags );
}
@@ -2308,14 +2306,14 @@ void SvxSearchDialog::SaveToModule_Impl()
aOpt.SetIgnoreKashida_CTL(GetCheckBoxValue(m_pIgnoreKashida));
aOpt.Commit();
- sal_Int32 nFlags = GetTransliterationFlags();
+ TransliterationFlags nFlags = GetTransliterationFlags();
if( !pSearchItem->IsUseAsianOptions())
- nFlags &= (TransliterationModules_IGNORE_CASE |
- TransliterationModules_IGNORE_WIDTH );
+ nFlags &= (TransliterationFlags::IGNORE_CASE |
+ TransliterationFlags::IGNORE_WIDTH );
if (GetCheckBoxValue(m_pIgnoreDiacritics))
- nFlags |= TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
+ nFlags |= TransliterationFlags::IGNORE_DIACRITICS_CTL;
if (GetCheckBoxValue(m_pIgnoreKashida))
- nFlags |= TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
+ nFlags |= TransliterationFlags::IGNORE_KASHIDA_CTL;
pSearchItem->SetTransliterationFlags( nFlags );
if ( !bWriter )
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index ee71be3a63de..6181fc2c3cc6 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -20,18 +20,17 @@
#include "svx/fmsrccfg.hxx"
#include <osl/diagnose.h>
-#include <com/sun/star/i18n/TransliterationModules.hpp>
#include <comphelper/processfactory.hxx>
+#include <i18nutil/transliteration.hxx>
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::i18n;
namespace svxform
{
// search parameters
FmSearchParams::FmSearchParams()
- :nTransliterationFlags( 0 )
+ :nTransliterationFlags( TransliterationFlags::NONE )
,nSearchForType ( 0 )
,nPosition ( MATCHING_ANYWHERE )
,nLevOther ( 2 )
@@ -47,29 +46,29 @@ namespace svxform
,bSoundsLikeCJK ( false )
{
nTransliterationFlags =
- TransliterationModules_ignoreSpace_ja_JP
- | TransliterationModules_ignoreMiddleDot_ja_JP
- | TransliterationModules_ignoreProlongedSoundMark_ja_JP
- | TransliterationModules_ignoreSeparator_ja_JP
- | TransliterationModules_IGNORE_CASE;
+ TransliterationFlags::ignoreSpace_ja_JP
+ | TransliterationFlags::ignoreMiddleDot_ja_JP
+ | TransliterationFlags::ignoreProlongedSoundMark_ja_JP
+ | TransliterationFlags::ignoreSeparator_ja_JP
+ | TransliterationFlags::IGNORE_CASE;
}
bool FmSearchParams::isIgnoreWidthCJK( ) const
{
- return 0 != (nTransliterationFlags & TransliterationModules_IGNORE_WIDTH);
+ return bool(nTransliterationFlags & TransliterationFlags::IGNORE_WIDTH);
}
bool FmSearchParams::isCaseSensitive( ) const
{
- return 0 == (nTransliterationFlags & TransliterationModules_IGNORE_CASE);
+ return !(nTransliterationFlags & TransliterationFlags::IGNORE_CASE);
}
void FmSearchParams::setCaseSensitive( bool _bCase )
{
if ( _bCase )
- nTransliterationFlags &= ~TransliterationModules_IGNORE_CASE;
+ nTransliterationFlags &= ~TransliterationFlags::IGNORE_CASE;
else
- nTransliterationFlags |= TransliterationModules_IGNORE_CASE;
+ nTransliterationFlags |= TransliterationFlags::IGNORE_CASE;
}
// maps from ascii values to int values
@@ -206,28 +205,28 @@ namespace svxform
nPosition = lcl_implMapAsciiValue( m_sSearchPosition, lcl_getSearchPositionValueMap() );
// the transliteration flags
- nTransliterationFlags = 0;
-
- if ( !m_bIsMatchCase ) nTransliterationFlags |= TransliterationModules_IGNORE_CASE;
- if ( m_bIsMatchFullHalfWidthForms ) nTransliterationFlags |= TransliterationModules_IGNORE_WIDTH;
- if ( m_bIsMatchHiraganaKatakana ) nTransliterationFlags |= TransliterationModules_IGNORE_KANA;
- if ( m_bIsMatchContractions ) nTransliterationFlags |= TransliterationModules_ignoreSize_ja_JP;
- if ( m_bIsMatchMinusDashCho_on ) nTransliterationFlags |= TransliterationModules_ignoreMinusSign_ja_JP;
- if ( m_bIsMatchRepeatCharMarks ) nTransliterationFlags |= TransliterationModules_ignoreIterationMark_ja_JP;
- if ( m_bIsMatchVariantFormKanji ) nTransliterationFlags |= TransliterationModules_ignoreTraditionalKanji_ja_JP;
- if ( m_bIsMatchOldKanaForms ) nTransliterationFlags |= TransliterationModules_ignoreTraditionalKana_ja_JP;
- if ( m_bIsMatch_DiZi_DuZu ) nTransliterationFlags |= TransliterationModules_ignoreZiZu_ja_JP;
- if ( m_bIsMatch_BaVa_HaFa ) nTransliterationFlags |= TransliterationModules_ignoreBaFa_ja_JP;
- if ( m_bIsMatch_TsiThiChi_DhiZi ) nTransliterationFlags |= TransliterationModules_ignoreTiJi_ja_JP;
- if ( m_bIsMatch_HyuIyu_ByuVyu ) nTransliterationFlags |= TransliterationModules_ignoreHyuByu_ja_JP;
- if ( m_bIsMatch_SeShe_ZeJe ) nTransliterationFlags |= TransliterationModules_ignoreSeZe_ja_JP;
- if ( m_bIsMatch_IaIya ) nTransliterationFlags |= TransliterationModules_ignoreIandEfollowedByYa_ja_JP;
- if ( m_bIsMatch_KiKu ) nTransliterationFlags |= TransliterationModules_ignoreKiKuFollowedBySa_ja_JP;
-
- if ( m_bIsIgnorePunctuation ) nTransliterationFlags |= TransliterationModules_ignoreSeparator_ja_JP;
- if ( m_bIsIgnoreWhitespace ) nTransliterationFlags |= TransliterationModules_ignoreSpace_ja_JP;
- if ( m_bIsIgnoreProlongedSoundMark ) nTransliterationFlags |= TransliterationModules_ignoreProlongedSoundMark_ja_JP;
- if ( m_bIsIgnoreMiddleDot ) nTransliterationFlags |= TransliterationModules_ignoreMiddleDot_ja_JP;
+ nTransliterationFlags = TransliterationFlags::NONE;
+
+ if ( !m_bIsMatchCase ) nTransliterationFlags |= TransliterationFlags::IGNORE_CASE;
+ if ( m_bIsMatchFullHalfWidthForms ) nTransliterationFlags |= TransliterationFlags::IGNORE_WIDTH;
+ if ( m_bIsMatchHiraganaKatakana ) nTransliterationFlags |= TransliterationFlags::IGNORE_KANA;
+ if ( m_bIsMatchContractions ) nTransliterationFlags |= TransliterationFlags::ignoreSize_ja_JP;
+ if ( m_bIsMatchMinusDashCho_on ) nTransliterationFlags |= TransliterationFlags::ignoreMinusSign_ja_JP;
+ if ( m_bIsMatchRepeatCharMarks ) nTransliterationFlags |= TransliterationFlags::ignoreIterationMark_ja_JP;
+ if ( m_bIsMatchVariantFormKanji ) nTransliterationFlags |= TransliterationFlags::ignoreTraditionalKanji_ja_JP;
+ if ( m_bIsMatchOldKanaForms ) nTransliterationFlags |= TransliterationFlags::ignoreTraditionalKana_ja_JP;
+ if ( m_bIsMatch_DiZi_DuZu ) nTransliterationFlags |= TransliterationFlags::ignoreZiZu_ja_JP;
+ if ( m_bIsMatch_BaVa_HaFa ) nTransliterationFlags |= TransliterationFlags::ignoreBaFa_ja_JP;
+ if ( m_bIsMatch_TsiThiChi_DhiZi ) nTransliterationFlags |= TransliterationFlags::ignoreTiJi_ja_JP;
+ if ( m_bIsMatch_HyuIyu_ByuVyu ) nTransliterationFlags |= TransliterationFlags::ignoreHyuByu_ja_JP;
+ if ( m_bIsMatch_SeShe_ZeJe ) nTransliterationFlags |= TransliterationFlags::ignoreSeZe_ja_JP;
+ if ( m_bIsMatch_IaIya ) nTransliterationFlags |= TransliterationFlags::ignoreIandEfollowedByYa_ja_JP;
+ if ( m_bIsMatch_KiKu ) nTransliterationFlags |= TransliterationFlags::ignoreKiKuFollowedBySa_ja_JP;
+
+ if ( m_bIsIgnorePunctuation ) nTransliterationFlags |= TransliterationFlags::ignoreSeparator_ja_JP;
+ if ( m_bIsIgnoreWhitespace ) nTransliterationFlags |= TransliterationFlags::ignoreSpace_ja_JP;
+ if ( m_bIsIgnoreProlongedSoundMark ) nTransliterationFlags |= TransliterationFlags::ignoreProlongedSoundMark_ja_JP;
+ if ( m_bIsIgnoreMiddleDot ) nTransliterationFlags |= TransliterationFlags::ignoreMiddleDot_ja_JP;
}
void FmSearchConfigItem::implTranslateToConfig( )
@@ -240,26 +239,26 @@ namespace svxform
// the transliteration flags
- m_bIsMatchCase = ( 0 == ( nTransliterationFlags & TransliterationModules_IGNORE_CASE ) );
- m_bIsMatchFullHalfWidthForms = ( 0 != ( nTransliterationFlags & TransliterationModules_IGNORE_WIDTH ) );
- m_bIsMatchHiraganaKatakana = ( 0 != ( nTransliterationFlags & TransliterationModules_IGNORE_KANA ) );
- m_bIsMatchContractions = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreSize_ja_JP ) );
- m_bIsMatchMinusDashCho_on = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreMinusSign_ja_JP ) );
- m_bIsMatchRepeatCharMarks = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreIterationMark_ja_JP ) );
- m_bIsMatchVariantFormKanji = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreTraditionalKanji_ja_JP ) );
- m_bIsMatchOldKanaForms = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreTraditionalKana_ja_JP ) );
- m_bIsMatch_DiZi_DuZu = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreZiZu_ja_JP ) );
- m_bIsMatch_BaVa_HaFa = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreBaFa_ja_JP ) );
- m_bIsMatch_TsiThiChi_DhiZi = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreTiJi_ja_JP ) );
- m_bIsMatch_HyuIyu_ByuVyu = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreHyuByu_ja_JP ) );
- m_bIsMatch_SeShe_ZeJe = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreSeZe_ja_JP ) );
- m_bIsMatch_IaIya = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreIandEfollowedByYa_ja_JP ) );
- m_bIsMatch_KiKu = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreKiKuFollowedBySa_ja_JP ) );
-
- m_bIsIgnorePunctuation = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreSeparator_ja_JP ) );
- m_bIsIgnoreWhitespace = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreSpace_ja_JP ) );
- m_bIsIgnoreProlongedSoundMark = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreProlongedSoundMark_ja_JP ) );
- m_bIsIgnoreMiddleDot = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreMiddleDot_ja_JP ) );
+ m_bIsMatchCase = !( nTransliterationFlags & TransliterationFlags::IGNORE_CASE );
+ m_bIsMatchFullHalfWidthForms = bool( nTransliterationFlags & TransliterationFlags::IGNORE_WIDTH );
+ m_bIsMatchHiraganaKatakana = bool( nTransliterationFlags & TransliterationFlags::IGNORE_KANA );
+ m_bIsMatchContractions = bool( nTransliterationFlags & TransliterationFlags::ignoreSize_ja_JP );
+ m_bIsMatchMinusDashCho_on = bool( nTransliterationFlags & TransliterationFlags::ignoreMinusSign_ja_JP );
+ m_bIsMatchRepeatCharMarks = bool( nTransliterationFlags & TransliterationFlags::ignoreIterationMark_ja_JP );
+ m_bIsMatchVariantFormKanji = bool( nTransliterationFlags & TransliterationFlags::ignoreTraditionalKanji_ja_JP );
+ m_bIsMatchOldKanaForms = bool( nTransliterationFlags & TransliterationFlags::ignoreTraditionalKana_ja_JP );
+ m_bIsMatch_DiZi_DuZu = bool( nTransliterationFlags & TransliterationFlags::ignoreZiZu_ja_JP );
+ m_bIsMatch_BaVa_HaFa = bool( nTransliterationFlags & TransliterationFlags::ignoreBaFa_ja_JP );
+ m_bIsMatch_TsiThiChi_DhiZi = bool( nTransliterationFlags & TransliterationFlags::ignoreTiJi_ja_JP );
+ m_bIsMatch_HyuIyu_ByuVyu = bool( nTransliterationFlags & TransliterationFlags::ignoreHyuByu_ja_JP );
+ m_bIsMatch_SeShe_ZeJe = bool( nTransliterationFlags & TransliterationFlags::ignoreSeZe_ja_JP );
+ m_bIsMatch_IaIya = bool( nTransliterationFlags & TransliterationFlags::ignoreIandEfollowedByYa_ja_JP );
+ m_bIsMatch_KiKu = bool( nTransliterationFlags & TransliterationFlags::ignoreKiKuFollowedBySa_ja_JP );
+
+ m_bIsIgnorePunctuation = bool( nTransliterationFlags & TransliterationFlags::ignoreSeparator_ja_JP );
+ m_bIsIgnoreWhitespace = bool( nTransliterationFlags & TransliterationFlags::ignoreSpace_ja_JP );
+ m_bIsIgnoreProlongedSoundMark = bool( nTransliterationFlags & TransliterationFlags::ignoreProlongedSoundMark_ja_JP );
+ m_bIsIgnoreMiddleDot = bool( nTransliterationFlags & TransliterationFlags::ignoreMiddleDot_ja_JP );
}
const FmSearchParams& FmSearchConfigItem::getParams() const
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 1e1d3aa337c5..f84ceee8ab2b 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -29,12 +29,10 @@
#include <svx/dialmgr.hxx>
#include <vcl/svapp.hxx>
#include <unotools/textsearch.hxx>
-#include <com/sun/star/util/SearchOptions2.hpp>
#include <com/sun/star/util/SearchAlgorithms2.hpp>
#include <com/sun/star/util/SearchResult.hpp>
#include <com/sun/star/util/SearchFlags.hpp>
#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/i18n/TransliterationModules.hpp>
#include <com/sun/star/i18n/CollatorOptions.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
@@ -51,6 +49,7 @@
#include <comphelper/numbers.hxx>
#include <unotools/syslocale.hxx>
+#include <i18nutil/searchopt.hxx>
#define EQUAL_BOOKMARKS(a, b) a == b
@@ -474,13 +473,13 @@ FmSearchEngine::SearchResult FmSearchEngine::SearchRegularApprox(const OUString&
FieldCollection::const_iterator iterInitialField = iterFieldLoop;
// Parameter sammeln
- SearchOptions2 aParam;
+ i18nutil::SearchOptions2 aParam;
aParam.AlgorithmType2 = m_bRegular ? SearchAlgorithms2::REGEXP : SearchAlgorithms2::APPROXIMATE;
aParam.searchFlag = 0;
aParam.transliterateFlags = GetTransliterationFlags();
if ( !GetTransliteration() )
{ // if transliteration is not enabled, the only flags which matter are IGNORE_CASE and IGNORE_WIDTH
- aParam.transliterateFlags &= TransliterationModules_IGNORE_CASE | TransliterationModules_IGNORE_WIDTH;
+ aParam.transliterateFlags &= TransliterationFlags::IGNORE_CASE | TransliterationFlags::IGNORE_WIDTH;
}
if (m_bLevenshtein)
{
@@ -605,7 +604,7 @@ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext,
,m_nLevShorter(0)
,m_nLevLonger(0)
,m_nPosition(MATCHING_ANYWHERE)
- ,m_nTransliterationFlags(0)
+ ,m_nTransliterationFlags(TransliterationFlags::NONE)
{
fillControlTexts(arrFields);
@@ -623,30 +622,30 @@ FmSearchEngine::~FmSearchEngine()
void FmSearchEngine::SetIgnoreWidthCJK(bool bSet)
{
if (bSet)
- m_nTransliterationFlags |= TransliterationModules_IGNORE_WIDTH;
+ m_nTransliterationFlags |= TransliterationFlags::IGNORE_WIDTH;
else
- m_nTransliterationFlags &= ~TransliterationModules_IGNORE_WIDTH;
+ m_nTransliterationFlags &= ~TransliterationFlags::IGNORE_WIDTH;
}
bool FmSearchEngine::GetIgnoreWidthCJK() const
{
- return 0 != (m_nTransliterationFlags & TransliterationModules_IGNORE_WIDTH);
+ return bool(m_nTransliterationFlags & TransliterationFlags::IGNORE_WIDTH);
}
void FmSearchEngine::SetCaseSensitive(bool bSet)
{
if (bSet)
- m_nTransliterationFlags &= ~TransliterationModules_IGNORE_CASE;
+ m_nTransliterationFlags &= ~TransliterationFlags::IGNORE_CASE;
else
- m_nTransliterationFlags |= TransliterationModules_IGNORE_CASE;
+ m_nTransliterationFlags |= TransliterationFlags::IGNORE_CASE;
}
bool FmSearchEngine::GetCaseSensitive() const
{
- return 0 == (m_nTransliterationFlags & TransliterationModules_IGNORE_CASE);
+ return !(m_nTransliterationFlags & TransliterationFlags::IGNORE_CASE);
}
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index e07d9f93a612..e3189a5459bd 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -39,8 +39,6 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/i18n/TransliterationModules.hpp>
-#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/text/XTextRange.hpp>
@@ -123,11 +121,14 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext
lArgs[2].Value <<= (sal_Int32)0;
lArgs[3].Name = "SearchItem.TransliterateFlags";
SvtCTLOptions aCTLOptions;
- sal_Int32 nFlags = 0;
- nFlags |= (!aMatchCase ? static_cast<int>(css::i18n::TransliterationModules_IGNORE_CASE) : 0);
- nFlags |= (aCTLOptions.IsCTLFontEnabled() ? css::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL:0 );
- nFlags |= (aCTLOptions.IsCTLFontEnabled() ? css::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL:0 );
- lArgs[3].Value <<= nFlags;
+ TransliterationFlags nFlags = TransliterationFlags::NONE;
+ if (!aMatchCase)
+ nFlags |= TransliterationFlags::IGNORE_CASE;
+ if (aCTLOptions.IsCTLFontEnabled())
+ nFlags |= TransliterationFlags::IGNORE_DIACRITICS_CTL;
+ if (aCTLOptions.IsCTLFontEnabled())
+ nFlags |= TransliterationFlags::IGNORE_KASHIDA_CTL;
+ lArgs[3].Value <<= (sal_Int32)nFlags;
lArgs[4].Name = "SearchItem.Command";
lArgs[4].Value <<= (sal_Int16)(aFindAll ?
SvxSearchCmd::FIND_ALL : SvxSearchCmd::FIND );
generated by cgit (git 2.34.1) at 2024-07-06 14:40:33 +0000