summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/ww8par.hxx
diff options
context:
space:
mode:
authorVasily Melenchuk <vasily.melenchuk@cib.de>2021-10-28 13:36:50 +0300
committerXisco Fauli <xiscofauli@libreoffice.org>2021-11-05 15:55:30 +0100
commit6f84c1fda7654c18b1e53de7b1c077e8a31e606f (patch)
tree9cc95d33464776137ba03facdfb47b187010db25 /sw/source/filter/ww8/ww8par.hxx
parent0e83cdaf8a96fa06b95219e581fc2eed7df39c26 (diff)
tdf#144668: docx export: simpler way to create lvlText in numberings
Oldr approach with populating ListLabelString with some predefined values and than replacing them by placeholders is not so good. It can lead to collisions if we use numbers in format string. Anow with support of list strings in core we do not need this: it is enougth to replace LO placeholders %1%, %2%, ... by MS binary placeholders \0, \1, ... Additionally added support for list level initialization in DOC import: that case was still setting just prefix/suffix leaving list level uninitialized. Change-Id: Ia85551f46b4e229dea93c663459ec1a8715c8a23 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124326 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit e0b41fcb56e51f20684da4ba44d7ed6e0e1a3234) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124698 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw/source/filter/ww8/ww8par.hxx')
-rw-r--r--sw/source/filter/ww8/ww8par.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index aa245b43bb68..240730d07f68 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1580,7 +1580,7 @@ private:
// rglst, hpllfo and hsttbListNames
// the corresponding structures are: LSTF, LVLF, LFO LFOLVL
- void SetAnlvStrings(SwNumFormat &rNum, WW8_ANLV const &rAV, const sal_uInt8* pText,
+ void SetAnlvStrings(SwNumFormat &rNum, int nLevel, WW8_ANLV const &rAV, const sal_uInt8* pText,
size_t nStart, size_t nElements, bool bOutline);
void SetAnld(SwNumRule* pNumR, WW8_ANLD const * pAD, sal_uInt8 nSwLevel, bool bOutLine);
void SetNumOlst( SwNumRule* pNumR, WW8_OLST* pO, sal_uInt8 nSwLevel );