diff options
author | Noel Grandin <noel@peralex.com> | 2015-02-02 08:58:20 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-02-02 09:51:36 +0000 |
commit | 72546d4492137aadabd46e8c7fffcdbb07a3e6c5 (patch) | |
tree | 25f066a28e4dcfedfe703f1579373d739092a823 /vcl/inc/win/salinst.h | |
parent | 1845b6af3991ca5521eef48aafe1d0489e2ff8f6 (diff) |
vcl: add SAL_OVERRIDE attributes to Windows-specific classes
and fix a bug where SalObject::Enabled(bool) should be virtual,
introduced by my commit
b44cbb26efe1d0b0950b1e1613e131b506dc3876
"new loplugin: change virtual methods to non-virtual"
Change-Id: I08cdddb36eed887ea7bd01f6260fa5fd89d12429
Reviewed-on: https://gerrit.libreoffice.org/14273
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/inc/win/salinst.h')
-rw-r--r-- | vcl/inc/win/salinst.h | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h index 15237a205e59..fa660497dc6d 100644 --- a/vcl/inc/win/salinst.h +++ b/vcl/inc/win/salinst.h @@ -36,41 +36,41 @@ public: WinSalInstance(); virtual ~WinSalInstance(); - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ); - virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ); - virtual void DestroyFrame( SalFrame* pFrame ); - virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ); - virtual void DestroyObject( SalObject* pObject ); + virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ) SAL_OVERRIDE; + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ) SAL_OVERRIDE; + virtual void DestroyFrame( SalFrame* pFrame ) SAL_OVERRIDE; + virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) SAL_OVERRIDE; + virtual void DestroyObject( SalObject* pObject ) SAL_OVERRIDE; virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, long nDX, long nDY, - sal_uInt16 nBitCount, const SystemGraphicsData *pData ); + sal_uInt16 nBitCount, const SystemGraphicsData *pData ) SAL_OVERRIDE; virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, - ImplJobSetup* pSetupData ); - virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ); - virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ); - virtual void DestroyPrinter( SalPrinter* pPrinter ); - virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ); - virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ); - virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ); - virtual OUString GetDefaultPrinter(); - virtual SalTimer* CreateSalTimer(); - virtual SalI18NImeStatus* CreateI18NImeStatus(); - virtual SalSystem* CreateSalSystem(); - virtual SalBitmap* CreateSalBitmap(); - virtual comphelper::SolarMutex* GetYieldMutex(); - virtual sal_uIntPtr ReleaseYieldMutex(); - virtual void AcquireYieldMutex( sal_uIntPtr nCount ); - virtual bool CheckYieldMutex(); + 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; + 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 SalTimer* CreateSalTimer() SAL_OVERRIDE; + virtual SalI18NImeStatus* CreateI18NImeStatus() SAL_OVERRIDE; + virtual SalSystem* CreateSalSystem() SAL_OVERRIDE; + virtual SalBitmap* CreateSalBitmap() SAL_OVERRIDE; + virtual comphelper::SolarMutex* GetYieldMutex() SAL_OVERRIDE; + virtual sal_uIntPtr ReleaseYieldMutex() SAL_OVERRIDE; + virtual void AcquireYieldMutex( sal_uIntPtr nCount ) SAL_OVERRIDE; + virtual bool CheckYieldMutex() SAL_OVERRIDE; - virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ); - virtual bool AnyInput( VclInputFlags nType ); - virtual SalMenu* CreateMenu( bool bMenuBar, Menu* ); - virtual void DestroyMenu( SalMenu* ); - virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ); - virtual void DestroyMenuItem( SalMenuItem* ); - virtual SalSession* CreateSalSession(); - virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ); - virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService); + virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ) SAL_OVERRIDE; + virtual bool AnyInput( VclInputFlags nType ) SAL_OVERRIDE; + virtual SalMenu* CreateMenu( bool bMenuBar, Menu* ) SAL_OVERRIDE; + virtual void DestroyMenu( SalMenu* ) SAL_OVERRIDE; + virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ) SAL_OVERRIDE; + virtual void DestroyMenuItem( SalMenuItem* ) SAL_OVERRIDE; + virtual SalSession* CreateSalSession() SAL_OVERRIDE; + virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) SAL_OVERRIDE; + virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) SAL_OVERRIDE; static int WorkaroundExceptionHandlingInUSER32Lib(int nExcept, LPEXCEPTION_POINTERS pExceptionInfo); }; |