From 567ef6d5782cdb729b49005caf6005610ce03e22 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 27 Mar 2014 18:12:18 +0100 Subject: Second batch of adding SAL_OVERRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f --- sd/source/core/CustomAnimationEffect.cxx | 4 +- sd/source/core/PageListWatcher.hxx | 8 +- sd/source/core/annotations/Annotation.cxx | 50 +++--- .../core/annotations/AnnotationEnumeration.cxx | 4 +- sd/source/core/stlpool.cxx | 4 +- sd/source/core/stlsheet.cxx | 2 +- sd/source/core/text/textapi.cxx | 10 +- sd/source/filter/eppt/eppt.hxx | 14 +- sd/source/filter/eppt/epptooxml.hxx | 28 ++-- sd/source/filter/eppt/escherex.hxx | 4 +- sd/source/filter/eppt/pptx-epptooxml.cxx | 6 +- sd/source/filter/grf/sdgrffilter.cxx | 2 +- sd/source/filter/html/HtmlOptionsDialog.cxx | 22 +-- sd/source/filter/html/htmlattr.hxx | 2 +- sd/source/filter/html/htmlex.hxx | 2 +- sd/source/filter/ppt/pptin.hxx | 6 +- .../ui/accessibility/AccessibleSlideSorterView.cxx | 2 +- .../ui/animations/CustomAnimationCreateDialog.cxx | 4 +- sd/source/ui/animations/CustomAnimationDialog.cxx | 52 +++--- sd/source/ui/animations/CustomAnimationDialog.hxx | 2 +- sd/source/ui/animations/CustomAnimationList.cxx | 16 +- sd/source/ui/animations/CustomAnimationList.hxx | 16 +- sd/source/ui/animations/CustomAnimationPane.hxx | 12 +- sd/source/ui/animations/SlideTransitionPane.hxx | 2 +- sd/source/ui/animations/motionpathtag.cxx | 20 +-- sd/source/ui/animations/motionpathtag.hxx | 60 +++---- sd/source/ui/annotations/annotationmanagerimpl.hxx | 6 +- sd/source/ui/annotations/annotationtag.cxx | 14 +- sd/source/ui/annotations/annotationtag.hxx | 28 ++-- sd/source/ui/annotations/annotationwindow.hxx | 34 ++-- sd/source/ui/app/tmplctrl.cxx | 2 +- sd/source/ui/controller/slidelayoutcontroller.hxx | 6 +- sd/source/ui/dlg/PhotoAlbumDialog.hxx | 2 +- sd/source/ui/dlg/RemoteDialogClientBox.hxx | 12 +- sd/source/ui/dlg/dlgassim.hxx | 2 +- sd/source/ui/dlg/filedlg.cxx | 2 +- sd/source/ui/dlg/headerfooterdlg.cxx | 4 +- sd/source/ui/dlg/paragr.cxx | 4 +- sd/source/ui/dlg/sddlgfact.hxx | 180 ++++++++++----------- .../GenericConfigurationChangeRequest.hxx | 6 +- .../ui/framework/configuration/UpdateRequest.hxx | 6 +- .../ui/framework/factories/BasicPaneFactory.hxx | 12 +- .../ui/framework/factories/BasicToolBarFactory.hxx | 10 +- .../ui/framework/factories/BasicViewFactory.hxx | 8 +- .../ui/framework/factories/ChildWindowPane.hxx | 8 +- .../ui/framework/factories/FrameWindowPane.hxx | 2 +- .../ui/framework/factories/FullScreenPane.hxx | 12 +- .../ui/framework/factories/PresentationFactory.cxx | 8 +- .../ui/framework/module/CenterViewFocusModule.hxx | 6 +- sd/source/ui/framework/module/ResourceManager.hxx | 6 +- sd/source/ui/framework/module/ShellStackGuard.hxx | 6 +- .../ui/framework/module/SlideSorterModule.hxx | 4 +- sd/source/ui/framework/module/ToolBarModule.hxx | 6 +- sd/source/ui/framework/module/ToolPanelModule.hxx | 4 +- sd/source/ui/framework/module/ViewTabBarModule.hxx | 6 +- sd/source/ui/framework/tools/FrameworkHelper.cxx | 16 +- sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 68 ++++---- sd/source/ui/inc/AccessibleDrawDocumentView.hxx | 46 +++--- sd/source/ui/inc/AccessibleOutlineEditSource.hxx | 20 +-- sd/source/ui/inc/AccessibleOutlineView.hxx | 30 ++-- sd/source/ui/inc/AccessiblePageShape.hxx | 26 +-- .../ui/inc/AccessiblePresentationGraphicShape.hxx | 8 +- .../ui/inc/AccessiblePresentationOLEShape.hxx | 8 +- sd/source/ui/inc/AccessiblePresentationShape.hxx | 8 +- sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 58 +++---- sd/source/ui/inc/AccessibleSlideSorterView.hxx | 72 ++++----- sd/source/ui/inc/AccessibleViewForwarder.hxx | 12 +- sd/source/ui/inc/BreakDlg.hxx | 2 +- sd/source/ui/inc/Client.hxx | 8 +- sd/source/ui/inc/ClientView.hxx | 6 +- sd/source/ui/inc/DocumentRenderer.hxx | 6 +- sd/source/ui/inc/DrawController.hxx | 54 +++---- sd/source/ui/inc/DrawDocShell.hxx | 50 +++--- sd/source/ui/inc/DrawSubController.hxx | 6 +- sd/source/ui/inc/DrawViewShell.hxx | 80 ++++----- sd/source/ui/inc/FormShellManager.hxx | 2 +- sd/source/ui/inc/GraphicViewShell.hxx | 4 +- sd/source/ui/inc/GraphicViewShellBase.hxx | 4 +- sd/source/ui/inc/ImpressViewShellBase.hxx | 4 +- sd/source/ui/inc/LayerDialogContent.hxx | 4 +- sd/source/ui/inc/LayerTabBar.hxx | 20 +-- sd/source/ui/inc/OutlineBulletDlg.hxx | 2 +- sd/source/ui/inc/OutlineView.hxx | 20 +-- sd/source/ui/inc/OutlineViewShell.hxx | 44 ++--- sd/source/ui/inc/OutlinerIteratorImpl.hxx | 20 +-- sd/source/ui/inc/PaneDockingWindow.hxx | 4 +- sd/source/ui/inc/PresentationViewShell.hxx | 10 +- sd/source/ui/inc/PresentationViewShellBase.hxx | 2 +- sd/source/ui/inc/PreviewRenderer.hxx | 2 +- sd/source/ui/inc/RemoteServer.hxx | 2 +- sd/source/ui/inc/Ruler.hxx | 10 +- sd/source/ui/inc/SdUnoDrawView.hxx | 22 +-- sd/source/ui/inc/SdUnoOutlineView.hxx | 24 +-- sd/source/ui/inc/SdUnoSlideView.hxx | 22 +-- sd/source/ui/inc/SlideSorterViewShell.hxx | 40 ++--- sd/source/ui/inc/SpellDialogChildWindow.hxx | 8 +- sd/source/ui/inc/TabControl.hxx | 30 ++-- sd/source/ui/inc/TemplateScanner.hxx | 4 +- sd/source/ui/inc/View.hxx | 40 ++--- sd/source/ui/inc/ViewShell.hxx | 4 +- sd/source/ui/inc/ViewShellBase.hxx | 40 ++--- sd/source/ui/inc/ViewTabBar.hxx | 22 +-- sd/source/ui/inc/Window.hxx | 34 ++-- sd/source/ui/inc/WindowUpdater.hxx | 2 +- sd/source/ui/inc/animobjs.hxx | 14 +- sd/source/ui/inc/diactrl.hxx | 6 +- sd/source/ui/inc/dlg_char.hxx | 2 +- sd/source/ui/inc/dlgpage.hxx | 2 +- sd/source/ui/inc/docprev.hxx | 10 +- sd/source/ui/inc/drawview.hxx | 20 +-- sd/source/ui/inc/framework/Configuration.hxx | 16 +- .../ui/inc/framework/ConfigurationController.hxx | 40 ++--- sd/source/ui/inc/framework/ModuleController.hxx | 6 +- sd/source/ui/inc/framework/Pane.hxx | 20 +-- sd/source/ui/inc/framework/PresentationFactory.hxx | 10 +- sd/source/ui/inc/framework/ResourceId.hxx | 22 +-- sd/source/ui/inc/framework/ViewShellWrapper.hxx | 30 ++-- sd/source/ui/inc/fuarea.hxx | 6 +- sd/source/ui/inc/fubullet.hxx | 2 +- sd/source/ui/inc/fuchar.hxx | 6 +- sd/source/ui/inc/fucon3d.hxx | 16 +- sd/source/ui/inc/fuconarc.hxx | 16 +- sd/source/ui/inc/fuconbez.hxx | 18 +-- sd/source/ui/inc/fuconcs.hxx | 16 +- sd/source/ui/inc/fuconnct.hxx | 2 +- sd/source/ui/inc/fuconrec.hxx | 16 +- sd/source/ui/inc/fuconstr.hxx | 16 +- sd/source/ui/inc/fuconuno.hxx | 16 +- sd/source/ui/inc/fucopy.hxx | 2 +- sd/source/ui/inc/fucushow.hxx | 2 +- sd/source/ui/inc/fudraw.hxx | 16 +- sd/source/ui/inc/fudspord.hxx | 10 +- sd/source/ui/inc/fuediglu.hxx | 20 +-- sd/source/ui/inc/fuexpand.hxx | 2 +- sd/source/ui/inc/fuformatpaintbrush.hxx | 14 +- sd/source/ui/inc/fuinsert.hxx | 10 +- sd/source/ui/inc/fuinsfil.hxx | 2 +- sd/source/ui/inc/fuline.hxx | 6 +- sd/source/ui/inc/fulinend.hxx | 6 +- sd/source/ui/inc/fulink.hxx | 2 +- sd/source/ui/inc/fumeasur.hxx | 2 +- sd/source/ui/inc/fumorph.hxx | 2 +- sd/source/ui/inc/fuoaprms.hxx | 2 +- sd/source/ui/inc/fuolbull.hxx | 2 +- sd/source/ui/inc/fuoltext.hxx | 24 +-- sd/source/ui/inc/fuoutl.hxx | 2 +- sd/source/ui/inc/fupage.hxx | 6 +- sd/source/ui/inc/fuparagr.hxx | 6 +- sd/source/ui/inc/fuprlout.hxx | 2 +- sd/source/ui/inc/fuprobjs.hxx | 2 +- sd/source/ui/inc/fuscale.hxx | 2 +- sd/source/ui/inc/fusearch.hxx | 2 +- sd/source/ui/inc/fusel.hxx | 20 +-- sd/source/ui/inc/fusldlg.hxx | 2 +- sd/source/ui/inc/fusnapln.hxx | 6 +- sd/source/ui/inc/fusumry.hxx | 2 +- sd/source/ui/inc/futempl.hxx | 6 +- sd/source/ui/inc/futext.hxx | 28 ++-- sd/source/ui/inc/futhes.hxx | 2 +- sd/source/ui/inc/futransf.hxx | 2 +- sd/source/ui/inc/futxtatt.hxx | 2 +- sd/source/ui/inc/fuvect.hxx | 2 +- sd/source/ui/inc/fuzoom.hxx | 10 +- sd/source/ui/inc/gluectrl.hxx | 6 +- sd/source/ui/inc/headerfooterdlg.hxx | 2 +- sd/source/ui/inc/masterlayoutdlg.hxx | 2 +- sd/source/ui/inc/navigatr.hxx | 12 +- sd/source/ui/inc/optsitem.hxx | 66 ++++---- sd/source/ui/inc/paragr.hxx | 2 +- sd/source/ui/inc/prltempl.hxx | 2 +- sd/source/ui/inc/prntopts.hxx | 6 +- sd/source/ui/inc/sdtreelb.hxx | 30 ++-- sd/source/ui/inc/sdundogr.hxx | 6 +- sd/source/ui/inc/sdxfer.hxx | 14 +- sd/source/ui/inc/slideshow.hxx | 34 ++-- sd/source/ui/inc/smarttag.hxx | 2 +- sd/source/ui/inc/tabtempl.hxx | 4 +- sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 12 +- sd/source/ui/inc/tbx_ww.hxx | 6 +- sd/source/ui/inc/tmplctrl.hxx | 6 +- sd/source/ui/inc/tools/PropertySet.hxx | 16 +- sd/source/ui/inc/tools/SlotStateListener.hxx | 6 +- sd/source/ui/inc/tpaction.hxx | 8 +- sd/source/ui/inc/tpoption.hxx | 18 +-- sd/source/ui/inc/unchss.hxx | 6 +- sd/source/ui/inc/undoback.hxx | 6 +- sd/source/ui/inc/undoheaderfooter.hxx | 4 +- sd/source/ui/inc/undolayer.hxx | 4 +- sd/source/ui/inc/undopage.hxx | 12 +- sd/source/ui/inc/unmodpg.hxx | 12 +- sd/source/ui/inc/unmovss.hxx | 6 +- sd/source/ui/inc/unoaprms.hxx | 4 +- sd/source/ui/inc/unomodel.hxx | 152 ++++++++--------- sd/source/ui/inc/unosrch.hxx | 42 ++--- sd/source/ui/inc/unprlout.hxx | 6 +- sd/source/ui/inc/view/viewoverlaymanager.hxx | 2 +- sd/source/ui/presenter/PresenterCanvas.cxx | 18 +-- sd/source/ui/presenter/PresenterCanvas.hxx | 68 ++++---- sd/source/ui/presenter/PresenterHelper.hxx | 18 +-- sd/source/ui/presenter/PresenterPreviewCache.cxx | 14 +- sd/source/ui/presenter/PresenterPreviewCache.hxx | 18 +-- sd/source/ui/presenter/PresenterTextView.hxx | 8 +- sd/source/ui/presenter/SlideRenderer.hxx | 10 +- sd/source/ui/remotecontrol/AvahiNetworkService.hxx | 4 +- sd/source/ui/remotecontrol/BluetoothServer.hxx | 2 +- .../ui/remotecontrol/BufferedStreamSocket.hxx | 6 +- sd/source/ui/remotecontrol/Communicator.hxx | 2 +- sd/source/ui/remotecontrol/DiscoveryService.hxx | 2 +- sd/source/ui/remotecontrol/ImagePreparer.hxx | 2 +- sd/source/ui/remotecontrol/Listener.hxx | 24 +-- sd/source/ui/remotecontrol/Receiver.hxx | 2 +- sd/source/ui/remotecontrol/Transmitter.hxx | 2 +- sd/source/ui/sidebar/AllMasterPagesSelector.hxx | 4 +- .../ui/sidebar/CurrentMasterPagesSelector.hxx | 12 +- sd/source/ui/sidebar/CustomAnimationPanel.hxx | 4 +- sd/source/ui/sidebar/LayoutMenu.hxx | 18 +-- sd/source/ui/sidebar/MasterPageContainer.cxx | 6 +- sd/source/ui/sidebar/MasterPageContainerFiller.hxx | 4 +- .../ui/sidebar/MasterPageContainerProviders.hxx | 30 ++-- sd/source/ui/sidebar/MasterPageObserver.cxx | 2 +- sd/source/ui/sidebar/MasterPagesSelector.hxx | 4 +- sd/source/ui/sidebar/NavigatorWrapper.hxx | 6 +- sd/source/ui/sidebar/PanelBase.hxx | 8 +- sd/source/ui/sidebar/PanelFactory.hxx | 4 +- sd/source/ui/sidebar/PreviewValueSet.hxx | 4 +- sd/source/ui/sidebar/RecentMasterPagesSelector.hxx | 8 +- sd/source/ui/sidebar/SlideTransitionPanel.hxx | 4 +- sd/source/ui/sidebar/TableDesignPanel.hxx | 4 +- sd/source/ui/slideshow/showwindow.hxx | 22 +-- sd/source/ui/slideshow/slideshow.cxx | 2 +- sd/source/ui/slideshow/slideshowimpl.hxx | 110 ++++++------- sd/source/ui/slideshow/slideshowviewimpl.hxx | 58 +++---- .../ui/slidesorter/cache/SlsBitmapCompressor.cxx | 6 +- .../ui/slidesorter/cache/SlsBitmapCompressor.hxx | 24 +-- .../ui/slidesorter/cache/SlsCacheCompactor.cxx | 6 +- sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx | 2 +- .../ui/slidesorter/controller/SlsListener.hxx | 14 +- .../controller/SlsSelectionFunction.cxx | 32 ++-- .../ui/slidesorter/inc/controller/SlsClipboard.hxx | 4 +- .../inc/controller/SlsSelectionFunction.hxx | 20 +-- .../inc/controller/SlsTransferableData.hxx | 2 +- .../slidesorter/inc/model/SlsPageEnumeration.hxx | 8 +- .../ui/slidesorter/inc/view/SlideSorterView.hxx | 12 +- .../inc/view/SlsInsertionIndicatorOverlay.hxx | 4 +- .../ui/slidesorter/model/SlsPageEnumeration.cxx | 8 +- sd/source/ui/slidesorter/shell/SlideSorter.cxx | 14 +- .../ui/slidesorter/shell/SlideSorterService.hxx | 74 ++++----- sd/source/ui/slidesorter/view/SlideSorterView.cxx | 8 +- .../ui/slidesorter/view/SlsInsertAnimator.cxx | 12 +- sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 2 +- sd/source/ui/slidesorter/view/SlsLayouter.cxx | 30 ++-- .../ui/slidesorter/view/SlsViewCacheContext.hxx | 14 +- sd/source/ui/table/TableDesignPane.hxx | 6 +- sd/source/ui/tools/EventMultiplexer.cxx | 14 +- sd/source/ui/tools/PreviewRenderer.cxx | 2 +- sd/source/ui/unoidl/UnoDocumentSettings.cxx | 44 ++--- sd/source/ui/unoidl/randomnode.cxx | 88 +++++----- sd/source/ui/unoidl/sddetect.hxx | 2 +- sd/source/ui/unoidl/unocpres.hxx | 56 +++---- sd/source/ui/unoidl/unolayer.hxx | 64 ++++---- sd/source/ui/unoidl/unomodel.cxx | 6 +- sd/source/ui/unoidl/unomodule.hxx | 18 +-- sd/source/ui/unoidl/unoobj.cxx | 18 +-- sd/source/ui/unoidl/unoobj.hxx | 34 ++-- sd/source/ui/unoidl/unopage.cxx | 8 +- sd/source/ui/unoidl/unopage.hxx | 152 ++++++++--------- sd/source/ui/unoidl/unopback.hxx | 30 ++-- sd/source/ui/unoidl/unopool.cxx | 2 +- sd/source/ui/view/DocumentRenderer.cxx | 12 +- sd/source/ui/view/FormShellManager.cxx | 4 +- sd/source/ui/view/ViewShellBase.cxx | 4 +- sd/source/ui/view/ViewTabBar.cxx | 6 +- sd/source/ui/view/drviews2.cxx | 2 +- sd/source/ui/view/drviewsa.cxx | 2 +- sd/source/ui/view/sdruler.cxx | 2 +- sd/source/ui/view/sdview.cxx | 2 +- sd/source/ui/view/viewoverlaymanager.cxx | 24 +-- sd/source/ui/view/viewshel.cxx | 4 +- 278 files changed, 2139 insertions(+), 2139 deletions(-) (limited to 'sd/source') diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index d66285ec517c..b1639a99b22e 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -2982,8 +2982,8 @@ class AnimationChangeListener : public cppu::WeakImplHelper1< XChangesListener > public: AnimationChangeListener( MainSequence* pMainSequence ) : mpMainSequence( pMainSequence ) {} - virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw (RuntimeException, std::exception); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (RuntimeException, std::exception); + virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; private: MainSequence* mpMainSequence; }; diff --git a/sd/source/core/PageListWatcher.hxx b/sd/source/core/PageListWatcher.hxx index d16d67f737bf..773a50aec729 100644 --- a/sd/source/core/PageListWatcher.hxx +++ b/sd/source/core/PageListWatcher.hxx @@ -67,8 +67,8 @@ public: class ImpDrawPageListWatcher : public ImpPageListWatcher { protected: - virtual sal_uInt32 ImpGetPageCount() const; - virtual SdPage* ImpGetPage(sal_uInt32 nIndex) const; + virtual sal_uInt32 ImpGetPageCount() const SAL_OVERRIDE; + virtual SdPage* ImpGetPage(sal_uInt32 nIndex) const SAL_OVERRIDE; public: ImpDrawPageListWatcher(const SdrModel& rModel); @@ -78,8 +78,8 @@ public: class ImpMasterPageListWatcher : public ImpPageListWatcher { protected: - virtual sal_uInt32 ImpGetPageCount() const; - virtual SdPage* ImpGetPage(sal_uInt32 nIndex) const; + virtual sal_uInt32 ImpGetPageCount() const SAL_OVERRIDE; + virtual SdPage* ImpGetPage(sal_uInt32 nIndex) const SAL_OVERRIDE; public: ImpMasterPageListWatcher(const SdrModel& rModel); diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx index 212853931701..736661f9b8f6 100644 --- a/sd/source/core/annotations/Annotation.cxx +++ b/sd/source/core/annotations/Annotation.cxx @@ -59,30 +59,30 @@ public: SdrModel* GetModel() { return (mpPage != 0) ? mpPage->GetModel() : 0; } // XInterface: - virtual Any SAL_CALL queryInterface(Type const & type) throw (RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw () { ::cppu::WeakComponentImplHelper1< XAnnotation >::acquire(); } - virtual void SAL_CALL release() throw () { ::cppu::WeakComponentImplHelper1< XAnnotation >::release(); } + virtual Any SAL_CALL queryInterface(Type const & type) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { ::cppu::WeakComponentImplHelper1< XAnnotation >::acquire(); } + virtual void SAL_CALL release() throw () SAL_OVERRIDE { ::cppu::WeakComponentImplHelper1< XAnnotation >::release(); } // ::com::sun::star::beans::XPropertySet: - virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue(const OUString & aPropertyName, const Any & aValue) throw (RuntimeException, UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, std::exception); - virtual Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception); - virtual void SAL_CALL addPropertyChangeListener(const OUString & aPropertyName, const Reference< XPropertyChangeListener > & xListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception); - virtual void SAL_CALL removePropertyChangeListener(const OUString & aPropertyName, const Reference< XPropertyChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception); - virtual void SAL_CALL addVetoableChangeListener(const OUString & PropertyName, const Reference< XVetoableChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener(const OUString & PropertyName, const Reference< XVetoableChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception); + virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue(const OUString & aPropertyName, const Any & aValue) throw (RuntimeException, UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, std::exception) SAL_OVERRIDE; + virtual Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener(const OUString & aPropertyName, const Reference< XPropertyChangeListener > & xListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener(const OUString & aPropertyName, const Reference< XPropertyChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener(const OUString & PropertyName, const Reference< XVetoableChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener(const OUString & PropertyName, const Reference< XVetoableChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) SAL_OVERRIDE; // ::com::sun::star::office::XAnnotation: - virtual ::com::sun::star::uno::Any SAL_CALL getAnchor() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual RealPoint2D SAL_CALL getPosition() throw (RuntimeException, std::exception); - virtual void SAL_CALL setPosition(const RealPoint2D & the_value) throw (RuntimeException, std::exception); - virtual ::com::sun::star::geometry::RealSize2D SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSize( const ::com::sun::star::geometry::RealSize2D& _size ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAuthor() throw (RuntimeException, std::exception); - virtual void SAL_CALL setAuthor(const OUString & the_value) throw (RuntimeException, std::exception); - virtual util::DateTime SAL_CALL getDateTime() throw (RuntimeException, std::exception); - virtual void SAL_CALL setDateTime(const util::DateTime & the_value) throw (RuntimeException, std::exception); - virtual Reference< XText > SAL_CALL getTextRange() throw (RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getAnchor() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual RealPoint2D SAL_CALL getPosition() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPosition(const RealPoint2D & the_value) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::geometry::RealSize2D SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSize( const ::com::sun::star::geometry::RealSize2D& _size ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAuthor() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAuthor(const OUString & the_value) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual util::DateTime SAL_CALL getDateTime() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDateTime(const util::DateTime & the_value) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< XText > SAL_CALL getTextRange() throw (RuntimeException, std::exception) SAL_OVERRIDE; private: Annotation(const Annotation &); // not defined @@ -96,7 +96,7 @@ private: // This function is called upon disposing the component, // if your component needs special work when it becomes // disposed, do it here. - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; SdPage* mpPage; Reference< XComponentContext > m_xContext; @@ -113,8 +113,8 @@ class UndoInsertOrRemoveAnnotation : public SdrUndoAction public: UndoInsertOrRemoveAnnotation( Annotation& rAnnotation, bool bInsert ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; protected: rtl::Reference< Annotation > mxAnnotation; @@ -151,8 +151,8 @@ class UndoAnnotation : public SdrUndoAction public: UndoAnnotation( Annotation& rAnnotation ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; protected: rtl::Reference< Annotation > mxAnnotation; diff --git a/sd/source/core/annotations/AnnotationEnumeration.cxx b/sd/source/core/annotations/AnnotationEnumeration.cxx index 8ad59904604c..43f872f4e142 100644 --- a/sd/source/core/annotations/AnnotationEnumeration.cxx +++ b/sd/source/core/annotations/AnnotationEnumeration.cxx @@ -40,8 +40,8 @@ public: AnnotationEnumeration( const AnnotationVector& rAnnotations ); // ::com::sun::star::office::XAnnotationEnumeration: - virtual ::sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::office::XAnnotation > SAL_CALL nextElement() throw (css::uno::RuntimeException, css::container::NoSuchElementException, std::exception); + virtual ::sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::office::XAnnotation > SAL_CALL nextElement() throw (css::uno::RuntimeException, css::container::NoSuchElementException, std::exception) SAL_OVERRIDE; private: AnnotationEnumeration(const AnnotationEnumeration &); // not defined diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 3dfd66f4a6fc..8a7cc23d11cc 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -631,7 +631,7 @@ struct HasFamilyPredicate : svl::StyleSheetPredicate HasFamilyPredicate(SfxStyleFamily eFamily) : meFamily(eFamily) {;} - bool Check(const SfxStyleSheetBase& sheet) + bool Check(const SfxStyleSheetBase& sheet) SAL_OVERRIDE { return sheet.GetFamily() == meFamily; } @@ -935,7 +935,7 @@ struct StyleSheetIsUserDefinedPredicate : svl::StyleSheetPredicate StyleSheetIsUserDefinedPredicate() {;} - bool Check(const SfxStyleSheetBase& sheet) + bool Check(const SfxStyleSheetBase& sheet) SAL_OVERRIDE { return sheet.IsUserDefined(); } diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index ce7fbf1cdb5c..d29ad99f72f3 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -108,7 +108,7 @@ class ModifyListenerForewarder : public SfxListener public: ModifyListenerForewarder( SdStyleSheet* pStyleSheet ); - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; private: SdStyleSheet* mpStyleSheet; diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index 3a35ee6cc1ed..9ed4f6731511 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -44,8 +44,8 @@ public: UndoTextAPIChanged( SdrModel& rModel, TextApiObject* pTextObj ); ~UndoTextAPIChanged(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; protected: OutlinerParaObject* mpOldText; @@ -96,9 +96,9 @@ class TextAPIEditSource : public SvxEditSource { TextAPIEditSource_Impl* pImpl; - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); + virtual SvxEditSource* Clone() const SAL_OVERRIDE; + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual void UpdateData() SAL_OVERRIDE; explicit TextAPIEditSource( const TextAPIEditSource& rSource ); public: diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index d36957d766ea..1b8023faf5b8 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -223,11 +223,11 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider void ImplCreateHeaderFooterStrings( SvStream& rOut, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet ); void ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet ); - virtual sal_Bool ImplCreateDocument(); + virtual sal_Bool ImplCreateDocument() SAL_OVERRIDE; sal_Bool ImplCreateHyperBlob( SvMemoryStream& rStream ); sal_uInt32 ImplInsertBookmarkURL( const OUString& rBookmark, const sal_uInt32 nType, const OUString& rStringVer0, const OUString& rStringVer1, const OUString& rStringVer2, const OUString& rStringVer3 ); - virtual sal_Bool ImplCreateMainNotes(); + virtual sal_Bool ImplCreateMainNotes() SAL_OVERRIDE; sal_Bool ImplCreateNotes( sal_uInt32 nPageNum ); void ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXBackgroundPropSet ); void ImplWriteVBA(); @@ -267,9 +267,9 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider sal_Bool ImplCloseDocument(); // we write the font, hyper and sound list virtual void ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterID, sal_uInt16 nMode, - sal_Bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ); - virtual void ImplWriteNotes( sal_uInt32 nPageNum ); - virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ); + sal_Bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; + virtual void ImplWriteNotes( sal_uInt32 nPageNum ) SAL_OVERRIDE; + virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; public: PPTWriter( SvStorageRef& rSvStorage, @@ -281,8 +281,8 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider sal_Bool IsValid() const { return mbStatus; }; - virtual void exportPPTPre( const std::vector< com::sun::star::beans::PropertyValue >& ); - virtual void exportPPTPost( ); + virtual void exportPPTPre( const std::vector< com::sun::star::beans::PropertyValue >& ) SAL_OVERRIDE; + virtual void exportPPTPost( ) SAL_OVERRIDE; }; #endif diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx index b4f9e641ebda..6f4fa03afefc 100644 --- a/sd/source/filter/eppt/epptooxml.hxx +++ b/sd/source/filter/eppt/epptooxml.hxx @@ -70,15 +70,15 @@ public: ~PowerPointExport(); // from FilterBase - virtual bool importDocument() throw(); - virtual bool exportDocument() throw(); + virtual bool importDocument() throw() SAL_OVERRIDE; + virtual bool exportDocument() throw() SAL_OVERRIDE; // only needed for import, leave them empty, refactor later XmlFilterBase to export and import base? virtual sal_Int32 getSchemeClr( sal_Int32 /* nColorSchemeToken */ ) const { return 0; } - virtual oox::vml::Drawing* getVmlDrawing() { return NULL; } - virtual const oox::drawingml::Theme* getCurrentTheme() const { return NULL; } - virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() { return oox::drawingml::table::TableStyleListPtr(); } - virtual oox::drawingml::chart::ChartConverter* getChartConverter() { return NULL; } + virtual oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE { return NULL; } + virtual const oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE { return NULL; } + virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE { return oox::drawingml::table::TableStyleListPtr(); } + virtual oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE { return NULL; } static const char* GetSideDirection( sal_uInt8 nDirection ); static const char* GetCornerDirection( sal_uInt8 nDirection ); @@ -88,16 +88,16 @@ public: protected: virtual void ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 nMode, - sal_Bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ); - virtual void ImplWriteNotes( sal_uInt32 nPageNum ); - virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ); - virtual void ImplWriteLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum ); + sal_Bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; + virtual void ImplWriteNotes( sal_uInt32 nPageNum ) SAL_OVERRIDE; + virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; + virtual void ImplWriteLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum ) SAL_OVERRIDE; void ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum ); void WriteTheme( sal_Int32 nThemeNum ); - virtual sal_Bool ImplCreateDocument(); - virtual sal_Bool ImplCreateMainNotes(); - virtual ::oox::ole::VbaProject* implCreateVbaProject() const; + virtual sal_Bool ImplCreateDocument() SAL_OVERRIDE; + virtual sal_Bool ImplCreateMainNotes() SAL_OVERRIDE; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; sal_Bool WriteNotesMaster(); void WriteAnimateTo( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any aValue, const OUString& rAttributeName ); @@ -130,7 +130,7 @@ protected: private: void AddLayoutIdAndRelation( ::sax_fastparser::FSHelperPtr pFS, sal_Int32 nLayoutFileId ); - virtual OUString implGetImplementationName() const; + virtual OUString implGetImplementationName() const SAL_OVERRIDE; ::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx index 81c45447abe8..9ef08c3f55b4 100644 --- a/sd/source/filter/eppt/escherex.hxx +++ b/sd/source/filter/eppt/escherex.hxx @@ -51,8 +51,8 @@ class PptEscherEx : public EscherEx PptEscherEx( SvStream& rOut, const OUString& ); ~PptEscherEx(); - void OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance = 0 ); - void CloseContainer(); + void OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance = 0 ) SAL_OVERRIDE; + void CloseContainer() SAL_OVERRIDE; sal_uInt32 EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClientData ); diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 74d06fe8907f..9cab5ade0780 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -110,9 +110,9 @@ public: PowerPointShapeExport( FSHelperPtr pFS, ShapeHashMap* pShapeMap, PowerPointExport* pFB ); void SetMaster( sal_Bool bMaster ); void SetPageType( PageType ePageType ); - ShapeExport& WriteNonVisualProperties( Reference< XShape > xShape ); - ShapeExport& WriteTextShape( Reference< XShape > xShape ); - ShapeExport& WriteUnknownShape( Reference< XShape > xShape ); + ShapeExport& WriteNonVisualProperties( Reference< XShape > xShape ) SAL_OVERRIDE; + ShapeExport& WriteTextShape( Reference< XShape > xShape ) SAL_OVERRIDE; + ShapeExport& WriteUnknownShape( Reference< XShape > xShape ) SAL_OVERRIDE; ShapeExport& WritePlaceholderShape( Reference< XShape > xShape, PlaceholderType ePlaceholder ); ShapeExport& WritePageShape( Reference< XShape > xShape, PageType ePageType, sal_Bool bPresObj ); diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 61e9fe27f039..bffc54efd364 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -108,7 +108,7 @@ class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper1< com::sun: sal_uInt16 GetErrorCode() const { return nFilterError; }; virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; SdGRFFilter_ImplInteractionHdl::~SdGRFFilter_ImplInteractionHdl() diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx index 44933efc6c58..5d3d4431f714 100644 --- a/sd/source/filter/html/HtmlOptionsDialog.cxx +++ b/sd/source/filter/html/HtmlOptionsDialog.cxx @@ -64,33 +64,33 @@ public: ~SdHtmlOptionsDialog(); // XInterface - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any > & aArguments ) throw ( Exception, RuntimeException, std::exception ); + virtual void SAL_CALL initialize( const Sequence< Any > & aArguments ) throw ( Exception, RuntimeException, std::exception ) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw ( RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw ( RuntimeException, std::exception ); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName() throw ( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( RuntimeException, std::exception ) SAL_OVERRIDE; // XPropertyAccess - virtual Sequence< PropertyValue > SAL_CALL getPropertyValues() throw ( RuntimeException, std::exception ); + virtual Sequence< PropertyValue > SAL_CALL getPropertyValues() throw ( RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & aProps ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XExecuteDialog virtual sal_Int16 SAL_CALL execute() - throw ( com::sun::star::uno::RuntimeException, std::exception ); + throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XExporter virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/sd/source/filter/html/htmlattr.hxx b/sd/source/filter/html/htmlattr.hxx index ad6946158ab7..5274632da254 100644 --- a/sd/source/filter/html/htmlattr.hxx +++ b/sd/source/filter/html/htmlattr.hxx @@ -34,7 +34,7 @@ public: SdHtmlAttrPreview( Window* pParent, const ResId& rResId ); ~SdHtmlAttrPreview(); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; void SetColors( Color& aBack, Color& aText, Color& aLink, Color& aVLink, Color& aALink ); diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index bb4d01f6c798..1912e007bae8 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -70,7 +70,7 @@ public: HtmlErrorContext(Window *pWin=0); ~HtmlErrorContext() {}; - virtual bool GetString( sal_uLong nErrId, OUString& rCtxStr ); + virtual bool GetString( sal_uLong nErrId, OUString& rCtxStr ) SAL_OVERRIDE; void SetContext( sal_uInt16 nResId, const OUString& rURL ); void SetContext( sal_uInt16 nResId, const OUString& rURL1, const OUString& rURL2 ); diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx index 92c992ee2292..003699ee6878 100644 --- a/sd/source/filter/ppt/pptin.hxx +++ b/sd/source/filter/ppt/pptin.hxx @@ -65,9 +65,9 @@ class ImplSdPPTImport : public SdrPowerPointImport void FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiveInfoAtom* pIAtom, const OUString& aMacroName ); - virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ); + virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) SAL_OVERRIDE; virtual SdrObject* ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pText, SdPage* pPage, - SfxStyleSheet*, SfxStyleSheet** ) const; + SfxStyleSheet*, SfxStyleSheet** ) const SAL_OVERRIDE; public: @@ -78,7 +78,7 @@ public: ~ImplSdPPTImport(); sal_Bool Import(); - virtual bool ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rFormComp ) const; + virtual bool ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rFormComp ) const SAL_OVERRIDE; }; class SdPPTImport diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 985b286c2e2c..96b3a99e5fa1 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -81,7 +81,7 @@ public: void ConnectListeners (void); void ReleaseListeners (void); - void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint); + void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) SAL_OVERRIDE; DECL_LINK(WindowEventListener, VclWindowEvent*); DECL_LINK(SelectionChangeListener, void*); DECL_LINK(BroadcastSelectionChange, void*); diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 36692adc70b5..8d7fae1ba8a3 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -75,7 +75,7 @@ public: CategoryListBox( Window* pParent ); ~CategoryListBox(); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; sal_Int32 InsertCategory( const OUString& rStr, sal_Int32 nPos = LISTBOX_APPEND ); @@ -84,7 +84,7 @@ public: DECL_LINK(implDoubleClickHdl, void *); private: - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; Link maDoubleClickHdl; }; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 77c2df212c7d..ee2d80daf125 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -107,9 +107,9 @@ public: PresetPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const OUString& aPresetId, const Link& rModifyHdl ); ~PresetPropertyBox(); - virtual Any getValue(); - virtual void setValue( const Any& rValue, const OUString& rPresetId ); - virtual Control* getControl(); + virtual Any getValue() SAL_OVERRIDE; + virtual void setValue( const Any& rValue, const OUString& rPresetId ) SAL_OVERRIDE; + virtual Control* getControl() SAL_OVERRIDE; private: std::map< sal_uInt16, OUString > maPropertyValues; @@ -194,9 +194,9 @@ public: ColorPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); ~ColorPropertyBox(); - virtual Any getValue(); - virtual void setValue( const Any& rValue, const OUString& rPresetId ); - virtual Control* getControl(); + virtual Any getValue() SAL_OVERRIDE; + virtual void setValue( const Any& rValue, const OUString& rPresetId ) SAL_OVERRIDE; + virtual Control* getControl() SAL_OVERRIDE; private: ColorListBox* mpControl; @@ -278,10 +278,10 @@ public: FontPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); virtual ~FontPropertyBox(); - virtual Any getValue(); - virtual void setValue( const Any& rValue, const OUString& rPresetId ); + virtual Any getValue() SAL_OVERRIDE; + virtual void setValue( const Any& rValue, const OUString& rPresetId ) SAL_OVERRIDE; - virtual Control* getControl(); + virtual Control* getControl() SAL_OVERRIDE; private: FontNameBox* mpControl; @@ -363,8 +363,8 @@ public: DropdownMenuBox( Window* pParent, Edit* pSubControl, PopupMenu* pMenu ); ~DropdownMenuBox(); - void Resize(); - bool PreNotify( NotifyEvent& rNEvt ); + void Resize() SAL_OVERRIDE; + bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void SetMenuSelectHdl( const Link& rLink ) { mpDropdownButton->SetSelectHdl( rLink ); } @@ -447,10 +447,10 @@ public: CharHeightPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); virtual ~CharHeightPropertyBox(); - virtual Any getValue(); - virtual void setValue( const Any& rValue, const OUString& ); + virtual Any getValue() SAL_OVERRIDE; + virtual void setValue( const Any& rValue, const OUString& ) SAL_OVERRIDE; - virtual Control* getControl(); + virtual Control* getControl() SAL_OVERRIDE; DECL_LINK( implMenuSelectHdl, MenuButton* ); @@ -538,10 +538,10 @@ public: TransparencyPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); ~TransparencyPropertyBox(); - virtual Any getValue(); - virtual void setValue( const Any& rValue, const OUString& rPresetId ); + virtual Any getValue() SAL_OVERRIDE; + virtual void setValue( const Any& rValue, const OUString& rPresetId ) SAL_OVERRIDE; - virtual Control* getControl(); + virtual Control* getControl() SAL_OVERRIDE; DECL_LINK( implMenuSelectHdl, MenuButton* ); DECL_LINK(implModifyHdl, void *); @@ -660,10 +660,10 @@ public: RotationPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); ~RotationPropertyBox(); - virtual Any getValue(); - virtual void setValue( const Any& rValue, const OUString& ); + virtual Any getValue() SAL_OVERRIDE; + virtual void setValue( const Any& rValue, const OUString& ) SAL_OVERRIDE; - virtual Control* getControl(); + virtual Control* getControl() SAL_OVERRIDE; DECL_LINK( implMenuSelectHdl, MenuButton* ); DECL_LINK(implModifyHdl, void *); @@ -801,10 +801,10 @@ public: ScalePropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); ~ScalePropertyBox(); - virtual Any getValue(); - virtual void setValue( const Any& rValue, const OUString& ); + virtual Any getValue() SAL_OVERRIDE; + virtual void setValue( const Any& rValue, const OUString& ) SAL_OVERRIDE; - virtual Control* getControl(); + virtual Control* getControl() SAL_OVERRIDE; DECL_LINK( implMenuSelectHdl, MenuButton* ); DECL_LINK(implModifyHdl, void *); @@ -980,10 +980,10 @@ public: FontStylePropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); ~FontStylePropertyBox(); - virtual Any getValue(); - virtual void setValue( const Any& rValue, const OUString& ); + virtual Any getValue() SAL_OVERRIDE; + virtual void setValue( const Any& rValue, const OUString& ) SAL_OVERRIDE; - virtual Control* getControl(); + virtual Control* getControl() SAL_OVERRIDE; DECL_LINK( implMenuSelectHdl, MenuButton* ); diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index daeb6f2b1104..bb052421ca48 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -134,7 +134,7 @@ public: void setSubControl( PropertySubControl* pSubControl ); PropertySubControl* getSubControl() const { return mpSubControl; } - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; private: PropertySubControl* mpSubControl; diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index ffb38577b9dc..d88188d309cc 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -205,12 +205,12 @@ class CustomAnimationListEntryItem : public SvLBoxString public: CustomAnimationListEntryItem( SvTreeListEntry*,sal_uInt16 nFlags, const OUString& aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ); virtual ~CustomAnimationListEntryItem(); - void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); - SvLBoxItem* Create() const; - void Clone( SvLBoxItem* pSource ); + void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) SAL_OVERRIDE; + SvLBoxItem* Create() const SAL_OVERRIDE; + void Clone( SvLBoxItem* pSource ) SAL_OVERRIDE; virtual void Paint( - const Point&, SvTreeListBox& rDev, const SvViewDataEntry* pView,const SvTreeListEntry* pEntry); + const Point&, SvTreeListBox& rDev, const SvViewDataEntry* pView,const SvTreeListEntry* pEntry) SAL_OVERRIDE; private: CustomAnimationList* mpParent; OUString maDescription; @@ -358,11 +358,11 @@ public: CustomAnimationTriggerEntryItem( SvTreeListEntry*,sal_uInt16 nFlags, const OUString& aDescription ); virtual ~CustomAnimationTriggerEntryItem(); virtual sal_uInt16 IsA(); - void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); - SvLBoxItem* Create() const; - void Clone( SvLBoxItem* pSource ); + void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) SAL_OVERRIDE; + SvLBoxItem* Create() const SAL_OVERRIDE; + void Clone( SvLBoxItem* pSource ) SAL_OVERRIDE; virtual void Paint( - const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); + const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; private: OUString maDescription; diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index 8aeb811d0c81..74942dcc2698 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -66,19 +66,19 @@ public: void onSelectionChanged( ::com::sun::star::uno::Any aSelection ); // overrides - virtual void SelectHdl(); - virtual bool DoubleClickHdl(); + virtual void SelectHdl() SAL_OVERRIDE; + virtual bool DoubleClickHdl() SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; - virtual PopupMenu* CreateContextMenu( void ); - virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ); + virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; + virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void SetTabs(); + virtual void SetTabs() SAL_OVERRIDE; - virtual void notify_change(); + virtual void notify_change() SAL_OVERRIDE; const Image& getImage( sal_uInt16 nId ); diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index fe89da0fc74f..bc87ea36838b 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -82,16 +82,16 @@ public: void remove( CustomAnimationEffectPtr& pEffect ); // Control - virtual void StateChanged( StateChangedType nStateChange ); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; // ICustomAnimationListController - virtual void onSelect(); - virtual void onDoubleClick(); - virtual void onContextMenu( sal_uInt16 nSelectedPopupEntry ); + virtual void onSelect() SAL_OVERRIDE; + virtual void onDoubleClick() SAL_OVERRIDE; + virtual void onContextMenu( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; // Window - virtual void DataChanged (const DataChangedEvent& rEvent); + virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; void addUndo(); diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx index 9fc97dba89b2..545f4e527063 100644 --- a/sd/source/ui/animations/SlideTransitionPane.hxx +++ b/sd/source/ui/animations/SlideTransitionPane.hxx @@ -60,7 +60,7 @@ public: virtual ~SlideTransitionPane(); // Window - virtual void DataChanged (const DataChangedEvent& rEvent); + virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; void onSelectionChanged(); void onChangeCurrentPage(); diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 7157451f7325..d35bf1063043 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -76,7 +76,7 @@ private: basegfx::B2DPolyPolygon maPathPolyPolygon; protected: - virtual void createSdrDragEntries(); + virtual void createSdrDragEntries() SAL_OVERRIDE; public: PathDragMove(SdrDragView& rNewView, @@ -94,8 +94,8 @@ public: mxTag( xTag ) {} - virtual bool BeginSdrDrag(); - virtual bool EndSdrDrag(bool bCopy); + virtual bool BeginSdrDrag() SAL_OVERRIDE; + virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE; rtl::Reference mxTag; }; @@ -140,7 +140,7 @@ private: basegfx::B2DPolyPolygon maPathPolyPolygon; protected: - virtual void createSdrDragEntries(); + virtual void createSdrDragEntries() SAL_OVERRIDE; public: PathDragResize(SdrDragView& rNewView, @@ -158,7 +158,7 @@ public: mxTag( xTag ) {} - virtual bool EndSdrDrag(bool bCopy); + virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE; rtl::Reference mxTag; }; @@ -201,7 +201,7 @@ private: basegfx::B2DPolyPolygon maPathPolyPolygon; protected: - virtual void createSdrDragEntries(); + virtual void createSdrDragEntries() SAL_OVERRIDE; public: PathDragObjOwn(SdrDragView& rNewView, @@ -215,7 +215,7 @@ public: maPathPolyPolygon() {} - virtual bool EndSdrDrag(bool bCopy); + virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE; }; void PathDragObjOwn::createSdrDragEntries() @@ -252,10 +252,10 @@ class SdPathHdl : public SmartHdl public: SdPathHdl( const SmartTagReference& xTag, SdrPathObj* mpPathObj ); virtual ~SdPathHdl(); - virtual void CreateB2dIAObject(); - virtual bool IsFocusHdl() const; + virtual void CreateB2dIAObject() SAL_OVERRIDE; + virtual bool IsFocusHdl() const SAL_OVERRIDE; virtual Pointer GetSdrDragPointer() const; - virtual bool isMarkable() const; + virtual bool isMarkable() const SAL_OVERRIDE; private: SdrPathObj* mpPathObj; diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx index adb037dc3ea9..faa883bef6c1 100644 --- a/sd/source/ui/animations/motionpathtag.hxx +++ b/sd/source/ui/animations/motionpathtag.hxx @@ -44,40 +44,40 @@ public: SdrPathObj* getPathObj() const { return mpPathObj; } /// @return true if the SmartTag handled the event. - virtual bool MouseButtonDown( const MouseEvent&, SmartHdl& ); + virtual bool MouseButtonDown( const MouseEvent&, SmartHdl& ) SAL_OVERRIDE; /// @return true if the SmartTag consumes this event. - virtual bool KeyInput( const KeyEvent& rKEvt ); + virtual bool KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; // callbacks from sdr view - virtual sal_uLong GetMarkablePointCount() const; - virtual sal_uLong GetMarkedPointCount() const; - virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); - virtual void CheckPossibilities(); - virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark); + virtual sal_uLong GetMarkablePointCount() const SAL_OVERRIDE; + virtual sal_uLong GetMarkedPointCount() const SAL_OVERRIDE; + virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False) SAL_OVERRIDE; + virtual void CheckPossibilities() SAL_OVERRIDE; + virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) SAL_OVERRIDE; const CustomAnimationEffectPtr& getEffect() const { return mpEffect; } - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; // IPolyPolygonEditorController - virtual void DeleteMarkedPoints(); - virtual bool IsDeleteMarkedPointsPossible() const; + virtual void DeleteMarkedPoints() SAL_OVERRIDE; + virtual bool IsDeleteMarkedPointsPossible() const SAL_OVERRIDE; - virtual void RipUpAtMarkedPoints(); - virtual bool IsRipUpAtMarkedPointsPossible() const; + virtual void RipUpAtMarkedPoints() SAL_OVERRIDE; + virtual bool IsRipUpAtMarkedPointsPossible() const SAL_OVERRIDE; - virtual bool IsSetMarkedSegmentsKindPossible() const; - virtual SdrPathSegmentKind GetMarkedSegmentsKind() const; - virtual void SetMarkedSegmentsKind(SdrPathSegmentKind eKind); + virtual bool IsSetMarkedSegmentsKindPossible() const SAL_OVERRIDE; + virtual SdrPathSegmentKind GetMarkedSegmentsKind() const SAL_OVERRIDE; + virtual void SetMarkedSegmentsKind(SdrPathSegmentKind eKind) SAL_OVERRIDE; - virtual bool IsSetMarkedPointsSmoothPossible() const; - virtual SdrPathSmoothKind GetMarkedPointsSmooth() const; - virtual void SetMarkedPointsSmooth(SdrPathSmoothKind eKind); + virtual bool IsSetMarkedPointsSmoothPossible() const SAL_OVERRIDE; + virtual SdrPathSmoothKind GetMarkedPointsSmooth() const SAL_OVERRIDE; + virtual void SetMarkedPointsSmooth(SdrPathSmoothKind eKind) SAL_OVERRIDE; - virtual void CloseMarkedObjects(bool bToggle, bool bOpen ); - virtual bool IsOpenCloseMarkedObjectsPossible() const; - virtual SdrObjClosedKind GetMarkedObjectsClosedState() const; + virtual void CloseMarkedObjects(bool bToggle, bool bOpen ) SAL_OVERRIDE; + virtual bool IsOpenCloseMarkedObjectsPossible() const SAL_OVERRIDE; + virtual SdrObjClosedKind GetMarkedObjectsClosedState() const SAL_OVERRIDE; void MovePath( int nDX, int nDY ); bool OnDelete(); @@ -86,17 +86,17 @@ public: bool OnMove( const KeyEvent& rKEvt ); // XChangesListener - virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire( ) throw (); - virtual void SAL_CALL release( ) throw (); + virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw () SAL_OVERRIDE; protected: - virtual void addCustomHandles( SdrHdlList& rHandlerList ); - virtual bool getContext( SdrViewContext& rContext ); - virtual void disposing(); - virtual void deselect(); + virtual void addCustomHandles( SdrHdlList& rHandlerList ) SAL_OVERRIDE; + virtual bool getContext( SdrViewContext& rContext ) SAL_OVERRIDE; + virtual void disposing() SAL_OVERRIDE; + virtual void deselect() SAL_OVERRIDE; void updatePathAttributes(); void selectionChanged(); diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index ac92bd18c7a9..4ac5997d923c 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -55,11 +55,11 @@ public: void init(); // WeakComponentImplHelper1 - virtual void SAL_CALL disposing (); + virtual void SAL_CALL disposing () SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void ExecuteAnnotation (SfxRequest& rRequest); void GetAnnotationState (SfxItemSet& rItemSet); diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index c96bef51f24e..c0cbf57c5c1e 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -101,10 +101,10 @@ class AnnotationDragMove : public SdrDragMove { public: AnnotationDragMove(SdrDragView& rNewView, const rtl::Reference & xTag); - virtual bool BeginSdrDrag(); - virtual bool EndSdrDrag(bool bCopy); - virtual void MoveSdrDrag(const Point& rNoSnapPnt); - virtual void CancelSdrDrag(); + virtual bool BeginSdrDrag() SAL_OVERRIDE; + virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE; + virtual void MoveSdrDrag(const Point& rNoSnapPnt) SAL_OVERRIDE; + virtual void CancelSdrDrag() SAL_OVERRIDE; private: rtl::Reference mxTag; @@ -165,10 +165,10 @@ class AnnotationHdl : public SmartHdl public: AnnotationHdl( const SmartTagReference& xTag, const Reference< XAnnotation >& xAnnotation, const Point& rPnt ); virtual ~AnnotationHdl(); - virtual void CreateB2dIAObject(); - virtual bool IsFocusHdl() const; + virtual void CreateB2dIAObject() SAL_OVERRIDE; + virtual bool IsFocusHdl() const SAL_OVERRIDE; virtual Pointer GetSdrDragPointer() const; - virtual bool isMarkable() const; + virtual bool isMarkable() const SAL_OVERRIDE; private: diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx index 56997eaafede..aed68740d33a 100644 --- a/sd/source/ui/annotations/annotationtag.hxx +++ b/sd/source/ui/annotations/annotationtag.hxx @@ -38,23 +38,23 @@ public: virtual ~AnnotationTag(); /// @return true if the SmartTag handled the event. - virtual bool MouseButtonDown( const MouseEvent&, SmartHdl& ); + virtual bool MouseButtonDown( const MouseEvent&, SmartHdl& ) SAL_OVERRIDE; /// @return true if the SmartTag consumes this event. - virtual bool KeyInput( const KeyEvent& rKEvt ); + virtual bool KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; /// @return true if the SmartTag consumes this event. - virtual bool RequestHelp( const HelpEvent& rHEvt ); + virtual bool RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; /// @return true if the SmartTag consumes this event. - virtual bool Command( const CommandEvent& rCEvt ); + virtual bool Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; // callbacks from sdr view - virtual sal_uLong GetMarkablePointCount() const; - virtual sal_uLong GetMarkedPointCount() const; - virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); - virtual void CheckPossibilities(); - virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark); + virtual sal_uLong GetMarkablePointCount() const SAL_OVERRIDE; + virtual sal_uLong GetMarkedPointCount() const SAL_OVERRIDE; + virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False) SAL_OVERRIDE; + virtual void CheckPossibilities() SAL_OVERRIDE; + virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) SAL_OVERRIDE; void Move( int nDX, int nDY ); bool OnMove( const KeyEvent& rKEvt ); @@ -67,11 +67,11 @@ public: void ClosePopup(); protected: - virtual void addCustomHandles( SdrHdlList& rHandlerList ); - virtual bool getContext( SdrViewContext& rContext ); - virtual void disposing(); - virtual void select(); - virtual void deselect(); + virtual void addCustomHandles( SdrHdlList& rHandlerList ) SAL_OVERRIDE; + virtual bool getContext( SdrViewContext& rContext ) SAL_OVERRIDE; + virtual void disposing() SAL_OVERRIDE; + virtual void select() SAL_OVERRIDE; + virtual void deselect() SAL_OVERRIDE; DECL_LINK( WindowEventHandler, VclWindowEvent* ); DECL_LINK( ClosePopupHdl, void* ); diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 387686c11ddb..5e74d9fd0df1 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -52,13 +52,13 @@ private: AnnotationWindow* mpAnnotationWindow; protected: - virtual void Paint( const Rectangle& rRect); - virtual void KeyInput( const KeyEvent& rKeyEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void LoseFocus(); + virtual void Paint( const Rectangle& rRect) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; public: AnnotationTextWindow( AnnotationWindow* pParent, WinBits nBits ); @@ -66,10 +66,10 @@ public: void SetOutlinerView( OutlinerView* pOutlinerView ) { mpOutlinerView = pOutlinerView; } - virtual OUString GetSurroundingText() const; - virtual Selection GetSurroundingTextSelection() const; + virtual OUString GetSurroundingText() const SAL_OVERRIDE; + virtual Selection GetSurroundingTextSelection() const SAL_OVERRIDE; - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; }; @@ -94,7 +94,7 @@ class AnnotationWindow : public FloatingWindow basegfx::B2DPolygon maPopupTriangle; protected: - void SetSizePixel( const Size& rNewSize ); + void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE; DECL_LINK(ModifyHdl, void*); DECL_LINK(ScrollHdl, ScrollBar*); @@ -142,12 +142,12 @@ class AnnotationWindow : public FloatingWindow DECL_LINK( OnlineSpellCallback, SpellCallbackInfo*); - virtual void Deactivate(); - virtual void Paint( const Rectangle& rRect); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void GetFocus(); + virtual void Deactivate() SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; void SetColor(); diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index 9ec549c91b15..ef6fdf25bf28 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -43,7 +43,7 @@ public: private: sal_uInt16 nCurId; - virtual void Select(); + virtual void Select() SAL_OVERRIDE; }; diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx index 3711f1f99d41..71e2bb3df1ff 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.hxx +++ b/sd/source/ui/controller/slidelayoutcontroller.hxx @@ -32,11 +32,11 @@ public: const OUString& sCommandURL, bool bInsertPage ); - virtual ::Window* createPopupWindow( ::Window* pParent ); + virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; using svt::PopupWindowController::createPopupWindow; private: diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx index 60abb9564f29..4026b97d422a 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx @@ -47,7 +47,7 @@ public: SdPhotoAlbumDialog(Window* pWindow, SdDrawDocument* pActDoc); ~SdPhotoAlbumDialog(); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; private: static OUString sDirUrl; diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index 9daa69a170e4..966af2ada373 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -78,7 +78,7 @@ public: // XEventListener virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class ClientBox: @@ -137,11 +137,11 @@ public: ClientBox( Window* pParent, WinBits nStyle ); ~ClientBox(); - void MouseButtonDown( const MouseEvent& rMEvt ); - void Paint( const Rectangle &rPaintRect ); - void Resize(); - Size GetOptimalSize() const; - bool Notify( NotifyEvent& rNEvt ); + void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + void Paint( const Rectangle &rPaintRect ) SAL_OVERRIDE; + void Resize() SAL_OVERRIDE; + Size GetOptimalSize() const SAL_OVERRIDE; + bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; const Size GetMinOutputSizePixel() const; void SetExtraSize( long nSize ) { m_nExtraHeight = nSize; } diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index a62d476e45dc..babe18892d07 100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -43,7 +43,7 @@ public: DECL_LINK( CheckButtonClickHdl, void * ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 92a785c5cdd5..00564e61c3ea 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -73,7 +73,7 @@ public: ErrCode Execute(); // overwritten from FileDialogHelper, to receive user feedback - virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); + virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ) SAL_OVERRIDE; }; diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index a6d4f06f8167..7177a77ad05d 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -78,8 +78,8 @@ public: PresLayoutPreview( ::Window* pParent ); ~PresLayoutPreview(); - virtual void Paint( const Rectangle& rRect ); - virtual Size GetOptimalSize() const; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void init( SdPage* pMaster ); void update( HeaderFooterSettings& rSettings ); diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index 41fddeabfdb6..4f8fe915a367 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -43,8 +43,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; private: TriStateBox* m_pNewStartCB; diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index f7ccf3e97928..d29ce574456c 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -29,7 +29,7 @@ public: \ : pDlg(p) \ {} \ virtual ~Class(); \ - virtual short Execute() ; + virtual short Execute() SAL_OVERRIDE ; #define IMPL_ABSTDLG_BASE(Class) \ Class::~Class() \ @@ -58,170 +58,170 @@ class SdVclAbstractDialog_Impl : public VclAbstractDialog class AbstractCopyDlg_Impl : public AbstractCopyDlg { DECL_ABSTDLG_BASE(AbstractCopyDlg_Impl,::sd::CopyDlg) - virtual void GetAttr( SfxItemSet& rOutAttrs ); + virtual void GetAttr( SfxItemSet& rOutAttrs ) SAL_OVERRIDE; }; class SdCustomShowDlg; class AbstractSdCustomShowDlg_Impl : public AbstractSdCustomShowDlg { DECL_ABSTDLG_BASE(AbstractSdCustomShowDlg_Impl,SdCustomShowDlg) - virtual sal_Bool IsModified() const ; - virtual sal_Bool IsCustomShow() const ; + virtual sal_Bool IsModified() const SAL_OVERRIDE ; + virtual sal_Bool IsCustomShow() const SAL_OVERRIDE ; }; class SfxTabDialog; class SdAbstractTabDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( SdAbstractTabDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( sal_uInt16 nId ); - virtual void SetCurPageId( const OString& rName ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; + virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; //From class Window. - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; }; class SfxTabDialog; class AbstractBulletDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( AbstractBulletDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( sal_uInt16 nId ); - virtual void SetCurPageId( const OString& rName ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; + virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; //From class Window. - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; }; class SdPresLayoutTemplateDlg; class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( SdPresLayoutTemplateDlg_Impl,SdPresLayoutTemplateDlg ) - virtual void SetCurPageId( sal_uInt16 nId ); - virtual void SetCurPageId( const OString& rName ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; + virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; //From class Window. - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; }; class AssistentDlg; class AbstractAssistentDlg_Impl : public AbstractAssistentDlg { DECL_ABSTDLG_BASE(AbstractAssistentDlg_Impl,AssistentDlg) - virtual SfxObjectShellLock GetDocument(); - virtual OutputType GetOutputMedium() const; - virtual sal_Bool IsSummary() const; - virtual StartType GetStartType() const; - virtual OUString GetDocPath() const; - virtual sal_Bool GetStartWithFlag() const; - virtual sal_Bool IsDocEmpty() const; - virtual com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > GetPassword(); + virtual SfxObjectShellLock GetDocument() SAL_OVERRIDE; + virtual OutputType GetOutputMedium() const SAL_OVERRIDE; + virtual sal_Bool IsSummary() const SAL_OVERRIDE; + virtual StartType GetStartType() const SAL_OVERRIDE; + virtual OUString GetDocPath() const SAL_OVERRIDE; + virtual sal_Bool GetStartWithFlag() const SAL_OVERRIDE; + virtual sal_Bool IsDocEmpty() const SAL_OVERRIDE; + virtual com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > GetPassword() SAL_OVERRIDE; }; class SdModifyFieldDlg; class AbstractSdModifyFieldDlg_Impl : public AbstractSdModifyFieldDlg { DECL_ABSTDLG_BASE(AbstractSdModifyFieldDlg_Impl,SdModifyFieldDlg) - virtual SvxFieldData* GetField(); - virtual SfxItemSet GetItemSet(); + virtual SvxFieldData* GetField() SAL_OVERRIDE; + virtual SfxItemSet GetItemSet() SAL_OVERRIDE; }; class SdSnapLineDlg; class AbstractSdSnapLineDlg_Impl : public AbstractSdSnapLineDlg { DECL_ABSTDLG_BASE(AbstractSdSnapLineDlg_Impl,SdSnapLineDlg) - virtual void GetAttr(SfxItemSet& rOutAttrs); - virtual void HideRadioGroup(); - virtual void HideDeleteBtn(); - virtual void SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY); + virtual void GetAttr(SfxItemSet& rOutAttrs) SAL_OVERRIDE; + virtual void HideRadioGroup() SAL_OVERRIDE; + virtual void HideDeleteBtn() SAL_OVERRIDE; + virtual void SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY) SAL_OVERRIDE; //from class Window - virtual void SetText( const OUString& rStr ); + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; }; class SdInsertLayerDlg; class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg { DECL_ABSTDLG_BASE(AbstractSdInsertLayerDlg_Impl,SdInsertLayerDlg) - virtual void GetAttr( SfxItemSet& rOutAttrs ) ; + virtual void GetAttr( SfxItemSet& rOutAttrs ) SAL_OVERRIDE ; //from class Window - virtual void SetHelpId( const OString& rHelpId ) ; + virtual void SetHelpId( const OString& rHelpId ) SAL_OVERRIDE ; }; class SdInsertPasteDlg; class AbstractSdInsertPasteDlg_Impl : public AbstractSdInsertPasteDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPasteDlg_Impl,SdInsertPasteDlg) - virtual sal_Bool IsInsertBefore() const; + virtual sal_Bool IsInsertBefore() const SAL_OVERRIDE; }; class SdInsertPagesObjsDlg; class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg) - virtual ::Window * GetWindow(); - virtual std::vector GetList ( const sal_uInt16 nType ); - virtual sal_Bool IsLink(); - virtual sal_Bool IsRemoveUnnessesaryMasterPages() const; + virtual ::Window * GetWindow() SAL_OVERRIDE; + virtual std::vector GetList ( const sal_uInt16 nType ) SAL_OVERRIDE; + virtual sal_Bool IsLink() SAL_OVERRIDE; + virtual sal_Bool IsRemoveUnnessesaryMasterPages() const SAL_OVERRIDE; }; class AbstractMorphDlg_Impl : public AbstractMorphDlg { DECL_ABSTDLG_BASE(AbstractMorphDlg_Impl,::sd::MorphDlg) - virtual void SaveSettings() const; - virtual sal_uInt16 GetFadeSteps() const; - virtual sal_Bool IsAttributeFade() const ; - virtual sal_Bool IsOrientationFade() const ; + virtual void SaveSettings() const SAL_OVERRIDE; + virtual sal_uInt16 GetFadeSteps() const SAL_OVERRIDE; + virtual sal_Bool IsAttributeFade() const SAL_OVERRIDE ; + virtual sal_Bool IsOrientationFade() const SAL_OVERRIDE ; }; class SdStartPresentationDlg; class AbstractSdStartPresDlg_Impl : public AbstractSdStartPresDlg { DECL_ABSTDLG_BASE(AbstractSdStartPresDlg_Impl,SdStartPresentationDlg) - virtual void GetAttr( SfxItemSet& rOutAttrs ); + virtual void GetAttr( SfxItemSet& rOutAttrs ) SAL_OVERRIDE; }; class SdPresLayoutDlg; class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg { DECL_ABSTDLG_BASE(AbstractSdPresLayoutDlg_Impl,SdPresLayoutDlg) - virtual void GetAttr(SfxItemSet& rOutAttrs); + virtual void GetAttr(SfxItemSet& rOutAttrs) SAL_OVERRIDE; }; class SdAbstractSfxDialog_Impl : public SfxAbstractDialog { DECL_ABSTDLG_BASE(SdAbstractSfxDialog_Impl,SfxModalDialog) - virtual const SfxItemSet* GetOutputItemSet() const; - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; }; class SdVectorizeDlg; class AbstractSdVectorizeDlg_Impl :public AbstractSdVectorizeDlg { DECL_ABSTDLG_BASE(AbstractSdVectorizeDlg_Impl,SdVectorizeDlg) - virtual const GDIMetaFile& GetGDIMetaFile() const ; + virtual const GDIMetaFile& GetGDIMetaFile() const SAL_OVERRIDE ; }; class SdPublishingDlg; class AbstractSdPublishingDlg_Impl :public AbstractSdPublishingDlg { DECL_ABSTDLG_BASE(AbstractSdPublishingDlg_Impl,SdPublishingDlg) - virtual void GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams ); + virtual void GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams ) SAL_OVERRIDE; }; class AbstractHeaderFooterDialog_Impl :public AbstractHeaderFooterDialog { DECL_ABSTDLG_BASE(AbstractHeaderFooterDialog_Impl,::sd::HeaderFooterDialog) - virtual void ApplyToAll(); - virtual void Apply(); - virtual void Cancel(); + virtual void ApplyToAll() SAL_OVERRIDE; + virtual void Apply() SAL_OVERRIDE; + virtual void Cancel() SAL_OVERRIDE; }; //AbstractDialogFactory_Impl implementations @@ -231,46 +231,46 @@ class SdAbstractDialogFactory_Impl : public SdAbstractDialogFactory public: virtual ~SdAbstractDialogFactory_Impl() {} - virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ); - virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference &pColTab, ::sd::View* pView ); - virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ); - virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ); - virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage = sal_True ); - virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, sal_Bool bAutoPilot); - virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); - virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); - virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ); - virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( ::Window* pWindow ); - virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( ::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ); - virtual AbstractMorphDlg* CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2); - virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ); - virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ); + virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) SAL_OVERRIDE; + virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference &pColTab, ::sd::View* pView ) SAL_OVERRIDE; + virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage = sal_True ) SAL_OVERRIDE; + virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, sal_Bool bAutoPilot) SAL_OVERRIDE; + virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) SAL_OVERRIDE; + virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) SAL_OVERRIDE; + virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( ::Window* pWindow ) SAL_OVERRIDE; + virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( ::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) SAL_OVERRIDE; + virtual AbstractMorphDlg* CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ) SAL_OVERRIDE; virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, - const std::vector &rPageNames, SdCustomShowList* pCSList ); - virtual VclAbstractDialog* CreateRemoteDialog( ::Window* pWindow ); // ad for RemoteDialog - virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); - virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs); - virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ); - virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ); - virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ); - virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType); + const std::vector &rPageNames, SdCustomShowList* pCSList ) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateRemoteDialog( ::Window* pWindow ) SAL_OVERRIDE; // ad for RemoteDialog + virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) SAL_OVERRIDE; + virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) SAL_OVERRIDE; + virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) SAL_OVERRIDE; + virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) SAL_OVERRIDE; + virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateSdPhotoAlbumDialog( ::Window* pWindow, SdDrawDocument* pDoc); + virtual VclAbstractDialog* CreateSdPhotoAlbumDialog( ::Window* pWindow, SdDrawDocument* pDoc) SAL_OVERRIDE; virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent, SdDrawDocument* pDoc, - SdPage* ); + SdPage* ) SAL_OVERRIDE; virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent, SdDrawDocument* pDoc, - SdPage* pCurrentPage ); + SdPage* pCurrentPage ) SAL_OVERRIDE; // For TabPage - virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc(); - virtual CreateTabPage GetSdPrintOptionsTabPageCreatorFunc(); - virtual CreateTabPage GetSdOptionsMiscTabPageCreatorFunc(); - virtual CreateTabPage GetSdOptionsSnapTabPageCreatorFunc(); + virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc() SAL_OVERRIDE; + virtual CreateTabPage GetSdPrintOptionsTabPageCreatorFunc() SAL_OVERRIDE; + virtual CreateTabPage GetSdOptionsMiscTabPageCreatorFunc() SAL_OVERRIDE; + virtual CreateTabPage GetSdOptionsSnapTabPageCreatorFunc() SAL_OVERRIDE; }; diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx index b3f7aa1b1287..03c1ae8e743f 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx @@ -86,7 +86,7 @@ public: virtual void SAL_CALL execute ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XConfiguration>& rxConfiguration) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed @@ -95,13 +95,13 @@ public: debugging purposes. */ virtual OUString SAL_CALL getName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ virtual void SAL_CALL setName (const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: const css::uno::Reference mxResourceId; diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx index 32ca67bcf055..283c1d9f38fa 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.hxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx @@ -62,7 +62,7 @@ public: virtual void SAL_CALL execute ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XConfiguration>& rxConfiguration) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed @@ -71,13 +71,13 @@ public: debugging purposes. */ virtual OUString SAL_CALL getName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ virtual void SAL_CALL setName (const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index b8a639581356..e5a8ee042420 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx @@ -71,14 +71,14 @@ public: const css::uno::Reference& rxContext); virtual ~BasicPaneFactory (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XResourceFactory @@ -86,26 +86,26 @@ public: virtual css::uno::Reference SAL_CALL createResource ( const css::uno::Reference& rxPaneId) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL releaseResource ( const css::uno::Reference& rxPane) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference mxComponentContext; diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx index c4b7ec3fc8e9..32932f13d87d 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx @@ -61,7 +61,7 @@ public: const css::uno::Reference& rxContext); virtual ~BasicToolBarFactory (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // ToolBarFactory @@ -70,27 +70,27 @@ public: createResource ( const css::uno::Reference< css::drawing::framework::XResourceId>& rxToolBarId) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL releaseResource ( const css::uno::Reference& rxToolBar) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference mxConfigurationController; diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index bff242c20c4e..761ee536b883 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -78,7 +78,7 @@ public: const css::uno::Reference& rxContext); virtual ~BasicViewFactory (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XViewFactory @@ -86,18 +86,18 @@ public: virtual css::uno::Reference SAL_CALL createResource ( const css::uno::Reference& rxViewId) - throw(css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception); + throw(css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL releaseResource ( const css::uno::Reference& xView) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index bcbbfc6acd80..a7d69c99863b 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -64,7 +64,7 @@ public: */ void Hide (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; /** This returns the content window when the child window is already visible. Otherwise is returned. In that case a later call @@ -73,14 +73,14 @@ public: Note that GetWindow() may return different Window pointers when Hide() is called in between. */ - virtual ::Window* GetWindow (void); + virtual ::Window* GetWindow (void) SAL_OVERRIDE; /** The local getWindow() first calls GetWindow() to provide a valid window pointer before forwarding the call to the base class. */ virtual ::com::sun::star::uno::Reference SAL_CALL getWindow (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECLARE_XINTERFACE() DECLARE_XTYPEPROVIDER() @@ -90,7 +90,7 @@ public: virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference mxPaneId; diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx index b8725f92b153..eb814a827ffe 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.hxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx @@ -45,7 +45,7 @@ public: Therefore this method always returns . */ virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index f99e161a71cc..b9a0c333a848 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -54,22 +54,22 @@ public: const ::Window* pViewShellWindow); virtual ~FullScreenPane (void) throw(); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; //----- XPane ------------------------------------------------------------- virtual sal_Bool SAL_CALL isVisible (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setVisible (sal_Bool bIsVisible) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Reference SAL_CALL getAccessible (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAccessible ( const cssu::Reference& rxAccessible) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; @@ -79,7 +79,7 @@ public: protected: virtual ::com::sun::star::uno::Reference CreateCanvas (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: css::uno::Reference mxComponentContext; diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 3651f4615765..0639765115a3 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -50,13 +50,13 @@ public: PresentationFactoryProvider (const Reference& rxContext); virtual ~PresentationFactoryProvider (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence& aArguments) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -79,10 +79,10 @@ public: // XView - virtual Reference SAL_CALL getResourceId (void) throw (RuntimeException, std::exception) + virtual Reference SAL_CALL getResourceId (void) throw (RuntimeException, std::exception) SAL_OVERRIDE { return mxResourceId; }; - virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (RuntimeException, std::exception) + virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (RuntimeException, std::exception) SAL_OVERRIDE { return false; } diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx index 66a5f6b29107..a3a2ef388226 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx @@ -62,20 +62,20 @@ public: ::com::sun::star::uno::Reference& rxController); virtual ~CenterViewFocusModule (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( const com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing ( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: class ViewShellContainer; diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index 2d1dc1b4093f..4c818dd5a666 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -63,19 +63,19 @@ public: sal_Bool IsResourceActive (const OUString& rsMainViewURL); virtual void SaveResourceState (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( const com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing ( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: ::com::sun::star::uno::Reference diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx index 31102989aca4..9d97ff3d239a 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.hxx +++ b/sd/source/ui/framework/module/ShellStackGuard.hxx @@ -70,19 +70,19 @@ public: ShellStackGuard (css::uno::Reference& rxController); virtual ~ShellStackGuard (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx index ae12d651d434..37f553a709c0 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.hxx +++ b/sd/source/ui/framework/module/SlideSorterModule.hxx @@ -39,12 +39,12 @@ public: const OUString& rsLeftPaneURL); virtual ~SlideSorterModule (void); - virtual void SaveResourceState (void); + virtual void SaveResourceState (void) SAL_OVERRIDE; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference mxViewTabBarId; diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx index c03b7c2d9704..a47c7337e5ee 100644 --- a/sd/source/ui/framework/module/ToolBarModule.hxx +++ b/sd/source/ui/framework/module/ToolBarModule.hxx @@ -61,20 +61,20 @@ public: const css::uno::Reference& rxController); virtual ~ToolBarModule (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference< diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx index 10f22b985d6f..3f22e6efe39a 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.hxx +++ b/sd/source/ui/framework/module/ToolPanelModule.hxx @@ -38,12 +38,12 @@ public: const OUString& rsRightPaneURL); virtual ~ToolPanelModule (void); - virtual void SaveResourceState (void); + virtual void SaveResourceState (void) SAL_OVERRIDE; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference mxControllerManager; diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx index 232ce6840ada..fee1ead700f9 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.hxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx @@ -64,20 +64,20 @@ public: css::drawing::framework::XResourceId>& rxViewTabBarId); virtual ~ViewTabBarModule (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference< diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 8a8d27195813..6cb7dd0d27fb 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -95,13 +95,13 @@ public: const ::sd::framework::FrameworkHelper::Callback& rCallback); virtual ~CallbackCaller (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange (const ConfigurationChangeEvent& rEvent) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; private: OUString msEventType; @@ -133,17 +133,17 @@ public: explicit LifetimeController (::sd::ViewShellBase& rBase); virtual ~LifetimeController (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; /** XEventListener. This method is called when the frame::XController is being destroyed. */ virtual void SAL_CALL disposing (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; /** This method is called when the ViewShellBase is being destroyed. */ - virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint); + virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) SAL_OVERRIDE; private: ::sd::ViewShellBase& mrBase; @@ -315,10 +315,10 @@ public: DisposeListener (const ::boost::shared_ptr& rpHelper); ~DisposeListener (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; virtual void SAL_CALL disposing (const lang::EventObject& rEventObject) - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; private: ::boost::shared_ptr mpHelper; diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 7791eded64e4..bf5236e8b322 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -138,21 +138,21 @@ public: overload this method. */ virtual void ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder); + const IAccessibleViewForwarder* pViewForwarder) SAL_OVERRIDE; //===== XAccessibleContext ============================================== virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This implementation returns either 1 or 0 depending on whether there is an active accessible OLE object or not. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This implementation either returns the active accessible OLE object if it exists and the given index is 0 or throws an exception. @@ -161,7 +161,7 @@ public: ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ @@ -169,34 +169,34 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint (const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XInterface ====================================================== virtual com::sun::star::uno::Any SAL_CALL queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire (void) - throw (); + throw () SAL_OVERRIDE; virtual void SAL_CALL release (void) - throw (); + throw () SAL_OVERRIDE; //===== XServiceInfo ==================================================== @@ -205,84 +205,84 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XPropertyChangeListener ========================================= virtual void SAL_CALL propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XWindowListener ================================================= virtual void SAL_CALL windowResized (const ::com::sun::star::awt::WindowEvent& e) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const ::com::sun::star::awt::WindowEvent& e) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const ::com::sun::star::lang::EventObject& e) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const ::com::sun::star::lang::EventObject& e) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XFocusListener ================================================= virtual void SAL_CALL focusGained (const ::com::sun::star::awt::FocusEvent& e) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL focusLost (const ::com::sun::star::awt::FocusEvent& e) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----------------------------xAttribute---------------------------- virtual com::sun::star::uno::Any SAL_CALL getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; ::sd::ViewShell* mpViewShell; private: // return the member maMutex; virtual ::osl::Mutex& - implGetMutex(); + implGetMutex() SAL_OVERRIDE; // return ourself as context in default case virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > implGetAccessibleContext() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; // return sal_False in default case virtual bool implIsSelected( sal_Int32 nAccessibleChildIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; // return nothing in default case virtual void implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; protected: /// The core window that is made accessible. @@ -317,7 +317,7 @@ protected: // This method is called from the component helper base class while // disposing. - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; /** Create a name string. The current name is not modified and, therefore, no events are send. This method is usually called once @@ -327,7 +327,7 @@ protected: */ virtual OUString CreateAccessibleName () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /** Create a description string. The current description is not modified and, therefore, no events are send. This method is usually @@ -338,7 +338,7 @@ protected: */ virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /** This method is called when (after) the frame containing this document has been activated. Can be used to send FOCUSED state @@ -374,15 +374,15 @@ protected: //===== XAccessibleGetAccFromXShape ============================================ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; public: virtual void SwitchViewActivated (void) { Activated(); } virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void impl_dispose (void); }; diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index e7bd34c04f2e..44acc0b40c78 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -53,63 +53,63 @@ public: /** Complete the initialization begun in the constructor. */ - virtual void Init (void); + virtual void Init (void) SAL_OVERRIDE; //===== IAccessibleViewForwarderListener ================================ virtual void ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder); + const IAccessibleViewForwarder* pViewForwarder) SAL_OVERRIDE; //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XPropertyChangeListener ========================================= virtual void SAL_CALL propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XInterface ====================================================== virtual com::sun::star::uno::Any SAL_CALL queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire (void) - throw (); + throw () SAL_OVERRIDE; virtual void SAL_CALL release (void) - throw (); + throw () SAL_OVERRIDE; //===== XAccessibleGroupPosition ========================================= virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getGroupPosition( const ::com::sun::star::uno::Any& rAny ) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getObjectLink( const ::com::sun::star::uno::Any& accoject ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; protected: @@ -117,16 +117,16 @@ protected: virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual bool implIsSelected( sal_Int32 nAccessibleChildIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /** Select or deselect the specified child or all children if the given index has the special value ACCESSIBLE_SELECTION_CHILD_ALL. @@ -143,7 +143,7 @@ protected: */ virtual void implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: ::sd::ViewShell* mpSdViewSh; @@ -156,7 +156,7 @@ protected: // This method is called from the component helper base class while // disposing. - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; /** Create a shape the represents the page as seen on the screen. */ @@ -165,31 +165,31 @@ protected: /// Create an accessible name that contains the current view mode. virtual OUString CreateAccessibleName () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /** Create an accessible description that contains the current view mode. */ virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /** Make sure that the currently focused shape sends a FOCUSED state change event indicating that it has (regained) the focus. */ - virtual void Activated (void); + virtual void Activated (void) SAL_OVERRIDE; /** Make sure that the currently focused shape sends a FOCUSED state change event indicating that it has lost the focus. */ - virtual void Deactivated (void); + virtual void Deactivated (void) SAL_OVERRIDE; - virtual void impl_dispose (void); + virtual void impl_dispose (void) SAL_OVERRIDE; //===== XAccessibleGetAccFromXShape ============================================ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetSelAccContextInTable(); diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index f10f217984bb..b4726387db9f 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -56,21 +56,21 @@ namespace accessibility virtual ~AccessibleOutlineEditSource(); /// This method is disabled and always returns NULL - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); + virtual SvxEditSource* Clone() const SAL_OVERRIDE; + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE; - virtual void UpdateData(); - virtual SfxBroadcaster& GetBroadcaster() const; + virtual void UpdateData() SAL_OVERRIDE; + virtual SfxBroadcaster& GetBroadcaster() const SAL_OVERRIDE; // the view forwarder - virtual bool IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual bool IsValid() const SAL_OVERRIDE; + virtual Rectangle GetVisArea() const SAL_OVERRIDE; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index fd9350645e19..dffa987c9967 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -54,39 +54,39 @@ public: /** Complete the initialization begun in the constructor. */ - virtual void Init (void); + virtual void Init (void) SAL_OVERRIDE; //===== IAccessibleViewForwarderListener ================================ virtual void ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder); + const IAccessibleViewForwarder* pViewForwarder) SAL_OVERRIDE; //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleEventBroadcaster ======================================== virtual void SAL_CALL addAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== @@ -94,19 +94,19 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XPropertyChangeListener ========================================= virtual void SAL_CALL propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: @@ -115,28 +115,28 @@ protected: virtual void FireEvent (const ::com::sun::star::accessibility::AccessibleEventObject& aEvent); // overridden to detect focus changes - virtual void Activated (void); + virtual void Activated (void) SAL_OVERRIDE; // overridden to detect focus changes - virtual void Deactivated (void); + virtual void Deactivated (void) SAL_OVERRIDE; // declared, but not defined AccessibleOutlineView( const AccessibleOutlineView& ); AccessibleOutlineView& operator= ( const AccessibleOutlineView& ); // This method is called from the component helper base class while disposing. - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; /// Create an accessible name that contains the current view mode. virtual OUString CreateAccessibleName () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create an accessible description that contains the current /// view mode. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index 27fd6c4f98bc..96e41f3d5701 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -73,14 +73,14 @@ public: /** Initialize a new shape. See the documentation of the constructor for the reason of this method's existence. */ - virtual void Init (void); + virtual void Init (void) SAL_OVERRIDE; //===== XAccessibleContext ============================================== /// Returns always 0 because there can be no children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (std::exception); + throw (std::exception) SAL_OVERRIDE; /** Return the specified child. @param nIndex @@ -94,43 +94,43 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XComponent ====================================================== virtual void SAL_CALL dispose (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& Source) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; using AccessibleShape::disposing; @@ -140,16 +140,16 @@ protected: */ virtual OUString CreateAccessibleBaseName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual OUString CreateAccessibleName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx index 3f5f4111270d..3942796c3384 100644 --- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx @@ -44,21 +44,21 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== internal ======================================================== /// Create a name string that contains the accessible name. virtual OUString CreateAccessibleBaseName () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx index 64f63c76ab5f..829c1e1e3a51 100644 --- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx @@ -44,21 +44,21 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== internal ======================================================== /// Create a name string that contains the accessible name. virtual OUString CreateAccessibleBaseName () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx index 3acc032732ed..97a052febcd1 100644 --- a/sd/source/ui/inc/AccessiblePresentationShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx @@ -42,20 +42,20 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== internal ======================================================== /// Create a name string that contains the accessible name. virtual OUString CreateAccessibleBaseName () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException); - OUString GetStyle(); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + OUString GetStyle() SAL_OVERRIDE; private: /** Don't use the default constructor. Use the public constructor that diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index 787e2675f558..6e719a6b358c 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -84,15 +84,15 @@ public: const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; //===== XComponent ============================================== - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } //===== XAccessible ======================================================= @@ -100,7 +100,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleEventBroadcaster ======================================= @@ -108,88 +108,88 @@ public: addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception); + ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; //===== XAccessibleComponent ================================================ virtual sal_Bool SAL_CALL containsPoint ( const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -199,19 +199,19 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index e76855f03715..0ed08adf88bf 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -83,7 +83,7 @@ public: const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; /** Return the implementation object of the specified child. @param nIndex @@ -93,11 +93,11 @@ public: //===== XComponent ============================================== - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } //===== XAccessible ======================================================= @@ -105,7 +105,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleEventBroadcaster ======================================= @@ -113,61 +113,61 @@ public: addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or throw exception. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL getAccessibleName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return the parents locale or throw exception if this object has no parent yet/anymore. @@ -175,7 +175,7 @@ public: virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception); + ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; //===== XAccessibleComponent ================================================ @@ -185,7 +185,7 @@ public: */ virtual sal_Bool SAL_CALL containsPoint ( const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation returns an empty reference. */ @@ -193,45 +193,45 @@ public: ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation returns an empty rectangle. */ virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation uses the result of getBounds to determine the location. */ virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation returns an empty position, i.e. the * result of the default constructor of com::sun::star::awt::Point. */ virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation uses the result of getBounds to determine the size. */ virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation does nothing. */ virtual void SAL_CALL grabFocus (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns black as the default foreground color. */ virtual sal_Int32 SAL_CALL getForeground (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns white as the default background color. */ virtual sal_Int32 SAL_CALL getBackground (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleSelection ============================================== @@ -239,35 +239,35 @@ public: virtual void SAL_CALL selectAccessibleChild (sal_Int32 nChildIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL clearAccessibleSelection( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== @@ -276,19 +276,19 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SwitchViewActivated (void); private: diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index 45ee9d16767e..0f4b4d44a070 100644 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx @@ -57,7 +57,7 @@ public: @return Return if the view forwarder is valid and else. */ - virtual bool IsValid (void) const; + virtual bool IsValid (void) const SAL_OVERRIDE; /** Returns the area of the underlying document that is visible in the * corresponding window. @@ -65,7 +65,7 @@ public: @return The rectangle of the visible part of the document. */ - virtual Rectangle GetVisibleArea() const; + virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; /** Transform the specified point from internal coordinates to an absolute screen position. @@ -77,7 +77,7 @@ public: The same point but in screen coordinates relative to the upper left corner of the (current) screen. */ - virtual Point LogicToPixel (const Point& rPoint) const; + virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE; /** Transform the specified size from internal coordinates to a screen * position. @@ -88,7 +88,7 @@ public: @return The same size but in screen coordinates. */ - virtual Size LogicToPixel (const Size& rSize) const; + virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; /** Transform the specified point from absolute screen coordinates to internal coordinates. @@ -100,7 +100,7 @@ public: @return The same point but in internal coordinates. */ - virtual Point PixelToLogic (const Point& rPoint) const; + virtual Point PixelToLogic (const Point& rPoint) const SAL_OVERRIDE; /** Transform the specified Size from screen coordinates to internal coordinates. @@ -111,7 +111,7 @@ public: @return The same size but in internal coordinates. */ - virtual Size PixelToLogic (const Size& rSize) const; + virtual Size PixelToLogic (const Size& rSize) const SAL_OVERRIDE; protected: SdrPaintView* mpView; diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index f50b043e7534..ddb279acaf0e 100644 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -53,7 +53,7 @@ public: sal_uLong nObjCount); virtual ~BreakDlg(); - short Execute(); + short Execute() SAL_OVERRIDE; private: FixedText* m_pFiObjInfo; diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx index 3aeceb3cedc7..41168e0e5ab6 100644 --- a/sd/source/ui/inc/Client.hxx +++ b/sd/source/ui/inc/Client.hxx @@ -38,10 +38,10 @@ class Client : public SfxInPlaceClient SdrGrafObj* pSdrGrafObj; OutlinerParaObject* pOutlinerParaObj; - virtual void ObjectAreaChanged(); - virtual void RequestNewObjectArea( Rectangle& ); - virtual void ViewChanged(); - virtual void MakeVisible(); + virtual void ObjectAreaChanged() SAL_OVERRIDE; + virtual void RequestNewObjectArea( Rectangle& ) SAL_OVERRIDE; + virtual void ViewChanged() SAL_OVERRIDE; + virtual void MakeVisible() SAL_OVERRIDE; public: Client (SdrOle2Obj* pObj, ViewShell* pSdViewShell, ::Window* pWindow); diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index ba45f858a06b..2599bdf904aa 100644 --- a/sd/source/ui/inc/ClientView.hxx +++ b/sd/source/ui/inc/ClientView.hxx @@ -39,12 +39,12 @@ public: DrawViewShell* pShell); virtual ~ClientView (void); - virtual void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); + virtual void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; /* if the view should not do a Invalidate() on the windows, you have to overload the following two methods and do something different */ - virtual void InvalidateOneWin(::Window& rWin); - virtual void InvalidateOneWin(::Window& rWin, const Rectangle& rRect); + virtual void InvalidateOneWin(::Window& rWin) SAL_OVERRIDE; + virtual void InvalidateOneWin(::Window& rWin, const Rectangle& rRect) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx index 40c9b341d4ae..ac17d83da022 100644 --- a/sd/source/ui/inc/DocumentRenderer.hxx +++ b/sd/source/ui/inc/DocumentRenderer.hxx @@ -48,19 +48,19 @@ public: virtual sal_Int32 SAL_CALL getRendererCount ( const css::uno::Any& aSelection, const css::uno::Sequence& xOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence SAL_CALL getRenderer ( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence& rxOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL render ( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence& rxOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: class Implementation; diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index c62f8072bcff..721ce76b8c1c 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -167,81 +167,81 @@ public: DECLARE_XTYPEPROVIDER() // XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XController - virtual ::sal_Bool SAL_CALL suspend( ::sal_Bool Suspend ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL suspend( ::sal_Bool Suspend ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSelectionSupplier - virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFormLayerAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isFormDesignMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFormDesignMode( ::sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isFormDesignMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFormDesignMode( ::sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XControlAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView virtual void SAL_CALL setCurrentPage ( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getCurrentPage (void) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // view::XSelectionChangeListener virtual void SAL_CALL selectionChanged (const ::com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XControllerManager virtual css::uno::Reference SAL_CALL getConfigurationController (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL getModuleController (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence& rId) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /** This method must return the name to index table. This table contains all property names and types of this object. */ - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; virtual void FillPropertyTable ( ::std::vector< ::com::sun::star::beans::Property>& rProperties); @@ -252,7 +252,7 @@ protected: */ virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, - sal_Int32 nHandle ) const; + sal_Int32 nHandle ) const SAL_OVERRIDE; /** Convert the value rValue and return the result in rConvertedValue and the old value in rOldValue. @@ -273,7 +273,7 @@ protected: ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException); + throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; /** The same as setFastProperyValue, but no exception is thrown and nHandle is always valid. You must not broadcast the changes in this method. @@ -281,7 +281,7 @@ protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception); + throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; /** When the called object has been disposed already this method throws a Disposed exception and does not return. diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 1dee67d7a967..2396e3ffa477 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -71,34 +71,34 @@ public: virtual ~DrawDocShell(); void UpdateRefDevice(); - virtual void Activate( bool bMDI ); - virtual void Deactivate( bool bMDI ); - virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); + virtual void Activate( bool bMDI ) SAL_OVERRIDE; + virtual void Deactivate( bool bMDI ) SAL_OVERRIDE; + virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) SAL_OVERRIDE; virtual bool ImportFrom(SfxMedium &rMedium, css::uno::Reference const& xInsertPosition) SAL_OVERRIDE; - virtual bool ConvertFrom( SfxMedium &rMedium ); - virtual bool Save(); - virtual bool SaveAsOwnFormat( SfxMedium& rMedium ); - virtual bool ConvertTo( SfxMedium &rMedium ); - virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); - - virtual bool Load( SfxMedium &rMedium ); - virtual bool LoadFrom( SfxMedium& rMedium ); - virtual bool SaveAs( SfxMedium &rMedium ); - - virtual Rectangle GetVisArea(sal_uInt16 nAspect) const; - virtual void Draw(OutputDevice*, const JobSetup& rSetup, sal_uInt16 nAspect = ASPECT_CONTENT); + virtual bool ConvertFrom( SfxMedium &rMedium ) SAL_OVERRIDE; + virtual bool Save() SAL_OVERRIDE; + virtual bool SaveAsOwnFormat( SfxMedium& rMedium ) SAL_OVERRIDE; + virtual bool ConvertTo( SfxMedium &rMedium ) SAL_OVERRIDE; + virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) SAL_OVERRIDE; + + virtual bool Load( SfxMedium &rMedium ) SAL_OVERRIDE; + virtual bool LoadFrom( SfxMedium& rMedium ) SAL_OVERRIDE; + virtual bool SaveAs( SfxMedium &rMedium ) SAL_OVERRIDE; + + virtual Rectangle GetVisArea(sal_uInt16 nAspect) const SAL_OVERRIDE; + virtual void Draw(OutputDevice*, const JobSetup& rSetup, sal_uInt16 nAspect = ASPECT_CONTENT) SAL_OVERRIDE; virtual ::svl::IUndoManager* - GetUndoManager(); - virtual Printer* GetDocumentPrinter(); - virtual void OnDocumentPrinterChanged(Printer* pNewPrinter); - virtual SfxStyleSheetBasePool* GetStyleSheetPool(); - virtual Size GetFirstPageSize(); - virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const; - virtual void SetModified( bool = true ); + GetUndoManager() SAL_OVERRIDE; + virtual Printer* GetDocumentPrinter() SAL_OVERRIDE; + virtual void OnDocumentPrinterChanged(Printer* pNewPrinter) SAL_OVERRIDE; + virtual SfxStyleSheetBasePool* GetStyleSheetPool() SAL_OVERRIDE; + virtual Size GetFirstPageSize() SAL_OVERRIDE; + virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const SAL_OVERRIDE; + virtual void SetModified( bool = true ) SAL_OVERRIDE; virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( ::Window *pParent, - const SfxItemSet &rSet ); + const SfxItemSet &rSet ) SAL_OVERRIDE; using SotObject::GetInterface; using SfxObjectShell::GetVisArea; @@ -192,7 +192,7 @@ public: @return Returns NULL when the current document has no reference device. */ - virtual OutputDevice* GetDocumentRefDev (void); + virtual OutputDevice* GetDocumentRefDev (void) SAL_OVERRIDE; DECL_LINK( RenameSlideHdl, AbstractSvxNameDialog* ); @@ -221,7 +221,7 @@ protected: bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor void Construct(bool bClipboard); - virtual void InPlaceActivate( bool bActive ); + virtual void InPlaceActivate( bool bActive ) SAL_OVERRIDE; public: virtual void setDocAccTitle( const OUString& rTitle ); virtual const OUString getDocAccTitle() const; diff --git a/sd/source/ui/inc/DrawSubController.hxx b/sd/source/ui/inc/DrawSubController.hxx index 5eb77118cfbd..b378d8c8247a 100644 --- a/sd/source/ui/inc/DrawSubController.hxx +++ b/sd/source/ui/inc/DrawSubController.hxx @@ -37,9 +37,9 @@ namespace sd { ::com::sun::star::lang::XServiceInfo >( aMutex ) {} // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; }; } diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 5e566773afb1..2e873a29d2d2 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -87,12 +87,12 @@ public: virtual ~DrawViewShell (void); - virtual void Init (bool bIsMainViewShell); + virtual void Init (bool bIsMainViewShell) SAL_OVERRIDE; - virtual void Shutdown (void); + virtual void Shutdown (void) SAL_OVERRIDE; - void PrePaint(); - virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin); + void PrePaint() SAL_OVERRIDE; + virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin) SAL_OVERRIDE; /** Set the position and size of the area which contains the GUI elements like rulers, sliders, and buttons as well as the document @@ -119,17 +119,17 @@ public: the enclosing window and current sizes of buttons, rulers, and sliders. */ - virtual void ArrangeGUIElements (void); + virtual void ArrangeGUIElements (void) SAL_OVERRIDE; void HidePage(); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); - virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin); - virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); - virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin); - virtual void Command(const CommandEvent& rCEvt, ::sd::Window* pWin); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) SAL_OVERRIDE; + virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) SAL_OVERRIDE; + virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin) SAL_OVERRIDE; + virtual void Command(const CommandEvent& rCEvt, ::sd::Window* pWin) SAL_OVERRIDE; - virtual void Resize (void); + virtual void Resize (void) SAL_OVERRIDE; void ShowMousePosInfo(const Rectangle& rRect, ::sd::Window* pWin); @@ -138,22 +138,22 @@ public: virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive); - virtual void SetZoom( long nZoom ); - virtual void SetZoomRect( const Rectangle& rZoomRect ); + virtual void SetZoom( long nZoom ) SAL_OVERRIDE; + virtual void SetZoomRect( const Rectangle& rZoomRect ) SAL_OVERRIDE; void InsertURLField(const OUString& rURL, const OUString& rText, const OUString& rTarget, const Point* pPos); void InsertURLButton(const OUString& rURL, const OUString& rText, const OUString& rTarget, const Point* pPos); - virtual void SetUIUnit(FieldUnit eUnit); + virtual void SetUIUnit(FieldUnit eUnit) SAL_OVERRIDE; void SelectionHasChanged(); void ModelHasChanged(); - virtual void Activate(bool bIsMDIActivate); - virtual void Deactivate(bool IsMDIActivate); - virtual void UIActivating( SfxInPlaceClient* ); - virtual void UIDeactivated( SfxInPlaceClient* ); + virtual void Activate(bool bIsMDIActivate) SAL_OVERRIDE; + virtual void Deactivate(bool IsMDIActivate) SAL_OVERRIDE; + virtual void UIActivating( SfxInPlaceClient* ) SAL_OVERRIDE; + virtual void UIDeactivated( SfxInPlaceClient* ) SAL_OVERRIDE; virtual OUString GetSelectionText( bool bCompleteWords = false ); virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; @@ -236,10 +236,10 @@ public: void SetMousePosFreezed( sal_Bool bIn ) { mbMousePosFreezed = bIn; } EditMode GetEditMode() const { return meEditMode; } - virtual SdPage* GetActualPage() { return mpActualPage; } + virtual SdPage* GetActualPage() SAL_OVERRIDE { return mpActualPage; } /// inherited from sd::ViewShell - virtual SdPage* getCurrentPage() const; + virtual SdPage* getCurrentPage() const SAL_OVERRIDE; void ResetActualPage(); void ResetActualLayer(); @@ -254,11 +254,11 @@ public: void FreshNavigatrTree(); void MakeVisible(const Rectangle& rRect, ::Window& rWin); - virtual void ReadFrameViewData(FrameView* pView); - virtual void WriteFrameViewData(); + virtual void ReadFrameViewData(FrameView* pView) SAL_OVERRIDE; + virtual void WriteFrameViewData() SAL_OVERRIDE; - virtual ErrCode DoVerb(long nVerb); - virtual sal_Bool ActivateObject(SdrOle2Obj* pObj, long nVerb); + virtual ErrCode DoVerb(long nVerb) SAL_OVERRIDE; + virtual sal_Bool ActivateObject(SdrOle2Obj* pObj, long nVerb) SAL_OVERRIDE; void SetZoomOnPage( sal_Bool bZoom = sal_True ) { mbZoomOnPage = bZoom; } sal_Bool IsZoomOnPage() { return mbZoomOnPage; } @@ -277,7 +277,7 @@ public: Do not call this method directly. Call the method at ViewShellBase instead. */ - virtual void ShowUIControls (bool bVisible = true); + virtual void ShowUIControls (bool bVisible = true) SAL_OVERRIDE; void ScannerEvent( const ::com::sun::star::lang::EventObject& rEventObject ); @@ -286,14 +286,14 @@ public: sal_uInt16* GetSlotArray() const { return mpSlotArray; } virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); + ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); + ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ) SAL_OVERRIDE; - virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); - virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); + virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ) SAL_OVERRIDE; + virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ) SAL_OVERRIDE; - virtual void VisAreaChanged(const Rectangle& rRect); + virtual void VisAreaChanged(const Rectangle& rRect) SAL_OVERRIDE; /** Create an accessible object representing the specified window. @param pWindow @@ -304,7 +304,7 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessibleDocumentView (::sd::Window* pWindow); + CreateAccessibleDocumentView (::sd::Window* pWindow) SAL_OVERRIDE; /** Return the number of layers managed by the layer tab control. This will usually differ from the number of layers managed by the layer @@ -357,14 +357,14 @@ public: /** modifies the given layer with the given values */ void ModifyLayer( SdrLayer* pLayer, const OUString& rLayerName, const OUString& rLayerTitle, const OUString& rLayerDesc, bool bIsVisible, bool bIsLocked, bool bIsPrintable ); - virtual css::uno::Reference CreateSubController (void); + virtual css::uno::Reference CreateSubController (void) SAL_OVERRIDE; DrawView* GetDrawView() const { return mpDrawView; } /** Relocation to a new parent window is not supported for DrawViewShell objects so this method always returns . */ - virtual bool RelocateToParentWindow (::Window* pParentWindow); + virtual bool RelocateToParentWindow (::Window* pParentWindow) SAL_OVERRIDE; OUString GetSidebarContextName (void) const; @@ -395,11 +395,11 @@ protected: void DeleteActualPage(); void DeleteActualLayer(); - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst); - virtual SvxRuler* CreateVRuler(::sd::Window* pWin); - virtual void UpdateHRuler(); - virtual void UpdateVRuler(); - virtual void SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY); + virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst) SAL_OVERRIDE; + virtual SvxRuler* CreateVRuler(::sd::Window* pWin) SAL_OVERRIDE; + virtual void UpdateHRuler() SAL_OVERRIDE; + virtual void UpdateVRuler() SAL_OVERRIDE; + virtual void SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY) SAL_OVERRIDE; void SetupPage( Size &rSize, long nLeft, long nRight, long nUpper, long nLower, sal_Bool bSize, sal_Bool bMargin, sal_Bool bScaleAll ); @@ -450,14 +450,14 @@ private: SfxRequest& rRequest, PageKind ePageKind, SdPage* pPage, - const sal_Int32 nInsertPosition = -1); + const sal_Int32 nInsertPosition = -1) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager2 > mxScannerManager; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > mxScannerListener; TransferableClipboardListener* mpClipEvtLstnr; sal_Bool mbPastePossible; - virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; /** Stop a running slide show. The frame the show is running in is destroyed if diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index 8bcc39b3b9fc..e0309275fd22 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -125,7 +125,7 @@ private: the factory working properly this method should not be necessary (and may be removed in the future.) */ - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx index 59663647da2c..f09d27473cb7 100644 --- a/sd/source/ui/inc/GraphicViewShell.hxx +++ b/sd/source/ui/inc/GraphicViewShell.hxx @@ -62,11 +62,11 @@ public: /** This method is overloaded in order to have the layer mode always active. */ - virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive); + virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive) SAL_OVERRIDE; protected: void ConstructGraphicViewShell (void); - virtual void ArrangeGUIElements (void); + virtual void ArrangeGUIElements (void) SAL_OVERRIDE; private: DECL_LINK(TabBarSplitHandler, TabBar*); diff --git a/sd/source/ui/inc/GraphicViewShellBase.hxx b/sd/source/ui/inc/GraphicViewShellBase.hxx index 37d4ed0c58ec..4215754ae362 100644 --- a/sd/source/ui/inc/GraphicViewShellBase.hxx +++ b/sd/source/ui/inc/GraphicViewShellBase.hxx @@ -43,10 +43,10 @@ public: /** Callback function for general slot calls. */ - virtual void Execute (SfxRequest& rRequest); + virtual void Execute (SfxRequest& rRequest) SAL_OVERRIDE; protected: - virtual void InitializeFramework (void); + virtual void InitializeFramework (void) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/ImpressViewShellBase.hxx b/sd/source/ui/inc/ImpressViewShellBase.hxx index 0da157499116..6f681c797b3a 100644 --- a/sd/source/ui/inc/ImpressViewShellBase.hxx +++ b/sd/source/ui/inc/ImpressViewShellBase.hxx @@ -43,10 +43,10 @@ public: /** Callback function for general slot calls. */ - virtual void Execute (SfxRequest& rRequest); + virtual void Execute (SfxRequest& rRequest) SAL_OVERRIDE; protected: - virtual void InitializeFramework (void); + virtual void InitializeFramework (void) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/LayerDialogContent.hxx b/sd/source/ui/inc/LayerDialogContent.hxx index 3a9331528a70..71b7092c8665 100644 --- a/sd/source/ui/inc/LayerDialogContent.hxx +++ b/sd/source/ui/inc/LayerDialogContent.hxx @@ -41,8 +41,8 @@ public: virtual ~LayerDialogContent (void); protected: - virtual bool Close (void); - virtual void Resize (void); + virtual bool Close (void) SAL_OVERRIDE; + virtual void Resize (void) SAL_OVERRIDE; private: LayerTabBar maLayerTabBar; diff --git a/sd/source/ui/inc/LayerTabBar.hxx b/sd/source/ui/inc/LayerTabBar.hxx index a9d24e94b6eb..83453a7d78e9 100644 --- a/sd/source/ui/inc/LayerTabBar.hxx +++ b/sd/source/ui/inc/LayerTabBar.hxx @@ -60,21 +60,21 @@ protected: DrawViewShell* pDrViewSh; // TabBar - virtual void Select(); - virtual void DoubleClick(); - virtual void MouseButtonDown(const MouseEvent& rMEvt); + virtual void Select() SAL_OVERRIDE; + virtual void DoubleClick() SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Command(const CommandEvent& rCEvt); + virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; - virtual long StartRenaming(); - virtual long AllowRenaming(); - virtual void EndRenaming(); + virtual long StartRenaming() SAL_OVERRIDE; + virtual long AllowRenaming() SAL_OVERRIDE; + virtual void EndRenaming() SAL_OVERRIDE; - virtual void ActivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/OutlineBulletDlg.hxx b/sd/source/ui/inc/OutlineBulletDlg.hxx index 9d145cc96889..a17aa67ab8a4 100644 --- a/sd/source/ui/inc/OutlineBulletDlg.hxx +++ b/sd/source/ui/inc/OutlineBulletDlg.hxx @@ -42,7 +42,7 @@ public: const SfxItemSet* GetOutputItemSet() const; protected: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; private: using SfxTabDialog::GetOutputItemSet; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index ee71f9899226..2a9ed09f2d66 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -77,8 +77,8 @@ public: SdrTextObj* CreateTitleTextObject(SdPage* pPage); SdrTextObj* CreateOutlineTextObject(SdPage* pPage); - virtual void AddWindowToPaintView(OutputDevice* pWin); - virtual void DeleteWindowFromPaintView(OutputDevice* pWin); + virtual void AddWindowToPaintView(OutputDevice* pWin) SAL_OVERRIDE; + virtual void DeleteWindowFromPaintView(OutputDevice* pWin) SAL_OVERRIDE; OutlinerView* GetViewByWindow (::Window* pWin) const; SdrOutliner* GetOutliner() { return(&mrOutliner) ; } @@ -115,14 +115,14 @@ public: sal_Bool PrepareClose(sal_Bool bUI = sal_True); - virtual sal_Bool GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False ) const; - virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False); + virtual sal_Bool GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False ) const SAL_OVERRIDE; + virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False) SAL_OVERRIDE; void FillOutliner(); void SetLinks(); void ResetLinks() const; - SfxStyleSheet* GetStyleSheet() const; + SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; void SetSelectedPages(); @@ -131,17 +131,17 @@ public: DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nLayer = SDRPAGE_NOTFOUND) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nLayer = SDRPAGE_NOTFOUND) SAL_OVERRIDE; // Re-implement GetScriptType for this view to get correct results - virtual sal_uInt16 GetScriptType() const; + virtual sal_uInt16 GetScriptType() const SAL_OVERRIDE; /** After this method has been called with following changes of the current page are ignored in that the corresponding text is not @@ -158,8 +158,8 @@ public: void UpdateParagraph( sal_Int32 nPara ); protected: - virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ); - virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ); + virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ) SAL_OVERRIDE; + virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) SAL_OVERRIDE; private: /** call this method before you do anything that can modify the outliner diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 5611360bf1ef..0897f2d6c908 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -59,32 +59,32 @@ public: virtual ~OutlineViewShell (void); - virtual void Shutdown (void); + virtual void Shutdown (void) SAL_OVERRIDE; - virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin); + virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin) SAL_OVERRIDE; /** Arrange and resize the GUI elements like rulers, sliders, and buttons as well as the actual document view according to the size of the enclosing window and current sizes of buttons, rulers, and sliders. */ - virtual void ArrangeGUIElements (void); + virtual void ArrangeGUIElements (void) SAL_OVERRIDE; virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE; - virtual long VirtHScrollHdl(ScrollBar* pHScroll); - virtual long VirtVScrollHdl(ScrollBar* pVHScroll); + virtual long VirtHScrollHdl(ScrollBar* pHScroll) SAL_OVERRIDE; + virtual long VirtVScrollHdl(ScrollBar* pVHScroll) SAL_OVERRIDE; virtual void AddWindow(::sd::Window* pWin); virtual void RemoveWindow(::sd::Window* pWin); - virtual void Activate( bool IsMDIActivate ); - virtual void Deactivate( bool IsMDIActivate ); + virtual void Activate( bool IsMDIActivate ) SAL_OVERRIDE; + virtual void Deactivate( bool IsMDIActivate ) SAL_OVERRIDE; - virtual SdPage* GetActualPage(); + virtual SdPage* GetActualPage() SAL_OVERRIDE; /// inherited from sd::ViewShell - virtual SdPage* getCurrentPage() const; + virtual SdPage* getCurrentPage() const SAL_OVERRIDE; void ExecCtrl(SfxRequest &rReq); void GetCtrlState(SfxItemSet &rSet); @@ -100,27 +100,27 @@ public: void FuPermanent(SfxRequest &rReq); void FuSupport(SfxRequest &rReq); - virtual void SetZoom(long nZoom); - virtual void SetZoomRect(const Rectangle& rZoomRect); + virtual void SetZoom(long nZoom) SAL_OVERRIDE; + virtual void SetZoomRect(const Rectangle& rZoomRect) SAL_OVERRIDE; virtual OUString GetSelectionText( bool bCompleteWords = false ); virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; void Execute(SfxRequest& rReq); - virtual void ReadFrameViewData(FrameView* pView); - virtual void WriteFrameViewData(); + virtual void ReadFrameViewData(FrameView* pView) SAL_OVERRIDE; + virtual void WriteFrameViewData() SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt, ::sd::Window* pWin ); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); - virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); + virtual void Command( const CommandEvent& rCEvt, ::sd::Window* pWin ) SAL_OVERRIDE; + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) SAL_OVERRIDE; + virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) SAL_OVERRIDE; sal_uLong Read(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat); - virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); - virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); + virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ) SAL_OVERRIDE; + virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ) SAL_OVERRIDE; /** this method is called when the visible area of the view from this viewshell is changed */ - virtual void VisAreaChanged(const Rectangle& rRect); + virtual void VisAreaChanged(const Rectangle& rRect) SAL_OVERRIDE; /** Create an accessible object representing the specified window. @param pWindow @@ -131,15 +131,15 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessibleDocumentView (::sd::Window* pWindow); + CreateAccessibleDocumentView (::sd::Window* pWindow) SAL_OVERRIDE; OUString m_StrOldPageName; /** Update the preview to show the specified page. */ - virtual void UpdatePreview (SdPage* pPage, sal_Bool bInit = sal_False); + virtual void UpdatePreview (SdPage* pPage, sal_Bool bInit = sal_False) SAL_OVERRIDE; - virtual css::uno::Reference CreateSubController (void); + virtual css::uno::Reference CreateSubController (void) SAL_OVERRIDE; /** Make the given page the new current page. This method notifies the controller and adapts the selection of the diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx index 1f72b48183ff..9e3da3723faf 100644 --- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx +++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx @@ -145,10 +145,10 @@ public: SelectionIteratorImpl (const SelectionIteratorImpl& rObject); virtual ~SelectionIteratorImpl (void); - virtual void GotoNextText (void); - virtual const IteratorPosition& GetPosition (void); - virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const; - virtual bool operator== (const IteratorImplBase& rIterator) const; + virtual void GotoNextText (void) SAL_OVERRIDE; + virtual const IteratorPosition& GetPosition (void) SAL_OVERRIDE; + virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const SAL_OVERRIDE; + virtual bool operator== (const IteratorImplBase& rIterator) const SAL_OVERRIDE; private: const ::std::vector& mrObjectList; @@ -163,7 +163,7 @@ private: @return Returns when both iterators point to the same object. */ - virtual bool IsEqual (const IteratorImplBase& rIterator, IteratorType aType) const; + virtual bool IsEqual (const IteratorImplBase& rIterator, IteratorType aType) const SAL_OVERRIDE; IteratorImplBase& operator= (const IteratorImplBase& rIterator); }; @@ -194,9 +194,9 @@ public: EditMode eEditMode); virtual ~ViewIteratorImpl (void); - virtual void GotoNextText (void); - virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const; - virtual void Reverse (void); + virtual void GotoNextText (void) SAL_OVERRIDE; + virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const SAL_OVERRIDE; + virtual void Reverse (void) SAL_OVERRIDE; protected: /// Number of pages in the view that is specified by maPosition. @@ -248,8 +248,8 @@ public: bool bDirectionIsForward); virtual ~DocumentIteratorImpl (void); - virtual void GotoNextText (void); - virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const; + virtual void GotoNextText (void) SAL_OVERRIDE; + virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const SAL_OVERRIDE; private: sal_Int32 mnPageCount; diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 9ca5ab2549bf..3e93c1bc2296 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -55,8 +55,8 @@ public: const OUString& rsTitle); virtual ~PaneDockingWindow (void); - virtual void StateChanged( StateChangedType nType ); - virtual void MouseButtonDown (const MouseEvent& rEvent); + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void MouseButtonDown (const MouseEvent& rEvent) SAL_OVERRIDE; /** When docked the given range is passed to the parent SplitWindow. */ void SetValidSizeRange (const Range aValidSizeRange); diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index 887dbf30e5cb..035256539504 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -47,17 +47,17 @@ public: */ void FinishInitialization( FrameView* pFrameView ); - virtual void Resize (void); + virtual void Resize (void) SAL_OVERRIDE; protected: - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst); - virtual SvxRuler* CreateVRuler(::sd::Window* pWin); + virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst) SAL_OVERRIDE; + virtual SvxRuler* CreateVRuler(::sd::Window* pWin) SAL_OVERRIDE; private: Rectangle maOldVisArea; - virtual void Activate (bool bIsMDIActivate); - virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); + virtual void Activate (bool bIsMDIActivate) SAL_OVERRIDE; + virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/PresentationViewShellBase.hxx b/sd/source/ui/inc/PresentationViewShellBase.hxx index 0e74b4dade52..3a17c1388d99 100644 --- a/sd/source/ui/inc/PresentationViewShellBase.hxx +++ b/sd/source/ui/inc/PresentationViewShellBase.hxx @@ -42,7 +42,7 @@ public: virtual ~PresentationViewShellBase (void); protected: - virtual void InitializeFramework (void); + virtual void InitializeFramework (void) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index 6eb60fe9bb6b..9120fd075612 100644 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -125,7 +125,7 @@ public: int nWidth); protected: - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; private: ::std::auto_ptr mpPreviewDevice; diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx index 3c450f0e4e87..8cf1ad428611 100644 --- a/sd/source/ui/inc/RemoteServer.hxx +++ b/sd/source/ui/inc/RemoteServer.hxx @@ -85,7 +85,7 @@ namespace sd ::std::vector mAvailableClients; - void execute(); + void execute() SAL_OVERRIDE; }; } diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index cd66d3cff8fb..f74000c3a4ab 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -56,11 +56,11 @@ protected: RulerCtrlItem* pCtrlItem; sal_Bool bHorz; - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void MouseButtonUp(const MouseEvent& rMEvt); - virtual void MouseMove(const MouseEvent& rMEvt); - virtual void Command(const CommandEvent& rCEvt); - virtual void ExtraDown(); + virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; + virtual void ExtraDown() SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index b9138cd69416..bec7694294d8 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -52,19 +52,19 @@ public: const css::uno::Any& aSelection) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getSelection (void) throw (css::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL addSelectionChangeListener ( const css::uno::Reference& rxListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeSelectionChangeListener ( const css::uno::Reference& rxListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView @@ -72,10 +72,10 @@ public: virtual void SAL_CALL setCurrentPage ( const css::uno::Reference& xPage) throw (css::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL getCurrentPage (void) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFastPropertySet @@ -87,18 +87,18 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: sal_Bool getMasterPageMode(void) const throw(); diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index 75c4d44dd1f5..90ebdd777c24 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -40,7 +40,7 @@ public: OutlineViewShell& rViewShell) throw(); virtual ~SdUnoOutlineView (void) throw(); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XSelectionSupplier @@ -48,28 +48,28 @@ public: virtual sal_Bool SAL_CALL select ( const css::uno::Any& aSelection) throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getSelection (void) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addSelectionChangeListener ( const css::uno::Reference& rxListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeSelectionChangeListener ( const css::uno::Reference& rxListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference& xPage) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL getCurrentPage (void) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFastPropertySet @@ -81,13 +81,13 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL @@ -95,9 +95,9 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: OutlineViewShell& mrOutlineViewShell; diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index 9e5993322ac3..71acbbb6a66d 100644 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx @@ -46,29 +46,29 @@ public: virtual sal_Bool SAL_CALL select (const ::com::sun::star::uno::Any& aSelection) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getSelection (void) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addSelectionChangeListener ( const css::uno::Reference& rxListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeSelectionChangeListener ( const css::uno::Reference& rxListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView virtual void SAL_CALL setCurrentPage ( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getCurrentPage (void) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFastPropertySet @@ -80,18 +80,18 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: slidesorter::SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 630ced0a6659..66cdebe2108d 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -57,7 +57,7 @@ public: /** Late initialization that has to be called after a new instance has completed its construction. */ - virtual void Init (bool bIsMainViewShell); + virtual void Init (bool bIsMainViewShell) SAL_OVERRIDE; /** Return a slide sorter that is currently displayed in one of the panes that belong to the given ViewShellBase object. @@ -70,10 +70,10 @@ public: virtual void GetFocus (void); virtual void LoseFocus (void); - virtual SdPage* GetActualPage (void); + virtual SdPage* GetActualPage (void) SAL_OVERRIDE; /// inherited from sd::ViewShell - virtual SdPage* getCurrentPage() const; + virtual SdPage* getCurrentPage() const SAL_OVERRIDE; void ExecCtrl (SfxRequest& rRequest); virtual void GetCtrlState (SfxItemSet &rSet); @@ -83,12 +83,12 @@ public: virtual void FuPermanent (SfxRequest& rRequest); void GetAttrState (SfxItemSet& rSet); void ExecStatusBar (SfxRequest& rRequest); - virtual void Command (const CommandEvent& rEvent, ::sd::Window* pWindow); + virtual void Command (const CommandEvent& rEvent, ::sd::Window* pWindow) SAL_OVERRIDE; virtual void GetMenuState (SfxItemSet &rSet); virtual void GetClipboardState (SfxItemSet &rSet); - virtual void ReadFrameViewData (FrameView* pView); - virtual void WriteFrameViewData (void); + virtual void ReadFrameViewData (FrameView* pView) SAL_OVERRIDE; + virtual void WriteFrameViewData (void) SAL_OVERRIDE; /** Set the zoom factor. The given value is clipped against an upper bound. @@ -96,22 +96,22 @@ public: An integer percent value, i.e. nZoom/100 is the actual zoom factor. */ - virtual void SetZoom (long int nZoom); - virtual void SetZoomRect (const Rectangle& rZoomRect); + virtual void SetZoom (long int nZoom) SAL_OVERRIDE; + virtual void SetZoomRect (const Rectangle& rZoomRect) SAL_OVERRIDE; /** This is a callback method used by the active window to delegate its Paint() call to. This view shell itself delegates it to the view. */ - virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin); + virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin) SAL_OVERRIDE; /** Place and size the controls and windows. You may want to call this method when something has changed that for instance affects the visibility state of the scroll bars. */ - virtual void ArrangeGUIElements (void); + virtual void ArrangeGUIElements (void) SAL_OVERRIDE; - virtual void Activate (bool IsMDIActivate); - virtual void Deactivate (bool IsMDIActivate); + virtual void Activate (bool IsMDIActivate) SAL_OVERRIDE; + virtual void Deactivate (bool IsMDIActivate) SAL_OVERRIDE; //===== Drag and Drop ===================================================== @@ -125,13 +125,13 @@ public: DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND ); + sal_uInt16 nLayer = SDRPAGE_NOTFOUND ) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nLayer = SDRPAGE_NOTFOUND) SAL_OVERRIDE; typedef ::std::vector PageSelection; @@ -158,7 +158,7 @@ public: */ void RemoveSelectionChangeListener (const Link& rListener); - virtual css::uno::Reference CreateSubController (void); + virtual css::uno::Reference CreateSubController (void) SAL_OVERRIDE; /** Create an accessible object representing the specified window. @param pWindow @@ -169,16 +169,16 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessibleDocumentView (::sd::Window* pWindow); + CreateAccessibleDocumentView (::sd::Window* pWindow) SAL_OVERRIDE; // handle SlideSorterView specially because AccessibleSlideSorterView doesn't inherit from AccessibleDocumentViewBase - virtual void SwitchViewFireFocus( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc ); + virtual void SwitchViewFireFocus( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc ) SAL_OVERRIDE; SlideSorter& GetSlideSorter (void) const; /** Try to relocate all toplevel window elements to the given parent window. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow); + virtual bool RelocateToParentWindow (::Window* pParentWindow) SAL_OVERRIDE; protected: @@ -187,7 +187,7 @@ protected: /** This method is overloaded to handle a missing tool bar correctly. This is the case when the slide sorter is not the main view shell. */ - virtual ::svl::IUndoManager* ImpGetUndoManager (void) const; + virtual ::svl::IUndoManager* ImpGetUndoManager (void) const SAL_OVERRIDE; private: ::boost::shared_ptr mpSlideSorter; @@ -204,7 +204,7 @@ private: scroll bar and the base class call is thus unnecessary. It simply calls UpdateScrollBars(false). */ - virtual void UpdateScrollBars (void); + virtual void UpdateScrollBars (void) SAL_OVERRIDE; }; typedef ::boost::shared_ptr SharedPageSelection; diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index 128a91638e06..50cf7e560920 100644 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -54,14 +54,14 @@ protected: next sentence with spelling errors. While doing so the view mode may be changed and text shapes are set into edit mode. */ - virtual ::svx::SpellPortions GetNextWrongSentence( bool bRecheck ); + virtual ::svx::SpellPortions GetNextWrongSentence( bool bRecheck ) SAL_OVERRIDE; /** This method is responsible for merging corrections made in the spelling dialog back into the document. */ - virtual void ApplyChangedSentence(const ::svx::SpellPortions& rChanged, bool bRecheck); - virtual void GetFocus (void); - virtual void LoseFocus (void); + virtual void ApplyChangedSentence(const ::svx::SpellPortions& rChanged, bool bRecheck) SAL_OVERRIDE; + virtual void GetFocus (void) SAL_OVERRIDE; + virtual void LoseFocus (void) SAL_OVERRIDE; private: /** This outliner is used to do the main work of iterating over a diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index 0948247fd569..50742964ce96 100644 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -59,25 +59,25 @@ protected: sal_Bool bInternalMove; // TabBar - virtual void Select(); - virtual void DoubleClick(); - virtual void MouseButtonDown(const MouseEvent& rMEvt); + virtual void Select() SAL_OVERRIDE; + virtual void DoubleClick() SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Command(const CommandEvent& rCEvt); + virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; - virtual long StartRenaming(); - virtual long AllowRenaming(); - virtual void EndRenaming(); + virtual long StartRenaming() SAL_OVERRIDE; + virtual long AllowRenaming() SAL_OVERRIDE; + virtual void EndRenaming() SAL_OVERRIDE; - virtual void ActivatePage(); - virtual long DeactivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; + virtual long DeactivatePage() SAL_OVERRIDE; // DragSourceHelper - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; DECL_LINK(DeactivatePageHdl, void*); @@ -94,9 +94,9 @@ private: virtual ~TabControlTransferable(); - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void DragFinished( sal_Int8 nDropAction ); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; }; diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index 6c54607ef886..991d2efd7ff8 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -137,11 +137,11 @@ public: /** Implementation of the AsynchronousTask interface method. */ - virtual void RunNextStep (void); + virtual void RunNextStep (void) SAL_OVERRIDE; /** Implementation of the AsynchronousTask interface method. */ - virtual bool HasNextStep (void); + virtual bool HasNextStep (void) SAL_OVERRIDE; /** Return the TemplateDir object that was last added to mpTemplateDirectory. diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index ea916dcb0696..526298a0aec0 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -75,17 +75,17 @@ public: ViewShell* pViewSh=NULL); virtual ~View (void); - void CompleteRedraw( OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); + void CompleteRedraw( OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; virtual sal_Bool GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False ) const; virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False); - virtual void MarkListHasChanged(); - virtual void ModelHasChanged(); + virtual void MarkListHasChanged() SAL_OVERRIDE; + virtual void ModelHasChanged() SAL_OVERRIDE; virtual void SelectAll(); virtual void DoCut(::Window* pWindow=NULL); virtual void DoCopy(::Window* pWindow=NULL); virtual void DoPaste(::Window* pWindow=NULL); - virtual void DoConnect(SdrOle2Obj* pOleObj); + virtual void DoConnect(SdrOle2Obj* pOleObj) SAL_OVERRIDE; virtual sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr = sal_False); virtual void StartDrag( const Point& rStartPos, ::Window* pWindow ); virtual void DragFinished( sal_Int8 nDropAction ); @@ -121,9 +121,9 @@ public: virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::Window* pWin = 0L, bool bIsNewObj = false, SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, - bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true); + bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true) SAL_OVERRIDE; - virtual SdrEndTextEditKind SdrEndTextEdit(bool bDontDeleteReally = false); + virtual SdrEndTextEditKind SdrEndTextEdit(bool bDontDeleteReally = false) SAL_OVERRIDE; bool RestoreDefaultText( SdrTextObj* pTextObj ); @@ -167,29 +167,29 @@ public: std::vector &rBookmarkList, const sal_uInt16 nType ); - virtual void onAccessibilityOptionsChanged(); + virtual void onAccessibilityOptionsChanged() SAL_OVERRIDE; - virtual SdrModel* GetMarkedObjModel() const; - virtual bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + virtual SdrModel* GetMarkedObjModel() const SAL_OVERRIDE; + virtual bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0) SAL_OVERRIDE; using SdrExchangeView::Paste; /** returns true if we have an undo manager and there is an open list undo action */ bool isRecordingUndo() const; - virtual void AddCustomHdl(); + virtual void AddCustomHdl() SAL_OVERRIDE; SmartTagSet& getSmartTags() { return maSmartTags; } void selectSmartTag( const SmartTagReference& xTag ); void updateHandles(); - virtual SdrViewContext GetContext() const; - virtual bool HasMarkablePoints() const; - virtual sal_uLong GetMarkablePointCount() const; - virtual bool HasMarkedPoints() const; - virtual sal_uLong GetMarkedPointCount() const; - virtual bool IsPointMarkable(const SdrHdl& rHdl) const; - virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false); - virtual void CheckPossibilities(); + virtual SdrViewContext GetContext() const SAL_OVERRIDE; + virtual bool HasMarkablePoints() const SAL_OVERRIDE; + virtual sal_uLong GetMarkablePointCount() const SAL_OVERRIDE; + virtual bool HasMarkedPoints() const SAL_OVERRIDE; + virtual sal_uLong GetMarkedPointCount() const SAL_OVERRIDE; + virtual bool IsPointMarkable(const SdrHdl& rHdl) const SAL_OVERRIDE; + virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false) SAL_OVERRIDE; + virtual void CheckPossibilities() SAL_OVERRIDE; virtual sal_Bool MarkPoints(const ::Rectangle* pRect, sal_Bool bUnmark); using SdrMarkView::MarkPoints; @@ -236,8 +236,8 @@ protected: DECL_LINK( OnParagraphInsertedHdl, ::Outliner * ); DECL_LINK( OnParagraphRemovingHdl, ::Outliner * ); - virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ); - virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ); + virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ) SAL_OVERRIDE; + virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) SAL_OVERRIDE; SdDrawDocument& mrDoc; DrawDocShell* mpDocSh; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 16b823b537e1..02462db7ff7e 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -541,8 +541,8 @@ protected: virtual void UpdateHRuler(); virtual void UpdateVRuler(); - virtual void Activate(bool IsMDIActivate); - virtual void Deactivate(bool IsMDIActivate); + virtual void Activate(bool IsMDIActivate) SAL_OVERRIDE; + virtual void Deactivate(bool IsMDIActivate) SAL_OVERRIDE; virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 995b8d9fad87..02aaa22897fe 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -112,35 +112,35 @@ public: virtual void GetState (SfxItemSet& rSet); /* override these from SfxViewShell */ - virtual OUString GetSelectionText(bool); - virtual bool HasSelection(bool) const; + virtual OUString GetSelectionText(bool) SAL_OVERRIDE; + virtual bool HasSelection(bool) const SAL_OVERRIDE; SvBorder GetBorder (bool bOuterResize); - virtual void InnerResizePixel (const Point& rOrigin, const Size& rSize); - virtual void OuterResizePixel (const Point& rOrigin, const Size& rSize); + virtual void InnerResizePixel (const Point& rOrigin, const Size& rSize) SAL_OVERRIDE; + virtual void OuterResizePixel (const Point& rOrigin, const Size& rSize) SAL_OVERRIDE; /** This call is forwarded to the main sub-shell. */ - virtual ErrCode DoVerb (long nVerb); + virtual ErrCode DoVerb (long nVerb) SAL_OVERRIDE; /** Return a new renderer that can be used for example for printing the document. */ - virtual com::sun::star::uno::Reference GetRenderable (void); + virtual com::sun::star::uno::Reference GetRenderable (void) SAL_OVERRIDE; /// Forwarded to the print manager. - virtual SfxPrinter* GetPrinter (bool bCreate = false); + virtual SfxPrinter* GetPrinter (bool bCreate = false) SAL_OVERRIDE; /// Forwarded to the print manager. virtual sal_uInt16 SetPrinter ( SfxPrinter* pNewPrinter, - sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false); + sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false) SAL_OVERRIDE; /// Forward methods to main sub shell. virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, - bool bBrowse = false); + bool bBrowse = false) SAL_OVERRIDE; /** Pass the given properties to the main view shell. After that we ensure that the right view shell type is displayed in the center @@ -149,20 +149,20 @@ public: virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, - bool bBrowse = false); + bool bBrowse = false) SAL_OVERRIDE; - virtual void UIActivating( SfxInPlaceClient* ); - virtual void UIDeactivated( SfxInPlaceClient* ); - virtual void Activate (bool IsMDIActivate); - virtual void Deactivate (bool IsMDIActivate); + virtual void UIActivating( SfxInPlaceClient* ) SAL_OVERRIDE; + virtual void UIDeactivated( SfxInPlaceClient* ) SAL_OVERRIDE; + virtual void Activate (bool IsMDIActivate) SAL_OVERRIDE; + virtual void Deactivate (bool IsMDIActivate) SAL_OVERRIDE; virtual void SetZoomFactor ( const Fraction &rZoomX, - const Fraction &rZoomY); + const Fraction &rZoomY) SAL_OVERRIDE; virtual bool PrepareClose (bool bUI = true) SAL_OVERRIDE; - virtual void WriteUserData (OUString&, bool bBrowse = false); - virtual void ReadUserData (const OUString&, bool bBrowse = false); - virtual SdrView* GetDrawView (void) const; - virtual void AdjustPosSizePixel (const Point &rOfs, const Size &rSize); + virtual void WriteUserData (OUString&, bool bBrowse = false) SAL_OVERRIDE; + virtual void ReadUserData (const OUString&, bool bBrowse = false) SAL_OVERRIDE; + virtual SdrView* GetDrawView (void) const SAL_OVERRIDE; + virtual void AdjustPosSizePixel (const Point &rOfs, const Size &rSize) SAL_OVERRIDE; /** When is given, then the mouse shape is set to hour glass (or whatever the busy shape looks like on the system.) @@ -228,7 +228,7 @@ public: protected: osl::Mutex maMutex; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; virtual void InitializeFramework (void); diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 864f30377b60..8cb3266d67b9 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -68,7 +68,7 @@ public: ::com::sun::star::frame::XController>& rxController); virtual ~ViewTabBar (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; ::boost::shared_ptr< ::TabControl> GetTabControl (void) const; @@ -79,14 +79,14 @@ public: virtual void SAL_CALL notifyConfigurationChange ( const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XTabBar ----------------------------------------------------------- @@ -95,42 +95,42 @@ public: SAL_CALL addTabBarButtonAfter ( const ::com::sun::star::drawing::framework::TabBarButton& rButton, const ::com::sun::star::drawing::framework::TabBarButton& rAnchor) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL appendTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence SAL_CALL getTabBarButtons (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XResource --------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId> SAL_CALL getResourceId (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XUnoTunnel -------------------------------------------------------- virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence& rId) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 7571f73dcf7a..56e0cb2a3429 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -137,11 +137,11 @@ public: double GetScrlPageWidth(); double GetScrlPageHeight(); virtual void GrabFocus(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; /** The DropScroll() method is used by AcceptDrop() to scroll the content of the window while dragging and dropping. With this method @@ -170,17 +170,17 @@ protected: ViewShell* mpViewShell; bool mbUseDropScroll; - virtual void Resize(); - virtual void PrePaint(); - virtual void Paint(const Rectangle& rRect); - virtual void KeyInput(const KeyEvent& rKEvt); - virtual void MouseMove(const MouseEvent& rMEvt); - virtual void MouseButtonUp(const MouseEvent& rMEvt); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void Command(const CommandEvent& rCEvt); - virtual void RequestHelp( const HelpEvent& rEvt ); - virtual void LoseFocus(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual void Resize() SAL_OVERRIDE; + virtual void PrePaint() SAL_OVERRIDE; + virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rEvt ) SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; /** Create an accessibility object that makes this window accessible. @@ -190,11 +190,11 @@ protected: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessible (void); + CreateAccessible (void) SAL_OVERRIDE; virtual void SwitchView(); - OUString GetSurroundingText() const; - Selection GetSurroundingTextSelection() const; + OUString GetSurroundingText() const SAL_OVERRIDE; + Selection GetSurroundingTextSelection() const SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index 3aeb08f6fb05..fd775eee7ffd 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -102,7 +102,7 @@ public: /** Callback that waits for notifications of a SvtCTLOptions object. */ - virtual void ConfigurationChanged ( utl::ConfigurationBroadcaster*, sal_uInt32 nHint); + virtual void ConfigurationChanged ( utl::ConfigurationBroadcaster*, sal_uInt32 nHint) SAL_OVERRIDE; private: /// Options to monitor for changes. diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index c740269478d3..9b9ecae46d3d 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -72,12 +72,12 @@ public: SdDisplay( ::Window* pWin, SdResId Id ); ~SdDisplay(); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; void SetBitmapEx( BitmapEx* pBmpEx ); void SetScale( const Fraction& rFrac ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; @@ -95,12 +95,12 @@ public: void AddObj( ::sd::View& rView ); void CreateAnimObj( ::sd::View& rView ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; protected: - virtual bool Close(); - virtual void Resize(); - virtual void FillInfo( SfxChildWinInfo& ) const; + virtual bool Close() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void FillInfo( SfxChildWinInfo& ) const SAL_OVERRIDE; private: SdDisplay aCtlDisplay; @@ -178,7 +178,7 @@ public: protected: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; private: AnimationWindow* pAnimationWin; }; diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index 1a7734785b57..e058a19ebdf8 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -38,7 +38,7 @@ class SdPagesField : public SvxMetricField private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; protected: - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; public: SdPagesField( Window* pParent, @@ -57,8 +57,8 @@ class SdTbxCtlDiaPages : public SfxToolBoxControl { public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx index cff67b0038a8..59ac70389b0c 100644 --- a/sd/source/ui/inc/dlg_char.hxx +++ b/sd/source/ui/inc/dlg_char.hxx @@ -39,7 +39,7 @@ private: const SfxObjectShell& rDocShell; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx index a68cec50466f..3578559f5216 100644 --- a/sd/source/ui/inc/dlgpage.hxx +++ b/sd/source/ui/inc/dlgpage.hxx @@ -47,7 +47,7 @@ public: SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage = sal_True ); ~SdPageDlg() {}; - virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_INC_DLGPAGE_HXX diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 7895129830c1..e02eb0f40644 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -48,7 +48,7 @@ protected: Color maDocumentColor; rtl::Reference< sd::SlideShow > mxSlideShow; - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; static void CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rPoint ); void ImpPaint( GDIMetaFile* pFile, OutputDevice* pVDev ); @@ -56,7 +56,7 @@ protected: svtools::ColorConfig maColorConfig; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; void updateViewSettings(); @@ -64,15 +64,15 @@ public: SdDocPreviewWin( Window* pParent, const ResId& rResId ); ~SdDocPreviewWin(); void SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage = 0 ); - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; void startPreview(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void SetClickHdl( const Link& rLink ) { aClickHdl = rLink; } const Link& GetClickHdl() const { return aClickHdl; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 18e5854527e7..0a149461b8a8 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -42,26 +42,26 @@ public: DrawViewShell* pShell); virtual ~DrawView (void); - virtual void MarkListHasChanged(); - void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); + virtual void MarkListHasChanged() SAL_OVERRIDE; + void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; - virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False); + virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False) SAL_OVERRIDE; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; void BlockPageOrderChangedHint(sal_Bool bBlock); - sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr = sal_False); - virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; + sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr = sal_False) SAL_OVERRIDE; + virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const SAL_OVERRIDE; - virtual void MakeVisible(const Rectangle& rRect, ::Window& rWin); - virtual void HideSdrPage(); // SdrPageView* pPV); + virtual void MakeVisible(const Rectangle& rRect, ::Window& rWin) SAL_OVERRIDE; + virtual void HideSdrPage() SAL_OVERRIDE; // SdrPageView* pPV); void PresPaint(const Region& rRegion); - virtual void DeleteMarked(); // from SdrView + virtual void DeleteMarked() SAL_OVERRIDE; // from SdrView protected: - virtual void ModelHasChanged(); + virtual void ModelHasChanged() SAL_OVERRIDE; private: DrawDocShell* mpDocShell; diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index 04356d9c8c2d..bba6bbe6b592 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -84,7 +84,7 @@ public: bool bBroadcastRequestEvents); virtual ~Configuration (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XConfiguration @@ -92,12 +92,12 @@ public: virtual void SAL_CALL addResource ( const ::com::sun::star::uno::Reference& rxResourceId) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeResource( const ::com::sun::star::uno::Reference& rxResourceId) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId> > SAL_CALL getResources ( @@ -105,19 +105,19 @@ public: ::com::sun::star::drawing::framework::XResourceId>& rxAnchorId, const OUString& rsResourceURLPrefix, ::com::sun::star::drawing::framework::AnchorBindingMode eMode) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasResource ( const ::com::sun::star::uno::Reference& rxResourceId) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCloneable virtual ::com::sun::star::uno::Reference SAL_CALL createClone (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed @@ -126,13 +126,13 @@ public: debugging purposes. */ virtual OUString SAL_CALL getName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ virtual void SAL_CALL setName (const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: class ResourceContainer; diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index 62c4fb3d1e44..1175631f0dac 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -69,7 +69,7 @@ public: ConfigurationController (void) throw(); virtual ~ConfigurationController (void) throw(); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; void ProcessEvent (void); @@ -88,44 +88,44 @@ public: virtual void SAL_CALL lock() throw (css::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL unlock (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL requestResourceActivation ( const css::uno::Reference& rxResourceId, css::drawing::framework::ResourceActivationMode eMode) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL requestResourceDeactivation ( const css::uno::Reference& rxResourceId) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL getResource ( const css::uno::Reference& rxResourceId) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL update (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::framework::XConfiguration> SAL_CALL getRequestedConfiguration (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::framework::XConfiguration> SAL_CALL getCurrentConfiguration (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL restoreConfiguration ( const css::uno::Reference& rxConfiguration) throw (css::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; // XConfigurationControllerBroadcaster @@ -135,27 +135,27 @@ public: css::drawing::framework::XConfigurationChangeListener>& rxListener, const OUString& rsEventType, const css::uno::Any& rUserData) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeConfigurationChangeListener ( const css::uno::Reference< css::drawing::framework::XConfigurationChangeListener>& rxListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL notifyEvent ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XConfigurationRequestQueue virtual sal_Bool SAL_CALL hasPendingRequests (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL postChangeRequest ( const css::uno::Reference< css::drawing::framework::XConfigurationChangeRequest>& rxRequest) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XResourceFactoryManager @@ -163,27 +163,27 @@ public: virtual void SAL_CALL addResourceFactory( const OUString& sResourceURL, const css::uno::Reference& rxResourceFactory) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeResourceFactoryForURL( const OUString& sResourceURL) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeResourceFactoryForReference( const css::uno::Reference& rxResourceFactory) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL getResourceFactory ( const OUString& sResourceURL) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Use this class instead of calling lock() and unlock() directly in diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index e3f214811861..50c7cb720f92 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -74,20 +74,20 @@ public: const css::uno::Reference& rxContext); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XModuleController virtual void SAL_CALL requestResource(const OUString& rsResourceURL) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference< diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index 2b3460305612..c0b9221620b3 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -79,7 +79,7 @@ public: throw (); virtual ~Pane (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence& getUnoTunnelId (void); @@ -96,46 +96,46 @@ public: */ virtual cssu::Reference SAL_CALL getWindow (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Reference SAL_CALL getCanvas (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; //----- XPane2 ------------------------------------------------------------- virtual sal_Bool SAL_CALL isVisible (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setVisible (sal_Bool bIsVisible) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Reference SAL_CALL getAccessible (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAccessible ( const cssu::Reference& rxAccessible) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; //----- XResource --------------------------------------------------------- virtual ::com::sun::star::uno::Reference SAL_CALL getResourceId (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** For the typical pane it makes no sense to be dislayed without a view. Therefore this default implementation returns always . */ virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XUnoTunnel -------------------------------------------------------- virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence& rId) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx index 646a8e4ec1f6..38c07876fa30 100644 --- a/sd/source/ui/inc/framework/PresentationFactory.hxx +++ b/sd/source/ui/inc/framework/PresentationFactory.hxx @@ -63,7 +63,7 @@ public: const css::uno::Reference& rxController); virtual ~PresentationFactory (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XResourceFactory @@ -72,25 +72,25 @@ public: SAL_CALL createResource ( const css::uno::Reference< css::drawing::framework::XResourceId>& rxViewId) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL releaseResource ( const css::uno::Reference& xView) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index e308e2389f5a..30bccf4c8a59 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -107,57 +107,57 @@ public: virtual OUString SAL_CALL getResourceURL (void) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::util::URL SAL_CALL getFullResourceURL (void) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasAnchor (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::framework::XResourceId> SAL_CALL getAnchor (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence SAL_CALL getAnchorURLs (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getResourceTypePrefix (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL compareTo (const css::uno::Reference< css::drawing::framework::XResourceId>& rxResourceId) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isBoundTo ( const css::uno::Reference< css::drawing::framework::XResourceId>& rxResourceId, css::drawing::framework::AnchorBindingMode eMode) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isBoundToURL ( const OUString& rsAnchorURL, css::drawing::framework::AnchorBindingMode eMode) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::framework::XResourceId> SAL_CALL clone (void) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XInitialization =================================================== void SAL_CALL initialize ( const css::uno::Sequence& aArguments) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: /** The set of URLs that consist of the resource URL at index 0 and the diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index 0ba3c93a98ca..dd8efc9c3087 100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -74,8 +74,8 @@ public: const ::com::sun::star::uno::Reference& rxWindow); virtual ~ViewShellWrapper (void); - virtual void SAL_CALL disposing (void); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence& getUnoTunnelId (void); @@ -88,58 +88,58 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence& rId) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XResource virtual ::com::sun::star::uno::Reference SAL_CALL getResourceId (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSelectionSupplier - virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRelocatableResource virtual sal_Bool SAL_CALL relocateToAnchor ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResource>& xResource) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::boost::shared_ptr< ViewShell > mpViewShell; diff --git a/sd/source/ui/inc/fuarea.hxx b/sd/source/ui/inc/fuarea.hxx index ad0cd278c21c..910ba23218b8 100644 --- a/sd/source/ui/inc/fuarea.hxx +++ b/sd/source/ui/inc/fuarea.hxx @@ -31,8 +31,8 @@ public: static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; private: FuArea ( @@ -42,7 +42,7 @@ private: SdDrawDocument* pDoc, SfxRequest& rReq); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/fubullet.hxx b/sd/source/ui/inc/fubullet.hxx index 1dd91c70dd59..4e606a7f75c5 100644 --- a/sd/source/ui/inc/fubullet.hxx +++ b/sd/source/ui/inc/fubullet.hxx @@ -35,7 +35,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; static void GetSlotState( SfxItemSet& rSet, ViewShell* pViewShell, SfxViewFrame* pViewFrame ); diff --git a/sd/source/ui/inc/fuchar.hxx b/sd/source/ui/inc/fuchar.hxx index 20ffd3d9d202..c0f66b58193b 100644 --- a/sd/source/ui/inc/fuchar.hxx +++ b/sd/source/ui/inc/fuchar.hxx @@ -32,10 +32,10 @@ public: static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; private: FuChar ( diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx index 9c0236e914ec..6ea52cbae3f6 100644 --- a/sd/source/ui/inc/fucon3d.hxx +++ b/sd/source/ui/inc/fucon3d.hxx @@ -36,18 +36,18 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; private: FuConstruct3dObject ( diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx index 8ac7bb453b9c..d9b2ece8b2b6 100644 --- a/sd/source/ui/inc/fuconarc.hxx +++ b/sd/source/ui/inc/fuconarc.hxx @@ -32,18 +32,18 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; protected: FuConstructArc ( diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index 0b65ff874bb6..15907e22a618 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -37,23 +37,23 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; - virtual void SelectionHasChanged(); + virtual void SelectionHasChanged() SAL_OVERRIDE; void SetEditMode(sal_uInt16 nMode); sal_uInt16 GetEditMode() { return nEditMode; } - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; protected: FuConstructBezierPolygon ( diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx index c29cec57b251..66b34db89e77 100644 --- a/sd/source/ui/inc/fuconcs.hxx +++ b/sd/source/ui/inc/fuconcs.hxx @@ -35,22 +35,22 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); + virtual void Activate() SAL_OVERRIDE; void SetAttributes( SdrObject* pObj ); - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; // #i33136# - virtual bool doConstructOrthogonal() const; + virtual bool doConstructOrthogonal() const SAL_OVERRIDE; protected: FuConstructCustomShape ( diff --git a/sd/source/ui/inc/fuconnct.hxx b/sd/source/ui/inc/fuconnct.hxx index 5eac44fd27c4..eb74f58e1023 100644 --- a/sd/source/ui/inc/fuconnct.hxx +++ b/sd/source/ui/inc/fuconnct.hxx @@ -32,7 +32,7 @@ public: static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuConnectionDlg ( diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx index 1d553336f7d2..3efba9d797f4 100644 --- a/sd/source/ui/inc/fuconrec.hxx +++ b/sd/source/ui/inc/fuconrec.hxx @@ -39,21 +39,21 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; void SetAttributes(SfxItemSet& rAttr, SdrObject* pObj); void SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj); - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; protected: FuConstructRectangle ( diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx index 88794cbd21ca..322c58ddf4ca 100644 --- a/sd/source/ui/inc/fuconstr.hxx +++ b/sd/source/ui/inc/fuconstr.hxx @@ -34,18 +34,18 @@ class FuConstruct public: TYPEINFO_OVERRIDE(); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; - virtual void SelectionHasChanged() { bSelectionChanged = true; } + virtual void SelectionHasChanged() SAL_OVERRIDE { bSelectionChanged = true; } // SJ: setting stylesheet, the use of a filled or unfilled style // is determined by the member nSlotId : diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx index 49c0e56212d8..5914346e9720 100644 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/source/ui/inc/fuconuno.hxx @@ -35,18 +35,18 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; protected: FuConstructUnoControl( diff --git a/sd/source/ui/inc/fucopy.hxx b/sd/source/ui/inc/fucopy.hxx index 46388a11574b..5ac6bd5eafe7 100644 --- a/sd/source/ui/inc/fucopy.hxx +++ b/sd/source/ui/inc/fucopy.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/fucushow.hxx b/sd/source/ui/inc/fucushow.hxx index 33b3b71b5da9..54685c4e32d5 100644 --- a/sd/source/ui/inc/fucushow.hxx +++ b/sd/source/ui/inc/fucushow.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuCustomShowDlg ( diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx index 1a3e6af03a39..142976d39579 100644 --- a/sd/source/ui/inc/fudraw.hxx +++ b/sd/source/ui/inc/fudraw.hxx @@ -37,14 +37,14 @@ class FuDraw public: TYPEINFO_OVERRIDE(); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual sal_Bool RequestHelp(const HelpEvent& rHEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool RequestHelp(const HelpEvent& rHEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; virtual void ForcePointer(const MouseEvent* pMEvt = NULL); @@ -61,7 +61,7 @@ public: @returns true if a active function was aborted */ - virtual bool cancel(); + virtual bool cancel() SAL_OVERRIDE; protected: FuDraw (ViewShell* pViewSh, diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx index c194b9501a7b..8e1356a31c57 100644 --- a/sd/source/ui/inc/fudspord.hxx +++ b/sd/source/ui/inc/fudspord.hxx @@ -38,12 +38,12 @@ public: static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); // Mouse- & Key-Events - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; protected: virtual ~FuDisplayOrder (void); diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx index 666804e49d64..5ea12d543057 100644 --- a/sd/source/ui/inc/fuediglu.hxx +++ b/sd/source/ui/inc/fuediglu.hxx @@ -31,22 +31,22 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual sal_Bool Command(const CommandEvent& rCEvt); - virtual void ReceiveRequest(SfxRequest& rReq); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool Command(const CommandEvent& rCEvt) SAL_OVERRIDE; + virtual void ReceiveRequest(SfxRequest& rReq) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; //Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point, //and SHIFT+ENTER key to decide the postion and draw the new insert point - virtual void ForcePointer(const MouseEvent* pMEvt = NULL); + virtual void ForcePointer(const MouseEvent* pMEvt = NULL) SAL_OVERRIDE; private: sal_Bool bBeginInsertPoint; Point oldPoint; diff --git a/sd/source/ui/inc/fuexpand.hxx b/sd/source/ui/inc/fuexpand.hxx index 9eb997d8e791..df6415894d02 100644 --- a/sd/source/ui/inc/fuexpand.hxx +++ b/sd/source/ui/inc/fuexpand.hxx @@ -31,7 +31,7 @@ class FuExpandPage TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuExpandPage ( diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 99a3e47e4cbd..061224220e40 100644 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -37,13 +37,13 @@ public: static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; static void GetMenuState( DrawViewShell& rDrawViewShell, SfxItemSet &rSet ); static bool CanCopyThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ); @@ -51,7 +51,7 @@ public: private: FuFormatPaintBrush ( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); - void DoExecute( SfxRequest& rReq ); + void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; bool HasContentForThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const; void Paste( bool, bool ); diff --git a/sd/source/ui/inc/fuinsert.hxx b/sd/source/ui/inc/fuinsert.hxx index f002250b58dd..60276cd146a6 100644 --- a/sd/source/ui/inc/fuinsert.hxx +++ b/sd/source/ui/inc/fuinsert.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: @@ -53,7 +53,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuInsertClipboard ( @@ -74,7 +74,7 @@ class FuInsertOLE TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuInsertOLE ( @@ -94,7 +94,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuInsertAVMedia ( @@ -112,7 +112,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuInsert3DModel ( diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx index 4cb8a4bd8efa..fac9e41a4014 100644 --- a/sd/source/ui/inc/fuinsfil.hxx +++ b/sd/source/ui/inc/fuinsfil.hxx @@ -35,7 +35,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; static void GetSupportedFilterVector( ::std::vector< OUString >& rFilterVector ); diff --git a/sd/source/ui/inc/fuline.hxx b/sd/source/ui/inc/fuline.hxx index 5ef287cf3a52..83bdc719237e 100644 --- a/sd/source/ui/inc/fuline.hxx +++ b/sd/source/ui/inc/fuline.hxx @@ -30,11 +30,11 @@ class FuLine public: TYPEINFO_OVERRIDE(); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/fulinend.hxx b/sd/source/ui/inc/fulinend.hxx index c70de5d33664..54207e7ccd1f 100644 --- a/sd/source/ui/inc/fulinend.hxx +++ b/sd/source/ui/inc/fulinend.hxx @@ -30,11 +30,11 @@ class FuLineEnd public: TYPEINFO_OVERRIDE(); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/fulink.hxx b/sd/source/ui/inc/fulink.hxx index ba787be323ce..ac127bf4bb2e 100644 --- a/sd/source/ui/inc/fulink.hxx +++ b/sd/source/ui/inc/fulink.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/fumeasur.hxx b/sd/source/ui/inc/fumeasur.hxx index 19f3c95fb7c2..97c8909761a7 100644 --- a/sd/source/ui/inc/fumeasur.hxx +++ b/sd/source/ui/inc/fumeasur.hxx @@ -31,7 +31,7 @@ class FuMeasureDlg TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx index ca18eb2363b5..c5a85d963a26 100644 --- a/sd/source/ui/inc/fumorph.hxx +++ b/sd/source/ui/inc/fumorph.hxx @@ -40,7 +40,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: typedef ::std::vector< ::basegfx::B2DPolyPolygon* > B2DPolyPolygonList_impl; diff --git a/sd/source/ui/inc/fuoaprms.hxx b/sd/source/ui/inc/fuoaprms.hxx index 0f103156e50c..1d3b0290fa10 100644 --- a/sd/source/ui/inc/fuoaprms.hxx +++ b/sd/source/ui/inc/fuoaprms.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/fuolbull.hxx b/sd/source/ui/inc/fuolbull.hxx index 8a607cfcfe34..a5b559436af2 100644 --- a/sd/source/ui/inc/fuolbull.hxx +++ b/sd/source/ui/inc/fuolbull.hxx @@ -43,7 +43,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuOutlineBullet ( diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx index 5e5602128665..0b6b0fece74e 100644 --- a/sd/source/ui/inc/fuoltext.hxx +++ b/sd/source/ui/inc/fuoltext.hxx @@ -42,18 +42,18 @@ public: static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - - virtual void DoCut(); - virtual void DoCopy(); - virtual void DoPaste(); - virtual void DoPasteUnformatted(); - - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + + virtual void DoCut() SAL_OVERRIDE; + virtual void DoCopy() SAL_OVERRIDE; + virtual void DoPaste() SAL_OVERRIDE; + virtual void DoPasteUnformatted() SAL_OVERRIDE; + + virtual void Activate() SAL_OVERRIDE; // Function aktivieren + virtual void Deactivate() SAL_OVERRIDE; // Function deaktivieren /** Call this method when the text in the outliner (may) has changed. It will invalidate some slots of the view frame and update the diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index 87c937402241..dbf764a3486c 100644 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -43,7 +43,7 @@ class FuOutline public: TYPEINFO_OVERRIDE(); - virtual sal_Bool Command(const CommandEvent& rCEvt); + virtual sal_Bool Command(const CommandEvent& rCEvt) SAL_OVERRIDE; protected: FuOutline ( diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx index 13753cfb0a39..ac2b947e7b6d 100644 --- a/sd/source/ui/inc/fupage.hxx +++ b/sd/source/ui/inc/fupage.hxx @@ -36,10 +36,10 @@ class FuPage TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; const SfxItemSet* ExecuteDialog( Window* pParent ); diff --git a/sd/source/ui/inc/fuparagr.hxx b/sd/source/ui/inc/fuparagr.hxx index 3341f249f47b..03e3b4b9f7cd 100644 --- a/sd/source/ui/inc/fuparagr.hxx +++ b/sd/source/ui/inc/fuparagr.hxx @@ -30,11 +30,11 @@ class FuParagraph public: TYPEINFO_OVERRIDE(); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuParagraph ( diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx index ec080c35531c..2990385600ed 100644 --- a/sd/source/ui/inc/fuprlout.hxx +++ b/sd/source/ui/inc/fuprlout.hxx @@ -38,7 +38,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuPresentationLayout ( diff --git a/sd/source/ui/inc/fuprobjs.hxx b/sd/source/ui/inc/fuprobjs.hxx index f1b988169843..b8446fbc89d9 100644 --- a/sd/source/ui/inc/fuprobjs.hxx +++ b/sd/source/ui/inc/fuprobjs.hxx @@ -39,7 +39,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuPresentationObjects ( diff --git a/sd/source/ui/inc/fuscale.hxx b/sd/source/ui/inc/fuscale.hxx index c130589977fc..a3d1d46df7fa 100644 --- a/sd/source/ui/inc/fuscale.hxx +++ b/sd/source/ui/inc/fuscale.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuScale ( diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx index 4540189c8ac1..2f80866f521d 100644 --- a/sd/source/ui/inc/fusearch.hxx +++ b/sd/source/ui/inc/fusearch.hxx @@ -35,7 +35,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; void SearchAndReplace( const SvxSearchItem* pSearchItem ); diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx index d9536102621c..6f5add203742 100644 --- a/sd/source/ui/inc/fusel.hxx +++ b/sd/source/ui/inc/fusel.hxx @@ -37,18 +37,18 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; - virtual void SelectionHasChanged(); + virtual void SelectionHasChanged() SAL_OVERRIDE; void SetEditMode(sal_uInt16 nMode); sal_uInt16 GetEditMode() { return nEditMode; } @@ -61,10 +61,10 @@ public: @returns true if a active function was aborted */ - virtual bool cancel(); + virtual bool cancel() SAL_OVERRIDE; //let mouse cursor move - virtual void ForcePointer(const MouseEvent* pMEvt = NULL); + virtual void ForcePointer(const MouseEvent* pMEvt = NULL) SAL_OVERRIDE; protected: FuSelection (ViewShell* pViewSh, ::sd::Window* pWin, diff --git a/sd/source/ui/inc/fusldlg.hxx b/sd/source/ui/inc/fusldlg.hxx index 3ec8cb1fcac6..edb56ea8b58a 100644 --- a/sd/source/ui/inc/fusldlg.hxx +++ b/sd/source/ui/inc/fusldlg.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuSlideShowDlg ( diff --git a/sd/source/ui/inc/fusnapln.hxx b/sd/source/ui/inc/fusnapln.hxx index 3c1188f1f10c..2a001f5eac4f 100644 --- a/sd/source/ui/inc/fusnapln.hxx +++ b/sd/source/ui/inc/fusnapln.hxx @@ -30,11 +30,11 @@ class FuSnapLine public: TYPEINFO_OVERRIDE(); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuSnapLine ( diff --git a/sd/source/ui/inc/fusumry.hxx b/sd/source/ui/inc/fusumry.hxx index 3f39ca9cd32c..1a21209c79ad 100644 --- a/sd/source/ui/inc/fusumry.hxx +++ b/sd/source/ui/inc/fusumry.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuSummaryPage ( diff --git a/sd/source/ui/inc/futempl.hxx b/sd/source/ui/inc/futempl.hxx index 630919dbf9e4..22ae4936b96e 100644 --- a/sd/source/ui/inc/futempl.hxx +++ b/sd/source/ui/inc/futempl.hxx @@ -30,11 +30,11 @@ class FuTemplate public: TYPEINFO_OVERRIDE(); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuTemplate ( diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index 3ec8412d4e3f..5c27032545e6 100644 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/source/ui/inc/futext.hxx @@ -41,25 +41,25 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual sal_Bool Command(const CommandEvent& rCEvt); - virtual sal_Bool RequestHelp(const HelpEvent& rHEvt); - virtual void ReceiveRequest(SfxRequest& rReq); - virtual void DoubleClick(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool Command(const CommandEvent& rCEvt) SAL_OVERRIDE; + virtual sal_Bool RequestHelp(const HelpEvent& rHEvt) SAL_OVERRIDE; + virtual void ReceiveRequest(SfxRequest& rReq) SAL_OVERRIDE; + virtual void DoubleClick(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); ///< activates the function - virtual void Deactivate(); ///< deactivates the function + virtual void Activate() SAL_OVERRIDE; ///< activates the function + virtual void Deactivate() SAL_OVERRIDE; ///< deactivates the function void SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag); sal_Bool DeleteDefaultText(); SdrTextObj* GetTextObj() { return static_cast< SdrTextObj* >( mxTextObj.get() ); } - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; /** is called when the currenct function should be aborted.

This is used when a function gets a KEY_ESCAPE but can also @@ -67,7 +67,7 @@ public: @returns true if a active function was aborted */ - virtual bool cancel(); + virtual bool cancel() SAL_OVERRIDE; static void ChangeFontSize( bool, OutlinerView*, const FontList*, ::sd::View* ); @@ -78,7 +78,7 @@ protected: SdDrawDocument* pDoc, SfxRequest& rReq); - virtual void disposing(); + virtual void disposing() SAL_OVERRIDE; SdrObjectWeakRef mxTextObj; Link aOldLink; diff --git a/sd/source/ui/inc/futhes.hxx b/sd/source/ui/inc/futhes.hxx index ea28787601d5..ed2b59aafe02 100644 --- a/sd/source/ui/inc/futhes.hxx +++ b/sd/source/ui/inc/futhes.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuThesaurus ( diff --git a/sd/source/ui/inc/futransf.hxx b/sd/source/ui/inc/futransf.hxx index 3118255ceda9..1f8dcd706b1a 100644 --- a/sd/source/ui/inc/futransf.hxx +++ b/sd/source/ui/inc/futransf.hxx @@ -32,7 +32,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuTransform ( diff --git a/sd/source/ui/inc/futxtatt.hxx b/sd/source/ui/inc/futxtatt.hxx index a6cf67566e0b..b56ebbc19d5a 100644 --- a/sd/source/ui/inc/futxtatt.hxx +++ b/sd/source/ui/inc/futxtatt.hxx @@ -31,7 +31,7 @@ class FuTextAttrDlg TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: FuTextAttrDlg ( diff --git a/sd/source/ui/inc/fuvect.hxx b/sd/source/ui/inc/fuvect.hxx index 93ca46c9cf79..0bae57170a32 100644 --- a/sd/source/ui/inc/fuvect.hxx +++ b/sd/source/ui/inc/fuvect.hxx @@ -31,7 +31,7 @@ public: TYPEINFO_OVERRIDE(); static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual void DoExecute( SfxRequest& rReq ); + virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx index 487c22a25fcf..9a8284b1cfe0 100644 --- a/sd/source/ui/inc/fuzoom.hxx +++ b/sd/source/ui/inc/fuzoom.hxx @@ -36,12 +36,12 @@ public: static rtl::Reference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); // Mouse- & Key-Events - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); ///< activates the function - virtual void Deactivate(); ///< deactivates the function + virtual void Activate() SAL_OVERRIDE; ///< activates the function + virtual void Deactivate() SAL_OVERRIDE; ///< deactivates the function protected: virtual ~FuZoom (void); diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index 2c311dffea06..c9feba92a99f 100644 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -35,7 +35,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); ~GlueEscDirLB(); - virtual void Select(); + virtual void Select() SAL_OVERRIDE; void Fill(); }; @@ -50,8 +50,8 @@ private: public: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, - const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index 807024960a5f..2887624ad2b0 100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -74,7 +74,7 @@ public: void Apply(); void Cancel(); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; }; } diff --git a/sd/source/ui/inc/masterlayoutdlg.hxx b/sd/source/ui/inc/masterlayoutdlg.hxx index 01ba5dc542d8..4c68d66178a1 100644 --- a/sd/source/ui/inc/masterlayoutdlg.hxx +++ b/sd/source/ui/inc/masterlayoutdlg.hxx @@ -55,7 +55,7 @@ private: public: MasterLayoutDialog( Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; }; } diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 582cf3cf1fe5..858654eb71be 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -98,7 +98,7 @@ public: const UpdateRequestFunctor& rUpdateRequest); virtual ~SdNavigatorWin(); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; void InitTreeLB( const SdDrawDocument* pDoc ); void RefreshDocumentLB( const OUString* pDocName = NULL ); @@ -109,8 +109,8 @@ public: void SetNavigatorDragType(NavigatorDragType eType) { meDragType = eType; } protected: - virtual void Resize(); - virtual bool Notify(NotifyEvent& rNEvt); + virtual void Resize() SAL_OVERRIDE; + virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; private: @@ -153,7 +153,7 @@ private: DECL_LINK( MenuSelectHdl, Menu * ); DECL_LINK( ShapeFilterCallback, Menu * ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetDragImage(); void ApplyImageList(); public: @@ -177,7 +177,7 @@ public: protected: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; private: SdNavigatorWin* pNavigatorWin; @@ -197,7 +197,7 @@ public: protected: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; private: SdNavigatorWin* pNavigatorWin; diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 01b22b53893b..e2a54d460ee5 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -62,8 +62,8 @@ public: SdOptionsItem( const SdOptionsGeneric& rParent, const OUString& rSubTree ); virtual ~SdOptionsItem(); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames) SAL_OVERRIDE; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties( const ::com::sun::star::uno::Sequence< OUString >& rNames ); @@ -128,9 +128,9 @@ private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ); @@ -162,8 +162,8 @@ public: SdOptionsLayoutItem( sal_uInt16 nWhich); SdOptionsLayoutItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; void SetOptions( SdOptions* pOpts ) const; @@ -177,9 +177,9 @@ class SD_DLLPUBLIC SdOptionsContents : public SdOptionsGeneric private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: @@ -195,8 +195,8 @@ public: SdOptionsContentsItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; void SetOptions( SdOptions* pOpts ) const; @@ -250,9 +250,9 @@ private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: @@ -341,8 +341,8 @@ public: SdOptionsMiscItem( sal_uInt16 nWhich); SdOptionsMiscItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; void SetOptions( SdOptions* pOpts ) const; @@ -369,9 +369,9 @@ private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: @@ -410,8 +410,8 @@ public: SdOptionsSnapItem( sal_uInt16 nWhich); SdOptionsSnapItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; void SetOptions( SdOptions* pOpts ) const; @@ -429,9 +429,9 @@ private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: @@ -448,9 +448,9 @@ class SdOptionsGrid : public SdOptionsGeneric, public SvxOptionsGrid { protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: @@ -520,9 +520,9 @@ private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: @@ -583,8 +583,8 @@ public: SdOptionsPrintItem( sal_uInt16 nWhich); SdOptionsPrintItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; void SetOptions( SdOptions* pOpts ) const; diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx index 12ea8065db10..4511537a9384 100644 --- a/sd/source/ui/inc/paragr.hxx +++ b/sd/source/ui/inc/paragr.hxx @@ -31,7 +31,7 @@ class SdParagraphDlg : public SfxTabDialog sal_uInt16 m_nParaStd; private: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr ); diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index e61e7c8a7bba..1cf08519b7c4 100644 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -74,7 +74,7 @@ private: PresentationObjects ePO; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; // for mapping with the new SvxNumBulletItem SfxItemSet aInputSet; diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index c0457e6cdad0..4966ad4c3b57 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -66,11 +66,11 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; void SetDrawMode(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; }; diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 31658b37c18f..eaa3680815ff 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -100,11 +100,11 @@ public: const ::com::sun::star::uno::Any maTreeListBoxData; SAL_DLLPRIVATE virtual ~SdPageObjsTransferable(); - SAL_DLLPRIVATE virtual void AddSupportedFormats(); - SAL_DLLPRIVATE virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - SAL_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction ); + SAL_DLLPRIVATE virtual void AddSupportedFormats() SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; friend class SdPageObjsTLB::SdPageObjsTransferable; @@ -139,13 +139,13 @@ protected: OUString maSelectionEntryText; // DragSourceHelper - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; - virtual void RequestingChildren( SvTreeListEntry* pParent ); + virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; void DoDrag(); void OnDragFinished( sal_uInt8 nDropAction ); @@ -177,11 +177,11 @@ protected: SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, - sal_uLong& rNewChildPos); + sal_uLong& rNewChildPos) SAL_OVERRIDE; using Window::GetDropTarget; - virtual SvTreeListEntry* GetDropTarget (const Point& rLocation); - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&,SvLBoxButtonKind); + virtual SvTreeListEntry* GetDropTarget (const Point& rLocation) SAL_OVERRIDE; + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&,SvLBoxButtonKind) SAL_OVERRIDE; public: @@ -191,10 +191,10 @@ public: // helper function for GetEntryAltText and GetEntryLongDescription OUString getAltLongDescText( SvTreeListEntry* pEntry , sal_Bool isAltText) const; - OUString GetEntryAltText( SvTreeListEntry* pEntry ) const; - OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const; - virtual void SelectHdl(); - virtual void KeyInput( const KeyEvent& rKEvt ); + OUString GetEntryAltText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; + OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; + virtual void SelectHdl() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; void SetViewFrame( SfxViewFrame* pViewFrame ) { mpFrame = pViewFrame; } SfxViewFrame* GetViewFrame() const { return mpFrame; } diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx index d5d11926596d..efb4a2a63dee 100644 --- a/sd/source/ui/inc/sdundogr.hxx +++ b/sd/source/ui/inc/sdundogr.hxx @@ -34,10 +34,10 @@ public: aCtn() {} virtual ~SdUndoGroup(); - virtual bool Merge( SfxUndoAction* pNextAction ); + virtual bool Merge( SfxUndoAction* pNextAction ) SAL_OVERRIDE; - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; void AddAction(SdUndoAction* pAction); sal_uLong Count() const { return aCtn.size(); } diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 7aa90c662742..592af02b3ea0 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -77,9 +77,9 @@ public: static SdTransferable* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual void DragFinished( sal_Int8 nDropAction ); + virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; SdDrawDocument* GetSourceDoc (void) const; /** User data objects can be used to store information temporarily @@ -106,12 +106,12 @@ public: protected: - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void ObjectReleased() SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 5b8b0b7c6f9b..effb0ad93732 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -114,35 +114,35 @@ public: // uno api - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPresentation - virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL end() throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL rehearseTimings( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL rehearseTimings( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPresentation2 virtual void SAL_CALL startWithArguments(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments) throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual ::sal_Bool SAL_CALL isRunning( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > SAL_CALL getController( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isRunning( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > SAL_CALL getController( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // legacy api diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index d7786dc1419a..a63b73fd0229 100644 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -79,7 +79,7 @@ protected: virtual void deselect(); virtual bool getContext( SdrViewContext& rContext ); - virtual void disposing(); + virtual void disposing() SAL_OVERRIDE; ::sd::View& mrView; bool mbSelected; diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index 7fb2a53213c4..c08ee9e952ce 100644 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -67,8 +67,8 @@ private: sal_uInt16 m_nTabId; sal_uInt16 m_nAsianTypoId; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); - virtual const SfxItemSet* GetRefreshedSet(); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual const SfxItemSet* GetRefreshedSet() SAL_OVERRIDE; public: SdTabTemplateDlg(Window* pParent, diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index 71128fd8c645..182080a23b28 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -76,10 +76,10 @@ public: virtual void KeyInput (const KeyEvent& rEvent); using sd::ViewShell::KeyInput; - virtual SdPage* GetActualPage (void); - virtual SdPage* getCurrentPage (void) const; + virtual SdPage* GetActualPage (void) SAL_OVERRIDE; + virtual SdPage* getCurrentPage (void) const SAL_OVERRIDE; - virtual void ArrangeGUIElements (void); + virtual void ArrangeGUIElements (void) SAL_OVERRIDE; TaskPaneShellManager& GetSubShellManager (void) const; @@ -102,13 +102,13 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessibleDocumentView (::sd::Window* pWindow); + CreateAccessibleDocumentView (::sd::Window* pWindow) SAL_OVERRIDE; - virtual css::uno::Reference CreateSubController (void); + virtual css::uno::Reference CreateSubController (void) SAL_OVERRIDE; /** Relocate all toplevel controls to the given parent window. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow); + virtual bool RelocateToParentWindow (::Window* pParentWindow) SAL_OVERRIDE; /// returns if and only if the given window is the panel anchor window of our ToolPanelDeck bool IsPanelAnchorWindow( const ::Window& i_rWindow ) const; diff --git a/sd/source/ui/inc/tbx_ww.hxx b/sd/source/ui/inc/tbx_ww.hxx index 20ec13892638..bfb3069360c6 100644 --- a/sd/source/ui/inc/tbx_ww.hxx +++ b/sd/source/ui/inc/tbx_ww.hxx @@ -35,10 +35,10 @@ public: SdTbxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SdTbxControl() {} - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_INC_TBX_WW_HXX diff --git a/sd/source/ui/inc/tmplctrl.hxx b/sd/source/ui/inc/tmplctrl.hxx index 1688af869617..def12f6c154e 100644 --- a/sd/source/ui/inc/tmplctrl.hxx +++ b/sd/source/ui/inc/tmplctrl.hxx @@ -27,13 +27,13 @@ public: SdTemplateControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); ~SdTemplateControl(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; SFX_DECL_STATUSBAR_CONTROL(); protected: - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; private: OUString msTemplate; diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index 1076a72467a9..a8c87d158fd1 100644 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx @@ -50,13 +50,13 @@ public: explicit PropertySet (void); virtual ~PropertySet (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XPropertySet virtual css::uno::Reference SAL_CALL getPropertySetInfo (void) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue ( const OUString& rsPropertyName, @@ -65,40 +65,40 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getPropertyValue (const OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener ( const OUString& rsPropertyName, const css::uno::Reference& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener ( const OUString& rsPropertyName, const css::uno::Reference& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener ( const OUString& rsPropertyName, const css::uno::Reference& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener ( const OUString& rsPropertyName, const css::uno::Reference& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /** Return the requested property value. diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index a61b306d77eb..ccf7a3972571 100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -97,20 +97,20 @@ public: virtual void SAL_CALL statusChanged ( const ::com::sun::star::frame::FeatureStateEvent& rState) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent) - throw(com::sun::star::uno::RuntimeException, std::exception); + throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /** This method is called by the WeakComponentImplHelper base class in reaction to a XComponent::dispose() call. It releases all currently active listeners. */ - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; private: Link maCallback; diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 266c4c71da81..9503425de8d4 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -103,11 +103,11 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; void Construct(); diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index be21955bb6fb..1be402ecaca2 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -40,8 +40,8 @@ public: ~SdTpOptionsSnap(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; }; @@ -62,8 +62,8 @@ public: ~SdTpOptionsContents(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; }; /** @@ -127,16 +127,16 @@ private: void UpdateCompatibilityControls (void); protected: - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; public: SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ); ~SdTpOptionsMisc(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet & ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; /** Hide Impress specific controls, make Draw specific controls visible and arrange the visible controls. Do not call this method or the @@ -149,7 +149,7 @@ public: SetDrawMode() method more than once. */ void SetImpressMode (void); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; using TabPage::ActivatePage; using TabPage::DeactivatePage; diff --git a/sd/source/ui/inc/unchss.hxx b/sd/source/ui/inc/unchss.hxx index 257eceaa2a73..e5096ea47358 100644 --- a/sd/source/ui/inc/unchss.hxx +++ b/sd/source/ui/inc/unchss.hxx @@ -41,10 +41,10 @@ public: const SfxItemSet* pTheNewItemSet); virtual ~StyleSheetUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_INC_UNCHSS_HXX diff --git a/sd/source/ui/inc/undoback.hxx b/sd/source/ui/inc/undoback.hxx index e30bacb3ac01..0efaf156d148 100644 --- a/sd/source/ui/inc/undoback.hxx +++ b/sd/source/ui/inc/undoback.hxx @@ -47,10 +47,10 @@ public: const SfxItemSet& rItenSet); virtual ~SdBackgroundObjUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual SdUndoAction* Clone() const; + virtual SdUndoAction* Clone() const SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_INC_UNDOBACK_HXX diff --git a/sd/source/ui/inc/undoheaderfooter.hxx b/sd/source/ui/inc/undoheaderfooter.hxx index b4b9cb5ecce7..944857741bff 100644 --- a/sd/source/ui/inc/undoheaderfooter.hxx +++ b/sd/source/ui/inc/undoheaderfooter.hxx @@ -40,8 +40,8 @@ public: SdHeaderFooterUndoAction( SdDrawDocument* pDoc, SdPage* pPage, const sd::HeaderFooterSettings& rNewSettings ); virtual ~SdHeaderFooterUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_INC_UNDOHEADERFOOTER_HXX diff --git a/sd/source/ui/inc/undolayer.hxx b/sd/source/ui/inc/undolayer.hxx index fda35cc5f3df..e19bfcd7ddf0 100644 --- a/sd/source/ui/inc/undolayer.hxx +++ b/sd/source/ui/inc/undolayer.hxx @@ -36,8 +36,8 @@ public: const OUString& rOldLayerName, const OUString& rOldLayerTitle, const OUString& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable, const OUString& rNewLayerName, const OUString& rNewLayerTitle, const OUString& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; private: SdrLayer* mpLayer; diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx index 3a8faab7cbb3..1f24916d9c9e 100644 --- a/sd/source/ui/inc/undopage.hxx +++ b/sd/source/ui/inc/undopage.hxx @@ -101,8 +101,8 @@ public: {} virtual ~SdPageFormatUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; }; /************************************************************************/ @@ -130,8 +130,8 @@ public: {} virtual ~SdPageLRUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; }; /************************************************************************/ @@ -159,8 +159,8 @@ public: {} virtual ~SdPageULUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; }; diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index 7b0257353f95..bf9c0d6849d7 100644 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -51,10 +51,10 @@ public: sal_Bool bTheNewBckgrndObjsVisible); virtual ~ModifyPageUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; @@ -66,10 +66,10 @@ public: const OUString& rOldLayoutName, const OUString& rNewLayoutName); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: OUString maOldName; diff --git a/sd/source/ui/inc/unmovss.hxx b/sd/source/ui/inc/unmovss.hxx index 3a976e5ef95e..65fca011ee5d 100644 --- a/sd/source/ui/inc/unmovss.hxx +++ b/sd/source/ui/inc/unmovss.hxx @@ -36,10 +36,10 @@ public: SdMoveStyleSheetsUndoAction(SdDrawDocument* pTheDoc, SdStyleSheetVector& rTheStyles, bool bInserted); virtual ~SdMoveStyleSheetsUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_INC_UNMOVSS_HXX diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index 05548711c4eb..b05158185c98 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -132,8 +132,8 @@ public: { nOldPresOrder = nTheOldPresOrder; nNewPresOrder = nTheNewPresOrder; } virtual ~SdAnimationPrmsUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_INC_UNOAPRMS_HXX diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index eccded2e0ad7..3e3f751346ac 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -139,83 +139,83 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XForbiddenCharacters > getForbiddenCharsTable(); // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; UNO3_GETIMPLEMENTATION_DECL(SdXImpressDocument) // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XModel - virtual void SAL_CALL lockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL unlockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasControllersLocked( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess > SAL_CALL getViewData() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setViewData( const ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess >& aData ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL lockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unlockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasControllersLocked( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess > SAL_CALL getViewData() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setViewData( const ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess >& aData ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawPageDuplicator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL duplicate( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL duplicate( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawPagesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMasterPagesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getMasterPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getMasterPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLayerManagerSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLayerManager( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLayerManager( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCustomPresentationSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getCustomPresentations( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getCustomPresentations( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHandoutMasterSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getHandoutMasterPage( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getHandoutMasterPage( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPresentationSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation > SAL_CALL getPresentation( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation > SAL_CALL getPresentation( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiServiceFactory ( SvxFmMSFactory ) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL createInstanceWithArguments( OUString const & ServiceSpecifier, css::uno::Sequence const & Arguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLinkTargetSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStyleFamiliesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAnyCompareFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRenderable - virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent @@ -226,7 +226,7 @@ public: and still has to forward the second call to the base class. See also comments of issue 27847. */ - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; /*********************************************************************** @@ -245,31 +245,31 @@ public: virtual ~SdDrawPagesAccess() throw(); // XDrawPages - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; /*********************************************************************** @@ -290,26 +290,26 @@ public: // XDrawPages virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; /*********************************************************************** @@ -327,23 +327,23 @@ public: virtual ~SdDocLinkTargets() throw(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // intern SdPage* FindPage( const OUString& rName ) const throw(); diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index 45c2f3ad8aad..ad7be67c5eae 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -55,14 +55,14 @@ public: virtual ~SdUnoSearchReplaceShape() throw(); // XReplaceable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL replaceAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL replaceAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSearchable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > SAL_CALL createSearchDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL findAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL findFirst( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL findNext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xStartAt, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > SAL_CALL createSearchDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL findAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL findFirst( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL findNext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xStartAt, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; /* ================================================================= */ @@ -97,21 +97,21 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdUnoSearchReplaceDescriptor ) // XSearchDescriptor - virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XReplaceDescriptor - virtual OUString SAL_CALL getReplaceString( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getReplaceString( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; /* ================================================================= */ @@ -130,12 +130,12 @@ public: virtual ~SdUnoFindAllAccess() throw(); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx index b5a69d3a5383..58cb42f02380 100644 --- a/sd/source/ui/inc/unprlout.hxx +++ b/sd/source/ui/inc/unprlout.hxx @@ -47,10 +47,10 @@ public: SdPage* pThePage); virtual ~SdPresentationLayoutUndoAction(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_INC_UNPRLOUT_HXX diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index 5d3def0017f3..3c04ed81b489 100644 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -46,7 +46,7 @@ public: bool CreateTags(); bool DisposeTags(); - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; private: ViewShellBase& mrBase; diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 06cdbd26acb0..9d088ae0d27c 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -91,38 +91,38 @@ public: const css::geometry::RealSize2D& rSpriteSize); virtual ~PresenterCustomSprite (void); virtual void SAL_CALL disposing (void) - throw (RuntimeException); + throw (RuntimeException) SAL_OVERRIDE; // XSprite virtual void SAL_CALL setAlpha (double nAlpha) - throw (lang::IllegalArgumentException,RuntimeException, std::exception); + throw (lang::IllegalArgumentException,RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL move (const geometry::RealPoint2D& rNewPos, const rendering::ViewState& rViewState, const rendering::RenderState& rRenderState) - throw (lang::IllegalArgumentException,RuntimeException, std::exception); + throw (lang::IllegalArgumentException,RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL transform (const geometry::AffineMatrix2D& rTransformation) - throw (lang::IllegalArgumentException,RuntimeException, std::exception); + throw (lang::IllegalArgumentException,RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL clip (const Reference& rClip) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPriority (double nPriority) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL show (void) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL hide (void) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; // XCustomSprite virtual Reference SAL_CALL getContentCanvas (void) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; private: rtl::Reference mpCanvas; diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index 860972b7eb7b..7fecfc991681 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -106,7 +106,7 @@ public: virtual ~PresenterCanvas (void); virtual void SAL_CALL disposing (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException) SAL_OVERRIDE; css::awt::Point GetOffset (const css::uno::Reference& rxBaseWindow); @@ -146,46 +146,46 @@ public: virtual void SAL_CALL initialize ( const css::uno::Sequence& rArguments) - throw(css::uno::Exception, css::uno::RuntimeException, std::exception); + throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCanvas virtual void SAL_CALL clear (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL drawPoint ( const css::geometry::RealPoint2D& aPoint, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL drawLine ( const css::geometry::RealPoint2D& aStartPoint, const css::geometry::RealPoint2D& aEndPoint, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL drawBezier ( const css::geometry::RealBezierSegment2D& aBezierSegment, const css::geometry::RealPoint2D& aEndPoint, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL drawPolyPolygon ( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL strokePolyPolygon ( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, const css::rendering::StrokeAttributes& aStrokeAttributes) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL strokeTexturedPolyPolygon ( @@ -196,7 +196,7 @@ public: const css::rendering::StrokeAttributes& aStrokeAttributes) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL strokeTextureMappedPolyPolygon( @@ -208,7 +208,7 @@ public: const css::rendering::StrokeAttributes& aStrokeAttributes) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL queryStrokeShapes( @@ -216,7 +216,7 @@ public: const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, const css::rendering::StrokeAttributes& aStrokeAttributes) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL fillPolyPolygon( @@ -224,7 +224,7 @@ public: const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL fillTexturedPolyPolygon( @@ -234,7 +234,7 @@ public: const css::uno::Sequence& xTextures) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL fillTextureMappedPolyPolygon( @@ -245,7 +245,7 @@ public: const css::uno::Reference< css::geometry::XMapping2D >& xMapping) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL createFont( @@ -253,13 +253,13 @@ public: const css::uno::Sequence< css::beans::PropertyValue >& aExtraFontProperties, const css::geometry::Matrix2D& aFontMatrix) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence SAL_CALL queryAvailableFonts( const css::rendering::FontInfo& aFilter, const css::uno::Sequence< css::beans::PropertyValue >& aFontProperties) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL drawText( @@ -268,14 +268,14 @@ public: const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, ::sal_Int8 nTextDirection) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL drawTextLayout( const css::uno::Reference< css::rendering::XTextLayout >& xLayoutetText, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL drawBitmap( @@ -284,7 +284,7 @@ public: const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL drawBitmapModulated( @@ -293,11 +293,11 @@ public: const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL getDevice (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSpriteCanvas @@ -305,7 +305,7 @@ public: css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation ( const css::uno::Reference< css::rendering::XAnimation >& animation) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps ( @@ -314,57 +314,57 @@ public: ::sal_Int8 interpolationMode) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite ( const css::geometry::RealSize2D& spriteSize) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite ( const css::uno::Reference< css::rendering::XSprite >& original) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::sal_Bool SAL_CALL updateScreen (::sal_Bool bUpdateAll) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XBitmap virtual css::geometry::IntegerSize2D SAL_CALL getSize (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasAlpha (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& rNewSize, sal_Bool bFast) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, std::exception); + css::rendering::VolatileContentDestroyedException, std::exception) SAL_OVERRIDE; private: css::uno::Reference mxUpdateCanvas; diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx index 48f87c29425e..bbacc31d91b9 100644 --- a/sd/source/ui/presenter/PresenterHelper.hxx +++ b/sd/source/ui/presenter/PresenterHelper.hxx @@ -51,7 +51,7 @@ public: // XInitialize virtual void SAL_CALL initialize (const css::uno::Sequence& rArguments) - throw(css::uno::Exception,css::uno::RuntimeException, std::exception); + throw(css::uno::Exception,css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPresenterHelper @@ -62,7 +62,7 @@ public: sal_Bool bInitiallyVisible, sal_Bool bEnableChildTransparentMode, sal_Bool bEnableParentClip) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL createSharedCanvas ( const css::uno::Reference& rxUpdateCanvas, @@ -70,33 +70,33 @@ public: const css::uno::Reference& rxSharedCanvas, const css::uno::Reference& rxSharedWindow, const css::uno::Reference& rxWindow) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL createCanvas ( const css::uno::Reference& rxWindow, sal_Int16 nRequestedCanvasFeatures, const OUString& rsOptionalCanvasServiceName) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL toTop ( const css::uno::Reference& rxWindow) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL loadBitmap ( const OUString& rsURL, const css::uno::Reference& rxCanvas) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL captureMouse (const css::uno::Reference& rxWindow) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL releaseMouse (const css::uno::Reference& rxWindow) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Rectangle SAL_CALL getWindowExtentsRelative ( const css::uno::Reference& rxChildWindow, const css::uno::Reference& rxParentWindow) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference mxComponentContext; diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index c9df2112b632..b8f43befe6e6 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -52,13 +52,13 @@ public: // CacheContext virtual void NotifyPreviewCreation ( CacheKey aKey, - const Bitmap& rPreview); - virtual bool IsIdle (void); - virtual bool IsVisible (CacheKey aKey); - virtual const SdrPage* GetPage (CacheKey aKey); - virtual ::boost::shared_ptr > GetEntryList (bool bVisible); - virtual sal_Int32 GetPriority (CacheKey aKey); - virtual ::com::sun::star::uno::Reference GetModel (void); + const Bitmap& rPreview) SAL_OVERRIDE; + virtual bool IsIdle (void) SAL_OVERRIDE; + virtual bool IsVisible (CacheKey aKey) SAL_OVERRIDE; + virtual const SdrPage* GetPage (CacheKey aKey) SAL_OVERRIDE; + virtual ::boost::shared_ptr > GetEntryList (bool bVisible) SAL_OVERRIDE; + virtual sal_Int32 GetPriority (CacheKey aKey) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference GetModel (void) SAL_OVERRIDE; private: Reference mxSlides; diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx index 354b1da49fc0..a31423d5d7a5 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.hxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx @@ -55,7 +55,7 @@ public: preview cache can be provided via methods. */ virtual void SAL_CALL initialize (const css::uno::Sequence& rArguments) - throw(css::uno::Exception,css::uno::RuntimeException, std::exception); + throw(css::uno::Exception,css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSlidePreviewCache @@ -63,36 +63,36 @@ public: virtual void SAL_CALL setDocumentSlides ( const css::uno::Reference& rxSlides, const css::uno::Reference& rxDocument) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setVisibleRange ( sal_Int32 nFirstVisibleSlideIndex, sal_Int32 nLastVisibleSlideIndex) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPreviewSize ( const css::geometry::IntegerSize2D& rSize) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL getSlidePreview ( sal_Int32 nSlideIndex, const css::uno::Reference& rxCanvas) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPreviewCreationNotifyListener ( const css::uno::Reference& rxListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePreviewCreationNotifyListener ( const css::uno::Reference& rxListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL pause (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL resume (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference mxComponentContext; diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx index e1e32fe175dc..7bb018773482 100644 --- a/sd/source/ui/presenter/PresenterTextView.hxx +++ b/sd/source/ui/presenter/PresenterTextView.hxx @@ -56,17 +56,17 @@ public: // XInitialization virtual void SAL_CALL initialize (const css::uno::Sequence& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; virtual css::uno::Any GetPropertyValue ( - const OUString& rsPropertyName); + const OUString& rsPropertyName) SAL_OVERRIDE; virtual css::uno::Any SetPropertyValue ( const OUString& rsPropertyName, - const css::uno::Any& rValue); + const css::uno::Any& rValue) SAL_OVERRIDE; private: class Implementation; diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx index 5eb4a078f517..06eda5ab06f3 100644 --- a/sd/source/ui/presenter/SlideRenderer.hxx +++ b/sd/source/ui/presenter/SlideRenderer.hxx @@ -51,13 +51,13 @@ class SlideRenderer public: explicit SlideRenderer (const css::uno::Reference& rxContext); virtual ~SlideRenderer (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize (const css::uno::Sequence& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSlideRenderer @@ -66,19 +66,19 @@ public: const css::uno::Reference& rxSlide, const css::awt::Size& rMaximumPreviewPixelSize, sal_Int16 nSuperSampleFactor) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL createPreviewForCanvas ( const css::uno::Reference& rxSlide, const css::awt::Size& rMaximumPreviewPixelSize, sal_Int16 nSuperSampleFactor, const css::uno::Reference& rxCanvas) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::awt::Size SAL_CALL calculatePreviewSize ( double nSlideAspectRatio, const css::awt::Size& rMaximumPreviewPixelSize) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: PreviewRenderer maPreviewRenderer; diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.hxx b/sd/source/ui/remotecontrol/AvahiNetworkService.hxx index 239059215929..11afc7bff4b3 100644 --- a/sd/source/ui/remotecontrol/AvahiNetworkService.hxx +++ b/sd/source/ui/remotecontrol/AvahiNetworkService.hxx @@ -21,8 +21,8 @@ namespace sd { : ZeroconfService(aname, aport){} virtual ~AvahiNetworkService(){} - void clear(); - void setup(); + void clear() SAL_OVERRIDE; + void setup() SAL_OVERRIDE; }; } #endif diff --git a/sd/source/ui/remotecontrol/BluetoothServer.hxx b/sd/source/ui/remotecontrol/BluetoothServer.hxx index 45fe3b21b141..0f649d9a2178 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.hxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.hxx @@ -49,7 +49,7 @@ namespace sd struct Impl; boost::scoped_ptr mpImpl; #endif - virtual void SAL_CALL run(); + virtual void SAL_CALL run() SAL_OVERRIDE; void cleanupCommunicators(); std::vector* mpCommunicators; diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx index 6705e000e72f..7b6e7deaedd1 100644 --- a/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx +++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx @@ -47,11 +47,11 @@ namespace sd * Returns whatever the last call of recv returned, i.e. 0 or less * if there was a problem in communications. */ - virtual sal_Int32 readLine( OString& aLine ); + virtual sal_Int32 readLine( OString& aLine ) SAL_OVERRIDE; - virtual sal_Int32 write( const void* pBuffer, sal_uInt32 n ); + virtual sal_Int32 write( const void* pBuffer, sal_uInt32 n ) SAL_OVERRIDE; - virtual void close(); + virtual void close() SAL_OVERRIDE; void getPeerAddr(osl::SocketAddr&); private: diff --git a/sd/source/ui/remotecontrol/Communicator.hxx b/sd/source/ui/remotecontrol/Communicator.hxx index 89f2c2e6d131..c7f00c6e1e77 100644 --- a/sd/source/ui/remotecontrol/Communicator.hxx +++ b/sd/source/ui/remotecontrol/Communicator.hxx @@ -48,7 +48,7 @@ namespace sd void forceClose(); private: - void execute(); + void execute() SAL_OVERRIDE; IBluetoothSocket *mpSocket; Transmitter *pTransmitter; diff --git a/sd/source/ui/remotecontrol/DiscoveryService.hxx b/sd/source/ui/remotecontrol/DiscoveryService.hxx index 03bbf87e4e96..a362d0fe911d 100644 --- a/sd/source/ui/remotecontrol/DiscoveryService.hxx +++ b/sd/source/ui/remotecontrol/DiscoveryService.hxx @@ -37,7 +37,7 @@ namespace sd void setupSockets(); static DiscoveryService *spService; - virtual void SAL_CALL run(); + virtual void SAL_CALL run() SAL_OVERRIDE; int mSocket; ZeroconfService * zService; diff --git a/sd/source/ui/remotecontrol/ImagePreparer.hxx b/sd/source/ui/remotecontrol/ImagePreparer.hxx index 358b1b2ccf9b..0b1d861e9dd0 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.hxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.hxx @@ -31,7 +31,7 @@ private: css::uno::Reference xController; Transmitter *pTransmitter; - virtual void Timeout(); + virtual void Timeout() SAL_OVERRIDE; void sendPreview( sal_uInt32 aSlideNumber ); css::uno::Sequence preparePreview( sal_uInt32 aSlideNumber, diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx index 41dc351f414c..89521395d1fa 100644 --- a/sd/source/ui/remotecontrol/Listener.hxx +++ b/sd/source/ui/remotecontrol/Listener.hxx @@ -37,28 +37,28 @@ public: // XAnimationListener virtual void SAL_CALL beginEvent(const css::uno::Reference< - css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception); + css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endEvent( const css::uno::Reference< - css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception); + css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& rNode, ::sal_Int32 Repeat ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSlideShowListener - virtual void SAL_CALL paused( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL resumed( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL slideTransitionStarted( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL slideTransitionEnded( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL slideAnimationsEnded( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL paused( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL resumed( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL slideTransitionStarted( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL slideTransitionEnded( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL slideAnimationsEnded( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; virtual void SAL_CALL disposing ( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: rtl::Reference mCommunicator; diff --git a/sd/source/ui/remotecontrol/Receiver.hxx b/sd/source/ui/remotecontrol/Receiver.hxx index 2bf338c8eb77..41a3bb872ff4 100644 --- a/sd/source/ui/remotecontrol/Receiver.hxx +++ b/sd/source/ui/remotecontrol/Receiver.hxx @@ -33,7 +33,7 @@ class Receiver : Timer public: Receiver( Transmitter *aTransmitter ); ~Receiver(); - virtual void Timeout(); + virtual void Timeout() SAL_OVERRIDE; void pushCommand( const std::vector &rCommand ); void executeCommand( const std::vector &aCommand ); diff --git a/sd/source/ui/remotecontrol/Transmitter.hxx b/sd/source/ui/remotecontrol/Transmitter.hxx index b832d614f7e8..14e1b9ea79f2 100644 --- a/sd/source/ui/remotecontrol/Transmitter.hxx +++ b/sd/source/ui/remotecontrol/Transmitter.hxx @@ -32,7 +32,7 @@ public: void notifyFinished(); private: - virtual void SAL_CALL run(); + virtual void SAL_CALL run() SAL_OVERRIDE; ::sd::IBluetoothSocket* pStreamSocket; diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx index 19f89c0cae0f..00c19f2e5307 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx @@ -46,12 +46,12 @@ public: /** Scan the set of templates for the ones whose first master pages are shown by this control and store them in the MasterPageContainer. */ - virtual void Fill (ItemList& rItemList); + virtual void Fill (ItemList& rItemList) SAL_OVERRIDE; virtual void GetState (SfxItemSet& rItemSet); protected: - virtual void NotifyContainerChangeEvent (const MasterPageContainerChangeEvent& rEvent); + virtual void NotifyContainerChangeEvent (const MasterPageContainerChangeEvent& rEvent) SAL_OVERRIDE; private: /** The list of master pages displayed by this class. diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx index 78f620db76f8..8ff1455a5432 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx @@ -48,19 +48,19 @@ public: used by the currently selected page of the document in the center pane. */ - virtual void UpdateSelection (void); + virtual void UpdateSelection (void) SAL_OVERRIDE; /** Copy all master pages that are to be shown into the given list. */ - virtual void Fill (ItemList& rItemList); + virtual void Fill (ItemList& rItemList) SAL_OVERRIDE; using MasterPagesSelector::Fill; protected: - virtual ResId GetContextMenuResId (void) const; + virtual ResId GetContextMenuResId (void) const SAL_OVERRIDE; - virtual void ProcessPopupMenu (Menu& rMenu); - virtual void ExecuteCommand (const sal_Int32 nCommandId); + virtual void ProcessPopupMenu (Menu& rMenu) SAL_OVERRIDE; + virtual void ExecuteCommand (const sal_Int32 nCommandId) SAL_OVERRIDE; private: cssu::Reference mxListener; @@ -73,7 +73,7 @@ private: const cssu::Reference& rxSidebar); virtual ~CurrentMasterPagesSelector (void); - virtual void LateInit (void); + virtual void LateInit (void) SAL_OVERRIDE; DECL_LINK(EventMultiplexerListener,sd::tools::EventMultiplexerEvent*); }; diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.hxx b/sd/source/ui/sidebar/CustomAnimationPanel.hxx index 83ef1d65e058..be03b8da401d 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.hxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.hxx @@ -35,12 +35,12 @@ public: virtual ~CustomAnimationPanel (void); // ILayoutableWindow - virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth); + virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; protected: virtual ::Window* CreateWrappedControl ( ::Window* pParentWindow, - ViewShellBase& rViewShellBase); + ViewShellBase& rViewShellBase) SAL_OVERRIDE; private: cssu::Reference mxFrame; diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index 88cfa527f2ab..cdbb0221c99a 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -86,15 +86,15 @@ public: AutoLayout GetSelectedAutoLayout (void); // From ILayoutableWindow - virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth); + virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; // From ::Window - virtual void Paint (const Rectangle& rRect); - virtual void Resize (void); + virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; + virtual void Resize (void) SAL_OVERRIDE; /** Show a context menu when the right mouse button is pressed. */ - virtual void MouseButtonDown (const MouseEvent& rEvent); + virtual void MouseButtonDown (const MouseEvent& rEvent) SAL_OVERRIDE; /** Call this method when the set of displayed layouts is not up-to-date anymore. It will re-assemple this set according to the current @@ -103,20 +103,20 @@ public: void InvalidateContent (void); // DragSourceHelper - virtual void StartDrag (sal_Int8 nAction, const Point& rPosPixel); + virtual void StartDrag (sal_Int8 nAction, const Point& rPosPixel) SAL_OVERRIDE; // DropTargetHelper - virtual sal_Int8 AcceptDrop (const AcceptDropEvent& rEvent); - virtual sal_Int8 ExecuteDrop (const ExecuteDropEvent& rEvent); + virtual sal_Int8 AcceptDrop (const AcceptDropEvent& rEvent) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop (const ExecuteDropEvent& rEvent) SAL_OVERRIDE; /** The context menu is requested over this Command() method. */ - virtual void Command (const CommandEvent& rEvent); + virtual void Command (const CommandEvent& rEvent) SAL_OVERRIDE; /** Call Fill() when switching to or from high contrast mode so that the correct set of icons is displayed. */ - virtual void DataChanged (const DataChangedEvent& rEvent); + virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; using Window::GetWindow; using ValueSet::StartDrag; diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index ae4fceb589c2..08542c173c9d 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -92,7 +92,7 @@ public: bool HasToken (Token aToken) const; const SharedMasterPageDescriptor GetDescriptor (MasterPageContainer::Token aToken) const; SharedMasterPageDescriptor GetDescriptor (MasterPageContainer::Token aToken); - virtual Token PutMasterPage (const SharedMasterPageDescriptor& rDescriptor); + virtual Token PutMasterPage (const SharedMasterPageDescriptor& rDescriptor) SAL_OVERRIDE; void InvalidatePreview (Token aToken); Image GetPreviewForToken ( Token aToken, @@ -112,14 +112,14 @@ public: const SharedMasterPageDescriptor& rpDescriptor, bool bForcePageObject, bool bForcePreview, - bool bSendEvents); + bool bSendEvents) SAL_OVERRIDE; void ReleaseDescriptor (Token aToken); /** Called by the MasterPageContainerFiller to notify that all master pages from template documents have been added. */ - virtual void FillingDone (void); + virtual void FillingDone (void) SAL_OVERRIDE; private: Implementation (void); diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.hxx b/sd/source/ui/sidebar/MasterPageContainerFiller.hxx index c0525032779a..31c44dcf4538 100644 --- a/sd/source/ui/sidebar/MasterPageContainerFiller.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerFiller.hxx @@ -59,13 +59,13 @@ public: /** Run the next step of the task. After HasNextStep() returns false this method should ignore further calls. */ - virtual void RunNextStep (void); + virtual void RunNextStep (void) SAL_OVERRIDE; /** Return when there is at least one more step to execute. When the task has been executed completely then is returned. */ - virtual bool HasNextStep (void); + virtual bool HasNextStep (void) SAL_OVERRIDE; private: ContainerAdapter& mrContainerAdapter; diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx index 10e0847a3c21..aa4b91160ec4 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx @@ -109,9 +109,9 @@ class PagePreviewProvider : public PreviewProvider public: PagePreviewProvider (void); virtual ~PagePreviewProvider() {} - virtual Image operator () (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer); - virtual int GetCostIndex (void); - virtual bool NeedsPageObject (void); + virtual Image operator () (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer) SAL_OVERRIDE; + virtual int GetCostIndex (void) SAL_OVERRIDE; + virtual bool NeedsPageObject (void) SAL_OVERRIDE; private: }; @@ -126,9 +126,9 @@ class TemplatePageObjectProvider : public PageObjectProvider public: TemplatePageObjectProvider (const OUString& rsURL); virtual ~TemplatePageObjectProvider (void) {}; - virtual SdPage* operator () (SdDrawDocument* pDocument); - virtual int GetCostIndex (void); - virtual bool operator== (const PageObjectProvider& rProvider); + virtual SdPage* operator () (SdDrawDocument* pDocument) SAL_OVERRIDE; + virtual int GetCostIndex (void) SAL_OVERRIDE; + virtual bool operator== (const PageObjectProvider& rProvider) SAL_OVERRIDE; private: OUString msURL; SfxObjectShellLock mxDocumentShell; @@ -146,9 +146,9 @@ class TemplatePreviewProvider : public PreviewProvider public: TemplatePreviewProvider (const OUString& rsURL); virtual ~TemplatePreviewProvider (void) {}; - virtual Image operator() (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer); - virtual int GetCostIndex (void); - virtual bool NeedsPageObject (void); + virtual Image operator() (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer) SAL_OVERRIDE; + virtual int GetCostIndex (void) SAL_OVERRIDE; + virtual bool NeedsPageObject (void) SAL_OVERRIDE; private: OUString msURL; }; @@ -163,9 +163,9 @@ class DefaultPageObjectProvider : public PageObjectProvider public: DefaultPageObjectProvider (void); virtual ~DefaultPageObjectProvider() {} - virtual SdPage* operator () (SdDrawDocument* pDocument); - virtual int GetCostIndex (void); - virtual bool operator== (const PageObjectProvider& rProvider); + virtual SdPage* operator () (SdDrawDocument* pDocument) SAL_OVERRIDE; + virtual int GetCostIndex (void) SAL_OVERRIDE; + virtual bool operator== (const PageObjectProvider& rProvider) SAL_OVERRIDE; }; @@ -178,9 +178,9 @@ class ExistingPageProvider : public PageObjectProvider public: ExistingPageProvider (SdPage* pPage); virtual ~ExistingPageProvider() {} - virtual SdPage* operator() (SdDrawDocument* pDocument); - virtual int GetCostIndex (void); - virtual bool operator== (const PageObjectProvider& rProvider); + virtual SdPage* operator() (SdDrawDocument* pDocument) SAL_OVERRIDE; + virtual int GetCostIndex (void) SAL_OVERRIDE; + virtual bool operator== (const PageObjectProvider& rProvider) SAL_OVERRIDE; private: SdPage* mpPage; }; diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx index 99aa6c1a8831..386e0f8a642c 100644 --- a/sd/source/ui/sidebar/MasterPageObserver.cxx +++ b/sd/source/ui/sidebar/MasterPageObserver.cxx @@ -89,7 +89,7 @@ private: virtual void Notify( SfxBroadcaster& rBroadcaster, - const SfxHint& rHint); + const SfxHint& rHint) SAL_OVERRIDE; void AnalyzeUsedMasterPages (SdDrawDocument& rDocument); diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index ae73b64fea81..72b52cf2929d 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -125,7 +125,7 @@ public: void UpdateAllPreviews (void); // ILayoutableWindow - virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth); + virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; protected: mutable ::osl::Mutex maMutex; @@ -200,7 +200,7 @@ protected: */ virtual ResId GetContextMenuResId (void) const; - virtual void Command (const CommandEvent& rEvent); + virtual void Command (const CommandEvent& rEvent) SAL_OVERRIDE; virtual void ProcessPopupMenu (Menu& rMenu); virtual void ExecuteCommand (const sal_Int32 nCommandId); diff --git a/sd/source/ui/sidebar/NavigatorWrapper.hxx b/sd/source/ui/sidebar/NavigatorWrapper.hxx index 77564286a672..d9bb14d33dd0 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.hxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.hxx @@ -49,11 +49,11 @@ public: virtual ~NavigatorWrapper (void); // Control - virtual void Resize (void); - virtual void GetFocus (void); + virtual void Resize (void) SAL_OVERRIDE; + virtual void GetFocus (void) SAL_OVERRIDE; // From ILayoutableWindow - virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth); + virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; private: ViewShellBase& mrViewShellBase; diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx index 259a165880ba..e3ea04032d37 100644 --- a/sd/source/ui/sidebar/PanelBase.hxx +++ b/sd/source/ui/sidebar/PanelBase.hxx @@ -51,16 +51,16 @@ public: ViewShellBase& rViewShellBase); virtual ~PanelBase (void); - virtual void Resize (void); + virtual void Resize (void) SAL_OVERRIDE; // IDisposable - virtual void Dispose (void); + virtual void Dispose (void) SAL_OVERRIDE; // ILayoutableWindow - virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth); + virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; // ISidebarReceiver - virtual void SetSidebar (const cssu::Reference& rxSidebar); + virtual void SetSidebar (const cssu::Reference& rxSidebar) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessibleObject ( diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx index 3e2592ba5dc2..6d16b43f2af0 100644 --- a/sd/source/ui/sidebar/PanelFactory.hxx +++ b/sd/source/ui/sidebar/PanelFactory.hxx @@ -63,7 +63,7 @@ public: PanelFactory (const cssu::Reference& rxContext); virtual ~PanelFactory (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XUIElementFactory @@ -74,7 +74,7 @@ public: throw( css::container::NoSuchElementException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception); + cssu::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx b/sd/source/ui/sidebar/PreviewValueSet.hxx index bc404abe81c9..5b3889b35aec 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.hxx +++ b/sd/source/ui/sidebar/PreviewValueSet.hxx @@ -36,7 +36,7 @@ public: ~PreviewValueSet (void); void SetRightMouseClickHandler (const Link& rLink); - virtual void Resize (void); + virtual void Resize (void) SAL_OVERRIDE; void SetPreviewSize (const Size& rSize); @@ -49,7 +49,7 @@ public: void Rearrange (bool bForceRequestResize = false); protected: - virtual void MouseButtonDown (const MouseEvent& rEvent); + virtual void MouseButtonDown (const MouseEvent& rEvent) SAL_OVERRIDE; private: Link maRightMouseClickHandler; diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx index 5eac1593fba9..e751b2b8ed71 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx @@ -38,7 +38,7 @@ public: protected: DECL_LINK(MasterPageListListener, void*); - virtual void Fill (ItemList& rItemList); + virtual void Fill (ItemList& rItemList) SAL_OVERRIDE; using sd::sidebar::MasterPagesSelector::Fill; @@ -54,9 +54,9 @@ protected: */ virtual void AssignMasterPageToPageList ( SdPage* pMasterPage, - const ::boost::shared_ptr >& rpPageList); + const ::boost::shared_ptr >& rpPageList) SAL_OVERRIDE; - virtual void ProcessPopupMenu (Menu& rMenu); + virtual void ProcessPopupMenu (Menu& rMenu) SAL_OVERRIDE; private: RecentMasterPagesSelector ( @@ -67,7 +67,7 @@ private: const cssu::Reference& rxSidebar); virtual ~RecentMasterPagesSelector (void); - virtual void LateInit (void); + virtual void LateInit (void) SAL_OVERRIDE; }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.hxx b/sd/source/ui/sidebar/SlideTransitionPanel.hxx index 1d824b6f3bca..d2990b62e6de 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.hxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.hxx @@ -35,12 +35,12 @@ public: virtual ~SlideTransitionPanel (void); // ILayoutableWindow - virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth); + virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; protected: virtual ::Window* CreateWrappedControl ( ::Window* pParentWindow, - ViewShellBase& rViewShellBase); + ViewShellBase& rViewShellBase) SAL_OVERRIDE; private: cssu::Reference mxFrame; diff --git a/sd/source/ui/sidebar/TableDesignPanel.hxx b/sd/source/ui/sidebar/TableDesignPanel.hxx index 032c9572e6a1..25d125dc510a 100644 --- a/sd/source/ui/sidebar/TableDesignPanel.hxx +++ b/sd/source/ui/sidebar/TableDesignPanel.hxx @@ -33,12 +33,12 @@ public: virtual ~TableDesignPanel (void); // ILayoutableWindow - virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth); + virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; protected: virtual ::Window* CreateWrappedControl ( ::Window* pParentWindow, - ViewShellBase& rViewShellBase); + ViewShellBase& rViewShellBase) SAL_OVERRIDE; }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index 0acf993576cf..db3dc2c51ab9 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -67,20 +67,20 @@ public: void RestartShow( sal_Int32 nPageIndexToRestart ); - virtual void Move(); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); - - virtual void KeyInput(const KeyEvent& rKEvt); - virtual void MouseMove(const MouseEvent& rMEvt); - virtual void MouseButtonUp(const MouseEvent& rMEvt); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void Paint(const Rectangle& rRect); + virtual void Move() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + + virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; //Overload the sd::Window's CreateAccessible to create a different accessible object virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessible (void); + CreateAccessible (void) SAL_OVERRIDE; void TerminateShow(); void RestartShow(); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 892fbadddf38..d3a2ae1c227f 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -89,7 +89,7 @@ namespace { mpRestarter->Restart(bForce); } - virtual void DataChanged (const DataChangedEvent& rEvent) + virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE { if (rEvent.GetType() == DATACHANGED_DISPLAY) Restart(false); diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index baba13d01e32..8b23c415276c 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -137,24 +137,24 @@ public: void removeShapeEventListener( const css::uno::Reference< css::drawing::XShape >& xShape ); // css::animations::XAnimationListener - virtual void SAL_CALL beginEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL endEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL beginEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::presentation::XSlideShowListener: - virtual void SAL_CALL paused() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL resumed() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL slideTransitionStarted() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL slideTransitionEnded() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL slideAnimationsEnded() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL hyperLinkClicked(const OUString & hyperLink) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL paused() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL resumed() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL slideTransitionStarted() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL slideTransitionEnded() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL slideAnimationsEnded() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL hyperLinkClicked(const OUString & hyperLink) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::lang::XEventListener: - virtual void SAL_CALL disposing(const css::lang::EventObject & Source) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing(const css::lang::EventObject & Source) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::presentation::XShapeEventListener: - virtual void SAL_CALL click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::cppu::OInterfaceContainerHelper maListeners; @@ -175,57 +175,57 @@ public: explicit SlideshowImpl( const css::uno::Reference< css::presentation::XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, ::Window* pParentWindow); // css::presentation::XSlideShowController: - virtual ::sal_Bool SAL_CALL getAlwaysOnTop() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAlwaysOnTop( ::sal_Bool _alwaysontop ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMouseVisible() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMouseVisible( ::sal_Bool _mousevisible ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getUsePen() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setUsePen( ::sal_Bool _usepen ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getPenColor() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPenColor( ::sal_Int32 _pencolor ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getAlwaysOnTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAlwaysOnTop( ::sal_Bool _alwaysontop ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMouseVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMouseVisible( ::sal_Bool _mousevisible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getUsePen() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setUsePen( ::sal_Bool _usepen ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getPenColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPenColor( ::sal_Int32 _pencolor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setUseEraser( ::sal_Bool _usepen ) throw (css::uno::RuntimeException); - virtual double SAL_CALL getPenWidth() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPenWidth( double dStrokeWidth ) throw (css::uno::RuntimeException, std::exception); + virtual double SAL_CALL getPenWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPenWidth( double dStrokeWidth ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setEraseAllInk( bool bEraseAllInk ) throw (css::uno::RuntimeException); virtual void SAL_CALL setEraseInk( sal_Int32 nEraseInkSize ) throw (css::uno::RuntimeException); virtual void SAL_CALL setPenMode( bool bSwitchPenMode) throw (css::uno::RuntimeException); virtual void SAL_CALL setEraserMode( bool bSwitchEraserMode ) throw (css::uno::RuntimeException); virtual void SAL_CALL setPointerMode( bool bSwitchPointerMode) throw (css::uno::RuntimeException); virtual void SAL_CALL setPointerPosition( const ::com::sun::star::geometry::RealPoint2D& pos ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isRunning( ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getSlideCount( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getSlideByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL addSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL gotoNextEffect( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL gotoPreviousEffect( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL gotoFirstSlide( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL gotoNextSlide( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL gotoPreviousSlide( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL gotoLastSlide( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL gotoBookmark( const OUString& Bookmark ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL gotoSlide( const css::uno::Reference< css::drawing::XDrawPage >& Page ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL gotoSlideIndex( ::sal_Int32 Index ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL stopSound( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL pause( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL resume( ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isPaused( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL blankScreen( ::sal_Int32 Color ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL activate( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL deactivate( ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isActive( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getCurrentSlide( ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getCurrentSlideIndex( ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getNextSlideIndex( ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isEndless( ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isFullScreen( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::presentation::XSlideShow > SAL_CALL getSlideShow( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isRunning( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getSlideCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getSlideByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL gotoNextEffect( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL gotoPreviousEffect( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL gotoFirstSlide( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL gotoNextSlide( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL gotoPreviousSlide( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL gotoLastSlide( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL gotoBookmark( const OUString& Bookmark ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL gotoSlide( const css::uno::Reference< css::drawing::XDrawPage >& Page ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL gotoSlideIndex( ::sal_Int32 Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL stopSound( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL pause( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL resume( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isPaused( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL blankScreen( ::sal_Int32 Color ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL activate( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL deactivate( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isActive( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getCurrentSlide( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getCurrentSlideIndex( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getNextSlideIndex( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isEndless( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isFullScreen( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::presentation::XSlideShow > SAL_CALL getSlideShow( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // will be called from the SlideShowListenerProxy when this event is fired from the XSlideShow void slideEnded(const bool bReverse); @@ -251,7 +251,7 @@ private: // This function is called upon disposing the component, // if your component needs special work when it becomes // disposed, do it here. - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // internal bool startShow( PresentationSettingsEx* pPresSettings ); diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index 4708e0746c0d..60c7ce5097a5 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -129,7 +129,7 @@ public: SlideShowViewPaintListeners( ::osl::Mutex& rMutex ); protected: - virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rListener, const ::com::sun::star::awt::PaintEvent& rEvent ) throw( ::com::sun::star::uno::Exception ); + virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rListener, const ::com::sun::star::awt::PaintEvent& rEvent ) throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; }; typedef ::std::auto_ptr< SlideShowViewPaintListeners > SlideShowViewPaintListenersPtr; @@ -144,7 +144,7 @@ public: protected: virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& rListener, - const WrappedMouseEvent& rEvent ) throw( ::com::sun::star::uno::Exception ); + const WrappedMouseEvent& rEvent ) throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; }; typedef ::std::auto_ptr< SlideShowViewMouseListeners > SlideShowViewMouseListenersPtr; @@ -162,7 +162,7 @@ public: protected: virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rListener, - const WrappedMouseMotionEvent& rEvent ) throw( ::com::sun::star::uno::Exception ); + const WrappedMouseMotionEvent& rEvent ) throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; }; typedef ::std::auto_ptr< SlideShowViewMouseMotionListeners > SlideShowViewMouseMotionListenersPtr; @@ -190,44 +190,44 @@ public: void ignoreNextMouseReleased() { mbMousePressedEaten = true; } /// Dispose all internal references - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Disposing our broadcaster - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL paint( const ::com::sun::star::awt::PaintEvent& e ) throw (::com::sun::star::uno::RuntimeException); // XSlideShowView methods - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > SAL_CALL getCanvas( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL clear( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::geometry::AffineMatrix2D SAL_CALL getTransformation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::geometry::IntegerSize2D SAL_CALL getTranslationOffset( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addTransformationChangedListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeTransformationChangedListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMouseCursor( sal_Int16 nPointerShape ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCanvasArea( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > SAL_CALL getCanvas( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clear( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::geometry::AffineMatrix2D SAL_CALL getTransformation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::geometry::IntegerSize2D SAL_CALL getTranslationOffset( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addTransformationChangedListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeTransformationChangedListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMouseCursor( sal_Int16 nPointerShape ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCanvasArea( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener methods - virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMouseListener implementation - virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMouseMotionListener implementation - virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; using cppu::WeakComponentImplHelperBase::disposing; diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx index fc83c9287f84..6d226edbd7f5 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx @@ -42,7 +42,7 @@ public: DummyReplacement (const Bitmap& rPreview) : maPreview(rPreview) { } virtual ~DummyReplacement(void) {} - virtual sal_Int32 GetMemorySize (void) const { return maPreview.GetSizeBytes(); } + virtual sal_Int32 GetMemorySize (void) const SAL_OVERRIDE { return maPreview.GetSizeBytes(); } }; @@ -107,7 +107,7 @@ public: Size maOriginalSize; virtual ~ResolutionReducedReplacement(); - virtual sal_Int32 GetMemorySize (void) const; + virtual sal_Int32 GetMemorySize (void) const SAL_OVERRIDE; }; ResolutionReduction::ResolutionReducedReplacement::~ResolutionReducedReplacement() @@ -184,7 +184,7 @@ public: { delete [] (char*)mpData; } - virtual sal_Int32 GetMemorySize (void) const + virtual sal_Int32 GetMemorySize (void) const SAL_OVERRIDE { return mnDataSize; } diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx index 519b0be4bc05..b9aaf18d80e5 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx @@ -89,9 +89,9 @@ class NoBitmapCompression class DummyReplacement; public: virtual ~NoBitmapCompression() {} - virtual ::boost::shared_ptr Compress (const Bitmap& rpBitmap) const; - virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const; - virtual bool IsLossless (void) const; + virtual ::boost::shared_ptr Compress (const Bitmap& rpBitmap) const SAL_OVERRIDE; + virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE; + virtual bool IsLossless (void) const SAL_OVERRIDE; }; @@ -107,9 +107,9 @@ class CompressionByDeletion { public: virtual ~CompressionByDeletion() {} - virtual ::boost::shared_ptr Compress (const Bitmap& rBitmap) const; - virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const; - virtual bool IsLossless (void) const; + virtual ::boost::shared_ptr Compress (const Bitmap& rBitmap) const SAL_OVERRIDE; + virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE; + virtual bool IsLossless (void) const SAL_OVERRIDE; }; @@ -127,11 +127,11 @@ class ResolutionReduction static const sal_Int32 mnWidth = 100; public: virtual ~ResolutionReduction() {} - virtual ::boost::shared_ptr Compress (const Bitmap& rpBitmap) const; + virtual ::boost::shared_ptr Compress (const Bitmap& rpBitmap) const SAL_OVERRIDE; /** Scale the replacement bitmap up to the original size. */ - virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const; - virtual bool IsLossless (void) const; + virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE; + virtual bool IsLossless (void) const SAL_OVERRIDE; }; @@ -146,9 +146,9 @@ class PngCompression class PngReplacement; public: virtual ~PngCompression() {} - virtual ::boost::shared_ptr Compress (const Bitmap& rBitmap) const; - virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const; - virtual bool IsLossless (void) const; + virtual ::boost::shared_ptr Compress (const Bitmap& rBitmap) const SAL_OVERRIDE; + virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE; + virtual bool IsLossless (void) const SAL_OVERRIDE; }; diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 6022d273b01a..cf9b19967146 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -46,10 +46,10 @@ public: : CacheCompactor(rCache, nMaximalCacheSize) {} - virtual void RequestCompaction (void) { /* Ignored */ }; + virtual void RequestCompaction (void) SAL_OVERRIDE { /* Ignored */ }; protected: - virtual void Run (void) { /* Do nothing */ }; + virtual void Run (void) SAL_OVERRIDE { /* Do nothing */ }; }; @@ -71,7 +71,7 @@ public: const ::boost::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor>& rpCompressor); protected: - virtual void Run (void); + virtual void Run (void) SAL_OVERRIDE; private: ::boost::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor> mpCompressor; diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx index c9eb9a95db45..887c2cfc96d0 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx @@ -103,7 +103,7 @@ public: /** Ensure we don't hand out a page deleted before anyone got a chance to process it */ - virtual void PageInDestruction(const SdrPage& rPage); + virtual void PageInDestruction(const SdrPage& rPage) SAL_OVERRIDE; private: ::osl::Mutex maMutex; diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index 4df4dcff83e8..aa03c4a91674 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -93,32 +93,32 @@ public: virtual void Notify ( SfxBroadcaster& rBroadcaster, - const SfxHint& rHint); + const SfxHint& rHint) SAL_OVERRIDE; //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== document::XEventListener ======================================== virtual void SAL_CALL notifyEvent ( const ::com::sun::star::document::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== beans::XPropertySetListener ===================================== virtual void SAL_CALL propertyChange ( const com::sun::star::beans::PropertyChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== accessibility::XAccessibleEventListener ========================== virtual void SAL_CALL notifyEvent ( const ::com::sun::star::accessibility::AccessibleEventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== frame::XFrameActionListener ====================================== /** For certain actions the listener connects to a new controller of the @@ -127,9 +127,9 @@ public: */ virtual void SAL_CALL frameAction (const ::com::sun::star::frame::FrameActionEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; private: SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 647e2516c3e5..8207c9e301ea 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -204,16 +204,16 @@ public: SelectionFunction& rSelectionFunction); virtual ~NormalModeHandler (void); - virtual SelectionFunction::Mode GetMode (void) const; - virtual void Abort (void); + virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; + virtual void Abort (void) SAL_OVERRIDE; void ResetButtonDownLocation (void); protected: - virtual bool ProcessButtonDownEvent (SelectionFunction::EventDescriptor& rDescriptor); - virtual bool ProcessButtonUpEvent (SelectionFunction::EventDescriptor& rDescriptor); - virtual bool ProcessMotionEvent (SelectionFunction::EventDescriptor& rDescriptor); - virtual bool ProcessDragEvent (SelectionFunction::EventDescriptor& rDescriptor); + virtual bool ProcessButtonDownEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; + virtual bool ProcessButtonUpEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; + virtual bool ProcessMotionEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; + virtual bool ProcessDragEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; private: ::boost::optional maButtonDownLocation; @@ -248,9 +248,9 @@ public: void Initialize(const sal_uInt32 nEventCode); #endif - virtual SelectionFunction::Mode GetMode (void) const; - virtual void Abort (void); - virtual void ProcessEvent (SelectionFunction::EventDescriptor& rDescriptor); + virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; + virtual void Abort (void) SAL_OVERRIDE; + virtual void ProcessEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; enum SelectionMode { SM_Normal, SM_Add, SM_Toggle }; @@ -258,9 +258,9 @@ public: void SetSelectionModeFromModifier (const sal_uInt32 nEventCode); protected: - virtual bool ProcessButtonUpEvent (SelectionFunction::EventDescriptor& rDescriptor); - virtual bool ProcessMotionEvent (SelectionFunction::EventDescriptor& rDescriptor); - virtual bool HandleUnprocessedEvent (SelectionFunction::EventDescriptor& rDescriptor); + virtual bool ProcessButtonUpEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; + virtual bool ProcessMotionEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; + virtual bool HandleUnprocessedEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; private: SelectionMode meSelectionMode; @@ -306,12 +306,12 @@ public: void Initialize(const Point& rMousePosition, ::Window* pWindow); #endif - virtual SelectionFunction::Mode GetMode (void) const; - virtual void Abort (void); + virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; + virtual void Abort (void) SAL_OVERRIDE; protected: - virtual bool ProcessButtonUpEvent (SelectionFunction::EventDescriptor& rDescriptor); - virtual bool ProcessDragEvent (SelectionFunction::EventDescriptor& rDescriptor); + virtual bool ProcessButtonUpEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; + virtual bool ProcessDragEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; private: ::boost::scoped_ptr mpDragAndDropContext; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index e10d81676305..db7767325507 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -101,11 +101,11 @@ public: protected: virtual sal_uInt16 DetermineInsertPosition ( - const SdTransferable& rTransferable); + const SdTransferable& rTransferable) SAL_OVERRIDE; virtual sal_uInt16 InsertSlides ( const SdTransferable& rTransferable, - sal_uInt16 nInsertPosition); + sal_uInt16 nInsertPosition) SAL_OVERRIDE; private: SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index f2acc963614e..1feda829ac17 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -47,22 +47,22 @@ public: static rtl::Reference Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ); // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; /// Forward to the clipboard manager. - virtual void DoCut (void); + virtual void DoCut (void) SAL_OVERRIDE; /// Forward to the clipboard manager. - virtual void DoCopy (void); + virtual void DoCopy (void) SAL_OVERRIDE; /// Forward to the clipboard manager. - virtual void DoPaste (void); + virtual void DoPaste (void) SAL_OVERRIDE; /** is called when the current function should be aborted.

This is used when a function gets a KEY_ESCAPE but can also @@ -71,7 +71,7 @@ public: @returns true if a active function was aborted */ - virtual bool cancel(); + virtual bool cancel() SAL_OVERRIDE; void MouseDragged ( const AcceptDropEvent& rEvent, diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index d2b143e75cc2..782de7db2076 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -82,7 +82,7 @@ private: const ::std::vector maRepresentatives; typedef ::std::vector > CallbackContainer; - virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint); + virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) SAL_OVERRIDE; }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx index 414da803f8db..2957303696ee 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx @@ -82,7 +82,7 @@ public: /** Create and return an exact copy of the called object. */ SAL_WNODEPRECATED_DECLARATIONS_PUSH - virtual ::std::auto_ptr > Clone (void); + virtual ::std::auto_ptr > Clone (void) SAL_OVERRIDE; SAL_WNODEPRECATED_DECLARATIONS_POP PageEnumeration& operator= (const PageEnumeration& rEnumeration); @@ -90,19 +90,19 @@ public: /** Return when the enumeration has more elements, i.e. it is save to call GetNextElement() at least one more time. */ - virtual bool HasMoreElements (void) const; + virtual bool HasMoreElements (void) const SAL_OVERRIDE; /** Return the next element of the enumeration. Call the HasMoreElements() before to make sure that there exists at least one more element. Calling this method with HasMoreElements() returning is an error. */ - virtual SharedPageDescriptor GetNextElement (void); + virtual SharedPageDescriptor GetNextElement (void) SAL_OVERRIDE; /** Rewind the enumeration so that the next call to GetNextElement() will return its first element. */ - virtual void Rewind (void); + virtual void Rewind (void) SAL_OVERRIDE; private: /// Implementation object. diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 664d545decb1..b44bfa987cb9 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -66,7 +66,7 @@ class SlideSorterView public ::boost::noncopyable { public: - TYPEINFO (); + TYPEINFO_OVERRIDE(); /** Create a new view for the slide sorter. @param rViewShell @@ -104,7 +104,7 @@ public: view::Layouter& GetLayouter (void); - virtual void ModelHasChanged (void); + virtual void ModelHasChanged (void) SAL_OVERRIDE; /** This method is typically called before a model change takes place. All references to model data are released. PostModelChange() has to @@ -131,12 +131,12 @@ public: virtual void CompleteRedraw ( OutputDevice* pDevice, const Region& rPaintArea, - sdr::contact::ViewObjectContactRedirector* pRedirector = NULL); + sdr::contact::ViewObjectContactRedirector* pRedirector = NULL) SAL_OVERRIDE; void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea); virtual void ConfigurationChanged ( utl::ConfigurationBroadcaster* pBroadcaster, - sal_uInt32 nHint); + sal_uInt32 nHint) SAL_OVERRIDE; void HandleDataChangeEvent (void); @@ -233,10 +233,10 @@ public: ToolTip& GetToolTip (void) const; - virtual void DragFinished (sal_Int8 nDropAction); + virtual void DragFinished (sal_Int8 nDropAction) SAL_OVERRIDE; protected: - virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint); + virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) SAL_OVERRIDE; private: SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx index 50c3261b3391..1e50f741502d 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx @@ -56,7 +56,7 @@ public: InsertionIndicatorOverlay (SlideSorter& rSlideSorter); virtual ~InsertionIndicatorOverlay (void); - virtual void SetLayerInvalidator (const SharedILayerInvalidator& rpInvalidator); + virtual void SetLayerInvalidator (const SharedILayerInvalidator& rpInvalidator) SAL_OVERRIDE; void Create (const SdTransferable* pTransferable); @@ -70,7 +70,7 @@ public: virtual void Paint ( OutputDevice& rDevice, - const Rectangle& rRepaintArea); + const Rectangle& rRepaintArea) SAL_OVERRIDE; bool IsVisible (void) const; void Hide (void); diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx index 77d1ad1f4bef..69514c0e40e5 100644 --- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx @@ -37,12 +37,12 @@ public: /** Create a copy of the called enumeration object. */ SAL_WNODEPRECATED_DECLARATIONS_PUSH - virtual inline ::std::auto_ptr > Clone (void); + virtual inline ::std::auto_ptr > Clone (void) SAL_OVERRIDE; SAL_WNODEPRECATED_DECLARATIONS_POP - virtual inline bool HasMoreElements (void) const; - virtual inline SharedPageDescriptor GetNextElement (void); - virtual inline void Rewind (void); + virtual inline bool HasMoreElements (void) const SAL_OVERRIDE; + virtual inline SharedPageDescriptor GetNextElement (void) SAL_OVERRIDE; + virtual inline void Rewind (void) SAL_OVERRIDE; private: const SlideSorterModel& mrModel; diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 5c2a56e4b502..eefd19238eaa 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -55,13 +55,13 @@ public: ContentWindow(::Window& rParent, SlideSorter& rSlideSorter); ~ContentWindow (void); void SetCurrentFunction (const rtl::Reference& rpFunction); - virtual void Paint(const Rectangle& rRect); - virtual void KeyInput (const KeyEvent& rEvent); - virtual void MouseMove (const MouseEvent& rEvent); - virtual void MouseButtonUp (const MouseEvent& rEvent); - virtual void MouseButtonDown (const MouseEvent& rEvent); - virtual void Command (const CommandEvent& rEvent); - virtual bool Notify (NotifyEvent& rEvent); + virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void KeyInput (const KeyEvent& rEvent) SAL_OVERRIDE; + virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE; + virtual void MouseButtonUp (const MouseEvent& rEvent) SAL_OVERRIDE; + virtual void MouseButtonDown (const MouseEvent& rEvent) SAL_OVERRIDE; + virtual void Command (const CommandEvent& rEvent) SAL_OVERRIDE; + virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE; private: SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index 50494b2123cd..e6f1bf63808d 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx @@ -57,135 +57,135 @@ public: explicit SlideSorterService ( const css::uno::Reference& rxContext); virtual ~SlideSorterService (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize (const css::uno::Sequence& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XResourceId css::uno::Reference SAL_CALL getResourceId (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL isAnchorOnly (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView virtual void SAL_CALL setCurrentPage( const css::uno::Reference& rxSlide) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference SAL_CALL getCurrentPage (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Attributes virtual css::uno::Reference SAL_CALL getDocumentSlides (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDocumentSlides ( const css::uno::Reference& rxSlides) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL getIsHighlightCurrentSlide (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsHighlightCurrentSlide (::sal_Bool bIsHighlightCurrentSlide) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL getIsShowSelection (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsShowSelection (sal_Bool bIsShowSelection) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL getIsCenterSelection (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsCenterSelection (sal_Bool bIsCenterSelection) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL getIsSuspendPreviewUpdatesDuringFullScreenPresentation (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsSuspendPreviewUpdatesDuringFullScreenPresentation ( sal_Bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL getIsOrientationVertical (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsOrientationVertical (sal_Bool bIsOrientationVertical) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL getIsSmoothScrolling (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsSmoothScrolling (sal_Bool bIsOrientationVertical) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::util::Color SAL_CALL getBackgroundColor (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setBackgroundColor (css::util::Color aBackgroundColor) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::util::Color SAL_CALL getTextColor (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setTextColor (css::util::Color aTextColor) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::util::Color SAL_CALL getSelectionColor (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSelectionColor (css::util::Color aSelectionColor) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::util::Color SAL_CALL getHighlightColor (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setHighlightColor (css::util::Color aHighlightColor) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL getIsUIReadOnly (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsUIReadOnly (sal_Bool bIsUIReadOnly) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL getIsShowFocus (void) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsShowFocus (sal_Bool bIsShowFocus) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::boost::shared_ptr mpSlideSorter; diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index eb437bebe724..fba8dd6ec84a 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -95,12 +95,12 @@ namespace { Painter (SlideSorterView& rView) : mrView(rView) {} virtual ~Painter (void) {} - virtual void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea) + virtual void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea) SAL_OVERRIDE { mrView.Paint(rDevice,rRepaintArea); } - virtual void SetLayerInvalidator (const SharedILayerInvalidator&) {} + virtual void SetLayerInvalidator (const SharedILayerInvalidator&) SAL_OVERRIDE {} private: SlideSorterView& mrView; @@ -117,14 +117,14 @@ public: BackgroundPainter (const Color aBackgroundColor) : maBackgroundColor(aBackgroundColor) {} virtual ~BackgroundPainter (void) {} - virtual void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea) + virtual void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea) SAL_OVERRIDE { rDevice.SetFillColor(maBackgroundColor); rDevice.SetLineColor(); rDevice.DrawRect(rRepaintArea); } - virtual void SetLayerInvalidator (const SharedILayerInvalidator&) {} + virtual void SetLayerInvalidator (const SharedILayerInvalidator&) SAL_OVERRIDE {} void SetColor (const Color aColor) { maBackgroundColor = aColor; } diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx index 8a2156f4fbcd..e8c925d63506 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx @@ -127,13 +127,13 @@ public: const InsertPosition& rInsertPosition, const controller::Animator::AnimationMode eAnimationMode); - virtual void AddRun (const ::boost::shared_ptr pRun); - virtual void RemoveRun (const ::boost::shared_ptr pRun); + virtual void AddRun (const ::boost::shared_ptr pRun) SAL_OVERRIDE; + virtual void RemoveRun (const ::boost::shared_ptr pRun) SAL_OVERRIDE; - virtual model::SlideSorterModel& GetModel (void) const { return mrModel; } - virtual view::SlideSorterView& GetView (void) const { return mrView; } - virtual ::boost::shared_ptr GetAnimator (void) { return mpAnimator; } - virtual SharedSdWindow GetContentWindow (void) { return mrSlideSorter.GetContentWindow(); } + virtual model::SlideSorterModel& GetModel (void) const SAL_OVERRIDE { return mrModel; } + virtual view::SlideSorterView& GetView (void) const SAL_OVERRIDE { return mrView; } + virtual ::boost::shared_ptr GetAnimator (void) SAL_OVERRIDE { return mpAnimator; } + virtual SharedSdWindow GetContentWindow (void) SAL_OVERRIDE { return mrSlideSorter.GetContentWindow(); } private: model::SlideSorterModel& mrModel; diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx index d4bc2f17fea2..034315e9e139 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx @@ -50,7 +50,7 @@ public: { } - virtual void Invalidate (const Rectangle& rInvalidationBox) + virtual void Invalidate (const Rectangle& rInvalidationBox) SAL_OVERRIDE { mpLayeredDevice->Invalidate(rInvalidationBox, mnLayer); mpTargetWindow->Invalidate(rInvalidationBox); diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index dd0bed3077b0..2c3cf5bdd3a7 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -232,18 +232,18 @@ public: const ::boost::shared_ptr& rpTheme); VerticalImplementation (const Implementation& rImplementation); - virtual Layouter::Orientation GetOrientation (void) const; + virtual Layouter::Orientation GetOrientation (void) const SAL_OVERRIDE; void CalculateLogicalInsertPosition ( const Point& rModelPosition, - InsertPosition& rPosition) const; + InsertPosition& rPosition) const SAL_OVERRIDE; protected: - virtual void CalculateRowAndColumnCount (const Size& rWindowSize); - virtual void CalculateMaxRowAndColumnCount (const Size& rWindowSize); + virtual void CalculateRowAndColumnCount (const Size& rWindowSize) SAL_OVERRIDE; + virtual void CalculateMaxRowAndColumnCount (const Size& rWindowSize) SAL_OVERRIDE; virtual Size CalculateTargetSize ( const Size& rWindowSize, - const Size& rPreviewModelSize) const; + const Size& rPreviewModelSize) const SAL_OVERRIDE; }; @@ -255,18 +255,18 @@ class HorizontalImplementation : public Layouter::Implementation public: HorizontalImplementation (const Implementation& rImplementation); - virtual Layouter::Orientation GetOrientation (void) const; + virtual Layouter::Orientation GetOrientation (void) const SAL_OVERRIDE; void CalculateLogicalInsertPosition ( const Point& rModelPosition, - InsertPosition& rPosition) const; + InsertPosition& rPosition) const SAL_OVERRIDE; protected: - virtual void CalculateRowAndColumnCount (const Size& rWindowSize); - virtual void CalculateMaxRowAndColumnCount (const Size& rWindowSize); + virtual void CalculateRowAndColumnCount (const Size& rWindowSize) SAL_OVERRIDE; + virtual void CalculateMaxRowAndColumnCount (const Size& rWindowSize) SAL_OVERRIDE; virtual Size CalculateTargetSize ( const Size& rWindowSize, - const Size& rPreviewModelSize) const; + const Size& rPreviewModelSize) const SAL_OVERRIDE; }; @@ -282,18 +282,18 @@ public: const ::boost::shared_ptr& rpTheme); GridImplementation (const Implementation& rImplementation); - virtual Layouter::Orientation GetOrientation (void) const; + virtual Layouter::Orientation GetOrientation (void) const SAL_OVERRIDE; void CalculateLogicalInsertPosition ( const Point& rModelPosition, - InsertPosition& rPosition) const; + InsertPosition& rPosition) const SAL_OVERRIDE; protected: - virtual void CalculateRowAndColumnCount (const Size& rWindowSize); - virtual void CalculateMaxRowAndColumnCount (const Size& rWindowSize); + virtual void CalculateRowAndColumnCount (const Size& rWindowSize) SAL_OVERRIDE; + virtual void CalculateMaxRowAndColumnCount (const Size& rWindowSize) SAL_OVERRIDE; virtual Size CalculateTargetSize ( const Size& rWindowSize, - const Size& rPreviewModelSize) const; + const Size& rPreviewModelSize) const SAL_OVERRIDE; }; diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx index 02bff80cca2d..c5523320f14e 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx @@ -41,13 +41,13 @@ class ViewCacheContext : public cache::CacheContext public: ViewCacheContext (SlideSorter& rSlideSorter); virtual ~ViewCacheContext (void); - virtual void NotifyPreviewCreation (cache::CacheKey aKey, const Bitmap& rPreview); - virtual bool IsIdle (void); - virtual bool IsVisible (cache::CacheKey aKey); - virtual const SdrPage* GetPage (cache::CacheKey aKey); - virtual ::boost::shared_ptr > GetEntryList (bool bVisible); - virtual sal_Int32 GetPriority (cache::CacheKey aKey); - virtual ::com::sun::star::uno::Reference GetModel (void); + virtual void NotifyPreviewCreation (cache::CacheKey aKey, const Bitmap& rPreview) SAL_OVERRIDE; + virtual bool IsIdle (void) SAL_OVERRIDE; + virtual bool IsVisible (cache::CacheKey aKey) SAL_OVERRIDE; + virtual const SdrPage* GetPage (cache::CacheKey aKey) SAL_OVERRIDE; + virtual ::boost::shared_ptr > GetEntryList (bool bVisible) SAL_OVERRIDE; + virtual sal_Int32 GetPriority (cache::CacheKey aKey) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference GetModel (void) SAL_OVERRIDE; private: model::SlideSorterModel& mrModel; diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index ca5394bf030d..7af968d215bc 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -59,8 +59,8 @@ private: bool m_bModal; public: TableValueSet(Window *pParent, WinBits nStyle); - virtual void Resize(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Resize() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void updateSettings(); void setModal(bool bModal) { m_bModal = bModal; } }; @@ -134,7 +134,7 @@ public: , aImpl(this, rBase, true) { } - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; }; } diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index ca64375b3aaf..42c63e7e042e 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -83,20 +83,20 @@ public: //===== lang::XEventListener ============================================== virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== beans::XPropertySetListener ======================================= virtual void SAL_CALL propertyChange ( const com::sun::star::beans::PropertyChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== view::XSelectionChangeListener ==================================== virtual void SAL_CALL selectionChanged ( const com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== frame::XFrameActionListener ====================================== /** For certain actions the listener connects to a new controller of the @@ -105,21 +105,21 @@ public: */ virtual void SAL_CALL frameAction (const ::com::sun::star::frame::FrameActionEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== drawing::framework::XConfigurationChangeListener ================== virtual void SAL_CALL notifyConfigurationChange ( const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; protected: virtual void Notify ( SfxBroadcaster& rBroadcaster, - const SfxHint& rHint); + const SfxHint& rHint) SAL_OVERRIDE; private: ViewShellBase& mrBase; diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 0810b0374dd1..8d6933174bc6 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -57,7 +57,7 @@ namespace { virtual ~ViewRedirector (void); virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, - const sdr::contact::DisplayInfo& rDisplayInfo); + const sdr::contact::DisplayInfo& rDisplayInfo) SAL_OVERRIDE; }; } diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 802caaa90c21..7026001ed891 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -75,43 +75,43 @@ namespace sd virtual ~DocumentSettings() throw(); // XInterface - virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception); - virtual void SAL_CALL acquire( ) throw (); - virtual void SAL_CALL release( ) throw (); + virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw () SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException, std::exception) SAL_OVERRIDE; // DocumentSettingsSerializer cf. xmloff virtual uno::Sequence filterStreamsFromStorage(OUString const & referer, const uno::Reference< embed::XStorage > &xStorage, - const uno::Sequence& aConfigProps ); + const uno::Sequence& aConfigProps ) SAL_OVERRIDE; virtual uno::Sequence filterStreamsToStorage(const uno::Reference< embed::XStorage > &xStorage, - const uno::Sequence& aConfigProps ); + const uno::Sequence& aConfigProps ) SAL_OVERRIDE; protected: - virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException ); - virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, RuntimeException ); + virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException ) SAL_OVERRIDE; + virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, RuntimeException ) SAL_OVERRIDE; private: bool LoadList( XPropertyListType t, const OUString &rPath, diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index d85500d6ffe3..1b76d9ad1bcf 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -77,64 +77,64 @@ public: void init( sal_Int16 nPresetClass ); // XInitialization - void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception); + void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; // XChild - Reference< XInterface > SAL_CALL getParent( ) throw (RuntimeException, std::exception); - void SAL_CALL setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException, std::exception); + Reference< XInterface > SAL_CALL getParent( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException, std::exception) SAL_OVERRIDE; // XCloneable - virtual Reference< XCloneable > SAL_CALL createClone() throw (RuntimeException, std::exception); + virtual Reference< XCloneable > SAL_CALL createClone() throw (RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - OUString SAL_CALL getImplementationName() throw(std::exception); - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception); - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception); + OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; // XAnimationNode - ::sal_Int16 SAL_CALL getType() throw (RuntimeException, std::exception); - Any SAL_CALL getBegin() throw (RuntimeException, std::exception); - void SAL_CALL setBegin( const Any& _begin ) throw (RuntimeException, std::exception); - Any SAL_CALL getDuration() throw (RuntimeException, std::exception); - void SAL_CALL setDuration( const Any& _duration ) throw (RuntimeException, std::exception); - Any SAL_CALL getEnd() throw (RuntimeException, std::exception); - void SAL_CALL setEnd( const Any& _end ) throw (RuntimeException, std::exception); - Any SAL_CALL getEndSync() throw (RuntimeException, std::exception); - void SAL_CALL setEndSync( const Any& _endsync ) throw (RuntimeException, std::exception); - Any SAL_CALL getRepeatCount() throw (RuntimeException, std::exception); - void SAL_CALL setRepeatCount( const Any& _repeatcount ) throw (RuntimeException, std::exception); - Any SAL_CALL getRepeatDuration() throw (RuntimeException, std::exception); - void SAL_CALL setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException, std::exception); - ::sal_Int16 SAL_CALL getFill() throw (RuntimeException, std::exception); - void SAL_CALL setFill( ::sal_Int16 _fill ) throw (RuntimeException, std::exception); - ::sal_Int16 SAL_CALL getFillDefault() throw (RuntimeException, std::exception); - void SAL_CALL setFillDefault( ::sal_Int16 _filldefault ) throw (RuntimeException, std::exception); - ::sal_Int16 SAL_CALL getRestart() throw (RuntimeException, std::exception); - void SAL_CALL setRestart( ::sal_Int16 _restart ) throw (RuntimeException, std::exception); - ::sal_Int16 SAL_CALL getRestartDefault() throw (RuntimeException, std::exception); - void SAL_CALL setRestartDefault( ::sal_Int16 _restartdefault ) throw (RuntimeException, std::exception); - double SAL_CALL getAcceleration() throw (RuntimeException, std::exception); - void SAL_CALL setAcceleration( double _acceleration ) throw (RuntimeException, std::exception); - double SAL_CALL getDecelerate() throw (RuntimeException, std::exception); - void SAL_CALL setDecelerate( double _decelerate ) throw (RuntimeException, std::exception); - ::sal_Bool SAL_CALL getAutoReverse() throw (RuntimeException, std::exception); - void SAL_CALL setAutoReverse( ::sal_Bool _autoreverse ) throw (RuntimeException, std::exception); - Sequence< NamedValue > SAL_CALL getUserData() throw (RuntimeException, std::exception); - void SAL_CALL setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException, std::exception); + ::sal_Int16 SAL_CALL getType() throw (RuntimeException, std::exception) SAL_OVERRIDE; + Any SAL_CALL getBegin() throw (RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setBegin( const Any& _begin ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + Any SAL_CALL getDuration() throw (RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setDuration( const Any& _duration ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + Any SAL_CALL getEnd() throw (RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setEnd( const Any& _end ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + Any SAL_CALL getEndSync() throw (RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setEndSync( const Any& _endsync ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + Any SAL_CALL getRepeatCount() throw (RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setRepeatCount( const Any& _repeatcount ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + Any SAL_CALL getRepeatDuration() throw (RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + ::sal_Int16 SAL_CALL getFill() throw (RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setFill( ::sal_Int16 _fill ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + ::sal_Int16 SAL_CALL getFillDefault() throw (RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setFillDefault( ::sal_Int16 _filldefault ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + ::sal_Int16 SAL_CALL getRestart() throw (RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setRestart( ::sal_Int16 _restart ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + ::sal_Int16 SAL_CALL getRestartDefault() throw (RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setRestartDefault( ::sal_Int16 _restartdefault ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getAcceleration() throw (RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setAcceleration( double _acceleration ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + double SAL_CALL getDecelerate() throw (RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setDecelerate( double _decelerate ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + ::sal_Bool SAL_CALL getAutoReverse() throw (RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setAutoReverse( ::sal_Bool _autoreverse ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + Sequence< NamedValue > SAL_CALL getUserData() throw (RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception); + virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual Reference< XEnumeration > SAL_CALL createEnumeration() throw (RuntimeException, std::exception); + virtual Reference< XEnumeration > SAL_CALL createEnumeration() throw (RuntimeException, std::exception) SAL_OVERRIDE; // XTimeContainer - Reference< XAnimationNode > SAL_CALL insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception); - Reference< XAnimationNode > SAL_CALL insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception); - Reference< XAnimationNode > SAL_CALL replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception); - Reference< XAnimationNode > SAL_CALL removeChild( const Reference< XAnimationNode >& oldChild ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception); - Reference< XAnimationNode > SAL_CALL appendChild( const Reference< XAnimationNode >& newChild ) throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception); + Reference< XAnimationNode > SAL_CALL insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + Reference< XAnimationNode > SAL_CALL insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + Reference< XAnimationNode > SAL_CALL replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + Reference< XAnimationNode > SAL_CALL removeChild( const Reference< XAnimationNode >& oldChild ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + Reference< XAnimationNode > SAL_CALL appendChild( const Reference< XAnimationNode >& newChild ) throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; private: // our first, last and only protection from mutli-threads! diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx index 14c7437b3bc7..342dc10e1547 100644 --- a/sd/source/ui/unoidl/sddetect.hxx +++ b/sd/source/ui/unoidl/sddetect.hxx @@ -61,7 +61,7 @@ public: // XExtendedFilterDetect - virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index a4b73081899e..a9b5a1733999 100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -65,33 +65,33 @@ public: UNO3_GETIMPLEMENTATION_DECL(SdXCustomPresentation) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -121,29 +121,29 @@ public: ~SdXCustomPresentationAccess() throw(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSingleServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; inline SdCustomShowList* SdXCustomPresentationAccess::GetCustomShowList() const throw() diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx index 575f002943e9..612d2d045950 100644 --- a/sd/source/ui/unoidl/unolayer.hxx +++ b/sd/source/ui/unoidl/unolayer.hxx @@ -61,34 +61,34 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdLayer ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XChild /** Returns the layer manager that manages this layer. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Not implemented. Always throws an exception. @raises NoSupportException. */ - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: SdLayerManager* pLayerManager; @@ -125,28 +125,28 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdLayerManager ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLayerManager - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer >& xLayer ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL attachShapeToLayer( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer >& xLayer ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer > SAL_CALL getLayerForShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer >& xLayer ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL attachShapeToLayer( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer >& xLayer ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer > SAL_CALL getLayerForShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return the XLayer object that is associated with the given SdrLayer object. If the requested object does @@ -163,9 +163,9 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> GetLayer (SdrLayer* pLayer); // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: SdXImpressDocument* mpModel; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 5eba9be797f7..a73768ae84c4 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -119,9 +119,9 @@ public: ~SdUnoForbiddenCharsTable(); // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw (); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw () SAL_OVERRIDE; protected: - virtual void onChange(); + virtual void onChange() SAL_OVERRIDE; private: SdrModel* mpModel; @@ -1533,7 +1533,7 @@ public: // different, overload the method and at least do what the method does. virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, - const sdr::contact::DisplayInfo& rDisplayInfo); + const sdr::contact::DisplayInfo& rDisplayInfo) SAL_OVERRIDE; }; ImplRenderPaintProc::ImplRenderPaintProc( const SdrLayerAdmin& rLA, SdrPageView* pView, vcl::PDFExtOutDevData* pData ) diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx index ad85113dbde2..f6a6cca7d4a3 100644 --- a/sd/source/ui/unoidl/unomodule.hxx +++ b/sd/source/ui/unoidl/unomodule.hxx @@ -59,23 +59,23 @@ public: // XnotifyingDispatch virtual void SAL_CALL dispatchWithNotification( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, const css::uno::Reference< css::frame::XDispatchResultListener >& Listener ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XDispatchProvider - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) ; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL , const OUString & sTargetFrameName, sal_Int32 eSearchFlags ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 4497db1e57e5..476332f570e4 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -1159,21 +1159,21 @@ public: SdUnoEventsAccess( SdXShape* pShape ) throw(); // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; // XEventsSupplier diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 0cafd8cfb1f0..19b906335dd4 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -73,46 +73,46 @@ public: SdXShape(SvxShape* pShape, SdXImpressDocument* pModel) throw(); virtual ~SdXShape() throw(); - virtual bool queryAggregation( const com::sun::star::uno::Type & rType, com::sun::star::uno::Any& aAny ); - virtual void dispose(); - virtual void modelChanged( SdrModel* pNewModel ); - virtual void pageChanged( SdrPage* pNewPage ); - virtual void objectChanged( SdrObject* pNewObj ); + virtual bool queryAggregation( const com::sun::star::uno::Type & rType, com::sun::star::uno::Any& aAny ) SAL_OVERRIDE; + virtual void dispose() SAL_OVERRIDE; + virtual void modelChanged( SdrModel* pNewModel ) SAL_OVERRIDE; + virtual void pageChanged( SdrPage* pNewPage ) SAL_OVERRIDE; + virtual void objectChanged( SdrObject* pNewObj ) SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; // XEventsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void setOldEffect( const com::sun::star::uno::Any& aValue ); diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 2c35b3b1375c..4c04ab3a18da 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -2602,12 +2602,12 @@ public: SdNavigationOrderAccess( SdrPage* pPage ); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException, std::exception); - virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception); + virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; private: std::vector< Reference< XShape > > maShapes; diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx index 43d1eb06b5dc..92bf1014fa6c 100644 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/unoidl/unopage.hxx @@ -83,7 +83,7 @@ protected: bool mbIsImpressDocument; - virtual void disposing() throw(); + virtual void disposing() throw() SAL_OVERRIDE; ::com::sun::star::uno::Any getNavigationOrder(); void setNavigationOrder( const ::com::sun::star::uno::Any& rValue ); @@ -101,63 +101,63 @@ public: SdXImpressDocument* GetModel() const; static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // this is called whenever a SdrObject must be created for a empty api shape wrapper virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) - throw (std::exception); + throw (std::exception) SAL_OVERRIDE; // SvxFmDrawPage virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const - throw (std::exception); + throw (std::exception) SAL_OVERRIDE; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XShapeCombiner - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL combine( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL split( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xGroup ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL combine( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL split( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xGroup ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XShapeBinder - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL bind( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL unbind( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL bind( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unbind( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLinkTargetSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAnimationNodeSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > SAL_CALL getAnimationNode( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > SAL_CALL getAnimationNode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAnnotationAccess: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > SAL_CALL createAndInsertAnnotation() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeAnnotation(const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > & annotation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotationEnumeration > SAL_CALL createAnnotationEnumeration() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > SAL_CALL createAndInsertAnnotation() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeAnnotation(const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > & annotation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotationEnumeration > SAL_CALL createAnnotationEnumeration() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; /*********************************************************************** @@ -172,8 +172,8 @@ private: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; protected: - virtual void setBackground( const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); - virtual void getBackground( ::com::sun::star::uno::Any& rValue ) throw(); + virtual void setBackground( const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual void getBackground( ::com::sun::star::uno::Any& rValue ) throw() SAL_OVERRIDE; public: SdDrawPage( SdXImpressDocument* pModel, SdPage* pInPage ) throw(); virtual ~SdDrawPage() throw(); @@ -185,43 +185,43 @@ public: static OUString getUiNameFromPageApiName( const OUString& rApiName ); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMasterPageTarget - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getMasterPage( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMasterPage( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xMasterPage ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getMasterPage( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMasterPage( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xMasterPage ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPresentationPage - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getNotesPage( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getNotesPage( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; }; /*********************************************************************** @@ -234,8 +234,8 @@ class SdMasterPage : public ::com::sun::star::presentation::XPresentationPage, private: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; protected: - virtual void setBackground( const ::com::sun::star::uno::Any& rValue ) throw( ::com::sun::star::lang::IllegalArgumentException ); - virtual void getBackground( ::com::sun::star::uno::Any& rValue ) throw(); + virtual void setBackground( const ::com::sun::star::uno::Any& rValue ) throw( ::com::sun::star::lang::IllegalArgumentException ) SAL_OVERRIDE; + virtual void getBackground( ::com::sun::star::uno::Any& rValue ) throw() SAL_OVERRIDE; public: SdMasterPage( SdXImpressDocument* pModel, SdPage* pInPage ) throw(); @@ -244,39 +244,39 @@ public: UNO3_GETIMPLEMENTATION_DECL(SdMasterPage) // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPresentationPage - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getNotesPage( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getNotesPage( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; }; @@ -300,18 +300,18 @@ public: SdrObject* FindObject( const OUString& rName ) const throw(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_SD_SOURCE_UI_UNOIDL_UNOPAGE_HXX diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx index d30aa07544ca..49964878dad0 100644 --- a/sd/source/ui/unoidl/unopback.hxx +++ b/sd/source/ui/unoidl/unopback.hxx @@ -54,30 +54,30 @@ public: // internal void fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) throw(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; // uno helper UNO3_GETIMPLEMENTATION_DECL( SdUnoPageBackground ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx index 1c1157b9bcbd..8914bc0c9081 100644 --- a/sd/source/ui/unoidl/unopool.cxx +++ b/sd/source/ui/unoidl/unopool.cxx @@ -49,7 +49,7 @@ public: virtual ~SdUnoDrawPool() throw(); protected: - virtual void putAny( SfxItemPool* pPool, const PropertyMapEntry* pEntry, const uno::Any& rValue ) throw( beans::UnknownPropertyException, lang::IllegalArgumentException); + virtual void putAny( SfxItemPool* pPool, const PropertyMapEntry* pEntry, const uno::Any& rValue ) throw( beans::UnknownPropertyException, lang::IllegalArgumentException) SAL_OVERRIDE; private: SdDrawDocument* mpDrawModel; diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index efe362661d36..9133412d1531 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -757,7 +757,7 @@ namespace { View* pView, DrawView& rPrintView, const SetOfByte& rVisibleLayers, - const SetOfByte& rPrintableLayers) const + const SetOfByte& rPrintableLayers) const SAL_OVERRIDE { (void)rViewShell; SdPage* pPageToPrint = rDocument.GetSdPage(mnPageIndex, mePageKind); @@ -815,7 +815,7 @@ namespace { View* pView, DrawView& rPrintView, const SetOfByte& rVisibleLayers, - const SetOfByte& rPrintableLayers) const + const SetOfByte& rPrintableLayers) const SAL_OVERRIDE { (void)rViewShell; SdPage* pPageToPrint = rDocument.GetSdPage(mnPageIndex, mePageKind); @@ -900,7 +900,7 @@ namespace { View* pView, DrawView& rPrintView, const SetOfByte& rVisibleLayers, - const SetOfByte& rPrintableLayers) const + const SetOfByte& rPrintableLayers) const SAL_OVERRIDE { (void)rViewShell; MapMode aMap (maMap); @@ -973,7 +973,7 @@ namespace { View* pView, DrawView& rPrintView, const SetOfByte& rVisibleLayers, - const SetOfByte& rPrintableLayers) const + const SetOfByte& rPrintableLayers) const SAL_OVERRIDE { SdPage& rHandoutPage (*rDocument.GetSdPage(0, PK_HANDOUT)); @@ -1122,7 +1122,7 @@ namespace { View* pView, DrawView& rPrintView, const SetOfByte& rVisibleLayers, - const SetOfByte& rPrintableLayers) const + const SetOfByte& rPrintableLayers) const SAL_OVERRIDE { (void)rViewShell; (void)pView; @@ -1201,7 +1201,7 @@ public: - virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) + virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) SAL_OVERRIDE { const SfxSimpleHint* pSimpleHint = dynamic_cast(&rHint); if (pSimpleHint != NULL diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index 91627e039a1e..889eba321bdd 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -38,8 +38,8 @@ class FormShellManagerFactory { public: FormShellManagerFactory (ViewShell& rViewShell, FormShellManager& rManager); - virtual FmFormShell* CreateShell (ShellId nId, ::Window* pParentWindow, FrameView* pFrameView); - virtual void ReleaseShell (SfxShell* pShell); + virtual FmFormShell* CreateShell (ShellId nId, ::Window* pParentWindow, FrameView* pFrameView) SAL_OVERRIDE; + virtual void ReleaseShell (SfxShell* pShell) SAL_OVERRIDE; private: ::sd::ViewShell& mrViewShell; diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index b651ecf71c38..573630db02d8 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -206,8 +206,8 @@ class FocusForwardingWindow : public ::Window public: FocusForwardingWindow (::Window& rParentWindow, ViewShellBase& rBase); virtual ~FocusForwardingWindow (void); - virtual void KeyInput (const KeyEvent& rEvent); - virtual void Command (const CommandEvent& rEvent); + virtual void KeyInput (const KeyEvent& rEvent) SAL_OVERRIDE; + virtual void Command (const CommandEvent& rEvent) SAL_OVERRIDE; private: ViewShellBase& mrBase; diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 3c5f728b54d9..56970bf0e8e9 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -71,8 +71,8 @@ public: TabBarControl ( ::Window* pParentWindow, const ::rtl::Reference& rpViewTabBar); - virtual void Paint (const Rectangle& rRect); - virtual void ActivatePage (void); + virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; + virtual void ActivatePage (void) SAL_OVERRIDE; private: ::rtl::Reference mpViewTabBar; }; @@ -87,7 +87,7 @@ class ViewTabPage : public TabPage { public: ViewTabPage (Window* pParent) : TabPage(pParent) {} - virtual void Resize (void) + virtual void Resize (void) SAL_OVERRIDE { SetPosSizePixel(Point(0,0),GetParent()->GetOutputSizePixel()); } }; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 856297edbe1c..f6a0f293de8a 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -195,7 +195,7 @@ public: m_pObj (pObj) {} - virtual void Update( Graphic& aGraphic ) + virtual void Update( Graphic& aGraphic ) SAL_OVERRIDE { SdrPageView* pPageView = m_pView->GetSdrPageView(); if( pPageView ) diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 67dcbcc70e98..8b38a339b42c 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -95,7 +95,7 @@ public: ~ScannerEventListener(); // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; void ParentDestroyed() { mpParent = NULL; } }; diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index dc1943f1847c..3a7ebd3b9ea2 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -43,7 +43,7 @@ class RulerCtrlItem : public SfxControllerItem protected: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, - const SfxPoolItem* pItem ); + const SfxPoolItem* pItem ) SAL_OVERRIDE; public: RulerCtrlItem(sal_uInt16 nId, Ruler& rRlr, SfxBindings& rBind); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index fe0fa9a27a0b..4a7f344aa813 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -185,7 +185,7 @@ public: // different, overload the method and at least do what the method does. virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, - const sdr::contact::DisplayInfo& rDisplayInfo); + const sdr::contact::DisplayInfo& rDisplayInfo) SAL_OVERRIDE; }; ViewRedirector::ViewRedirector() diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 4e8d1ade10a8..0afec03231a6 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -116,18 +116,18 @@ public: virtual ~ChangePlaceholderTag(); /** returns true if the SmartTag handled the event. */ - virtual bool MouseButtonDown( const MouseEvent&, SmartHdl& ); + virtual bool MouseButtonDown( const MouseEvent&, SmartHdl& ) SAL_OVERRIDE; /** returns true if the SmartTag consumes this event. */ - virtual bool KeyInput( const KeyEvent& rKEvt ); + virtual bool KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; BitmapEx createOverlayImage( int nHighlight = -1 ); protected: - virtual void addCustomHandles( SdrHdlList& rHandlerList ); - virtual void disposing(); - virtual void select(); - virtual void deselect(); + virtual void addCustomHandles( SdrHdlList& rHandlerList ) SAL_OVERRIDE; + virtual void disposing() SAL_OVERRIDE; + virtual void select() SAL_OVERRIDE; + virtual void deselect() SAL_OVERRIDE; private: SdrObjectWeakRef mxPlaceholderObj; @@ -138,13 +138,13 @@ class ImageButtonHdl : public SmartHdl public: ImageButtonHdl( const SmartTagReference& xTag, /* sal_uInt16 nSID, const Image& rImage, const Image& rImageMO, */ const Point& rPnt ); virtual ~ImageButtonHdl(); - virtual void CreateB2dIAObject(); - virtual bool IsFocusHdl() const; - virtual Pointer GetPointer() const; - virtual bool isMarkable() const; + virtual void CreateB2dIAObject() SAL_OVERRIDE; + virtual bool IsFocusHdl() const SAL_OVERRIDE; + virtual Pointer GetPointer() const SAL_OVERRIDE; + virtual bool isMarkable() const SAL_OVERRIDE; - virtual void onMouseEnter(const MouseEvent& rMEvt); - virtual void onMouseLeave(); + virtual void onMouseEnter(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void onMouseLeave() SAL_OVERRIDE; int getHighlightId() const { return mnHighlightId; } diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index d3bfeecd7de3..f87d917f74c3 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -100,8 +100,8 @@ public: virtual SfxShell* CreateShell ( ::sd::ShellId nId, ::Window* pParentWindow, - ::sd::FrameView* pFrameView); - virtual void ReleaseShell (SfxShell* pShell); + ::sd::FrameView* pFrameView) SAL_OVERRIDE; + virtual void ReleaseShell (SfxShell* pShell) SAL_OVERRIDE; private: ::sd::ViewShell& mrViewShell; /** This cache holds the already created object bars. -- cgit v1.2.3