diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
tree | a70f4957c454b443520cbf91250c41d9eea80017 /vcl/inc/headless/svpframe.hxx | |
parent | 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff) |
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'vcl/inc/headless/svpframe.hxx')
-rw-r--r-- | vcl/inc/headless/svpframe.hxx | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index b05f71e71078..6a14adf6e1d2 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -76,62 +76,62 @@ public: #endif // SalFrame - virtual SalGraphics* AcquireGraphics(); - virtual void ReleaseGraphics( SalGraphics* pGraphics ); - - virtual bool PostEvent( void* pData ); - - virtual void SetTitle( const OUString& rTitle ); - virtual void SetIcon( sal_uInt16 nIcon ); - virtual void SetMenu( SalMenu* pMenu ); - virtual void DrawMenuBar(); - - virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ); - virtual void Show( bool bVisible, bool bNoActivate = false ); - virtual void Enable( bool bEnable ); - virtual void SetMinClientSize( long nWidth, long nHeight ); - virtual void SetMaxClientSize( long nWidth, long nHeight ); - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ); - virtual void GetClientSize( long& rWidth, long& rHeight ); - virtual void GetWorkArea( Rectangle& rRect ); - virtual SalFrame* GetParent() const; - virtual void SetWindowState( const SalFrameState* pState ); - virtual bool GetWindowState( SalFrameState* pState ); - virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ); - virtual void StartPresentation( bool bStart ); - virtual void SetAlwaysOnTop( bool bOnTop ); - virtual void ToTop( sal_uInt16 nFlags ); - virtual void SetPointer( PointerStyle ePointerStyle ); - virtual void CaptureMouse( bool bMouse ); - virtual void SetPointerPos( long nX, long nY ); + virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE; + virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE; + + virtual bool PostEvent( void* 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 Enable( bool bEnable ) 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; using SalFrame::Flush; - virtual void Flush(); - virtual void Sync(); - virtual void SetInputContext( SalInputContext* pContext ); - virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual OUString GetKeyName( sal_uInt16 nKeyCode ); - virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); - virtual LanguageType GetInputLanguage(); - virtual void UpdateSettings( AllSettings& rSettings ); - virtual void Beep(); - virtual const SystemEnvData* GetSystemData() const; - virtual SalPointerState GetPointerState(); - virtual SalIndicatorState GetIndicatorState(); - virtual void SimulateKeyPress( sal_uInt16 nKeyCode ); - virtual void SetParent( SalFrame* pNewParent ); - virtual bool SetPluginParent( SystemParentData* pNewParent ); - virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( sal_uLong nRects ); - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); - virtual void EndSetClipRegion(); + virtual void Flush() SAL_OVERRIDE; + virtual void Sync() SAL_OVERRIDE; + virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE; + virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE; + virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE; + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, 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 SalIndicatorState 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; // If enabled we can get damage notifications for regions immediately rendered to ... virtual void enableDamageTracker( bool bOn = true ); virtual void damaged( const basegfx::B2IBox& /* rDamageRect */) {} /*TODO: functional implementation */ - virtual void SetScreenNumber( unsigned int nScreen ) { (void)nScreen; } - virtual void SetApplicationID(const OUString &rApplicationID) { (void) rApplicationID; } + virtual void SetScreenNumber( unsigned int nScreen ) SAL_OVERRIDE { (void)nScreen; } + virtual void SetApplicationID(const OUString &rApplicationID) SAL_OVERRIDE { (void) rApplicationID; } bool IsVisible() { return m_bVisible; } static SvpSalFrame* GetFocusFrame() { return s_pFocusFrame; } |