Skip to content

C
core
Kaydet (Commit) 72546d44 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin
Dosyalara gözat
Seçenekler

vcl: add SAL_OVERRIDE attributes to Windows-specific classes 

and fix a bug where SalObject::Enabled(bool) should be virtual,
introduced by my commit
b44cbb26
"new loplugin: change virtual methods to non-virtual"

Change-Id: I08cdddb36eed887ea7bd01f6260fa5fd89d12429
Reviewed-on: https://gerrit.libreoffice.org/14273Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 1845b6af
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 150 deletions
vcl/inc/salobj.hxx
Dosyayı görüntüle @ 72546d44
...@@ -51,7 +51,7 @@ public: ...@@ -51,7 +51,7 @@ public:
virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) = 0; virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) = 0;
virtual void Show( bool bVisible ) = 0; virtual void Show( bool bVisible ) = 0;
void Enable( bool /* nEnable */ ) {} virtual void Enable( bool /* nEnable */ ) {} // overridden by WinSalObject
virtual void GrabFocus() {} virtual void GrabFocus() {}
virtual void SetForwardKey( bool /* bEnable */ ) {} virtual void SetForwardKey( bool /* bEnable */ ) {}
......
vcl/inc/salprn.hxx
Dosyayı görüntüle @ 72546d44
...@@ -75,13 +75,13 @@ public: ...@@ -75,13 +75,13 @@ public:
long& rOutWidth, long& rOutHeight, long& rOutWidth, long& rOutHeight,
long& rPageOffX, long& rPageOffY, long& rPageOffX, long& rPageOffY,
long& rPageWidth, long& rPageHeight ) = 0; long& rPageWidth, long& rPageHeight ) = 0;
virtual sal_uLong GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ) = 0; virtual sal_uLong GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ) = 0;
virtual sal_uLong GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0; virtual sal_uLong GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0;
virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) = 0; virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) = 0;
// fills m_aPaperFormats and sets m_bPapersInit to true // fills m_aPaperFormats and sets m_bPapersInit to true
virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) = 0; virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) = 0;
// returns angle that a landscape page will be turned counterclockwise wrt to portrait // returns angle that a landscape page will be turned counterclockwise wrt to portrait
virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ) = 0; virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ) = 0;
}; };
class VCL_PLUGIN_PUBLIC SalPrinter class VCL_PLUGIN_PUBLIC SalPrinter
...@@ -110,7 +110,7 @@ public: ...@@ -110,7 +110,7 @@ public:
virtual bool AbortJob() = 0; virtual bool AbortJob() = 0;
virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) = 0; virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) = 0;
virtual bool EndPage() = 0; virtual bool EndPage() = 0;
virtual sal_uLong GetErrorCode() = 0; virtual sal_uLong GetErrorCode() = 0;
}; };
......
vcl/inc/win/salbmp.h
Dosyayı görüntüle @ 72546d44
...@@ -56,8 +56,8 @@ private: ...@@ -56,8 +56,8 @@ private:
sal_uInt16 mnBitCount; sal_uInt16 mnBitCount;
Gdiplus::Bitmap* ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlphaSource); Gdiplus::Bitmap* ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlphaSource);
Gdiplus::Bitmap* ImplCreateGdiPlusBitmap(); Gdiplus::Bitmap* ImplCreateGdiPlusBitmap();
public: public:
...@@ -80,22 +80,22 @@ public: ...@@ -80,22 +80,22 @@ public:
public: public:
bool Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle ); bool Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle );
virtual bool Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ); virtual bool Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) SAL_OVERRIDE;
virtual bool Create( const SalBitmap& rSalBmpImpl ); virtual bool Create( const SalBitmap& rSalBmpImpl ) SAL_OVERRIDE;
virtual bool Create( const SalBitmap& rSalBmpImpl, SalGraphics* pGraphics ); virtual bool Create( const SalBitmap& rSalBmpImpl, SalGraphics* pGraphics ) SAL_OVERRIDE;
virtual bool Create( const SalBitmap& rSalBmpImpl, sal_uInt16 nNewBitCount ); virtual bool Create( const SalBitmap& rSalBmpImpl, sal_uInt16 nNewBitCount ) SAL_OVERRIDE;
virtual bool Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas, virtual bool Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas,
Size& rSize, Size& rSize,
bool bMask = false ); bool bMask = false ) SAL_OVERRIDE;
virtual void Destroy(); virtual void Destroy() SAL_OVERRIDE;
virtual Size GetSize() const { return maSize; } virtual Size GetSize() const SAL_OVERRIDE { return maSize; }
virtual sal_uInt16 GetBitCount() const { return mnBitCount; } virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE { return mnBitCount; }
virtual BitmapBuffer* AcquireBuffer( BitmapAccessMode nMode ); virtual BitmapBuffer* AcquireBuffer( BitmapAccessMode nMode ) SAL_OVERRIDE;
virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ); virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) SAL_OVERRIDE;
virtual bool GetSystemData( BitmapSystemData& rData ); virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE; virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
virtual bool Erase( const Color& rFillColor ) SAL_OVERRIDE; virtual bool Erase( const Color& rFillColor ) SAL_OVERRIDE;
......
vcl/inc/win/saldata.hxx
Dosyayı görüntüle @ 72546d44
...@@ -107,16 +107,16 @@ public: ...@@ -107,16 +107,16 @@ public:
sal_uInt16 mnStockBrushCount; // count of static brushes sal_uInt16 mnStockBrushCount; // count of static brushes
WPARAM mnSalObjWantKeyEvt; // KeyEvent that should be processed by SalObj-Hook WPARAM mnSalObjWantKeyEvt; // KeyEvent that should be processed by SalObj-Hook
BYTE mnCacheDCInUse; // count of CacheDC in use BYTE mnCacheDCInUse; // count of CacheDC in use
bool mbObjClassInit; // is SALOBJECTCLASS initialised bool mbObjClassInit; // is SALOBJECTCLASS initialised
bool mbInPalChange; // is in WM_QUERYNEWPALETTE bool mbInPalChange; // is in WM_QUERYNEWPALETTE
DWORD mnAppThreadId; // Id from Applikation-Thread DWORD mnAppThreadId; // Id from Applikation-Thread
BOOL mbScrSvrEnabled; // ScreenSaver enabled BOOL mbScrSvrEnabled; // ScreenSaver enabled
int mnSageStatus; // status of Sage-DLL (DISABLE_AGENT == does not exist) int mnSageStatus; // status of Sage-DLL (DISABLE_AGENT == does not exist)
SysAgt_Enable_PROC mpSageEnableProc; // funktion to deactivate the system agent SysAgt_Enable_PROC mpSageEnableProc; // funktion to deactivate the system agent
SalIcon* mpFirstIcon; // icon cache, points to first icon, NULL if none SalIcon* mpFirstIcon; // icon cache, points to first icon, NULL if none
TempFontItem* mpTempFontItem; TempFontItem* mpTempFontItem;
bool mbThemeChanged; // true if visual theme was changed: throw away theme handles bool mbThemeChanged; // true if visual theme was changed: throw away theme handles
bool mbThemeMenuSupport; bool mbThemeMenuSupport;
// for GdiPlus GdiplusStartup/GdiplusShutdown // for GdiPlus GdiplusStartup/GdiplusShutdown
ULONG_PTR gdiplusToken; ULONG_PTR gdiplusToken;
......
vcl/inc/win/salframe.h
Dosyayı görüntüle @ 72546d44
...@@ -87,52 +87,52 @@ public: ...@@ -87,52 +87,52 @@ public:
WinSalFrame(); WinSalFrame();
virtual ~WinSalFrame(); virtual ~WinSalFrame();
virtual SalGraphics* AcquireGraphics(); virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
virtual void ReleaseGraphics( SalGraphics* pGraphics ); virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
virtual bool PostEvent( void* pData ); virtual bool PostEvent( void* pData ) SAL_OVERRIDE;
virtual void SetTitle( const OUString& rTitle ); virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
virtual void SetIcon( sal_uInt16 nIcon ); virtual void SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
virtual void SetMenu( SalMenu* pSalMenu ); virtual void SetMenu( SalMenu* pSalMenu ) SAL_OVERRIDE;
virtual void DrawMenuBar(); virtual void DrawMenuBar() SAL_OVERRIDE;
virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ); virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) SAL_OVERRIDE;
virtual void Show( bool bVisible, bool bNoActivate = FALSE ); virtual void Show( bool bVisible, bool bNoActivate = FALSE ) SAL_OVERRIDE;
virtual void SetMinClientSize( long nWidth, long nHeight ); virtual void SetMinClientSize( long nWidth, long nHeight ) SAL_OVERRIDE;
virtual void SetMaxClientSize( long nWidth, long nHeight ); virtual void SetMaxClientSize( long nWidth, long nHeight ) SAL_OVERRIDE;
virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) SAL_OVERRIDE;
virtual void GetClientSize( long& rWidth, long& rHeight ); virtual void GetClientSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
virtual void GetWorkArea( Rectangle& rRect ); virtual void GetWorkArea( Rectangle& rRect ) SAL_OVERRIDE;
virtual SalFrame* GetParent() const; virtual SalFrame* GetParent() const SAL_OVERRIDE;
virtual void SetWindowState( const SalFrameState* pState ); virtual void SetWindowState( const SalFrameState* pState ) SAL_OVERRIDE;
virtual bool GetWindowState( SalFrameState* pState ); virtual bool GetWindowState( SalFrameState* pState ) SAL_OVERRIDE;
virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ); virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) SAL_OVERRIDE;
virtual void StartPresentation( bool bStart ); virtual void StartPresentation( bool bStart ) SAL_OVERRIDE;
virtual void SetAlwaysOnTop( bool bOnTop ); virtual void SetAlwaysOnTop( bool bOnTop ) SAL_OVERRIDE;
virtual void ToTop( sal_uInt16 nFlags ); virtual void ToTop( sal_uInt16 nFlags ) SAL_OVERRIDE;
virtual void SetPointer( PointerStyle ePointerStyle ); virtual void SetPointer( PointerStyle ePointerStyle ) SAL_OVERRIDE;
virtual void CaptureMouse( bool bMouse ); virtual void CaptureMouse( bool bMouse ) SAL_OVERRIDE;
virtual void SetPointerPos( long nX, long nY ); virtual void SetPointerPos( long nX, long nY ) SAL_OVERRIDE;
using SalFrame::Flush; using SalFrame::Flush;
virtual void Flush(); virtual void Flush() SAL_OVERRIDE;
virtual void Sync(); virtual void Sync() SAL_OVERRIDE;
virtual void SetInputContext( SalInputContext* pContext ); virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
virtual void EndExtTextInput( sal_uInt16 nFlags ); virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE;
virtual OUString GetKeyName( sal_uInt16 nKeyCode ); virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ); virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE;
virtual LanguageType GetInputLanguage(); virtual LanguageType GetInputLanguage() SAL_OVERRIDE;
virtual void UpdateSettings( AllSettings& rSettings ); virtual void UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE;
virtual void Beep(); virtual void Beep() SAL_OVERRIDE;
virtual const SystemEnvData* GetSystemData() const; virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE;
virtual SalPointerState GetPointerState(); virtual SalPointerState GetPointerState() SAL_OVERRIDE;
virtual KeyIndicatorState GetIndicatorState(); virtual KeyIndicatorState GetIndicatorState() SAL_OVERRIDE;
virtual void SimulateKeyPress( sal_uInt16 nKeyCode ); virtual void SimulateKeyPress( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
virtual void SetParent( SalFrame* pNewParent ); virtual void SetParent( SalFrame* pNewParent ) SAL_OVERRIDE;
virtual bool SetPluginParent( SystemParentData* pNewParent ); virtual bool SetPluginParent( SystemParentData* pNewParent ) SAL_OVERRIDE;
virtual void SetScreenNumber( unsigned int ); virtual void SetScreenNumber( unsigned int ) SAL_OVERRIDE;
virtual void SetApplicationID( const OUString &rApplicationID ); virtual void SetApplicationID( const OUString &rApplicationID ) SAL_OVERRIDE;
virtual void ResetClipRegion(); virtual void ResetClipRegion() SAL_OVERRIDE;
virtual void BeginSetClipRegion( sal_uIntPtr nRects ); virtual void BeginSetClipRegion( sal_uIntPtr nRects ) SAL_OVERRIDE;
virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
virtual void EndSetClipRegion(); virtual void EndSetClipRegion() SAL_OVERRIDE;
}; };
void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect ); void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect );
......
vcl/inc/win/salgdi.h
Dosyayı görüntüle @ 72546d44
This diff is collapsed.
vcl/inc/win/salinst.h
Dosyayı görüntüle @ 72546d44
...@@ -36,41 +36,41 @@ public: ...@@ -36,41 +36,41 @@ public:
WinSalInstance(); WinSalInstance();
virtual ~WinSalInstance(); virtual ~WinSalInstance();
virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ); virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ) SAL_OVERRIDE;
virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ); virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ) SAL_OVERRIDE;
virtual void DestroyFrame( SalFrame* pFrame ); virtual void DestroyFrame( SalFrame* pFrame ) SAL_OVERRIDE;
virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ); virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) SAL_OVERRIDE;
virtual void DestroyObject( SalObject* pObject ); virtual void DestroyObject( SalObject* pObject ) SAL_OVERRIDE;
virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics,
long nDX, long nDY, long nDX, long nDY,
sal_uInt16 nBitCount, const SystemGraphicsData *pData ); sal_uInt16 nBitCount, const SystemGraphicsData *pData ) SAL_OVERRIDE;
virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
ImplJobSetup* pSetupData ); ImplJobSetup* pSetupData ) SAL_OVERRIDE;
virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ); virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ) SAL_OVERRIDE;
virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ); virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ) SAL_OVERRIDE;
virtual void DestroyPrinter( SalPrinter* pPrinter ); virtual void DestroyPrinter( SalPrinter* pPrinter ) SAL_OVERRIDE;
virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ); virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ) SAL_OVERRIDE;
virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ); virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) SAL_OVERRIDE;
virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ); virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) SAL_OVERRIDE;
virtual OUString GetDefaultPrinter(); virtual OUString GetDefaultPrinter() SAL_OVERRIDE;
virtual SalTimer* CreateSalTimer(); virtual SalTimer* CreateSalTimer() SAL_OVERRIDE;
virtual SalI18NImeStatus* CreateI18NImeStatus(); virtual SalI18NImeStatus* CreateI18NImeStatus() SAL_OVERRIDE;
virtual SalSystem* CreateSalSystem(); virtual SalSystem* CreateSalSystem() SAL_OVERRIDE;
virtual SalBitmap* CreateSalBitmap(); virtual SalBitmap* CreateSalBitmap() SAL_OVERRIDE;
virtual comphelper::SolarMutex* GetYieldMutex(); virtual comphelper::SolarMutex* GetYieldMutex() SAL_OVERRIDE;
virtual sal_uIntPtr ReleaseYieldMutex(); virtual sal_uIntPtr ReleaseYieldMutex() SAL_OVERRIDE;
virtual void AcquireYieldMutex( sal_uIntPtr nCount ); virtual void AcquireYieldMutex( sal_uIntPtr nCount ) SAL_OVERRIDE;
virtual bool CheckYieldMutex(); virtual bool CheckYieldMutex() SAL_OVERRIDE;
virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ); virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ) SAL_OVERRIDE;
virtual bool AnyInput( VclInputFlags nType ); virtual bool AnyInput( VclInputFlags nType ) SAL_OVERRIDE;
virtual SalMenu* CreateMenu( bool bMenuBar, Menu* ); virtual SalMenu* CreateMenu( bool bMenuBar, Menu* ) SAL_OVERRIDE;
virtual void DestroyMenu( SalMenu* ); virtual void DestroyMenu( SalMenu* ) SAL_OVERRIDE;
virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ); virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ) SAL_OVERRIDE;
virtual void DestroyMenuItem( SalMenuItem* ); virtual void DestroyMenuItem( SalMenuItem* ) SAL_OVERRIDE;
virtual SalSession* CreateSalSession(); virtual SalSession* CreateSalSession() SAL_OVERRIDE;
virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ); virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) SAL_OVERRIDE;
virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService); virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) SAL_OVERRIDE;
static int WorkaroundExceptionHandlingInUSER32Lib(int nExcept, LPEXCEPTION_POINTERS pExceptionInfo); static int WorkaroundExceptionHandlingInUSER32Lib(int nExcept, LPEXCEPTION_POINTERS pExceptionInfo);
}; };
......
vcl/inc/win/salmenu.h
Dosyayı görüntüle @ 72546d44
...@@ -28,19 +28,19 @@ class WinSalMenu : public SalMenu ...@@ -28,19 +28,19 @@ class WinSalMenu : public SalMenu
public: public:
WinSalMenu(); WinSalMenu();
virtual ~WinSalMenu(); virtual ~WinSalMenu();
virtual bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars virtual bool VisibleMenuBar() SAL_OVERRIDE; // must return TRUE to actually DISPLAY native menu bars
// otherwise only menu messages are processed (eg, OLE on Windows) // otherwise only menu messages are processed (eg, OLE on Windows)
virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ); virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) SAL_OVERRIDE;
virtual void RemoveItem( unsigned nPos ); virtual void RemoveItem( unsigned nPos ) SAL_OVERRIDE;
virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ); virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) SAL_OVERRIDE;
virtual void SetFrame( const SalFrame* pFrame ); virtual void SetFrame( const SalFrame* pFrame ) SAL_OVERRIDE;
virtual void CheckItem( unsigned nPos, bool bCheck ); virtual void CheckItem( unsigned nPos, bool bCheck ) SAL_OVERRIDE;
virtual void EnableItem( unsigned nPos, bool bEnable ); virtual void EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE;
virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ); virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) SAL_OVERRIDE;
virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ); virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ) SAL_OVERRIDE;
virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ); virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE;
virtual void GetSystemMenuData( SystemMenuData* pData ); virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE;
HMENU mhMenu; // the menu handle HMENU mhMenu; // the menu handle
bool mbMenuBar; // true for menu bars bool mbMenuBar; // true for menu bars
......
vcl/inc/win/salobj.h
Dosyayı görüntüle @ 72546d44
...@@ -30,26 +30,26 @@ public: ...@@ -30,26 +30,26 @@ public:
HWND mhWnd; // Window handle HWND mhWnd; // Window handle
HWND mhWndChild; // Child Window handle HWND mhWndChild; // Child Window handle
HWND mhLastFocusWnd; // Child-Window, welches als letztes den Focus hatte HWND mhLastFocusWnd; // Child-Window, welches als letztes den Focus hatte
SystemEnvData maSysData; // SystemEnvData SystemEnvData maSysData; // SystemEnvData
RGNDATA* mpClipRgnData; // ClipRegion-Data RGNDATA* mpClipRgnData; // ClipRegion-Data
RGNDATA* mpStdClipRgnData; // Cache Standard-ClipRegion-Data RGNDATA* mpStdClipRgnData; // Cache Standard-ClipRegion-Data
RECT* mpNextClipRect; // Naechstes ClipRegion-Rect RECT* mpNextClipRect; // Naechstes ClipRegion-Rect
bool mbFirstClipRect; // Flag for first cliprect to insert bool mbFirstClipRect; // Flag for first cliprect to insert
WinSalObject* mpNextObject; // pointer to next object WinSalObject* mpNextObject; // pointer to next object
WinSalObject(); WinSalObject();
virtual ~WinSalObject(); virtual ~WinSalObject();
virtual void ResetClipRegion(); virtual void ResetClipRegion() SAL_OVERRIDE;
virtual sal_uInt16 GetClipRegionType(); virtual sal_uInt16 GetClipRegionType() SAL_OVERRIDE;
virtual void BeginSetClipRegion( sal_uIntPtr nRects ); virtual void BeginSetClipRegion( sal_uIntPtr nRects ) SAL_OVERRIDE;
virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight) SAL_OVERRIDE;
virtual void EndSetClipRegion(); virtual void EndSetClipRegion() SAL_OVERRIDE;
virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
virtual void Show( bool bVisible ); virtual void Show( bool bVisible ) SAL_OVERRIDE;
virtual void Enable( bool nEnable ); virtual void Enable( bool nEnable ) SAL_OVERRIDE;
virtual void GrabFocus(); virtual void GrabFocus() SAL_OVERRIDE;
virtual const SystemEnvData* GetSystemData() const; virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE;
}; };
#endif // INCLUDED_VCL_INC_WIN_SALOBJ_H #endif // INCLUDED_VCL_INC_WIN_SALOBJ_H
......
vcl/inc/win/salprn.h
Dosyayı görüntüle @ 72546d44
...@@ -55,20 +55,20 @@ public: ...@@ -55,20 +55,20 @@ public:
WinSalInfoPrinter(); WinSalInfoPrinter();
virtual ~WinSalInfoPrinter(); virtual ~WinSalInfoPrinter();
virtual SalGraphics* AcquireGraphics(); virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
virtual void ReleaseGraphics( SalGraphics* pGraphics ); virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) SAL_OVERRIDE;
virtual bool SetPrinterData( ImplJobSetup* pSetupData ); virtual bool SetPrinterData( ImplJobSetup* pSetupData ) SAL_OVERRIDE;
virtual bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ); virtual bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ) SAL_OVERRIDE;
virtual void GetPageInfo( const ImplJobSetup* pSetupData, virtual void GetPageInfo( const ImplJobSetup* pSetupData,
long& rOutWidth, long& rOutHeight, long& rOutWidth, long& rOutHeight,
long& rPageOffX, long& rPageOffY, long& rPageOffX, long& rPageOffY,
long& rPageWidth, long& rPageHeight ); long& rPageWidth, long& rPageHeight ) SAL_OVERRIDE;
virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ); virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ) SAL_OVERRIDE;
virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData ); virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData ) SAL_OVERRIDE;
virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ); virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ) SAL_OVERRIDE;
virtual void InitPaperFormats( const ImplJobSetup* pSetupData ); virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) SAL_OVERRIDE;
virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ); virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ) SAL_OVERRIDE;
}; };
// - WinSalPrinter - // - WinSalPrinter -
...@@ -98,12 +98,12 @@ public: ...@@ -98,12 +98,12 @@ public:
sal_uIntPtr nCopies, sal_uIntPtr nCopies,
bool bCollate, bool bCollate,
bool bDirect, bool bDirect,
ImplJobSetup* pSetupData ); ImplJobSetup* pSetupData ) SAL_OVERRIDE;
virtual bool EndJob(); virtual bool EndJob() SAL_OVERRIDE;
virtual bool AbortJob(); virtual bool AbortJob() SAL_OVERRIDE;
virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ); virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) SAL_OVERRIDE;
virtual bool EndPage(); virtual bool EndPage() SAL_OVERRIDE;
virtual sal_uIntPtr GetErrorCode(); virtual sal_uIntPtr GetErrorCode() SAL_OVERRIDE;
void markInvalid(); void markInvalid();
bool isValid() const { return mbValid; } bool isValid() const { return mbValid; }
......
vcl/inc/win/salsys.h
Dosyayı görüntüle @ 72546d44
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
class WinSalSystem : public SalSystem class WinSalSystem : public SalSystem
{ {
public: public:
struct DisplayMonitor struct DisplayMonitor
{ {
OUString m_aName; OUString m_aName;
...@@ -48,7 +48,7 @@ class WinSalSystem : public SalSystem ...@@ -48,7 +48,7 @@ class WinSalSystem : public SalSystem
} }
~DisplayMonitor() {} ~DisplayMonitor() {}
}; };
private: private:
std::vector<DisplayMonitor> m_aMonitors; std::vector<DisplayMonitor> m_aMonitors;
std::map<OUString, unsigned int> m_aDeviceNameToMonitor; std::map<OUString, unsigned int> m_aDeviceNameToMonitor;
unsigned int m_nPrimary; unsigned int m_nPrimary;
...@@ -56,14 +56,14 @@ public: ...@@ -56,14 +56,14 @@ public:
WinSalSystem() : m_nPrimary( 0 ) {} WinSalSystem() : m_nPrimary( 0 ) {}
virtual ~WinSalSystem(); virtual ~WinSalSystem();
virtual unsigned int GetDisplayScreenCount(); virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE;
virtual unsigned int GetDisplayBuiltInScreen(); virtual unsigned int GetDisplayBuiltInScreen() SAL_OVERRIDE;
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ); virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) SAL_OVERRIDE;
virtual OUString GetDisplayScreenName( unsigned int nScreen ); virtual OUString GetDisplayScreenName( unsigned int nScreen ) SAL_OVERRIDE;
virtual int ShowNativeMessageBox( const OUString& rTitle, virtual int ShowNativeMessageBox( const OUString& rTitle,
const OUString& rMessage, const OUString& rMessage,
int nButtonCombination, int nButtonCombination,
int nDefaultButton, bool bUseResources); int nDefaultButton, bool bUseResources) SAL_OVERRIDE;
bool initMonitors(); bool initMonitors();
// discards monitorinfo; used by WM_DISPLAYCHANGED handler // discards monitorinfo; used by WM_DISPLAYCHANGED handler
void clearMonitors(); void clearMonitors();
......
vcl/inc/win/salvd.h
Dosyayı görüntüle @ 72546d44
...@@ -49,9 +49,9 @@ public: ...@@ -49,9 +49,9 @@ public:
WinSalVirtualDevice(); WinSalVirtualDevice();
virtual ~WinSalVirtualDevice(); virtual ~WinSalVirtualDevice();
virtual SalGraphics* AcquireGraphics(); virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
virtual void ReleaseGraphics( SalGraphics* pGraphics ); virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
virtual bool SetSize( long nNewDX, long nNewDY ); virtual bool SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE;
static HBITMAP ImplCreateVirDevBitmap(HDC hDC, long nDX, long nDY, sal_uInt16 nBitCount, void **ppDummy); static HBITMAP ImplCreateVirDevBitmap(HDC hDC, long nDX, long nDY, sal_uInt16 nBitCount, void **ppDummy);
......
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