[Libreoffice-commits] core.git: 15 commits - connectivity/source editeng/source filter/source include/editeng include/svx reportdesign/source scripting/source sc/source sd/source svx/source sw/source vcl/workben
Caolán McNamara
caolanm at redhat.com
Sun Jun 28 13:35:35 PDT 2015
connectivity/source/drivers/odbc/OConnection.cxx | 4 ++--
connectivity/source/inc/odbc/OConnection.hxx | 2 +-
editeng/source/accessibility/AccessibleContextBase.cxx | 2 +-
filter/source/placeware/exporter.cxx | 2 +-
include/editeng/AccessibleContextBase.hxx | 2 +-
include/svx/AccessibleShape.hxx | 2 +-
include/svx/ShapeTypeHandler.hxx | 2 +-
reportdesign/source/core/api/ReportEngineJFree.cxx | 2 +-
reportdesign/source/core/inc/ReportEngineJFree.hxx | 2 +-
reportdesign/source/filter/xml/xmlfilter.cxx | 2 +-
reportdesign/source/filter/xml/xmlfilter.hxx | 2 +-
reportdesign/source/ui/dlg/AddField.cxx | 2 +-
reportdesign/source/ui/inc/AddField.hxx | 2 +-
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 2 +-
sc/source/ui/Accessibility/AccessibleDocument.cxx | 2 +-
sc/source/ui/inc/AccessibleCellBase.hxx | 2 +-
sc/source/ui/inc/AccessibleDocument.hxx | 2 +-
scripting/source/stringresource/stringresource.cxx | 2 +-
scripting/source/stringresource/stringresource.hxx | 2 +-
scripting/source/vbaevents/eventhelper.cxx | 4 ++--
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 2 +-
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 2 +-
sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 2 +-
sd/source/ui/inc/AccessibleDrawDocumentView.hxx | 2 +-
sd/source/ui/slideshow/slideshowimpl.cxx | 2 +-
sd/source/ui/slideshow/slideshowimpl.hxx | 2 +-
svx/source/accessibility/AccessibleShape.cxx | 2 +-
svx/source/accessibility/ShapeTypeHandler.cxx | 2 +-
svx/source/form/tabwin.cxx | 2 +-
svx/source/inc/tabwin.hxx | 2 +-
sw/source/core/access/accpara.cxx | 3 ++-
sw/source/core/access/accpara.hxx | 3 ++-
vcl/workben/svptest.cxx | 5 +++++
33 files changed, 41 insertions(+), 34 deletions(-)
New commits:
commit 99de5f603b0af9a0fad4f59cc0e8cff305d3cb89
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 28 21:11:01 2015 +0100
coverity#1308566 Uncaught exception
Change-Id: Ib7678784dc822bc84eee0c522c1b2df5de6d6713
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 7815447..90d9248 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -874,7 +874,8 @@ bool SwAccessibleParagraph::GetTextBoundary(
throw (
lang::IndexOutOfBoundsException,
lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException,
+ std::exception)
{
// error checking
if( !( AccessibleTextType::LINE == nTextType
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index bc604fb..4758866 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -233,7 +233,8 @@ protected:
throw (
::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew) SAL_OVERRIDE;
commit 565e135bf6750408f4155b03e90c943fcf944a9d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 28 21:08:31 2015 +0100
coverity#1308565 Uncaught exception
Change-Id: I961169b4da3daf34adc338ca913dab6f5c1edfae
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index 304dee7..800b5bf 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -276,7 +276,7 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive
return createDocumentAlive(_frame,false);
}
-uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive( const uno::Reference< frame::XFrame >& _frame,bool _bHidden ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException)
+uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive( const uno::Reference< frame::XFrame >& _frame,bool _bHidden ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException, std::exception)
{
uno::Reference< frame::XModel > xModel;
OUString sOutputName = getNewOutputName(); // starts implicite the report generator
diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx
index 7542c77..33f4f2b 100644
--- a/reportdesign/source/core/inc/ReportEngineJFree.hxx
+++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx
@@ -115,7 +115,7 @@ namespace reportdesign
// Methods
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL createDocumentModel( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL createDocumentAlive( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _frame ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL createDocumentAlive( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _frame ,bool _bHidden) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) ;
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL createDocumentAlive( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _frame ,bool _bHidden) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) ;
virtual ::com::sun::star::util::URL SAL_CALL createDocument( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
virtual void SAL_CALL interrupt( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 0c4cacd..ece8b75 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -448,7 +448,7 @@ OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs()
#include <com/sun/star/table/BorderLine.hpp>
OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs()
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
IsObjectValid();
diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx
index 0d0b824..8037f1f 100644
--- a/sc/source/ui/inc/AccessibleCellBase.hxx
+++ b/sc/source/ui/inc/AccessibleCellBase.hxx
@@ -145,7 +145,7 @@ protected:
OUString SAL_CALL getShadowAttrs()
throw (::com::sun::star::uno::RuntimeException, std::exception);
OUString SAL_CALL getBorderAttrs()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
public:
const ScAddress& GetCellAddress() const { return maCellAddress; }
bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder);
commit 3b35c0017860cefa4b658f9ec14134c3fbe3d02f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 28 21:07:35 2015 +0100
coverity#1308564 Uncaught exception
Change-Id: Iffb972ca2b89f8b943ec54db4d22db6b7052ab5f
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index d75e13f..cb36b26 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -450,7 +450,7 @@ protected:
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
OUString
GetFullAccessibleName(AccessibleShape *shape)
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual OUString GetStyle();
void UpdateDocumentAllSelState(::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet > &xStateSet);
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 9411b82..9c1c933 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -1160,7 +1160,7 @@ OUString AccessibleShape::CreateAccessibleName()
}
OUString AccessibleShape::GetFullAccessibleName (AccessibleShape *shape)
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
OUString sName (shape->CreateAccessibleBaseName());
// Append the shape's index to the name to disambiguate between shapes
commit 44eeb36e2e0b964a9fb8512aece103e8db958d46
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 28 21:06:16 2015 +0100
coverity#1308563 Uncaught exception
Change-Id: I2ab21b98f4dee612b8c82ca7f1d0fef14b2a847e
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index f4f321f..f13acfa 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -70,6 +70,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 a0d2f5c6e4de6009c8f4b70b5a0c0090a6a2ce1d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 28 21:05:04 2015 +0100
coverity#1308561 Uncaught exception
Change-Id: I82dfcb853f9737e327c84996cc363e0a48d7f796
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index cc38e35..64104a5 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -181,7 +181,7 @@ static OString convertString( const OUString& aInput )
return aRet;
}
-static void createSlideFile( Reference< XComponent > xDoc, PlacewareZipFile& rZipFile, const OUString& rURL, vector< PageEntry* >& rPageEntries ) throw( ::com::sun::star::uno::Exception )
+static void createSlideFile( Reference< XComponent > xDoc, PlacewareZipFile& rZipFile, const OUString& rURL, vector< PageEntry* >& rPageEntries ) throw( ::com::sun::star::uno::Exception, std::exception )
{
OString aInfo;
commit 8a4d61ceec4dd95931c6ff97311e41a480fe3411
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 28 21:04:25 2015 +0100
coverity#1308560 Uncaught exception
Change-Id: Ic5a483ae6de5e072430d8198651177788bf86af9
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 8748d0a..a34c273 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -649,7 +649,7 @@ private:
DECL_LINK( OnAsyncScriptEvent, ScriptEvent* );
#endif
void setShellFromModel();
- void firing_Impl( const ScriptEvent& evt, Any *pSyncRet=NULL ) throw( RuntimeException );
+ void firing_Impl( const ScriptEvent& evt, Any *pSyncRet=NULL ) throw( RuntimeException, std::exception );
Reference< XComponentContext > m_xContext;
Reference< frame::XModel > m_xModel;
@@ -870,7 +870,7 @@ bool DenyMouseDrag(const ScriptEvent& evt, void* )
// EventListener
void
-EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeException)
+EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeException, std::exception)
{
OSL_TRACE("EventListener::firing_Impl( FAKE VBA_EVENTS )");
static const OUString vbaInterOp =
commit 30dfabb68e868788f64802afd673f351145f71a4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 28 21:03:30 2015 +0100
coverity#1308559 Uncaught exception
Change-Id: Ic133aa4f3709b199529d3940369c990e3357ff87
diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx
index 59c969a..2b2589e 100644
--- a/connectivity/source/drivers/odbc/OConnection.cxx
+++ b/connectivity/source/drivers/odbc/OConnection.cxx
@@ -177,7 +177,7 @@ SQLRETURN OConnection::OpenConnection(const OUString& aConnectStr, sal_Int32 nTi
return nSQLRETURN;
}
-SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyValue >& info) throw(SQLException)
+SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyValue >& info) throw(SQLException, std::exception)
{
m_aConnectionHandle = SQL_NULL_HANDLE;
m_sURL = url;
@@ -188,7 +188,7 @@ SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyVal
throw SQLException();
sal_Int32 nLen = url.indexOf(':');
- nLen = url.indexOf(':',nLen+1);
+ nLen = url.indexOf(':',nLen+2);
OUString aDSN("DSN="), aUID, aPWD, aSysDrvSettings;
aDSN += url.copy(nLen+1);
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index 1c5fe40..8dfb062 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -85,7 +85,7 @@ namespace connectivity
public:
oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const;
- SQLRETURN Construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException);
+ SQLRETURN Construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException, std::exception);
OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver);
// OConnection(const SQLHANDLE _pConnectionHandle);
commit 17c6c005fb060520d71ad77cd2311a14bf223d94
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 28 21:03:20 2015 +0100
coverity#1308558 Uncaught exception
Change-Id: I75bb68121d8c3ec9283f3391de8dea7d912489cb
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index a4e94cc..02c1b24 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -2199,7 +2199,7 @@ utl::AccessibleRelationSetHelper* ScAccessibleDocument::GetRelationSet(const ScA
OUString SAL_CALL
ScAccessibleDocument::createAccessibleDescription()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
OUString sDescription = OUString(ScResId(STR_ACC_DOC_DESCR));
return sDescription;
diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx
index 154aaa1..b0285fd 100644
--- a/sc/source/ui/inc/AccessibleDocument.hxx
+++ b/sc/source/ui/inc/AccessibleDocument.hxx
@@ -271,7 +271,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
commit f96de190d8db99020aa4ba052ec3a04a7c09044b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 28 21:00:55 2015 +0100
coverity#1308556 Uncaught exception
Change-Id: I7a07f2b283d6fe2edb5163004223234f69ef6c16
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 8b02146..72ef6ed 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -3305,7 +3305,7 @@ void PresentationSettingsEx::SetArguments( const Sequence< PropertyValue >& rArg
}
}
-void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const Any& rValue ) throw (IllegalArgumentException)
+void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const Any& rValue ) throw (IllegalArgumentException, std::exception)
{
if ( rProperty == "RehearseTimings" )
{
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 3190f02..c584a53 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -101,7 +101,7 @@ struct PresentationSettingsEx : public PresentationSettings
void SetArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments ) throw (css::lang::IllegalArgumentException);
- void SetPropertyValue( const OUString& rProperty, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException);
+ void SetPropertyValue( const OUString& rProperty, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException, std::exception);
};
struct WrappedShapeEventImpl
commit 318b31481b31f063cc18ae4a305831284c225f6c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 28 20:59:48 2015 +0100
coverity#1308554 Uncaught exception
Change-Id: I907dfd51b224b3bd7579b96b169be27f29364cb2
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index dca562b..f23d38b 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -422,7 +422,7 @@ sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescript
}
bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
OUString sFileName;
uno::Reference< embed::XStorage > xStorage;
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index 9c43056..66a6015 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -98,7 +98,7 @@ private:
Reference<XReportDefinition> m_xReportDefinition;
::boost::shared_ptr<rptui::OReportModel> m_pReportModel;
- bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
+ bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception);
SvXMLImportContext* CreateStylesContext(const OUString& rLocalName,
const Reference< XAttributeList>& xAttrList, bool bIsAutoStyle );
commit bcb055fb1a230379bead940ca496c0b272683ce2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 28 20:55:21 2015 +0100
coverity#1308551 Uncaught exception
Change-Id: I61fb5e047b64873b3f5e07582dd1155340d7a1b5
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index 7cca7ba..3217f0d 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -577,7 +577,7 @@ OUString AccessibleContextBase::CreateAccessibleDescription()
OUString AccessibleContextBase::CreateAccessibleName()
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
return OUString("Empty Name");
}
diff --git a/include/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx
index 857e2e2..391857d 100644
--- a/include/editeng/AccessibleContextBase.hxx
+++ b/include/editeng/AccessibleContextBase.hxx
@@ -307,7 +307,7 @@ protected:
siblings) name.
*/
virtual OUString CreateAccessibleName()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
/** Create the accessible object's descriptive string. May be called
more than once.
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index c8baa62..bc21e83 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -639,7 +639,7 @@ void SAL_CALL AccessibleDocumentViewBase::disposing()
/// Create a name for this view.
OUString
AccessibleDocumentViewBase::CreateAccessibleName()
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
return OUString ("AccessibleDocumentViewBase");
}
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 2e85582..fc6a7ed 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -554,7 +554,7 @@ OUString AccessibleDrawDocumentView::getObjectLink( const uno::Any& rAny )
/// Create a name for this view.
OUString AccessibleDrawDocumentView::CreateAccessibleName()
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
OUString sName;
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index 8dd5fe3..6c44a3a 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -319,7 +319,7 @@ protected:
*/
virtual OUString
CreateAccessibleName ()
- throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/** Create a description string. The current description is not
modified and, therefore, no events are send. This method is usually
diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
index 5552c72..75393d2 100644
--- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
+++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
@@ -161,7 +161,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 37d2cdde6657ac5c4a582bdbe0e7a4e0e07b1d13
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 28 20:54:14 2015 +0100
coverity#1308550 Uncaught exception
Change-Id: I87dfcbd5d124120bb107ff63a18e6d79f895ddbb
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 6020abb..7fcf359 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -276,7 +276,7 @@ bool OAddFieldWindow::PreNotify( NotifyEvent& _rNEvt )
return FloatingWindow::PreNotify( _rNEvt );
}
-void OAddFieldWindow::_propertyChanged( const beans::PropertyChangeEvent& _evt ) throw( uno::RuntimeException )
+void OAddFieldWindow::_propertyChanged( const beans::PropertyChangeEvent& _evt ) throw( uno::RuntimeException, std::exception )
{
OSL_ENSURE( _evt.Source == m_xRowSet, "OAddFieldWindow::_propertyChanged: where did this come from?" );
(void)_evt;
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index 2544331..36dcc2d 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -117,7 +117,7 @@ public:
private:
// FmXChangeListener
- 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;
// OContainerListener
virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
commit d63a10c69fb21dcb7333bfd0c14cf5268a33ed8c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 28 20:53:22 2015 +0100
coverity#1308549 Uncaught exception
Change-Id: I9d3086465b9ea6a4aac606b6464abfbfd71dc3ea
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 2a21874..a58f813 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -278,7 +278,7 @@ bool FmFieldWin::Close()
}
-void FmFieldWin::_propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw( ::com::sun::star::uno::RuntimeException )
+void FmFieldWin::_propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw( ::com::sun::star::uno::RuntimeException, std::exception )
{
::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > xForm(evt.Source, ::com::sun::star::uno::UNO_QUERY);
UpdateContent(xForm);
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index d973a04..88ac821 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -111,7 +111,7 @@ public:
protected:
// FmXChangeListener
- 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;
protected:
inline SfxBindings& GetBindings() { return SfxControllerItem::GetBindings(); }
commit 6f823d85f73ab149a65a0af81cf3691a0702039e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 28 20:52:35 2015 +0100
coverity#1308548 Uncaught exception
Change-Id: I62d538799a814346df4de00dc232a04376e77ad7
diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx
index ec38725..29c8209 100644
--- a/include/svx/ShapeTypeHandler.hxx
+++ b/include/svx/ShapeTypeHandler.hxx
@@ -155,7 +155,7 @@ public:
/// get the accessible base name for an object
static OUString CreateAccessibleBaseName (
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape)
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
protected:
// Declare default constructor, copy constructor, destructor, and
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index c2d4183..911fc8e 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -1153,7 +1153,7 @@ void StringResourcePersistenceImpl::implKillChangedDefaultFiles
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 changed defaults
for( LocaleItemVectorIt it = m_aChangedDefaultLocaleVector.begin();
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index 069cb14..d6a5ac3 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -297,7 +297,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 implStoreAtLocation
(
commit d7876aeb21244c8a55111c89f38e48acab01a2b7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 28 20:51:48 2015 +0100
coverity#1308547 Uncaught exception
Change-Id: I7ac0ce93a6cef3091e86bbc6d95e6c2a27cd2e3f
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 2581573..30ce3fe 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -219,7 +219,7 @@ long ShapeTypeHandler::GetSlotId (const uno::Reference<drawing::XShape>& rxShape
/// get the accessible base name for an object
OUString
ShapeTypeHandler::CreateAccessibleBaseName (const uno::Reference<drawing::XShape>& rxShape)
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
sal_Int32 nResourceId;
OUString sName;
More information about the Libreoffice-commits
mailing list