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 /include/editeng | |
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 'include/editeng')
-rw-r--r-- | include/editeng/editeng.hxx | 6 | ||||
-rw-r--r-- | include/editeng/editview.hxx | 3 | ||||
-rw-r--r-- | include/editeng/outliner.hxx | 16 |
3 files changed, 12 insertions, 13 deletions
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 921b60f2c954..b9ce5226543b 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -110,7 +110,7 @@ struct EPaM; class DeletedNodeInfo; class ParaPortionList; enum class CharCompressType; - +enum class TransliterationFlags; /** values for: SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs::All ); @@ -253,8 +253,8 @@ public: LanguageType GetLanguage(const EditPaM& rPaM) const; LanguageType GetLanguage( sal_Int32 nPara, sal_Int32 nPos ) const; - void TransliterateText( const ESelection& rSelection, sal_Int32 nTransliterationMode ); - EditSelection TransliterateText( const EditSelection& rSelection, sal_Int32 nTransliterationMode ); + void TransliterateText( const ESelection& rSelection, TransliterationFlags nTransliterationMode ); + EditSelection TransliterateText( const EditSelection& rSelection, TransliterationFlags nTransliterationMode ); void SetAsianCompressionMode( CharCompressType nCompression ); diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index adabc65dbf1b..15e53a141eb6 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -58,6 +58,7 @@ class SfxStyleSheet; namespace vcl { class Font; } class FontList; class OutputDevice; +enum class TransliterationFlags; namespace com { namespace sun { @@ -224,7 +225,7 @@ public: // for text conversion void StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const vcl::Font *pDestFont, sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc ); - void TransliterateText( sal_Int32 nTransliterationMode ); + void TransliterateText( TransliterationFlags nTransliterationMode ); bool IsCursorAtWrongSpelledWord(); bool IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWrong = false ); diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 2c1f7810e85e..034de4776bfc 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -47,7 +47,6 @@ #include <editeng/paragraphdata.hxx> #include <o3tl/typed_flags_set.hxx> - #include <functional> #include <vector> @@ -84,26 +83,25 @@ class OverflowingText; class NonOverflowingText; class OutlinerViewShell; enum class CharCompressType; +enum class TransliterationFlags; +class SvxFieldData; namespace svl { class IUndoManager; } - -class SvxFieldData; - - namespace com { namespace sun { namespace star { namespace linguistic2 { class XSpellChecker1; class XHyphenator; }}}} namespace svx{ -struct SpellPortion; -typedef std::vector<SpellPortion> SpellPortions; + struct SpellPortion; + typedef std::vector<SpellPortion> SpellPortions; } - namespace basegfx { class B2DPolyPolygon; } + + // internal use only! enum class ParaFlag { @@ -300,7 +298,7 @@ public: // for text conversion void StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const vcl::Font *pDestFont, sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc ); - void TransliterateText( sal_Int32 nTransliterationMode ); + void TransliterateText( TransliterationFlags nTransliterationMode ); ESelection GetSelection(); |