diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-08-27 14:28:35 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-31 15:12:00 +0200 |
| commit | 99619cedab937b55e0be93aabae67bd8d6dc3de0 (patch) | |
| tree | f7b2e9239974495420696cd503e4f3515221742c | |
| parent | 347646347b1bef261683916a69dd98f97afc243b (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.ppt | bin | 0 -> 7648 bytes | |||
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 6 |
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 Binary files differnew file mode 100644 index 000000000000..99a81c4a3362 --- /dev/null +++ b/sd/qa/unit/data/ppt/pass/hang-10.ppt 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; } } } |