diff options
| author | Zhe Wang <wangzcdl@apache.org> | 2012-09-07 04:46:35 +0000 |
|---|---|---|
| committer | Radek Doulík <rodo@novell.com> | 2013-03-13 09:53:31 +0000 |
| commit | 8ed047be746c428b4b9d614afc26e53238ec72f8 (patch) | |
| tree | 8182a79a1e9fea635ddbb92e4c16c77d345af8f9 /editeng | |
| parent | 83bdce645a7fd4843630fc9a378de8620d48c6c4 (diff) | |
Resolves: #i120773 Numbering lost when saving or opening a ppt file
* subversion/main/editeng/inc/editeng/svxenum.hxx
Define some numbering types supported by MS ppt
* subversion/main/filter/source/msfilter/svdfppt.cxx
Mapping added MS numbering types to Symphony numbering types
* subversion/main/sd/source/filter/eppt/epptso.cxx
Export added MS numbering types
Patch by: Yin Bing <steve.yin.aoo@gmail.com>
Suggested by: Wang Zhe <kingwisemmx@gmail.com>
Found by: Yin Bing <steve.yin.aoo@gmail.com>
Review by: Wang Zhe <kingwisemmx@gmail.com>(cherry picked from commit 39e9cae1ac9b7944c9df0642a193b042a1b68266)
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
Conflicts:
editeng/inc/editeng/svxenum.hxx
sd/source/filter/eppt/epptso.cxx
Change-Id: Ic8a9406fd1b58e5cec5c5adc28bf0190ccb87315
(cherry picked from commit ef23b47e887908161d980f3e6f6d321f18acca77)
Reviewed-on: https://gerrit.libreoffice.org/2692
Reviewed-by: Radek Doulík <rodo@novell.com>
Tested-by: Radek Doulík <rodo@novell.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/inc/editeng/svxenum.hxx | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/editeng/inc/editeng/svxenum.hxx b/editeng/inc/editeng/svxenum.hxx index ff751b0a82f9..2759bebcd0ea 100644 --- a/editeng/inc/editeng/svxenum.hxx +++ b/editeng/inc/editeng/svxenum.hxx @@ -210,7 +210,21 @@ enum SvxExtNumType SVX_NUM_PAGEDESC, // Numbering from the page template SVX_NUM_BITMAP, SVX_NUM_CHARS_UPPER_LETTER_N, // Counts from a-z, aa-zz, aaa-zzz - SVX_NUM_CHARS_LOWER_LETTER_N + SVX_NUM_CHARS_LOWER_LETTER_N, + SVX_NUM_TRANSLITERATION, + SVX_NUM_NATIVE_NUMBERING, + SVX_NUM_FULL_WIDTH_ARABIC, + SVX_NUM_CIRCLE_NUMBER, + SVX_NUM_NUMBER_LOWER_ZH, + SVX_NUM_NUMBER_UPPER_ZH, + SVX_NUM_NUMBER_UPPER_ZH_TW, + SVX_NUM_TIAN_GAN_ZH, + SVX_NUM_DI_ZI_ZH, + SVX_NUM_NUMBER_TRADITIONAL_JA, + SVX_NUM_AIU_FULLWIDTH_JA, + SVX_NUM_AIU_HALFWIDTH_JA, + SVX_NUM_IROHA_FULLWIDTH_JA, + SVX_NUM_IROHA_HALFWIDTH_JA }; enum SvxCompareMode |