[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/qa sd/source

[Caolán McNamara]

 sd/qa/unit/data/ppt/pass/hang-10.ppt |binary
 sd/source/filter/ppt/pptin.cxx       |    6 ++++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 15c185132f8c425722c6cdb380857e70a0ce04fd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 27 14:28:35 2015 +0100

    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 at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

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 0000000..99a81c4
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-10.ppt differ
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 7565fd4..0b2c0c8 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;
                                             }
                                         }
                                     }