summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/ww8par2.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-04-12 12:52:40 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-04-12 13:10:21 +0100
commit13ca751a69f1aed666eade43d464b357dbe3c1af (patch)
tree56eebcce637af1dbec58ac072a3b12c0b1483d55 /sw/source/filter/ww8/ww8par2.cxx
parent9c70cdda1025e7eb31bfb307ad7deb544defcb3b (diff)
ofz: timeout, guard against going backwards
Change-Id: Ib91ae165147582bdb44690215a1df6f01ede796b
Diffstat (limited to 'sw/source/filter/ww8/ww8par2.cxx')
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 6e488a1328bc..9787ad27cfaa 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3983,7 +3983,7 @@ void WW8RStyle::Import1Style( sal_uInt16 nNr )
pStStrm->Seek( rSI.m_nFilePos );
- short nSkip, cbStd;
+ sal_uInt16 nSkip, cbStd;
OUString sName;
std::unique_ptr<WW8_STD> xStd(Read1Style(nSkip, &sName, &cbStd));// read Style
@@ -4075,10 +4075,10 @@ void WW8RStyle::ScanStyles() // investigate style dependencies
{ // and detect Filepos for each Style
for (sal_uInt16 i = 0; i < cstd; ++i)
{
- short nSkip;
SwWW8StyInf &rSI = pIo->m_vColl[i];
rSI.m_nFilePos = pStStrm->Tell(); // remember FilePos
+ sal_uInt16 nSkip;
WW8_STD* pStd = Read1Style( nSkip, nullptr, nullptr ); // read STD
rSI.m_bValid = (nullptr != pStd);
if (rSI.m_bValid)