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-07 09:34:43 +0000 |
| commit | 8aa9fac23bc8f29de5e91293352f96c99418ddfc (patch) | |
| tree | 27b798b3cd0e10aa9411ee69b6384e95c2acf181 /include/svx | |
| parent | c945d4166087e09798d812a466a85d424482e08b (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
Change-Id: Ib19ecb8f7ca0c867ae3be2b41e49ac4cacfd5bb6
Reviewed-on: https://gerrit.libreoffice.org/23730
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'include/svx')
| -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 0a2b0c3f4257..4c3ca3c5d008 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 }; /*-------------------------------------------------------------------- |