diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /sd/source/ui/presenter | |
parent | Introduce INetContentType::scan (diff) | |
download | core-567ef6d5782cdb729b49005caf6005610ce03e22.tar.gz core-567ef6d5782cdb729b49005caf6005610ce03e22.zip |
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
Diffstat (limited to 'sd/source/ui/presenter')
-rw-r--r-- | sd/source/ui/presenter/PresenterCanvas.cxx | 18 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterCanvas.hxx | 68 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterHelper.hxx | 18 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterPreviewCache.cxx | 14 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterPreviewCache.hxx | 18 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterTextView.hxx | 8 | ||||
-rw-r--r-- | sd/source/ui/presenter/SlideRenderer.hxx | 10 |
7 files changed, 77 insertions, 77 deletions
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<rendering::XPolyPolygon2D>& 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<rendering::XCanvas> SAL_CALL getContentCanvas (void) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; private: rtl::Reference<PresenterCanvas> 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<css::awt::XWindow>& rxBaseWindow); @@ -146,46 +146,46 @@ public: virtual void SAL_CALL initialize ( const css::uno::Sequence<css::uno::Any>& 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<css::rendering::XCachedPrimitive> 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<css::rendering::XCachedPrimitive> 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<css::rendering::XCachedPrimitive> 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<css::rendering::XCachedPrimitive> 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<css::rendering::XPolyPolygon2D> 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<css::rendering::XCachedPrimitive> 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<css::rendering::XCachedPrimitive> SAL_CALL fillTexturedPolyPolygon( @@ -234,7 +234,7 @@ public: const css::uno::Sequence<css::rendering::Texture>& xTextures) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::rendering::XCachedPrimitive> 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<css::rendering::XCanvasFont> 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<css::rendering::FontInfo> 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<css::rendering::XCachedPrimitive> 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<css::rendering::XCachedPrimitive> 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<css::rendering::XCachedPrimitive> 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<css::rendering::XCachedPrimitive> 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<css::rendering::XGraphicDevice> 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<css::rendering::XBitmap> 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<css::rendering::XSpriteCanvas> 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<css::uno::Any>& 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<css::rendering::XCanvas> SAL_CALL createSharedCanvas ( const css::uno::Reference<css::rendering::XSpriteCanvas>& rxUpdateCanvas, @@ -70,33 +70,33 @@ public: const css::uno::Reference<css::rendering::XCanvas>& rxSharedCanvas, const css::uno::Reference<css::awt::XWindow>& rxSharedWindow, const css::uno::Reference<css::awt::XWindow>& rxWindow) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL createCanvas ( const css::uno::Reference<css::awt::XWindow>& 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<css::awt::XWindow>& rxWindow) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL loadBitmap ( const OUString& rsURL, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL captureMouse (const css::uno::Reference<css::awt::XWindow>& rxWindow) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL releaseMouse (const css::uno::Reference<css::awt::XWindow>& 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<css::awt::XWindow>& rxChildWindow, const css::uno::Reference<css::awt::XWindow>& rxParentWindow) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: css::uno::Reference<css::uno::XComponentContext> 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<std::vector<CacheKey> > GetEntryList (bool bVisible); - virtual sal_Int32 GetPriority (CacheKey aKey); - virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> 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<std::vector<CacheKey> > GetEntryList (bool bVisible) SAL_OVERRIDE; + virtual sal_Int32 GetPriority (CacheKey aKey) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel (void) SAL_OVERRIDE; private: Reference<container::XIndexAccess> 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<css::uno::Any>& 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<css::container::XIndexAccess>& rxSlides, const css::uno::Reference<css::uno::XInterface>& 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<css::rendering::XBitmap> SAL_CALL getSlidePreview ( sal_Int32 nSlideIndex, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPreviewCreationNotifyListener ( const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePreviewCreationNotifyListener ( const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& 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<css::uno::XComponentContext> 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<css::uno::Any>& 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<css::uno::XComponentContext>& 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<css::uno::Any>& 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<css::drawing::XDrawPage>& 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<css::rendering::XBitmap> SAL_CALL createPreviewForCanvas ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide, const css::awt::Size& rMaximumPreviewPixelSize, sal_Int16 nSuperSampleFactor, const css::uno::Reference<css::rendering::XCanvas>& 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; |