[Libreoffice-commits] core.git: 2 commits - sdext/source svtools/source

[Caolán McNamara (via logerrit)]

 sdext/source/presenter/PresenterTextView.cxx |    2 +-
 svtools/source/misc/filechangedchecker.cxx   |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 1cbca8b27e6e175631190a50a3a363e9d9b07c86
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 18 11:18:05 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jul 19 09:43:58 2019 +0200

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

diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index a11bc4f193e3..3aa30753bc4b 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -1062,7 +1062,7 @@ PresenterTextCaret::~PresenterTextCaret()
     }
     catch (uno::Exception const&)
     {
-        css::uno::Any ex( cppu::getCaughtException() );
+        css::uno::Any ex(DbgGetCaughtException());
         SAL_WARN("sdext.presenter", "unexpected exception in ~PresenterTextCaret " << exceptionToString(ex));
     }
 }
commit 311d835a4a02782284bcdaa6c7334f6a76bb86f5
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 18 11:16:11 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jul 19 09:43:43 2019 +0200

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

diff --git a/svtools/source/misc/filechangedchecker.cxx b/svtools/source/misc/filechangedchecker.cxx
index c1e67a0fe1f0..09e24c3fafb1 100644
--- a/svtools/source/misc/filechangedchecker.cxx
+++ b/svtools/source/misc/filechangedchecker.cxx
@@ -45,12 +45,13 @@ bool FileChangedChecker::getCurrentModTime(TimeValue& o_rValue) const
 {
     // Need a Directory item to fetch file status
     osl::DirectoryItem aItem;
-    osl::DirectoryItem::get(mFileName, aItem);
+    if (osl::FileBase::E_None != osl::DirectoryItem::get(mFileName, aItem))
+        return false;
 
     // Retrieve the status - we are only interested in last File
     // Modified time
     osl::FileStatus aStatus( osl_FileStatus_Mask_ModifyTime );
-    if( osl::FileBase::E_None != aItem.getFileStatus(aStatus) )
+    if (osl::FileBase::E_None != aItem.getFileStatus(aStatus))
         return false;
 
     o_rValue = aStatus.getModifyTime();