summaryrefslogtreecommitdiff
path: root/hwpfilter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-10-11 09:17:14 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-10-11 12:27:19 +0200
commit07fc7aea5f73bf5ae7da4bbca0a7d7a205baab8d (patch)
tree610919fc3407e141db6157e0ba19663c8f30e6e2 /hwpfilter
parentfbbbc7e3f9a62a80d41bcf9621cc098fd45b94c7 (diff)
ofz#18116 Timeout
Change-Id: If0bf63bacf9b5f7502287b1e465a34806d18b874 Reviewed-on: https://gerrit.libreoffice.org/80641 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'hwpfilter')
-rw-r--r--hwpfilter/source/hwpfile.cxx12
1 files changed, 8 insertions, 4 deletions
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)