diff options
| author | abdulmajeed ahmed <aalabdulrazzaq@kacst.edu.sa> | 2013-06-25 10:30:58 +0200 |
|---|---|---|
| committer | abdulmajeed ahmed <aalabdulrazzaq@kacst.edu.sa> | 2013-06-25 10:33:43 +0200 |
| commit | 96456205067220cc73bffae6ae860dd120641660 (patch) | |
| tree | e205d5e8602902a5cb9d433b75b7a9b855d58f64 | |
| parent | 59eee3c0a492e05c47e85cb53eeb25ad6bf0322a (diff) | |
Add Ignore-Diacritics to find toolbar for CTL fdo#52204
Change-Id: I79cb4db1ec87258c45ddc786914b32f47e96acf5
| -rw-r--r-- | svx/source/tbxctrls/tbunosearchcontrollers.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index dcb32066abad..a32c77be94cb 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -26,11 +26,13 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/i18n/TransliterationModules.hpp> +#include <com/sun/star/i18n/TransliterationModulesExtra.hpp> #include <com/sun/star/text/XTextRange.hpp> #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/URLTransformer.hpp> +#include <svl/ctloptions.hxx> #include <svl/srchitem.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/toolbox.hxx> @@ -98,8 +100,11 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext lArgs[2].Name = OUString(SEARCHITEM_SEARCHFLAGS); lArgs[2].Value <<= (sal_Int32)0; lArgs[3].Name = OUString(SEARCHITEM_TRANSLITERATEFLAGS); - lArgs[3].Value <<= (sal_Int32)(!aMatchCase ? - com::sun::star::i18n::TransliterationModules_IGNORE_CASE : 0); + SvtCTLOptions aCTLOptions; + sal_Int32 nFlags = 0; + nFlags |= (!aMatchCase ? com::sun::star::i18n::TransliterationModules_IGNORE_CASE : 0); + nFlags |= (aCTLOptions.IsCTLFontEnabled() ? com::sun::star::i18n::TransliterationModulesExtra::ignoreDiacritics_CTL:0 ); + lArgs[3].Value <<= nFlags; lArgs[4].Name = OUString(SEARCHITEM_COMMAND); lArgs[4].Value <<= (sal_Int16)(aFindAll ? SVX_SEARCHCMD_FIND_ALL : SVX_SEARCHCMD_FIND ); |