[Libreoffice-commits] core.git: 2 commits - basic/source sd/source

[Caolán McNamara (via logerrit)]

 basic/source/runtime/iosys.cxx                |    3 ++-
 sd/source/helper/simplereferencecomponent.cxx |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ecf1e4b4022bc6e7756d2f94e192ef69816c8f63
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 18 10:48:28 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 18 22:12:36 2019 +0200

    cid#1448356 Uncaught exception
    
    Change-Id: Iaa48face892514b5af769cdb3120f001940cf0ea
    Reviewed-on: https://gerrit.libreoffice.org/75882
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx
index 23a1fe108c4a..acce1c481288 100644
--- a/sd/source/helper/simplereferencecomponent.cxx
+++ b/sd/source/helper/simplereferencecomponent.cxx
@@ -54,7 +54,7 @@ void SimpleReferenceComponent::release()
         }
         catch (RuntimeException const &) // don't break throw ()
         {
-            css::uno::Any ex( cppu::getCaughtException() );
+            css::uno::Any ex(DbgGetCaughtException());
             SAL_WARN( "sd", exceptionToString(ex) );
         }
     }
commit acf351fab73b1d05592d33e0a32cbc7cd160ae97
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 18 10:49:41 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 18 22:12:20 2019 +0200

    cid#1448372 Unchecked return value
    
    Change-Id: I63d8c9d145cd938fde289d680bdc0ed3f7357bd7
    Reviewed-on: https://gerrit.libreoffice.org/75883
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index c0b85982cf81..d73a177ac223 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -247,7 +247,8 @@ sal_uInt64 OslStream::SeekPos( sal_uInt64 nPos )
     }
     OSL_VERIFY(rc == ::osl::FileBase::E_None);
     sal_uInt64 nRealPos(0);
-    maFile.getPos( nRealPos );
+    rc = maFile.getPos( nRealPos );
+    OSL_VERIFY(rc == ::osl::FileBase::E_None);
     return nRealPos;
 }