summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-08-27 14:28:35 +0100
committerMichael Meeks <michael.meeks@collabora.com>2015-08-28 11:31:12 +0000
commit15c185132f8c425722c6cdb380857e70a0ce04fd (patch)
tree4f0ba0f55729d3bd99c97e636f71a0b7332c8963
parent8ccabcc0c0c70bdcc6632c6758723f591677371d (diff)
check status of SeekTo
(cherry picked from commit 932f6de91904f86f38d2914b9ce07b94dfadac0c) Change-Id: Ia2bb397c3fdd783cab77a6b0dbc31c9e3d19326b Reviewed-on: https://gerrit.libreoffice.org/18094 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
-rw-r--r--sd/qa/unit/data/ppt/pass/hang-10.pptbin0 -> 7648 bytes
-rw-r--r--sd/source/filter/ppt/pptin.cxx6
2 files changed, 4 insertions, 2 deletions
diff --git a/sd/qa/unit/data/ppt/pass/hang-10.ppt b/sd/qa/unit/data/ppt/pass/hang-10.ppt
new file mode 100644
index 000000000000..99a81c4a3362
--- /dev/null
+++ b/sd/qa/unit/data/ppt/pass/hang-10.ppt
Binary files differ
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 7565fd45bbb3..0b2c0c813e28 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -780,7 +780,8 @@ bool ImplSdPPTImport::Import()
if ( nObjCount++ ) // skipping the first object
{
Rectangle aEmpty;
- aHd2.SeekToBegOfRecord( rStCtrl );
+ if (!aHd2.SeekToBegOfRecord( rStCtrl ))
+ break;
SdrObject* pImpObj = ImportObj( rStCtrl, (void*)&aProcessData, aEmpty, aEmpty );
if ( pImpObj )
{
@@ -789,7 +790,8 @@ bool ImplSdPPTImport::Import()
}
}
}
- aHd2.SeekToEndOfRecord( rStCtrl );
+ if (!aHd2.SeekToEndOfRecord(rStCtrl))
+ break;
}
}
}