diff options
Diffstat (limited to 'svx/source/unodraw')
26 files changed, 317 insertions, 536 deletions
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 3e0e40f4fced..58fd9c773561 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -142,20 +142,20 @@ namespace { GraphicExporter(); // XFilter - virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL cancel( ) throw(RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) override; + virtual void SAL_CALL cancel( ) override; // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) override; + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XMimeTypeInfo - virtual sal_Bool SAL_CALL supportsMimeType( const OUString& MimeTypeName ) throw (RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedMimeTypeNames( ) throw (RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMimeType( const OUString& MimeTypeName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedMimeTypeNames( ) override; VclPtr<VirtualDevice> CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const; @@ -990,7 +990,6 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, // XFilter sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDescriptor ) - throw(RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1071,7 +1070,6 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes } void SAL_CALL GraphicExporter::cancel() - throw(RuntimeException, std::exception) { } @@ -1079,7 +1077,6 @@ void SAL_CALL GraphicExporter::cancel() /** the source 'document' could be a XDrawPage, a XShape or a generic XShapes */ void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XComponent >& xComponent ) - throw(IllegalArgumentException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1186,26 +1183,23 @@ void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XCompon // XServiceInfo OUString SAL_CALL GraphicExporter::getImplementationName( ) - throw(RuntimeException, std::exception) { return OUString( "com.sun.star.comp.Draw.GraphicExporter" ); } sal_Bool SAL_CALL GraphicExporter::supportsService( const OUString& ServiceName ) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL GraphicExporter::getSupportedServiceNames( ) - throw(RuntimeException, std::exception) { Sequence< OUString > aSupportedServiceNames { "com.sun.star.drawing.GraphicExportFilter" }; return aSupportedServiceNames; } // XMimeTypeInfo -sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& rMimeTypeName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& rMimeTypeName ) { GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); sal_uInt16 nCount = rFilter.GetExportFormatCount(); @@ -1221,7 +1215,7 @@ sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& rMimeTypeNa return false; } -Sequence< OUString > SAL_CALL GraphicExporter::getSupportedMimeTypeNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL GraphicExporter::getSupportedMimeTypeNames( ) { GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); sal_uInt16 nCount = rFilter.GetExportFormatCount(); diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index cf6e850cdb57..4d38ba0961a3 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -73,7 +73,7 @@ void SvxUnoNameItemTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw( dispose(); } -sal_Bool SAL_CALL SvxUnoNameItemTable::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxUnoNameItemTable::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } @@ -91,7 +91,6 @@ void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, cons // XNameContainer void SAL_CALL SvxUnoNameItemTable::insertByName( const OUString& aApiName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -105,7 +104,6 @@ void SAL_CALL SvxUnoNameItemTable::insertByName( const OUString& aApiName, const void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -140,7 +138,6 @@ void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName ) // XNameReplace void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -192,7 +189,6 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons // XNameAccess uno::Any SAL_CALL SvxUnoNameItemTable::getByName( const OUString& aApiName ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -221,7 +217,6 @@ uno::Any SAL_CALL SvxUnoNameItemTable::getByName( const OUString& aApiName ) } uno::Sequence< OUString > SAL_CALL SvxUnoNameItemTable::getElementNames( ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -245,7 +240,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoNameItemTable::getElementNames( ) } sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -269,7 +263,6 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName ) } sal_Bool SAL_CALL SvxUnoNameItemTable::hasElements( ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx index 8cd21000a3c0..53d7355cf408 100644 --- a/svx/source/unodraw/UnoNameItemTable.hxx +++ b/svx/source/unodraw/UnoNameItemTable.hxx @@ -63,22 +63,22 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw () override; // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) throw( css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) override; }; #endif // INCLUDED_SVX_SOURCE_UNODRAW_UNONAMEITEMTABLE_HXX diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 548865e0d01a..5cbbe59fba18 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -57,18 +57,18 @@ namespace svx NamespaceMap( sal_uInt16* pWhichIds, SfxItemPool* pPool ); // XNameAccess - virtual Any SAL_CALL getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getElementNames( ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (RuntimeException, std::exception) override; + virtual Any SAL_CALL getByName( const OUString& aName ) override; + virtual Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) override; + virtual Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; Reference< XInterface > SAL_CALL NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool ) @@ -186,7 +186,7 @@ NamespaceMap::NamespaceMap( sal_uInt16* pWhichIds, SfxItemPool* pPool ) } // XNameAccess -Any SAL_CALL NamespaceMap::getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL NamespaceMap::getByName( const OUString& aName ) { NamespaceIteratorImpl aIter( mpWhichIds, mpPool ); @@ -207,7 +207,7 @@ Any SAL_CALL NamespaceMap::getByName( const OUString& aName ) throw (NoSuchEleme return makeAny( aURL ); } -Sequence< OUString > SAL_CALL NamespaceMap::getElementNames() throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL NamespaceMap::getElementNames() { NamespaceIteratorImpl aIter( mpWhichIds, mpPool ); @@ -222,7 +222,7 @@ Sequence< OUString > SAL_CALL NamespaceMap::getElementNames() throw (RuntimeExce return comphelper::containerToSequence(aPrefixSet); } -sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName ) { NamespaceIteratorImpl aIter( mpWhichIds, mpPool ); @@ -241,12 +241,12 @@ sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName ) throw (Runtim } // XElementAccess -Type SAL_CALL NamespaceMap::getElementType() throw (RuntimeException, std::exception) +Type SAL_CALL NamespaceMap::getElementType() { return ::cppu::UnoType<OUString>::get(); } -sal_Bool SAL_CALL NamespaceMap::hasElements() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL NamespaceMap::hasElements() { NamespaceIteratorImpl aIter( mpWhichIds, mpPool ); @@ -258,19 +258,16 @@ sal_Bool SAL_CALL NamespaceMap::hasElements() throw (RuntimeException, std::exce // XServiceInfo OUString SAL_CALL NamespaceMap::getImplementationName( ) - throw(RuntimeException, std::exception) { return NamespaceMap_getImplementationName(); } sal_Bool SAL_CALL NamespaceMap::supportsService( const OUString& serviceName ) - throw(RuntimeException, std::exception) { return cppu::supportsService( this, serviceName ); } Sequence< OUString > SAL_CALL NamespaceMap::getSupportedServiceNames( ) - throw(RuntimeException, std::exception) { return NamespaceMap_getSupportedServiceNames(); } diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 60758c01d382..7dbd98693f8a 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -54,28 +54,28 @@ public: SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) throw(); /// @throws uno::RuntimeException - virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw(uno::RuntimeException) = 0; + virtual uno::Any getAny( const XPropertyEntry* pEntry ) const = 0; /// @throws uno::RuntimeException /// @throws lang::IllegalArgumentException - virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw(uno::RuntimeException, lang::IllegalArgumentException) = 0; + virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const = 0; // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override; // XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) throw( uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) override; }; SvxUnoXPropertyTable::SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) throw() @@ -93,14 +93,12 @@ const XPropertyEntry* SvxUnoXPropertyTable::get(long index) const // XServiceInfo sal_Bool SAL_CALL SvxUnoXPropertyTable::supportsService( const OUString& ServiceName ) - throw( uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } // XNameContainer void SAL_CALL SvxUnoXPropertyTable::insertByName( const OUString& aName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -120,7 +118,6 @@ void SAL_CALL SvxUnoXPropertyTable::insertByName( const OUString& aName, const } void SAL_CALL SvxUnoXPropertyTable::removeByName( const OUString& Name ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -143,7 +140,6 @@ void SAL_CALL SvxUnoXPropertyTable::removeByName( const OUString& Name ) // XNameReplace void SAL_CALL SvxUnoXPropertyTable::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -170,7 +166,6 @@ void SAL_CALL SvxUnoXPropertyTable::replaceByName( const OUString& aName, const // XNameAccess uno::Any SAL_CALL SvxUnoXPropertyTable::getByName( const OUString& aName ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -190,7 +185,6 @@ uno::Any SAL_CALL SvxUnoXPropertyTable::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL SvxUnoXPropertyTable::getElementNames() - throw( uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -210,7 +204,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXPropertyTable::getElementNames() } sal_Bool SAL_CALL SvxUnoXPropertyTable::hasByName( const OUString& aName ) - throw( uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -230,7 +223,6 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasByName( const OUString& aName ) // XElementAccess sal_Bool SAL_CALL SvxUnoXPropertyTable::hasElements( ) - throw( uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -248,11 +240,11 @@ public: virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw() override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override; + virtual uno::Type SAL_CALL getElementType() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw() @@ -278,18 +270,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXColorTable::createEntry(const OUString& r // XElementAccess uno::Type SAL_CALL SvxUnoXColorTable::getElementType() - throw( uno::RuntimeException, std::exception ) { return ::cppu::UnoType<sal_Int32>::get(); } // XServiceInfo -OUString SAL_CALL SvxUnoXColorTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoXColorTable::getImplementationName( ) { return OUString( "SvxUnoXColorTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.drawing.ColorTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); @@ -304,14 +295,14 @@ public: // SvxUnoXPropertyTable virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw() override; - virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw(lang::IllegalArgumentException) override; + virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override; + virtual uno::Type SAL_CALL getElementType() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXLineEndTable_createInstance( XPropertyList* pTable ) throw() @@ -328,7 +319,7 @@ uno::Any SvxUnoXLineEndTable::getAny( const XPropertyEntry* pEntry ) const throw return uno::Any(aBezier); } -std::unique_ptr<XPropertyEntry> SvxUnoXLineEndTable::createEntry(const OUString& rName, const uno::Any& rAny) const throw(lang::IllegalArgumentException) +std::unique_ptr<XPropertyEntry> SvxUnoXLineEndTable::createEntry(const OUString& rName, const uno::Any& rAny) const { auto pCoords = o3tl::tryAccess<drawing::PolyPolygonBezierCoords>(rAny); if( !pCoords ) @@ -346,18 +337,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXLineEndTable::createEntry(const OUString& // XElementAccess uno::Type SAL_CALL SvxUnoXLineEndTable::getElementType() - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::PolyPolygonBezierCoords>::get(); } // XServiceInfo -OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName( ) { return OUString( "SvxUnoXLineEndTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.drawing.LineEndTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); @@ -375,11 +365,11 @@ public: virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw() override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override; + virtual uno::Type SAL_CALL getElementType() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXDashTable_createInstance( XPropertyList* pTable ) throw() @@ -424,18 +414,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXDashTable::createEntry(const OUString& rN // XElementAccess uno::Type SAL_CALL SvxUnoXDashTable::getElementType() - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::LineDash>::get(); } // XServiceInfo -OUString SAL_CALL SvxUnoXDashTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoXDashTable::getImplementationName( ) { return OUString( "SvxUnoXDashTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.drawing.DashTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); @@ -453,11 +442,11 @@ public: virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw() override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override; + virtual uno::Type SAL_CALL getElementType() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXHatchTable_createInstance( XPropertyList* pTable ) throw() @@ -497,18 +486,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXHatchTable::createEntry(const OUString& r // XElementAccess uno::Type SAL_CALL SvxUnoXHatchTable::getElementType() - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::Hatch>::get(); } // XServiceInfo -OUString SAL_CALL SvxUnoXHatchTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoXHatchTable::getImplementationName( ) { return OUString( "SvxUnoXHatchTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.drawing.HatchTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); @@ -526,11 +514,11 @@ public: virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw() override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override; + virtual uno::Type SAL_CALL getElementType() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXGradientTable_createInstance( XPropertyList* pTable ) throw() @@ -582,18 +570,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXGradientTable::createEntry(const OUString // XElementAccess uno::Type SAL_CALL SvxUnoXGradientTable::getElementType() - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<awt::Gradient>::get(); } // XServiceInfo -OUString SAL_CALL SvxUnoXGradientTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoXGradientTable::getImplementationName( ) { return OUString( "SvxUnoXGradientTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.drawing.GradientTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); @@ -607,15 +594,15 @@ public: explicit SvxUnoXBitmapTable( XPropertyList* pTable ) throw() : SvxUnoXPropertyTable( XATTR_FILLBITMAP, pTable ) {}; // SvxUnoXPropertyTable - virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw(uno::RuntimeException) override; - virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw(uno::RuntimeException) override; + virtual uno::Any getAny( const XPropertyEntry* pEntry ) const override; + virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override; + virtual uno::Type SAL_CALL getElementType() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XPropertyList* pTable ) throw() @@ -624,7 +611,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XP } // SvxUnoXPropertyTable -uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const throw(uno::RuntimeException) +uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const { OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX); const GraphicObject& rGraphicObject(static_cast<const XBitmapEntry*>(pEntry)->GetGraphicObject()); @@ -633,7 +620,7 @@ uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const throw( return uno::Any(aURL); } -std::unique_ptr<XPropertyEntry> SvxUnoXBitmapTable::createEntry(const OUString& rName, const uno::Any& rAny) const throw(uno::RuntimeException) +std::unique_ptr<XPropertyEntry> SvxUnoXBitmapTable::createEntry(const OUString& rName, const uno::Any& rAny) const { OUString aURL; if(!(rAny >>= aURL)) @@ -646,18 +633,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXBitmapTable::createEntry(const OUString& // XElementAccess uno::Type SAL_CALL SvxUnoXBitmapTable::getElementType() - throw( uno::RuntimeException, std::exception ) { return ::cppu::UnoType<OUString>::get(); } // XServiceInfo -OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName( ) { return OUString( "SvxUnoXBitmapTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.drawing.BitmapTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx index 150d5beafa34..9f2953b2f039 100644 --- a/svx/source/unodraw/gluepts.cxx +++ b/svx/source/unodraw/gluepts.cxx @@ -44,33 +44,33 @@ public: explicit SvxUnoGluePointAccess( SdrObject* pObject ) throw(); // XIdentifierContainer - virtual sal_Int32 SAL_CALL insert( const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIdentifier( sal_Int32 Identifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL insert( const uno::Any& aElement ) override; + virtual void SAL_CALL removeByIdentifier( sal_Int32 Identifier ) override; // XIdentifierReplace - virtual void SAL_CALL replaceByIdentifer( sal_Int32 Identifier, const uno::Any& aElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIdentifer( sal_Int32 Identifier, const uno::Any& aElement ) override; // XIdentifierReplace - virtual uno::Any SAL_CALL getByIdentifier( sal_Int32 Identifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual uno::Sequence< sal_Int32 > SAL_CALL getIdentifiers( ) throw (uno::RuntimeException, std::exception) override; + virtual uno::Any SAL_CALL getByIdentifier( sal_Int32 Identifier ) override; + virtual uno::Sequence< sal_Int32 > SAL_CALL getIdentifiers( ) override; /* deprecated */ // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const uno::Any& Element ) throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const uno::Any& Element ) override; + virtual void SAL_CALL removeByIndex( sal_Int32 Index ) override; /* deprecated */ // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const uno::Any& Element ) throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const uno::Any& Element ) override; /* deprecated */ // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(uno::RuntimeException, std::exception) override; - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw( uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; }; static void convert( const SdrGluePoint& rSdrGlue, drawing::GluePoint2& rUnoGlue ) throw() @@ -196,7 +196,7 @@ SvxUnoGluePointAccess::SvxUnoGluePointAccess( SdrObject* pObject ) throw() } // XIdentifierContainer -sal_Int32 SAL_CALL SvxUnoGluePointAccess::insert( const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL SvxUnoGluePointAccess::insert( const uno::Any& aElement ) { if( mpObject.is() ) { @@ -226,7 +226,7 @@ sal_Int32 SAL_CALL SvxUnoGluePointAccess::insert( const uno::Any& aElement ) thr return -1; } -void SAL_CALL SvxUnoGluePointAccess::removeByIdentifier( sal_Int32 Identifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoGluePointAccess::removeByIdentifier( sal_Int32 Identifier ) { if( mpObject.is() && ( Identifier >= NON_USER_DEFINED_GLUE_POINTS )) { @@ -255,7 +255,7 @@ void SAL_CALL SvxUnoGluePointAccess::removeByIdentifier( sal_Int32 Identifier ) } // XIdentifierReplace -void SAL_CALL SvxUnoGluePointAccess::replaceByIdentifer( sal_Int32 Identifier, const uno::Any& aElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoGluePointAccess::replaceByIdentifer( sal_Int32 Identifier, const uno::Any& aElement ) { if( mpObject.is() && mpObject->IsNode() ) { @@ -289,7 +289,7 @@ void SAL_CALL SvxUnoGluePointAccess::replaceByIdentifer( sal_Int32 Identifier, c } // XIdentifierAccess -uno::Any SAL_CALL SvxUnoGluePointAccess::getByIdentifier( sal_Int32 Identifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL SvxUnoGluePointAccess::getByIdentifier( sal_Int32 Identifier ) { if( mpObject.is() && mpObject->IsNode() ) { @@ -329,7 +329,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIdentifier( sal_Int32 Identifier ) throw container::NoSuchElementException(); } -uno::Sequence< sal_Int32 > SAL_CALL SvxUnoGluePointAccess::getIdentifiers() throw (uno::RuntimeException, std::exception) +uno::Sequence< sal_Int32 > SAL_CALL SvxUnoGluePointAccess::getIdentifiers() { if( mpObject.is() ) { @@ -360,8 +360,6 @@ uno::Sequence< sal_Int32 > SAL_CALL SvxUnoGluePointAccess::getIdentifiers() thro // XIndexContainer void SAL_CALL SvxUnoGluePointAccess::insertByIndex( sal_Int32, const uno::Any& Element ) - throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( mpObject.is() ) { @@ -391,7 +389,6 @@ void SAL_CALL SvxUnoGluePointAccess::insertByIndex( sal_Int32, const uno::Any& E } void SAL_CALL SvxUnoGluePointAccess::removeByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( mpObject.is() ) { @@ -417,8 +414,6 @@ void SAL_CALL SvxUnoGluePointAccess::removeByIndex( sal_Int32 Index ) // XIndexReplace void SAL_CALL SvxUnoGluePointAccess::replaceByIndex( sal_Int32 Index, const uno::Any& Element ) - throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { drawing::GluePoint2 aUnoGlue; if(!(Element >>= aUnoGlue)) @@ -444,7 +439,6 @@ void SAL_CALL SvxUnoGluePointAccess::replaceByIndex( sal_Int32 Index, const uno: // XIndexAccess sal_Int32 SAL_CALL SvxUnoGluePointAccess::getCount() - throw(uno::RuntimeException, std::exception) { sal_Int32 nCount = 0; if( mpObject.is() ) @@ -465,7 +459,6 @@ sal_Int32 SAL_CALL SvxUnoGluePointAccess::getCount() } uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( Index >= 0 && mpObject.is() && mpObject->IsNode() ) { @@ -497,13 +490,11 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index ) // XElementAccess uno::Type SAL_CALL SvxUnoGluePointAccess::getElementType() - throw( uno::RuntimeException, std::exception) { return cppu::UnoType<drawing::GluePoint2>::get(); } sal_Bool SAL_CALL SvxUnoGluePointAccess::hasElements() - throw( uno::RuntimeException, std::exception) { return mpObject.is() && mpObject->IsNode(); } diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 90ab28488885..261676b8f4a9 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -80,19 +80,15 @@ class RecoveryUI : public ::cppu::WeakImplHelper< css::lang::XServiceInfo // css.lang.XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; virtual css::uno::Any SAL_CALL dispatchWithReturnValue(const css::util::URL& aURL, - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override; // helper @@ -116,19 +112,16 @@ RecoveryUI::RecoveryUI(const css::uno::Reference< css::uno::XComponentContext >& } OUString SAL_CALL RecoveryUI::getImplementationName() - throw(css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.svx.RecoveryUI"); } sal_Bool SAL_CALL RecoveryUI::supportsService(const OUString& sServiceName) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } css::uno::Sequence< OUString > SAL_CALL RecoveryUI::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > lServiceNames { "com.sun.star.dialog.RecoveryUI" }; return lServiceNames; @@ -136,7 +129,6 @@ css::uno::Sequence< OUString > SAL_CALL RecoveryUI::getSupportedServiceNames() css::uno::Any SAL_CALL RecoveryUI::dispatchWithReturnValue(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& ) - throw(css::uno::RuntimeException, std::exception) { // Internally we use VCL ... every call into vcl based code must // be guarded by locking the global solar mutex. diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx index 7bf166292691..a78b6cc13dee 100644 --- a/svx/source/unodraw/shapeimpl.hxx +++ b/svx/source/unodraw/shapeimpl.hxx @@ -30,17 +30,17 @@ class SvxPluginShape : public SvxOle2Shape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; public: explicit SvxPluginShape( SdrObject* pObj ) throw(); virtual ~SvxPluginShape() throw() override; - 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, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; using SvxUnoTextRangeBase::setPropertyValue; - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override; }; @@ -48,17 +48,17 @@ class SvxAppletShape : public SvxOle2Shape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; public: explicit SvxAppletShape( SdrObject* pObj ) throw(); virtual ~SvxAppletShape() throw() override; - 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, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; using SvxUnoTextRangeBase::setPropertyValue; - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override; }; @@ -66,24 +66,20 @@ class SvxFrameShape : public SvxOle2Shape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; virtual bool getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, - css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; + css::uno::Any& rValue) override; public: explicit SvxFrameShape( SdrObject* pObj ) throw(); virtual ~SvxFrameShape() throw() override; - 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, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; using SvxUnoTextRangeBase::setPropertyValue; - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; - virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) throw (css::uno::RuntimeException, std::exception) override; + virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override; }; @@ -91,8 +87,8 @@ class SvxTableShape : public SvxShape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; virtual void lock() override; virtual void unlock() override; diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index fcf589cb545d..aa31209b4144 100644 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx @@ -49,7 +49,6 @@ bool SvxTableShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { @@ -102,7 +101,6 @@ bool SvxTableShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index 388c2e49c974..5cb461772193 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -44,11 +44,11 @@ public: virtual bool isValid( const NameOrIndex* pItem ) const override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType( ) override; }; SvxUnoBitmapTable::SvxUnoBitmapTable( SdrModel* pModel ) throw() @@ -72,13 +72,12 @@ bool SvxUnoBitmapTable::isValid( const NameOrIndex* pItem ) const return false; } -OUString SAL_CALL SvxUnoBitmapTable::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoBitmapTable::getImplementationName() { return OUString("SvxUnoBitmapTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoBitmapTable::getSupportedServiceNames( ) - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.drawing.BitmapTable" }; return aSNS; @@ -91,7 +90,6 @@ NameOrIndex* SvxUnoBitmapTable::createItem() const throw() // XElementAccess uno::Type SAL_CALL SvxUnoBitmapTable::getElementType( ) - throw( uno::RuntimeException, std::exception ) { return ::cppu::UnoType<OUString>::get(); } diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index 11bb724ef4b3..d97d081430ea 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -40,27 +40,27 @@ public: SvxUnoColorTable(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override; // XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override; - virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw( uno::RuntimeException, std::exception) override; + virtual uno::Sequence< OUString > SAL_CALL getElementNames() override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw( uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; }; SvxUnoColorTable::SvxUnoColorTable() @@ -70,18 +70,17 @@ SvxUnoColorTable::SvxUnoColorTable() XPropertyListType::Color, SvtPathOptions().GetPalettePath(), "")); } -sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } -OUString SAL_CALL SvxUnoColorTable::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoColorTable::getImplementationName() { return OUString("com.sun.star.drawing.SvxUnoColorTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.drawing.ColorTable" }; return aSNS; @@ -89,7 +88,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getSupportedServiceNames() // XNameContainer void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if( hasByName( aName ) ) throw container::ElementExistException(); @@ -105,7 +103,6 @@ void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno:: } void SAL_CALL SvxUnoColorTable::removeByName( const OUString& Name ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { long nIndex = pList.is() ? pList->GetIndex( Name ) : -1; if( nIndex == -1 ) @@ -116,7 +113,6 @@ void SAL_CALL SvxUnoColorTable::removeByName( const OUString& Name ) // XNameReplace void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { sal_Int32 nColor = 0; if( !(aElement >>= nColor) ) @@ -131,7 +127,6 @@ void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno: // XNameAccess uno::Any SAL_CALL SvxUnoColorTable::getByName( const OUString& aName ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { long nIndex = pList.is() ? pList->GetIndex( aName ) : -1; if( nIndex == -1 ) @@ -142,7 +137,6 @@ uno::Any SAL_CALL SvxUnoColorTable::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getElementNames() - throw( uno::RuntimeException, std::exception ) { const long nCount = pList.is() ? pList->Count() : 0; @@ -159,7 +153,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getElementNames() } sal_Bool SAL_CALL SvxUnoColorTable::hasByName( const OUString& aName ) - throw( uno::RuntimeException, std::exception ) { long nIndex = pList.is() ? pList->GetIndex( aName ) : -1; return nIndex != -1; @@ -167,13 +160,11 @@ sal_Bool SAL_CALL SvxUnoColorTable::hasByName( const OUString& aName ) // XElementAccess uno::Type SAL_CALL SvxUnoColorTable::getElementType() - throw( uno::RuntimeException, std::exception ) { return ::cppu::UnoType<sal_Int32>::get(); } sal_Bool SAL_CALL SvxUnoColorTable::hasElements() - throw( uno::RuntimeException, std::exception ) { return pList.is() && pList->Count() != 0; } diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index 5574ec29bf90..786e4d8603d4 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -41,11 +41,11 @@ public: virtual NameOrIndex* createItem() const throw() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType( ) override; }; SvxUnoDashTable::SvxUnoDashTable( SdrModel* pModel ) throw() @@ -53,13 +53,12 @@ SvxUnoDashTable::SvxUnoDashTable( SdrModel* pModel ) throw() { } -OUString SAL_CALL SvxUnoDashTable::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoDashTable::getImplementationName() { return OUString("SvxUnoDashTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoDashTable::getSupportedServiceNames( ) - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.drawing.DashTable" }; return aSNS; @@ -74,7 +73,6 @@ NameOrIndex* SvxUnoDashTable::createItem() const throw() // XElementAccess uno::Type SAL_CALL SvxUnoDashTable::getElementType( ) - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::LineDash>::get(); } diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index 148bc63148c0..2b9b11071398 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -40,11 +40,11 @@ public: virtual NameOrIndex* createItem() const throw() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType( ) override; }; SvxUnoGradientTable::SvxUnoGradientTable( SdrModel* pModel ) throw() @@ -52,13 +52,12 @@ SvxUnoGradientTable::SvxUnoGradientTable( SdrModel* pModel ) throw() { } -OUString SAL_CALL SvxUnoGradientTable::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoGradientTable::getImplementationName() { return OUString("SvxUnoGradientTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoGradientTable::getSupportedServiceNames( ) - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.drawing.GradientTable" }; return aSNS; @@ -73,7 +72,6 @@ NameOrIndex* SvxUnoGradientTable::createItem() const throw() // XElementAccess uno::Type SAL_CALL SvxUnoGradientTable::getElementType( ) - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<awt::Gradient>::get(); } diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index dcfda9772a50..5ada87d34f9f 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -40,11 +40,11 @@ public: virtual NameOrIndex* createItem() const throw() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType( ) override; }; SvxUnoHatchTable::SvxUnoHatchTable( SdrModel* pModel ) throw() @@ -52,13 +52,12 @@ SvxUnoHatchTable::SvxUnoHatchTable( SdrModel* pModel ) throw() { } -OUString SAL_CALL SvxUnoHatchTable::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoHatchTable::getImplementationName() { return OUString("SvxUnoHatchTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoHatchTable::getSupportedServiceNames( ) - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.drawing.HatchTable" }; return aSNS; @@ -71,7 +70,6 @@ NameOrIndex* SvxUnoHatchTable::createItem() const throw() // XElementAccess uno::Type SAL_CALL SvxUnoHatchTable::getElementType( ) - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::Hatch>::get(); } diff --git a/svx/source/unodraw/unomlstr.cxx b/svx/source/unodraw/unomlstr.cxx index e764a10dc35f..bae372d48c73 100644 --- a/svx/source/unodraw/unomlstr.cxx +++ b/svx/source/unodraw/unomlstr.cxx @@ -35,7 +35,7 @@ SvxUnoShapeModifyListener::~SvxUnoShapeModifyListener() throw() } // css::util::XModifyListener -void SAL_CALL SvxUnoShapeModifyListener::modified(const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) +void SAL_CALL SvxUnoShapeModifyListener::modified(const lang::EventObject& ) { SolarMutexGuard aGuard; if( mpObj ) @@ -46,7 +46,7 @@ void SAL_CALL SvxUnoShapeModifyListener::modified(const lang::EventObject& ) thr } // css::lang::XEventListener -void SvxUnoShapeModifyListener::disposing(const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) +void SvxUnoShapeModifyListener::disposing(const lang::EventObject& ) { invalidate(); } diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 55033c62f5ac..5f5fbd251f61 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -75,21 +75,21 @@ public: explicit SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel ) throw(); // XDrawPages - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; //- @@ -196,18 +196,16 @@ css::uno::Reference<css::uno::XInterface> create( } uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance( const OUString& rServiceSpecifier ) - throw( uno::Exception, uno::RuntimeException, std::exception ) { return create(rServiceSpecifier, ""); } -uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField( const OUString& ServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException) +uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField( const OUString& ServiceSpecifier ) { return SvxUnoTextCreateTextField( ServiceSpecifier ); } uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< css::uno::Any >& Arguments ) - throw( uno::Exception, uno::RuntimeException, std::exception ) { OUString arg; if ((ServiceSpecifier == "com.sun.star.drawing.GraphicObjectShape" @@ -220,7 +218,6 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstanceWi } uno::Sequence< OUString > SAL_CALL SvxUnoDrawMSFactory::getAvailableServiceNames() - throw( uno::RuntimeException, std::exception ) { return UHashMap::getServiceNames(); } @@ -257,7 +254,7 @@ SvxUnoDrawingModel::~SvxUnoDrawingModel() throw() { } -uno::Any SAL_CALL SvxUnoDrawingModel::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL SvxUnoDrawingModel::queryInterface( const uno::Type & rType ) { uno::Any aAny; @@ -282,7 +279,7 @@ void SAL_CALL SvxUnoDrawingModel::release() throw ( ) } // XTypeProvider -uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawingModel::getTypes( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawingModel::getTypes( ) { if( maTypeSequence.getLength() == 0 ) { @@ -307,20 +304,18 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawingModel::getTypes( ) throw(uno:: return maTypeSequence; } -uno::Sequence< sal_Int8 > SAL_CALL SvxUnoDrawingModel::getImplementationId( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< sal_Int8 > SAL_CALL SvxUnoDrawingModel::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } void SAL_CALL SvxUnoDrawingModel::lockControllers( ) - throw(uno::RuntimeException, std::exception) { if( mpDoc ) mpDoc->setLock(true); } void SAL_CALL SvxUnoDrawingModel::unlockControllers( ) - throw(uno::RuntimeException, std::exception) { if( mpDoc && mpDoc->isLocked() ) { @@ -329,14 +324,12 @@ void SAL_CALL SvxUnoDrawingModel::unlockControllers( ) } sal_Bool SAL_CALL SvxUnoDrawingModel::hasControllersLocked( ) - throw(uno::RuntimeException, std::exception) { return mpDoc && mpDoc->isLocked(); } // XDrawPagesSupplier uno::Reference< drawing::XDrawPages > SAL_CALL SvxUnoDrawingModel::getDrawPages() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -350,7 +343,6 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SvxUnoDrawingModel::getDrawPages( // XMultiServiceFactory ( SvxFmMSFactory ) uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( const OUString& aServiceSpecifier ) - throw(uno::Exception, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -508,7 +500,6 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( c } uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames() - throw(uno::RuntimeException, std::exception) { const uno::Sequence< OUString > aSNS_ORG( SvxFmMSFactory::getAvailableServiceNames() ); @@ -546,18 +537,16 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames( // lang::XServiceInfo OUString SAL_CALL SvxUnoDrawingModel::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("SvxUnoDrawingModel"); } sal_Bool SAL_CALL SvxUnoDrawingModel::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } -uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames() { OUString aSN("com.sun.star.drawing.DrawingDocument"); uno::Sequence< OUString > aSeq( &aSN, 1 ); @@ -566,7 +555,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames( // XAnyCompareFactory uno::Reference< css::ucb::XAnyCompare > SAL_CALL SvxUnoDrawingModel::createAnyCompareByName( const OUString& ) - throw(uno::RuntimeException, std::exception) { return SvxCreateNumRuleCompare(); } @@ -578,7 +566,6 @@ SvxUnoDrawPagesAccess::SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel ) th // XIndexAccess sal_Int32 SAL_CALL SvxUnoDrawPagesAccess::getCount() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -591,7 +578,6 @@ sal_Int32 SAL_CALL SvxUnoDrawPagesAccess::getCount() } uno::Any SAL_CALL SvxUnoDrawPagesAccess::getByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -625,13 +611,11 @@ uno::Any SAL_CALL SvxUnoDrawPagesAccess::getByIndex( sal_Int32 Index ) // XElementAccess uno::Type SAL_CALL SvxUnoDrawPagesAccess::getElementType() - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<drawing::XDrawPage>::get(); } sal_Bool SAL_CALL SvxUnoDrawPagesAccess::hasElements() - throw(uno::RuntimeException, std::exception) { return getCount() > 0; } @@ -641,7 +625,6 @@ sal_Bool SAL_CALL SvxUnoDrawPagesAccess::hasElements() // create a new page with model at given position // and return corresponding SdDrawPage uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -664,7 +647,6 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewBy } void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -687,17 +669,17 @@ void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDra // XServiceInfo -OUString SAL_CALL SvxUnoDrawPagesAccess::getImplementationName( ) throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SvxUnoDrawPagesAccess::getImplementationName( ) { return OUString( "SvxUnoDrawPagesAccess" ); } -sal_Bool SAL_CALL SvxUnoDrawPagesAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxUnoDrawPagesAccess::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -uno::Sequence< OUString > SAL_CALL SvxUnoDrawPagesAccess::getSupportedServiceNames( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoDrawPagesAccess::getSupportedServiceNames( ) { OUString aService( "com.sun.star.drawing.DrawPages" ); uno::Sequence< OUString > aSeq( &aService, 1 ); diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index ef6ec0776cb0..0796fc768308 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -71,25 +71,25 @@ public: void SAL_CALL ImplInsertByName( const OUString& aName, const uno::Any& aElement ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override; // XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw( uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; }; SvxUnoMarkerTable::SvxUnoMarkerTable( SdrModel* pModel ) throw() @@ -129,18 +129,17 @@ void SvxUnoMarkerTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw() dispose(); } -sal_Bool SAL_CALL SvxUnoMarkerTable::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxUnoMarkerTable::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -OUString SAL_CALL SvxUnoMarkerTable::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoMarkerTable::getImplementationName() { return OUString("SvxUnoMarkerTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getSupportedServiceNames( ) - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.drawing.MarkerTable" }; return aSNS; @@ -166,7 +165,6 @@ void SAL_CALL SvxUnoMarkerTable::ImplInsertByName( const OUString& aName, const // XNameContainer void SAL_CALL SvxUnoMarkerTable::insertByName( const OUString& aApiName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -179,7 +177,6 @@ void SAL_CALL SvxUnoMarkerTable::insertByName( const OUString& aApiName, const u } void SAL_CALL SvxUnoMarkerTable::removeByName( const OUString& aApiName ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -214,7 +211,6 @@ void SAL_CALL SvxUnoMarkerTable::removeByName( const OUString& aApiName ) // XNameReplace void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -298,7 +294,6 @@ static bool getByNameFromPool( const OUString& rSearchName, SfxItemPool* pPool, // XNameAccess uno::Any SAL_CALL SvxUnoMarkerTable::getByName( const OUString& aApiName ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -341,7 +336,6 @@ static void createNamesForPool( SfxItemPool* pPool, sal_uInt16 nWhich, std::set< } uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getElementNames() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -357,7 +351,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getElementNames() } sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -392,13 +385,11 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName ) // XElementAccess uno::Type SAL_CALL SvxUnoMarkerTable::getElementType( ) - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::PointSequence>::get(); } sal_Bool SAL_CALL SvxUnoMarkerTable::hasElements( ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index ac4ed1e44a87..2e5868465298 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -104,7 +104,6 @@ void SvxDrawPage::disposing() throw() // XComponent void SvxDrawPage::dispose() - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -159,7 +158,7 @@ void SvxDrawPage::dispose() } -void SAL_CALL SvxDrawPage::addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL SvxDrawPage::addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) { SolarMutexGuard aGuard; @@ -169,7 +168,7 @@ void SAL_CALL SvxDrawPage::addEventListener( const css::uno::Reference< css::lan mrBHelper.addListener( cppu::UnoType<decltype(aListener)>::get() , aListener ); } -void SAL_CALL SvxDrawPage::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL SvxDrawPage::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) { SolarMutexGuard aGuard; @@ -180,7 +179,6 @@ void SAL_CALL SvxDrawPage::removeEventListener( const css::uno::Reference< css:: } void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -218,13 +216,11 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape } void SAL_CALL SvxDrawPage::addTop( const uno::Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { add(xShape); } void SAL_CALL SvxDrawPage::addBottom( const uno::Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -262,7 +258,6 @@ void SAL_CALL SvxDrawPage::addBottom( const uno::Reference< drawing::XShape >& x } void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -312,7 +307,6 @@ void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape ) // css::container::XIndexAccess sal_Int32 SAL_CALL SvxDrawPage::getCount() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -323,7 +317,6 @@ sal_Int32 SAL_CALL SvxDrawPage::getCount() } uno::Any SAL_CALL SvxDrawPage::getByIndex( sal_Int32 Index ) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -343,13 +336,11 @@ uno::Any SAL_CALL SvxDrawPage::getByIndex( sal_Int32 Index ) // css::container::XElementAccess uno::Type SAL_CALL SvxDrawPage::getElementType() - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::XShape>::get(); } sal_Bool SAL_CALL SvxDrawPage::hasElements() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -412,7 +403,6 @@ void SvxDrawPage::SelectObjectInView( const Reference< drawing::XShape > & xShap } Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference< drawing::XShapes >& xShapes ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -450,7 +440,6 @@ Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference< } void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGroup ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -476,7 +465,6 @@ void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGr } SdrObject *SvxDrawPage::CreateSdrObject_(const Reference< drawing::XShape > & xShape) - throw (css::uno::RuntimeException, std::exception) { sal_uInt16 nType = 0; SdrInventor nInventor; @@ -587,7 +575,6 @@ void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, SdrInventor& rInventor, } SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInventor nInventor, SdrObject *pObj, SvxDrawPage *mpPage, OUString const & referer ) - throw (css::uno::RuntimeException) { SvxShape* pRet = nullptr; switch( nInventor ) @@ -810,7 +797,6 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInvent } Reference< drawing::XShape > SvxDrawPage::CreateShape( SdrObject *pObj ) const - throw (css::uno::RuntimeException, std::exception) { Reference< drawing::XShape > xShape( CreateShapeByTypeAndInventor(pObj->GetObjIdentifier(), pObj->GetObjInventor(), @@ -838,25 +824,23 @@ SdrObject *SvxDrawPage::CreateSdrObject( const Reference< drawing::XShape > & xS } // css::lang::XServiceInfo -OUString SAL_CALL SvxDrawPage::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxDrawPage::getImplementationName() { return OUString("SvxDrawPage"); } sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } -uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() { uno::Sequence<OUString> aSeq { "com.sun.star.drawing.ShapeCollection" }; return aSeq; } SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, SdrInventor nInventor, OUString const & referer) - throw (css::uno::RuntimeException, std::exception) { return SvxDrawPage::CreateShapeByTypeAndInventor( nType, nInventor, nullptr, nullptr, referer ); } diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index 2a56da4fbcca..2bcab15bb261 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -93,7 +93,6 @@ SfxItemPool* SvxUnoDrawPool::getModelPool( bool bReadOnly ) throw() } void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, uno::Any& rValue ) - throw(beans::UnknownPropertyException) { switch( pEntry->mnHandle ) { @@ -148,7 +147,6 @@ void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEn } void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const uno::Any& rValue ) - throw(beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException, std::exception) { uno::Any aValue( rValue ); @@ -199,7 +197,6 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn } void SvxUnoDrawPool::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException ) { SolarMutexGuard aGuard; @@ -214,7 +211,6 @@ void SvxUnoDrawPool::_setPropertyValues( const comphelper::PropertyMapEntry** pp } void SvxUnoDrawPool::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValue ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException ) { SolarMutexGuard aGuard; @@ -229,7 +225,6 @@ void SvxUnoDrawPool::_getPropertyValues( const comphelper::PropertyMapEntry** pp } void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** ppEntries, beans::PropertyState* pStates ) - throw(beans::UnknownPropertyException ) { SolarMutexGuard aGuard; @@ -292,7 +287,6 @@ void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** pp } void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry* pEntry ) - throw(beans::UnknownPropertyException ) { SolarMutexGuard aGuard; @@ -311,7 +305,6 @@ void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry* } uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry* pEntry ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException ) { SolarMutexGuard aGuard; @@ -332,13 +325,11 @@ uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry // XInterface uno::Any SAL_CALL SvxUnoDrawPool::queryInterface( const uno::Type & rType ) - throw( uno::RuntimeException, std::exception ) { return OWeakAggObject::queryInterface( rType ); } uno::Any SAL_CALL SvxUnoDrawPool::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { uno::Any aAny; @@ -369,7 +360,6 @@ void SAL_CALL SvxUnoDrawPool::release() throw ( ) } uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawPool::getTypes() - throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Type > aTypes( 6 ); uno::Type* pTypes = aTypes.getArray(); @@ -385,24 +375,22 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawPool::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL SvxUnoDrawPool::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } // XServiceInfo -sal_Bool SAL_CALL SvxUnoDrawPool::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxUnoDrawPool::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -OUString SAL_CALL SvxUnoDrawPool::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoDrawPool::getImplementationName() { return OUString("SvxUnoDrawPool"); } uno::Sequence< OUString > SAL_CALL SvxUnoDrawPool::getSupportedServiceNames( ) - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.drawing.Defaults" }; return aSNS; diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 71f911202dd5..c92b945cfd73 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1117,7 +1117,7 @@ bool SvxUnoGetResourceRanges( const short nWhich, int& nApiResIds, int& nIntResI } /// @throws std::exception -bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount, OUString& rString ) throw(std::exception) +bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount, OUString& rString ) { // first, calculate the search string length without an optional number behind the name sal_Int32 nLength = rString.getLength(); @@ -1271,7 +1271,7 @@ static const sal_uInt16 SvxUnoColorNameResId[] = }; /// @throws std::exception -bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, OUString& rString ) throw (std::exception) +bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, OUString& rString ) { //We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't //replace "Red Hat 1" with the translation of Red :-) @@ -1302,7 +1302,7 @@ bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uIn /** if the given name is a predefined name for the current language it is replaced by the corresponding api name. */ -OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName) throw(std::exception) +OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName) { OUString aNew = rInternalName; @@ -1335,7 +1335,7 @@ OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rIntern /** if the given name is a predefined api name it is replaced by the predefined name for the current language. */ -OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw(std::exception) +OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) { OUString aNew = rApiName; diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 00d1b62f4030..3c75438f99e6 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -101,12 +101,11 @@ void SvxShapeGroup::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) uno::Any SAL_CALL SvxShapeGroup::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return SvxShape::queryInterface( rType ); } -uno::Any SAL_CALL SvxShapeGroup::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL SvxShapeGroup::queryAggregation( const uno::Type & rType ) { uno::Any aAny; @@ -132,7 +131,6 @@ void SAL_CALL SvxShapeGroup::release() throw ( ) } uno::Sequence< sal_Int8 > SAL_CALL SvxShapeGroup::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -141,31 +139,29 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeGroup::getImplementationId() OUString SAL_CALL SvxShapeGroup::getShapeType() - throw( uno::RuntimeException, std::exception ) { return SvxShape::getShapeType(); } -awt::Point SAL_CALL SvxShapeGroup::getPosition() throw(uno::RuntimeException, std::exception) +awt::Point SAL_CALL SvxShapeGroup::getPosition() { return SvxShape::getPosition(); } -void SAL_CALL SvxShapeGroup::setPosition( const awt::Point& Position ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeGroup::setPosition( const awt::Point& Position ) { SvxShape::setPosition(Position); } -awt::Size SAL_CALL SvxShapeGroup::getSize() throw(uno::RuntimeException, std::exception) +awt::Size SAL_CALL SvxShapeGroup::getSize() { return SvxShape::getSize(); } void SAL_CALL SvxShapeGroup::setSize( const awt::Size& rSize ) - throw(beans::PropertyVetoException, uno::RuntimeException, std::exception) { SvxShape::setSize( rSize ); } @@ -173,14 +169,14 @@ void SAL_CALL SvxShapeGroup::setSize( const awt::Size& rSize ) // drawing::XShapeGroup -void SAL_CALL SvxShapeGroup::enterGroup( ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeGroup::enterGroup( ) { // Todo // pDrView->EnterMarkedGroup(); } -void SAL_CALL SvxShapeGroup::leaveGroup( ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeGroup::leaveGroup( ) { // Todo // pDrView->LeaveOneGroup(); @@ -230,7 +226,6 @@ void SvxShapeGroup::addUnoShape( const uno::Reference< drawing::XShape >& xShape // XShapes void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -240,7 +235,6 @@ void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShap void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -292,7 +286,6 @@ void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xS } void SAL_CALL SvxShapeGroup::addTop( const uno::Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -301,7 +294,6 @@ void SAL_CALL SvxShapeGroup::addTop( const uno::Reference< drawing::XShape >& xS } void SAL_CALL SvxShapeGroup::addBottom( const uno::Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -312,7 +304,7 @@ void SAL_CALL SvxShapeGroup::addBottom( const uno::Reference< drawing::XShape >& // XIndexAccess -sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxShapeGroup::getCount() { ::SolarMutexGuard aGuard; @@ -328,7 +320,6 @@ sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException, std:: uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index ) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -350,13 +341,13 @@ uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index ) // css::container::XElementAccess -uno::Type SAL_CALL SvxShapeGroup::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL SvxShapeGroup::getElementType() { return cppu::UnoType<drawing::XShape>::get(); } -sal_Bool SAL_CALL SvxShapeGroup::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxShapeGroup::hasElements() { ::SolarMutexGuard aGuard; @@ -375,13 +366,11 @@ SvxShapeConnector::~SvxShapeConnector() throw() uno::Any SAL_CALL SvxShapeConnector::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return SvxShapeText::queryInterface( rType ); } uno::Any SAL_CALL SvxShapeConnector::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { uno::Any aAny; @@ -404,13 +393,11 @@ void SAL_CALL SvxShapeConnector::release() throw ( ) // XTypeProvider uno::Sequence< uno::Type > SAL_CALL SvxShapeConnector::getTypes() - throw (uno::RuntimeException, std::exception) { return SvxShape::getTypes(); } uno::Sequence< sal_Int8 > SAL_CALL SvxShapeConnector::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -419,31 +406,29 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeConnector::getImplementationId() OUString SAL_CALL SvxShapeConnector::getShapeType() - throw( uno::RuntimeException, std::exception ) { return SvxShapeText::getShapeType(); } -awt::Point SAL_CALL SvxShapeConnector::getPosition() throw(uno::RuntimeException, std::exception) +awt::Point SAL_CALL SvxShapeConnector::getPosition() { return SvxShapeText::getPosition(); } -void SAL_CALL SvxShapeConnector::setPosition( const awt::Point& Position ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeConnector::setPosition( const awt::Point& Position ) { SvxShapeText::setPosition(Position); } -awt::Size SAL_CALL SvxShapeConnector::getSize() throw(uno::RuntimeException, std::exception) +awt::Size SAL_CALL SvxShapeConnector::getSize() { return SvxShapeText::getSize(); } void SAL_CALL SvxShapeConnector::setSize( const awt::Size& rSize ) - throw(beans::PropertyVetoException, uno::RuntimeException, std::exception) { SvxShapeText::setSize( rSize ); } @@ -451,7 +436,7 @@ void SAL_CALL SvxShapeConnector::setSize( const awt::Size& rSize ) // XConnectorShape -void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType ) throw( uno::RuntimeException, std::exception ) +void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType ) { ::SolarMutexGuard aGuard; @@ -467,7 +452,6 @@ void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XC void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType ) - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -483,7 +467,6 @@ void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XCon void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing::XConnectableShape >& ) - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -496,7 +479,6 @@ void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing: void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::XConnectableShape >& ) - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -520,12 +502,11 @@ SvxShapeControl::~SvxShapeControl() throw() uno::Any SAL_CALL SvxShapeControl::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return SvxShapeText::queryInterface( rType ); } -uno::Any SAL_CALL SvxShapeControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL SvxShapeControl::queryAggregation( const uno::Type & rType ) { uno::Any aAny; @@ -548,13 +529,11 @@ void SAL_CALL SvxShapeControl::release() throw ( ) // XTypeProvider uno::Sequence< uno::Type > SAL_CALL SvxShapeControl::getTypes() - throw (uno::RuntimeException, std::exception) { return SvxShape::getTypes(); } uno::Sequence< sal_Int8 > SAL_CALL SvxShapeControl::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -563,31 +542,29 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeControl::getImplementationId() OUString SAL_CALL SvxShapeControl::getShapeType() - throw( uno::RuntimeException, std::exception ) { return SvxShapeText::getShapeType(); } -awt::Point SAL_CALL SvxShapeControl::getPosition() throw(uno::RuntimeException, std::exception) +awt::Point SAL_CALL SvxShapeControl::getPosition() { return SvxShapeText::getPosition(); } -void SAL_CALL SvxShapeControl::setPosition( const awt::Point& Position ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeControl::setPosition( const awt::Point& Position ) { SvxShapeText::setPosition(Position); } -awt::Size SAL_CALL SvxShapeControl::getSize() throw(uno::RuntimeException, std::exception) +awt::Size SAL_CALL SvxShapeControl::getSize() { return SvxShapeText::getSize(); } void SAL_CALL SvxShapeControl::setSize( const awt::Size& rSize ) - throw(beans::PropertyVetoException, uno::RuntimeException, std::exception) { SvxShapeText::setSize( rSize ); } @@ -596,7 +573,6 @@ void SAL_CALL SvxShapeControl::setSize( const awt::Size& rSize ) // XControlShape Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl() - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -611,7 +587,6 @@ Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl() void SAL_CALL SvxShapeControl::setControl( const Reference< awt::XControlModel >& xControl ) - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -783,7 +758,6 @@ namespace } void SAL_CALL SvxShapeControl::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, std::exception) { OUString aFormsName; if ( lcl_convertPropertyName( aPropertyName, aFormsName ) ) @@ -822,7 +796,6 @@ void SAL_CALL SvxShapeControl::setPropertyValue( const OUString& aPropertyName, } uno::Any SAL_CALL SvxShapeControl::getPropertyValue( const OUString& aPropertyName ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OUString aFormsName; if ( lcl_convertPropertyName( aPropertyName, aFormsName ) ) @@ -871,7 +844,7 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyValue( const OUString& aPropertyNa } // XPropertyState -beans::PropertyState SAL_CALL SvxShapeControl::getPropertyState( const OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) +beans::PropertyState SAL_CALL SvxShapeControl::getPropertyState( const OUString& PropertyName ) { OUString aFormsName; if ( lcl_convertPropertyName( PropertyName, aFormsName ) ) @@ -896,7 +869,7 @@ beans::PropertyState SAL_CALL SvxShapeControl::getPropertyState( const OUString& } } -void SAL_CALL SvxShapeControl::setPropertyToDefault( const OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) +void SAL_CALL SvxShapeControl::setPropertyToDefault( const OUString& PropertyName ) { OUString aFormsName; if ( lcl_convertPropertyName( PropertyName, aFormsName ) ) @@ -920,7 +893,6 @@ void SAL_CALL SvxShapeControl::setPropertyToDefault( const OUString& PropertyNam } uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const OUString& aPropertyName ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { OUString aFormsName; if ( lcl_convertPropertyName( aPropertyName, aFormsName ) ) @@ -976,7 +948,6 @@ SvxShapeCircle::~SvxShapeCircle() throw() } SvxShapePolyPolygon::SvxShapePolyPolygon( SdrObject* pObj , drawing::PolygonKind eNew ) - throw( css::beans::PropertyVetoException, css::lang::IllegalArgumentException) : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_POLYPOLYGON), getSvxMapProvider().GetPropertySet(SVXMAP_POLYPOLYGON, SdrObject::GetGlobalDrawObjectItemPool()) ) , mePolygonKind( eNew ) { @@ -1020,7 +991,7 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c } -bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) +bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -1128,9 +1099,6 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1201,7 +1169,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx } -void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(uno::RuntimeException) +void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) { ::SolarMutexGuard aGuard; @@ -1236,7 +1204,7 @@ SvxShapePolyPolygonBezier::~SvxShapePolyPolygonBezier() throw() } -bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) +bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -1277,7 +1245,7 @@ bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, con } -bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) +bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -1315,7 +1283,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con } -void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(uno::RuntimeException) +void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) { ::SolarMutexGuard aGuard; @@ -1347,7 +1315,7 @@ SvxGraphicObject::~SvxGraphicObject() throw() { } -bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { bool bOk = false; switch( pProperty->nWID ) @@ -1495,7 +1463,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte return true; } -bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -1601,13 +1569,11 @@ SvxCustomShape::~SvxCustomShape() throw() uno::Any SAL_CALL SvxCustomShape::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return SvxShapeText::queryInterface( rType ); } uno::Any SAL_CALL SvxCustomShape::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { css::uno::Any aReturn = SvxShapeText::queryAggregation( rType ); if ( !aReturn.hasValue() ) @@ -1627,13 +1593,11 @@ void SAL_CALL SvxCustomShape::release() throw ( ) uno::Sequence< uno::Type > SAL_CALL SvxCustomShape::getTypes() - throw (uno::RuntimeException, std::exception) { return SvxShapeText::getTypes(); } uno::Sequence< sal_Int8 > SAL_CALL SvxCustomShape::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1641,7 +1605,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxCustomShape::getImplementationId() // css::drawing::XShape -awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, std::exception) +awt::Point SAL_CALL SvxCustomShape::getPosition() { ::SolarMutexGuard aGuard; if ( mpModel && mpObj.is() ) @@ -1724,7 +1688,6 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, std::exception) { ::SolarMutexGuard aGuard; @@ -1805,7 +1768,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c } } -bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -1822,7 +1785,7 @@ bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemP } -void SvxCustomShape::createCustomShapeDefaults( const OUString& rValueType ) throw (css::uno::RuntimeException, std::exception) +void SvxCustomShape::createCustomShapeDefaults( const OUString& rValueType ) { static_cast<SdrObjCustomShape*>(mpObj.get())->MergeDefaultAttributes( &rValueType ); } diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 8a59d737184e..3af24f0f1fb2 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -76,7 +76,7 @@ void Svx3DSceneObject::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) } -uno::Any SAL_CALL Svx3DSceneObject::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL Svx3DSceneObject::queryAggregation( const uno::Type & rType ) { uno::Any aAny; @@ -89,7 +89,7 @@ uno::Any SAL_CALL Svx3DSceneObject::queryAggregation( const uno::Type & rType ) return aAny; } -uno::Any SAL_CALL Svx3DSceneObject::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) +uno::Any SAL_CALL Svx3DSceneObject::queryInterface( const uno::Type & rType ) { return SvxShape::queryInterface( rType ); } @@ -107,14 +107,12 @@ void SAL_CALL Svx3DSceneObject::release() throw ( ) // XTypeProvider uno::Sequence< sal_Int8 > SAL_CALL Svx3DSceneObject::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -143,7 +141,6 @@ void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -184,7 +181,6 @@ void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xSha sal_Int32 SAL_CALL Svx3DSceneObject::getCount() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -197,7 +193,6 @@ sal_Int32 SAL_CALL Svx3DSceneObject::getCount() uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index ) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -219,14 +214,12 @@ uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index ) // css::container::XElementAccess uno::Type SAL_CALL Svx3DSceneObject::getElementType() - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::XShape>::get(); } sal_Bool SAL_CALL Svx3DSceneObject::hasElements() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -292,7 +285,7 @@ struct ImpRememberTransAndRect Rectangle maRect; }; -bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -405,10 +398,6 @@ bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxIte bool Svx3DSceneObject::getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) { switch( pProperty->nWID ) { @@ -453,7 +442,6 @@ bool Svx3DSceneObject::getPropertyValueImpl(const OUString& rName, const SfxItem // css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3DScene"} ); @@ -469,7 +457,7 @@ Svx3DCubeObject::~Svx3DCubeObject() throw() { } -bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { SolarMutexGuard aGuard; @@ -524,7 +512,7 @@ bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItem throw IllegalArgumentException(); } -bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -574,7 +562,6 @@ bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItem // css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3D", @@ -591,7 +578,7 @@ Svx3DSphereObject::~Svx3DSphereObject() throw() { } -bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -635,7 +622,7 @@ bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxIt throw IllegalArgumentException(); } -bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -680,7 +667,6 @@ bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxIt // css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3D", @@ -785,7 +771,7 @@ static void B3dPolyPolygon_to_PolyPolygonShape3D( const basegfx::B3DPolyPolygon& rValue <<= aRetval; } -bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -831,7 +817,7 @@ bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxIte throw IllegalArgumentException(); } -bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -879,7 +865,6 @@ bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxIte // css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3D", @@ -896,7 +881,7 @@ Svx3DExtrudeObject::~Svx3DExtrudeObject() throw() { } -bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -931,7 +916,7 @@ bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxI throw IllegalArgumentException(); } -bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -981,7 +966,6 @@ bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxI // css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3D", @@ -998,7 +982,7 @@ Svx3DPolygonObject::~Svx3DPolygonObject() throw() { } -bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -1071,7 +1055,7 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxI throw IllegalArgumentException(); } -bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -1118,7 +1102,6 @@ bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxI // css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DPolygonObject::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3D", diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index c806e75e27e2..d9c43b7d2353 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -80,7 +80,7 @@ SvxOle2Shape::~SvxOle2Shape() throw() } //XPropertySet -bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -198,7 +198,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPro throw IllegalArgumentException(); } -bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -577,19 +577,19 @@ void SvxAppletShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) SetShapeType( "com.sun.star.drawing.AppletShape" ); } -void SAL_CALL SvxAppletShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SvxAppletShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) { SvxShape::setPropertyValue( aPropertyName, rValue ); resetModifiedState(); } -void SAL_CALL SvxAppletShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SvxAppletShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) { SvxShape::setPropertyValues( aPropertyNames, rValues ); resetModifiedState(); } -bool SvxAppletShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxAppletShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { if( (pProperty->nWID >= OWN_ATTR_APPLET_DOCBASE) && (pProperty->nWID <= OWN_ATTR_APPLET_ISSCRIPT) ) { @@ -610,7 +610,7 @@ bool SvxAppletShape::setPropertyValueImpl( const OUString& rName, const SfxItemP } } -bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { if( (pProperty->nWID >= OWN_ATTR_APPLET_DOCBASE) && (pProperty->nWID <= OWN_ATTR_APPLET_ISSCRIPT) ) { @@ -649,19 +649,19 @@ void SvxPluginShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) SetShapeType( "com.sun.star.drawing.PluginShape" ); } -void SAL_CALL SvxPluginShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SvxPluginShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) { SvxShape::setPropertyValue( aPropertyName, rValue ); resetModifiedState(); } -void SAL_CALL SvxPluginShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SvxPluginShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) { SvxShape::setPropertyValues( aPropertyNames, rValues ); resetModifiedState(); } -bool SvxPluginShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxPluginShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { if( (pProperty->nWID >= OWN_ATTR_PLUGIN_MIMETYPE) && (pProperty->nWID <= OWN_ATTR_PLUGIN_COMMANDS) ) { @@ -682,7 +682,7 @@ bool SvxPluginShape::setPropertyValueImpl( const OUString& rName, const SfxItemP } } -bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { if( (pProperty->nWID >= OWN_ATTR_PLUGIN_MIMETYPE) && (pProperty->nWID <= OWN_ATTR_PLUGIN_COMMANDS) ) { @@ -713,7 +713,7 @@ SvxFrameShape::~SvxFrameShape() throw() { } -void SvxFrameShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw (uno::RuntimeException, std::exception) +void SvxFrameShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) { SvxShape::Create( pNewObj, pNewPage ); const SvGlobalName aIFrameClassId( SO3_IFRAME_CLASSID ); @@ -721,19 +721,19 @@ void SvxFrameShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw (u SetShapeType( "com.sun.star.drawing.FrameShape" ); } -void SAL_CALL SvxFrameShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SvxFrameShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) { SvxShape::setPropertyValue( aPropertyName, rValue ); resetModifiedState(); } -void SAL_CALL SvxFrameShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SvxFrameShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) { SvxShape::setPropertyValues( aPropertyNames, rValues ); resetModifiedState(); } -bool SvxFrameShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxFrameShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { if( (pProperty->nWID >= OWN_ATTR_FRAME_URL) && (pProperty->nWID <= OWN_ATTR_FRAME_MARGIN_HEIGHT) ) { @@ -756,10 +756,6 @@ bool SvxFrameShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr bool SvxFrameShape::getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) { if( (pProperty->nWID >= OWN_ATTR_FRAME_URL) && (pProperty->nWID <= OWN_ATTR_FRAME_MARGIN_HEIGHT) ) { @@ -791,7 +787,7 @@ SvxMediaShape::~SvxMediaShape() throw() } -bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { if( ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM)) || (pProperty->nWID == OWN_ATTR_MEDIA_STREAM) @@ -917,7 +913,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr } -bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { if ( ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM)) diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index bf54674e563c..d20eaef09261 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -171,7 +171,7 @@ protected: } }; -SvxShape::SvxShape( SdrObject* pObject ) throw( uno::RuntimeException ) +SvxShape::SvxShape( SdrObject* pObject ) : maSize(100,100) , mpImpl( new SvxShapeImpl( *this, maMutex ) ) , mbIsMultiPropertyCall(false) @@ -185,7 +185,7 @@ SvxShape::SvxShape( SdrObject* pObject ) throw( uno::RuntimeException ) } -SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) throw( uno::RuntimeException ) +SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) : maSize(100,100) , mpImpl( new SvxShapeImpl( *this, maMutex ) ) , mbIsMultiPropertyCall(false) @@ -199,7 +199,7 @@ SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, } -SvxShape::SvxShape() throw( uno::RuntimeException ) +SvxShape::SvxShape() : maSize(100,100) , mpImpl( new SvxShapeImpl( *this, maMutex ) ) , mbIsMultiPropertyCall(false) @@ -273,7 +273,7 @@ void SvxShape::setMaster( SvxShapeMaster* pMaster ) } -uno::Any SAL_CALL SvxShape::queryAggregation( const uno::Type& rType ) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SvxShape::queryAggregation( const uno::Type& rType ) { if( mpImpl->mpMaster ) { @@ -306,7 +306,7 @@ SvxShape* SvxShape::getImplementation( const uno::Reference< uno::XInterface >& } -sal_Int64 SAL_CALL SvxShape::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SvxShape::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) { @@ -651,7 +651,6 @@ void SvxShape::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet) } uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const - throw (uno::RuntimeException, std::exception) { DBG_TESTSOLARMUTEX(); uno::Any aAny; @@ -702,7 +701,6 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const } uno::Sequence< uno::Type > SAL_CALL SvxShape::getTypes() - throw (uno::RuntimeException, std::exception) { if( mpImpl->mpMaster ) { @@ -716,7 +714,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::getTypes() uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() - throw(uno::RuntimeException) { switch( mpImpl->mnObjId ) { @@ -994,7 +991,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() uno::Sequence< sal_Int8 > SAL_CALL SvxShape::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1113,7 +1109,7 @@ static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect ) } -awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException, std::exception) +awt::Point SAL_CALL SvxShape::getPosition() { ::SolarMutexGuard aGuard; @@ -1136,7 +1132,7 @@ awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException, std::ex } -void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) { ::SolarMutexGuard aGuard; @@ -1166,7 +1162,7 @@ void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::Run } -awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException, std::exception) +awt::Size SAL_CALL SvxShape::getSize() { ::SolarMutexGuard aGuard; @@ -1183,7 +1179,6 @@ awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException, std::excepti void SAL_CALL SvxShape::setSize( const awt::Size& rSize ) - throw(beans::PropertyVetoException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1234,7 +1229,7 @@ void SAL_CALL SvxShape::setSize( const awt::Size& rSize ) // XNamed -OUString SAL_CALL SvxShape::getName( ) throw(css::uno::RuntimeException, std::exception) +OUString SAL_CALL SvxShape::getName( ) { ::SolarMutexGuard aGuard; if( mpObj.is() ) @@ -1248,7 +1243,7 @@ OUString SAL_CALL SvxShape::getName( ) throw(css::uno::RuntimeException, std::e } -void SAL_CALL SvxShape::setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::setName( const OUString& aName ) { ::SolarMutexGuard aGuard; if( mpObj.is() ) @@ -1264,7 +1259,7 @@ void SAL_CALL SvxShape::setName( const OUString& aName ) throw(css::uno::Runtime // XShapeDescriptor -OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SvxShape::getShapeType() { if( !maShapeType.getLength() ) return UHashMap::getNameFromId( mpImpl->mnObjId ); @@ -1275,7 +1270,7 @@ OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException, std::exc // XComponent -void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::dispose() { ::SolarMutexGuard aGuard; @@ -1334,13 +1329,12 @@ void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException, std::exception) void SAL_CALL SvxShape::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw(uno::RuntimeException, std::exception) { mpImpl->maDisposeListeners.addInterface(xListener); } -void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListener >& aListener ) { mpImpl->maDisposeListeners.removeInterface(aListener); } @@ -1349,7 +1343,7 @@ void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListen Reference< beans::XPropertySetInfo > SAL_CALL - SvxShape::getPropertySetInfo() throw(uno::RuntimeException, std::exception) + SvxShape::getPropertySetInfo() { if( mpImpl->mpMaster ) { @@ -1362,33 +1356,33 @@ Reference< beans::XPropertySetInfo > SAL_CALL } Reference< beans::XPropertySetInfo > SAL_CALL - SvxShape::_getPropertySetInfo() throw(uno::RuntimeException) + SvxShape::_getPropertySetInfo() { return mpPropSet->getPropertySetInfo(); } -void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener ) { ::osl::MutexGuard aGuard( maMutex ); mpImpl->maPropertyNotifier.addPropertyChangeListener( _propertyName, _listener ); } -void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener ) { ::osl::MutexGuard aGuard( maMutex ); mpImpl->maPropertyNotifier.removePropertyChangeListener( _propertyName, _listener ); } -void SAL_CALL SvxShape::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) { OSL_FAIL( "SvxShape::addVetoableChangeListener: don't have any vetoable properties, so why ...?" ); } -void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) { OSL_FAIL( "SvxShape::removeVetoableChangeListener: don't have any vetoable properties, so why ...?" ); } @@ -1574,7 +1568,6 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( mpImpl->mpMaster ) { @@ -1587,7 +1580,6 @@ void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const u } void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1701,7 +1693,6 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if ( mpImpl->mpMaster ) return mpImpl->mpMaster->getPropertyValue( PropertyName ); @@ -1711,7 +1702,6 @@ uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName ) uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -1769,7 +1759,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) // XMultiPropertySet -void SAL_CALL SvxShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) { ::SolarMutexGuard aSolarGuard; @@ -1840,7 +1830,7 @@ void SvxShape::endSetPropertyValues() } -css::uno::Sequence< css::uno::Any > SAL_CALL SvxShape::getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Any > SAL_CALL SvxShape::getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) { const sal_Int32 nCount = aPropertyNames.getLength(); const OUString* pNames = aPropertyNames.getConstArray(); @@ -1883,15 +1873,15 @@ css::uno::Sequence< css::uno::Any > SAL_CALL SvxShape::getPropertyValues( const return aRet; } -void SAL_CALL SvxShape::addPropertiesChangeListener( const css::uno::Sequence< OUString >& , const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::addPropertiesChangeListener( const css::uno::Sequence< OUString >& , const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) { } -void SAL_CALL SvxShape::removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) { } -void SAL_CALL SvxShape::firePropertiesChangeEvent( const css::uno::Sequence< OUString >& , const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::firePropertiesChangeEvent( const css::uno::Sequence< OUString >& , const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) { } @@ -1978,7 +1968,6 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE // XPropertyState beans::PropertyState SAL_CALL SvxShape::getPropertyState( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if( mpImpl->mpMaster ) { @@ -1991,7 +1980,6 @@ beans::PropertyState SAL_CALL SvxShape::getPropertyState( const OUString& Proper } beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -2058,7 +2046,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope return eState; } -bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -2501,7 +2489,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl } -bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -2888,7 +2876,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl } -bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) +bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) { if( pProperty->nWID == OWN_ATTR_FILLBMP_MODE ) { @@ -2918,7 +2906,7 @@ bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty } -bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) +bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) { if( pProperty->nWID == OWN_ATTR_FILLBMP_MODE ) { @@ -2939,7 +2927,6 @@ bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProp uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( const uno::Sequence< OUString >& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { const sal_Int32 nCount = aPropertyName.getLength(); const OUString* pNames = aPropertyName.getConstArray(); @@ -2955,7 +2942,6 @@ uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( cons void SAL_CALL SvxShape::setPropertyToDefault( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if( mpImpl->mpMaster ) { @@ -2968,7 +2954,6 @@ void SAL_CALL SvxShape::setPropertyToDefault( const OUString& PropertyName ) } void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -2987,7 +2972,6 @@ void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName ) uno::Any SAL_CALL SvxShape::getPropertyDefault( const OUString& aPropertyName ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( mpImpl->mpMaster ) { @@ -3000,7 +2984,6 @@ uno::Any SAL_CALL SvxShape::getPropertyDefault( const OUString& aPropertyName ) } uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -3026,7 +3009,7 @@ uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName ) } // XMultiPropertyStates -void SvxShape::setAllPropertiesToDefault() throw (uno::RuntimeException, std::exception) +void SvxShape::setAllPropertiesToDefault() { ::SolarMutexGuard aGuard; @@ -3056,7 +3039,6 @@ void SvxShape::setAllPropertiesToDefault() throw (uno::RuntimeException, std::ex void SvxShape::setPropertiesToDefault( const uno::Sequence<OUString>& aPropertyNames ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { for ( sal_Int32 pos = 0; pos < aPropertyNames.getLength(); ++pos ) setPropertyToDefault( aPropertyNames[pos] ); @@ -3064,8 +3046,6 @@ void SvxShape::setPropertiesToDefault( uno::Sequence<uno::Any> SvxShape::getPropertyDefaults( const uno::Sequence<OUString>& aPropertyNames ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { ::std::vector<uno::Any> ret; for ( sal_Int32 pos = 0; pos < aPropertyNames.getLength(); ++pos ) @@ -3077,7 +3057,6 @@ uno::Sequence<uno::Any> SvxShape::getPropertyDefaults( // XServiceInfo OUString SAL_CALL SvxShape::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("SvxShape"); } @@ -3130,7 +3109,6 @@ const char sUNO_service_drawing_MediaShape[] = STAR_NAMESPACE "d uno::Sequence< OUString > SAL_CALL SvxShape::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { if( mpImpl->mpMaster ) { @@ -3143,7 +3121,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::getSupportedServiceNames() } uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() - throw(uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -3697,14 +3674,13 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() return aSeq; } -sal_Bool SAL_CALL SvxShape::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxShape::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } // XGluePointsSupplier uno::Reference< container::XIndexContainer > SAL_CALL SvxShape::getGluePoints() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; uno::Reference< container::XIndexContainer > xGluePoints( mxGluePoints ); @@ -3720,7 +3696,6 @@ uno::Reference< container::XIndexContainer > SAL_CALL SvxShape::getGluePoints() // XChild uno::Reference<uno::XInterface> SAL_CALL SvxShape::getParent() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3749,7 +3724,6 @@ uno::Reference<uno::XInterface> SAL_CALL SvxShape::getParent() } void SAL_CALL SvxShape::setParent( const css::uno::Reference< css::uno::XInterface >& ) - throw(lang::NoSupportException, uno::RuntimeException, std::exception) { throw lang::NoSupportException(); } @@ -3768,7 +3742,7 @@ void SvxShape::unlock() // XActionLockable -sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxShape::isActionLocked( ) { ::SolarMutexGuard aGuard; @@ -3776,7 +3750,7 @@ sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (css::uno::RuntimeException } -void SAL_CALL SvxShape::addActionLock( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::addActionLock( ) { ::SolarMutexGuard aGuard; @@ -3788,7 +3762,7 @@ void SAL_CALL SvxShape::addActionLock( ) throw (css::uno::RuntimeException, std } -void SAL_CALL SvxShape::removeActionLock( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::removeActionLock( ) { ::SolarMutexGuard aGuard; @@ -3800,7 +3774,7 @@ void SAL_CALL SvxShape::removeActionLock( ) throw (css::uno::RuntimeException, } -void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (css::uno::RuntimeException, std::exception ) +void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) { ::SolarMutexGuard aGuard; @@ -3814,7 +3788,7 @@ void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (css::uno::Runti } -sal_Int16 SAL_CALL SvxShape::resetActionLocks( ) throw (css::uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL SvxShape::resetActionLocks( ) { ::SolarMutexGuard aGuard; @@ -3892,14 +3866,12 @@ void SvxShapeText::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) // XInterface uno::Any SAL_CALL SvxShapeText::queryInterface( const uno::Type & rType ) - throw( uno::RuntimeException, std::exception ) { return SvxShape::queryInterface( rType ); } uno::Any SAL_CALL SvxShapeText::queryAggregation( const uno::Type & rType ) - throw( uno::RuntimeException, std::exception ) { uno::Any aAny( SvxShape::queryAggregation( rType ) ); if( aAny.hasValue() ) @@ -3922,19 +3894,19 @@ void SAL_CALL SvxShapeText::release() throw() // XServiceInfo -OUString SAL_CALL SvxShapeText::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxShapeText::getImplementationName() { return OUString("SvxShapeText"); } -uno::Sequence< OUString > SAL_CALL SvxShapeText::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SAL_CALL SvxShapeText::getSupportedServiceNames() { return SvxShape::getSupportedServiceNames(); } -sal_Bool SAL_CALL SvxShapeText::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxShapeText::supportsService( const OUString& ServiceName ) { return cppu::supportsService(static_cast<SvxShape*>(this), ServiceName); } @@ -3942,12 +3914,11 @@ sal_Bool SAL_CALL SvxShapeText::supportsService( const OUString& ServiceName ) t // XTypeProvider uno::Sequence< uno::Type > SAL_CALL SvxShapeText::getTypes() - throw( uno::RuntimeException, std::exception ) { return SvxShape::getTypes(); } -sal_Int64 SAL_CALL SvxShapeText::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SvxShapeText::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { const sal_Int64 nReturn = SvxShape::getSomething( rId ); if( nReturn ) @@ -3958,7 +3929,6 @@ sal_Int64 SAL_CALL SvxShapeText::getSomething( const css::uno::Sequence< sal_Int uno::Sequence< sal_Int8 > SAL_CALL SvxShapeText::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -3982,7 +3952,7 @@ void SvxShapeText::unlock() } // css::text::XTextRange -uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() { ::SolarMutexGuard aGuard; SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr; @@ -3992,7 +3962,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno:: } -uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() { ::SolarMutexGuard aGuard; SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr; @@ -4001,7 +3971,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() throw(uno::Ru return SvxUnoTextBase::getEnd(); } -OUString SAL_CALL SvxShapeText::getString() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SvxShapeText::getString() { ::SolarMutexGuard aGuard; SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr; @@ -4011,7 +3981,7 @@ OUString SAL_CALL SvxShapeText::getString() throw(uno::RuntimeException, std::ex } -void SAL_CALL SvxShapeText::setString( const OUString& aString ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeText::setString( const OUString& aString ) { ::SolarMutexGuard aGuard; SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr; @@ -4021,7 +3991,7 @@ void SAL_CALL SvxShapeText::setString( const OUString& aString ) throw(uno::Runt } // override these for special property handling in subcasses. Return true if property is handled -bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { // HACK-fix #99090# // since SdrTextObj::SetVerticalWriting exchanges @@ -4044,7 +4014,7 @@ bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPro return SvxShape::setPropertyValueImpl( rName, pProperty, rValue ); } -bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { if( pProperty->nWID == SDRATTR_TEXTDIRECTION ) { @@ -4059,12 +4029,12 @@ bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPro return SvxShape::getPropertyValueImpl( rName, pProperty, rValue ); } -bool SvxShapeText::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) +bool SvxShapeText::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) { return SvxShape::getPropertyStateImpl( pProperty, rState ); } -bool SvxShapeText::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) +bool SvxShapeText::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) { return SvxShape::setPropertyToDefaultImpl( pProperty ); } @@ -4078,12 +4048,12 @@ SvxShapeRect::~SvxShapeRect() throw() { } -uno::Any SAL_CALL SvxShapeRect::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL SvxShapeRect::queryInterface( const uno::Type & rType ) { return SvxShapeText::queryInterface( rType ); } -uno::Any SAL_CALL SvxShapeRect::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL SvxShapeRect::queryAggregation( const uno::Type & rType ) { return SvxShapeText::queryAggregation( rType ); } @@ -4100,7 +4070,7 @@ void SAL_CALL SvxShapeRect::release() throw() // XServiceInfo -uno::Sequence< OUString > SvxShapeRect::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SvxShapeRect::getSupportedServiceNames() { return SvxShape::getSupportedServiceNames(); } diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index d370a9c8aab8..a8754dbbb9c9 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -58,26 +58,26 @@ public: virtual void SAL_CALL release() throw() override; // XComponent - virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XShapes - virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; SvxShapeCollection::SvxShapeCollection() throw() @@ -120,7 +120,6 @@ void SvxShapeCollection::release() throw() // XComponent void SvxShapeCollection::dispose() - throw(css::uno::RuntimeException, std::exception) { // An frequently programming error is to release the last // reference to this object in the disposing message. @@ -178,39 +177,38 @@ void SvxShapeCollection::dispose() } // XComponent -void SAL_CALL SvxShapeCollection::addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeCollection::addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) { mrBHelper.addListener( cppu::UnoType<decltype(aListener)>::get() , aListener ); } // XComponent -void SAL_CALL SvxShapeCollection::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeCollection::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) { mrBHelper.removeListener( cppu::UnoType<decltype(aListener)>::get() , aListener ); } // XShapes -void SAL_CALL SvxShapeCollection::add( const Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException, std::exception ) +void SAL_CALL SvxShapeCollection::add( const Reference< drawing::XShape >& xShape ) { maShapeContainer.addInterface( xShape ); } -void SAL_CALL SvxShapeCollection::remove( const uno::Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException, std::exception ) +void SAL_CALL SvxShapeCollection::remove( const uno::Reference< drawing::XShape >& xShape ) { maShapeContainer.removeInterface( xShape ); } -sal_Int32 SAL_CALL SvxShapeCollection::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxShapeCollection::getCount() { return maShapeContainer.getLength(); } uno::Any SAL_CALL SvxShapeCollection::getByIndex( sal_Int32 Index ) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -222,30 +220,28 @@ uno::Any SAL_CALL SvxShapeCollection::getByIndex( sal_Int32 Index ) } // XElementAccess -uno::Type SAL_CALL SvxShapeCollection::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL SvxShapeCollection::getElementType() { return cppu::UnoType<drawing::XShape>::get(); } -sal_Bool SAL_CALL SvxShapeCollection::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxShapeCollection::hasElements() { return getCount() != 0; } // XServiceInfo OUString SAL_CALL SvxShapeCollection::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString("com.sun.star.drawing.SvxShapeCollection"); } sal_Bool SAL_CALL SvxShapeCollection::supportsService( const OUString& ServiceName ) - throw( uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName); } -uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames() { uno::Sequence< OUString > aSeq(2); aSeq.getArray()[0] = "com.sun.star.drawing.Shapes"; diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index f2f9f58a1e61..3f29ce5b39eb 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -40,11 +40,11 @@ public: virtual NameOrIndex* createItem() const throw() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType( ) override; }; SvxUnoTransGradientTable::SvxUnoTransGradientTable( SdrModel* pModel ) throw() @@ -52,13 +52,12 @@ SvxUnoTransGradientTable::SvxUnoTransGradientTable( SdrModel* pModel ) throw() { } -OUString SAL_CALL SvxUnoTransGradientTable::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoTransGradientTable::getImplementationName() { return OUString("SvxUnoTransGradientTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedServiceNames( ) - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.drawing.TransparencyGradientTable" }; return aSNS; @@ -73,7 +72,6 @@ NameOrIndex* SvxUnoTransGradientTable::createItem() const throw() // XElementAccess uno::Type SAL_CALL SvxUnoTransGradientTable::getElementType( ) - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<awt::Gradient>::get(); } |