[Libreoffice-commits] core.git: 17 commits - connectivity/source forms/source framework/inc framework/source include/svx scaddins/source scripting/source sc/source sd/source sfx2/source svx/source sw/inc sw/source vcl/workben
Caolán McNamara
caolanm at redhat.com
Mon Jun 29 01:44:02 PDT 2015
connectivity/source/drivers/firebird/Driver.cxx | 2 +-
connectivity/source/drivers/firebird/Driver.hxx | 2 +-
connectivity/source/drivers/postgresql/pq_connection.cxx | 2 +-
forms/source/component/DatabaseForm.cxx | 2 +-
forms/source/component/DatabaseForm.hxx | 2 +-
forms/source/component/FormComponent.cxx | 2 +-
forms/source/component/FormattedField.cxx | 2 +-
forms/source/component/FormattedField.hxx | 2 +-
forms/source/inc/FormComponent.hxx | 2 +-
framework/inc/xml/xmlnamespaces.hxx | 2 +-
framework/source/fwe/xml/xmlnamespaces.cxx | 2 +-
include/svx/AccessibleGraphicShape.hxx | 2 +-
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 2 +-
sc/source/ui/inc/AccessibleDocumentPagePreview.hxx | 2 +-
sc/source/ui/vba/excelvbahelper.cxx | 2 +-
sc/source/ui/vba/excelvbahelper.hxx | 2 +-
scaddins/source/analysis/analysis.cxx | 2 +-
scaddins/source/analysis/analysis.hxx | 2 +-
scaddins/source/pricing/pricing.cxx | 2 +-
scaddins/source/pricing/pricing.hxx | 2 +-
scripting/source/stringresource/stringresource.cxx | 4 ++--
scripting/source/stringresource/stringresource.hxx | 4 ++--
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 2 +-
sd/source/ui/accessibility/AccessibleOutlineView.cxx | 2 +-
sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx | 2 +-
sd/source/ui/inc/AccessibleDrawDocumentView.hxx | 2 +-
sd/source/ui/inc/AccessibleOutlineView.hxx | 2 +-
sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx | 2 +-
sfx2/source/dialog/templdlg.cxx | 2 +-
svx/source/accessibility/AccessibleGraphicShape.cxx | 2 +-
sw/inc/unotbl.hxx | 2 +-
sw/source/core/unocore/unotbl.cxx | 2 +-
vcl/workben/svdem.cxx | 5 +++++
33 files changed, 39 insertions(+), 34 deletions(-)
New commits:
commit 76837070c7c3eae1da50ff0de5e508be285e22c7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 09:42:16 2015 +0100
Resolves: tdf#92047 fix wrong merge conflict resolution
since
commit e8b97a52c96df9c8e8055407b1e40ed7cb9cfc67
Merge: 2b0be6c 0cde74f
Date: Tue Apr 28 11:41:31 2015 +0100
- bWaterDisabled = !(pTreeBox || aFmtLb.GetSelectionCount() <= 1);
- bWaterDisabled = (pTreeBox || aFmtLb->GetSelectionCount() <= 1) ? sal_False : sal_True;
++ bWaterDisabled = pTreeBox || aFmtLb->GetSelectionCount() <= 1;
Change-Id: I14d848b4527adf05eb05110b93369791134cbe6c
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 47f2e1d..1a2dc49 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1271,7 +1271,7 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
if(!bWaterDisabled)
//make sure the watercan is only activated when there is (only) one selection
- bWaterDisabled = pTreeBox || aFmtLb->GetSelectionCount() <= 1;
+ bWaterDisabled = !(pTreeBox || aFmtLb->GetSelectionCount() <= 1);
if(pItem && !bWaterDisabled)
{
commit 5d39063581fa7a24ee18c870d2f53c2b5d58a0e8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 09:29:04 2015 +0100
coverity#1308583 Uncaught exception
Change-Id: Ibc6a8e437d81769b9a77d0a52e98f71b1c7e7d51
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 9b8a398..1b978d1 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -1421,7 +1421,7 @@ void OBoundControlModel::onValuePropertyChange( ControlModelLock& i_rControLock
recheckValidity( true );
}
-void OBoundControlModel::_propertyChanged( const PropertyChangeEvent& _rEvt ) throw ( RuntimeException )
+void OBoundControlModel::_propertyChanged( const PropertyChangeEvent& _rEvt ) throw ( RuntimeException, std::exception )
{
ControlModelLock aLock( *this );
OSL_ENSURE( _rEvt.PropertyName == m_sValuePropertyName,
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index bb37b4b..0d385ac 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -438,7 +438,7 @@ Any SAL_CALL OFormattedModel::getPropertyDefault( const OUString& aPropertyName
return OEditBaseModel::getPropertyDefault(aPropertyName);
}
-void OFormattedModel::_propertyChanged( const com::sun::star::beans::PropertyChangeEvent& evt ) throw(RuntimeException)
+void OFormattedModel::_propertyChanged( const com::sun::star::beans::PropertyChangeEvent& evt ) throw(RuntimeException, std::exception)
{
// TODO: check how this works with external bindings
OSL_ENSURE( evt.Source == m_xAggregateSet, "OFormattedModel::_propertyChanged: where did this come from?" );
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index 424f0db..3c771d5 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -107,7 +107,7 @@ class OFormattedModel
) const SAL_OVERRIDE;
// XPropertyChangeListener
- virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// prevent method hiding
using OEditBaseModel::disposing;
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index ecaffb9..745dc88 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -1079,7 +1079,7 @@ protected:
protected:
// OPropertyChangeListener
virtual void
- _propertyChanged( const ::com::sun::star::beans::PropertyChangeEvent& _rEvt ) throw ( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+ _propertyChanged( const ::com::sun::star::beans::PropertyChangeEvent& _rEvt ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/// checks whether we currently have an external value binding in place
inline bool hasExternalValueBinding() const { return m_xExternalBinding.is(); }
commit 0a4e65219e785dced414821d0c2fef483b40e0c4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 09:28:20 2015 +0100
coverity#1308582 Uncaught exception
Change-Id: Ibe15ebdbdd5c0eb719821043696ce22f76c5b232
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 265e21f..e5214aa 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -2829,7 +2829,7 @@ bool ODatabaseForm::implEnsureConnection()
}
-void ODatabaseForm::load_impl(bool bCausedByParentForm, bool bMoveToFirst, const Reference< XInteractionHandler >& _rxCompletionHandler ) throw( RuntimeException )
+void ODatabaseForm::load_impl(bool bCausedByParentForm, bool bMoveToFirst, const Reference< XInteractionHandler >& _rxCompletionHandler ) throw( RuntimeException, std::exception )
{
::osl::ResettableMutexGuard aGuard(m_aMutex);
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 01e9f41..2bcf96e 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -461,7 +461,7 @@ private:
// impl methods
void load_impl(bool bCausedByParentForm, bool bMoveToFirst = true,
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxCompletionHandler = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >())
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException, std::exception);
void reload_impl(bool bMoveToFirst,
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxCompletionHandler = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >())
throw(::com::sun::star::uno::RuntimeException, std::exception);
commit 1db55c30784d4b31211bd59c5644f01b5053130d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 09:20:58 2015 +0100
coverity#1308580 Uncaught exception
Change-Id: I13722acfcdf3d1706c26796c56158c99d3d844ba
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 4c94b4d..9a1d41c 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -546,7 +546,7 @@ public:
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > *pAnySeq,
::com::sun::star::uno::Sequence< OUString > *pTextSeq,
::com::sun::star::uno::Sequence< double > *pDblSeq,
- bool bForceNumberResults = false ) throw (::com::sun::star::uno::RuntimeException);
+ bool bForceNumberResults = false ) throw (::com::sun::star::uno::RuntimeException, std::exception);
};
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 4e936c5..8edd361 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3465,7 +3465,7 @@ void SwXCellRange::GetDataSequence(
bool bForceNumberResults ) //-> when 'true' requires to make an
// extra effort to return a value different
// from 0 even if the cell is formatted to text
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
commit 7462cfde6d3c8ce38455935c83261633c3a1d433
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 09:19:48 2015 +0100
coverity#1308579 Uncaught exception
Change-Id: I6bd1f9cdf69865972de9c22106a95e1ebf9a74f7
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 53cdcbf..79b018e 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -1127,7 +1127,7 @@ void StringResourcePersistenceImpl::implKillRemovedLocaleFiles
const OUString& aNameBase,
const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess
)
- throw (Exception, RuntimeException)
+ throw (Exception, RuntimeException, std::exception)
{
// Delete files for deleted locales
while( m_aDeletedLocaleItemVector.size() > 0 )
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index 853b214..5992ea8 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -289,7 +289,7 @@ protected:
const OUString& aNameBase,
const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess
)
- throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
void implKillChangedDefaultFiles
(
commit 5887200e10398fb5264dfaa853bbc51b1c6e7a4f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 09:18:45 2015 +0100
coverity#1308577 Uncaught exception
Change-Id: I6de407255be2bd1cc12edb5bbcaba5dd2501f60d
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index fc6a7ed..1f209947 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -607,7 +607,7 @@ OUString AccessibleDrawDocumentView::CreateAccessibleName()
*/
OUString
AccessibleDrawDocumentView::CreateAccessibleDescription()
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
OUString sDescription;
diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
index 75393d2..73b6e70 100644
--- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
+++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
@@ -168,7 +168,7 @@ protected:
*/
virtual OUString
CreateAccessibleDescription ()
- throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Make sure that the currently focused shape sends a FOCUSED state
change event indicating that it has (regained) the focus.
commit 25283488fd221b1964eacc2c917df98ac3d604ae
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 09:17:10 2015 +0100
coverity#1308574 Uncaught exception
Change-Id: I416e3d443a43802bd8e093397945b056abe3bf85
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index e6288ff..0e1015c 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -262,7 +262,7 @@ void SAL_CALL
/// Create a name for this view.
OUString
AccessibleOutlineView::CreateAccessibleName()
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx
index 02eaa7c..6fb682f 100644
--- a/sd/source/ui/inc/AccessibleOutlineView.hxx
+++ b/sd/source/ui/inc/AccessibleOutlineView.hxx
@@ -121,7 +121,7 @@ protected:
/// Create an accessible name that contains the current view mode.
virtual OUString
CreateAccessibleName ()
- throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Create an accessible description that contains the current
/// view mode.
commit e678100a40e678e48e731c5e02e1c29187c2f56a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 09:14:47 2015 +0100
coverity#1308573 Uncaught exception
Change-Id: Ie3ecffe0fe91572ffff6e124075e1be1ef978731
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index f26f7b6..c20f706 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -678,7 +678,7 @@ Reference< XNameAccess > Connection::getUsers()
Reference< XInterface > ConnectionCreateInstance(
- const Reference< XComponentContext > & ctx ) throw (Exception)
+ const Reference< XComponentContext > & ctx ) throw (Exception, std::exception)
{
::rtl::Reference< RefCountedMutex > ref = new RefCountedMutex();
return * new Connection( ref, ctx );
commit 5e1206f0925b4dddcdede41df7d897b4759813ad
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 09:11:32 2015 +0100
coverity#1308571 Uncaught exception
Change-Id: Ib844cbd5c5d7be28e4ee2922caf06fb43c7b8a46
diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx
index 6245f52..d4b8808 100644
--- a/include/svx/AccessibleGraphicShape.hxx
+++ b/include/svx/AccessibleGraphicShape.hxx
@@ -96,7 +96,7 @@ protected:
/// Create a description string that contains the accessible description.
virtual OUString
CreateAccessibleDescription ()
- throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
AccessibleGraphicShape (const AccessibleGraphicShape&) SAL_DELETED_FUNCTION;
diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
index 8d63fbe..b41b1a0 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
@@ -76,7 +76,7 @@ OUString
OUString
AccessiblePresentationGraphicShape::CreateAccessibleDescription()
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
// return createAccessibleName ();
DescriptionGenerator aDG (mxShape);
diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
index cee2b8d..9dc504f 100644
--- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
+++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
@@ -55,7 +55,7 @@ public:
/// Create a description string that contains the accessible description.
virtual OUString
CreateAccessibleDescription ()
- throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return this object's role.
virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx
index a688a8a..d24b15e 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -175,7 +175,7 @@ OUString
}
OUString AccessibleGraphicShape::CreateAccessibleDescription()
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
//Don't use the same information for accessible name and accessible description.
OUString sDesc;
commit 3e9a13f16cf439876775ed5009690862a8d276d1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 09:10:38 2015 +0100
coverity#1308570 Uncaught exception
Change-Id: I9009a96e09943b5339c6ef6995d9a28c3e4b596c
diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx
index 6ce9351..e56b11a 100644
--- a/framework/inc/xml/xmlnamespaces.hxx
+++ b/framework/inc/xml/xmlnamespaces.hxx
@@ -41,7 +41,7 @@ class FWE_DLLPUBLIC XMLNamespaces
OUString applyNSToAttributeName( const OUString& ) const
throw( ::com::sun::star::xml::sax::SAXException, std::exception );
OUString applyNSToElementName( const OUString& ) const
- throw( ::com::sun::star::xml::sax::SAXException );
+ throw( ::com::sun::star::xml::sax::SAXException, std::exception );
private:
typedef ::std::map< OUString, OUString > NamespaceMap;
diff --git a/framework/source/fwe/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx
index f65e669..a208e44 100644
--- a/framework/source/fwe/xml/xmlnamespaces.cxx
+++ b/framework/source/fwe/xml/xmlnamespaces.cxx
@@ -118,7 +118,7 @@ OUString XMLNamespaces::applyNSToAttributeName( const OUString& aName ) const th
return aName;
}
-OUString XMLNamespaces::applyNSToElementName( const OUString& aName ) const throw( SAXException )
+OUString XMLNamespaces::applyNSToElementName( const OUString& aName ) const throw( SAXException, std::exception )
{
// xml draft: element names can have a default namespace
commit fab69b025b7011728fe105215ab790811db61ca1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 09:09:39 2015 +0100
coverity#1308569 Uncaught exception
Change-Id: Ie3f4d0d0d8197d5dcbba7c266133e06e110843df
diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx
index 365ad38..6889c0d 100644
--- a/vcl/workben/svdem.cxx
+++ b/vcl/workben/svdem.cxx
@@ -61,6 +61,11 @@ SAL_IMPLEMENT_MAIN()
SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
return 1;
}
+ catch (const std::exception &e)
+ {
+ fprintf(stderr, "fatal error: %s\n", e.what());
+ return 1;
+ }
return 0;
}
commit ed450f7e65198aebd19d745991358302ca14d0c9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 09:08:26 2015 +0100
coverity#1308568 Uncaught exception
Change-Id: Ic9e4136619d9babe5333f815c9a0268830fbc0d6
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index 130f9b0..2f6b668 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -271,7 +271,7 @@ OUString ScaPricingAddIn::GetDisplFuncStr( sal_uInt16 nResId ) throw( uno::Runti
return ScaResStringLoader( RID_PRICING_FUNCTION_NAMES, nResId, GetResMgr() ).GetString();
}
-OUString ScaPricingAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( uno::RuntimeException )
+OUString ScaPricingAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( uno::RuntimeException, std::exception )
{
OUString aRet;
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index d125a2e..92a9d20 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -323,7 +323,7 @@ private:
void InitData();
OUString GetDisplFuncStr( sal_uInt16 nResId ) throw( css::uno::RuntimeException, std::exception );
- OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( css::uno::RuntimeException );
+ OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( css::uno::RuntimeException, std::exception );
public:
ScaPricingAddIn();
commit 4e4760ef42b2a1da76d697d607a78ac39ac25ed3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 09:08:01 2015 +0100
coverity#1308596 Uncaught exception
Change-Id: I0784ad02e540757a0cb25b0e216b7bab4d2061f8
diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx
index da36330..835effe 100644
--- a/sc/source/ui/vba/excelvbahelper.cxx
+++ b/sc/source/ui/vba/excelvbahelper.cxx
@@ -249,7 +249,7 @@ getViewFrame( const uno::Reference< frame::XModel >& xModel )
}
uno::Reference< XHelperInterface >
-getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) throw ( uno::RuntimeException )
+getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) throw ( uno::RuntimeException, std::exception )
{
uno::Reference< beans::XPropertySet > xProps( xSheet, uno::UNO_QUERY_THROW );
OUString sCodeName;
diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx
index 9de833c..951b81a 100644
--- a/sc/source/ui/vba/excelvbahelper.hxx
+++ b/sc/source/ui/vba/excelvbahelper.hxx
@@ -50,7 +50,7 @@ SfxViewFrame* getViewFrame( const css::uno::Reference< css::frame::XModel >& xMo
css::uno::Reference< css::sheet::XUnnamedDatabaseRanges > GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( css::uno::RuntimeException );
css::uno::Reference< css::sheet::XDatabaseRange > GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( css::uno::RuntimeException );
-css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet ) throw ( css::uno::RuntimeException );
+css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet ) throw ( css::uno::RuntimeException, std::exception );
css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges ) throw ( css::uno::RuntimeException );
css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCellRange >& xRange ) throw ( css::uno::RuntimeException );
css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCell >& xCell ) throw ( css::uno::RuntimeException );
commit 662f294a485a16f89290b62d81346a154beb6701
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 09:02:27 2015 +0100
coverity#1308597 Uncaught exception
Change-Id: Ibcbdd39952a573e72edbe1813c9d8b73c5e32f78
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index cfa9f30..85ab00c 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -103,7 +103,7 @@ AnalysisFuncRes::AnalysisFuncRes( ResId& rRes, ResMgr& rResMgr, sal_uInt16 nInd,
FreeResource();
}
-OUString AnalysisAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( uno::RuntimeException )
+OUString AnalysisAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( uno::RuntimeException, std::exception )
{
OUString aRet;
AnalysisResourcePublisher aResPubl( AnalysisResId( RID_ANALYSIS_FUNCTION_DESCRIPTIONS, GetResMgr() ) );
diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx
index a387918..560ec5d 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -64,7 +64,7 @@ private:
ResMgr& GetResMgr() throw( css::uno::RuntimeException, std::exception );
OUString GetDisplFuncStr( sal_uInt16 nFuncNum ) throw( css::uno::RuntimeException );
- OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( css::uno::RuntimeException );
+ OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( css::uno::RuntimeException, std::exception );
void InitDefLocales();
inline const css::lang::Locale& GetLocale( sal_uInt32 nInd );
void InitData();
commit 9202cab16767ee4008074434055796f9be99f6b4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 09:00:59 2015 +0100
coverity#1308598 Uncaught exception
Change-Id: Id65e076641506e128c27cec4f50bc677e808fa95
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 911fc8e..53cdcbf 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -999,7 +999,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage
bool bUsedForStore,
bool bStoreAll
)
- throw (Exception, RuntimeException)
+ throw (Exception, RuntimeException, std::exception)
{
// Delete files for deleted locales
if( bUsedForStore )
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index d6a5ac3..853b214 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -281,7 +281,7 @@ protected:
bool bUsedForStore,
bool bStoreAll
)
- throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
void implKillRemovedLocaleFiles
(
commit 6a151630e3084df42979d5c3b8083fef55449230
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 08:58:56 2015 +0100
coverity#1308601 Uncaught exception
Change-Id: I231a5b94ded2c936edf84ff7dc59332e628150cd
diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index 0a65ea9..8e38cbb 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -49,7 +49,7 @@ namespace connectivity
namespace firebird
{
Reference< XInterface > SAL_CALL FirebirdDriver_CreateInstance(
- const Reference< XMultiServiceFactory >& _rxFactory) throw( Exception )
+ const Reference< XMultiServiceFactory >& _rxFactory) throw( Exception, std::exception )
{
SAL_INFO("connectivity.firebird", "FirebirdDriver_CreateInstance()" );
return *(new FirebirdDriver(comphelper::getComponentContext(_rxFactory)));
diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx
index 34bfb97..d01707d 100644
--- a/connectivity/source/drivers/firebird/Driver.hxx
+++ b/connectivity/source/drivers/firebird/Driver.hxx
@@ -38,7 +38,7 @@ namespace connectivity
// 3: Is IB6 -- minimum required for delimited identifiers.
static const int FIREBIRD_SQL_DIALECT = 3;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL FirebirdDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception );
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL FirebirdDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception, std::exception );
typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver,
::com::sun::star::sdbcx::XDataDefinitionSupplier,
commit cdc94a0e32a7295cfe939c1b83a95d3412e2a9ee
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 29 08:58:22 2015 +0100
coverity#1308602 Uncaught exception
Change-Id: I5bee9695bbd294ff56ae7511f742b31e58bcc5bc
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index c127841..7b2fbf1 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -1603,7 +1603,7 @@ uno::Sequence<sal_Int8> SAL_CALL
//===== internal ========================================================
OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
OUString sDescription = OUString(ScResId(STR_ACC_PREVIEWDOC_DESCR));
return sDescription;
diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
index 0a05bb7..b83a38c 100644
--- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
+++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
@@ -110,7 +110,7 @@ protected:
/// Return this object's description.
virtual OUString SAL_CALL
createAccessibleDescription()
- throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return the object's current name.
virtual OUString SAL_CALL
More information about the Libreoffice-commits
mailing list