From cef38a8363efbd973f566f7595f0b6cfc41fdc2b Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Sun, 19 Apr 2020 19:54:59 +0300 Subject: tdf#132185: field command does not necessarily end with space Change-Id: I5a5e54fb42e20855b75af7ab523465a032ab46e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92504 Tested-by: Jenkins Reviewed-by: Mike Kaganski (cherry picked from commit 8c8b3a4f83f67882b284ddc3b3fe10d3fe6dedf4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92444 Reviewed-by: Michael Stahl --- writerfilter/source/dmapper/DomainMapper_Impl.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'writerfilter') diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 13f1ce4ad6a2..a04af3c1c8aa 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2902,7 +2902,14 @@ static sal_Int16 lcl_ParseNumberingType( const OUString& rCommand ) sal_Int16 nRet = style::NumberingType::PAGE_DESCRIPTOR; // The command looks like: " PAGE \* Arabic " - OUString sNumber = msfilter::util::findQuotedText(rCommand, "\\* ", ' '); + // tdf#132185: but may as well be "PAGE \* Arabic" + OUString sNumber; + constexpr OUStringLiteral rSeparator("\\* "); + if (sal_Int32 nStartIndex = rCommand.indexOf(rSeparator); nStartIndex >= 0) + { + nStartIndex += rSeparator.getLength(); + sNumber = rCommand.getToken(0, ' ', nStartIndex); + } if( !sNumber.isEmpty() ) { -- cgit b/libreoffice-6-1 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/xmloff/Package_dtd.mk
>res
AgeCommit message (Expand)Author
AgeCommit message (Expand)Author