summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-08-27 14:28:35 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-08-27 14:45:04 +0100
commit932f6de91904f86f38d2914b9ce07b94dfadac0c (patch)
treebb3122ba4e94f427ff9a6b27ed4ea2d32efb8949
parentde71eae5807ff94c8eace0eccaabf1ffa08e77b6 (diff)
check status of SeekTo
Change-Id: Ia2bb397c3fdd783cab77a6b0dbc31c9e3d19326b
-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 d37855d59f1b..31fe108508a3 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -787,7 +787,8 @@ bool ImplSdPPTImport::Import()
if ( nObjCount++ ) // skipping the first object
{
Rectangle aEmpty;
- aHd2.SeekToBegOfRecord( rStCtrl );
+ if (!aHd2.SeekToBegOfRecord(rStCtrl))
+ break;
SdrObject* pImpObj = ImportObj( rStCtrl, static_cast<void*>(&aProcessData), aEmpty, aEmpty );
if ( pImpObj )
{
@@ -796,7 +797,8 @@ bool ImplSdPPTImport::Import()
}
}
}
- aHd2.SeekToEndOfRecord( rStCtrl );
+ if (!aHd2.SeekToEndOfRecord(rStCtrl))
+ break;
}
}
}