diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-07-29 20:04:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-29 22:16:50 +0200 |
| commit | 155c056b1d4674d5ff73bbb5e1ad1dcd1e6aae36 (patch) | |
| tree | ab314dc29d575f546fcbd9ea9a03693d7d64343c /i18npool/inc | |
| parent | 50ceac91a4ac2057847e7d9807f5cb614e6ff755 (diff) | |
i18npool: create instances with uno constructors
See tdf#74608 for motivation.
Change-Id: I814512ccc546bd015558a8122f0d2e3803437e38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99722
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'i18npool/inc')
| -rw-r--r-- | i18npool/inc/calendar_gregorian.hxx | 8 | ||||
| -rw-r--r-- | i18npool/inc/indexentrysupplier_ja_phonetic.hxx | 13 |
2 files changed, 14 insertions, 7 deletions
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index 10bde05b2027..f66300d42e0a 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.hxx @@ -151,10 +151,16 @@ class Calendar_hanja final : public Calendar_gregorian public: // Constructors Calendar_hanja(); - virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) override; virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) override; }; +class Calendar_hanja_yoil final : public Calendar_gregorian +{ +public: + // Constructors + Calendar_hanja_yoil(); + virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) override; +}; class Calendar_gengou final : public Calendar_gregorian diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx index cced5597c22d..e376796ad0d1 100644 --- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx +++ b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx @@ -42,21 +42,22 @@ public: const css::lang::Locale& rLocale2 ) override; }; -#define INDEXENTRYSUPPLIER_JA_PHONETIC( algorithm ) \ +#define INDEXENTRYSUPPLIER_JA_PHONETIC( algorithm, algo_descr ) \ class IndexEntrySupplier_##algorithm final : public IndexEntrySupplier_ja_phonetic {\ public:\ IndexEntrySupplier_##algorithm (const css::uno::Reference < css::uno::XComponentContext >& rxContext) : IndexEntrySupplier_ja_phonetic (rxContext) {\ - implementationName = "com.sun.star.i18n.IndexEntrySupplier_"#algorithm;\ + implementationName = "com.sun.star.i18n.IndexEntrySupplier_"#algo_descr;\ };\ virtual sal_Bool SAL_CALL loadAlgorithm(\ const css::lang::Locale& rLocale,\ const OUString& SortAlgorithm, sal_Int32 collatorOptions ) override;\ }; -INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_first_by_syllable ) -INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_first_by_consonant ) -INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_last_by_syllable ) -INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_last_by_consonant ) +/** descriptions formed by concatenating strings here must match names in .component file */ +INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_first_by_syllable, " (alphanumeric first) (grouped by syllable)" ) +INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_first_by_consonant, " (alphanumeric first) (grouped by consonant)" ) +INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_last_by_syllable, " (alphanumeric last) (grouped by consonant)" ) +INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_last_by_consonant, " (alphanumeric last) (grouped by consonant)" ) } #endif |