[Libreoffice-commits] core.git: 5 commits - include/vbahelper vbahelper/source
Caolán McNamara
caolanm at redhat.com
Thu Apr 24 03:10:28 PDT 2014
include/vbahelper/vbashape.hxx | 15 ++++++++++-----
vbahelper/source/vbahelper/vbashape.cxx | 16 +++++++++++-----
2 files changed, 21 insertions(+), 10 deletions(-)
New commits:
commit cf058da1e5664bc8c30a5777e2c1dbf059a6304f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 11:05:52 2014 +0100
coverity#707475 Uncaught exception
Change-Id: I4c9da1bb21e55578fc81e4c5b3133cbd639711cc
diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx
index f389c29..0750bbd 100644
--- a/include/vbahelper/vbashape.hxx
+++ b/include/vbahelper/vbashape.hxx
@@ -92,7 +92,8 @@ public:
virtual void SAL_CALL setRelativeHorizontalPosition(::sal_Int32 _relativehorizontalposition)
throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::sal_Int32 SAL_CALL getRelativeVerticalPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setRelativeVerticalPosition(::sal_Int32 _relativeverticalposition)
+ throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Methods
virtual css::uno::Any SAL_CALL SAL_CALL TextFrame( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index 0077ad9..38a6740 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -648,7 +648,8 @@ ScVbaShape::getRelativeVerticalPosition() throw (uno::RuntimeException, std::exc
}
void SAL_CALL
-ScVbaShape::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::setRelativeVerticalPosition(::sal_Int32 _relativeverticalposition)
+ throw (css::script::BasicErrorException, uno::RuntimeException, std::exception)
{
sal_Int16 nType = text::RelOrientation::PAGE_FRAME;
switch( _relativeverticalposition )
commit 6b260f17e9ccabe83457f0203efc256441b781dc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 11:05:12 2014 +0100
coverity#707476 Uncaught exception
Change-Id: I667867d0333d9d82db3218e2645741a2327cd8fe
diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx
index b4e6f19..f389c29 100644
--- a/include/vbahelper/vbashape.hxx
+++ b/include/vbahelper/vbashape.hxx
@@ -89,7 +89,8 @@ public:
virtual sal_Bool SAL_CALL getLockAnchor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setLockAnchor( sal_Bool _lockanchor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::sal_Int32 SAL_CALL getRelativeHorizontalPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setRelativeHorizontalPosition(::sal_Int32 _relativehorizontalposition)
+ throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::sal_Int32 SAL_CALL getRelativeVerticalPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index 062f561..0077ad9 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -576,7 +576,8 @@ ScVbaShape::getRelativeHorizontalPosition() throw (uno::RuntimeException, std::e
}
void SAL_CALL
-ScVbaShape::setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::setRelativeHorizontalPosition(::sal_Int32 _relativehorizontalposition)
+ throw (css::script::BasicErrorException, uno::RuntimeException, std::exception)
{
sal_Int16 nType = text::RelOrientation::PAGE_FRAME;
switch( _relativehorizontalposition )
commit 4d225d3e7f3dbbb463fd0229f3e6403407e34f62
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 11:04:00 2014 +0100
coverity#707477 Uncaught exception
Change-Id: Ie91515b0cd0fcf5a1b3bc7b2d394927dafa851ea
diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx
index 3435d43..b4e6f19 100644
--- a/include/vbahelper/vbashape.hxx
+++ b/include/vbahelper/vbashape.hxx
@@ -69,7 +69,8 @@ public:
virtual void SAL_CALL setHeight(double _height)
throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setWidth(double _width)
+ throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index 03c611e..062f561 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -205,7 +205,8 @@ ScVbaShape::getWidth() throw (uno::RuntimeException, std::exception)
}
void SAL_CALL
-ScVbaShape::setWidth( double _width ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::setWidth(double _width)
+ throw (css::script::BasicErrorException, uno::RuntimeException, std::exception)
{
m_pShapeHelper->setWidth( _width );
}
commit b6804259c5664f1d749717cf270ccb80ddfd2f41
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 11:01:34 2014 +0100
coverity#707478 Uncaught exception
Change-Id: Ib967053b7d306d18c69843da39646d69540f081f
diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx
index 1625f36..3435d43 100644
--- a/include/vbahelper/vbashape.hxx
+++ b/include/vbahelper/vbashape.hxx
@@ -66,7 +66,8 @@ public:
virtual OUString SAL_CALL getAlternativeText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setAlternativeText( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setHeight(double _height)
+ throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index d97b61e..03c611e 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -192,7 +192,8 @@ ScVbaShape::getHeight() throw (uno::RuntimeException, std::exception)
}
void SAL_CALL
-ScVbaShape::setHeight( double _height ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::setHeight(double _height)
+ throw (script::BasicErrorException, uno::RuntimeException, std::exception)
{
m_pShapeHelper->setHeight( _height );
}
commit cc44da64b109ec9b1fe9393a19ac18c57d9e3217
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 10:56:31 2014 +0100
coverity#707479 Uncaught exception
Change-Id: I4a1c43dab2814ed66f1785b91ead76407e32de46
diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx
index 3069fa6..1625f36 100644
--- a/include/vbahelper/vbashape.hxx
+++ b/include/vbahelper/vbashape.hxx
@@ -52,7 +52,8 @@ protected:
virtual OUString getServiceImplName() SAL_OVERRIDE;
virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE;
public:
- ScVbaShape( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nType ) throw ( css::lang::IllegalArgumentException );
+ ScVbaShape( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nType )
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
virtual ~ScVbaShape();
css::uno::Any getRange() { return m_aRange; };
void setRange( css::uno::Any aRange ) { m_aRange = aRange; };
diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index 9f7a3cd..d97b61e 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -47,7 +47,9 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-ScVbaShape::ScVbaShape( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XShapes >& xShapes, const uno::Reference< frame::XModel >& xModel, sal_Int32 nType ) throw( lang::IllegalArgumentException ) : ScVbaShape_BASE( xParent, xContext ), m_xShape( xShape ), m_xShapes( xShapes ), m_nType( nType ), m_xModel( xModel )
+ScVbaShape::ScVbaShape( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XShapes >& xShapes, const uno::Reference< frame::XModel >& xModel, sal_Int32 nType )
+ throw (lang::IllegalArgumentException, uno::RuntimeException)
+ : ScVbaShape_BASE( xParent, xContext ), m_xShape( xShape ), m_xShapes( xShapes ), m_nType( nType ), m_xModel( xModel )
{
m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
m_pShapeHelper.reset( new ShapeHelper( m_xShape ) );
More information about the Libreoffice-commits
mailing list