Kaydet (Commit) 8e4560e7 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

SAL_OVERRIDE, Mac OS X vcl redux

Change-Id: I25f2a79efff7b77651f7cd6c658269e9411c3bdd
üst c62d31f7
......@@ -33,8 +33,8 @@ class AquaSalTimer : public SalTimer
AquaSalTimer();
virtual ~AquaSalTimer();
void Start( sal_uLong nMS );
void Stop();
void Start( sal_uLong nMS ) SAL_OVERRIDE;
void Stop() SAL_OVERRIDE;
static void handleStartTimerEvent( NSEvent* pEvent );
......
......@@ -63,23 +63,23 @@ public:
public:
// SalBitmap methods
bool Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal );
bool Create( const SalBitmap& rSalBmp );
bool Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics );
bool Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount );
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;
virtual bool Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas,
Size& rSize,
bool bMask = false );
bool bMask = false ) SAL_OVERRIDE;
void Destroy();
void Destroy() SAL_OVERRIDE;
Size GetSize() const;
sal_uInt16 GetBitCount() const;
Size GetSize() const SAL_OVERRIDE;
sal_uInt16 GetBitCount() const SAL_OVERRIDE;
BitmapBuffer *AcquireBuffer( bool bReadOnly );
void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
BitmapBuffer *AcquireBuffer( bool bReadOnly ) SAL_OVERRIDE;
void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) SAL_OVERRIDE;
bool GetSystemData( BitmapSystemData& rData );
bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
private:
// quartz helper
......
This diff is collapsed.
......@@ -58,10 +58,10 @@ public:
AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData );
virtual ~AquaSalVirtualDevice();
virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
virtual bool SetSize( long nNewDX, long nNewDY );
virtual void GetSize( long& rWidth, long& rHeight );
virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
virtual bool SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE;
virtual void GetSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
};
#endif // INCLUDED_VCL_INC_OSX_SALVD_H
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment