diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2021-04-30 08:20:03 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2021-05-02 17:02:28 +0200 |
commit | 10d29c390dd58ed629dd27fe5ed35fae28eceec3 (patch) | |
tree | 7476cbb90fff182c5bec0a5a1ef9c41a3ad29f19 /sd | |
parent | a9243e626193ab4efe3a618413886773336a38e6 (diff) |
throw() -> noexcept, part 2/3: Automatic loplugin:noexcept rewrite
Change-Id: I076f16d0536b534abf0ced4d76051eadb4c0e033
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114949
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sd')
60 files changed, 218 insertions, 218 deletions
diff --git a/sd/inc/Annotation.hxx b/sd/inc/Annotation.hxx index 2f36761a9acc..b32a7d1127f4 100644 --- a/sd/inc/Annotation.hxx +++ b/sd/inc/Annotation.hxx @@ -90,8 +90,8 @@ public: // XInterface: virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type) override; - virtual void SAL_CALL acquire() throw () override { ::cppu::WeakComponentImplHelper<css::office::XAnnotation>::acquire(); } - virtual void SAL_CALL release() throw () override { ::cppu::WeakComponentImplHelper<css::office::XAnnotation>::release(); } + virtual void SAL_CALL acquire() noexcept override { ::cppu::WeakComponentImplHelper<css::office::XAnnotation>::acquire(); } + virtual void SAL_CALL release() noexcept override { ::cppu::WeakComponentImplHelper<css::office::XAnnotation>::release(); } // css::beans::XPropertySet: virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index c0dd967e3120..8617eade17e1 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -84,7 +84,7 @@ public: virtual bool SetName(const OUString& rNewName, bool bReindexNow = true) override; // XInterface - virtual void SAL_CALL release( ) throw () override; + virtual void SAL_CALL release( ) noexcept override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx index 4b2d1a751d9e..090cab889b4f 100644 --- a/sd/inc/textapi.hxx +++ b/sd/inc/textapi.hxx @@ -34,7 +34,7 @@ class TextApiObject final : public SvxUnoText public: static rtl::Reference< TextApiObject > create( SdDrawDocument* pDoc ); - virtual ~TextApiObject() throw() override; + virtual ~TextApiObject() noexcept override; /// @throws css::uno::RuntimeException void dispose(); diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index dbf164e41235..81c047b70c8a 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -690,7 +690,7 @@ rtl::Reference<SdStyleSheet> SdStyleSheet::CreateEmptyUserStyle( SfxStyleSheetBa // XInterface -void SAL_CALL SdStyleSheet::release( ) throw () +void SAL_CALL SdStyleSheet::release( ) noexcept { if (osl_atomic_decrement( &m_refCount ) != 0) return; diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index fa4ffc391ea8..ca20ac440db3 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -139,7 +139,7 @@ TextApiObject::TextApiObject( std::unique_ptr<TextAPIEditSource> pEditSource ) { } -TextApiObject::~TextApiObject() throw() +TextApiObject::~TextApiObject() noexcept { dispose(); } diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx index 42f9f5817b5c..bedd492ca2b7 100644 --- a/sd/source/filter/eppt/epptooxml.hxx +++ b/sd/source/filter/eppt/epptooxml.hxx @@ -59,7 +59,7 @@ public: virtual ~PowerPointExport() override; // from FilterBase - virtual bool importDocument() throw() override; + virtual bool importDocument() noexcept override; virtual bool exportDocument() override; // only needed for import, leave them empty, refactor later XmlFilterBase to export and import base? diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index fa1a55ac6b5f..0fad116fd1ea 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -369,7 +369,7 @@ void PowerPointExport::writeDocumentProperties() exportCustomFragments(); } -bool PowerPointExport::importDocument() throw() +bool PowerPointExport::importDocument() noexcept { return false; } diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx index 13e5cea52cca..c7d2f7a8eb09 100644 --- a/sd/source/filter/html/HtmlOptionsDialog.cxx +++ b/sd/source/filter/html/HtmlOptionsDialog.cxx @@ -58,8 +58,8 @@ public: SdHtmlOptionsDialog(); // XInterface - virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() override; + virtual void SAL_CALL acquire() noexcept override; + virtual void SAL_CALL release() noexcept override; // XInitialization virtual void SAL_CALL initialize( const Sequence< Any > & aArguments ) override; @@ -89,12 +89,12 @@ SdHtmlOptionsDialog::SdHtmlOptionsDialog() : { } -void SAL_CALL SdHtmlOptionsDialog::acquire() throw() +void SAL_CALL SdHtmlOptionsDialog::acquire() noexcept { OWeakObject::acquire(); } -void SAL_CALL SdHtmlOptionsDialog::release() throw() +void SAL_CALL SdHtmlOptionsDialog::release() noexcept { OWeakObject::release(); } diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index c754cdc84f53..8436e88f9bc5 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -384,14 +384,14 @@ uno::Any SAL_CALL void SAL_CALL AccessibleDocumentViewBase::acquire() - throw () + noexcept { AccessibleContextBase::acquire (); } void SAL_CALL AccessibleDocumentViewBase::release() - throw () + noexcept { AccessibleContextBase::release (); } diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 15f5c24dc963..fb5ddb5d686b 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -403,13 +403,13 @@ uno::Any SAL_CALL void SAL_CALL AccessibleDrawDocumentView::acquire() - throw () + noexcept { AccessibleDocumentViewBase::acquire (); } void SAL_CALL AccessibleDrawDocumentView::release() - throw () + noexcept { AccessibleDocumentViewBase::release (); } diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 6597faf2c7b9..dab0e22cf251 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -1187,12 +1187,12 @@ Any SAL_CALL MotionPathTag::queryInterface( const css::uno::Type& aType ) return Any(); } -void SAL_CALL MotionPathTag::acquire() throw () +void SAL_CALL MotionPathTag::acquire() noexcept { SimpleReferenceComponent::acquire(); } -void SAL_CALL MotionPathTag::release( ) throw () +void SAL_CALL MotionPathTag::release( ) noexcept { SimpleReferenceComponent::release(); } diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx index 8e12ed71bfb5..715ce4268426 100644 --- a/sd/source/ui/animations/motionpathtag.hxx +++ b/sd/source/ui/animations/motionpathtag.hxx @@ -86,8 +86,8 @@ public: virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) override; virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; - virtual void SAL_CALL acquire( ) throw () override; - virtual void SAL_CALL release( ) throw () override; + virtual void SAL_CALL acquire( ) noexcept override; + virtual void SAL_CALL release( ) noexcept override; private: virtual void addCustomHandles( SdrHdlList& rHandlerList ) override; diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index d05aba6be19b..02087f853f35 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -749,7 +749,7 @@ const css::uno::Sequence< sal_Int8 >& SdTransferable::getUnoTunnelId() return theSdTransferableUnoTunnelId.getSeq(); } -SdTransferable* SdTransferable::getImplementation( const Reference< XInterface >& rxData ) throw() +SdTransferable* SdTransferable::getImplementation( const Reference< XInterface >& rxData ) noexcept { try { diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index d50dd9dc83d3..4494cf35419a 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -133,7 +133,7 @@ const css::uno::Sequence<sal_Int8>& SdPageObjsTLV::SdPageObjsTransferable::getUn } SdPageObjsTLV::SdPageObjsTransferable* SdPageObjsTLV::SdPageObjsTransferable::getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) - throw() + noexcept { try { diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 470d9777f7f6..b2ec80bdee68 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -101,14 +101,14 @@ ConfigurationController::Lock::~Lock() //===== ConfigurationController =============================================== -ConfigurationController::ConfigurationController() throw() +ConfigurationController::ConfigurationController() noexcept : ConfigurationControllerInterfaceBase(MutexOwner::maMutex) , mpImplementation() , mbIsDisposed(false) { } -ConfigurationController::~ConfigurationController() throw() +ConfigurationController::~ConfigurationController() noexcept { } diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx index 088253d5606b..61413ef55dfb 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx @@ -42,7 +42,7 @@ GenericConfigurationChangeRequest::GenericConfigurationChangeRequest ( throw css::lang::IllegalArgumentException(); } -GenericConfigurationChangeRequest::~GenericConfigurationChangeRequest() throw() +GenericConfigurationChangeRequest::~GenericConfigurationChangeRequest() noexcept { } diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx index f46275fb0aaf..7b7fb2bc6bdf 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx @@ -64,7 +64,7 @@ public: rxResourceId, const Mode eMode); - virtual ~GenericConfigurationChangeRequest() throw() override; + virtual ~GenericConfigurationChangeRequest() noexcept override; // XConfigurationChangeOperation diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx index ec927e238003..53c9ddd45049 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.cxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx @@ -25,12 +25,12 @@ using namespace ::com::sun::star::drawing::framework; namespace sd::framework { -UpdateRequest::UpdateRequest() throw() +UpdateRequest::UpdateRequest() noexcept : UpdateRequestInterfaceBase(MutexOwner::maMutex) { } -UpdateRequest::~UpdateRequest() throw() {} +UpdateRequest::~UpdateRequest() noexcept {} void SAL_CALL UpdateRequest::execute(const Reference<XConfiguration>&) { diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx index 68cdecbd3276..3a53b82ae8d9 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.hxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx @@ -46,8 +46,8 @@ class UpdateRequest public UpdateRequestInterfaceBase { public: - UpdateRequest() throw(); - virtual ~UpdateRequest() throw() override; + UpdateRequest() noexcept; + virtual ~UpdateRequest() noexcept override; // XConfigurationChangeOperation diff --git a/sd/source/ui/framework/factories/FrameWindowPane.cxx b/sd/source/ui/framework/factories/FrameWindowPane.cxx index bd0cd6eeb8f3..1f4b387d88ec 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.cxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.cxx @@ -30,7 +30,7 @@ FrameWindowPane::FrameWindowPane(const Reference<XResourceId>& rxPaneId, vcl::Wi { } -FrameWindowPane::~FrameWindowPane() throw() {} +FrameWindowPane::~FrameWindowPane() noexcept {} sal_Bool SAL_CALL FrameWindowPane::isAnchorOnly() { return false; } diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx index a3808ee12042..67da37fdff25 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.hxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx @@ -36,7 +36,7 @@ class FrameWindowPane : public Pane public: FrameWindowPane(const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, vcl::Window* pWindow); - virtual ~FrameWindowPane() throw() override; + virtual ~FrameWindowPane() noexcept override; /** A frame window typically can (and should) exists on its own without children, if only to visualize that something (a view) is missing. diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 6a0e153b5399..b63da87397b3 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -92,7 +92,7 @@ FullScreenPane::FullScreenPane ( mpWindow->GrabFocus(); } -FullScreenPane::~FullScreenPane() throw() +FullScreenPane::~FullScreenPane() noexcept { } diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index 984ca96cfdec..b33804ee5856 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -50,7 +50,7 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, const vcl::Window* pViewShellWindow); - virtual ~FullScreenPane() throw() override; + virtual ~FullScreenPane() noexcept override; virtual void SAL_CALL disposing() override; diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 25d1bcb40e29..4596bd73d6f8 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -35,7 +35,7 @@ namespace sd::framework { Pane::Pane ( const Reference<XResourceId>& rxPaneId, vcl::Window* pWindow) - throw () + noexcept : PaneInterfaceBase(MutexOwner::maMutex), mxPaneId(rxPaneId), mpWindow(pWindow), diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index b01074c3ca74..ff79439786d5 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -100,7 +100,7 @@ ModuleController::ModuleController (const Reference<XComponentContext>& rxContex } } -ModuleController::~ModuleController() throw() +ModuleController::~ModuleController() noexcept { } diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 9fd7f02d92fc..0db25b689cff 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -168,11 +168,11 @@ public: virtual void SAL_CALL acquire() - throw () override; + noexcept override; virtual void SAL_CALL release() - throw () override; + noexcept override; //===== XServiceInfo ==================================================== diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index 376aac51342c..202edd0ea88d 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -85,11 +85,11 @@ public: virtual void SAL_CALL acquire() - throw () override; + noexcept override; virtual void SAL_CALL release() - throw () override; + noexcept override; //===== XAccessibleGroupPosition ========================================= virtual css::uno::Sequence< sal_Int32 > SAL_CALL diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index fe8d52466ba9..2c15e26eb601 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -96,9 +96,9 @@ public: /** Create a new DrawController object for the given ViewShellBase. */ - explicit DrawController (ViewShellBase& rBase) throw(); + explicit DrawController (ViewShellBase& rBase) noexcept; - virtual ~DrawController() throw() override; + virtual ~DrawController() noexcept override; /** Replace the currently used sub controller with the given one. This new sub controller is used from now on for the view (that is the @@ -115,33 +115,33 @@ public: /** Call this method when the VisArea has changed. */ - void FireVisAreaChanged (const ::tools::Rectangle& rVisArea) throw(); + void FireVisAreaChanged (const ::tools::Rectangle& rVisArea) noexcept; /** Call this method when the selection has changed. */ - void FireSelectionChangeListener() throw(); + void FireSelectionChangeListener() noexcept; /** Call this method when the edit mode has changed. */ - void FireChangeEditMode (bool bMasterPageMode) throw(); + void FireChangeEditMode (bool bMasterPageMode) noexcept; /** Call this method when the layer mode has changed. */ - void FireChangeLayerMode (bool bLayerMode) throw(); + void FireChangeLayerMode (bool bLayerMode) noexcept; /** Call this method when there is a new current page. */ - void FireSwitchCurrentPage (SdPage* pCurrentPage) throw(); + void FireSwitchCurrentPage (SdPage* pCurrentPage) noexcept; /** Broadcast a sidebar context change that is caused by a view switch. */ void BroadcastContextChange() const; void NotifyAccUpdate(); - void fireChangeLayer( css::uno::Reference< css::drawing::XLayer>* pCurrentLayer ) throw(); + void fireChangeLayer( css::uno::Reference< css::drawing::XLayer>* pCurrentLayer ) noexcept; // change the parameter to int //void fireSwitchCurrentPage( String pageName) throw(); - void fireSwitchCurrentPage( sal_Int32 pageIndex) throw(); + void fireSwitchCurrentPage( sal_Int32 pageIndex) noexcept; bool IsDisposing() const { return mbDisposing; } /** Return a pointer to the ViewShellBase object that the DrawController diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index f40600f007a5..6b62e4cb2772 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -39,8 +39,8 @@ class SdUnoDrawView final public: SdUnoDrawView ( DrawViewShell& rViewShell, - View& rView) throw(); - virtual ~SdUnoDrawView() throw() override; + View& rView) noexcept; + virtual ~SdUnoDrawView() noexcept override; // XSelectionSupplier @@ -84,10 +84,10 @@ public: css::uno::Reference< css::drawing::XLayer> getActiveLayer() const; private: - bool getMasterPageMode() const throw(); - void setMasterPageMode(bool MasterPageMode_) throw(); - bool getLayerMode() const throw(); - void setLayerMode(bool LayerMode_) throw(); + bool getMasterPageMode() const noexcept; + void setMasterPageMode(bool MasterPageMode_) noexcept; + bool getLayerMode() const noexcept; + void setLayerMode(bool LayerMode_) noexcept; /** Make the specified object the active layer. @param rxLayer The new layer object. @@ -105,7 +105,7 @@ private: css::uno::Any getDrawViewMode() const; - SdXImpressDocument* GetModel() const throw(); + SdXImpressDocument* GetModel() const noexcept; DrawViewShell& mrDrawViewShell; sd::View& mrView; diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index 2ebc56eab62f..ce51a5916486 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -34,8 +34,8 @@ class SdUnoOutlineView { public: SdUnoOutlineView ( - OutlineViewShell& rViewShell) throw(); - virtual ~SdUnoOutlineView() throw() override; + OutlineViewShell& rViewShell) noexcept; + virtual ~SdUnoOutlineView() noexcept override; virtual void SAL_CALL disposing() override; diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index 651f57401532..ce45c447cb99 100644 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx @@ -36,8 +36,8 @@ class SdUnoSlideView { public: SdUnoSlideView ( - slidesorter::SlideSorter& rSlideSorter) throw(); - virtual ~SdUnoSlideView() throw() override; + slidesorter::SlideSorter& rSlideSorter) noexcept; + virtual ~SdUnoSlideView() noexcept override; // XSelectionSupplier diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index 6f6bca8582e4..16549338fc75 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -52,7 +52,7 @@ class WindowUpdater : public utl::ConfigurationListener { public: explicit WindowUpdater(); - virtual ~WindowUpdater() throw() override; + virtual ~WindowUpdater() noexcept override; /** Add the given device to the list of devices which will be updated when one of the monitored values changes. diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index a8f5be5ae35d..da7c45d53c95 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -52,8 +52,8 @@ class ConfigurationController public ConfigurationControllerInterfaceBase { public: - ConfigurationController() throw(); - virtual ~ConfigurationController() throw() override; + ConfigurationController() noexcept; + virtual ~ConfigurationController() noexcept override; ConfigurationController(const ConfigurationController&) = delete; ConfigurationController& operator=(const ConfigurationController&) = delete; diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index a33ef33b8092..260176f9e513 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -90,7 +90,7 @@ private: ModuleController ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); ModuleController (const ModuleController&) = delete; - virtual ~ModuleController() throw() override; + virtual ~ModuleController() noexcept override; /** Called for every entry in the ResourceFactories configuration entry. */ diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index 6a9241f0df5c..5b1c592a6c33 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -65,7 +65,7 @@ public: Pane ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, vcl::Window* pWindow) - throw (); + noexcept; virtual ~Pane() override; virtual void SAL_CALL disposing() override; diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index e85f39b11a86..e57bcb3a367e 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -361,7 +361,7 @@ public: NavigatorDragType GetDragType() const { return meDragType;} static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); - static SdPageObjsTransferable* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) throw(); + static SdPageObjsTransferable* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) noexcept; /** Return a temporary transferable data flavor that is used internally in the navigator for reordering entries. Its lifetime ends with the office application. diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 9ff584a4935b..1c95efb35646 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -71,7 +71,7 @@ public: bool SetTableRTF( SdDrawDocument* ); static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); - static SdTransferable* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) throw(); + static SdTransferable* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) noexcept; // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index f5a02cbee597..8cfa5a81d06a 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -128,7 +128,7 @@ protected: public: SdXImpressDocument(::sd::DrawDocShell* pShell, bool bClipBoard); SdXImpressDocument(SdDrawDocument* pDoc, bool bClipBoard); - virtual ~SdXImpressDocument() throw() override; + virtual ~SdXImpressDocument() noexcept override; static rtl::Reference< SdXImpressDocument > GetModel( SdDrawDocument const & rDoc ); @@ -140,7 +140,7 @@ public: SdDrawDocument* GetDoc() const { return mpDoc; } bool IsImpressDocument() const { return mbImpressDoc; } - void SetModified() throw(); + void SetModified() noexcept; css::uno::Reference< css::i18n::XForbiddenCharacters > getForbiddenCharsTable(); @@ -151,8 +151,8 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() override; + virtual void SAL_CALL acquire() noexcept override; + virtual void SAL_CALL release() noexcept override; // XModel virtual void SAL_CALL lockControllers( ) override; @@ -298,8 +298,8 @@ private: SdXImpressDocument* mpModel; public: - SdDrawPagesAccess( SdXImpressDocument& rMyModel ) throw(); - virtual ~SdDrawPagesAccess() throw() override; + SdDrawPagesAccess( SdXImpressDocument& rMyModel ) noexcept; + virtual ~SdDrawPagesAccess() noexcept override; // XDrawPages virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) override; @@ -339,8 +339,8 @@ private: SdXImpressDocument* mpModel; public: - SdMasterPagesAccess( SdXImpressDocument& rMyModel ) throw(); - virtual ~SdMasterPagesAccess() throw() override; + SdMasterPagesAccess( SdXImpressDocument& rMyModel ) noexcept; + virtual ~SdMasterPagesAccess() noexcept override; // XDrawPages virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) override; @@ -376,8 +376,8 @@ private: SdXImpressDocument* mpModel; public: - SdDocLinkTargets( SdXImpressDocument& rMyModel ) throw(); - virtual ~SdDocLinkTargets() throw() override; + SdDocLinkTargets( SdXImpressDocument& rMyModel ) noexcept; + virtual ~SdDocLinkTargets() noexcept override; // XNameAccess virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx index 85f7260a3e9e..bfebde089100 100644 --- a/sd/source/ui/inc/unopage.hxx +++ b/sd/source/ui/inc/unopage.hxx @@ -82,7 +82,7 @@ protected: bool IsImpressDocument() const; - virtual void disposing() throw() override; + virtual void disposing() noexcept override; css::uno::Any getNavigationOrder(); void setNavigationOrder( const css::uno::Any& rValue ); @@ -92,7 +92,7 @@ protected: public: SdGenericDrawPage(SdXImpressDocument* pModel, SdPage* pInPage, const SvxItemPropertySet* pSet); - virtual ~SdGenericDrawPage() throw() override; + virtual ~SdGenericDrawPage() noexcept override; // intern bool isValid() const { return (SvxDrawPage::mpPage != nullptr) && (mpModel != nullptr); } @@ -100,7 +100,7 @@ public: SdPage* GetPage() const { return static_cast<SdPage*>(SvxDrawPage::mpPage); } SdXImpressDocument* GetModel() const; - static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() noexcept; virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; // this is called whenever a SdrObject must be created for an empty api shape wrapper @@ -111,7 +111,7 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL release() throw() override; + virtual void SAL_CALL release() noexcept override; // XShapeCombiner virtual css::uno::Reference< css::drawing::XShape > SAL_CALL combine( const css::uno::Reference< css::drawing::XShapes >& xShapes ) override; @@ -168,7 +168,7 @@ protected: virtual void getBackground( css::uno::Any& rValue ) override; public: SdDrawPage(SdXImpressDocument* pModel, SdPage* pInPage); - virtual ~SdDrawPage() throw() override; + virtual ~SdDrawPage() noexcept override; UNO3_GETIMPLEMENTATION_DECL( SdDrawPage ) @@ -178,8 +178,8 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() override; + virtual void SAL_CALL acquire() noexcept override; + virtual void SAL_CALL release() noexcept override; // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; @@ -229,14 +229,14 @@ protected: public: SdMasterPage(SdXImpressDocument* pModel, SdPage* pInPage); - virtual ~SdMasterPage() throw() override; + virtual ~SdMasterPage() noexcept override; UNO3_GETIMPLEMENTATION_DECL(SdMasterPage) // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() override; + virtual void SAL_CALL acquire() noexcept override; + virtual void SAL_CALL release() noexcept override; // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; @@ -279,11 +279,11 @@ private: SdGenericDrawPage* mpUnoPage; public: - SdPageLinkTargets( SdGenericDrawPage* pUnoPage ) throw(); - virtual ~SdPageLinkTargets() throw() override; + SdPageLinkTargets( SdGenericDrawPage* pUnoPage ) noexcept; + virtual ~SdPageLinkTargets() noexcept override; // intern - SdrObject* FindObject( std::u16string_view rName ) const throw(); + SdrObject* FindObject( std::u16string_view rName ) const noexcept; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index 32e315692101..2f1df481e9ba 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -43,17 +43,17 @@ protected: css::drawing::XDrawPage* mpPage; css::uno::Reference< css::text::XTextRange > Search( const css::uno::Reference< css::text::XTextRange >& xText, SdUnoSearchReplaceDescriptor* pDescr ); - bool Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) throw(); - static ESelection GetSelection( const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw(); - static css::uno::Reference< css::drawing::XShape > GetShape( const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw(); - css::uno::Reference< css::drawing::XShape > GetNextShape( const css::uno::Reference< css::container::XIndexAccess >& xShapes, const css::uno::Reference< css::drawing::XShape >& xCurrentShape ) throw(); - css::uno::Reference< css::drawing::XShape > GetCurrentShape() const throw(); + bool Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) noexcept; + static ESelection GetSelection( const css::uno::Reference< css::text::XTextRange >& xTextRange ) noexcept; + static css::uno::Reference< css::drawing::XShape > GetShape( const css::uno::Reference< css::text::XTextRange >& xTextRange ) noexcept; + css::uno::Reference< css::drawing::XShape > GetNextShape( const css::uno::Reference< css::container::XIndexAccess >& xShapes, const css::uno::Reference< css::drawing::XShape >& xCurrentShape ) noexcept; + css::uno::Reference< css::drawing::XShape > GetCurrentShape() const noexcept; public: // danger, this c'tor is only usable if the given shape or page is derived // from this class!!! - SdUnoSearchReplaceShape( css::drawing::XDrawPage* xPage ) throw(); - virtual ~SdUnoSearchReplaceShape() throw(); + SdUnoSearchReplaceShape( css::drawing::XDrawPage* xPage ) noexcept; + virtual ~SdUnoSearchReplaceShape() noexcept; // XReplaceable virtual css::uno::Reference< css::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor( ) override; @@ -86,7 +86,7 @@ protected: public: /// @throws css::uno::RuntimeException SdUnoSearchReplaceDescriptor(); - virtual ~SdUnoSearchReplaceDescriptor() throw() override; + virtual ~SdUnoSearchReplaceDescriptor() noexcept override; bool IsCaseSensitive() const { return mbCaseSensitive; } bool IsWords() const { return mbWords; } @@ -120,8 +120,8 @@ class SdUnoFindAllAccess final : public ::cppu::WeakImplHelper< css::container:: css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > maSequence; public: - SdUnoFindAllAccess( css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > const & rSequence ) throw(); - virtual ~SdUnoFindAllAccess() throw() override; + SdUnoFindAllAccess( css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > const & rSequence ) noexcept; + virtual ~SdUnoFindAllAccess() noexcept override; // XIndexAccess virtual sal_Int32 SAL_CALL getCount() override ; diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 019d00221802..fdd2e0f78378 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -58,7 +58,7 @@ using vcl::EnumContext; namespace sd { -DrawController::DrawController (ViewShellBase& rBase) throw() +DrawController::DrawController (ViewShellBase& rBase) noexcept : DrawControllerInterfaceBase(&rBase), BroadcastHelperOwner(SfxBaseController::m_aMutex), OPropertySetHelper(BroadcastHelperOwner::maBroadcastHelper), @@ -78,7 +78,7 @@ DrawController::DrawController (ViewShellBase& rBase) throw() ProvideFrameworkControllers(); } -DrawController::~DrawController() throw() +DrawController::~DrawController() noexcept { } @@ -326,7 +326,7 @@ Reference< drawing::XDrawPage > SAL_CALL DrawController::getCurrentPage() return xPage; } -void DrawController::FireVisAreaChanged (const ::tools::Rectangle& rVisArea) throw() +void DrawController::FireVisAreaChanged (const ::tools::Rectangle& rVisArea) noexcept { if( maLastVisArea == rVisArea ) return; @@ -350,7 +350,7 @@ void DrawController::FireVisAreaChanged (const ::tools::Rectangle& rVisArea) thr maLastVisArea = rVisArea; } -void DrawController::FireSelectionChangeListener() throw() +void DrawController::FireSelectionChangeListener() noexcept { OInterfaceContainerHelper * pLC = BroadcastHelperOwner::maBroadcastHelper.getContainer( m_aSelectionTypeIdentifier); @@ -377,7 +377,7 @@ void DrawController::FireSelectionChangeListener() throw() } } -void DrawController::FireChangeEditMode (bool bMasterPageMode) throw() +void DrawController::FireChangeEditMode (bool bMasterPageMode) noexcept { if (bMasterPageMode != mbMasterPageMode ) { @@ -390,7 +390,7 @@ void DrawController::FireChangeEditMode (bool bMasterPageMode) throw() } } -void DrawController::FireChangeLayerMode (bool bLayerMode) throw() +void DrawController::FireChangeLayerMode (bool bLayerMode) noexcept { if (bLayerMode != mbLayerMode) { @@ -403,7 +403,7 @@ void DrawController::FireChangeLayerMode (bool bLayerMode) throw() } } -void DrawController::FireSwitchCurrentPage (SdPage* pNewCurrentPage) throw() +void DrawController::FireSwitchCurrentPage (SdPage* pNewCurrentPage) noexcept { rtl::Reference<SdrPage> pCurrentPage = mpCurrentPage.get(); if (pNewCurrentPage == pCurrentPage.get()) @@ -438,7 +438,7 @@ void DrawController::NotifyAccUpdate() fire (&nHandle, &aNewValue, &aOldValue, 1, false); } -void DrawController::fireChangeLayer( css::uno::Reference< css::drawing::XLayer>* pCurrentLayer ) throw() +void DrawController::fireChangeLayer( css::uno::Reference< css::drawing::XLayer>* pCurrentLayer ) noexcept { if( pCurrentLayer != mpCurrentLayer ) { @@ -456,7 +456,7 @@ void DrawController::fireChangeLayer( css::uno::Reference< css::drawing::XLayer> // This method is only called in slide show and outline view //void DrawController::fireSwitchCurrentPage(String pageName ) throw() -void DrawController::fireSwitchCurrentPage(sal_Int32 pageIndex ) throw() +void DrawController::fireSwitchCurrentPage(sal_Int32 pageIndex ) noexcept { Any aNewValue; Any aOldValue; diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index e66c572a70a9..7c0de17775ce 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -51,23 +51,23 @@ namespace sd { SdUnoDrawView::SdUnoDrawView( DrawViewShell& rViewShell, - View& rView) throw() + View& rView) noexcept : DrawSubControllerInterfaceBase(m_aMutex), mrDrawViewShell(rViewShell), mrView(rView) { } -SdUnoDrawView::~SdUnoDrawView() throw() +SdUnoDrawView::~SdUnoDrawView() noexcept { } -bool SdUnoDrawView::getMasterPageMode() const throw() +bool SdUnoDrawView::getMasterPageMode() const noexcept { return (mrDrawViewShell.GetEditMode() == EditMode::MasterPage); } -void SdUnoDrawView::setMasterPageMode (bool bMasterPageMode) throw() +void SdUnoDrawView::setMasterPageMode (bool bMasterPageMode) noexcept { if ((mrDrawViewShell.GetEditMode() == EditMode::MasterPage) != bMasterPageMode) { @@ -77,12 +77,12 @@ void SdUnoDrawView::setMasterPageMode (bool bMasterPageMode) throw() } } -bool SdUnoDrawView::getLayerMode() const throw() +bool SdUnoDrawView::getLayerMode() const noexcept { return mrDrawViewShell.IsLayerModeActive(); } -void SdUnoDrawView::setLayerMode (bool bLayerMode) throw() +void SdUnoDrawView::setLayerMode (bool bLayerMode) noexcept { if (mrDrawViewShell.IsLayerModeActive() != bLayerMode) { @@ -505,7 +505,7 @@ void SdUnoDrawView::SetZoomType ( sal_Int16 nType ) { &aZoomItem }); } -SdXImpressDocument* SdUnoDrawView::GetModel() const throw() +SdXImpressDocument* SdUnoDrawView::GetModel() const noexcept { if (mrView.GetDocSh()!=nullptr) { diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx index 4d066898a7d3..93c5bcc647cb 100644 --- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx +++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx @@ -33,13 +33,13 @@ using namespace ::com::sun::star::uno; namespace sd { SdUnoOutlineView::SdUnoOutlineView( - OutlineViewShell& rViewShell) throw() + OutlineViewShell& rViewShell) noexcept : DrawSubControllerInterfaceBase(m_aMutex), mrOutlineViewShell(rViewShell) { } -SdUnoOutlineView::~SdUnoOutlineView() throw() +SdUnoOutlineView::~SdUnoOutlineView() noexcept { } diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx index 52141ff6fc8a..1055d51b1cc3 100644 --- a/sd/source/ui/unoidl/SdUnoSlideView.cxx +++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx @@ -37,13 +37,13 @@ using namespace ::com::sun::star::uno; namespace sd { SdUnoSlideView::SdUnoSlideView ( - slidesorter::SlideSorter& rSlideSorter) throw() + slidesorter::SlideSorter& rSlideSorter) noexcept : DrawSubControllerInterfaceBase(m_aMutex), mrSlideSorter(rSlideSorter) { } -SdUnoSlideView::~SdUnoSlideView() throw() +SdUnoSlideView::~SdUnoSlideView() noexcept { } diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index f7265afc3844..666fbacdf623 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -77,8 +77,8 @@ namespace sd // XInterface virtual Any SAL_CALL queryInterface( const Type& aType ) override; - virtual void SAL_CALL acquire( ) throw () override; - virtual void SAL_CALL release( ) throw () override; + virtual void SAL_CALL acquire( ) noexcept override; + virtual void SAL_CALL release( ) noexcept override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; @@ -126,7 +126,7 @@ namespace sd } Reference< XInterface > DocumentSettings_createInstance( SdXImpressDocument* pModel ) - throw () + noexcept { DBG_ASSERT( pModel, "I need a model for the DocumentSettings!" ); return static_cast<XWeak*>(new DocumentSettings( pModel )); @@ -1313,12 +1313,12 @@ Any SAL_CALL DocumentSettings::queryInterface( const Type& aType ) return WeakImplHelper< XPropertySet, XMultiPropertySet, XServiceInfo >::queryInterface( aType ); } -void SAL_CALL DocumentSettings::acquire( ) throw () +void SAL_CALL DocumentSettings::acquire( ) noexcept { WeakImplHelper< XPropertySet, XMultiPropertySet, XServiceInfo >::acquire(); } -void SAL_CALL DocumentSettings::release( ) throw () +void SAL_CALL DocumentSettings::release( ) noexcept { WeakImplHelper< XPropertySet, XMultiPropertySet, XServiceInfo >::release(); } diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.hxx b/sd/source/ui/unoidl/UnoDocumentSettings.hxx index 29de91941503..bba3c66b1bff 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.hxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.hxx @@ -31,7 +31,7 @@ class SdXImpressDocument; namespace sd { css::uno::Reference<css::uno::XInterface> -DocumentSettings_createInstance(SdXImpressDocument* pDoc) throw(); +DocumentSettings_createInstance(SdXImpressDocument* pDoc) noexcept; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index ff169dc9b13d..27716bd781a6 100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -40,21 +40,21 @@ uno::Reference< uno::XInterface > createUnoCustomShow( SdCustomShow* pShow ) return static_cast<cppu::OWeakObject*>(new SdXCustomPresentation( pShow )); } -SdXCustomPresentation::SdXCustomPresentation() throw() +SdXCustomPresentation::SdXCustomPresentation() noexcept : mpSdCustomShow(nullptr), mpModel(nullptr), aDisposeListeners( aDisposeContainerMutex ), bDisposing( false ) { } -SdXCustomPresentation::SdXCustomPresentation( SdCustomShow* pShow) throw() +SdXCustomPresentation::SdXCustomPresentation( SdCustomShow* pShow) noexcept : mpSdCustomShow(pShow), mpModel(nullptr), aDisposeListeners( aDisposeContainerMutex ), bDisposing( false ) { } -SdXCustomPresentation::~SdXCustomPresentation() throw() +SdXCustomPresentation::~SdXCustomPresentation() noexcept { } @@ -260,12 +260,12 @@ void SAL_CALL SdXCustomPresentation::removeEventListener( const uno::Reference< * public UsrObject * *===========================================================================*/ -SdXCustomPresentationAccess::SdXCustomPresentationAccess(SdXImpressDocument& rMyModel) throw() +SdXCustomPresentationAccess::SdXCustomPresentationAccess(SdXImpressDocument& rMyModel) noexcept : mrModel(rMyModel) { } -SdXCustomPresentationAccess::~SdXCustomPresentationAccess() throw() +SdXCustomPresentationAccess::~SdXCustomPresentationAccess() noexcept { } @@ -429,7 +429,7 @@ sal_Bool SAL_CALL SdXCustomPresentationAccess::hasElements() return pList && !pList->empty(); } -SdCustomShow * SdXCustomPresentationAccess::getSdCustomShow( std::u16string_view rName ) const throw() +SdCustomShow * SdXCustomPresentationAccess::getSdCustomShow( std::u16string_view rName ) const noexcept { sal_uInt32 nIdx = 0; diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index 5a9cbad7768d..0ac1c4e74ed3 100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -53,14 +53,14 @@ private: bool bDisposing; public: - SdXCustomPresentation() throw(); - explicit SdXCustomPresentation( SdCustomShow* mpSdCustomShow ) throw(); - virtual ~SdXCustomPresentation() throw() override; + SdXCustomPresentation() noexcept; + explicit SdXCustomPresentation( SdCustomShow* mpSdCustomShow ) noexcept; + virtual ~SdXCustomPresentation() noexcept override; // internal - SdCustomShow* GetSdCustomShow() const throw() { return mpSdCustomShow; } - void SetSdCustomShow( SdCustomShow* pShow ) throw() { mpSdCustomShow = pShow; } - SdXImpressDocument* GetModel() const throw() { return mpModel; } + SdCustomShow* GetSdCustomShow() const noexcept { return mpSdCustomShow; } + void SetSdCustomShow( SdCustomShow* pShow ) noexcept { mpSdCustomShow = pShow; } + SdXImpressDocument* GetModel() const noexcept { return mpModel; } // uno helper UNO3_GETIMPLEMENTATION_DECL(SdXCustomPresentation) @@ -103,12 +103,12 @@ private: SdXImpressDocument& mrModel; // intern - inline SdCustomShowList* GetCustomShowList() const throw(); - SdCustomShow * getSdCustomShow( std::u16string_view Name ) const throw(); + inline SdCustomShowList* GetCustomShowList() const noexcept; + SdCustomShow * getSdCustomShow( std::u16string_view Name ) const noexcept; public: - explicit SdXCustomPresentationAccess(SdXImpressDocument& rMyModel) throw(); - virtual ~SdXCustomPresentationAccess() throw() override; + explicit SdXCustomPresentationAccess(SdXImpressDocument& rMyModel) noexcept; + virtual ~SdXCustomPresentationAccess() noexcept override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; @@ -136,7 +136,7 @@ public: virtual sal_Bool SAL_CALL hasElements() override; }; -inline SdCustomShowList* SdXCustomPresentationAccess::GetCustomShowList() const throw() +inline SdCustomShowList* SdXCustomPresentationAccess::GetCustomShowList() const noexcept { if(mrModel.GetDoc()) return mrModel.GetDoc()->GetCustomShowList(); diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index dabcd24f0af2..eb84735296da 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -83,7 +83,7 @@ SdLayer::SdLayer(SdLayerManager* pLayerManager_, SdrLayer* pSdrLayer_) // from view. } -SdLayer::~SdLayer() throw() +SdLayer::~SdLayer() noexcept { } @@ -227,7 +227,7 @@ void SAL_CALL SdLayer::removePropertyChangeListener( const OUString& , const uno void SAL_CALL SdLayer::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {} void SAL_CALL SdLayer::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {} -bool SdLayer::get( LayerAttribute what ) throw() +bool SdLayer::get( LayerAttribute what ) noexcept { if(pLayer && mxLayerManager.is()) { @@ -273,7 +273,7 @@ bool SdLayer::get( LayerAttribute what ) throw() return false; //TODO: uno::Exception? } -void SdLayer::set( LayerAttribute what, bool flag ) throw() +void SdLayer::set( LayerAttribute what, bool flag ) noexcept { if(!(pLayer && mxLayerManager.is())) return; @@ -367,13 +367,13 @@ void SAL_CALL SdLayer::removeEventListener( const uno::Reference< lang::XEventLi } // class SdLayerManager -SdLayerManager::SdLayerManager( SdXImpressDocument& rMyModel ) throw() +SdLayerManager::SdLayerManager( SdXImpressDocument& rMyModel ) noexcept :mpModel( &rMyModel) { mpLayers.reset(new SvUnoWeakContainer); } -SdLayerManager::~SdLayerManager() throw() +SdLayerManager::~SdLayerManager() noexcept { dispose(); } @@ -618,7 +618,7 @@ sal_Bool SAL_CALL SdLayerManager::hasElements() * If something was changed at the layers, this methods takes care that the * changes are made visible in sdbcx::View. */ -void SdLayerManager::UpdateLayerView() const throw() +void SdLayerManager::UpdateLayerView() const noexcept { if(!mpModel->mpDocShell) return; @@ -636,7 +636,7 @@ void SdLayerManager::UpdateLayerView() const throw() } /** */ -::sd::View* SdLayerManager::GetView() const throw() +::sd::View* SdLayerManager::GetView() const noexcept { if( mpModel->mpDocShell ) { diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx index 0a78ba0eca7f..aa7d4891b38b 100644 --- a/sd/source/ui/unoidl/unolayer.hxx +++ b/sd/source/ui/unoidl/unolayer.hxx @@ -47,10 +47,10 @@ class SdLayer : public ::cppu::WeakImplHelper< css::drawing::XLayer, { public: SdLayer(SdLayerManager* pLayerManager_, SdrLayer* pSdrLayer_); - virtual ~SdLayer() throw() override; + virtual ~SdLayer() noexcept override; // intern - SdrLayer* GetSdrLayer() const throw() { return pLayer; } + SdrLayer* GetSdrLayer() const noexcept { return pLayer; } // uno helper UNO3_GETIMPLEMENTATION_DECL( SdLayer ) @@ -90,8 +90,8 @@ private: SdrLayer* pLayer; const SvxItemPropertySet* pPropSet; - bool get( LayerAttribute what ) throw(); - void set( LayerAttribute what, bool flag ) throw(); + bool get( LayerAttribute what ) noexcept; + void set( LayerAttribute what, bool flag ) noexcept; }; @@ -108,8 +108,8 @@ class SdLayerManager : public ::cppu::WeakImplHelper< css::drawing::XLayerManage friend class SdLayer; public: - explicit SdLayerManager( SdXImpressDocument& rMyModel ) throw(); - virtual ~SdLayerManager() throw() override; + explicit SdLayerManager( SdXImpressDocument& rMyModel ) noexcept; + virtual ~SdLayerManager() noexcept override; // uno helper UNO3_GETIMPLEMENTATION_DECL( SdLayerManager ) @@ -161,9 +161,9 @@ private: SdXImpressDocument* mpModel; std::unique_ptr<SvUnoWeakContainer> mpLayers; - ::sd::View* GetView() const throw(); - ::sd::DrawDocShell* GetDocShell() const throw() { return mpModel->mpDocShell; } - void UpdateLayerView() const throw(); + ::sd::View* GetView() const noexcept; + ::sd::DrawDocShell* GetDocShell() const noexcept { return mpModel->mpDocShell; } + void UpdateLayerView() const noexcept; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index cb3569a7689d..0d9e888187cb 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -137,7 +137,7 @@ public: virtual ~SdUnoForbiddenCharsTable() override; // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw () override; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) noexcept override; protected: virtual void onChange() override; @@ -169,7 +169,7 @@ SdUnoForbiddenCharsTable::~SdUnoForbiddenCharsTable() EndListening( *mpModel ); } -void SdUnoForbiddenCharsTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw() +void SdUnoForbiddenCharsTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) noexcept { if (rHint.GetId() != SfxHintId::ThisIsAnSdrHint) return; @@ -262,7 +262,7 @@ SdXImpressDocument::SdXImpressDocument(SdDrawDocument* pDoc, bool bClipBoard) /*********************************************************************** * * ***********************************************************************/ -SdXImpressDocument::~SdXImpressDocument() throw() +SdXImpressDocument::~SdXImpressDocument() noexcept { } @@ -305,12 +305,12 @@ uno::Any SAL_CALL SdXImpressDocument::queryInterface( const uno::Type & rType ) return aAny; } -void SAL_CALL SdXImpressDocument::acquire() throw ( ) +void SAL_CALL SdXImpressDocument::acquire() noexcept { SfxBaseModel::acquire(); } -void SAL_CALL SdXImpressDocument::release() throw ( ) +void SAL_CALL SdXImpressDocument::release() noexcept { if (osl_atomic_decrement( &m_refCount ) != 0) return; @@ -333,7 +333,7 @@ void SAL_CALL SdXImpressDocument::release() throw ( ) } // XUnoTunnel -const css::uno::Sequence< sal_Int8 > & SdXImpressDocument::getUnoTunnelId() throw() +const css::uno::Sequence< sal_Int8 > & SdXImpressDocument::getUnoTunnelId() noexcept { static const UnoTunnelIdInit theSdXImpressDocumentUnoTunnelId; return theSdXImpressDocumentUnoTunnelId.getSeq(); @@ -548,7 +548,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate ) return pStandardPage.get(); } -void SdXImpressDocument::SetModified() throw() +void SdXImpressDocument::SetModified() noexcept { if( mpDoc ) mpDoc->SetChanged(); @@ -2773,12 +2773,12 @@ void SAL_CALL SdXImpressDocument::dispose() } -SdDrawPagesAccess::SdDrawPagesAccess( SdXImpressDocument& rMyModel ) throw() +SdDrawPagesAccess::SdDrawPagesAccess( SdXImpressDocument& rMyModel ) noexcept : mpModel( &rMyModel) { } -SdDrawPagesAccess::~SdDrawPagesAccess() throw() +SdDrawPagesAccess::~SdDrawPagesAccess() noexcept { } @@ -3013,12 +3013,12 @@ void SAL_CALL SdDrawPagesAccess::removeEventListener( const uno::Reference< lang } -SdMasterPagesAccess::SdMasterPagesAccess( SdXImpressDocument& rMyModel ) throw() +SdMasterPagesAccess::SdMasterPagesAccess( SdXImpressDocument& rMyModel ) noexcept : mpModel(&rMyModel) { } -SdMasterPagesAccess::~SdMasterPagesAccess() throw() +SdMasterPagesAccess::~SdMasterPagesAccess() noexcept { } @@ -3244,12 +3244,12 @@ uno::Sequence< OUString > SAL_CALL SdMasterPagesAccess::getSupportedServiceNames } -SdDocLinkTargets::SdDocLinkTargets( SdXImpressDocument& rMyModel ) throw() +SdDocLinkTargets::SdDocLinkTargets( SdXImpressDocument& rMyModel ) noexcept : mpModel( &rMyModel ) { } -SdDocLinkTargets::~SdDocLinkTargets() throw() +SdDocLinkTargets::~SdDocLinkTargets() noexcept { } diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index e9e017de3f8d..dff577534ed5 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -268,7 +268,7 @@ SdXShape::SdXShape(SvxShape* pShape, SdXImpressDocument* pModel) pShape->setMaster( this ); } -SdXShape::~SdXShape() throw() +SdXShape::~SdXShape() noexcept { } @@ -283,12 +283,12 @@ uno::Any SAL_CALL SdXShape::queryInterface( const uno::Type & rType ) return mpShape->queryInterface( rType ); } -void SAL_CALL SdXShape::acquire() throw() +void SAL_CALL SdXShape::acquire() noexcept { mpShape->acquire(); } -void SAL_CALL SdXShape::release() throw() +void SAL_CALL SdXShape::release() noexcept { mpShape->release(); } @@ -957,13 +957,13 @@ void SdXShape::SetEmptyPresObj(bool bEmpty) pObj->SetEmptyPresObj(bEmpty); } -bool SdXShape::IsMasterDepend() const throw() +bool SdXShape::IsMasterDepend() const noexcept { SdrObject* pObj = mpShape->GetSdrObject(); return pObj && pObj->GetUserCall() != nullptr; } -void SdXShape::SetMasterDepend( bool bDepend ) throw() +void SdXShape::SetMasterDepend( bool bDepend ) noexcept { if( IsMasterDepend() == bDepend ) return; @@ -1033,7 +1033,7 @@ private: SdXShape* mpShape; public: - explicit SdUnoEventsAccess(SdXShape* pShape) throw(); + explicit SdUnoEventsAccess(SdXShape* pShape) noexcept; // XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; @@ -1075,7 +1075,7 @@ constexpr OUStringLiteral gaStrSpeed( u"Speed" ); constexpr OUStringLiteral gaStrStarBasic( u"StarBasic" ); constexpr OUStringLiteral gaStrScript( u"Script" ); -SdUnoEventsAccess::SdUnoEventsAccess( SdXShape* pShape ) throw() +SdUnoEventsAccess::SdUnoEventsAccess( SdXShape* pShape ) noexcept : mpShape( pShape ) { } diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 8bb4bcad0815..3f01cbed1a02 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -57,22 +57,22 @@ private: bool IsEmptyPresObj() const; void SetEmptyPresObj(bool bEmpty); - bool IsMasterDepend() const throw(); - void SetMasterDepend( bool bDepend ) throw(); + bool IsMasterDepend() const noexcept; + void SetMasterDepend( bool bDepend ) noexcept; OUString GetPlaceholderText() const; public: SdXShape(SvxShape* pShape, SdXImpressDocument* pModel); - virtual ~SdXShape() throw(); + virtual ~SdXShape() noexcept; virtual bool queryAggregation( const css::uno::Type & rType, css::uno::Any& aAny ) override; virtual void dispose() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() override; + virtual void SAL_CALL acquire() noexcept override; + virtual void SAL_CALL release() noexcept override; // XServiceInfo virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index eed82fceddd8..416370d56ae4 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -321,7 +321,7 @@ static const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKin return pRet; } -const css::uno::Sequence< sal_Int8 > & SdGenericDrawPage::getUnoTunnelId() throw() +const css::uno::Sequence< sal_Int8 > & SdGenericDrawPage::getUnoTunnelId() noexcept { static const UnoTunnelIdInit theSdGenericDrawPageUnoTunnelId; return theSdGenericDrawPageUnoTunnelId.getSeq(); @@ -354,7 +354,7 @@ SdGenericDrawPage::SdGenericDrawPage(SdXImpressDocument* _pModel, SdPage* pInPag } -SdGenericDrawPage::~SdGenericDrawPage() throw() +SdGenericDrawPage::~SdGenericDrawPage() noexcept { } @@ -1833,14 +1833,14 @@ void SdGenericDrawPage::SetHeight( sal_Int32 nHeight ) } // XInterface -void SdGenericDrawPage::release() throw() +void SdGenericDrawPage::release() noexcept { OWeakAggObject::release(); } // XComponent -void SdGenericDrawPage::disposing() throw() +void SdGenericDrawPage::disposing() noexcept { mpDocModel = nullptr; SvxFmDrawPage::disposing(); @@ -1859,13 +1859,13 @@ Reference< XAnimationNode > SAL_CALL SdGenericDrawPage::getAnimationNode() } // SdPageLinkTargets -SdPageLinkTargets::SdPageLinkTargets( SdGenericDrawPage* pUnoPage ) throw() +SdPageLinkTargets::SdPageLinkTargets( SdGenericDrawPage* pUnoPage ) noexcept { mxPage = pUnoPage; mpUnoPage = pUnoPage; } -SdPageLinkTargets::~SdPageLinkTargets() throw() +SdPageLinkTargets::~SdPageLinkTargets() noexcept { } @@ -1970,7 +1970,7 @@ sal_Bool SAL_CALL SdPageLinkTargets::hasByName( const OUString& aName ) return FindObject( aName ) != nullptr; } -SdrObject* SdPageLinkTargets::FindObject( std::u16string_view rName ) const throw() +SdrObject* SdPageLinkTargets::FindObject( std::u16string_view rName ) const noexcept { SdPage* pPage = mpUnoPage->GetPage(); if( pPage == nullptr ) @@ -2014,7 +2014,7 @@ SdDrawPage::SdDrawPage(SdXImpressDocument* pModel, SdPage* pPage) { } -SdDrawPage::~SdDrawPage() throw() +SdDrawPage::~SdDrawPage() noexcept { } @@ -2038,12 +2038,12 @@ Any SAL_CALL SdDrawPage::queryInterface( const uno::Type & rType ) return SdGenericDrawPage::queryInterface( rType ); } -void SAL_CALL SdDrawPage::acquire() throw() +void SAL_CALL SdDrawPage::acquire() noexcept { SvxDrawPage::acquire(); } -void SAL_CALL SdDrawPage::release() throw() +void SAL_CALL SdDrawPage::release() noexcept { SvxDrawPage::release(); } @@ -2612,7 +2612,7 @@ SdMasterPage::SdMasterPage(SdXImpressDocument* pModel, SdPage* pPage) { } -SdMasterPage::~SdMasterPage() throw() +SdMasterPage::~SdMasterPage() noexcept { } @@ -2641,12 +2641,12 @@ Any SAL_CALL SdMasterPage::queryInterface( const uno::Type & rType ) return aAny; } -void SAL_CALL SdMasterPage::acquire() throw() +void SAL_CALL SdMasterPage::acquire() noexcept { SvxDrawPage::acquire(); } -void SAL_CALL SdMasterPage::release() throw() +void SAL_CALL SdMasterPage::release() noexcept { SvxDrawPage::release(); } diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 88ff72ef92a8..7a017b8d531a 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -64,7 +64,7 @@ SdUnoPageBackground::SdUnoPageBackground( } } -SdUnoPageBackground::~SdUnoPageBackground() throw() +SdUnoPageBackground::~SdUnoPageBackground() noexcept { SolarMutexGuard g; @@ -403,7 +403,7 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyDefault( const OUString& aProp } /** this is used because our property map is not sorted yet */ -const SfxItemPropertyMapEntry* SdUnoPageBackground::getPropertyMapEntry( std::u16string_view rPropertyName ) const throw() +const SfxItemPropertyMapEntry* SdUnoPageBackground::getPropertyMapEntry( std::u16string_view rPropertyName ) const noexcept { return mpPropSet->getPropertyMap().getByName(rPropertyName); } diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx index 4713de8bffc0..cf7bc235773c 100644 --- a/sd/source/ui/unoidl/unopback.hxx +++ b/sd/source/ui/unoidl/unopback.hxx @@ -51,10 +51,10 @@ class SdUnoPageBackground final : public ::cppu::WeakImplHelper< std::unique_ptr<SfxItemSet> mpSet; SdrModel* mpDoc; - const SfxItemPropertyMapEntry* getPropertyMapEntry( std::u16string_view rPropertyName ) const throw(); + const SfxItemPropertyMapEntry* getPropertyMapEntry( std::u16string_view rPropertyName ) const noexcept; public: SdUnoPageBackground( SdDrawDocument* pDoc = nullptr, const SfxItemSet* pSet = nullptr); - virtual ~SdUnoPageBackground() throw() override; + virtual ~SdUnoPageBackground() noexcept override; // internal void fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ); diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index 653c7c4e3a02..f8e1da8f02dc 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -89,12 +89,12 @@ public: page or a given sdrobj */ -SdUnoSearchReplaceShape::SdUnoSearchReplaceShape( drawing::XDrawPage* pPage ) throw() +SdUnoSearchReplaceShape::SdUnoSearchReplaceShape( drawing::XDrawPage* pPage ) noexcept : mpPage(pPage) { } -SdUnoSearchReplaceShape::~SdUnoSearchReplaceShape() throw() +SdUnoSearchReplaceShape::~SdUnoSearchReplaceShape() noexcept { } @@ -285,7 +285,7 @@ uno::Reference< css::uno::XInterface > SAL_CALL SdUnoSearchReplaceShape::findFir return uno::Reference< uno::XInterface > (); } -uno::Reference< drawing::XShape > SdUnoSearchReplaceShape::GetCurrentShape() const throw() +uno::Reference< drawing::XShape > SdUnoSearchReplaceShape::GetCurrentShape() const noexcept { uno::Reference< drawing::XShape > xShape; @@ -346,7 +346,7 @@ uno::Reference< css::uno::XInterface > SAL_CALL SdUnoSearchReplaceShape::findNex /** this method returns the shape that follows xCurrentShape in the shape collection xShapes. It steps recursive into groupshapes and returns the xCurrentShape if it is the last shape in this collection */ -uno::Reference< drawing::XShape > SdUnoSearchReplaceShape::GetNextShape( const uno::Reference< container::XIndexAccess >& xShapes, const uno::Reference< drawing::XShape >& xCurrentShape ) throw() +uno::Reference< drawing::XShape > SdUnoSearchReplaceShape::GetNextShape( const uno::Reference< container::XIndexAccess >& xShapes, const uno::Reference< drawing::XShape >& xCurrentShape ) noexcept { uno::Reference< drawing::XShape > xFound; @@ -564,7 +564,7 @@ uno::Reference< text::XTextRange > SdUnoSearchReplaceShape::Search( const uno:: return xFound; } -bool SdUnoSearchReplaceShape::Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) throw() +bool SdUnoSearchReplaceShape::Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) noexcept { OUString aSearchStr( pDescr->getSearchString() ); OUString aText( rText ); @@ -597,7 +597,7 @@ bool SdUnoSearchReplaceShape::Search( const OUString& rText, sal_Int32& nStartPo return false; } -ESelection SdUnoSearchReplaceShape::GetSelection( const uno::Reference< text::XTextRange >& xTextRange ) throw() +ESelection SdUnoSearchReplaceShape::GetSelection( const uno::Reference< text::XTextRange >& xTextRange ) noexcept { ESelection aSel; SvxUnoTextRangeBase* pRange = comphelper::getUnoTunnelImplementation<SvxUnoTextRangeBase>( xTextRange ); @@ -608,7 +608,7 @@ ESelection SdUnoSearchReplaceShape::GetSelection( const uno::Reference< text::XT return aSel; } -uno::Reference< drawing::XShape > SdUnoSearchReplaceShape::GetShape( const uno::Reference< text::XTextRange >& xTextRange ) throw() +uno::Reference< drawing::XShape > SdUnoSearchReplaceShape::GetShape( const uno::Reference< text::XTextRange >& xTextRange ) noexcept { uno::Reference< drawing::XShape > xShape; @@ -652,7 +652,7 @@ SdUnoSearchReplaceDescriptor::SdUnoSearchReplaceDescriptor() mbWords = false; } -SdUnoSearchReplaceDescriptor::~SdUnoSearchReplaceDescriptor() throw() +SdUnoSearchReplaceDescriptor::~SdUnoSearchReplaceDescriptor() noexcept { } @@ -745,12 +745,12 @@ void SAL_CALL SdUnoSearchReplaceDescriptor::removeVetoableChangeListener( const /* ================================================================= */ -SdUnoFindAllAccess::SdUnoFindAllAccess( uno::Sequence< uno::Reference< uno::XInterface > > const & rSequence ) throw() +SdUnoFindAllAccess::SdUnoFindAllAccess( uno::Sequence< uno::Reference< uno::XInterface > > const & rSequence ) noexcept :maSequence( rSequence ) { } -SdUnoFindAllAccess::~SdUnoFindAllAccess() throw() +SdUnoFindAllAccess::~SdUnoFindAllAccess() noexcept { } diff --git a/sd/source/ui/unoidl/unowcntr.cxx b/sd/source/ui/unoidl/unowcntr.cxx index bff99b1b3530..1079477ef379 100644 --- a/sd/source/ui/unoidl/unowcntr.cxx +++ b/sd/source/ui/unoidl/unowcntr.cxx @@ -23,16 +23,16 @@ using namespace ::com::sun::star; -SvUnoWeakContainer::SvUnoWeakContainer() throw() +SvUnoWeakContainer::SvUnoWeakContainer() noexcept { } -SvUnoWeakContainer::~SvUnoWeakContainer() throw() +SvUnoWeakContainer::~SvUnoWeakContainer() noexcept { } /** inserts the given ref into this container */ -void SvUnoWeakContainer::insert( const uno::WeakReference< uno::XInterface >& xRef ) throw() +void SvUnoWeakContainer::insert( const uno::WeakReference< uno::XInterface >& xRef ) noexcept { for ( auto it = maVector.begin(); it != maVector.end(); ) { diff --git a/sd/source/ui/unoidl/unowcntr.hxx b/sd/source/ui/unoidl/unowcntr.hxx index 904424b407ce..a863f09291eb 100644 --- a/sd/source/ui/unoidl/unowcntr.hxx +++ b/sd/source/ui/unoidl/unowcntr.hxx @@ -30,11 +30,11 @@ private: std::vector< css::uno::WeakReference< css::uno::XInterface > > maVector; public: - SvUnoWeakContainer() throw(); - ~SvUnoWeakContainer() throw(); + SvUnoWeakContainer() noexcept; + ~SvUnoWeakContainer() noexcept; /** inserts the given ref into this container */ - void insert( const css::uno::WeakReference< css::uno::XInterface >& xRef ) throw(); + void insert( const css::uno::WeakReference< css::uno::XInterface >& xRef ) noexcept; /** searches the container for a ref that returns true on the given search function diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx index 2726833637ee..410a0470f68d 100644 --- a/sd/source/ui/view/WindowUpdater.cxx +++ b/sd/source/ui/view/WindowUpdater.cxx @@ -34,7 +34,7 @@ WindowUpdater::WindowUpdater() maCTLOptions.AddListener(this); } -WindowUpdater::~WindowUpdater() throw () +WindowUpdater::~WindowUpdater() noexcept { maCTLOptions.RemoveListener(this); } |