summaryrefslogtreecommitdiff
path: root/vcl/inc/win
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc/win')
-rw-r--r--vcl/inc/win/salbmp.h26
-rw-r--r--vcl/inc/win/salframe.h90
-rw-r--r--vcl/inc/win/salgdi.h136
-rw-r--r--vcl/inc/win/salinst.h62
-rw-r--r--vcl/inc/win/salmenu.h22
-rw-r--r--vcl/inc/win/salobj.h20
-rw-r--r--vcl/inc/win/salprn.h32
-rw-r--r--vcl/inc/win/salsys.h8
-rw-r--r--vcl/inc/win/saltimer.h4
-rw-r--r--vcl/inc/win/salvd.h10
10 files changed, 205 insertions, 205 deletions
diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h
index 05df37c43b82..1fad90491fdf 100644
--- a/vcl/inc/win/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -80,25 +80,25 @@ public:
public:
bool Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle );
- virtual bool Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) SAL_OVERRIDE;
- virtual bool Create( const SalBitmap& rSalBmpImpl ) SAL_OVERRIDE;
- virtual bool Create( const SalBitmap& rSalBmpImpl, SalGraphics* pGraphics ) SAL_OVERRIDE;
- virtual bool Create( const SalBitmap& rSalBmpImpl, sal_uInt16 nNewBitCount ) SAL_OVERRIDE;
+ virtual bool Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) override;
+ virtual bool Create( const SalBitmap& rSalBmpImpl ) override;
+ virtual bool Create( const SalBitmap& rSalBmpImpl, SalGraphics* pGraphics ) override;
+ virtual bool Create( const SalBitmap& rSalBmpImpl, 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;
- virtual void Destroy() SAL_OVERRIDE;
+ virtual void Destroy() override;
- virtual Size GetSize() const SAL_OVERRIDE { return maSize; }
- virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE { return mnBitCount; }
+ virtual Size GetSize() const override { return maSize; }
+ virtual sal_uInt16 GetBitCount() const override { return mnBitCount; }
- virtual BitmapBuffer* AcquireBuffer( BitmapAccessMode nMode ) SAL_OVERRIDE;
- virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) SAL_OVERRIDE;
- virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
+ virtual BitmapBuffer* AcquireBuffer( BitmapAccessMode nMode ) override;
+ virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) override;
+ virtual bool GetSystemData( BitmapSystemData& rData ) override;
- virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE;
- virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE;
+ virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override;
+ virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override;
};
#endif // INCLUDED_VCL_INC_WIN_SALBMP_H
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 68a2337657f1..27fa46e5c3fb 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -87,52 +87,52 @@ public:
WinSalFrame();
virtual ~WinSalFrame();
- virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
- virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
- virtual bool PostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
- virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
- virtual void SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
- virtual void SetMenu( SalMenu* pSalMenu ) 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 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;
+ virtual SalGraphics* AcquireGraphics() override;
+ virtual void ReleaseGraphics( SalGraphics* pGraphics ) override;
+ virtual bool PostEvent(ImplSVEvent* pData) override;
+ virtual void SetTitle( const OUString& rTitle ) override;
+ virtual void SetIcon( sal_uInt16 nIcon ) override;
+ virtual void SetMenu( SalMenu* pSalMenu ) override;
+ virtual void DrawMenuBar() override;
+ virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) override;
+ virtual void Show( bool bVisible, bool bNoActivate = FALSE ) override;
+ virtual void SetMinClientSize( long nWidth, long nHeight ) override;
+ virtual void SetMaxClientSize( long nWidth, long nHeight ) override;
+ virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
+ virtual void GetClientSize( long& rWidth, long& rHeight ) override;
+ virtual void GetWorkArea( Rectangle& rRect ) override;
+ virtual SalFrame* GetParent() const override;
+ virtual void SetWindowState( const SalFrameState* pState ) override;
+ virtual bool GetWindowState( SalFrameState* pState ) override;
+ virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) override;
+ virtual void StartPresentation( bool bStart ) override;
+ virtual void SetAlwaysOnTop( bool bOnTop ) override;
+ virtual void ToTop( sal_uInt16 nFlags ) override;
+ virtual void SetPointer( PointerStyle ePointerStyle ) override;
+ virtual void CaptureMouse( bool bMouse ) override;
+ virtual void SetPointerPos( long nX, long nY ) override;
using SalFrame::Flush;
- virtual void Flush() SAL_OVERRIDE;
- virtual void Sync() SAL_OVERRIDE;
- virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
- virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) SAL_OVERRIDE;
- virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
- virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::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 KeyIndicatorState 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 SetScreenNumber( unsigned int ) SAL_OVERRIDE;
- virtual void SetApplicationID( const OUString &rApplicationID ) SAL_OVERRIDE;
- virtual void ResetClipRegion() SAL_OVERRIDE;
- virtual void BeginSetClipRegion( sal_uIntPtr nRects ) SAL_OVERRIDE;
- virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
- virtual void EndSetClipRegion() SAL_OVERRIDE;
+ virtual void Flush() override;
+ virtual void Sync() override;
+ virtual void SetInputContext( SalInputContext* pContext ) override;
+ virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) override;
+ virtual OUString GetKeyName( sal_uInt16 nKeyCode ) override;
+ virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) override;
+ virtual LanguageType GetInputLanguage() override;
+ virtual void UpdateSettings( AllSettings& rSettings ) override;
+ virtual void Beep() override;
+ virtual const SystemEnvData* GetSystemData() const override;
+ virtual SalPointerState GetPointerState() override;
+ virtual KeyIndicatorState GetIndicatorState() override;
+ virtual void SimulateKeyPress( sal_uInt16 nKeyCode ) override;
+ virtual void SetParent( SalFrame* pNewParent ) override;
+ virtual bool SetPluginParent( SystemParentData* pNewParent ) override;
+ virtual void SetScreenNumber( unsigned int ) override;
+ virtual void SetApplicationID( const OUString &rApplicationID ) override;
+ virtual void ResetClipRegion() override;
+ virtual void BeginSetClipRegion( sal_uIntPtr nRects ) override;
+ virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
+ virtual void EndSetClipRegion() override;
};
void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect );
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 01cb43235d46..b7697d6843f4 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -77,9 +77,9 @@ public:
BYTE nPitchAndFamily );
virtual ~ImplWinFontData();
- virtual PhysicalFontFace* Clone() const SAL_OVERRIDE;
- virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE;
- virtual sal_IntPtr GetFontId() const SAL_OVERRIDE;
+ virtual PhysicalFontFace* Clone() const override;
+ virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const override;
+ virtual sal_IntPtr GetFontId() const override;
void SetFontId( sal_IntPtr nId ) { mnId = nId; }
void UpdateFromHDC( HDC ) const;
@@ -247,7 +247,7 @@ public:
SalGeometryProvider *pProvider);
virtual ~WinSalGraphics();
- SalGraphicsImpl* GetImpl() const SAL_OVERRIDE;
+ SalGraphicsImpl* GetImpl() const override;
bool isPrinter() const;
bool isVirtualDevice() const;
bool isWindow() const;
@@ -256,123 +256,123 @@ public:
void setHWND(HWND hWnd);
protected:
- virtual bool setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
+ virtual bool setClipRegion( const vcl::Region& ) override;
// draw --> LineColor and FillColor and RasterOp and ClipRegion
- virtual void drawPixel( long nX, long nY ) SAL_OVERRIDE;
- virtual void drawPixel( long nX, long nY, SalColor nSalColor ) SAL_OVERRIDE;
- virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) SAL_OVERRIDE;
- virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
- virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
- virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
- virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) SAL_OVERRIDE;
- virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) SAL_OVERRIDE;
+ virtual void drawPixel( long nX, long nY ) override;
+ virtual void drawPixel( long nX, long nY, SalColor nSalColor ) override;
+ virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) override;
+ virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) override;
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
+ virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) override;
+ virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) override;
virtual bool drawPolyLine(
const ::basegfx::B2DPolygon&,
double fTransparency,
const ::basegfx::B2DVector& rLineWidth,
basegfx::B2DLineJoin,
- com::sun::star::drawing::LineCap) SAL_OVERRIDE;
- virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
- virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
- virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ) SAL_OVERRIDE;
- virtual bool drawGradient( const tools::PolyPolygon&, const Gradient& ) SAL_OVERRIDE { return false; };
+ com::sun::star::drawing::LineCap) override;
+ virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) override;
+ virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) override;
+ virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ) override;
+ virtual bool drawGradient( const tools::PolyPolygon&, const Gradient& ) override { return false; };
// CopyArea --> No RasterOp, but ClipRegion
virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
- long nSrcHeight, sal_uInt16 nFlags ) SAL_OVERRIDE;
+ long nSrcHeight, sal_uInt16 nFlags ) override;
// CopyBits and DrawBitmap --> RasterOp and ClipRegion
// CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
- virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
- virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) SAL_OVERRIDE;
+ virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) override;
+ virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) override;
virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
- const SalBitmap& rTransparentBitmap ) SAL_OVERRIDE;
+ const SalBitmap& rTransparentBitmap ) override;
virtual void drawMask( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
- SalColor nMaskColor ) SAL_OVERRIDE;
+ SalColor nMaskColor ) override;
- virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
- virtual SalColor getPixel( long nX, long nY ) SAL_OVERRIDE;
+ virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) override;
+ virtual SalColor getPixel( long nX, long nY ) override;
// invert --> ClipRegion (only Windows or VirDevs)
- virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) SAL_OVERRIDE;
- virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) SAL_OVERRIDE;
+ virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) override;
+ virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override;
- virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) SAL_OVERRIDE;
+ virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) override;
// native widget rendering methods that require mirroring
virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
- const Point& aPos, bool& rIsInside ) SAL_OVERRIDE;
+ const Point& aPos, bool& rIsInside ) override;
virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
- const OUString& aCaption ) SAL_OVERRIDE;
+ const OUString& aCaption ) override;
virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
const ImplControlValue& aValue, const OUString& aCaption,
- Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) SAL_OVERRIDE;
+ Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) override;
virtual bool blendBitmap( const SalTwoRect&,
- const SalBitmap& rBitmap ) SAL_OVERRIDE;
+ const SalBitmap& rBitmap ) override;
virtual bool blendAlphaBitmap( const SalTwoRect&,
const SalBitmap& rSrcBitmap,
const SalBitmap& rMaskBitmap,
- const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
+ const SalBitmap& rAlphaBitmap ) override;
virtual bool drawAlphaBitmap( const SalTwoRect&,
const SalBitmap& rSourceBitmap,
- const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
+ const SalBitmap& rAlphaBitmap ) override;
virtual bool drawTransformedBitmap(
const basegfx::B2DPoint& rNull,
const basegfx::B2DPoint& rX,
const basegfx::B2DPoint& rY,
const SalBitmap& rSourceBitmap,
- const SalBitmap* pAlphaBitmap) SAL_OVERRIDE;
- virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) SAL_OVERRIDE;
+ const SalBitmap* pAlphaBitmap) override;
+ virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) override;
public:
// public SalGraphics methods, the interface to the independent vcl part
// get device resolution
- virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE;
+ virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override;
// get the depth of the device
- virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE;
+ virtual sal_uInt16 GetBitCount() const override;
// get the width of the device
- virtual long GetGraphicsWidth() const SAL_OVERRIDE;
+ virtual long GetGraphicsWidth() const override;
// set the clip region to empty
- virtual void ResetClipRegion() SAL_OVERRIDE;
+ virtual void ResetClipRegion() override;
// set the line color to transparent (= don't draw lines)
- virtual void SetLineColor() SAL_OVERRIDE;
+ virtual void SetLineColor() override;
// set the line color to a specific color
- virtual void SetLineColor( SalColor nSalColor ) SAL_OVERRIDE;
+ virtual void SetLineColor( SalColor nSalColor ) override;
// set the fill color to transparent (= don't fill)
- virtual void SetFillColor() SAL_OVERRIDE;
+ virtual void SetFillColor() override;
// set the fill color to a specific color, shapes will be
// filled accordingly
- virtual void SetFillColor( SalColor nSalColor ) SAL_OVERRIDE;
+ virtual void SetFillColor( SalColor nSalColor ) override;
// enable/disable XOR drawing
- virtual void SetXORMode( bool bSet, bool ) SAL_OVERRIDE;
+ virtual void SetXORMode( bool bSet, bool ) override;
// set line color for raster operations
- virtual void SetROPLineColor( SalROPColor nROPColor ) SAL_OVERRIDE;
+ virtual void SetROPLineColor( SalROPColor nROPColor ) override;
// set fill color for raster operations
- virtual void SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE;
+ virtual void SetROPFillColor( SalROPColor nROPColor ) override;
// set the text color to a specific color
- virtual void SetTextColor( SalColor nSalColor ) SAL_OVERRIDE;
+ virtual void SetTextColor( SalColor nSalColor ) override;
// set the font
- virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE;
+ virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) override;
// get the current font's metrics
- virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE;
+ virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) override;
// get the repertoire of the current font
- virtual const FontCharMapPtr GetFontCharMap() const SAL_OVERRIDE;
+ virtual const FontCharMapPtr GetFontCharMap() const override;
// get the layout capabilities of the current font
- virtual bool GetFontCapabilities(vcl::FontCapabilities &rGetFontCapabilities) const SAL_OVERRIDE;
+ virtual bool GetFontCapabilities(vcl::FontCapabilities &rGetFontCapabilities) const override;
// graphics must fill supplied font list
- virtual void GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE;
+ virtual void GetDevFontList( PhysicalFontCollection* ) override;
// graphics must drop any cached font info
- virtual void ClearDevFontCache() SAL_OVERRIDE;
- virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE;
+ virtual void ClearDevFontCache() override;
+ virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) override;
// CreateFontSubset: a method to get a subset of glyhps of a font
// inside a new valid font file
// returns TRUE if creation of subset was successful
@@ -392,7 +392,7 @@ public:
sal_Int32* pWidths,
int nGlyphs,
FontSubsetInfo& rInfo // out parameter
- ) SAL_OVERRIDE;
+ ) override;
// GetFontEncodingVector: a method to get the encoding map Unicode
// to font encoded character; this is only used for type1 fonts and
@@ -401,7 +401,7 @@ public:
// glyphs with only a name) exist it is set to the corresponding
// map for non encoded glyphs; the encoding vector contains -1
// as encoding for these cases
- virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const** ) SAL_OVERRIDE;
+ virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const** ) override;
// GetEmbedFontData: gets the font data for a font marked
// embeddable by GetDevFontList or NULL in case of error
@@ -415,28 +415,28 @@ public:
sal_Int32* pWidths,
size_t nLen,
FontSubsetInfo& rInfo,
- long* pDataLen ) SAL_OVERRIDE;
+ long* pDataLen ) override;
// frees the font data again
- virtual void FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE;
+ virtual void FreeEmbedFontData( const void* pData, long nDataLen ) override;
virtual void GetGlyphWidths( const PhysicalFontFace*,
bool bVertical,
Int32Vector& rWidths,
- Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE;
+ Ucs2UIntMap& rUnicodeEnc ) override;
int GetMinKashidaWidth();
- virtual bool GetGlyphBoundRect( sal_GlyphId, Rectangle& ) SAL_OVERRIDE;
- virtual bool GetGlyphOutline( sal_GlyphId, ::basegfx::B2DPolyPolygon& ) SAL_OVERRIDE;
+ virtual bool GetGlyphBoundRect( sal_GlyphId, Rectangle& ) override;
+ virtual bool GetGlyphOutline( sal_GlyphId, ::basegfx::B2DPolyPolygon& ) override;
- virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE;
- virtual void DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE;
+ virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override;
+ virtual void DrawServerFontLayout( const ServerFontLayout& ) override;
- virtual bool supportsOperation( OutDevSupportType ) const SAL_OVERRIDE;
+ virtual bool supportsOperation( OutDevSupportType ) const override;
// Query the platform layer for control support
- virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ) SAL_OVERRIDE;
+ virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ) override;
- virtual SystemGraphicsData GetGraphicsData() const SAL_OVERRIDE;
+ virtual SystemGraphicsData GetGraphicsData() const override;
- virtual OpenGLContext *BeginPaint() SAL_OVERRIDE;
+ virtual OpenGLContext *BeginPaint() override;
/// Update settings based on the platform values
static void updateSettingsNative( AllSettings& rSettings );
diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h
index 7bdf3fc5d112..2d3cadc3a725 100644
--- a/vcl/inc/win/salinst.h
+++ b/vcl/inc/win/salinst.h
@@ -46,41 +46,41 @@ public:
WinSalInstance();
virtual ~WinSalInstance();
- virtual SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
- virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags 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 SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override;
+ virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override;
+ virtual void DestroyFrame( SalFrame* pFrame ) override;
+ virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) override;
+ virtual void DestroyObject( SalObject* pObject ) override;
virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics,
long &nDX, long &nDY,
- sal_uInt16 nBitCount, const SystemGraphicsData *pData ) SAL_OVERRIDE;
+ sal_uInt16 nBitCount, const SystemGraphicsData *pData ) override;
virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
- 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;
+ ImplJobSetup* pSetupData ) override;
+ virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ) override;
+ virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ) override;
+ virtual void DestroyPrinter( SalPrinter* pPrinter ) override;
+ virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ) override;
+ virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) override;
+ virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) override;
+ virtual OUString GetDefaultPrinter() override;
+ virtual SalTimer* CreateSalTimer() override;
+ virtual SalI18NImeStatus* CreateI18NImeStatus() override;
+ virtual SalSystem* CreateSalSystem() override;
+ virtual SalBitmap* CreateSalBitmap() override;
+ virtual comphelper::SolarMutex* GetYieldMutex() override;
+ virtual sal_uIntPtr ReleaseYieldMutex() override;
+ virtual void AcquireYieldMutex( sal_uIntPtr nCount ) override;
+ virtual bool CheckYieldMutex() override;
- virtual void DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) 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;
+ virtual void DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) override;
+ virtual bool AnyInput( VclInputFlags nType ) override;
+ virtual SalMenu* CreateMenu( bool bMenuBar, Menu* ) override;
+ virtual void DestroyMenu( SalMenu* ) override;
+ virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ) override;
+ virtual void DestroyMenuItem( SalMenuItem* ) override;
+ virtual SalSession* CreateSalSession() override;
+ virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) override;
+ virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) override;
static int WorkaroundExceptionHandlingInUSER32Lib(int nExcept, LPEXCEPTION_POINTERS pExceptionInfo);
};
diff --git a/vcl/inc/win/salmenu.h b/vcl/inc/win/salmenu.h
index 588a95b45cc7..858d587a40e8 100644
--- a/vcl/inc/win/salmenu.h
+++ b/vcl/inc/win/salmenu.h
@@ -28,19 +28,19 @@ class WinSalMenu : public SalMenu
public:
WinSalMenu();
virtual ~WinSalMenu();
- virtual bool VisibleMenuBar() SAL_OVERRIDE; // must return TRUE to actually DISPLAY native menu bars
+ virtual bool VisibleMenuBar() override; // must return TRUE to actually DISPLAY native menu bars
// otherwise only menu messages are processed (eg, OLE on Windows)
- virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) SAL_OVERRIDE;
- virtual void RemoveItem( unsigned nPos ) SAL_OVERRIDE;
- virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) SAL_OVERRIDE;
- virtual void SetFrame( const SalFrame* pFrame ) SAL_OVERRIDE;
- virtual void CheckItem( unsigned nPos, bool bCheck ) SAL_OVERRIDE;
- virtual void EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE;
- virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) SAL_OVERRIDE;
- 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 ) SAL_OVERRIDE;
- virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE;
+ virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) override;
+ virtual void RemoveItem( unsigned nPos ) override;
+ virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) override;
+ virtual void SetFrame( const SalFrame* pFrame ) override;
+ virtual void CheckItem( unsigned nPos, bool bCheck ) override;
+ virtual void EnableItem( unsigned nPos, bool bEnable ) override;
+ virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) override;
+ virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ) override;
+ virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) override;
+ virtual void GetSystemMenuData( SystemMenuData* pData ) override;
HMENU mhMenu; // the menu handle
bool mbMenuBar; // true for menu bars
diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h
index a33150102a65..78da55fa515c 100644
--- a/vcl/inc/win/salobj.h
+++ b/vcl/inc/win/salobj.h
@@ -40,16 +40,16 @@ public:
WinSalObject();
virtual ~WinSalObject();
- virtual void ResetClipRegion() SAL_OVERRIDE;
- virtual sal_uInt16 GetClipRegionType() SAL_OVERRIDE;
- virtual void BeginSetClipRegion( sal_uIntPtr nRects ) SAL_OVERRIDE;
- virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight) SAL_OVERRIDE;
- virtual void EndSetClipRegion() SAL_OVERRIDE;
- virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
- virtual void Show( bool bVisible ) SAL_OVERRIDE;
- virtual void Enable( bool bEnable ) SAL_OVERRIDE;
- virtual void GrabFocus() SAL_OVERRIDE;
- virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE;
+ virtual void ResetClipRegion() override;
+ virtual sal_uInt16 GetClipRegionType() override;
+ virtual void BeginSetClipRegion( sal_uIntPtr nRects ) override;
+ virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight) override;
+ virtual void EndSetClipRegion() override;
+ virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) override;
+ virtual void Show( bool bVisible ) override;
+ virtual void Enable( bool bEnable ) override;
+ virtual void GrabFocus() override;
+ virtual const SystemEnvData* GetSystemData() const override;
};
#endif // INCLUDED_VCL_INC_WIN_SALOBJ_H
diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h
index 1835e79b992f..1eed33ad8fb5 100644
--- a/vcl/inc/win/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -55,20 +55,20 @@ public:
WinSalInfoPrinter();
virtual ~WinSalInfoPrinter();
- virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
- virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
- virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) SAL_OVERRIDE;
- virtual bool SetPrinterData( ImplJobSetup* pSetupData ) SAL_OVERRIDE;
- virtual bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ) SAL_OVERRIDE;
+ virtual SalGraphics* AcquireGraphics() override;
+ virtual void ReleaseGraphics( SalGraphics* pGraphics ) override;
+ virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) override;
+ virtual bool SetPrinterData( ImplJobSetup* pSetupData ) override;
+ virtual bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ) override;
virtual void GetPageInfo( const ImplJobSetup* pSetupData,
long& rOutWidth, long& rOutHeight,
long& rPageOffX, long& rPageOffY,
- long& rPageWidth, long& rPageHeight ) SAL_OVERRIDE;
- virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) SAL_OVERRIDE;
- virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData ) SAL_OVERRIDE;
- virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ) SAL_OVERRIDE;
- virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) SAL_OVERRIDE;
- virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ) SAL_OVERRIDE;
+ long& rPageWidth, long& rPageHeight ) override;
+ virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) override;
+ virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData ) override;
+ virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ) override;
+ virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) override;
+ virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ) override;
};
// - WinSalPrinter -
@@ -98,11 +98,11 @@ public:
sal_uIntPtr nCopies,
bool bCollate,
bool bDirect,
- ImplJobSetup* pSetupData ) SAL_OVERRIDE;
- virtual bool EndJob() SAL_OVERRIDE;
- virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) SAL_OVERRIDE;
- virtual bool EndPage() SAL_OVERRIDE;
- virtual sal_uIntPtr GetErrorCode() SAL_OVERRIDE;
+ ImplJobSetup* pSetupData ) override;
+ virtual bool EndJob() override;
+ virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) override;
+ virtual bool EndPage() override;
+ virtual sal_uIntPtr GetErrorCode() override;
void markInvalid();
bool isValid() const { return mbValid; }
diff --git a/vcl/inc/win/salsys.h b/vcl/inc/win/salsys.h
index fc7a4b2d596e..5b6fc7f04bfe 100644
--- a/vcl/inc/win/salsys.h
+++ b/vcl/inc/win/salsys.h
@@ -56,13 +56,13 @@ public:
WinSalSystem() : m_nPrimary( 0 ) {}
virtual ~WinSalSystem();
- virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE;
- virtual unsigned int GetDisplayBuiltInScreen() SAL_OVERRIDE;
- virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) SAL_OVERRIDE;
+ virtual unsigned int GetDisplayScreenCount() override;
+ virtual unsigned int GetDisplayBuiltInScreen() override;
+ virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) override;
virtual int ShowNativeMessageBox( const OUString& rTitle,
const OUString& rMessage,
int nButtonCombination,
- int nDefaultButton, bool bUseResources) SAL_OVERRIDE;
+ int nDefaultButton, bool bUseResources) override;
bool initMonitors();
// discards monitorinfo; used by WM_DISPLAYCHANGED handler
void clearMonitors();
diff --git a/vcl/inc/win/saltimer.h b/vcl/inc/win/saltimer.h
index adc0fea69716..220941fc9a2e 100644
--- a/vcl/inc/win/saltimer.h
+++ b/vcl/inc/win/saltimer.h
@@ -28,8 +28,8 @@ public:
WinSalTimer() {}
virtual ~WinSalTimer();
- virtual void Start(sal_uIntPtr nMS) SAL_OVERRIDE;
- virtual void Stop() SAL_OVERRIDE;
+ virtual void Start(sal_uIntPtr nMS) override;
+ virtual void Stop() override;
};
#endif
diff --git a/vcl/inc/win/salvd.h b/vcl/inc/win/salvd.h
index bb8e168311f4..e19e88d9d096 100644
--- a/vcl/inc/win/salvd.h
+++ b/vcl/inc/win/salvd.h
@@ -49,15 +49,15 @@ public:
WinSalVirtualDevice();
virtual ~WinSalVirtualDevice();
- virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
- virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
- virtual bool SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE;
+ virtual SalGraphics* AcquireGraphics() override;
+ virtual void ReleaseGraphics( SalGraphics* pGraphics ) override;
+ virtual bool SetSize( long nNewDX, long nNewDY ) override;
static HBITMAP ImplCreateVirDevBitmap(HDC hDC, long nDX, long nDY, sal_uInt16 nBitCount, void **ppDummy);
// SalGeometryProvider
- virtual long GetWidth() const SAL_OVERRIDE { return mnWidth; }
- virtual long GetHeight() const SAL_OVERRIDE { return mnHeight; }
+ virtual long GetWidth() const override { return mnWidth; }
+ virtual long GetHeight() const override { return mnHeight; }
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 01:16:58 +0000