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 /vcl/inc/opengl/salbmp.hxx | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'vcl/inc/opengl/salbmp.hxx')
| -rw-r--r-- | vcl/inc/opengl/salbmp.hxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx index 592c84800cee..7172ca627b73 100644 --- a/vcl/inc/opengl/salbmp.hxx +++ b/vcl/inc/opengl/salbmp.hxx @@ -53,7 +53,7 @@ private: std::deque< OpenGLSalBitmapOp* > maPendingOps; void makeCurrent(); - virtual void updateChecksum() const SAL_OVERRIDE; + virtual void updateChecksum() const override; bool calcChecksumGL(OpenGLTexture& rInputTexture, ChecksumType& rChecksum) const; @@ -64,26 +64,26 @@ public: public: // SalBitmap methods - bool Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) SAL_OVERRIDE; - bool Create( const SalBitmap& rSalBmp ) SAL_OVERRIDE; - bool Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) SAL_OVERRIDE; - bool Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ) SAL_OVERRIDE; + bool Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) override; + bool Create( const SalBitmap& rSalBmp ) override; + bool Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) override; + bool Create( const SalBitmap& rSalBmp, 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; + bool bMask = false ) override; - void Destroy() SAL_OVERRIDE; + void Destroy() override; - Size GetSize() const SAL_OVERRIDE; - sal_uInt16 GetBitCount() const SAL_OVERRIDE; + Size GetSize() const override; + sal_uInt16 GetBitCount() const override; - BitmapBuffer *AcquireBuffer( BitmapAccessMode nMode ) SAL_OVERRIDE; - void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) SAL_OVERRIDE; + BitmapBuffer *AcquireBuffer( BitmapAccessMode nMode ) override; + void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) override; - bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE; + bool GetSystemData( BitmapSystemData& rData ) override; - bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE; - bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE; + bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override; + bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override; public: |