hwpfilter/source/hwpfile.cxx | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 07fc7aea5f73bf5ae7da4bbca0a7d7a205baab8d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Oct 11 09:17:14 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Oct 11 12:27:19 2019 +0200
ofz#18116 Timeout
Change-Id: If0bf63bacf9b5f7502287b1e465a34806d18b874
Reviewed-on: https://gerrit.libreoffice.org/80641
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 8f221c743a43..a97c39cc8eb6 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -526,17 +526,21 @@ void HWPFile::AddParaShape(std::shared_ptr<ParaShape>
const & pshape)
}
}
if( nscount )
+ {
pshape->tabs[MAXTABS-1].type = sal::static_int_cast<char>(nscount);
+ pshape->index = ++pcount;
+ pslist.push_back(pshape);
+ return;
+ }
int value = compareParaShape(pshape.get());
-
- if( value == 0 || nscount )
+ if (value == 0)
{
pshape->index = ++pcount;
pslist.push_back(pshape);
+ return;
}
- else
- pshape->index = value;
+ pshape->index = value;
}
void HWPFile::AddCharShape(std::shared_ptr<CharShape> const & cshape)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
