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

[Caolán McNamara]

 ucb/source/ucp/file/filrset.cxx |    3 ++-
 ucb/source/ucp/file/filrset.hxx |    5 +++--
 ucb/source/ucp/ftp/ftpurl.cxx   |    2 +-
 ucb/source/ucp/ftp/ftpurl.hxx   |    2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 41155a364517fb674c1f76ea66005f27e34e6ef2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 6 09:24:10 2015 +0000

    coverity#1338237 Uncaught exception
    
    Change-Id: I7a7604f250a571708225fa347e80585baaa2f03d

diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index d843874..60bbfbb 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -217,7 +217,8 @@ bool SAL_CALL
 XResultSet_impl::OneMore(
     void )
     throw( sdbc::SQLException,
-           uno::RuntimeException )
+           uno::RuntimeException,
+           std::exception )
 {
     if( ! m_nIsOpen )
         return false;
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index 26758a4..7ffcd87 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -622,8 +622,9 @@ class XResultSet_impl : public Notifier,
 
         // Methods
         bool SAL_CALL OneMore()
-            throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException );
+            throw( css::sdbc::SQLException,
+                   css::uno::RuntimeException,
+                   std::exception );
 
         void rowCountChanged();
         void isFinalChanged();
commit a04b96e49bbd8c2ca066accb46da6169fa348487
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 6 09:23:18 2015 +0000

    coverity#1338236 Uncaught exception
    
    Change-Id: Ia2fc54862dfc0f6367f52fd471d6066d915264b6

diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 58c909b..8164ce3 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -387,7 +387,7 @@ namespace ftp {
                      urlParAscii.getStr());
 
 oslFileHandle FTPURL::open()
-    throw(curl_exception)
+    throw(curl_exception, std::exception)
 {
     if(m_aPathSegmentVec.empty())
         throw curl_exception(CURLE_FTP_COULDNT_RETR_FILE);
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index 6034abf..1a18ed6 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -122,7 +122,7 @@ namespace ftp {
 
         // returns a pointer to an open tempfile,
         // sought to the beginning of.
-        oslFileHandle open() throw(curl_exception);
+        oslFileHandle open() throw(curl_exception, std::exception);
 
         FTPDirentry direntry() const
             throw(curl_exception, malformed_exception, std::exception);