summaryrefslogtreecommitdiff
path: root/offapi
diff options
context:
space:
mode:
authorVasily Melenchuk <vasily.melenchuk@cib.de>2021-06-14 14:27:56 +0300
committerThorsten Behrens <thorsten.behrens@allotropia.de>2021-06-29 19:02:20 +0200
commit9987b518fca1476bd0ce8c86bcf6ac7c81f7b580 (patch)
tree3aa1af29be70b24bc96951a310f3379a621a54b1 /offapi
parentd8dcd706c74b4a0fa420946c707137b097b3c7fe (diff)
new ODF numbered list parameter loext:num-list-format
Instead of style:num-prefix and style:num-suffix new list format is much more flexible for storing list multilevel numberings. Now it is possible to have not just prefix/suffix but any random separators between levels, arbitrary levels order, etc. Internal LO format for list format is changed: instead of placeholders like %1, %2, etc we right now use %1%, %2%... Reason: for ODT documents, having more than 9 levels there is ambiguity in "%10": it is "%1" followed by "0" suffix, or "%10"? Aux changes: * removed zero width space hack: since format string is always defined this hack is interfering with standard list numbers printing (see changes in ooxmlexport14.cxx, ww8export3.cxx tests) * changed cross-references values to lists: they are now including full list label string: previously this was bit self-contradictory (see changes in odfexport.cxx and check_cross_references.py tests) Conflicts: sw/qa/extras/odfexport/odfexport.cxx Change-Id: I9696cc4846375c5f6222539aeaadbca5ae58ce27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117156 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118040 Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
Diffstat (limited to 'offapi')
-rw-r--r--offapi/com/sun/star/style/NumberingLevel.idl21
1 files changed, 21 insertions, 0 deletions
diff --git a/offapi/com/sun/star/style/NumberingLevel.idl b/offapi/com/sun/star/style/NumberingLevel.idl
index eb3cb92add03..16402da791d4 100644
--- a/offapi/com/sun/star/style/NumberingLevel.idl
+++ b/offapi/com/sun/star/style/NumberingLevel.idl
@@ -41,10 +41,14 @@ published service NumberingLevel
[property] short ParentNumbering;
/** This prefix is inserted in front of the numbering symbol(s).
+
+ @deprecated as of LibreOffice 7.2, use ListFormat instead
*/
[property] string Prefix;
/** This suffix is inserted after the numbering symbol(s).
+
+ @deprecated as of LibreOffice 7.2, use ListFormat instead
*/
[property] string Suffix;
@@ -81,6 +85,23 @@ published service NumberingLevel
@since LibreOffice 6.1
*/
[optional, property] com::sun::star::awt::XBitmap GraphicBitmap;
+
+ /** Format string used to generate actual numbering.
+
+ It contains placeholders (like %1%, %2%, etc) where corresponding
+ level numberings are inserted.
+
+ This is more flexible way to provide multilevel numbering with
+ complex format string. This property is a replacement for
+ Prefix and Suffix: if ListFormat is provided, they are not used
+ anymore.
+
+ Example: ListFormat "(%1% %2%.%3%)" can be resolved to numbering
+ in actual multilevel list like "(4 1.3)".
+
+ @since LibreOffice 7.2
+ */
+ [optional, property] string ListFormat;
};