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
Show whitespace changes
Inline Side-by-side
Showing with 201 additions and 201 deletions
vcl/inc/salobj.hxx
Dosyayı görüntüle @ 72546d44
......@@ -51,7 +51,7 @@ public:
virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) = 0;
virtual void Show( bool bVisible ) = 0;
void Enable( bool /* nEnable */ ) {}
virtual void Enable( bool /* nEnable */ ) {} // overridden by WinSalObject
virtual void GrabFocus() {}
virtual void SetForwardKey( bool /* bEnable */ ) {}
......
vcl/inc/win/salbmp.h
Dosyayı görüntüle @ 72546d44
......@@ -80,22 +80,22 @@ public:
public:
bool Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle );
virtual bool Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal );
virtual bool Create( const SalBitmap& rSalBmpImpl );
virtual bool Create( const SalBitmap& rSalBmpImpl, SalGraphics* pGraphics );
virtual bool Create( const SalBitmap& rSalBmpImpl, sal_uInt16 nNewBitCount );
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 ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas,
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 sal_uInt16 GetBitCount() const { return mnBitCount; }
virtual Size GetSize() const SAL_OVERRIDE { return maSize; }
virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE { return mnBitCount; }
virtual BitmapBuffer* AcquireBuffer( BitmapAccessMode nMode );
virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode );
virtual bool GetSystemData( BitmapSystemData& rData );
virtual BitmapBuffer* AcquireBuffer( BitmapAccessMode nMode ) SAL_OVERRIDE;
virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) SAL_OVERRIDE;
virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
virtual bool Erase( const Color& rFillColor ) SAL_OVERRIDE;
......
vcl/inc/win/salframe.h
Dosyayı görüntüle @ 72546d44
......@@ -87,52 +87,52 @@ public:
WinSalFrame();
virtual ~WinSalFrame();
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* pSalMenu );
virtual void DrawMenuBar();
virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle );
virtual void Show( bool bVisible, bool bNoActivate = FALSE );
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* 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;
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, vcl::KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
virtual void UpdateSettings( AllSettings& rSettings );
virtual void Beep();
virtual const SystemEnvData* GetSystemData() const;
virtual SalPointerState GetPointerState();
virtual KeyIndicatorState GetIndicatorState();
virtual void SimulateKeyPress( sal_uInt16 nKeyCode );
virtual void SetParent( SalFrame* pNewParent );
virtual bool SetPluginParent( SystemParentData* pNewParent );
virtual void SetScreenNumber( unsigned int );
virtual void SetApplicationID( const OUString &rApplicationID );
virtual void ResetClipRegion();
virtual void BeginSetClipRegion( sal_uIntPtr 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, 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;
};
void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect );
......
vcl/inc/win/salgdi.h
Dosyayı görüntüle @ 72546d44
......@@ -77,9 +77,9 @@ public:
BYTE nPitchAndFamily );
virtual ~ImplWinFontData();
virtual PhysicalFontFace* Clone() const;
virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const;
virtual sal_IntPtr GetFontId() const;
virtual PhysicalFontFace* Clone() const SAL_OVERRIDE;
virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE;
virtual sal_IntPtr GetFontId() const SAL_OVERRIDE;
void SetFontId( sal_IntPtr nId ) { mnId = nId; }
void UpdateFromHDC( HDC ) const;
......@@ -257,63 +257,63 @@ public:
void setHWND(HWND hWnd);
protected:
virtual bool setClipRegion( const vcl::Region& );
virtual bool setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
// draw --> LineColor and FillColor and RasterOp and ClipRegion
virtual void drawPixel( long nX, long nY );
virtual void drawPixel( long nX, long nY, SalColor nSalColor );
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 );
virtual void drawRect( long nX, long nY, long nWidth, long nHeight );
virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry );
virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry );
virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
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 bool drawPolyLine(
const ::basegfx::B2DPolygon&,
double fTransparency,
const ::basegfx::B2DVector& rLineWidth,
basegfx::B2DLineJoin,
com::sun::star::drawing::LineCap);
virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry );
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; };
// CopyArea --> No RasterOp, but ClipRegion
virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
long nSrcHeight, sal_uInt16 nFlags );
long nSrcHeight, sal_uInt16 nFlags ) SAL_OVERRIDE;
// CopyBits and DrawBitmap --> RasterOp and ClipRegion
// CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics );
virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap );
virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) SAL_OVERRIDE;
virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
SalColor nTransparentColor );
SalColor nTransparentColor ) SAL_OVERRIDE;
virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
const SalBitmap& rTransparentBitmap );
const SalBitmap& rTransparentBitmap ) SAL_OVERRIDE;
virtual void drawMask( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
SalColor nMaskColor );
SalColor nMaskColor ) SAL_OVERRIDE;
virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight );
virtual SalColor getPixel( long nX, long nY );
virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
virtual SalColor getPixel( long nX, long nY ) SAL_OVERRIDE;
// invert --> ClipRegion (only Windows or VirDevs)
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags );
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 bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize );
virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) SAL_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;
virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
const OUString& aCaption );
const OUString& aCaption ) SAL_OVERRIDE;
virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
const ImplControlValue& aValue, const OUString& aCaption,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) SAL_OVERRIDE;
virtual bool blendBitmap( const SalTwoRect&,
const SalBitmap& rBitmap ) SAL_OVERRIDE;
......@@ -325,14 +325,14 @@ protected:
virtual bool drawAlphaBitmap( const SalTwoRect&,
const SalBitmap& rSourceBitmap,
const SalBitmap& rAlphaBitmap );
const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
virtual bool drawTransformedBitmap(
const basegfx::B2DPoint& rNull,
const basegfx::B2DPoint& rX,
const basegfx::B2DPoint& rY,
const SalBitmap& rSourceBitmap,
const SalBitmap* pAlphaBitmap);
virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency );
const SalBitmap* pAlphaBitmap) SAL_OVERRIDE;
virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) SAL_OVERRIDE;
private:
// local helpers
......@@ -344,45 +344,45 @@ public:
// public SalGraphics methods, the interface to the independent vcl part
// get device resolution
virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE;
// get the depth of the device
virtual sal_uInt16 GetBitCount() const;
virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE;
// get the width of the device
virtual long GetGraphicsWidth() const;
virtual long GetGraphicsWidth() const SAL_OVERRIDE;
// set the clip region to empty
virtual void ResetClipRegion();
virtual void ResetClipRegion() SAL_OVERRIDE;
// set the line color to transparent (= don't draw lines)
virtual void SetLineColor();
virtual void SetLineColor() SAL_OVERRIDE;
// set the line color to a specific color
virtual void SetLineColor( SalColor nSalColor );
virtual void SetLineColor( SalColor nSalColor ) SAL_OVERRIDE;
// set the fill color to transparent (= don't fill)
virtual void SetFillColor();
virtual void SetFillColor() SAL_OVERRIDE;
// set the fill color to a specific color, shapes will be
// filled accordingly
virtual void SetFillColor( SalColor nSalColor );
virtual void SetFillColor( SalColor nSalColor ) SAL_OVERRIDE;
// enable/disable XOR drawing
virtual void SetXORMode( bool bSet, bool );
virtual void SetXORMode( bool bSet, bool ) SAL_OVERRIDE;
// set line color for raster operations
virtual void SetROPLineColor( SalROPColor nROPColor );
virtual void SetROPLineColor( SalROPColor nROPColor ) SAL_OVERRIDE;
// set fill color for raster operations
virtual void SetROPFillColor( SalROPColor nROPColor );
virtual void SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE;
// set the text color to a specific color
virtual void SetTextColor( SalColor nSalColor );
virtual void SetTextColor( SalColor nSalColor ) SAL_OVERRIDE;
// set the font
virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel );
virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE;
// get the current font's metrics
virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE;
// get the repertoire of the current font
virtual const FontCharMapPtr GetFontCharMap() const;
virtual const FontCharMapPtr GetFontCharMap() const SAL_OVERRIDE;
// get the layout capabilities of the current font
virtual bool GetFontCapabilities(vcl::FontCapabilities &rGetFontCapabilities) const;
virtual bool GetFontCapabilities(vcl::FontCapabilities &rGetFontCapabilities) const SAL_OVERRIDE;
// graphics must fill supplied font list
virtual void GetDevFontList( PhysicalFontCollection* );
virtual void GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE;
// graphics must drop any cached font info
virtual void ClearDevFontCache();
virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName );
virtual void ClearDevFontCache() SAL_OVERRIDE;
virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_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
......@@ -402,7 +402,7 @@ public:
sal_Int32* pWidths,
int nGlyphs,
FontSubsetInfo& rInfo // out parameter
);
) SAL_OVERRIDE;
// GetFontEncodingVector: a method to get the encoding map Unicode
// to font encoded character; this is only used for type1 fonts and
......@@ -411,7 +411,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** );
virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const** ) SAL_OVERRIDE;
// GetEmbedFontData: gets the font data for a font marked
// embeddable by GetDevFontList or NULL in case of error
......@@ -425,27 +425,27 @@ public:
sal_Int32* pWidths,
size_t nLen,
FontSubsetInfo& rInfo,
long* pDataLen );
long* pDataLen ) SAL_OVERRIDE;
// frees the font data again
virtual void FreeEmbedFontData( const void* pData, long nDataLen );
virtual void FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE;
virtual void GetGlyphWidths( const PhysicalFontFace*,
bool bVertical,
Int32Vector& rWidths,
Ucs2UIntMap& rUnicodeEnc );
virtual int GetMinKashidaWidth();
Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE;
int GetMinKashidaWidth();
virtual bool GetGlyphBoundRect( sal_GlyphId, Rectangle& );
virtual bool GetGlyphOutline( sal_GlyphId, ::basegfx::B2DPolyPolygon& );
virtual bool GetGlyphBoundRect( sal_GlyphId, Rectangle& ) SAL_OVERRIDE;
virtual bool GetGlyphOutline( sal_GlyphId, ::basegfx::B2DPolyPolygon& ) SAL_OVERRIDE;
virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
virtual void DrawServerFontLayout( const ServerFontLayout& );
virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE;
virtual void DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE;
virtual bool supportsOperation( OutDevSupportType ) const;
virtual bool supportsOperation( OutDevSupportType ) const SAL_OVERRIDE;
// Query the platform layer for control support
virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart );
virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ) SAL_OVERRIDE;
virtual SystemGraphicsData GetGraphicsData() const;
virtual SystemFontData GetSysFontData( int nFallbacklevel ) const;
virtual SystemGraphicsData GetGraphicsData() const SAL_OVERRIDE;
virtual SystemFontData GetSysFontData( int nFallbacklevel ) const SAL_OVERRIDE;
virtual void BeginPaint() SAL_OVERRIDE;
virtual void EndPaint() SAL_OVERRIDE;
......
vcl/inc/win/salinst.h
Dosyayı görüntüle @ 72546d44
......@@ -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);
};
......
vcl/inc/win/salmenu.h
Dosyayı görüntüle @ 72546d44
......@@ -28,19 +28,19 @@ class WinSalMenu : public SalMenu
public:
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)
virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos );
virtual void RemoveItem( unsigned nPos );
virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos );
virtual void SetFrame( const SalFrame* pFrame );
virtual void CheckItem( unsigned nPos, bool bCheck );
virtual void EnableItem( unsigned nPos, bool bEnable );
virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText );
virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage );
virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName );
virtual void GetSystemMenuData( SystemMenuData* pData );
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;
HMENU mhMenu; // the menu handle
bool mbMenuBar; // true for menu bars
......
vcl/inc/win/salobj.h
Dosyayı görüntüle @ 72546d44
......@@ -40,16 +40,16 @@ public:
WinSalObject();
virtual ~WinSalObject();
virtual void ResetClipRegion();
virtual sal_uInt16 GetClipRegionType();
virtual void BeginSetClipRegion( sal_uIntPtr nRects );
virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
virtual void EndSetClipRegion();
virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight );
virtual void Show( bool bVisible );
virtual void Enable( bool nEnable );
virtual void GrabFocus();
virtual const SystemEnvData* GetSystemData() const;
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 nEnable ) SAL_OVERRIDE;
virtual void GrabFocus() SAL_OVERRIDE;
virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE;
};
#endif // INCLUDED_VCL_INC_WIN_SALOBJ_H
......
vcl/inc/win/salprn.h
Dosyayı görüntüle @ 72546d44
......@@ -55,20 +55,20 @@ public:
WinSalInfoPrinter();
virtual ~WinSalInfoPrinter();
virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
virtual bool SetPrinterData( ImplJobSetup* pSetupData );
virtual bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData );
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 void GetPageInfo( const ImplJobSetup* pSetupData,
long& rOutWidth, long& rOutHeight,
long& rPageOffX, long& rPageOffY,
long& rPageWidth, long& rPageHeight );
virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType );
virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData );
virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin );
virtual void InitPaperFormats( const ImplJobSetup* pSetupData );
virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData );
long& rPageWidth, long& rPageHeight ) SAL_OVERRIDE;
virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 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;
};
// - WinSalPrinter -
......@@ -98,12 +98,12 @@ public:
sal_uIntPtr nCopies,
bool bCollate,
bool bDirect,
ImplJobSetup* pSetupData );
virtual bool EndJob();
virtual bool AbortJob();
virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData );
virtual bool EndPage();
virtual sal_uIntPtr GetErrorCode();
ImplJobSetup* pSetupData ) SAL_OVERRIDE;
virtual bool EndJob() SAL_OVERRIDE;
virtual bool AbortJob() SAL_OVERRIDE;
virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) SAL_OVERRIDE;
virtual bool EndPage() SAL_OVERRIDE;
virtual sal_uIntPtr GetErrorCode() SAL_OVERRIDE;
void markInvalid();
bool isValid() const { return mbValid; }
......
vcl/inc/win/salsys.h
Dosyayı görüntüle @ 72546d44
......@@ -27,7 +27,7 @@
class WinSalSystem : public SalSystem
{
public:
public:
struct DisplayMonitor
{
OUString m_aName;
......@@ -48,7 +48,7 @@ class WinSalSystem : public SalSystem
}
~DisplayMonitor() {}
};
private:
private:
std::vector<DisplayMonitor> m_aMonitors;
std::map<OUString, unsigned int> m_aDeviceNameToMonitor;
unsigned int m_nPrimary;
......@@ -56,14 +56,14 @@ public:
WinSalSystem() : m_nPrimary( 0 ) {}
virtual ~WinSalSystem();
virtual unsigned int GetDisplayScreenCount();
virtual unsigned int GetDisplayBuiltInScreen();
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
virtual OUString GetDisplayScreenName( unsigned int nScreen );
virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE;
virtual unsigned int GetDisplayBuiltInScreen() SAL_OVERRIDE;
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) SAL_OVERRIDE;
virtual OUString GetDisplayScreenName( unsigned int nScreen ) SAL_OVERRIDE;
virtual int ShowNativeMessageBox( const OUString& rTitle,
const OUString& rMessage,
int nButtonCombination,
int nDefaultButton, bool bUseResources);
int nDefaultButton, bool bUseResources) SAL_OVERRIDE;
bool initMonitors();
// discards monitorinfo; used by WM_DISPLAYCHANGED handler
void clearMonitors();
......
vcl/inc/win/salvd.h
Dosyayı görüntüle @ 72546d44
......@@ -49,9 +49,9 @@ public:
WinSalVirtualDevice();
virtual ~WinSalVirtualDevice();
virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
virtual bool SetSize( long nNewDX, long nNewDY );
virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
virtual bool SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE;
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