mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use valid UNOIDL identifiers in TransliterationModulesExtra

Browse Source 
ignoreDiacritics_CTL was introduced in LO 4.2, but is unpublished and appears to
be rarely used, so changing it is hopefully OK.

ignoreKashida_CTL is new in LO 4.3.

Change-Id: I52c6d1e8c6b30eec4af22e3bbc72dd5874ef7151
This commit is contained in:
Stephan Bergmann 2014-04-10 18:35:03 +02:00
parent 578cd010f5
commit f699e7b9b2
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
i18npool/source/transliteration/transliterationImpl.cxx
View File

@ -194,12 +194,12 @@ TransliterationImpl::loadModule( TransliterationModules modType, const Locale& r
numCascade++; numCascade++;
} }
// additional transliterations from TranslationModuleExtra (we cannot extend TransliterationModule) // additional transliterations from TranslationModuleExtra (we cannot extend TransliterationModule)
if (modType & TransliterationModulesExtra::ignoreDiacritics_CTL) if (modType & TransliterationModulesExtra::IGNORE_DIACRITICS_CTL)
{ {
if (loadModuleByName(OUString("ignoreDiacritics_CTL"), bodyCascade[numCascade], rLocale)) if (loadModuleByName(OUString("ignoreDiacritics_CTL"), bodyCascade[numCascade], rLocale))
numCascade++; numCascade++;
} }
if (modType & TransliterationModulesExtra::ignoreKashida_CTL) if (modType & TransliterationModulesExtra::IGNORE_KASHIDA_CTL)
if (loadModuleByName(OUString("ignoreKashida_CTL"), bodyCascade[numCascade], rLocale)) if (loadModuleByName(OUString("ignoreKashida_CTL"), bodyCascade[numCascade], rLocale))
numCascade++; numCascade++;

4
offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
View File

@ -51,8 +51,8 @@ constants TransliterationModulesExtra
const short TOGGLE_CASE = 202; const short TOGGLE_CASE = 202;
/// because we cannot extend TransliterationModule we used TranslationModuleExtra and it will act the same way /// because we cannot extend TransliterationModule we used TranslationModuleExtra and it will act the same way
const long ignoreDiacritics_CTL = 0x40000000; const long IGNORE_DIACRITICS_CTL = 0x40000000;
const long ignoreKashida_CTL = 0x00000800; const long IGNORE_KASHIDA_CTL = 0x00000800;
const long END_OF_MODULE = 0; const long END_OF_MODULE = 0;
}; };

4
svl/source/items/srchitem.cxx
View File

@ -145,9 +145,9 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
if ( aOpt.IsMatchFullHalfWidthForms()) if ( aOpt.IsMatchFullHalfWidthForms())
rFlags |= TransliterationModules_IGNORE_WIDTH; rFlags |= TransliterationModules_IGNORE_WIDTH;
if ( aOpt.IsIgnoreDiacritics_CTL()) if ( aOpt.IsIgnoreDiacritics_CTL())
rFlags |= TransliterationModulesExtra::ignoreDiacritics_CTL ; rFlags |= TransliterationModulesExtra::IGNORE_DIACRITICS_CTL ;
if ( aOpt.IsIgnoreKashida_CTL()) if ( aOpt.IsIgnoreKashida_CTL())
rFlags |= TransliterationModulesExtra::ignoreKashida_CTL ; rFlags |= TransliterationModulesExtra::IGNORE_KASHIDA_CTL ;
if ( bAsianOptions ) if ( bAsianOptions )
{ {
if ( aOpt.IsMatchHiraganaKatakana()) if ( aOpt.IsMatchHiraganaKatakana())

8
svx/source/dialog/srchdlg.cxx
View File

@ -1228,9 +1228,9 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
nFlags &= (TransliterationModules_IGNORE_CASE | nFlags &= (TransliterationModules_IGNORE_CASE |
TransliterationModules_IGNORE_WIDTH ); TransliterationModules_IGNORE_WIDTH );
if (GetCheckBoxValue(m_pIgnoreDiacritics)) if (GetCheckBoxValue(m_pIgnoreDiacritics))
nFlags |= TransliterationModulesExtra::ignoreDiacritics_CTL; nFlags |= TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
if (GetCheckBoxValue(m_pIgnoreKashida)) if (GetCheckBoxValue(m_pIgnoreKashida))
nFlags |= TransliterationModulesExtra::ignoreKashida_CTL; nFlags |= TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
pSearchItem->SetTransliterationFlags( nFlags ); pSearchItem->SetTransliterationFlags( nFlags );
if ( !bWriter ) if ( !bWriter )
@ -2182,9 +2182,9 @@ void SvxSearchDialog::SaveToModule_Impl()
nFlags &= (TransliterationModules_IGNORE_CASE | nFlags &= (TransliterationModules_IGNORE_CASE |
TransliterationModules_IGNORE_WIDTH ); TransliterationModules_IGNORE_WIDTH );
if (GetCheckBoxValue(m_pIgnoreDiacritics)) if (GetCheckBoxValue(m_pIgnoreDiacritics))
nFlags |= TransliterationModulesExtra::ignoreDiacritics_CTL; nFlags |= TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
if (GetCheckBoxValue(m_pIgnoreKashida)) if (GetCheckBoxValue(m_pIgnoreKashida))
nFlags |= TransliterationModulesExtra::ignoreKashida_CTL; nFlags |= TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
pSearchItem->SetTransliterationFlags( nFlags ); pSearchItem->SetTransliterationFlags( nFlags );
if ( !bWriter ) if ( !bWriter )

2
svx/source/tbxctrls/tbunosearchcontrollers.cxx
View File

@ -109,7 +109,7 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext
SvtCTLOptions aCTLOptions; SvtCTLOptions aCTLOptions;
sal_Int32 nFlags = 0; sal_Int32 nFlags = 0;
nFlags |= (!aMatchCase ? static_cast<int>(com::sun::star::i18n::TransliterationModules_IGNORE_CASE) : 0); nFlags |= (!aMatchCase ? static_cast<int>(com::sun::star::i18n::TransliterationModules_IGNORE_CASE) : 0);
nFlags |= (aCTLOptions.IsCTLFontEnabled() ? com::sun::star::i18n::TransliterationModulesExtra::ignoreDiacritics_CTL:0 ); nFlags |= (aCTLOptions.IsCTLFontEnabled() ? com::sun::star::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL:0 );
lArgs[3].Value <<= nFlags; lArgs[3].Value <<= nFlags;
lArgs[4].Name = OUString(SEARCHITEM_COMMAND); lArgs[4].Name = OUString(SEARCHITEM_COMMAND);
lArgs[4].Value <<= (sal_Int16)(aFindAll ? lArgs[4].Value <<= (sal_Int16)(aFindAll ?

4
unotools/source/config/searchopt.cxx
View File

@ -287,9 +287,9 @@ sal_Int32 SvtSearchOptions::GetTransliterationFlags() const
if ( IsIgnoreMiddleDot()) if ( IsIgnoreMiddleDot())
nRes |= TransliterationModules_ignoreMiddleDot_ja_JP; nRes |= TransliterationModules_ignoreMiddleDot_ja_JP;
if ( IsIgnoreDiacritics_CTL()) if ( IsIgnoreDiacritics_CTL())
nRes |= TransliterationModulesExtra::ignoreDiacritics_CTL; nRes |= TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
if ( IsIgnoreKashida_CTL()) if ( IsIgnoreKashida_CTL())
nRes |= TransliterationModulesExtra::ignoreKashida_CTL; nRes |= TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
return nRes; return nRes;
} }