From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 16:04:04 +0200 Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 --- vcl/inc/headless/svpbmp.hxx | 26 ++++---- vcl/inc/headless/svpdummies.hxx | 26 ++++---- vcl/inc/headless/svpframe.hxx | 96 +++++++++++++-------------- vcl/inc/headless/svpgdi.hxx | 132 ++++++++++++++++++------------------- vcl/inc/headless/svpinst.hxx | 54 +++++++-------- vcl/inc/headless/svpprn.hxx | 2 +- vcl/inc/headless/svptextrender.hxx | 38 +++++------ vcl/inc/headless/svpvd.hxx | 12 ++-- 8 files changed, 193 insertions(+), 193 deletions(-) (limited to 'vcl/inc/headless') diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx index 9cf373974141..006ef49a2057 100644 --- a/vcl/inc/headless/svpbmp.hxx +++ b/vcl/inc/headless/svpbmp.hxx @@ -42,25 +42,25 @@ public: // SalBitmap virtual bool Create( const Size& rSize, sal_uInt16 nBitCount, - const BitmapPalette& rPal ) SAL_OVERRIDE; - virtual bool Create( const SalBitmap& rSalBmp ) SAL_OVERRIDE; + const BitmapPalette& rPal ) override; + virtual bool Create( const SalBitmap& rSalBmp ) override; virtual bool Create( const SalBitmap& rSalBmp, - SalGraphics* pGraphics ) SAL_OVERRIDE; + SalGraphics* pGraphics ) override; virtual bool Create( const SalBitmap& rSalBmp, - sal_uInt16 nNewBitCount ) SAL_OVERRIDE; + sal_uInt16 nNewBitCount ) override; virtual bool Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& rBitmapCanvas, Size& rSize, - bool bMask = false ) SAL_OVERRIDE; - virtual void Destroy() SAL_OVERRIDE; - virtual Size GetSize() const SAL_OVERRIDE; - virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE; + bool bMask = false ) override; + virtual void Destroy() override; + virtual Size GetSize() const override; + virtual sal_uInt16 GetBitCount() const override; - virtual BitmapBuffer* AcquireBuffer( BitmapAccessMode nMode ) SAL_OVERRIDE; - virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) SAL_OVERRIDE; - virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE; + virtual BitmapBuffer* AcquireBuffer( BitmapAccessMode nMode ) override; + virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) override; + virtual bool GetSystemData( BitmapSystemData& rData ) override; - virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE; - virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE; + virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override; + virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override; static sal_uInt32 getBitCountFromScanlineFormat( basebmp::Format nFormat ); }; diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx index 7b13fa21760d..f2df54c92555 100644 --- a/vcl/inc/headless/svpdummies.hxx +++ b/vcl/inc/headless/svpdummies.hxx @@ -37,16 +37,16 @@ public: virtual ~SvpSalObject(); // override all pure virtual methods - virtual void ResetClipRegion() SAL_OVERRIDE; - virtual sal_uInt16 GetClipRegionType() SAL_OVERRIDE; - virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE; - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; - virtual void EndSetClipRegion() SAL_OVERRIDE; + virtual void ResetClipRegion() override; + virtual sal_uInt16 GetClipRegionType() override; + virtual void BeginSetClipRegion( sal_uLong nRects ) override; + virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override; + virtual void EndSetClipRegion() override; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; - virtual void Show( bool bVisible ) SAL_OVERRIDE; + virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) override; + virtual void Show( bool bVisible ) override; - virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE; + virtual const SystemEnvData* GetSystemData() const override; }; class VCL_DLLPUBLIC SvpImeStatus : public SalI18NImeStatus @@ -55,8 +55,8 @@ class VCL_DLLPUBLIC SvpImeStatus : public SalI18NImeStatus SvpImeStatus() {} virtual ~SvpImeStatus(); - virtual bool canToggle() SAL_OVERRIDE; - virtual void toggle() SAL_OVERRIDE; + virtual bool canToggle() override; + virtual void toggle() override; }; class VCL_DLLPUBLIC SvpSalSystem : public SalGenericSystem @@ -65,13 +65,13 @@ public: SvpSalSystem() {} virtual ~SvpSalSystem(); // get info about the display - virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE; - virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) SAL_OVERRIDE; + virtual unsigned int GetDisplayScreenCount() override; + virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) override; virtual int ShowNativeDialog( const OUString& rTitle, const OUString& rMessage, const std::list< OUString >& rButtons, - int nDefButton ) SAL_OVERRIDE; + int nDefButton ) override; }; #endif // INCLUDED_VCL_INC_HEADLESS_SVPDUMMIES_HXX diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index d7e9b0189156..f64d22f7c303 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -77,53 +77,53 @@ public: #endif // SalFrame - virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE; - virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE; - - virtual bool PostEvent(ImplSVEvent* pData) SAL_OVERRIDE; - - virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE; - virtual void SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE; - virtual void SetMenu( SalMenu* pMenu ) SAL_OVERRIDE; - virtual void DrawMenuBar() SAL_OVERRIDE; - - virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) SAL_OVERRIDE; - virtual void Show( bool bVisible, bool bNoActivate = false ) SAL_OVERRIDE; - virtual void SetMinClientSize( long nWidth, long nHeight ) SAL_OVERRIDE; - virtual void SetMaxClientSize( long nWidth, long nHeight ) SAL_OVERRIDE; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) SAL_OVERRIDE; - virtual void GetClientSize( long& rWidth, long& rHeight ) SAL_OVERRIDE; - virtual void GetWorkArea( Rectangle& rRect ) SAL_OVERRIDE; - virtual SalFrame* GetParent() const SAL_OVERRIDE; - virtual void SetWindowState( const SalFrameState* pState ) SAL_OVERRIDE; - virtual bool GetWindowState( SalFrameState* pState ) SAL_OVERRIDE; - virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) SAL_OVERRIDE; - virtual void StartPresentation( bool bStart ) SAL_OVERRIDE; - virtual void SetAlwaysOnTop( bool bOnTop ) SAL_OVERRIDE; - virtual void ToTop( sal_uInt16 nFlags ) SAL_OVERRIDE; - virtual void SetPointer( PointerStyle ePointerStyle ) SAL_OVERRIDE; - virtual void CaptureMouse( bool bMouse ) SAL_OVERRIDE; - virtual void SetPointerPos( long nX, long nY ) SAL_OVERRIDE; + virtual SalGraphics* AcquireGraphics() override; + virtual void ReleaseGraphics( SalGraphics* pGraphics ) override; + + virtual bool PostEvent(ImplSVEvent* pData) override; + + virtual void SetTitle( const OUString& rTitle ) override; + virtual void SetIcon( sal_uInt16 nIcon ) override; + virtual void SetMenu( SalMenu* pMenu ) override; + virtual void DrawMenuBar() override; + + virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) override; + virtual void Show( bool bVisible, bool bNoActivate = false ) override; + virtual void SetMinClientSize( long nWidth, long nHeight ) override; + virtual void SetMaxClientSize( long nWidth, long nHeight ) override; + virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override; + virtual void GetClientSize( long& rWidth, long& rHeight ) override; + virtual void GetWorkArea( Rectangle& rRect ) override; + virtual SalFrame* GetParent() const override; + virtual void SetWindowState( const SalFrameState* pState ) override; + virtual bool GetWindowState( SalFrameState* pState ) override; + virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) override; + virtual void StartPresentation( bool bStart ) override; + virtual void SetAlwaysOnTop( bool bOnTop ) override; + virtual void ToTop( sal_uInt16 nFlags ) override; + virtual void SetPointer( PointerStyle ePointerStyle ) override; + virtual void CaptureMouse( bool bMouse ) override; + virtual void SetPointerPos( long nX, long nY ) override; using SalFrame::Flush; - virtual void Flush() SAL_OVERRIDE; - virtual void Sync() SAL_OVERRIDE; - virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE; - virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) SAL_OVERRIDE; - virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE; - virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE; - virtual LanguageType GetInputLanguage() SAL_OVERRIDE; - virtual void UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE; - virtual void Beep() SAL_OVERRIDE; - virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE; - virtual SalPointerState GetPointerState() SAL_OVERRIDE; - virtual KeyIndicatorState GetIndicatorState() SAL_OVERRIDE; - virtual void SimulateKeyPress( sal_uInt16 nKeyCode ) SAL_OVERRIDE; - virtual void SetParent( SalFrame* pNewParent ) SAL_OVERRIDE; - virtual bool SetPluginParent( SystemParentData* pNewParent ) SAL_OVERRIDE; - virtual void ResetClipRegion() SAL_OVERRIDE; - virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE; - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; - virtual void EndSetClipRegion() SAL_OVERRIDE; + virtual void Flush() override; + virtual void Sync() override; + virtual void SetInputContext( SalInputContext* pContext ) override; + virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) override; + virtual OUString GetKeyName( sal_uInt16 nKeyCode ) override; + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) override; + virtual LanguageType GetInputLanguage() override; + virtual void UpdateSettings( AllSettings& rSettings ) override; + virtual void Beep() override; + virtual const SystemEnvData* GetSystemData() const override; + virtual SalPointerState GetPointerState() override; + virtual KeyIndicatorState GetIndicatorState() override; + virtual void SimulateKeyPress( sal_uInt16 nKeyCode ) override; + virtual void SetParent( SalFrame* pNewParent ) override; + virtual bool SetPluginParent( SystemParentData* pNewParent ) override; + virtual void ResetClipRegion() override; + virtual void BeginSetClipRegion( sal_uLong nRects ) override; + virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override; + virtual void EndSetClipRegion() override; #ifdef ANDROID // If enabled we can get damage notifications for regions immediately rendered to ... @@ -131,8 +131,8 @@ public: #endif /*TODO: functional implementation */ - virtual void SetScreenNumber( unsigned int nScreen ) SAL_OVERRIDE { (void)nScreen; } - virtual void SetApplicationID(const OUString &rApplicationID) SAL_OVERRIDE { (void) rApplicationID; } + virtual void SetScreenNumber( unsigned int nScreen ) override { (void)nScreen; } + virtual void SetApplicationID(const OUString &rApplicationID) override { (void) rApplicationID; } static SvpSalFrame* GetFocusFrame() { return s_pFocusFrame; } diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 5a1f824a6a9c..694b888bfff4 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -74,50 +74,50 @@ protected: std::unique_ptr m_xTextRenderImpl; protected: - virtual bool blendBitmap( const SalTwoRect&, const SalBitmap& rBitmap ) SAL_OVERRIDE; + virtual bool blendBitmap( const SalTwoRect&, const SalBitmap& rBitmap ) override; virtual bool blendAlphaBitmap( const SalTwoRect&, const SalBitmap& rSrcBitmap, const SalBitmap& rMaskBitmap, - const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE; - virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE; + const SalBitmap& rAlphaBitmap ) override; + virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, const SalBitmap& rAlphaBitmap ) override; virtual bool drawTransformedBitmap( const basegfx::B2DPoint& rNull, const basegfx::B2DPoint& rX, const basegfx::B2DPoint& rY, const SalBitmap& rSourceBitmap, - const SalBitmap* pAlphaBitmap) SAL_OVERRIDE; - virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) SAL_OVERRIDE; + const SalBitmap* pAlphaBitmap) override; + virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) override; public: SvpSalGraphics(); virtual ~SvpSalGraphics(); - virtual SalGraphicsImpl* GetImpl() const SAL_OVERRIDE { return NULL; }; - virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE; - virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE; - virtual long GetGraphicsWidth() const SAL_OVERRIDE; + virtual SalGraphicsImpl* GetImpl() const override { return NULL; }; + virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override; + virtual sal_uInt16 GetBitCount() const override; + virtual long GetGraphicsWidth() const override; - virtual void ResetClipRegion() SAL_OVERRIDE; - virtual bool setClipRegion( const vcl::Region& ) SAL_OVERRIDE; + virtual void ResetClipRegion() override; + virtual bool setClipRegion( const vcl::Region& ) override; - virtual void SetLineColor() SAL_OVERRIDE; - virtual void SetLineColor( SalColor nSalColor ) SAL_OVERRIDE; - virtual void SetFillColor() SAL_OVERRIDE; - virtual void SetFillColor( SalColor nSalColor ) SAL_OVERRIDE; + virtual void SetLineColor() override; + virtual void SetLineColor( SalColor nSalColor ) override; + virtual void SetFillColor() override; + virtual void SetFillColor( SalColor nSalColor ) override; - virtual void SetXORMode( bool bSet, bool ) SAL_OVERRIDE; + virtual void SetXORMode( bool bSet, bool ) override; - virtual void SetROPLineColor( SalROPColor nROPColor ) SAL_OVERRIDE; - virtual void SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE; + virtual void SetROPLineColor( SalROPColor nROPColor ) override; + virtual void SetROPFillColor( SalROPColor nROPColor ) override; - virtual void SetTextColor( SalColor nSalColor ) SAL_OVERRIDE; - virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE; - virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE; - virtual const FontCharMapPtr GetFontCharMap() const SAL_OVERRIDE; - virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE; - virtual void GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE; - virtual void ClearDevFontCache() SAL_OVERRIDE; - virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE; + virtual void SetTextColor( SalColor nSalColor ) override; + virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) override; + virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) override; + virtual const FontCharMapPtr GetFontCharMap() const override; + virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override; + virtual void GetDevFontList( PhysicalFontCollection* ) override; + virtual void ClearDevFontCache() override; + virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) override; virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, const sal_GlyphId* pGlyphIds, @@ -125,50 +125,50 @@ public: sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo - ) SAL_OVERRIDE; - virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set const** ) SAL_OVERRIDE; + ) override; + virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set const** ) override; virtual const void* GetEmbedFontData( const PhysicalFontFace*, const sal_Ucs* pUnicodes, sal_Int32* pWidths, size_t nLen, FontSubsetInfo& rInfo, - long* pDataLen ) SAL_OVERRIDE; - virtual void FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE; + long* pDataLen ) override; + virtual void FreeEmbedFontData( const void* pData, long nDataLen ) override; virtual void GetGlyphWidths( const PhysicalFontFace*, bool bVertical, Int32Vector& rWidths, - Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE; - virtual bool GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) SAL_OVERRIDE; - virtual bool GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) SAL_OVERRIDE; - virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE; - virtual void DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE; - virtual bool supportsOperation( OutDevSupportType ) const SAL_OVERRIDE; - virtual void drawPixel( long nX, long nY ) SAL_OVERRIDE; - virtual void drawPixel( long nX, long nY, SalColor nSalColor ) SAL_OVERRIDE; - virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) SAL_OVERRIDE; - virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; - virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) SAL_OVERRIDE; + Ucs2UIntMap& rUnicodeEnc ) override; + virtual bool GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) override; + virtual bool GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) override; + virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override; + virtual void DrawServerFontLayout( const ServerFontLayout& ) override; + virtual bool supportsOperation( OutDevSupportType ) const override; + virtual void drawPixel( long nX, long nY ) override; + virtual void drawPixel( long nX, long nY, SalColor nSalColor ) override; + virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) override; + virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) override; + virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) override; virtual bool drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, - com::sun::star::drawing::LineCap) SAL_OVERRIDE; - virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE; - virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE; + com::sun::star::drawing::LineCap) override; + virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override; + virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) override; virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, - PCONSTSALPOINT* pPtAry ) SAL_OVERRIDE; + PCONSTSALPOINT* pPtAry ) override; virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, - const sal_uInt8* pFlgAry ) SAL_OVERRIDE; + const sal_uInt8* pFlgAry ) override; virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, - const sal_uInt8* pFlgAry ) SAL_OVERRIDE; + const sal_uInt8* pFlgAry ) override; virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, - const sal_uInt8* const* pFlgAry ) SAL_OVERRIDE; - virtual bool drawGradient( const tools::PolyPolygon&, const Gradient& ) SAL_OVERRIDE { return false; }; + const sal_uInt8* const* pFlgAry ) override; + virtual bool drawGradient( const tools::PolyPolygon&, const Gradient& ) override { return false; }; virtual void copyArea( long nDestX, long nDestY, @@ -176,34 +176,34 @@ public: long nSrcY, long nSrcWidth, long nSrcHeight, - sal_uInt16 nFlags ) SAL_OVERRIDE; + sal_uInt16 nFlags ) override; virtual void copyBits( const SalTwoRect& rPosAry, - SalGraphics* pSrcGraphics ) SAL_OVERRIDE; + SalGraphics* pSrcGraphics ) override; virtual void drawBitmap( const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap ) SAL_OVERRIDE; + const SalBitmap& rSalBitmap ) override; virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, - const SalBitmap& rTransparentBitmap ) SAL_OVERRIDE; + const SalBitmap& rTransparentBitmap ) override; virtual void drawMask( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, - SalColor nMaskColor ) SAL_OVERRIDE; - virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; - virtual SalColor getPixel( long nX, long nY ) SAL_OVERRIDE; - virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) SAL_OVERRIDE; - virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) SAL_OVERRIDE; + SalColor nMaskColor ) override; + virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) override; + virtual SalColor getPixel( long nX, long nY ) override; + virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) override; + virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override; - virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) SAL_OVERRIDE; + virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) override; - virtual SystemGraphicsData GetGraphicsData() const SAL_OVERRIDE; + virtual SystemGraphicsData GetGraphicsData() const override; #if ENABLE_CAIRO_CANVAS - virtual bool SupportsCairo() const SAL_OVERRIDE; - virtual cairo::SurfaceSharedPtr CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const SAL_OVERRIDE; - virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const SAL_OVERRIDE; - virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const SAL_OVERRIDE; - virtual css::uno::Any GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const SAL_OVERRIDE; + virtual bool SupportsCairo() const override; + virtual cairo::SurfaceSharedPtr CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const override; + virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const override; + virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const override; + virtual css::uno::Any GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const override; - virtual SystemFontData GetSysFontData( int nFallbacklevel ) const SAL_OVERRIDE; + virtual SystemFontData GetSysFontData( int nFallbacklevel ) const override; static cairo_t* createCairoContext(const basebmp::BitmapDeviceSharedPtr& rBuffer); void clipRegion(cairo_t* cr); diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index e1bf136452c3..e113304df898 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -50,8 +50,8 @@ public: virtual ~SvpSalTimer(); // override all pure virtual methods - virtual void Start( sal_uLong nMS ) SAL_OVERRIDE; - virtual void Stop() SAL_OVERRIDE; + virtual void Start( sal_uLong nMS ) override; + virtual void Stop() override; }; class SvpSalFrame; @@ -115,13 +115,13 @@ public: bool CheckTimeout( bool bExecuteTimers = true ); // Frame - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE; - virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE; - virtual void DestroyFrame( SalFrame* pFrame ) SAL_OVERRIDE; + virtual SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override; + virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override; + virtual void DestroyFrame( SalFrame* pFrame ) override; // Object (System Child Window) - virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) SAL_OVERRIDE; - virtual void DestroyObject( SalObject* pObject ) SAL_OVERRIDE; + virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) override; + virtual void DestroyObject( SalObject* pObject ) override; // VirtualDevice // nDX and nDY in Pixel @@ -129,47 +129,47 @@ public: // pData allows for using a system dependent graphics or device context virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, long &nDX, long &nDY, - sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) SAL_OVERRIDE; + sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) override; // Printer // pSetupData->mpDriverData can be 0 // pSetupData must be updatet with the current // JobSetup virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, - ImplJobSetup* pSetupData ) SAL_OVERRIDE; - virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ) SAL_OVERRIDE; - virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ) SAL_OVERRIDE; - virtual void DestroyPrinter( SalPrinter* pPrinter ) SAL_OVERRIDE; + ImplJobSetup* pSetupData ) override; + virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ) override; + virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ) override; + virtual void DestroyPrinter( SalPrinter* pPrinter ) override; - virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ) SAL_OVERRIDE; - virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) SAL_OVERRIDE; - virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) SAL_OVERRIDE; - virtual OUString GetDefaultPrinter() SAL_OVERRIDE; - virtual void PostPrintersChanged() SAL_OVERRIDE; + virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ) override; + virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) override; + virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) override; + virtual OUString GetDefaultPrinter() override; + virtual void PostPrintersChanged() override; // SalTimer - virtual SalTimer* CreateSalTimer() SAL_OVERRIDE; + virtual SalTimer* CreateSalTimer() override; // SalI18NImeStatus - virtual SalI18NImeStatus* CreateI18NImeStatus() SAL_OVERRIDE; + virtual SalI18NImeStatus* CreateI18NImeStatus() override; // SalSystem - virtual SalSystem* CreateSalSystem() SAL_OVERRIDE; + virtual SalSystem* CreateSalSystem() override; // SalBitmap - virtual SalBitmap* CreateSalBitmap() SAL_OVERRIDE; + virtual SalBitmap* CreateSalBitmap() override; // wait next event and dispatch // must returned by UserEvent (SalFrame::PostEvent) // and timer - virtual void DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) SAL_OVERRIDE; - virtual bool AnyInput( VclInputFlags nType ) SAL_OVERRIDE; + virtual void DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) override; + virtual bool AnyInput( VclInputFlags nType ) override; // may return NULL to disable session management - virtual SalSession* CreateSalSession() SAL_OVERRIDE; + virtual SalSession* CreateSalSession() override; - virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) SAL_OVERRIDE; + virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) override; - virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) SAL_OVERRIDE; + virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) override; - virtual GenPspGraphics *CreatePrintGraphics() SAL_OVERRIDE; + virtual GenPspGraphics *CreatePrintGraphics() override; // We want to be able to select colourspace, i.e. ARGB vs RGBA vs BGRA etc. // -- as the rest of vcl always uses bit depths, it is perhaps simplest diff --git a/vcl/inc/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx index b8a3b3fa52c4..54280f60c931 100644 --- a/vcl/inc/headless/svpprn.hxx +++ b/vcl/inc/headless/svpprn.hxx @@ -30,7 +30,7 @@ class SvpSalInfoPrinter : public PspSalInfoPrinter { public: - virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) SAL_OVERRIDE; + virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) override; }; class SvpSalPrinter : public PspSalPrinter diff --git a/vcl/inc/headless/svptextrender.hxx b/vcl/inc/headless/svptextrender.hxx index 7c2ca03bb7b7..43fd78d2f758 100644 --- a/vcl/inc/headless/svptextrender.hxx +++ b/vcl/inc/headless/svptextrender.hxx @@ -36,16 +36,16 @@ private: ServerFont* m_pServerFont[ MAX_FALLBACK ]; public: SvpTextRender(SvpSalGraphics& rParent); - virtual void setDevice(basebmp::BitmapDeviceSharedPtr& rDevice) SAL_OVERRIDE; + virtual void setDevice(basebmp::BitmapDeviceSharedPtr& rDevice) override; - virtual void SetTextColor( SalColor nSalColor ) SAL_OVERRIDE; - virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE; - virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE; - virtual const FontCharMapPtr GetFontCharMap() const SAL_OVERRIDE; - virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE; - virtual void GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE; - virtual void ClearDevFontCache() SAL_OVERRIDE; - virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE; + virtual void SetTextColor( SalColor nSalColor ) override; + virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) override; + virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) override; + virtual const FontCharMapPtr GetFontCharMap() const override; + virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override; + virtual void GetDevFontList( PhysicalFontCollection* ) override; + virtual void ClearDevFontCache() override; + virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) override; virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, @@ -53,30 +53,30 @@ public: const sal_uInt8* pEncoding, sal_Int32* pWidths, int nGlyphs, - FontSubsetInfo& rInfo) SAL_OVERRIDE; + FontSubsetInfo& rInfo) override; - virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set const**) SAL_OVERRIDE; + virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set const**) override; virtual const void* GetEmbedFontData( const PhysicalFontFace*, const sal_Ucs* pUnicodes, sal_Int32* pWidths, size_t nLen, FontSubsetInfo& rInfo, - long* pDataLen ) SAL_OVERRIDE; + long* pDataLen ) override; - virtual void FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE; + virtual void FreeEmbedFontData( const void* pData, long nDataLen ) override; virtual void GetGlyphWidths( const PhysicalFontFace*, bool bVertical, Int32Vector& rWidths, - Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE; + Ucs2UIntMap& rUnicodeEnc ) override; - virtual bool GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) SAL_OVERRIDE; - virtual bool GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) SAL_OVERRIDE; - virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE; - virtual void DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE; + virtual bool GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) override; + virtual bool GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) override; + virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override; + virtual void DrawServerFontLayout( const ServerFontLayout& ) override; #if ENABLE_CAIRO_CANVAS - virtual SystemFontData GetSysFontData( int nFallbackLevel ) const SAL_OVERRIDE; + virtual SystemFontData GetSysFontData( int nFallbackLevel ) const override; #endif // ENABLE_CAIRO_CANVAS }; diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx index 9b73ae54604d..1dd39f8c2b29 100644 --- a/vcl/inc/headless/svpvd.hxx +++ b/vcl/inc/headless/svpvd.hxx @@ -37,18 +37,18 @@ public: virtual ~SvpSalVirtualDevice(); // SalVirtualDevice - virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE; - virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE; + virtual SalGraphics* AcquireGraphics() override; + virtual void ReleaseGraphics( SalGraphics* pGraphics ) override; - virtual bool SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE; + virtual bool SetSize( long nNewDX, long nNewDY ) override; virtual bool SetSizeUsingBuffer( long nNewDX, long nNewDY, const basebmp::RawMemorySharedArray &pBuffer, const bool bTopDown - ) SAL_OVERRIDE; + ) override; // SalGeometryProvider - virtual long GetWidth() const SAL_OVERRIDE { return m_aDevice.get() ? m_aDevice->getSize().getX() : 0; } - virtual long GetHeight() const SAL_OVERRIDE { return m_aDevice.get() ? m_aDevice->getSize().getY() : 0; } + virtual long GetWidth() const override { return m_aDevice.get() ? m_aDevice->getSize().getX() : 0; } + virtual long GetHeight() const override { return m_aDevice.get() ? m_aDevice->getSize().getY() : 0; } }; #endif // INCLUDED_VCL_INC_HEADLESS_SVPVD_HXX -- cgit