[Libreoffice-commits] core.git: 29 commits - comphelper/source connectivity/source dbaccess/source editeng/source forms/source i18npool/inc i18npool/source include/comphelper include/connectivity include/editeng include/svx svl/source sw/inc sw/source
Caolán McNamara
caolanm at redhat.com
Thu Sep 1 09:40:51 UTC 2016
comphelper/source/property/propagg.cxx | 4 +---
connectivity/source/commontools/dbtools.cxx | 4 ++--
connectivity/source/drivers/file/FPreparedStatement.cxx | 2 +-
connectivity/source/drivers/file/FStatement.cxx | 3 +--
connectivity/source/drivers/file/fcomp.cxx | 4 ++--
connectivity/source/drivers/mork/MPreparedStatement.cxx | 4 +---
connectivity/source/drivers/mork/MPreparedStatement.hxx | 2 +-
connectivity/source/drivers/mork/MResultSet.cxx | 10 ++++------
connectivity/source/drivers/mork/MResultSet.hxx | 7 ++++---
connectivity/source/drivers/mork/MStatement.cxx | 3 +--
connectivity/source/drivers/mork/MStatement.hxx | 2 +-
connectivity/source/drivers/odbc/OStatement.cxx | 2 +-
connectivity/source/inc/file/FPreparedStatement.hxx | 2 +-
connectivity/source/inc/file/FStatement.hxx | 2 +-
connectivity/source/inc/file/fcomp.hxx | 4 ++--
connectivity/source/inc/odbc/OStatement.hxx | 2 +-
dbaccess/source/core/api/CacheSet.cxx | 12 ++++++------
dbaccess/source/core/api/CacheSet.hxx | 12 ++++++------
dbaccess/source/core/api/KeySet.cxx | 6 +++---
dbaccess/source/core/api/KeySet.hxx | 6 +++---
dbaccess/source/core/api/StaticSet.cxx | 10 +++++-----
dbaccess/source/core/api/StaticSet.hxx | 10 +++++-----
dbaccess/source/core/api/WrappedResultSet.cxx | 4 ++--
dbaccess/source/core/api/WrappedResultSet.hxx | 4 ++--
editeng/source/uno/unonrule.cxx | 2 +-
forms/source/component/FormComponent.cxx | 4 ++--
forms/source/component/ListBox.cxx | 2 +-
forms/source/component/ListBox.hxx | 2 +-
forms/source/inc/FormComponent.hxx | 4 ++--
i18npool/inc/indexentrysupplier_default.hxx | 2 +-
i18npool/source/indexentry/indexentrysupplier_default.cxx | 2 +-
include/comphelper/propagg.hxx | 2 +-
include/connectivity/dbtools.hxx | 4 ++--
include/editeng/unonrule.hxx | 2 +-
include/svx/IAccessibleParent.hxx | 2 +-
svl/source/inc/passwordcontainer.hxx | 4 ++--
svl/source/passwordcontainer/passwordcontainer.cxx | 8 ++------
sw/inc/accmap.hxx | 2 +-
sw/source/core/access/accmap.cxx | 2 +-
sw/source/core/docnode/ndtbl.cxx | 8 ++++----
sw/source/core/docnode/nodes.cxx | 2 +-
sw/source/core/frmedt/fefly1.cxx | 4 ++--
sw/source/core/frmedt/fews.cxx | 9 ++++++---
43 files changed, 90 insertions(+), 98 deletions(-)
New commits:
commit 98ce52b6786723d2402bd423638947bddd0f2fd7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 22:01:10 2016 +0100
coverity#1372406 Uncaught exception
Change-Id: I24fe9cb3aa9002d4b94b6f934e39aff243c1e09d
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 7a7d041..7352946 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1790,7 +1790,7 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams,
sal_Int32 parameterIndex,
const ::connectivity::ORowSetValue& _rValue,
sal_Int32 sqlType,
- sal_Int32 scale) throw(SQLException, RuntimeException)
+ sal_Int32 scale) throw(SQLException, RuntimeException, std::exception)
{
if ( _rValue.isNull() )
_xParams->setNull(parameterIndex,sqlType);
diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index 32db2ec..5c791b6 100644
--- a/include/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
@@ -590,7 +590,7 @@ namespace dbtools
sal_Int32 parameterIndex,
const ::connectivity::ORowSetValue& x,
sal_Int32 sqlType,
- sal_Int32 scale) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ sal_Int32 scale) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
/** implements <method scope="com.sun.star.sdb">XParameters::setObject</method>
commit 02d1eb96e1f99eb85a7f997c98e3759f5575f1b6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 22:00:24 2016 +0100
coverity#1372405 Uncaught exception
Change-Id: I9d2029be969d767eb096137017e8a7e646b69d2d
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
index 02f122c..09181e6 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -92,7 +92,7 @@ void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const c
(*_rInsertRow->get().begin()) = getBookmark();
}
-void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException, std::exception)
{
sal_Int32 i = 1;
connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOriginalRow->get().begin()+1;
diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx
index 4811705..6cd31f8 100644
--- a/dbaccess/source/core/api/WrappedResultSet.hxx
+++ b/dbaccess/source/core/api/WrappedResultSet.hxx
@@ -53,7 +53,7 @@ namespace dbaccess
virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
// css::sdbc::XResultSetUpdate
virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+ virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
};
}
commit f28dd1d9d24092135aeef7ea76f73492d76d99e8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:59:37 2016 +0100
coverity#1372404 Uncaught exception
Change-Id: Id78404a2fae06004a35c9bf07136bd4806a12e02
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 907b2f4..7f492b4 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -522,7 +522,7 @@ void SAL_CALL OCacheSet::beforeFirst( ) throw(SQLException, RuntimeException)
m_xDriverSet->beforeFirst();
}
-void SAL_CALL OCacheSet::afterLast( ) throw(SQLException, RuntimeException)
+void SAL_CALL OCacheSet::afterLast( ) throw(SQLException, RuntimeException, std::exception)
{
m_bInserted = m_bUpdated = m_bDeleted = false;
m_xDriverSet->afterLast();
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index 3bd134e..c0dc762d 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -104,7 +104,7 @@ namespace dbaccess
virtual bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
- virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
virtual bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
virtual bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index dab13ea..aa1ec1c 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -141,7 +141,7 @@ void SAL_CALL OStaticSet::beforeFirst( ) throw(SQLException, RuntimeException)
m_aSetIter = m_aSet.begin();
}
-void SAL_CALL OStaticSet::afterLast( ) throw(SQLException, RuntimeException)
+void SAL_CALL OStaticSet::afterLast( ) throw(SQLException, RuntimeException, std::exception)
{
m_bInserted = m_bUpdated = m_bDeleted = false;
fillAllRows();
diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx
index 70e7b8d..0b6f516 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -56,7 +56,7 @@ namespace dbaccess
virtual bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
- virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+ virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
commit f9eaeae19dc06558737e59c5eec0b0628ed57603
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:58:19 2016 +0100
coverity#1372403 Uncaught exception
Change-Id: I9bdb04e55f28c5470e13debde9845c984954092f
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
index 86c0d4f..02f122c 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -78,7 +78,7 @@ sal_Int32 SAL_CALL WrappedResultSet::hashBookmark( const Any& bookmark ) throw(S
return m_xRowLocate->hashBookmark(bookmark);
}
-void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException, std::exception)
{
m_xUpd->moveToInsertRow();
sal_Int32 i = 1;
diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx
index db76925..4811705 100644
--- a/dbaccess/source/core/api/WrappedResultSet.hxx
+++ b/dbaccess/source/core/api/WrappedResultSet.hxx
@@ -52,7 +52,7 @@ namespace dbaccess
virtual bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
// css::sdbc::XResultSetUpdate
- virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+ virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
};
commit 321d5970c687fac40fb5da55b517f01ca630ad77
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:57:32 2016 +0100
coverity#1372402 Uncaught exception
Change-Id: I63743ccdeca1be66da5622bd286f08daebdd74ff
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index ea7849e..7a7d041 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1779,7 +1779,7 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams,
sal_Int32 parameterIndex,
const Any& x,
sal_Int32 sqlType,
- sal_Int32 scale) throw(SQLException, RuntimeException)
+ sal_Int32 scale) throw(SQLException, RuntimeException, std::exception)
{
ORowSetValue aVal;
aVal.fill(x);
diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index 2d57893..32db2ec 100644
--- a/include/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
@@ -576,7 +576,7 @@ namespace dbtools
sal_Int32 parameterIndex,
const css::uno::Any& x,
sal_Int32 sqlType,
- sal_Int32 scale=0) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ sal_Int32 scale=0) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
/** call the appropriate set method for the specific sql type @see css::sdbc::DataType
@param _xParams the parameters where to set the value
commit cb1539c4d66893a1522df1bbdbb90a69815c5e50
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:56:22 2016 +0100
coverity#1372401 Uncaught exception
Change-Id: I9624eeacbe8dc32fd22560737c3d69cf022b2724
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 9da09584..907b2f4 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -545,7 +545,7 @@ sal_Int32 SAL_CALL OCacheSet::getRow( ) throw(SQLException, RuntimeException)
return m_xDriverSet->getRow();
}
-bool SAL_CALL OCacheSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
{
m_bInserted = m_bUpdated = m_bDeleted = false;
return m_xDriverSet->absolute(row);
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index 95b6cd5..3bd134e 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -108,7 +108,7 @@ namespace dbaccess
virtual bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
virtual bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
- virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
virtual bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
virtual bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index 58152b7..dab13ea 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -177,7 +177,7 @@ sal_Int32 SAL_CALL OStaticSet::getRow( ) throw(SQLException, RuntimeException)
return nPos;
}
-bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
+bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
{
m_bInserted = m_bUpdated = m_bDeleted = false;
OSL_ENSURE(row,"OStaticSet::absolute: INVALID row number!");
diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx
index 8c23e7d..70e7b8d 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -60,7 +60,7 @@ namespace dbaccess
virtual bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
- virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+ virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
commit a9dcaba2d50fae9e6eb861dbf45ec9aa9e588a4a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:55:12 2016 +0100
coverity#1372400 Uncaught exception
Change-Id: I2319602a3b04bc0c5a6d4082ac62f98f7a697cf8
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 7b9aa47..917f78b 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1059,7 +1059,7 @@ void SAL_CALL OKeySet::afterLast( ) throw(SQLException, RuntimeException)
invalidateRow();
}
-bool SAL_CALL OKeySet::first( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::first() throw(SQLException, RuntimeException, std::exception)
{
m_bInserted = m_bUpdated = m_bDeleted = false;
m_aKeyIter = m_aKeyMap.begin();
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index ff1ee7a..5c3fa2b6 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -190,7 +190,7 @@ namespace dbaccess
virtual bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
- virtual bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+ virtual bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
commit 6ce409bd9cfdda559aa86082896df51dfc5556ee
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:53:51 2016 +0100
coverity#1372398 Uncaught exception
Change-Id: Icf6c0f8071a3ea2de81073dfcabc64fae6aeee9c
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx
index 8b2aad8..1ee4846 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -374,7 +374,7 @@ sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLExcep
// returns NULL if the current result is not a ResultSet.
Reference< XResultSet > OStatement_Base::getResultSet(bool checkCount)
- throw (SQLException, css::uno::RuntimeException)
+ throw (SQLException, css::uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 5a068eb..9d3a963 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -115,7 +115,7 @@ namespace connectivity
// returns NULL if the current result is not a ResultSet.
css::uno::Reference<css::sdbc::XResultSet> getResultSet(bool checkCount)
- throw (css::sdbc::SQLException, css::uno::RuntimeException);
+ throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
/**
creates the driver specific resultset (factory)
*/
commit 8e2ba391e4b78f361f9c5f189197680872fb48a9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:52:40 2016 +0100
coverity#1372397 Uncaught exception
Change-Id: I5baed239582f91a30c451eb26c46ea9bf33c92a4
diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx
index d53bda5..e9ffbd0 100644
--- a/i18npool/inc/indexentrysupplier_default.hxx
+++ b/i18npool/inc/indexentrysupplier_default.hxx
@@ -86,7 +86,7 @@ public:
void init(const css::lang::Locale& rLocale, const OUString& algorithm) throw (css::uno::RuntimeException);
- void makeIndexKeys(const css::lang::Locale &rLocale, const OUString &algorithm) throw (css::uno::RuntimeException);
+ void makeIndexKeys(const css::lang::Locale &rLocale, const OUString &algorithm) throw (css::uno::RuntimeException, std::exception);
sal_Int16 getIndexWeight(const OUString& rIndexEntry);
OUString getIndexDescription(const OUString& rIndexEntry);
diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx
index aae0e74..9cfbc9f 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx
@@ -165,7 +165,7 @@ OUString Index::getIndexDescription(const OUString& rIndexEntry)
#define LOCALE_EN lang::Locale(OUString("en"), OUString(), OUString())
-void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm) throw (RuntimeException)
+void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm) throw (RuntimeException, std::exception)
{
OUString keyStr = LocaleDataImpl::get()->getIndexKeysByAlgorithm(rLocale, algorithm);
commit de32f503202be634d8de95744d4942d74a4a9511
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:51:42 2016 +0100
coverity#1372396 Uncaught exception
Change-Id: Idd2be5ba18d68ab9b5f7da12b69727480ad9ff50
diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx
index 6a34126..f2212e3 100644
--- a/svl/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.hxx
@@ -321,7 +321,7 @@ public:
static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL
impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& ServiceManager ) throw(css::uno::RuntimeException);
static css::uno::Reference< css::uno::XInterface > SAL_CALL
- impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::RuntimeException );
+ impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 16b3444..3471291 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -1358,13 +1358,11 @@ OUString SAL_CALL PasswordContainer::impl_getStaticImplementationName() throw(un
return OUString("stardiv.svl.PasswordContainer");
}
-
-Reference< XInterface > SAL_CALL PasswordContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( RuntimeException )
+Reference< XInterface > SAL_CALL PasswordContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( RuntimeException, std::exception )
{
return Reference< XInterface >( *new PasswordContainer( xServiceManager ) );
}
-
Reference< XSingleServiceFactory > SAL_CALL PasswordContainer::impl_createFactory( const Reference< XMultiServiceFactory >& ServiceManager ) throw(RuntimeException)
{
Reference< XSingleServiceFactory > xReturn( ::cppu::createOneInstanceFactory( ServiceManager,
commit 2ff52852a267f6a7c63d00291bc38677916d39c5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:50:45 2016 +0100
coverity#1372395 Uncaught exception
Change-Id: Ia384d4f7186e3ea870a6bb06fb8227ae0321715e
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 5b10f35..9da09584 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -528,7 +528,7 @@ void SAL_CALL OCacheSet::afterLast( ) throw(SQLException, RuntimeException)
m_xDriverSet->afterLast();
}
-bool SAL_CALL OCacheSet::first( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::first() throw(SQLException, RuntimeException, std::exception)
{
m_bInserted = m_bUpdated = m_bDeleted = false;
return m_xDriverSet->first();
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index dd9e5e6..95b6cd5 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -105,7 +105,7 @@ namespace dbaccess
virtual bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
- virtual bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
virtual bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index 182d34c..58152b7 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -148,7 +148,7 @@ void SAL_CALL OStaticSet::afterLast( ) throw(SQLException, RuntimeException)
m_aSetIter = m_aSet.end();
}
-bool SAL_CALL OStaticSet::first( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OStaticSet::first() throw(SQLException, RuntimeException, std::exception)
{
m_bInserted = m_bUpdated = m_bDeleted = false;
m_aSetIter = m_aSet.begin()+1;
diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx
index e18453e..8c23e7d 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -57,7 +57,7 @@ namespace dbaccess
virtual bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
- virtual bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+ virtual bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
commit 8f7886c742cae5e012e52029c20925aa7b0fb6ea
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:49:03 2016 +0100
coverity#1372393 Uncaught exception
Change-Id: I310fb547b81d89e9000760f6628e07d2e5c7effc
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 9942743..5b10f35 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -534,7 +534,7 @@ bool SAL_CALL OCacheSet::first( ) throw(SQLException, RuntimeException)
return m_xDriverSet->first();
}
-bool SAL_CALL OCacheSet::last( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::last() throw(SQLException, RuntimeException, std::exception)
{
m_bInserted = m_bUpdated = m_bDeleted = false;
return m_xDriverSet->last();
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index 8154741..dd9e5e6 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -106,7 +106,7 @@ namespace dbaccess
virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
- virtual bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index f83af06..182d34c 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -158,7 +158,7 @@ bool SAL_CALL OStaticSet::first( ) throw(SQLException, RuntimeException)
return m_aSetIter != m_aSet.end();
}
-bool SAL_CALL OStaticSet::last( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OStaticSet::last() throw(SQLException, RuntimeException, std::exception)
{
m_bInserted = m_bUpdated = m_bDeleted = false;
fillAllRows();
diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx
index f879bf1..e18453e 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -58,7 +58,7 @@ namespace dbaccess
virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
- virtual bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+ virtual bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
commit 3c50bae22266ee708e7e81cf0334d8944261a891
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:47:39 2016 +0100
coverity#1372392 Uncaught exception
Change-Id: Ic8bb4748b0752796fcb76c1816441bb22b896809
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index bf99c8f..de5d0c9 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -997,9 +997,8 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
}
}
-
void OResultSet::fillRowData()
- throw (css::sdbc::SQLException, css::uno::RuntimeException)
+ throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
{
OSL_ENSURE( m_pStatement, "Require a statement" );
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx
index 6300cb9..57a6519 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -241,7 +241,7 @@ protected:
::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns;
void parseParameter( const OSQLParseNode* pNode, OUString& rMatchString );
- void fillRowData() throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ void fillRowData() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
void analyseWhereClause( const OSQLParseNode* parseTree,
MQueryExpression &queryExpression);
commit c39378edb25686ed445f11fc60d1e0e07eed18dd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:46:19 2016 +0100
coverity#1372391 Uncaught exception
Change-Id: I62358c3705c437dfe1e3e370a2cc857a21144ca2
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index c2456f2..7b9aa47 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1006,7 +1006,7 @@ Reference<XNameAccess> OKeySet::getKeyColumns() const
return xKeyColumns;
}
-bool SAL_CALL OKeySet::next( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::next() throw(SQLException, RuntimeException, std::exception)
{
m_bInserted = m_bUpdated = m_bDeleted = false;
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index b0aa1e2..ff1ee7a 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -185,7 +185,7 @@ namespace dbaccess
virtual bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
// css::sdbc::XResultSet
- virtual bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+ virtual bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
commit ec2aa9c5ba7a6ccd1f71c26cd78af11007ad5baa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:45:05 2016 +0100
coverity#1372390 Uncaught exception
Change-Id: I4bb01b0bb9865986d9da8ed294a46fa7a4488458
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 20bb0ee..c59496a 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -75,7 +75,7 @@ void OPreparedStatement::disposing()
}
}
-void OPreparedStatement::construct(const OUString& sql) throw(SQLException, RuntimeException)
+void OPreparedStatement::construct(const OUString& sql) throw(SQLException, RuntimeException, std::exception)
{
OStatement_Base::construct(sql);
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index a4dc41d..2db0409 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -374,8 +374,7 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef,
m_aOrderbyAscending.push_back((SQL_ISTOKEN(pAscendingDescending,DESC)) ? TAscendingOrder::DESC : TAscendingOrder::ASC);
}
-
-void OStatement_Base::construct(const OUString& sql) throw(SQLException, RuntimeException)
+void OStatement_Base::construct(const OUString& sql) throw(SQLException, RuntimeException, std::exception)
{
OUString aErr;
m_pParseTree = m_aParser.parseTree(aErr,sql);
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index 15a2f2d..7d4d868 100644
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -73,7 +73,7 @@ namespace connectivity
// a Constructor, that is needed for when Returning the Object is needed:
OPreparedStatement( OConnection* _pConnection);
- virtual void construct(const OUString& sql) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+ virtual void construct(const OUString& sql) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
// OComponentHelper
virtual void SAL_CALL disposing() override;
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index 81ebaca..aa3398d 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -137,7 +137,7 @@ namespace connectivity
using OStatement_BASE::operator css::uno::Reference< css::uno::XInterface >;
- virtual void construct(const OUString& sql) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual void construct(const OUString& sql) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
// OComponentHelper
virtual void SAL_CALL disposing() override;
commit 99542f5744b8feaec0c44081029cdedd93a77639
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:43:36 2016 +0100
coverity#1372389 Uncaught exception
Change-Id: Ic788073adcaefb3de2bff7e249f17a64fad48b19
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 611c945..018b57e 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -410,7 +410,7 @@ void OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode) throw(SQL
m_aCodeList.push_back(pOperator);
}
-OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException)
+OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException, std::exception)
{
OOperand* pOperand = nullptr;
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 7a2b9a2..5c3d0f2 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -72,7 +72,7 @@ namespace connectivity
void execute_LIKE(connectivity::OSQLParseNode* pPredicateNode) throw(css::sdbc::SQLException, css::uno::RuntimeException);
void execute_BETWEEN(connectivity::OSQLParseNode* pPredicateNode) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
void execute_ISNULL(connectivity::OSQLParseNode* pPredicateNode) throw(css::sdbc::SQLException, css::uno::RuntimeException);
- OOperand* execute_Operand(connectivity::OSQLParseNode* pPredicateNode) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ OOperand* execute_Operand(connectivity::OSQLParseNode* pPredicateNode) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
void execute_Fold(OSQLParseNode* pPredicateNode) throw( css::sdbc::SQLException, css::uno::RuntimeException);
void executeFunction(OSQLParseNode* pPredicateNode) throw( css::sdbc::SQLException, css::uno::RuntimeException);
};
commit 1e9881441482f61c770a30f8294e6a38ec1a2ebd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:42:34 2016 +0100
coverity#1372388 Uncaught exception
Change-Id: I55c4e2ad1f3384c4e8b0a6cc88b83fa96cf2dede
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx
index 5376e0e..196b623 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx
@@ -62,9 +62,8 @@ void SAL_CALL OPreparedStatement::disposing()
m_xParamColumns = nullptr;
}
-
OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sql , bool bAdjusted )
- throw ( css::sdbc::SQLException, css::uno::RuntimeException )
+ throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
{
StatementType eStatementType = OCommonStatement::parseSql( sql, bAdjusted );
if ( eStatementType != eSelect )
@@ -81,7 +80,6 @@ OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sq
return eStatementType;
}
-
void OPreparedStatement::initializeResultSet( OResultSet* _pResult )
{
OCommonStatement::initializeResultSet( _pResult );
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx
index 65268bc..2aa9aef 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx
@@ -58,7 +58,7 @@ namespace connectivity
// OCommonStatement overridables
virtual StatementType
- parseSql( const OUString& sql , bool bAdjusted = false) throw ( css::sdbc::SQLException, css::uno::RuntimeException ) override;
+ parseSql( const OUString& sql , bool bAdjusted = false) throw ( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
virtual void initializeResultSet( OResultSet* _pResult ) override;
virtual void clearCachedResultSet() override;
virtual void cacheResultSet( const ::rtl::Reference< OResultSet >& _pResult ) override;
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index f74e2e1..0096d36 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -119,9 +119,8 @@ void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException,
dispose();
}
-
OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql , bool bAdjusted)
- throw ( SQLException, RuntimeException )
+ throw ( SQLException, RuntimeException, std::exception )
{
OUString aErr;
diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx
index 76f9f1f..d199142 100644
--- a/connectivity/source/drivers/mork/MStatement.hxx
+++ b/connectivity/source/drivers/mork/MStatement.hxx
@@ -106,7 +106,7 @@ namespace connectivity
/** called to do the parsing of a to-be-executed SQL statement, and set all members as needed
*/
virtual StatementType
- parseSql( const OUString& sql , bool bAdjusted = false) throw ( css::sdbc::SQLException, css::uno::RuntimeException );
+ parseSql( const OUString& sql , bool bAdjusted = false) throw ( css::sdbc::SQLException, css::uno::RuntimeException, std::exception );
/** called to initialize a result set, according to a previously parsed SQL statement
*/
virtual void initializeResultSet( OResultSet* _pResult );
commit e4a1209443fbda58aed07a28cc28612f0b060bae
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:40:22 2016 +0100
coverity#1372387 Uncaught exception
Change-Id: I563e7987d00a68373c05dc4f1f3d62cd3e52de70
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 339f4c8..bf99c8f 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -1105,9 +1105,9 @@ sal_Int32 OResultSet::getRowForCardNumber(sal_Int32 nCardNum)
return 0;
}
-
-void SAL_CALL OResultSet::executeQuery() throw( css::sdbc::SQLException,
- css::uno::RuntimeException)
+void SAL_CALL OResultSet::executeQuery() throw(css::sdbc::SQLException,
+ css::uno::RuntimeException,
+ std::exception)
{
ResultSetEntryGuard aGuard( *this );
@@ -1281,7 +1281,6 @@ void SAL_CALL OResultSet::executeQuery() throw( css::sdbc::SQLException,
}
}
-
void OResultSet::setBoundedColumns(const OValueRow& _rRow,
const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,
const Reference<XIndexAccess>& _xNames,
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx
index 6ccc04a..6300cb9 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -275,8 +275,9 @@ protected:
public:
bool determineReadOnly();
// MozAddressbook Specific methods
- void SAL_CALL executeQuery() throw( css::sdbc::SQLException,
- css::uno::RuntimeException);
+ void SAL_CALL executeQuery() throw(css::sdbc::SQLException,
+ css::uno::RuntimeException,
+ std::exception);
void setTable(OTable* _rTable);
commit a6bc2ace5fd7b7c4dc2058c16dc0b94b0561edcd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:38:35 2016 +0100
coverity#1372386 Uncaught exception
Change-Id: Ic1fd5486e6b26718086d2f062459f11c00f244d2
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index ed91935..5225a7e 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -851,8 +851,7 @@ css::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const O
return getPropertyDefaultByHandle(nHandle);
}
-
-sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException)
+sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException, std::exception)
{
bool bModified = false;
@@ -872,7 +871,6 @@ sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any&
return bModified;
}
-
void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception )
{
OSL_ENSURE( m_pForwarder->isResponsibleFor( _nHandle ), "OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast: this is no forwarded property - did you use declareForwardedProperty for it?" );
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 431501c..9ff9a58 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -937,7 +937,7 @@ void OControlModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) con
sal_Bool OControlModel::convertFastPropertyValue(
Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue)
- throw (css::lang::IllegalArgumentException)
+ throw (css::lang::IllegalArgumentException, std::exception)
{
bool bModified(false);
switch (_nHandle)
@@ -1642,7 +1642,7 @@ sal_Bool OBoundControlModel::convertFastPropertyValue(
Any& _rConvertedValue, Any& _rOldValue,
sal_Int32 _nHandle,
const Any& _rValue)
- throw (css::lang::IllegalArgumentException)
+ throw (css::lang::IllegalArgumentException, std::exception)
{
bool bModified(false);
switch (_nHandle)
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 006a2be..9d54a9b 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -390,7 +390,7 @@ namespace frm
sal_Bool OListBoxModel::convertFastPropertyValue(
Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue)
- throw (IllegalArgumentException)
+ throw (IllegalArgumentException, std::exception)
{
bool bModified(false);
switch (_nHandle)
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 702332e..b1e32e2 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -146,7 +146,7 @@ public:
throw (css::uno::Exception, std::exception) override;
virtual sal_Bool SAL_CALL convertFastPropertyValue(
css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue )
- throw (css::lang::IllegalArgumentException) override;
+ throw (css::lang::IllegalArgumentException, std::exception) override;
protected:
static const ::connectivity::ORowSetValue s_aEmptyValue;
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index da3bb20..1b7c08d 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -425,7 +425,7 @@ public:
virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override;
virtual sal_Bool SAL_CALL convertFastPropertyValue(
css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue )
- throw (css::lang::IllegalArgumentException) override;
+ throw (css::lang::IllegalArgumentException, std::exception) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
throw (css::uno::Exception, std::exception) override;
using ::cppu::OPropertySetHelper::getFastPropertyValue;
@@ -1002,7 +1002,7 @@ public:
virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override;
virtual sal_Bool SAL_CALL convertFastPropertyValue(
css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue )
- throw (css::lang::IllegalArgumentException) override;
+ throw (css::lang::IllegalArgumentException, std::exception) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
throw (css::uno::Exception, std::exception) override;
using ::cppu::OPropertySetHelper::getFastPropertyValue;
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index 68fafa01..2ecc05b 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -247,7 +247,7 @@ public:
/** only implemented for "forwarded" properties, every other property must be handled
in the derivee, and will assert if passed herein
*/
- virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw(css::lang::IllegalArgumentException) override;
+ virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw(css::lang::IllegalArgumentException, std::exception) override;
/** only implemented for "forwarded" properties, every other property must be handled
in the derivee, and will assert if passed herein
commit 50caee009b82fcae7f851e3a1b21ecc3e47a82de
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:35:42 2016 +0100
coverity#1372385 Uncaught exception
Change-Id: Ic8a33ef10d627bc5868a77aa7f14b46682d735d2
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index ad6bfe3..9942743 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -500,7 +500,7 @@ Reference< XArray > SAL_CALL OCacheSet::getArray( sal_Int32 columnIndex ) throw(
}
// XResultSet
-bool SAL_CALL OCacheSet::next( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::next() throw(SQLException, RuntimeException, std::exception)
{
m_bInserted = m_bUpdated = m_bDeleted = false;
return m_xDriverSet->next();
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index a927417..8154741 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -100,7 +100,7 @@ namespace dbaccess
virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
// css::sdbc::XResultSet
- virtual bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
virtual bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index 4efd16e..f83af06 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -108,7 +108,7 @@ void OStaticSet::fillAllRows()
}
// XResultSet
-bool SAL_CALL OStaticSet::next( ) throw(SQLException, RuntimeException)
+bool SAL_CALL OStaticSet::next() throw(SQLException, RuntimeException, std::exception)
{
m_bInserted = m_bUpdated = m_bDeleted = false;
diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx
index 9d76cdd..f879bf1 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -52,7 +52,7 @@ namespace dbaccess
virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
// css::sdbc::XResultSet
- virtual bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+ virtual bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
commit 66f7aaf7663c3d7f8c5a13093f7449d14e028b03
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:34:11 2016 +0100
coverity#1372384 Uncaught exception
Change-Id: I4451623ba950b93e0efba5b3ec755622c2bea2bc
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index f46599e..313d592 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -171,7 +171,7 @@ Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames( )
}
Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal_Int32 nIndex) const
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
// NumberingRule aRule;
const SvxNumberFormat& rFmt = maRule.GetLevel((sal_uInt16) nIndex);
diff --git a/include/editeng/unonrule.hxx b/include/editeng/unonrule.hxx
index d778836..461fed4 100644
--- a/include/editeng/unonrule.hxx
+++ b/include/editeng/unonrule.hxx
@@ -73,7 +73,7 @@ public:
// internal
css::uno::Sequence<css::beans::PropertyValue> getNumberingRuleByIndex( sal_Int32 nIndex) const
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
void setNumberingRuleByIndex(const css::uno::Sequence<css::beans::PropertyValue>& rProperties, sal_Int32 nIndex)
throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception);
commit ca409c68e22d6f9257311b399199f512cb150cd8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:33:10 2016 +0100
coverity#1372383 Uncaught exception
Change-Id: Idfdd846d8439be91b059d53dab6591d202576fae
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 38eae60..611c945 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -315,7 +315,7 @@ void OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw(SQLEx
m_aCodeList.push_back(pOperator);
}
-void OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException)
+void OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException, std::exception)
{
DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree");
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index aece8e0..7a2b9a2 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -70,7 +70,7 @@ namespace connectivity
protected:
void execute_COMPARE(connectivity::OSQLParseNode* pPredicateNode) throw( css::sdbc::SQLException, css::uno::RuntimeException);
void execute_LIKE(connectivity::OSQLParseNode* pPredicateNode) throw(css::sdbc::SQLException, css::uno::RuntimeException);
- void execute_BETWEEN(connectivity::OSQLParseNode* pPredicateNode) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ void execute_BETWEEN(connectivity::OSQLParseNode* pPredicateNode) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
void execute_ISNULL(connectivity::OSQLParseNode* pPredicateNode) throw(css::sdbc::SQLException, css::uno::RuntimeException);
OOperand* execute_Operand(connectivity::OSQLParseNode* pPredicateNode) throw(css::sdbc::SQLException, css::uno::RuntimeException);
void execute_Fold(OSQLParseNode* pPredicateNode) throw( css::sdbc::SQLException, css::uno::RuntimeException);
commit 9f0e49cee4ddf96f48b65078adccaf16bb35b785
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:32:12 2016 +0100
coverity#1372382 Uncaught exception
Change-Id: I7c3e11542d2b82af212d2f52bc1b66f0e6ce187c
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 6922b00..ad6bfe3 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -572,7 +572,7 @@ bool OCacheSet::absolute_checked( sal_Int32 row,bool /*i_bFetchRow*/ )
return absolute(row);
}
-void SAL_CALL OCacheSet::refreshRow( ) throw(SQLException, RuntimeException)
+void SAL_CALL OCacheSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception)
{
m_xDriverSet->refreshRow();
}
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index ca4aea9..a927417 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -110,7 +110,7 @@ namespace dbaccess
virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
- virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
virtual bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 3af8899..c2456f2 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1228,7 +1228,7 @@ bool OKeySet::doTryRefetch_throw() throw(SQLException, RuntimeException)
return m_xSet->next();
}
-void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException)
+void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException, std::exception)
{
invalidateRow();
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index 46117c3..b0aa1e2 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -196,7 +196,7 @@ namespace dbaccess
virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
void SAL_CALL ensureRowForData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
- virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+ virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
// css::sdbcx::XRowLocate
virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
commit 69bea8fde2bb98ee4b8522e9968a6648d0d1329b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:30:42 2016 +0100
coverity#1372381 Uncaught exception
Change-Id: I37fb1503737f81edb92a0571cc6222a69ba465c2
diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx
index cb09b72..6a34126 100644
--- a/svl/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.hxx
@@ -268,7 +268,7 @@ css::task::UrlRecord find(
throw(css::uno::RuntimeException, std::exception);
static ::std::vector< OUString > DecodePasswords( const OUString& aLine, const OUString& aMasterPassword )
- throw(css::uno::RuntimeException);
+ throw(css::uno::RuntimeException, std::exception);
static OUString EncodePasswords(const std::vector< OUString >& lines, const OUString& aMasterPassword )
throw(css::uno::RuntimeException);
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index d5be5b4..16b3444 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -402,7 +402,6 @@ PasswordContainer::~PasswordContainer()
}
}
-
void SAL_CALL PasswordContainer::disposing( const EventObject& ) throw(RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( mMutex );
@@ -420,8 +419,7 @@ void SAL_CALL PasswordContainer::disposing( const EventObject& ) throw(RuntimeEx
}
}
-
-vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLine, const OUString& aMasterPasswd ) throw(RuntimeException)
+vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLine, const OUString& aMasterPasswd ) throw(RuntimeException, std::exception)
{
if( !aMasterPasswd.isEmpty() )
{
commit e3190bdef2a3c85559aa761103c198930c7e1164
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:28:28 2016 +0100
coverity#1372380 Uncaught exception
Change-Id: I7e3fa90b9186b518188b322f9236bd588d00d846
diff --git a/include/svx/IAccessibleParent.hxx b/include/svx/IAccessibleParent.hxx
index 26678ef..897820b 100644
--- a/include/svx/IAccessibleParent.hxx
+++ b/include/svx/IAccessibleParent.hxx
@@ -79,7 +79,7 @@ public:
const css::uno::Reference< css::drawing::XShape >& _rxShape,
const long _nIndex,
const AccessibleShapeTreeInfo& _rShapeTreeInfo
- ) throw (css::uno::RuntimeException) = 0;
+ ) throw (css::uno::RuntimeException, std::exception) = 0;
//Add this method to support Form Controls
virtual AccessibleControlShape* GetAccControlShapeFromModel
(css::beans::XPropertySet*)
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index ecb0520..38eba83 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -261,7 +261,7 @@ public:
const css::uno::Reference< css::drawing::XShape >& _rxShape,
const long _nIndex,
const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo
- ) throw (css::uno::RuntimeException) override;
+ ) throw (css::uno::RuntimeException, std::exception) override;
virtual ::accessibility::AccessibleControlShape* GetAccControlShapeFromModel
(css::beans::XPropertySet* pSet)
throw (css::uno::RuntimeException) override;
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 00bac53..385c077 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -3159,7 +3159,7 @@ bool SwAccessibleMap::ReplaceChild (
const uno::Reference< drawing::XShape >& _rxShape,
const long /*_nIndex*/,
const ::accessibility::AccessibleShapeTreeInfo& /*_rShapeTreeInfo*/
- ) throw (uno::RuntimeException)
+ ) throw (uno::RuntimeException, std::exception)
{
const SdrObject *pObj = nullptr;
{
commit 07395b440f5f2f12aa122b7fd047865a5ed55611
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 1 09:44:12 2016 +0100
coverity#1093229 Dereference null return value
Change-Id: I6f9b6c024442f5152b5f2c72fa018f10b4b7866a
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 4b04d07..058d102 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -968,7 +968,7 @@ void SwNodes::SectionUp(SwNodeRange *pRange)
if( pAktNode->IsStartNode() ) // selbst StartNode
{
SwEndNode* pEndNd = pRange->aEnd.GetNode().GetEndNode();
- if( pAktNode == pEndNd->m_pStartOfSection )
+ if (pEndNd && pAktNode == pEndNd->m_pStartOfSection)
{
// there was a pairwise reset, adjust only those in the range
SwStartNode* pTmpSttNd = pAktNode->m_pStartOfSection;
commit ba401ee10be2fb051bc961680f35b04e4e77a32d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 1 09:39:37 2016 +0100
coverity#1372378 Dereference null return value
Change-Id: I4f5c6b79d884497574dee37a15752178c1eb59ed
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 782400a..d05c562 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1040,8 +1040,8 @@ bool SwFEShell::SetFlyFrameAttr( SfxItemSet& rSet )
if( rSet.Count() )
{
SwFlyFrame *pFly = GetSelectedOrCurrFlyFrame();
- OSL_ENSURE( pFly, "SetFlyFrameAttr, no Fly selected." );
- if( pFly )
+ OSL_ENSURE(pFly, "SetFlyFrameAttr, no Fly selected.");
+ if (pFly)
{
StartAllAction();
const Point aPt( pFly->Frame().Pos() );
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 630959e..9bc6d94 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -491,9 +491,12 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const OUString &rText, con
SfxItemSet aSet(makeItemSetFromFormatAnchor(GetDoc()->GetAttrPool(), aAnc));
SwFlyFrame *pFly = GetSelectedOrCurrFlyFrame();
- SwFlyFrameFormat* pInnerFlyFormat = pFly->GetFormat();
- GetDoc()->SetFlyFrameAttr(*pInnerFlyFormat, aSet);
-
+ OSL_ENSURE(pFly, "SetFlyFrameAttr, no Fly selected.");
+ if (pFly)
+ {
+ SwFlyFrameFormat* pInnerFlyFormat = pFly->GetFormat();
+ GetDoc()->SetFlyFrameAttr(*pInnerFlyFormat, aSet);
+ }
//put a hard-break after the graphic to keep it separated
//from the caption text if the outer frame is resized
SwIndex aIdx(pTextNode, bBefore ? nInsertPos : 1);
commit ac192a7ef116e6453fee7872b558ff957e377c50
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 1 09:36:20 2016 +0100
coverity#1372379 this can be a real assert cause we deref it afterwards
Change-Id: Ic80132c5fa94d935910c1cfdb03f696b2812676a
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 9ebeb53..6fad994 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3408,7 +3408,7 @@ SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, bool bAfter,
SwTableNode * pNewTableNd;
{
SwEndNode* pOldTableEndNd = pTNd->EndOfSectionNode()->GetEndNode();
- OSL_ENSURE( pOldTableEndNd, "Where is the EndNode?" );
+ assert(pOldTableEndNd && "Where is the EndNode?");
SwNodeIndex aIdx( *pBox->GetSttNd() );
new SwEndNode( aIdx, *pTNd );
commit 1d07d8fb5ee361be5e15c753ddbde2f26fefe393
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 31 21:26:03 2016 +0100
coverity#1372376 assert can't have Division or modulo by zero
Change-Id: I0b7615bb5a29e1a275647670351f643784467885
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 5310662..9ebeb53 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -336,8 +336,8 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTableOpts,
bool bCalledFromShell,
bool bNewModel )
{
- OSL_ENSURE( nRows, "Table without line?" );
- OSL_ENSURE( nCols, "Table without rows?" );
+ assert(nRows && "Table without line?");
+ assert(nCols && "Table without rows?");
{
// Do not copy into Footnotes!
@@ -428,7 +428,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTableOpts,
}
nWidth = nLastPos - nSttPos;
}
- else if( nCols )
+ else
{
nWidth /= nCols;
nWidth *= nCols; // to avoid rounding problems
More information about the Libreoffice-commits
mailing list