diff options
Diffstat (limited to 'chart2/source/view/main/DummyXShape.cxx')
-rw-r--r-- | chart2/source/view/main/DummyXShape.cxx | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index 6b28c43b4aee..8d4ac25efb2a 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -56,26 +56,26 @@ public: mrProperties(rProps) {} virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& rName ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual beans::Property SAL_CALL getPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, beans::UnknownPropertyException); + throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception); virtual uno::Sequence< beans::Property > SAL_CALL getProperties() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); private: const std::map<OUString, uno::Any>& mrProperties; }; sal_Bool SAL_CALL DummyPropertySetInfo::hasPropertyByName( const OUString& rName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return mrProperties.find(rName) != mrProperties.end(); } beans::Property SAL_CALL DummyPropertySetInfo::getPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, beans::UnknownPropertyException) + throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception) { beans::Property aRet; if(mrProperties.find(rName) == mrProperties.end()) @@ -89,7 +89,7 @@ beans::Property SAL_CALL DummyPropertySetInfo::getPropertyByName( const OUString } uno::Sequence< beans::Property > SAL_CALL DummyPropertySetInfo::getProperties() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Sequence< beans::Property > aRet(mrProperties.size()); @@ -134,49 +134,49 @@ DummyXShape::DummyXShape() } OUString SAL_CALL DummyXShape::getName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return maName; } void SAL_CALL DummyXShape::setName( const OUString& rName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { maName = rName; } awt::Point SAL_CALL DummyXShape::getPosition() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return maPosition; } void SAL_CALL DummyXShape::setPosition( const awt::Point& rPoint ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { maPosition = rPoint; } awt::Size SAL_CALL DummyXShape::getSize() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return maSize; } void SAL_CALL DummyXShape::setSize( const awt::Size& rSize ) - throw(beans::PropertyVetoException, uno::RuntimeException) + throw(beans::PropertyVetoException, uno::RuntimeException, std::exception) { maSize = rSize; } OUString SAL_CALL DummyXShape::getShapeType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString("dummy shape"); } uno::Reference< beans::XPropertySetInfo > SAL_CALL DummyXShape::getPropertySetInfo() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return new DummyPropertySetInfo(maProperties); } @@ -184,7 +184,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL DummyXShape::getPropertySetIn void SAL_CALL DummyXShape::setPropertyValue( const OUString& rName, const uno::Any& rValue) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { SAL_WARN("chart2", "DummyXShape::setProperty: " << rName << " " << "Any"); maProperties[rName] = rValue; @@ -195,7 +195,7 @@ void SAL_CALL DummyXShape::setPropertyValue( const OUString& rName, const uno::A } uno::Any SAL_CALL DummyXShape::getPropertyValue( const OUString& rName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("chart2.opengl", "DummyXShape::getPropertyValue: " << rName); std::map<OUString, uno::Any>::iterator itr = maProperties.find(rName); @@ -206,29 +206,29 @@ uno::Any SAL_CALL DummyXShape::getPropertyValue( const OUString& rName ) } void SAL_CALL DummyXShape::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SAL_CALL DummyXShape::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SAL_CALL DummyXShape::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SAL_CALL DummyXShape::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SAL_CALL DummyXShape::setPropertyValues( const uno::Sequence< OUString >& rNames, const uno::Sequence< uno::Any >& rValues) throw (beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException) + lang::WrappedTargetException, uno::RuntimeException, std::exception) { size_t n = std::min<size_t>(rNames.getLength(), rValues.getLength()); for(size_t i = 0; i < n; ++i) @@ -239,7 +239,7 @@ throw (beans::PropertyVetoException, lang::IllegalArgumentException, uno::Sequence< uno::Any > SAL_CALL DummyXShape::getPropertyValues( const uno::Sequence< OUString >& rNames) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Any > aValues(rNames.getLength()); for(sal_Int32 i = 0; i < rNames.getLength(); ++i) @@ -253,22 +253,22 @@ uno::Sequence< uno::Any > SAL_CALL DummyXShape::getPropertyValues( return aValues; } -void SAL_CALL DummyXShape::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException) +void SAL_CALL DummyXShape::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception) { } -void SAL_CALL DummyXShape::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException) +void SAL_CALL DummyXShape::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception) { } void SAL_CALL DummyXShape::firePropertiesChangeEvent( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } OUString SAL_CALL DummyXShape::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString("DummyXShape"); } @@ -292,25 +292,25 @@ uno::Sequence< OUString > listSupportedServices() } uno::Sequence< OUString > SAL_CALL DummyXShape::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return listSupportedServices(); } sal_Bool SAL_CALL DummyXShape::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Reference< uno::XInterface > SAL_CALL DummyXShape::getParent() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return mxParent; } void SAL_CALL DummyXShape::setParent( const uno::Reference< uno::XInterface >& xParent ) - throw(lang::NoSupportException, uno::RuntimeException) + throw(lang::NoSupportException, uno::RuntimeException, std::exception) { mxParent = xParent; } @@ -856,7 +856,7 @@ void DummyText::render() void SAL_CALL DummyText::setPropertyValue( const OUString& rName, const uno::Any& rValue) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { SAL_WARN("chart2.opengl", "property value set after image has been created"); SAL_WARN("chart2.opengl", rName); @@ -864,7 +864,7 @@ void SAL_CALL DummyText::setPropertyValue( const OUString& rName, const uno::Any } void SAL_CALL DummyText::setPosition(const awt::Point& rPosition ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { DummyXShape::setPosition(rPosition); if(maTrans.hasValue()) @@ -908,7 +908,7 @@ DummyGroup2D::DummyGroup2D(const OUString& rName) } awt::Point SAL_CALL DummyGroup2D::getPosition() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { long nTop = std::numeric_limits<long>::max(); long nLeft = std::numeric_limits<long>::max(); @@ -927,7 +927,7 @@ awt::Point SAL_CALL DummyGroup2D::getPosition() } awt::Size SAL_CALL DummyGroup2D::getSize() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { long nTop = std::numeric_limits<long>::max(); long nLeft = std::numeric_limits<long>::max(); @@ -948,7 +948,7 @@ awt::Size SAL_CALL DummyGroup2D::getSize() } void SAL_CALL DummyGroup2D::setPosition( const awt::Point& rPos ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { for(std::vector<DummyXShape*>::const_iterator itr = maShapes.begin(), itrEnd = maShapes.end(); itr != itrEnd; ++itr) @@ -960,7 +960,7 @@ void SAL_CALL DummyGroup2D::setPosition( const awt::Point& rPos ) } void SAL_CALL DummyGroup2D::setSize( const awt::Size& ) - throw( beans::PropertyVetoException, uno::RuntimeException ) + throw( beans::PropertyVetoException, uno::RuntimeException, std::exception ) { SAL_WARN("chart2.opengl", "set size on group shape"); } @@ -995,7 +995,7 @@ DummyChart* DummyChart::getRootShape() return uno::makeAny(uno::Reference<xint>(this)); uno::Any SAL_CALL DummyXShapes::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { QUERY_INTERFACE( drawing::XShapes ); QUERY_INTERFACE( container::XIndexAccess ); @@ -1003,7 +1003,7 @@ uno::Any SAL_CALL DummyXShapes::queryInterface( const uno::Type& rType ) } uno::Any SAL_CALL DummyXShapes::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Any aAny; @@ -1028,7 +1028,7 @@ void DummyXShapes::release() } void SAL_CALL DummyXShapes::add( const uno::Reference< drawing::XShape>& xShape ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { DummyXShape* pChild = dynamic_cast<DummyXShape*>(xShape.get()); assert(pChild); @@ -1038,7 +1038,7 @@ void SAL_CALL DummyXShapes::add( const uno::Reference< drawing::XShape>& xShape } void SAL_CALL DummyXShapes::remove( const uno::Reference< drawing::XShape>& xShape ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { std::vector< uno::Reference<drawing::XShape> >::iterator itr = std::find(maUNOShapes.begin(), maUNOShapes.end(), xShape); if(itr != maUNOShapes.end()) @@ -1053,26 +1053,26 @@ void SAL_CALL DummyXShapes::remove( const uno::Reference< drawing::XShape>& xSha } uno::Type SAL_CALL DummyXShapes::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return ::getCppuType(( const uno::Reference< drawing::XShape >*)0); } sal_Bool SAL_CALL SAL_CALL DummyXShapes::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return !maUNOShapes.empty(); } sal_Int32 SAL_CALL DummyXShapes::getCount() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return maUNOShapes.size(); } uno::Any SAL_CALL DummyXShapes::getByIndex(sal_Int32 nIndex) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { uno::Any aShape; aShape <<= maUNOShapes[nIndex]; @@ -1499,7 +1499,7 @@ void DummyChart::createGLContext() } void SAL_CALL DummyChart::setPosition( const awt::Point& aPosition ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { DummyXShape::setPosition(aPosition); } @@ -1509,7 +1509,7 @@ DummyChart::~DummyChart() } void SAL_CALL DummyChart::setSize( const awt::Size& aSize ) - throw( beans::PropertyVetoException, uno::RuntimeException ) + throw( beans::PropertyVetoException, uno::RuntimeException, std::exception ) { SAL_INFO("chart2.opengl", "DummyChart::setSize()---aSize.Width = " << aSize.Width << ", aSize.Height = " << aSize.Height); int width = aSize.Width / OPENGL_SCALE_VALUE; |