diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-23 16:15:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-01 07:28:03 +0000 |
| commit | 4c09fc48e9fa9114f32f2973090cbe75177cdd37 (patch) | |
| tree | 09d4ee3c2d75d038f45ba13a086a344d35aeadb6 /sd | |
| parent | d97380c66904328e9d706a0b03a6800dc048aa7d (diff) | |
typesafe wrappers for css::i18nutil::TransliterationModules
and related css::util::SearchOptions2
The TransliterationModules enum has it's constants spread over multiple
UNO enum/constant-collections - TransliterationModules and
TransliterationModulesExtra, which means that most code simply uses
sal_Int32.
Wrap them up into a better bundle so that only the lowest layer needs to
deal directly with the UNO constants.
Change-Id: I1edeab79fcc7817a4a97c933ef84ab7015bb849b
Reviewed-on: https://gerrit.libreoffice.org/34582
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/drviewse.cxx | 24 | ||||
| -rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 23 |
2 files changed, 21 insertions, 26 deletions
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 59795acc7ed2..fd9c2b9089fd 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -20,9 +20,8 @@ #include <com/sun/star/presentation/XPresentation2.hpp> #include <com/sun/star/form/FormButtonType.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/i18n/TransliterationModules.hpp> -#include <com/sun/star/i18n/TransliterationModulesExtra.hpp> #include <i18nutil/unicode.hxx> +#include <i18nutil/transliteration.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Any.hxx> @@ -1344,37 +1343,36 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) OutlinerView* pOLV = GetView()->GetTextEditOutlinerView(); if( pOLV ) { - using namespace ::com::sun::star::i18n; - sal_Int32 nType = 0; + TransliterationFlags nType = TransliterationFlags::NONE; switch( nSId ) { case SID_TRANSLITERATE_SENTENCE_CASE: - nType = TransliterationModulesExtra::SENTENCE_CASE; + nType = TransliterationFlags::SENTENCE_CASE; break; case SID_TRANSLITERATE_TITLE_CASE: - nType = TransliterationModulesExtra::TITLE_CASE; + nType = TransliterationFlags::TITLE_CASE; break; case SID_TRANSLITERATE_TOGGLE_CASE: - nType = TransliterationModulesExtra::TOGGLE_CASE; + nType = TransliterationFlags::TOGGLE_CASE; break; case SID_TRANSLITERATE_UPPER: - nType = TransliterationModules_LOWERCASE_UPPERCASE; + nType = TransliterationFlags::LOWERCASE_UPPERCASE; break; case SID_TRANSLITERATE_LOWER: - nType = TransliterationModules_UPPERCASE_LOWERCASE; + nType = TransliterationFlags::UPPERCASE_LOWERCASE; break; case SID_TRANSLITERATE_HALFWIDTH: - nType = TransliterationModules_FULLWIDTH_HALFWIDTH; + nType = TransliterationFlags::FULLWIDTH_HALFWIDTH; break; case SID_TRANSLITERATE_FULLWIDTH: - nType = TransliterationModules_HALFWIDTH_FULLWIDTH; + nType = TransliterationFlags::HALFWIDTH_FULLWIDTH; break; case SID_TRANSLITERATE_HIRAGANA: - nType = TransliterationModules_KATAKANA_HIRAGANA; + nType = TransliterationFlags::KATAKANA_HIRAGANA; break; case SID_TRANSLITERATE_KATAGANA: - nType = TransliterationModules_HIRAGANA_KATAKANA; + nType = TransliterationFlags::HIRAGANA_KATAKANA; break; } diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 3c1903637ca8..b499eb02a334 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -51,8 +51,6 @@ #include <svx/svdorect.hxx> #include <sot/formats.hxx> #include <com/sun/star/linguistic2/XThesaurus.hpp> -#include <com/sun/star/i18n/TransliterationModules.hpp> -#include <com/sun/star/i18n/TransliterationModulesExtra.hpp> #include <editeng/unolingu.hxx> #include <comphelper/processfactory.hxx> #include <editeng/outlobj.hxx> @@ -593,37 +591,36 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) OutlinerView* pOLV = pOlView ? pOlView->GetViewByWindow( GetActiveWindow() ) : nullptr; if( pOLV ) { - using namespace ::com::sun::star::i18n; - sal_Int32 nType = 0; + TransliterationFlags nType = TransliterationFlags::NONE; switch( nSlot ) { case SID_TRANSLITERATE_SENTENCE_CASE: - nType = TransliterationModulesExtra::SENTENCE_CASE; + nType = TransliterationFlags::SENTENCE_CASE; break; case SID_TRANSLITERATE_TITLE_CASE: - nType = TransliterationModulesExtra::TITLE_CASE; + nType = TransliterationFlags::TITLE_CASE; break; case SID_TRANSLITERATE_TOGGLE_CASE: - nType = TransliterationModulesExtra::TOGGLE_CASE; + nType = TransliterationFlags::TOGGLE_CASE; break; case SID_TRANSLITERATE_UPPER: - nType = TransliterationModules_LOWERCASE_UPPERCASE; + nType = TransliterationFlags::LOWERCASE_UPPERCASE; break; case SID_TRANSLITERATE_LOWER: - nType = TransliterationModules_UPPERCASE_LOWERCASE; + nType = TransliterationFlags::UPPERCASE_LOWERCASE; break; case SID_TRANSLITERATE_HALFWIDTH: - nType = TransliterationModules_FULLWIDTH_HALFWIDTH; + nType = TransliterationFlags::FULLWIDTH_HALFWIDTH; break; case SID_TRANSLITERATE_FULLWIDTH: - nType = TransliterationModules_HALFWIDTH_FULLWIDTH; + nType = TransliterationFlags::HALFWIDTH_FULLWIDTH; break; case SID_TRANSLITERATE_HIRAGANA: - nType = TransliterationModules_KATAKANA_HIRAGANA; + nType = TransliterationFlags::KATAKANA_HIRAGANA; break; case SID_TRANSLITERATE_KATAGANA: - nType = TransliterationModules_HIRAGANA_KATAKANA; + nType = TransliterationFlags::HIRAGANA_KATAKANA; break; } |