canvas/source/cairo/cairo_canvasbitmap.cxx | 7 +++----
framework/source/fwe/xml/menuconfiguration.cxx | 2 +-
include/framework/menuconfiguration.hxx | 2 +-
include/oox/ppt/dgmimport.hxx | 2 +-
include/oox/ppt/dgmlayout.hxx | 2 +-
oox/source/ppt/dgmimport.cxx | 2 +-
oox/source/ppt/dgmlayout.cxx | 2 +-
sc/source/filter/excel/xestream.cxx | 3 ++-
sc/source/filter/inc/xestream.hxx | 3 ++-
svx/source/inc/xmlxtexp.hxx | 3 ++-
svx/source/unogallery/unogalitem.cxx | 8 ++++----
svx/source/unogallery/unogalitem.hxx | 6 +++++-
svx/source/xml/xmlxtexp.cxx | 3 ++-
13 files changed, 26 insertions(+), 19 deletions(-)
New commits:
commit d8863b73755a0d09b1b548246956f74d66de6007
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 3 20:42:40 2014 +0100
coverity#735682 Unchecked dynamic_cast
Change-Id: Ie3ac1e9960afa71e5cf221bb67b8b8ccb609dc38
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx
b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 6865063..40b642a 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -221,12 +221,11 @@ namespace cairocanvas
case 1:
{
#ifdef CAIRO_HAS_XLIB_SURFACE
- X11Surface*
pXlibSurface=dynamic_cast<X11Surface*>(mpBufferSurface.get());
- OSL_ASSERT(pXlibSurface);
+ X11Surface&
rXlibSurface=dynamic_cast<X11Surface&>(*mpBufferSurface.get());
uno::Sequence< uno::Any > args( 3 );
args[0] = uno::Any( false ); // do not call XFreePixmap on it
- args[1] = uno::Any( pXlibSurface->getPixmap()->mhDrawable );
- args[2] = uno::Any( sal_Int32( pXlibSurface->getDepth() ) );
+ args[1] = uno::Any( rXlibSurface.getPixmap()->mhDrawable );
+ args[2] = uno::Any( sal_Int32( rXlibSurface.getDepth() ) );
aRV = uno::Any( args );
#elif defined CAIRO_HAS_QUARTZ_SURFACE
commit 312ffe07bbef6b8dbc14ce38c0a726f69dd90946
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 3 20:24:08 2014 +0100
coverity#738062 Uncaught exception
Change-Id: Id123422e23f93b1c0062cac190fcf93a253cb629
diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx
index 7a99cb2..82fdb20 100644
--- a/svx/source/inc/xmlxtexp.hxx
+++ b/svx/source/inc/xmlxtexp.hxx
@@ -49,7 +49,8 @@ public:
::com::sun::star::container::XNameContainer >&
xTable,
const ::com::sun::star::uno::Reference <
::com::sun::star::embed::XStorage > &xStorage,
- OUString *pOptName ) throw();
+ OUString *pOptName )
+ throw (css::uno::RuntimeException);
// methods without content:
virtual void _ExportAutoStyles() SAL_OVERRIDE;
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 48743e9..85bf42a 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -209,7 +209,8 @@ bool SvxXMLXTableExportComponent::save(
const OUString& rURL,
const uno::Reference<container::XNameContainer >& xTable,
const uno::Reference<embed::XStorage >& xStorage,
- OUString *pOptName ) throw()
+ OUString *pOptName )
+ throw (css::uno::RuntimeException)
{
bool bRet = false;
SfxMedium* pMedium = NULL;
commit 604d5be3b6a1750cde01de9a01734c10fef30a0c
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 3 20:22:47 2014 +0100
coverity#738055 Uncaught exception
Change-Id: Ic4bb1603894ce7ff1b72e1290501d6cd17e6d762
diff --git a/svx/source/unogallery/unogalitem.cxx
b/svx/source/unogallery/unogalitem.cxx
index 81d2f75..1a70be1 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -300,7 +300,8 @@ void GalleryItem::_setPropertyValues( const
comphelper::PropertyMapEntry** ppEnt
void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry**
ppEntries, uno::Any* pValue )
throw (beans::UnknownPropertyException,
lang::WrappedTargetException,
- css::uno::RuntimeException)
+ css::uno::RuntimeException,
+ std::exception)
{
const SolarMutexGuard aGuard;
diff --git a/svx/source/unogallery/unogalitem.hxx
b/svx/source/unogallery/unogalitem.hxx
index 81ac48d..ab526c9 100644
--- a/svx/source/unogallery/unogalitem.hxx
+++ b/svx/source/unogallery/unogalitem.hxx
@@ -80,7 +80,8 @@ protected:
virtual void _getPropertyValues( const comphelper::PropertyMapEntry**
ppEntries, ::com::sun::star::uno::Any* pValue )
throw (css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
- css::uno::RuntimeException) SAL_OVERRIDE;
+ css::uno::RuntimeException,
+ std::exception) SAL_OVERRIDE;
protected:
commit 59198069d280723f618a101db0c0d8cd38f42f24
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 3 20:21:22 2014 +0100
coverity#738052 Uncaught exception
Change-Id: If6767fdc7a3e462cbd88dcc879857676037e80ef
diff --git a/svx/source/unogallery/unogalitem.cxx
b/svx/source/unogallery/unogalitem.cxx
index 1443bba..81d2f75 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -297,11 +297,10 @@ void GalleryItem::_setPropertyValues( const
comphelper::PropertyMapEntry** ppEnt
}
}
-
-
void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry**
ppEntries, uno::Any* pValue )
- throw( beans::UnknownPropertyException,
- lang::WrappedTargetException )
+ throw (beans::UnknownPropertyException,
+ lang::WrappedTargetException,
+ css::uno::RuntimeException)
{
const SolarMutexGuard aGuard;
diff --git a/svx/source/unogallery/unogalitem.hxx
b/svx/source/unogallery/unogalitem.hxx
index 2a86ed3..81ac48d 100644
--- a/svx/source/unogallery/unogalitem.hxx
+++ b/svx/source/unogallery/unogalitem.hxx
@@ -77,7 +77,10 @@ protected:
// PropertySetHelper
virtual void _setPropertyValues( const comphelper::PropertyMapEntry**
ppEntries, const ::com::sun::star::uno::Any* pValues )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE;
- virtual void _getPropertyValues( const comphelper::PropertyMapEntry**
ppEntries, ::com::sun::star::uno::Any* pValue )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE;
+ virtual void _getPropertyValues( const comphelper::PropertyMapEntry**
ppEntries, ::com::sun::star::uno::Any* pValue )
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException) SAL_OVERRIDE;
protected:
commit a7e6f6d17117482d699b2d230841997156828e1a
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 3 20:18:33 2014 +0100
coverity#737265 Uncaught exception
Change-Id: Icb36e8e72c6d99e9a72d360382855f325886f99b
diff --git a/sc/source/filter/excel/xestream.cxx
b/sc/source/filter/excel/xestream.cxx
index 6f5c7b4..5a391a6 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -1051,7 +1051,8 @@ ScDocShell* XclExpXmlStream::getDocShell()
return 0;
}
-bool XclExpXmlStream::exportDocument() throw(std::exception)
+bool XclExpXmlStream::exportDocument()
+ throw (css::uno::RuntimeException, std::exception)
{
ScDocShell* pShell = getDocShell();
ScDocument* pDoc = pShell->GetDocument();
diff --git a/sc/source/filter/inc/xestream.hxx
b/sc/source/filter/inc/xestream.hxx
index 3d36c04..13a225b 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -318,7 +318,8 @@ public:
OUString* pRelationshipId = NULL );
// ignore
- virtual bool exportDocument() throw (std::exception) SAL_OVERRIDE;
+ virtual bool exportDocument()
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// only needed for import; ignore
virtual bool importDocument() throw() SAL_OVERRIDE;
commit 6b44b03c130ad63c50cbff34c719acb99ab500d5
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 3 20:15:15 2014 +0100
coverity#737244 Uncaught exception
Change-Id: I9e34e14d1266310458bb491259e4bf9880e8a19f
diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx
index 2b5d97d..52dcfbd 100644
--- a/include/oox/ppt/dgmlayout.hxx
+++ b/include/oox/ppt/dgmlayout.hxx
@@ -40,7 +40,7 @@ public:
QuickDiagrammingLayout( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext );
// from FilterBase
- virtual bool importDocument() throw() SAL_OVERRIDE;
+ virtual bool importDocument() throw (css::uno::RuntimeException)
SAL_OVERRIDE;
virtual bool exportDocument() throw() SAL_OVERRIDE;
virtual const ::oox::drawingml::Theme* getCurrentTheme() const
SAL_OVERRIDE;
diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx
index 1fbafdc..10276dc 100644
--- a/oox/source/ppt/dgmlayout.cxx
+++ b/oox/source/ppt/dgmlayout.cxx
@@ -61,7 +61,7 @@ QuickDiagrammingLayout::QuickDiagrammingLayout( const
Reference< XComponentConte
mpThemePtr(new drawingml::Theme())
{}
-bool QuickDiagrammingLayout::importDocument() throw()
+bool QuickDiagrammingLayout::importDocument() throw
(css::uno::RuntimeException)
{
Reference<drawing::XShape> xParentShape(getParentShape(),
UNO_QUERY_THROW);
commit ae6b606f5769a45f3b56e29528d36a2d2b4660d6
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 3 20:14:11 2014 +0100
coverity#737243 Uncaught exception
Change-Id: I4bef14453d076f11066a695bc4a948cea5cfd40b
diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx
index 993e79b..f4d4e96 100644
--- a/include/oox/ppt/dgmimport.hxx
+++ b/include/oox/ppt/dgmimport.hxx
@@ -40,7 +40,7 @@ public:
QuickDiagrammingImport( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext );
// from FilterBase
- virtual bool importDocument() throw() SAL_OVERRIDE;
+ virtual bool importDocument() throw (css::uno::RuntimeException)
SAL_OVERRIDE;
virtual bool exportDocument() throw() SAL_OVERRIDE;
virtual const ::oox::drawingml::Theme* getCurrentTheme() const
SAL_OVERRIDE;
diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx
index 7ff543c..19ff1ca 100644
--- a/oox/source/ppt/dgmimport.cxx
+++ b/oox/source/ppt/dgmimport.cxx
@@ -54,7 +54,7 @@ QuickDiagrammingImport::QuickDiagrammingImport( const
::com::sun::star::uno::Ref
: XmlFilterBase( rxContext )
{}
-bool QuickDiagrammingImport::importDocument() throw()
+bool QuickDiagrammingImport::importDocument() throw
(css::uno::RuntimeException)
{
/* to activate the PPTX dumper, define the environment variable
OOO_PPTXDUMPER and insert the full path to the file
commit 1d2993df98798e0432d140651045a49a4caef2e8
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 3 20:12:31 2014 +0100
coverity#737167 Uncaught exception
Change-Id: I9ac3ffbecf8c9efc0b69ad4606c61dbf8fa5a0e9
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx
b/framework/source/fwe/xml/menuconfiguration.cxx
index add181e..8eb6a6d 100644
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -55,7 +55,7 @@ MenuConfiguration::~MenuConfiguration()
Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML(
Reference< XInputStream >& rInputStream )
-throw ( WrappedTargetException )
+ throw (WrappedTargetException, RuntimeException)
{
Reference< XParser > xParser = Parser::create( m_xContext );
diff --git a/include/framework/menuconfiguration.hxx
b/include/framework/menuconfiguration.hxx
index 4e5fd87..50e4405 100644
--- a/include/framework/menuconfiguration.hxx
+++ b/include/framework/menuconfiguration.hxx
@@ -87,7 +87,7 @@ class FWE_DLLPUBLIC MenuConfiguration
::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexAccess > CreateMenuBarConfigurationFromXML(
::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream >& rInputStream )
- throw ( ::com::sun::star::lang::WrappedTargetException );
+ throw (css::lang::WrappedTargetException,
css::uno::RuntimeException);
PopupMenu* CreateBookmarkMenu(css::uno::Reference<css::frame::XFrame
>& rFrame, const OUString& aURL)
throw (css::lang::WrappedTargetException,
css::uno::RuntimeException);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
