diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-22 08:09:01 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-04-21 11:01:33 +0200 |
| commit | 238f76535ec0efe4babf4613c73592c487244e21 (patch) | |
| tree | 46df3f545bddebb8856f7ffe77766328e9ef2950 /include | |
| parent | 56239025ae3db59419fe1b4aedace6108da8b93b (diff) | |
tdf#65642 RTF filter: import \pgnrestart and \pgnucltr
This implicitly adds support for DOCX import of <w:pgNumType
w:fmt="upperLetter"> as well.
(cherry picked from commits abaf6bde4ee91c628bd55a7ec2e876a5d0ecff6e and
d29b75c402ea635b3865501e43c9f349885913af)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: Ib19ecb8f7ca0c867ae3be2b41e49ac4cacfd5bb6
Reviewed-on: https://gerrit.libreoffice.org/23916
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 03b3c54039c7459922919af2c227583769677490)
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/pageitem.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index 76260ebcad6b..29091d088700 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -32,7 +32,9 @@ enum SvxNumType SVX_ARABIC, SVX_NUMBER_NONE, SVX_CHAR_SPECIAL, - SVX_PAGEDESC + SVX_PAGEDESC, + SVX_BITMAP, + SVX_CHARS_UPPER_LETTER_N }; /*-------------------------------------------------------------------- |