[Libreoffice-commits] core.git: 21 commits - comphelper/source connectivity/source dbaccess/source filter/source forms/source framework/inc framework/source include/comphelper include/filter
Caolán McNamara
caolanm at redhat.com
Wed Oct 26 08:56:58 UTC 2016
comphelper/source/property/propagg.cxx | 2
connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx | 4 +
connectivity/source/drivers/odbc/OResultSet.cxx | 2
connectivity/source/drivers/odbc/OStatement.cxx | 2
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 2
connectivity/source/inc/odbc/OResultSet.hxx | 4 +
connectivity/source/inc/odbc/OStatement.hxx | 2
dbaccess/source/core/api/statement.cxx | 2
dbaccess/source/core/dataaccess/datasource.cxx | 2
dbaccess/source/core/dataaccess/datasource.hxx | 2
dbaccess/source/core/inc/statement.hxx | 4 +
filter/source/msfilter/mscodec.cxx | 23 +++++-----
forms/source/component/Button.cxx | 2
forms/source/component/Button.hxx | 2
forms/source/component/Columns.cxx | 3 -
forms/source/component/Columns.hxx | 2
forms/source/component/ComboBox.cxx | 4 -
forms/source/component/ComboBox.hxx | 2
forms/source/component/DatabaseForm.cxx | 5 --
forms/source/component/DatabaseForm.hxx | 2
forms/source/component/EditBase.cxx | 5 --
forms/source/component/EditBase.hxx | 2
forms/source/component/FormComponent.cxx | 4 -
forms/source/component/Grid.cxx | 4 +
forms/source/component/Grid.hxx | 2
forms/source/component/ImageControl.cxx | 2
forms/source/component/ImageControl.hxx | 2
forms/source/component/clickableimage.cxx | 2
forms/source/component/clickableimage.hxx | 2
forms/source/component/formcontrolfont.cxx | 2
forms/source/component/refvaluecomponent.cxx | 2
forms/source/component/refvaluecomponent.hxx | 2
forms/source/component/scrollbar.cxx | 2
forms/source/component/scrollbar.hxx | 2
forms/source/component/spinbutton.cxx | 2
forms/source/component/spinbutton.hxx | 2
forms/source/inc/FormComponent.hxx | 4 -
forms/source/inc/formcontrolfont.hxx | 2
framework/inc/classes/actiontriggerseparatorpropertyset.hxx | 4 +
framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx | 2
include/comphelper/propagg.hxx | 2
include/filter/msfilter/mscodec.hxx | 2
42 files changed, 68 insertions(+), 60 deletions(-)
New commits:
commit 0b4be27b147485fb4d61d3398cbb3860e69f01c1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:01:54 2016 +0100
try and silence coverity#1374267 Out-of-bounds access
Change-Id: Ib7a8866dc4acdc243e7bfa975e760afde3bb43a6
diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx
index 732fe89..3cb7f44 100644
--- a/filter/source/msfilter/mscodec.cxx
+++ b/filter/source/msfilter/mscodec.cxx
@@ -248,10 +248,10 @@ void MSCodec_Xor95::Skip( std::size_t nBytes )
MSCodec97::MSCodec97(size_t nHashLen)
: m_nHashLen(nHashLen)
, m_hCipher(rtl_cipher_create(rtl_Cipher_AlgorithmARCFOUR, rtl_Cipher_ModeStream))
+ , m_aDocId(16, 0)
, m_aDigestValue(nHashLen, 0)
{
assert(m_hCipher != nullptr);
- (void)memset (m_pDocId, 0, sizeof(m_pDocId));
}
MSCodec_Std97::MSCodec_Std97()
@@ -269,7 +269,7 @@ MSCodec_CryptoAPI::MSCodec_CryptoAPI()
MSCodec97::~MSCodec97()
{
(void)memset(m_aDigestValue.data(), 0, m_aDigestValue.size());
- (void)memset(m_pDocId, 0, sizeof(m_pDocId));
+ (void)memset(m_aDocId.data(), 0, m_aDocId.size());
rtl_cipher_destroy(m_hCipher);
}
@@ -309,10 +309,11 @@ bool MSCodec97::InitCodec( const uno::Sequence< beans::NamedValue >& aData )
uno::Sequence< sal_Int8 > aUniqueID = aHashData.getUnpackedValueOrDefault("STD97UniqueID", uno::Sequence< sal_Int8 >() );
if ( aUniqueID.getLength() == 16 )
{
- (void)memcpy( m_pDocId, aUniqueID.getConstArray(), 16 );
+ assert(m_aDocId.size() == static_cast<size_t>(aUniqueID.getLength()));
+ (void)memcpy(m_aDocId.data(), aUniqueID.getConstArray(), m_aDocId.size());
bResult = true;
lcl_PrintDigest(m_aDigestValue.data(), "digest value");
- lcl_PrintDigest(m_pDocId, "DocId value");
+ lcl_PrintDigest(m_aDocId.data(), "DocId value");
}
else
OSL_FAIL( "Unexpected document ID!\n" );
@@ -328,7 +329,7 @@ uno::Sequence< beans::NamedValue > MSCodec97::GetEncryptionData()
::comphelper::SequenceAsHashMap aHashData;
assert(m_aDigestValue.size() == m_nHashLen);
aHashData[ OUString( "STD97EncryptionKey" ) ] <<= uno::Sequence< sal_Int8 >( reinterpret_cast<sal_Int8*>(m_aDigestValue.data()), m_nHashLen );
- aHashData[ OUString( "STD97UniqueID" ) ] <<= uno::Sequence< sal_Int8 >( reinterpret_cast<sal_Int8*>(m_pDocId), 16 );
+ aHashData[ OUString( "STD97UniqueID" ) ] <<= uno::Sequence< sal_Int8 >( reinterpret_cast<sal_Int8*>(m_aDocId.data()), m_aDocId.size() );
return aHashData.getAsConstNamedValueList();
}
@@ -351,9 +352,9 @@ void MSCodec_Std97::InitKey (
lcl_PrintDigest(m_aDigestValue.data(), "digest value");
- (void)memcpy (m_pDocId, pDocId, 16);
+ (void)memcpy (m_aDocId.data(), pDocId, 16);
- lcl_PrintDigest(m_pDocId, "DocId value");
+ lcl_PrintDigest(m_aDocId.data(), "DocId value");
}
void MSCodec_CryptoAPI::InitKey (
@@ -378,9 +379,9 @@ void MSCodec_CryptoAPI::InitKey (
lcl_PrintDigest(m_aDigestValue.data(), "digest value");
- (void)memcpy (m_pDocId, pDocId, 16);
+ (void)memcpy(m_aDocId.data(), pDocId, 16);
- lcl_PrintDigest(m_pDocId, "DocId value");
+ lcl_PrintDigest(m_aDocId.data(), "DocId value");
}
bool MSCodec97::VerifyKey(const sal_uInt8* pSaltData, const sal_uInt8* pSaltDigest)
@@ -592,8 +593,8 @@ void MSCodec_Std97::GetEncryptKey (
void MSCodec97::GetDocId( sal_uInt8 pDocId[16] )
{
- if ( sizeof( m_pDocId ) == 16 )
- (void)memcpy( pDocId, m_pDocId, 16 );
+ assert(m_aDocId.size() == 16);
+ (void)memcpy(pDocId, m_aDocId.data(), 16);
}
EncryptionStandardHeader::EncryptionStandardHeader()
diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx
index 52846f8..b0ab818 100644
--- a/include/filter/msfilter/mscodec.hxx
+++ b/include/filter/msfilter/mscodec.hxx
@@ -319,7 +319,7 @@ private:
protected:
size_t m_nHashLen;
rtlCipher m_hCipher;
- sal_uInt8 m_pDocId[16];
+ std::vector<sal_uInt8> m_aDocId;
std::vector<sal_uInt8> m_aDigestValue;
};
commit 2574d760598bcb1725dc1fe60a04992235c54032
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:35:54 2016 +0100
coverity#1374287 Uncaught exception
Change-Id: Ieed911b33fe4a5358855b3960b9d4c77c66ceff9
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx
index 1ee4846..5a55ef8 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -913,7 +913,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue(
Any & rOldValue,
sal_Int32 nHandle,
const Any& rValue )
- throw (css::lang::IllegalArgumentException)
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
bool bConverted = false;
try
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 0916ec8..462007c 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -135,7 +135,7 @@ namespace connectivity
css::uno::Any & rOldValue,
sal_Int32 nHandle,
const css::uno::Any& rValue )
- throw (css::lang::IllegalArgumentException) override;
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle,
const css::uno::Any& rValue
commit 95af8bfcdff3d81770c24df49f3cdd07498d3563
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:35:00 2016 +0100
coverity#1374286 Uncaught exception
Change-Id: Ied3abcd1f2bd7754e3861905f441c46f828f7f5d
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 45f22e9..d5c4b8e 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -279,7 +279,7 @@ void SAL_CALL OButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle
}
-sal_Bool SAL_CALL OButtonModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException)
+sal_Bool SAL_CALL OButtonModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException, RuntimeException, std::exception)
{
bool bModified = false;
switch ( _nHandle )
diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx
index bea42b7..d315c0f 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -82,7 +82,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, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override;
// OComponentHelper
commit 8ee0932466ba60e42a245bdbd673323c7e12b132
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:34:07 2016 +0100
coverity#1374285 Uncaught exception
Change-Id: I0a3790607fe7db6a8b8093a67e4dbf3548c800bb
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
index d10f6c9..1d29d68 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
@@ -735,7 +735,9 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue(
Any & rOldValue,
sal_Int32 nHandle,
const Any& rValue )
- throw (css::lang::IllegalArgumentException)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception)
{
switch(nHandle)
{
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 81dbea6..1ca0f69 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -104,7 +104,7 @@ namespace connectivity
css::uno::Any & rOldValue,
sal_Int32 nHandle,
const css::uno::Any& rValue )
- throw (css::lang::IllegalArgumentException) override;
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
throw (css::uno::Exception, std::exception) override;
virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
commit 521e5dd37911a4c4ed9f1a0346f707ffbc51bfa9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:32:42 2016 +0100
coverity#1374284 Uncaught exception
Change-Id: Ie43165d3f6abd420b951a80e0101d8e77946d4a3
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index b55ecbf..fbd4bc6 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -721,7 +721,7 @@ Reference< XPropertySetInfo > ODatabaseSource::getPropertySetInfo() throw (Runt
return *getArrayHelper();
}
-sal_Bool ODatabaseSource::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException )
+sal_Bool ODatabaseSource::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException, RuntimeException, std::exception )
{
bool bModified(false);
if ( m_pImpl.is() )
diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx
index 93ae469..e5c4f0b 100644
--- a/dbaccess/source/core/dataaccess/datasource.hxx
+++ b/dbaccess/source/core/dataaccess/datasource.hxx
@@ -148,7 +148,7 @@ public:
css::uno::Any & rOldValue,
sal_Int32 nHandle,
const css::uno::Any& rValue )
- throw (css::lang::IllegalArgumentException) override;
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle,
const css::uno::Any& rValue
commit b9d0b57b1760a5c394f376941a8b843ce99ae40e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:31:28 2016 +0100
coverity#1374283 Uncaught exception
Change-Id: I658a12da4d30f360f207ca06dcf3650ba18cc7a2
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 3507793..9318d47 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -1434,7 +1434,7 @@ sal_Bool OResultSet::convertFastPropertyValue(
Any & rOldValue,
sal_Int32 nHandle,
const Any& rValue )
- throw (css::lang::IllegalArgumentException)
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
switch(nHandle)
{
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index d6ac6f4..1f4965a 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -200,7 +200,9 @@ namespace connectivity
css::uno::Any & rOldValue,
sal_Int32 nHandle,
const css::uno::Any& rValue )
- throw (css::lang::IllegalArgumentException) override;
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle,
const css::uno::Any& rValue
commit 5d5564fa7ac77303e6e6145e488bc28bc675a860
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:30:01 2016 +0100
coverity#1374282 Uncaught exception
Change-Id: I1b31825ec27d2395ca030ca79b6c932b7814d901
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index 6addfcd..6e389c9 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -90,7 +90,9 @@ class ActionTriggerSeparatorPropertySet : private cppu::BaseMutex,
bool impl_tryToChangeProperty( sal_Int16 aCurrentValue ,
const css::uno::Any& aNewValue ,
css::uno::Any& aOldValue ,
- css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException );
+ css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception );
// members
diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index 63c3ed4..49720d6 100644
--- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
@@ -267,7 +267,7 @@ bool ActionTriggerSeparatorPropertySet::impl_tryToChangeProperty(
const Any& aNewValue ,
Any& aOldValue ,
Any& aConvertedValue )
-throw( IllegalArgumentException )
+throw( IllegalArgumentException, RuntimeException, std::exception )
{
// Set default return value if method failed.
bool bReturn = false;
commit b23e979157a1f690b84d110e082af3a01f102d55
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:28:36 2016 +0100
coverity#1374281 Uncaught exception
Change-Id: Iaffb4b67c67b5877a5a53d9ae81927b28883fc56
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index a2b551d..02fedc3 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -127,7 +127,7 @@ namespace frm
sal_Bool OSpinButtonModel::convertFastPropertyValue(
Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue )
- throw ( IllegalArgumentException )
+ throw ( IllegalArgumentException, RuntimeException, std::exception )
{
bool bModified( false );
switch ( _nHandle )
diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx
index a93f732..e680d2c 100644
--- a/forms/source/component/spinbutton.hxx
+++ b/forms/source/component/spinbutton.hxx
@@ -59,7 +59,7 @@ namespace frm
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue )
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, css::uno::RuntimeException, std::exception ) override;
// OBoundControlModel
virtual css::uno::Any translateDbColumnToControlValue( ) override;
commit 77c3b365c6defcfd0db11489d90cd6d82ecffb62
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:27:43 2016 +0100
coverity#1374280 Uncaught exception
Change-Id: I18f7f006256ac7df575d9235e7121b45fbd05370
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index a3b04c7..0173e8a 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -253,10 +253,9 @@ void OComboBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const
}
}
-
sal_Bool OComboBoxModel::convertFastPropertyValue(
Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue)
- throw (IllegalArgumentException)
+ throw (IllegalArgumentException, RuntimeException, std::exception)
{
bool bModified(false);
switch (_nHandle)
@@ -288,7 +287,6 @@ sal_Bool OComboBoxModel::convertFastPropertyValue(
return bModified;
}
-
void OComboBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) const
{
BEGIN_DESCRIBE_PROPERTIES( 6, OBoundControlModel )
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index 57f05f3..ecc65a2 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -77,7 +77,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, css::uno::RuntimeException, std::exception) override;
// XLoadListener
virtual void SAL_CALL reloaded( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
commit f96f2adc28b4848918e31ce2267896576fcc80a0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:26:53 2016 +0100
coverity#1374279 Uncaught exception
Change-Id: I5818bb0a2fe64fd808de5ca7f6d8393f92ab55e2
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 154e7dc..e87ea44 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -390,7 +390,8 @@ void OGridColumn::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) const
sal_Bool OGridColumn::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue,
- sal_Int32 nHandle, const Any& rValue )throw( IllegalArgumentException )
+ sal_Int32 nHandle, const Any& rValue )
+ throw( IllegalArgumentException, RuntimeException, std::exception )
{
bool bModified(false);
switch (nHandle)
diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx
index 29f35b6..014300f 100644
--- a/forms/source/component/Columns.hxx
+++ b/forms/source/component/Columns.hxx
@@ -93,7 +93,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, css::uno::RuntimeException, 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 OPropertySetAggregationHelper::getFastPropertyValue;
commit b1de670d6a39db535b945cbc04718a44bfd3cf19
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:25:51 2016 +0100
coverity#1374278 Uncaught exception
Change-Id: Ide557d1a3237c36067107d357ac2df6186994e10
diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx
index b44505c..3cde33e 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.cxx
@@ -291,9 +291,9 @@ void OEditBaseModel::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
}
}
-
sal_Bool OEditBaseModel::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue,
- sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException )
+ sal_Int32 nHandle, const Any& rValue )
+ throw( IllegalArgumentException, RuntimeException, std::exception )
{
bool bModified(false);
switch (nHandle)
@@ -326,7 +326,6 @@ sal_Bool OEditBaseModel::convertFastPropertyValue( Any& rConvertedValue, Any& rO
return bModified;
}
-
void OEditBaseModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw ( css::uno::Exception, std::exception)
{
switch (nHandle)
diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx
index 569b422..07605ac 100644
--- a/forms/source/component/EditBase.hxx
+++ b/forms/source/component/EditBase.hxx
@@ -76,7 +76,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, css::uno::RuntimeException, 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;
commit 1ae7f7fcae2d1c3f1aced2fbb1cf86453722e9a1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:24:56 2016 +0100
coverity#1374277 Uncaught exception
Change-Id: I2475056682252111af78a7594c04d15a93fda47f
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index c2a02dd..1bc7a67 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -173,7 +173,7 @@ namespace frm
sal_Bool OScrollBarModel::convertFastPropertyValue(
Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue )
- throw ( IllegalArgumentException )
+ throw ( IllegalArgumentException, RuntimeException, std::exception )
{
bool bModified( false );
switch ( _nHandle )
diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx
index a228a41..838c297 100644
--- a/forms/source/component/scrollbar.hxx
+++ b/forms/source/component/scrollbar.hxx
@@ -58,7 +58,7 @@ namespace frm
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue )
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, css::uno::RuntimeException, std::exception ) override;
// OBoundControlModel
virtual css::uno::Any translateDbColumnToControlValue( ) override;
commit 487738732bebce422551d9632d6b1a33bec31da9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:24:02 2016 +0100
coverity#1374276 Uncaught exception
Change-Id: I0572e4365831cf0be2b73c5255812aaf4516ccb0
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index bd078be..26461d8 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1566,9 +1566,9 @@ void ODatabaseForm::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
}
}
-
sal_Bool ODatabaseForm::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue,
- sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException )
+ sal_Int32 nHandle, const Any& rValue )
+ throw (IllegalArgumentException, RuntimeException, std::exception)
{
bool bModified(false);
switch (nHandle)
@@ -1650,7 +1650,6 @@ sal_Bool ODatabaseForm::convertFastPropertyValue( Any& rConvertedValue, Any& rOl
return bModified;
}
-
void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw( Exception, std::exception )
{
switch (nHandle)
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 85cfe21..efd64b1 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -231,7 +231,7 @@ public:
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
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;
+ 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, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception ) override;
css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle )
commit 9b6cb97e43da81a9248e3a805c8b164e10c095b2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:23:02 2016 +0100
coverity#1374275 Uncaught exception
Change-Id: I6fcc5d75d8a4b131dc4e3b2e294761b152763a1b
diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx
index 66bc6db..b48469a 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -119,7 +119,7 @@ namespace frm
}
- sal_Bool SAL_CALL OReferenceValueComponent::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException)
+ sal_Bool SAL_CALL OReferenceValueComponent::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException, RuntimeException, std::exception)
{
bool bModified = false;
switch ( _nHandle )
diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx
index 5f727df..72491bb 100644
--- a/forms/source/component/refvaluecomponent.hxx
+++ b/forms/source/component/refvaluecomponent.hxx
@@ -62,7 +62,7 @@ namespace frm
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, css::uno::RuntimeException, std::exception) override;
virtual void describeFixedProperties(
css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps
) const override;
commit adf3ec20325a9082a1bf83a5a7610929716abfeb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:22:00 2016 +0100
coverity#1374274 Uncaught exception
Change-Id: I9e3cee79dfdc06c751d1e5b3d0806c49a7e30da7
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index b5022a8..465b859 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -301,7 +301,7 @@ void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, con
sal_Bool OImageControlModel::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue)
- throw( IllegalArgumentException )
+ throw( IllegalArgumentException, RuntimeException, std::exception )
{
switch (nHandle)
{
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index e7bc6bb..0a8da10 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -68,7 +68,7 @@ public:
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) 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, css::uno::RuntimeException, std::exception) override;
// UNO Anbindung
DECLARE_UNO3_AGG_DEFAULTS(OImageControlModel, OBoundControlModel)
commit 0aa597d06310fab4672698ba42218de6a28a554f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:21:07 2016 +0100
coverity#1374273 Uncaught exception
Change-Id: Ia2738aeb9d1092dd0738801022c5a729b9081f26
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 22c772a..8d11fb5 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -488,8 +488,10 @@ void OGridControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) co
OControlModel::getFastPropertyValue( rValue, nHandle );
}
}
+
sal_Bool OGridControlModel::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue,
- sal_Int32 nHandle, const Any& rValue )throw( IllegalArgumentException )
+ sal_Int32 nHandle, const Any& rValue )
+ throw(IllegalArgumentException, RuntimeException, std::exception)
{
bool bModified(false);
switch (nHandle)
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx
index a755350..1a07ed0 100644
--- a/forms/source/component/Grid.hxx
+++ b/forms/source/component/Grid.hxx
@@ -147,7 +147,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, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override;
// XPropertyState
commit 0b069a35d338d3492ffcc1830cdee32f508cd81e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:19:55 2016 +0100
coverity#1374272 Uncaught exception
Change-Id: Iea7cb5d35e78b89398e8aca7bbdbd17015cb7120
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 430aeff..de1d7a5 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -1642,7 +1642,7 @@ sal_Bool OBoundControlModel::convertFastPropertyValue(
Any& _rConvertedValue, Any& _rOldValue,
sal_Int32 _nHandle,
const Any& _rValue)
- throw (css::lang::IllegalArgumentException, std::exception)
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
bool bModified(false);
switch (_nHandle)
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index f9d0607..575aee7 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -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, std::exception) override;
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, 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;
commit 759c585e0cc0a86fd918a1fb8ebf0a9a498e804a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:18:40 2016 +0100
coverity#1374271 Uncaught exception
Change-Id: I043cd76ae0da65cac09130f0e761266fd8730be6
diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx
index 2eb5637..59ff701 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -249,7 +249,7 @@ namespace frm
bool FontControlModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue,
- sal_Int32 _nHandle, const Any& _rValue ) throw( IllegalArgumentException )
+ sal_Int32 _nHandle, const Any& _rValue ) throw( IllegalArgumentException, RuntimeException, std::exception )
{
bool bModified = false;
switch( _nHandle )
diff --git a/forms/source/inc/formcontrolfont.hxx b/forms/source/inc/formcontrolfont.hxx
index 6999c7e..b1161a7 100644
--- a/forms/source/inc/formcontrolfont.hxx
+++ b/forms/source/inc/formcontrolfont.hxx
@@ -73,7 +73,7 @@ namespace frm
css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps );
void getFastPropertyValue ( css::uno::Any& _rValue, sal_Int32 _nHandle ) const;
- bool convertFastPropertyValue ( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw( css::lang::IllegalArgumentException );
+ bool convertFastPropertyValue ( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception );
void setFastPropertyValue_NoBroadcast_impl(
::cppu::OPropertySetHelper & rBase,
void (::cppu::OPropertySetHelper::*pSet)( sal_Int32, css::uno::Any const&),
commit 07385355dbd83d164c32ba278f4d221da6fd407d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:17:21 2016 +0100
coverity#1374270 Uncaught exception
Change-Id: Ia29b644748f00aa7dc31af9ccc510976d8646241
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index b736520..54f0963 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -646,7 +646,7 @@ namespace frm
sal_Bool OClickableImageBaseModel::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue)
- throw( IllegalArgumentException )
+ throw( IllegalArgumentException, RuntimeException, std::exception )
{
switch (nHandle)
{
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index ba0d752..3408b6a 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -115,7 +115,7 @@ namespace frm
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) 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, css::uno::RuntimeException, std::exception) override;
using ::cppu::OPropertySetHelper::getFastPropertyValue;
commit ae68c27457a1641d8a0569025e676b67219a3378
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:15:14 2016 +0100
coverity#1374269 Uncaught exception
Change-Id: Ib3a876ea6463396784062bd53bfedff177818498
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index 5225a7e..92a37a6 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -851,7 +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, std::exception)
+sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
bool bModified = false;
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 9ff9a58..430aeff 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, std::exception)
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
bool bModified(false);
switch (_nHandle)
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index ac9f100..f9d0607 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, std::exception) override;
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, 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 7797782..fa91130 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, 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, css::uno::RuntimeException, std::exception) override;
/** only implemented for "forwarded" properties, every other property must be handled
in the derivee, and will assert if passed herein
commit 6920de0e1f525eadb61114f0e5bb1bb282d17572
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 26 09:08:58 2016 +0100
coverity#1374268 Uncaught exception
Change-Id: Ife6e9897c12a9754afd5f4754c7de41eef7f00eb
diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx
index 44c96f2..beb04ef 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -198,7 +198,7 @@ Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (Runtim
return *getArrayHelper();
}
-sal_Bool OStatementBase::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException )
+sal_Bool OStatementBase::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException, RuntimeException, std::exception)
{
bool bModified(false);
switch (nHandle)
diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx
index a2cb99a..7d7b7f0 100644
--- a/dbaccess/source/core/inc/statement.hxx
+++ b/dbaccess/source/core/inc/statement.hxx
@@ -91,7 +91,9 @@ public:
css::uno::Any & rOldValue,
sal_Int32 nHandle,
const css::uno::Any& rValue )
- throw (css::lang::IllegalArgumentException) override;
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle,
const css::uno::Any& rValue
More information about the Libreoffice-commits
mailing list