[Libreoffice-commits] core.git: 12 commits - configmgr/qa include/canvas
Caolán McNamara
caolanm at redhat.com
Thu Feb 12 03:28:27 PST 2015
configmgr/qa/unit/test.cxx | 8 +-
include/canvas/base/canvasbase.hxx | 101 +++++++++++++++++-------------
include/canvas/base/graphicdevicebase.hxx | 30 +++++---
3 files changed, 82 insertions(+), 57 deletions(-)
New commits:
commit 4aab54a094e39e2ee2f0fbd3aa202583f4a9cd26
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 12 11:25:05 2015 +0000
coverity#1269584 Uncaught exception
and
coverity#1269578 Uncaught exception
Change-Id: I68ef6ada3521cb12e17c5fe2ccecd67ade4ed40b
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index 956b6510..420517a 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -212,11 +212,13 @@ namespace canvas
}
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
- strokePolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
- const ::com::sun::star::rendering::ViewState& viewState,
- const ::com::sun::star::rendering::RenderState& renderState,
- const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+ strokePolyPolygon(const css::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
+ const css::rendering::ViewState& viewState,
+ const css::rendering::RenderState& renderState,
+ const css::rendering::StrokeAttributes& strokeAttributes)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception) SAL_OVERRIDE
{
tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes,
BOOST_CURRENT_FUNCTION,
commit c5875fd2cb6cb86584898dc48ad885c663d9981d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 12 11:23:45 2015 +0000
coverity#1269586 Uncaught exception
and
coverity#1269581 Uncaught exception
Change-Id: I48d08e1361ac9cf4c7d6040c247c753366dab4c5
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index 432dc29..956b6510 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -132,10 +132,12 @@ namespace canvas
maCanvasHelper.clear();
}
- virtual void SAL_CALL drawPoint( const ::com::sun::star::geometry::RealPoint2D& aPoint,
- const ::com::sun::star::rendering::ViewState& viewState,
- const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+ virtual void SAL_CALL drawPoint(const css::geometry::RealPoint2D& aPoint,
+ const css::rendering::ViewState& viewState,
+ const css::rendering::RenderState& renderState)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception) SAL_OVERRIDE
{
tools::verifyArgs(aPoint, viewState, renderState,
BOOST_CURRENT_FUNCTION,
commit 0a756818c7d26e7a80634db6fa1961812bced423
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 12 11:21:39 2015 +0000
coverity#1269589 Uncaught exception
and
coverity#1269587 Uncaught exception
Change-Id: Ic532ed2dfe38e33bcf2d9cedd0edee2cf3869f17
diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx
index f2216d4..a28fc06 100644
--- a/include/canvas/base/graphicdevicebase.hxx
+++ b/include/canvas/base/graphicdevicebase.hxx
@@ -187,8 +187,10 @@ namespace canvas
return maDeviceHelper.createCompatibleBezierPolyPolygon( this, points );
}
- virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleBitmap( const css::geometry::IntegerSize2D& size ) throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException) SAL_OVERRIDE
+ virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleBitmap( const css::geometry::IntegerSize2D& size )
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception) SAL_OVERRIDE
{
tools::verifyBitmapSize(size,
BOOST_CURRENT_FUNCTION,
@@ -211,8 +213,10 @@ namespace canvas
return maDeviceHelper.createVolatileBitmap( this, size );
}
- virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleAlphaBitmap( const css::geometry::IntegerSize2D& size ) throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException) SAL_OVERRIDE
+ virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleAlphaBitmap( const css::geometry::IntegerSize2D& size )
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception) SAL_OVERRIDE
{
tools::verifyBitmapSize(size,
BOOST_CURRENT_FUNCTION,
commit 9b4431098950a71b3c355386d37bc0d4f3f440d2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 12 11:20:31 2015 +0000
coverity#1269591 Uncaught exception
and
coverity#1269585 Uncaught exception
Change-Id: I1ec46b1c3996cf95744c15351d2c26a47d079c77
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index cf2b1ee..432dc29 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -384,12 +384,14 @@ namespace canvas
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
- drawText( const ::com::sun::star::rendering::StringContext& text,
- const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont >& xFont,
- const ::com::sun::star::rendering::ViewState& viewState,
- const ::com::sun::star::rendering::RenderState& renderState,
- sal_Int8 textDirection ) throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+ drawText(const css::rendering::StringContext& text,
+ const css::uno::Reference< ::com::sun::star::rendering::XCanvasFont >& xFont,
+ const css::rendering::ViewState& viewState,
+ const css::rendering::RenderState& renderState,
+ sal_Int8 textDirection)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception) SAL_OVERRIDE
{
tools::verifyArgs(xFont, viewState, renderState,
BOOST_CURRENT_FUNCTION,
commit 1445679455095081383a50eba5ce418a62952ee8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 12 11:18:24 2015 +0000
coverity#1269592 Uncaught exception
and
coverity#1269577 Uncaught exception
Change-Id: Ib8a61f8738d35cf5cb7cfa32d91d241f5c8d52d4
diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx
index b6f5036..f2216d4 100644
--- a/include/canvas/base/graphicdevicebase.hxx
+++ b/include/canvas/base/graphicdevicebase.hxx
@@ -296,18 +296,20 @@ namespace canvas
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException,
- css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException) SAL_OVERRIDE
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException,
+ std::exception) SAL_OVERRIDE
{
MutexType aGuard( BaseType::m_aMutex );
maPropHelper.setPropertyValue( aPropertyName, aValue );
}
virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException) SAL_OVERRIDE
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException,
+ std::exception) SAL_OVERRIDE
{
MutexType aGuard( BaseType::m_aMutex );
return maPropHelper.getPropertyValue( aPropertyName );
commit 06ce26c082698502dfd2254768f9bc2b075068c8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 12 11:17:05 2015 +0000
coverity#1269593 Uncaught exception
and
coverity#1269580 Uncaught exception
Change-Id: I366d43d2c5fd51927a6cd07101051e7cf9614974
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index 29fdb12..cf2b1ee 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -149,11 +149,13 @@ namespace canvas
maCanvasHelper.drawPoint( this, aPoint, viewState, renderState );
}
- virtual void SAL_CALL drawLine( const ::com::sun::star::geometry::RealPoint2D& aStartPoint,
- const ::com::sun::star::geometry::RealPoint2D& aEndPoint,
- const ::com::sun::star::rendering::ViewState& viewState,
- const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+ virtual void SAL_CALL drawLine(const css::geometry::RealPoint2D& aStartPoint,
+ const css::geometry::RealPoint2D& aEndPoint,
+ const css::rendering::ViewState& viewState,
+ const css::rendering::RenderState& renderState)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception) SAL_OVERRIDE
{
tools::verifyArgs(aStartPoint, aEndPoint, viewState, renderState,
BOOST_CURRENT_FUNCTION,
commit 2fd534ab9079a5cfe0b03381ef789629f0bf149e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 12 11:15:00 2015 +0000
coverity#1269594 Uncaught exception
and
coverity#1269588 Uncaught exception
Change-Id: I9e36c9636b7783530973272229dfb5bbfed556e5
diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx
index 239ac40..b6f5036 100644
--- a/include/canvas/base/graphicdevicebase.hxx
+++ b/include/canvas/base/graphicdevicebase.hxx
@@ -159,14 +159,14 @@ namespace canvas
return maDeviceHelper.getColorSpace();
}
- virtual css::geometry::RealSize2D SAL_CALL getPhysicalResolution( ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+ virtual css::geometry::RealSize2D SAL_CALL getPhysicalResolution() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
MutexType aGuard( BaseType::m_aMutex );
return maDeviceHelper.getPhysicalResolution();
}
- virtual css::geometry::RealSize2D SAL_CALL getPhysicalSize( ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+ virtual css::geometry::RealSize2D SAL_CALL getPhysicalSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
MutexType aGuard( BaseType::m_aMutex );
commit c1e25f9a173f98c82ce196b09022a8abdfbe9e53
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 12 11:13:46 2015 +0000
coverity#1269597 Uncaught exception
and
coverity#1269596 Uncaught exception
Change-Id: I0466e66cd33dd842296131f73376bc95308254e4
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index 5caefb0..fd00477 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -123,11 +123,11 @@ protected:
private:
virtual void SAL_CALL disposing(css::lang::EventObject const &)
- throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL propertyChange(
css::beans::PropertyChangeEvent const &)
- throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
int count_;
bool * destroyed_;
@@ -160,14 +160,14 @@ RecursiveTest::~RecursiveTest()
}
void RecursiveTest::disposing(css::lang::EventObject const & Source)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
CPPUNIT_ASSERT(properties_.is() && Source.Source == properties_);
properties_.clear();
}
void RecursiveTest::propertyChange(css::beans::PropertyChangeEvent const & evt)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
CPPUNIT_ASSERT( evt.Source == properties_ && evt.PropertyName == "Label" );
if (count_ > 0) {
commit ec3c964c6674d2966f61e9ac615c08a7ef4b512e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 12 11:11:52 2015 +0000
coverity#1269598 Uncaught exception
and
coverity#1269595 Uncaught exception
Change-Id: Ia32be45c93769de92ad649eb765a343b659ddc3f
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index f8d8744..29fdb12 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -287,10 +287,12 @@ namespace canvas
}
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
- fillPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
- const ::com::sun::star::rendering::ViewState& viewState,
- const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+ fillPolyPolygon(const css::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
+ const css::rendering::ViewState& viewState,
+ const css::rendering::RenderState& renderState)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception) SAL_OVERRIDE
{
tools::verifyArgs(xPolyPolygon, viewState, renderState,
BOOST_CURRENT_FUNCTION,
commit e2ea5d1e1c2bc387c5211822750bea6a11515a03
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 12 11:10:23 2015 +0000
coverity#1269599 Uncaught exception
and
coverity#1269590 Uncaught exception
Change-Id: I03394a827e8f04842a8a94f839f0439407926150
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index 327afc4..f8d8744 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -188,10 +188,12 @@ namespace canvas
}
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
- drawPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
- const ::com::sun::star::rendering::ViewState& viewState,
- const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+ drawPolyPolygon(const css::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
+ const css::rendering::ViewState& viewState,
+ const css::rendering::RenderState& renderState)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception) SAL_OVERRIDE
{
tools::verifyArgs(xPolyPolygon, viewState, renderState,
BOOST_CURRENT_FUNCTION,
commit f6202716f7a3869231f90034077028b240ebbfc5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 12 11:06:18 2015 +0000
coverity#1269582 Uncaught exception
and
coverity#1269600 Uncaught exception
coverity#1269575 Uncaught exception
coverity#1269579 Uncaught exception
Change-Id: If8d5650a9de574d92912a53a5b560ddb03e937f1
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index 98772d2..327afc4 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -303,11 +303,13 @@ namespace canvas
}
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
- fillTexturedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
- const ::com::sun::star::rendering::ViewState& viewState,
- const ::com::sun::star::rendering::RenderState& renderState,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures ) throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+ fillTexturedPolyPolygon(const css::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon,
+ const css::rendering::ViewState& viewState,
+ const css::rendering::RenderState& renderState,
+ const css::uno::Sequence< ::com::sun::star::rendering::Texture >& textures)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception) SAL_OVERRIDE
{
tools::verifyArgs(xPolyPolygon, viewState, renderState, textures,
BOOST_CURRENT_FUNCTION,
@@ -400,9 +402,12 @@ namespace canvas
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
- drawTextLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout >& laidOutText,
- const ::com::sun::star::rendering::ViewState& viewState,
- const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+ drawTextLayout(const css::uno::Reference< ::com::sun::star::rendering::XTextLayout >& laidOutText,
+ const css::rendering::ViewState& viewState,
+ const css::rendering::RenderState& renderState)
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception) SAL_OVERRIDE
{
tools::verifyArgs(laidOutText, viewState, renderState,
BOOST_CURRENT_FUNCTION,
commit 6dd06494227d2f09b18619973735b9f9b9e65663
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 12 11:04:08 2015 +0000
coverity#1269574 Uncaught exception
and
coverity#1269583 Uncaught exception
Change-Id: I046d19894183167a9b54f0975508378babc531c7
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index 9f691e3..98772d2 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -167,11 +167,13 @@ namespace canvas
maCanvasHelper.drawLine( this, aStartPoint, aEndPoint, viewState, renderState );
}
- virtual void SAL_CALL drawBezier( const ::com::sun::star::geometry::RealBezierSegment2D& aBezierSegment,
- const ::com::sun::star::geometry::RealPoint2D& aEndPoint,
- const ::com::sun::star::rendering::ViewState& viewState,
- const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+ virtual void SAL_CALL drawBezier( const css::geometry::RealBezierSegment2D& aBezierSegment,
+ const css::geometry::RealPoint2D& aEndPoint,
+ const css::rendering::ViewState& viewState,
+ const css::rendering::RenderState& renderState )
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException,
+ std::exception) SAL_OVERRIDE
{
tools::verifyArgs(aBezierSegment, aEndPoint, viewState, renderState,
BOOST_CURRENT_FUNCTION,
More information about the Libreoffice-commits
mailing list