diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
| commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
| tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /slideshow/source/engine/slide/slideimpl.cxx | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'slideshow/source/engine/slide/slideimpl.cxx')
| -rw-r--r-- | slideshow/source/engine/slide/slideimpl.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 0e2cf1a614aa..bff4c491babf 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -108,36 +108,36 @@ public: // Slide interface - virtual bool prefetch() SAL_OVERRIDE; - virtual bool show( bool ) SAL_OVERRIDE; - virtual void hide() SAL_OVERRIDE; + virtual bool prefetch() override; + virtual bool show( bool ) override; + virtual void hide() override; - virtual basegfx::B2ISize getSlideSize() const SAL_OVERRIDE; - virtual uno::Reference<drawing::XDrawPage > getXDrawPage() const SAL_OVERRIDE; - virtual uno::Reference<animations::XAnimationNode> getXAnimationNode() const SAL_OVERRIDE; - virtual PolyPolygonVector getPolygons() SAL_OVERRIDE; - virtual void drawPolygons() const SAL_OVERRIDE; - virtual bool isPaintOverlayActive() const SAL_OVERRIDE; - virtual void enablePaintOverlay() SAL_OVERRIDE; - virtual void disablePaintOverlay() SAL_OVERRIDE; - virtual void update_settings( bool bUserPaintEnabled, RGBColor const& aUserPaintColor, double dUserPaintStrokeWidth ) SAL_OVERRIDE; + virtual basegfx::B2ISize getSlideSize() const override; + virtual uno::Reference<drawing::XDrawPage > getXDrawPage() const override; + virtual uno::Reference<animations::XAnimationNode> getXAnimationNode() const override; + virtual PolyPolygonVector getPolygons() override; + virtual void drawPolygons() const override; + virtual bool isPaintOverlayActive() const override; + virtual void enablePaintOverlay() override; + virtual void disablePaintOverlay() override; + virtual void update_settings( bool bUserPaintEnabled, RGBColor const& aUserPaintColor, double dUserPaintStrokeWidth ) override; // TODO(F2): Rework SlideBitmap to no longer be based on XBitmap, // but on canvas-independent basegfx bitmaps - virtual SlideBitmapSharedPtr getCurrentSlideBitmap( const UnoViewSharedPtr& rView ) const SAL_OVERRIDE; + virtual SlideBitmapSharedPtr getCurrentSlideBitmap( const UnoViewSharedPtr& rView ) const override; private: // ViewEventHandler - virtual void viewAdded( const UnoViewSharedPtr& rView ) SAL_OVERRIDE; - virtual void viewRemoved( const UnoViewSharedPtr& rView ) SAL_OVERRIDE; - virtual void viewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE; - virtual void viewsChanged() SAL_OVERRIDE; + virtual void viewAdded( const UnoViewSharedPtr& rView ) override; + virtual void viewRemoved( const UnoViewSharedPtr& rView ) override; + virtual void viewChanged( const UnoViewSharedPtr& rView ) override; + virtual void viewsChanged() override; // CursorManager - virtual bool requestCursor( sal_Int16 nCursorShape ) SAL_OVERRIDE; - virtual void resetCursor() SAL_OVERRIDE; + virtual bool requestCursor( sal_Int16 nCursorShape ) override; + virtual void resetCursor() override; void activatePaintOverlay(); void deactivatePaintOverlay(); |