diff options
| author | Tim Bartlett <github@tim.bartletts.id.au> | 2019-08-19 18:40:56 +1000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-04-02 09:05:08 +0200 |
| commit | ea58353bafbb646c09ee95a7e9884323306efddf (patch) | |
| tree | 37830f2ceb0ccc4147d5ca01dbd654472d2ccd96 /i18npool | |
| parent | b62c2306f0db584e367dcbb6172a783179153008 (diff) | |
tdf#55436 - Add SYMBOL_CHICAGO numbering scheme (for footnotes)
Includes adding SYMBOL_CHICAGO translations to .docx import/export filters
(cherry picked from commit 0fbcac4caa971bd8824c96fe9ef7d9338cd37cbc)
Conflicts:
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
Change-Id: I5212739d7d04ab400a3d2aa549cb7cfd8531a4b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91499
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index 899ea58457d3..b7963de5c0b5 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -66,6 +66,11 @@ #define S_HI_TWO "\xDB\xB2" #define S_HI_THREE "\xDB\xB3" +// Chicago footnote symbols +#define S_DAGGER "\xE2\x80\xA0" +#define S_DBL_DAGGER "\xE2\x80\xA1" +#define S_SECTION "\xC2\xA7" + #include <math.h> #include <sal/macros.h> #include <rtl/ustring.hxx> @@ -229,6 +234,10 @@ static const sal_Unicode lowerLetter[] = { 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A }; +static const sal_Unicode table_Chicago[] = { + 0x002a, 0x2020, 0x2021, 0x00a7 +}; + // Tables used for numbering in persian words static const sal_Unicode table_PersianWord_decade1[][7]={ {0}, // 0 @@ -902,6 +911,10 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal lcl_formatPersianWord(number, result); break; + case SYMBOL_CHICAGO: + lcl_formatChars1( table_Chicago, 4, number-1, result ); // *, +, |, S, **, ++, ... + break; + default: OSL_ASSERT(false); throw IllegalArgumentException(); @@ -945,6 +958,7 @@ static const Supported_NumberingType aSupportedTypes[] = {style::NumberingType::CHAR_SPECIAL, "Bullet", LANG_ALL}, {style::NumberingType::PAGE_DESCRIPTOR, "Page", LANG_ALL}, {style::NumberingType::BITMAP, "Bitmap", LANG_ALL}, + {style::NumberingType::SYMBOL_CHICAGO, "*, " S_DAGGER ", " S_DBL_DAGGER ", " S_SECTION ", **, " S_DAGGER S_DAGGER ", ...", LANG_ALL}, {style::NumberingType::TEXT_NUMBER, "1st", LANG_ALL}, {style::NumberingType::TEXT_CARDINAL, "One", LANG_ALL}, {style::NumberingType::TEXT_ORDINAL, "First", LANG_ALL}, |