diff options
Diffstat (limited to 'vcl')
110 files changed, 1154 insertions, 1143 deletions
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 4b45754a2d66..723262956340 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -1153,7 +1153,7 @@ public: { FcPatternDestroy(mpPattern); } - virtual void *GetPattern(void * face, bool bEmbolden, bool /*bVerticalLayout*/) const + virtual void *GetPattern(void * face, bool bEmbolden, bool /*bVerticalLayout*/) const SAL_OVERRIDE { FcValue value; value.type = FcTypeFTFace; diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx index deeb7916004a..4c10c9a63394 100644 --- a/vcl/generic/fontmanager/fontsubst.cxx +++ b/vcl/generic/fontmanager/fontsubst.cxx @@ -49,7 +49,7 @@ class FcPreMatchSubstititution : public ImplPreMatchFontSubstitution { public: - bool FindFontSubstitute( FontSelectPattern& ) const; + bool FindFontSubstitute( FontSelectPattern& ) const SAL_OVERRIDE; typedef ::std::pair<FontSelectPatternAttributes, FontSelectPatternAttributes> value_type; private: typedef ::std::list<value_type> CachedFontMapType; @@ -61,7 +61,7 @@ class FcGlyphFallbackSubstititution { // TODO: add a cache public: - bool FindFontSubstitute( FontSelectPattern&, OUString& rMissingCodes ) const; + bool FindFontSubstitute( FontSelectPattern&, OUString& rMissingCodes ) const SAL_OVERRIDE; }; int SalGenericInstance::FetchFontSubstitutionFlags() diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx index a0915ea72bdd..7015b343f960 100644 --- a/vcl/generic/glyphs/gcach_ftyp.hxx +++ b/vcl/generic/glyphs/gcach_ftyp.hxx @@ -168,9 +168,9 @@ public: FtFontInfo* GetFtFontInfo() const { return mpFtFontInfo; } - virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const; - virtual PhysicalFontFace* Clone() const { return new ImplFTSFontData( *this ); } - virtual sal_IntPtr GetFontId() const { return mpFtFontInfo->GetFontId(); } + virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE; + virtual PhysicalFontFace* Clone() const SAL_OVERRIDE { return new ImplFTSFontData( *this ); } + virtual sal_IntPtr GetFontId() const SAL_OVERRIDE { return mpFtFontInfo->GetFontId(); } static bool CheckFontData( const PhysicalFontFace& r ) { return r.CheckMagic( IFTSFONT_MAGIC ); } }; diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index 84f0a494e1d3..dfbd653224a2 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -329,7 +329,7 @@ public: HbLayoutEngine(ServerFont&); virtual ~HbLayoutEngine(); - virtual bool layout(ServerFontLayout&, ImplLayoutArgs&); + virtual bool layout(ServerFontLayout&, ImplLayoutArgs&) SAL_OVERRIDE; }; HbLayoutEngine::HbLayoutEngine(ServerFont& rServerFont) diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/generic/glyphs/scrptrun.h index bdea66109068..72975464a38e 100644 --- a/vcl/generic/glyphs/scrptrun.h +++ b/vcl/generic/glyphs/scrptrun.h @@ -37,6 +37,9 @@ #ifndef __SCRPTRUN_H #define __SCRPTRUN_H +#include <sal/config.h> + +#include <sal/types.h> #include "unicode/utypes.h" #include "unicode/uobject.h" #include "unicode/uscript.h" @@ -81,7 +84,7 @@ public: * * @stable ICU 2.2 */ - virtual inline UClassID getDynamicClassID() const { return getStaticClassID(); } + virtual inline UClassID getDynamicClassID() const SAL_OVERRIDE { return getStaticClassID(); } /** * ICU "poor man's RTTI", returns a UClassID for this class. diff --git a/vcl/generic/print/bitmap_gfx.cxx b/vcl/generic/print/bitmap_gfx.cxx index f929944c6e0f..0e6fdcda6314 100644 --- a/vcl/generic/print/bitmap_gfx.cxx +++ b/vcl/generic/print/bitmap_gfx.cxx @@ -72,7 +72,7 @@ public: HexEncoder (osl::File* pFile); virtual ~HexEncoder (); void WriteAscii (sal_uInt8 nByte); - virtual void EncodeByte (sal_uInt8 nByte); + virtual void EncodeByte (sal_uInt8 nByte) SAL_OVERRIDE; void FlushLine (); }; @@ -147,7 +147,7 @@ public: Ascii85Encoder (osl::File* pFile); virtual ~Ascii85Encoder (); - virtual void EncodeByte (sal_uInt8 nByte); + virtual void EncodeByte (sal_uInt8 nByte) SAL_OVERRIDE; void WriteAscii (sal_uInt8 nByte); }; @@ -295,7 +295,7 @@ public: LZWEncoder (osl::File* pOutputFile); ~LZWEncoder (); - virtual void EncodeByte (sal_uInt8 nByte); + virtual void EncodeByte (sal_uInt8 nByte) SAL_OVERRIDE; }; LZWEncoder::LZWEncoder(osl::File* pOutputFile) : diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index d111c28e1024..924faa671cfe 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -79,14 +79,14 @@ private: SalPrinterBmp (BitmapBuffer* pBitmap); virtual ~SalPrinterBmp (); - virtual sal_uInt32 GetPaletteColor (sal_uInt32 nIdx) const; - virtual sal_uInt32 GetPaletteEntryCount () const; - virtual sal_uInt32 GetPixelRGB (sal_uInt32 nRow, sal_uInt32 nColumn) const; - virtual sal_uInt8 GetPixelGray (sal_uInt32 nRow, sal_uInt32 nColumn) const; - virtual sal_uInt8 GetPixelIdx (sal_uInt32 nRow, sal_uInt32 nColumn) const; - virtual sal_uInt32 GetWidth () const; - virtual sal_uInt32 GetHeight() const; - virtual sal_uInt32 GetDepth () const; + virtual sal_uInt32 GetPaletteColor (sal_uInt32 nIdx) const SAL_OVERRIDE; + virtual sal_uInt32 GetPaletteEntryCount () const SAL_OVERRIDE; + virtual sal_uInt32 GetPixelRGB (sal_uInt32 nRow, sal_uInt32 nColumn) const SAL_OVERRIDE; + virtual sal_uInt8 GetPixelGray (sal_uInt32 nRow, sal_uInt32 nColumn) const SAL_OVERRIDE; + virtual sal_uInt8 GetPixelIdx (sal_uInt32 nRow, sal_uInt32 nColumn) const SAL_OVERRIDE; + virtual sal_uInt32 GetWidth () const SAL_OVERRIDE; + virtual sal_uInt32 GetHeight() const SAL_OVERRIDE; + virtual sal_uInt32 GetDepth () const SAL_OVERRIDE; }; SalPrinterBmp::SalPrinterBmp (BitmapBuffer* pBuffer) : @@ -567,9 +567,9 @@ private: public: ImplPspFontData( const psp::FastPrintFontInfo& ); - virtual sal_IntPtr GetFontId() const { return mnFontId; } - virtual PhysicalFontFace* Clone() const { return new ImplPspFontData( *this ); } - virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const; + virtual sal_IntPtr GetFontId() const SAL_OVERRIDE { return mnFontId; } + virtual PhysicalFontFace* Clone() const SAL_OVERRIDE { return new ImplPspFontData( *this ); } + virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE; static bool CheckFontData( const PhysicalFontFace& r ) { return r.CheckMagic( PSPFD_MAGIC ); } }; @@ -594,9 +594,9 @@ class PspFontLayout : public GenericSalLayout { public: PspFontLayout( ::psp::PrinterGfx& ); - virtual bool LayoutText( ImplLayoutArgs& ); - virtual void InitFont() const; - virtual void DrawText( SalGraphics& ) const; + virtual bool LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE; + virtual void InitFont() const SAL_OVERRIDE; + virtual void DrawText( SalGraphics& ) const SAL_OVERRIDE; private: ::psp::PrinterGfx& mrPrinterGfx; sal_IntPtr mnFontID; @@ -684,7 +684,7 @@ class PspServerFontLayout : public ServerFontLayout public: PspServerFontLayout( psp::PrinterGfx&, ServerFont& rFont, const ImplLayoutArgs& rArgs ); - virtual void InitFont() const; + virtual void InitFont() const SAL_OVERRIDE; const sal_Unicode* getTextPtr() const { return maText.getStr() - mnMinCharPos; } int getMinCharPos() const { return mnMinCharPos; } int getMaxCharPos() const { return mnMinCharPos+maText.getLength()-1; } diff --git a/vcl/headless/svpdata.cxx b/vcl/headless/svpdata.cxx index ede1c1b5a94e..1dcb8cabd897 100644 --- a/vcl/headless/svpdata.cxx +++ b/vcl/headless/svpdata.cxx @@ -14,8 +14,8 @@ class SvpSalData : public SalGenericData { public: SvpSalData( SalInstance *pInstance ) : SalGenericData( SAL_DATA_SVP, pInstance ) {} - virtual void ErrorTrapPush() {} - virtual bool ErrorTrapPop( bool ) { return false; } + virtual void ErrorTrapPush() SAL_OVERRIDE {} + virtual bool ErrorTrapPop( bool ) SAL_OVERRIDE { return false; } }; // plugin factory function diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index 6e12d6aeacd1..8c214453cb38 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -38,7 +38,7 @@ namespace { { DamageTracker( SvpSalFrame& rFrame ) : m_rFrame( rFrame ) {} virtual ~DamageTracker() {} - virtual void damaged( const basegfx::B2IBox& rDamageRect ) const + virtual void damaged( const basegfx::B2IBox& rDamageRect ) const SAL_OVERRIDE { m_rFrame.damaged( rDamageRect ); } diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx index e53ac29514cd..2dd140ac14a8 100644 --- a/vcl/headless/svptext.cxx +++ b/vcl/headless/svptext.cxx @@ -52,8 +52,8 @@ public: basebmp::Format nBmpFormat, B2IPoint& rTargetPos ); protected: - virtual void RemovingFont( ServerFont& ); - virtual void RemovingGlyph( GlyphData& ); + virtual void RemovingFont( ServerFont& ) SAL_OVERRIDE; + virtual void RemovingGlyph( GlyphData& ) SAL_OVERRIDE; class SvpGcpHelper { diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index d0055c95f568..1adfaee92b47 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -124,16 +124,16 @@ public: sal_uInt16 nTypeStyle = 0 ); ~ImplBorderWindow(); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Activate(); - virtual void Deactivate(); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void InitView(); void UpdateView( bool bNewView, const Size& rNewOutSize ); @@ -169,7 +169,7 @@ public: Rectangle GetMenuRect() const; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; struct ImplBorderFrameData @@ -244,11 +244,11 @@ class ImplNoBorderWindowView : public ImplBorderWindowView public: ImplNoBorderWindowView( ImplBorderWindow* pBorderWindow ); - virtual void Init( OutputDevice* pDev, long nWidth, long nHeight ); + virtual void Init( OutputDevice* pDev, long nWidth, long nHeight ) SAL_OVERRIDE; virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, - sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; - virtual long CalcTitleWidth() const; - virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ); + sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const SAL_OVERRIDE; + virtual long CalcTitleWidth() const SAL_OVERRIDE; + virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ) SAL_OVERRIDE; }; class ImplSmallBorderWindowView : public ImplBorderWindowView @@ -266,11 +266,11 @@ class ImplSmallBorderWindowView : public ImplBorderWindowView public: ImplSmallBorderWindowView( ImplBorderWindow* pBorderWindow ); - virtual void Init( OutputDevice* pOutDev, long nWidth, long nHeight ); + virtual void Init( OutputDevice* pOutDev, long nWidth, long nHeight ) SAL_OVERRIDE; virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, - sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; - virtual long CalcTitleWidth() const; - virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ); + sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const SAL_OVERRIDE; + virtual long CalcTitleWidth() const SAL_OVERRIDE; + virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ) SAL_OVERRIDE; }; class ImplStdBorderWindowView : public ImplBorderWindowView @@ -283,17 +283,17 @@ public: ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow ); ~ImplStdBorderWindowView(); - virtual bool MouseMove( const MouseEvent& rMEvt ); - virtual bool MouseButtonDown( const MouseEvent& rMEvt ); - virtual bool Tracking( const TrackingEvent& rTEvt ); - virtual OUString RequestHelp( const Point& rPos, Rectangle& rHelpRect ); - virtual Rectangle GetMenuRect() const; + virtual bool MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual bool MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual bool Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual OUString RequestHelp( const Point& rPos, Rectangle& rHelpRect ) SAL_OVERRIDE; + virtual Rectangle GetMenuRect() const SAL_OVERRIDE; - virtual void Init( OutputDevice* pDev, long nWidth, long nHeight ); + virtual void Init( OutputDevice* pDev, long nWidth, long nHeight ) SAL_OVERRIDE; virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, - sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; - virtual long CalcTitleWidth() const; - virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ); + sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const SAL_OVERRIDE; + virtual long CalcTitleWidth() const SAL_OVERRIDE; + virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ) SAL_OVERRIDE; }; #endif // INCLUDED_VCL_INC_BRDWIN_HXX diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx index 6bd3bd9ac984..8ad3e9869fd4 100644 --- a/vcl/inc/canvasbitmap.hxx +++ b/vcl/inc/canvasbitmap.hxx @@ -63,45 +63,45 @@ namespace unotools public: // XBitmap - virtual com::sun::star::geometry::IntegerSize2D SAL_CALL getSize() throw (com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasAlpha( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual com::sun::star::uno::Reference< com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const com::sun::star::geometry::RealSize2D& newSize, sal_Bool beFast ) throw (com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::geometry::IntegerSize2D SAL_CALL getSize() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasAlpha( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual com::sun::star::uno::Reference< com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const com::sun::star::geometry::RealSize2D& newSize, sal_Bool beFast ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIntegerReadOnlyBitmap - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapPalette > SAL_CALL getPalette( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XBitmapPalette - virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getIndex( ::com::sun::star::uno::Sequence< double >& entry, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL setIndex( const ::com::sun::star::uno::Sequence< double >& color, ::sal_Bool transparency, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace > SAL_CALL getColorSpace( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getIndex( ::com::sun::star::uno::Sequence< double >& entry, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL setIndex( const ::com::sun::star::uno::Sequence< double >& color, ::sal_Bool transparency, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace > SAL_CALL getColorSpace( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIntegerBitmapColorSpace - virtual ::sal_Int8 SAL_CALL getType( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertColorSpace( const ::com::sun::star::uno::Sequence< double >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace >& targetColorSpace ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor > SAL_CALL convertToRGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertToARGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertToPARGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromRGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromPARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace >& targetColorSpace ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor > SAL_CALL convertIntegerToRGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int8 SAL_CALL getType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertColorSpace( const ::com::sun::star::uno::Sequence< double >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace >& targetColorSpace ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor > SAL_CALL convertToRGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertToARGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertToPARGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromRGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromPARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace >& targetColorSpace ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor > SAL_CALL convertIntegerToRGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Create API wrapper for given BitmapEx diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx index 3b0d7d6985fe..6c807e5707c5 100644 --- a/vcl/inc/cupsmgr.hxx +++ b/vcl/inc/cupsmgr.hxx @@ -61,7 +61,7 @@ class CUPSManager : public PrinterInfoManager CUPSManager(); virtual ~CUPSManager(); - virtual void initialize(); + virtual void initialize() SAL_OVERRIDE; void getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner, int& rNumOptions, void** rOptions ) const; void runDests(); @@ -76,22 +76,22 @@ public: const char* authenticateUser( const char* ); - virtual FILE* startSpool( const OUString& rPrinterName, bool bQuickCommand ); - virtual bool endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner, const OUString& rFaxNumber ); - virtual void setupJobContextData( JobData& rData ); + virtual FILE* startSpool( const OUString& rPrinterName, bool bQuickCommand ) SAL_OVERRIDE; + virtual bool endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner, const OUString& rFaxNumber ) SAL_OVERRIDE; + virtual void setupJobContextData( JobData& rData ) SAL_OVERRIDE; /// changes the info about a named printer - virtual void changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo ); + virtual void changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo ) SAL_OVERRIDE; /// check if the printer configuration has changed - virtual bool checkPrintersChanged( bool bWait ); + virtual bool checkPrintersChanged( bool bWait ) SAL_OVERRIDE; // members for administration // disable for CUPS - virtual bool addPrinter( const OUString& rPrinterName, const OUString& rDriverName ); - virtual bool removePrinter( const OUString& rPrinterName, bool bCheckOnly = false ); - virtual bool writePrinterConfig(); - virtual bool setDefaultPrinter( const OUString& rPrinterName ); + virtual bool addPrinter( const OUString& rPrinterName, const OUString& rDriverName ) SAL_OVERRIDE; + virtual bool removePrinter( const OUString& rPrinterName, bool bCheckOnly = false ) SAL_OVERRIDE; + virtual bool writePrinterConfig() SAL_OVERRIDE; + virtual bool setDefaultPrinter( const OUString& rPrinterName ) SAL_OVERRIDE; }; } // namespace psp diff --git a/vcl/inc/dndevdis.hxx b/vcl/inc/dndevdis.hxx index 5b6b12089560..b325ba57906c 100644 --- a/vcl/inc/dndevdis.hxx +++ b/vcl/inc/dndevdis.hxx @@ -71,31 +71,31 @@ public: * XDropTargetDragContext */ - virtual void SAL_CALL acceptDrag( sal_Int8 dropAction ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL rejectDrag() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL acceptDrag( sal_Int8 dropAction ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL rejectDrag() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /* * XDropTargetListener */ - virtual void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /* * XDragGestureListener */ - virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /* * XEventListener */ - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& eo ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& eo ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlcon.hxx index 3828ea0d66ca..f385682d069c 100644 --- a/vcl/inc/dndlcon.hxx +++ b/vcl/inc/dndlcon.hxx @@ -76,36 +76,36 @@ public: * XDragGestureRecognizer */ - virtual void SAL_CALL addDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL resetRecognizer( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL resetRecognizer( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /* * XDropTargetDragContext */ - virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL rejectDrag( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL rejectDrag( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /* * XDropTargetDropContext */ - virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL rejectDrop( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dropComplete( sal_Bool success ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL rejectDrop( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dropComplete( sal_Bool success ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /* * XDropTarget */ - virtual void SAL_CALL addDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isActive( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setActive( sal_Bool active ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int8 SAL_CALL getDefaultActions( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isActive( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setActive( sal_Bool active ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int8 SAL_CALL getDefaultActions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx index f0d95f188bd1..ab2ceab50fc2 100644 --- a/vcl/inc/fontmanager.hxx +++ b/vcl/inc/fontmanager.hxx @@ -223,7 +223,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager Type1FontFile() : PrintFont( fonttype::Type1 ), m_nDirectory( 0 ) {} virtual ~Type1FontFile(); - virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* pProvider ); + virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* pProvider ) SAL_OVERRIDE; }; struct TrueTypeFontFile : public PrintFont @@ -235,7 +235,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager TrueTypeFontFile(); virtual ~TrueTypeFontFile(); - virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* pProvider ); + virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* pProvider ) SAL_OVERRIDE; }; fontID m_nNextFontID; diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h index adc05a6fb674..a41089cf9e31 100644 --- a/vcl/inc/generic/geninst.h +++ b/vcl/inc/generic/geninst.h @@ -58,9 +58,9 @@ public: SalYieldMutex(); ~SalYieldMutex(); - virtual void acquire(); - virtual void release(); - virtual bool tryToAcquire(); + virtual void acquire() SAL_OVERRIDE; + virtual void release() SAL_OVERRIDE; + virtual bool tryToAcquire() SAL_OVERRIDE; sal_uIntPtr GetAcquireCount() const { return mnCount; } oslThreadIdentifier GetThreadId() const { return mnThreadId; } diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h index d3215f632966..8097b6d3a1c8 100644 --- a/vcl/inc/generic/genprn.h +++ b/vcl/inc/generic/genprn.h @@ -38,20 +38,20 @@ public: virtual ~PspSalInfoPrinter(); // overload all pure virtual methods - 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; }; class VCL_DLLPUBLIC PspSalPrinter : public SalPrinter @@ -79,17 +79,17 @@ public: sal_uIntPtr nCopies, bool bCollate, bool bDirect, - ImplJobSetup* pSetupData ); + ImplJobSetup* pSetupData ) SAL_OVERRIDE; virtual bool StartJob( const OUString*, const OUString&, const OUString&, ImplJobSetup*, - vcl::PrinterController& i_rController ); - virtual bool EndJob(); - virtual bool AbortJob(); - virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ); - virtual bool EndPage(); - virtual sal_uIntPtr GetErrorCode(); + vcl::PrinterController& i_rController ) 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; }; #endif // INCLUDED_VCL_INC_GENERIC_GENPRN_H diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h index 3d1bbc7178fc..076952e2340a 100644 --- a/vcl/inc/generic/genpspgraphics.h +++ b/vcl/inc/generic/genpspgraphics.h @@ -72,32 +72,32 @@ public: const psp::FastPrintFontInfo& ); // overload all pure virtual methods - virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ); - virtual sal_uInt16 GetBitCount() const; - virtual long GetGraphicsWidth() const; - - virtual void ResetClipRegion(); - virtual bool setClipRegion( const Region& ); - - virtual void SetLineColor(); - virtual void SetLineColor( SalColor nSalColor ); - virtual void SetFillColor(); - virtual void SetFillColor( SalColor nSalColor ); - virtual void SetXORMode( bool bSet, bool ); - virtual void SetROPLineColor( SalROPColor nROPColor ); - virtual void SetROPFillColor( SalROPColor nROPColor ); - - virtual void SetTextColor( SalColor nSalColor ); - virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ); - virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); - virtual const ImplFontCharMap* GetImplFontCharMap() const; - virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; - virtual void GetDevFontList( PhysicalFontCollection* ); + virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE; + virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE; + virtual long GetGraphicsWidth() const SAL_OVERRIDE; + + virtual void ResetClipRegion() SAL_OVERRIDE; + virtual bool setClipRegion( const Region& ) SAL_OVERRIDE; + + virtual void SetLineColor() SAL_OVERRIDE; + virtual void SetLineColor( SalColor nSalColor ) SAL_OVERRIDE; + virtual void SetFillColor() SAL_OVERRIDE; + virtual void SetFillColor( SalColor nSalColor ) SAL_OVERRIDE; + virtual void SetXORMode( bool bSet, bool ) SAL_OVERRIDE; + virtual void SetROPLineColor( SalROPColor nROPColor ) SAL_OVERRIDE; + virtual void SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE; + + virtual void SetTextColor( SalColor nSalColor ) SAL_OVERRIDE; + virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE; + virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE; + virtual const ImplFontCharMap* GetImplFontCharMap() const SAL_OVERRIDE; + virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE; + virtual void GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE; // graphics must drop any cached font info - virtual void ClearDevFontCache(); + virtual void ClearDevFontCache() SAL_OVERRIDE; virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, - const OUString& rFontName ); + const OUString& rFontName ) SAL_OVERRIDE; virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, @@ -105,92 +105,92 @@ public: sal_uInt8* pEncoding, sal_Int32* pWidths, int nGlyphs, - FontSubsetInfo& rInfo ); + FontSubsetInfo& rInfo ) SAL_OVERRIDE; virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, - const Ucs2OStrMap** ppNonEncoded ); + const Ucs2OStrMap** ppNonEncoded ) SAL_OVERRIDE; virtual const void* GetEmbedFontData( const PhysicalFontFace*, const sal_Ucs* pUnicodes, sal_Int32* pWidths, FontSubsetInfo& rInfo, - long* pDataLen ); - virtual void FreeEmbedFontData( const void* pData, long nDataLen ); + long* pDataLen ) SAL_OVERRIDE; + virtual void FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE; virtual void GetGlyphWidths( const PhysicalFontFace*, bool bVertical, Int32Vector& rWidths, - Ucs2UIntMap& rUnicodeEnc ); - virtual bool GetGlyphBoundRect( sal_GlyphId, Rectangle& ); - virtual bool GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ); - virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ); - virtual void DrawServerFontLayout( const ServerFontLayout& ); - virtual bool supportsOperation( OutDevSupportType ) const; - 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 ); + Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE; + virtual bool GetGlyphBoundRect( sal_GlyphId, Rectangle& ) SAL_OVERRIDE; + virtual bool GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) SAL_OVERRIDE; + virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE; + virtual void DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE; + virtual bool supportsOperation( OutDevSupportType ) const SAL_OVERRIDE; + 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 ); + PCONSTSALPOINT* pPtAry ) SAL_OVERRIDE; virtual bool drawPolyPolygon( const basegfx::B2DPolyPolygon&, - double fTransparency ); + double fTransparency ) SAL_OVERRIDE; virtual bool drawPolyLine( const basegfx::B2DPolygon&, double fTransparency, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, - css::drawing::LineCap); + css::drawing::LineCap) SAL_OVERRIDE; virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, - const sal_uInt8* pFlgAry ); + const sal_uInt8* pFlgAry ) SAL_OVERRIDE; virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, - const sal_uInt8* pFlgAry ); + const sal_uInt8* pFlgAry ) SAL_OVERRIDE; virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, - const sal_uInt8* const* pFlgAry ); + const sal_uInt8* const* pFlgAry ) SAL_OVERRIDE; virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, - sal_uInt16 nFlags ); + sal_uInt16 nFlags ) SAL_OVERRIDE; virtual void copyBits( const SalTwoRect& rPosAry, - SalGraphics* pSrcGraphics ); + SalGraphics* pSrcGraphics ) SAL_OVERRIDE; virtual void drawBitmap( const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap ); + 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 ); - virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ); - virtual SalColor getPixel( long nX, long nY ); + SalColor nMaskColor ) SAL_OVERRIDE; + virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; + virtual SalColor getPixel( long nX, long nY ) SAL_OVERRIDE; virtual void invert( long nX, long nY, long nWidth, long nHeight, - SalInvert nFlags ); + SalInvert nFlags ) SAL_OVERRIDE; virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, - SalInvert nFlags ); + SalInvert nFlags ) SAL_OVERRIDE; virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, - void* pPtr, sal_uIntPtr nSize ); + void* pPtr, sal_uIntPtr nSize ) SAL_OVERRIDE; 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); + const SalBitmap* pAlphaBitmap) SAL_OVERRIDE; virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, - sal_uInt8 nTransparency ); + sal_uInt8 nTransparency ) 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; }; #endif // INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H diff --git a/vcl/inc/generic/gensys.h b/vcl/inc/generic/gensys.h index 77ff2edfa8bf..b22347555a59 100644 --- a/vcl/inc/generic/gensys.h +++ b/vcl/inc/generic/gensys.h @@ -41,7 +41,7 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem virtual int ShowNativeMessageBox( const OUString& rTitle, const OUString& rMessage, int nButtonCombination, - int nDefaultButton, bool bUseResources); + int nDefaultButton, bool bUseResources) SAL_OVERRIDE; #if !defined(ANDROID) && !defined(IOS) // Simple helpers for X11 WM_CLASS hints diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 28770f784ab2..98d6bc371013 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -316,9 +316,9 @@ private: public: ServerFontLayout( ServerFont& ); - virtual bool LayoutText( ImplLayoutArgs& ); - virtual void AdjustLayout( ImplLayoutArgs& ); - virtual void DrawText( SalGraphics& ) const; + virtual bool LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE; + virtual void AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE; + virtual void DrawText( SalGraphics& ) const SAL_OVERRIDE; void setNeedFallback(ImplLayoutArgs& rArgs, sal_Int32 nIndex, bool bRightToLeft); diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx index fc6dca1c5d57..6a84d54647fb 100644 --- a/vcl/inc/graphite_layout.hxx +++ b/vcl/inc/graphite_layout.hxx @@ -115,32 +115,32 @@ public: const grutils::GrFeatureParser * features = NULL) throw(); // used by upper layers - virtual bool LayoutText( ImplLayoutArgs& ); // first step of layout + virtual bool LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE; // first step of layout // split into two stages to allow dc to be restored on the segment gr_segment * CreateSegment(ImplLayoutArgs& rArgs); bool LayoutGlyphs(ImplLayoutArgs& rArgs, gr_segment * pSegment); - virtual void AdjustLayout( ImplLayoutArgs& ); // adjusting positions + virtual void AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE; // adjusting positions // methods using string indexing virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra=0, int nFactor=1) const SAL_OVERRIDE; - virtual long FillDXArray( sal_Int32* pDXArray ) const; + virtual long FillDXArray( sal_Int32* pDXArray ) const SAL_OVERRIDE; virtual void ApplyDXArray(ImplLayoutArgs &rArgs, std::vector<int> & rDeltaWidth); - virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const; + virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const SAL_OVERRIDE; // methods using glyph indexing virtual int GetNextGlyphs(int nLen, sal_GlyphId* pGlyphIdxAry, ::Point & rPos, int&, sal_Int32* pGlyphAdvAry = NULL, int* pCharPosAry = NULL, - const PhysicalFontFace** pFallbackFonts = NULL ) const; + const PhysicalFontFace** pFallbackFonts = NULL ) const SAL_OVERRIDE; // used by glyph+font+script fallback - virtual void MoveGlyph( int nStart, long nNewXPos ); - virtual void DropGlyph( int nStart ); - virtual void Simplify( bool bIsBase ); + virtual void MoveGlyph( int nStart, long nNewXPos ) SAL_OVERRIDE; + virtual void DropGlyph( int nStart ) SAL_OVERRIDE; + virtual void Simplify( bool bIsBase ) SAL_OVERRIDE; // Dummy implementation so layout can be shared between Linux/Windows - virtual void DrawText(SalGraphics&) const {}; + virtual void DrawText(SalGraphics&) const SAL_OVERRIDE {}; virtual ~GraphiteLayout() throw(); void SetFont(gr_font * pFont) { mpFont = pFont; } diff --git a/vcl/inc/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx index 9f22e4fcdf04..180ed69236d9 100644 --- a/vcl/inc/graphite_serverfont.hxx +++ b/vcl/inc/graphite_serverfont.hxx @@ -37,7 +37,7 @@ public: ServerFont & rServerFont) throw() : GraphiteLayout(pFace), mrServerFont(rServerFont) {}; virtual ~GraphiteLayoutImpl() throw() {}; - virtual sal_GlyphId getKashidaGlyph(int & width); + virtual sal_GlyphId getKashidaGlyph(int & width) SAL_OVERRIDE; private: ServerFont & mrServerFont; }; @@ -55,38 +55,38 @@ private: public: GraphiteServerFontLayout(ServerFont& pServerFont) throw(); - virtual bool LayoutText( ImplLayoutArgs& rArgs) + virtual bool LayoutText( ImplLayoutArgs& rArgs) SAL_OVERRIDE { mpStr = rArgs.mpStr; SalLayout::AdjustLayout(rArgs); return maImpl.LayoutText(rArgs); }; // first step of layout - virtual void AdjustLayout( ImplLayoutArgs& rArgs) + virtual void AdjustLayout( ImplLayoutArgs& rArgs) SAL_OVERRIDE { SalLayout::AdjustLayout(rArgs); maImpl.DrawBase() = maDrawBase; maImpl.DrawOffset() = maDrawOffset; maImpl.AdjustLayout(rArgs); }; - virtual long GetTextWidth() const { return maImpl.GetTextWidth(); } - virtual long FillDXArray( sal_Int32* dxa ) const { return maImpl.FillDXArray(dxa); } + virtual long GetTextWidth() const SAL_OVERRIDE { return maImpl.GetTextWidth(); } + virtual long FillDXArray( sal_Int32* dxa ) const SAL_OVERRIDE { return maImpl.FillDXArray(dxa); } virtual sal_Int32 GetTextBreak(long mw, long ce, int f) const SAL_OVERRIDE { return maImpl.GetTextBreak(mw, ce, f); } - virtual void GetCaretPositions( int as, sal_Int32* cxa ) const { maImpl.GetCaretPositions(as, cxa); } + virtual void GetCaretPositions( int as, sal_Int32* cxa ) const SAL_OVERRIDE { maImpl.GetCaretPositions(as, cxa); } // used by display layers virtual int GetNextGlyphs( int l, sal_GlyphId* gia, Point& p, int& s, sal_Int32* gaa = NULL, int* cpa = NULL, - const PhysicalFontFace** pFallbackFonts = NULL ) const + const PhysicalFontFace** pFallbackFonts = NULL ) const SAL_OVERRIDE { maImpl.DrawBase() = maDrawBase; maImpl.DrawOffset() = maDrawOffset; return maImpl.GetNextGlyphs(l, gia, p, s, gaa, cpa, pFallbackFonts); } - virtual void MoveGlyph( int nStart, long nNewXPos ) { maImpl.MoveGlyph(nStart, nNewXPos); }; - virtual void DropGlyph( int nStart ) { maImpl.DropGlyph(nStart); }; - virtual void Simplify( bool bIsBase ) { maImpl.Simplify(bIsBase); }; + virtual void MoveGlyph( int nStart, long nNewXPos ) SAL_OVERRIDE { maImpl.MoveGlyph(nStart, nNewXPos); }; + virtual void DropGlyph( int nStart ) SAL_OVERRIDE { maImpl.DropGlyph(nStart); }; + virtual void Simplify( bool bIsBase ) SAL_OVERRIDE { maImpl.Simplify(bIsBase); }; virtual ~GraphiteServerFontLayout() throw(); diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx index 2e96584f9f4c..aecf79c29ef7 100644 --- a/vcl/inc/headless/svpbmp.hxx +++ b/vcl/inc/headless/svpbmp.hxx @@ -41,22 +41,22 @@ public: // SalBitmap virtual bool Create( const Size& rSize, sal_uInt16 nBitCount, - const BitmapPalette& rPal ); - virtual bool Create( const SalBitmap& rSalBmp ); + const BitmapPalette& rPal ) SAL_OVERRIDE; + virtual bool Create( const SalBitmap& rSalBmp ) SAL_OVERRIDE; virtual bool Create( const SalBitmap& rSalBmp, - SalGraphics* pGraphics ); + SalGraphics* pGraphics ) SAL_OVERRIDE; virtual bool Create( const SalBitmap& rSalBmp, - sal_uInt16 nNewBitCount ); + 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 ); - virtual void Destroy(); - virtual Size GetSize() const; - virtual sal_uInt16 GetBitCount() const; + bool bMask = false ) SAL_OVERRIDE; + virtual void Destroy() SAL_OVERRIDE; + virtual Size GetSize() const SAL_OVERRIDE; + virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE; - virtual BitmapBuffer* AcquireBuffer( bool bReadOnly ); - virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ); - virtual bool GetSystemData( BitmapSystemData& rData ); + virtual BitmapBuffer* AcquireBuffer( bool bReadOnly ) SAL_OVERRIDE; + virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) SAL_OVERRIDE; + virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE; static sal_uInt32 getBitCountFromScanlineFormat( basebmp::Format nFormat ); }; diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx index 2f1ea8a4c4a2..8f075891fe4c 100644 --- a/vcl/inc/headless/svpdummies.hxx +++ b/vcl/inc/headless/svpdummies.hxx @@ -37,16 +37,16 @@ public: virtual ~SvpSalObject(); // overload all pure virtual methods - virtual void ResetClipRegion(); - virtual sal_uInt16 GetClipRegionType(); - virtual void BeginSetClipRegion( sal_uLong nRects ); - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); - virtual void EndSetClipRegion(); + virtual void ResetClipRegion() SAL_OVERRIDE; + virtual sal_uInt16 GetClipRegionType() SAL_OVERRIDE; + virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE; + virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; + virtual void EndSetClipRegion() SAL_OVERRIDE; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); - virtual void Show( bool bVisible ); + virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; + virtual void Show( bool bVisible ) SAL_OVERRIDE; - virtual const SystemEnvData* GetSystemData() const; + virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE; }; class SvpImeStatus : public SalI18NImeStatus @@ -55,8 +55,8 @@ class SvpImeStatus : public SalI18NImeStatus SvpImeStatus() {} virtual ~SvpImeStatus(); - virtual bool canToggle(); - virtual void toggle(); + virtual bool canToggle() SAL_OVERRIDE; + virtual void toggle() SAL_OVERRIDE; }; class SvpSalSystem : public SalGenericSystem @@ -65,14 +65,14 @@ public: SvpSalSystem() {} virtual ~SvpSalSystem(); // get info about the display - virtual unsigned int GetDisplayScreenCount(); - virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ); - virtual OUString GetDisplayScreenName( unsigned int nScreen ); + virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE; + virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) SAL_OVERRIDE; + virtual OUString GetDisplayScreenName( unsigned int nScreen ) SAL_OVERRIDE; virtual int ShowNativeDialog( const OUString& rTitle, const OUString& rMessage, const std::list< OUString >& rButtons, - int nDefButton ); + int nDefButton ) SAL_OVERRIDE; }; diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index b05f71e71078..6a14adf6e1d2 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -76,62 +76,62 @@ public: #endif // SalFrame - virtual SalGraphics* AcquireGraphics(); - virtual void ReleaseGraphics( SalGraphics* pGraphics ); - - virtual bool PostEvent( void* pData ); - - virtual void SetTitle( const OUString& rTitle ); - virtual void SetIcon( sal_uInt16 nIcon ); - virtual void SetMenu( SalMenu* pMenu ); - virtual void DrawMenuBar(); - - virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ); - virtual void Show( bool bVisible, bool bNoActivate = false ); - virtual void Enable( bool bEnable ); - virtual void SetMinClientSize( long nWidth, long nHeight ); - virtual void SetMaxClientSize( long nWidth, long nHeight ); - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ); - virtual void GetClientSize( long& rWidth, long& rHeight ); - virtual void GetWorkArea( Rectangle& rRect ); - virtual SalFrame* GetParent() const; - virtual void SetWindowState( const SalFrameState* pState ); - virtual bool GetWindowState( SalFrameState* pState ); - virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ); - virtual void StartPresentation( bool bStart ); - virtual void SetAlwaysOnTop( bool bOnTop ); - virtual void ToTop( sal_uInt16 nFlags ); - virtual void SetPointer( PointerStyle ePointerStyle ); - virtual void CaptureMouse( bool bMouse ); - virtual void SetPointerPos( long nX, long nY ); + virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE; + virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE; + + virtual bool PostEvent( void* pData ) SAL_OVERRIDE; + + virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE; + virtual void SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE; + virtual void SetMenu( SalMenu* pMenu ) SAL_OVERRIDE; + virtual void DrawMenuBar() SAL_OVERRIDE; + + virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) SAL_OVERRIDE; + virtual void Show( bool bVisible, bool bNoActivate = false ) SAL_OVERRIDE; + virtual void Enable( bool bEnable ) SAL_OVERRIDE; + virtual void SetMinClientSize( long nWidth, long nHeight ) SAL_OVERRIDE; + virtual void SetMaxClientSize( long nWidth, long nHeight ) SAL_OVERRIDE; + virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) SAL_OVERRIDE; + virtual void GetClientSize( long& rWidth, long& rHeight ) SAL_OVERRIDE; + virtual void GetWorkArea( Rectangle& rRect ) SAL_OVERRIDE; + virtual SalFrame* GetParent() const SAL_OVERRIDE; + virtual void SetWindowState( const SalFrameState* pState ) SAL_OVERRIDE; + virtual bool GetWindowState( SalFrameState* pState ) SAL_OVERRIDE; + virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) SAL_OVERRIDE; + virtual void StartPresentation( bool bStart ) SAL_OVERRIDE; + virtual void SetAlwaysOnTop( bool bOnTop ) SAL_OVERRIDE; + virtual void ToTop( sal_uInt16 nFlags ) SAL_OVERRIDE; + virtual void SetPointer( PointerStyle ePointerStyle ) SAL_OVERRIDE; + virtual void CaptureMouse( bool bMouse ) SAL_OVERRIDE; + virtual void SetPointerPos( long nX, long nY ) SAL_OVERRIDE; using SalFrame::Flush; - virtual void Flush(); - virtual void Sync(); - virtual void SetInputContext( SalInputContext* pContext ); - virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual OUString GetKeyName( sal_uInt16 nKeyCode ); - virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); - virtual LanguageType GetInputLanguage(); - virtual void UpdateSettings( AllSettings& rSettings ); - virtual void Beep(); - virtual const SystemEnvData* GetSystemData() const; - virtual SalPointerState GetPointerState(); - virtual SalIndicatorState GetIndicatorState(); - virtual void SimulateKeyPress( sal_uInt16 nKeyCode ); - virtual void SetParent( SalFrame* pNewParent ); - virtual bool SetPluginParent( SystemParentData* pNewParent ); - virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( sal_uLong nRects ); - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); - virtual void EndSetClipRegion(); + virtual void Flush() SAL_OVERRIDE; + virtual void Sync() SAL_OVERRIDE; + virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE; + virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE; + virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE; + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) SAL_OVERRIDE; + virtual LanguageType GetInputLanguage() SAL_OVERRIDE; + virtual void UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE; + virtual void Beep() SAL_OVERRIDE; + virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE; + virtual SalPointerState GetPointerState() SAL_OVERRIDE; + virtual SalIndicatorState GetIndicatorState() SAL_OVERRIDE; + virtual void SimulateKeyPress( sal_uInt16 nKeyCode ) SAL_OVERRIDE; + virtual void SetParent( SalFrame* pNewParent ) SAL_OVERRIDE; + virtual bool SetPluginParent( SystemParentData* pNewParent ) SAL_OVERRIDE; + virtual void ResetClipRegion() SAL_OVERRIDE; + virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE; + virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; + virtual void EndSetClipRegion() SAL_OVERRIDE; // If enabled we can get damage notifications for regions immediately rendered to ... virtual void enableDamageTracker( bool bOn = true ); virtual void damaged( const basegfx::B2IBox& /* rDamageRect */) {} /*TODO: functional implementation */ - virtual void SetScreenNumber( unsigned int nScreen ) { (void)nScreen; } - virtual void SetApplicationID(const OUString &rApplicationID) { (void) rApplicationID; } + virtual void SetScreenNumber( unsigned int nScreen ) SAL_OVERRIDE { (void)nScreen; } + virtual void SetApplicationID(const OUString &rApplicationID) SAL_OVERRIDE { (void) rApplicationID; } bool IsVisible() { return m_bVisible; } static SvpSalFrame* GetFocusFrame() { return s_pFocusFrame; } diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index bf4effd63e94..ff7f0e047cd2 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -122,44 +122,44 @@ protected: Region m_aClipRegion; protected: - virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, const SalBitmap& rAlphaBitmap ); + virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, 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; public: SvpSalGraphics(); virtual ~SvpSalGraphics(); - virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ); - virtual sal_uInt16 GetBitCount() const; - virtual long GetGraphicsWidth() const; + virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE; + virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE; + virtual long GetGraphicsWidth() const SAL_OVERRIDE; - virtual void ResetClipRegion(); - virtual bool setClipRegion( const Region& ); + virtual void ResetClipRegion() SAL_OVERRIDE; + virtual bool setClipRegion( const Region& ) SAL_OVERRIDE; - virtual void SetLineColor(); - virtual void SetLineColor( SalColor nSalColor ); - virtual void SetFillColor(); - virtual void SetFillColor( SalColor nSalColor ); + virtual void SetLineColor() SAL_OVERRIDE; + virtual void SetLineColor( SalColor nSalColor ) SAL_OVERRIDE; + virtual void SetFillColor() SAL_OVERRIDE; + virtual void SetFillColor( SalColor nSalColor ) SAL_OVERRIDE; - virtual void SetXORMode( bool bSet, bool ); + virtual void SetXORMode( bool bSet, bool ) SAL_OVERRIDE; - virtual void SetROPLineColor( SalROPColor nROPColor ); - virtual void SetROPFillColor( SalROPColor nROPColor ); + virtual void SetROPLineColor( SalROPColor nROPColor ) SAL_OVERRIDE; + virtual void SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE; - virtual void SetTextColor( SalColor nSalColor ); - virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ); - virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); - virtual const ImplFontCharMap* GetImplFontCharMap() const; - virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; - virtual void GetDevFontList( PhysicalFontCollection* ); - virtual void ClearDevFontCache(); - virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ); + virtual void SetTextColor( SalColor nSalColor ) SAL_OVERRIDE; + virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE; + virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE; + virtual const ImplFontCharMap* GetImplFontCharMap() const SAL_OVERRIDE; + virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE; + virtual void GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE; + virtual void ClearDevFontCache() SAL_OVERRIDE; + virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE; virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, sal_GlyphId* pGlyphIds, @@ -167,48 +167,48 @@ public: sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo - ); - virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded ); + ) SAL_OVERRIDE; + virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded ) SAL_OVERRIDE; virtual const void* GetEmbedFontData( const PhysicalFontFace*, const sal_Ucs* pUnicodes, sal_Int32* pWidths, FontSubsetInfo& rInfo, - long* pDataLen ); - virtual void FreeEmbedFontData( const void* pData, long nDataLen ); + long* pDataLen ) SAL_OVERRIDE; + virtual void FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE; virtual void GetGlyphWidths( const PhysicalFontFace*, bool bVertical, Int32Vector& rWidths, - Ucs2UIntMap& rUnicodeEnc ); - virtual bool GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ); - virtual bool GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ); - virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ); - virtual void DrawServerFontLayout( const ServerFontLayout& ); - virtual bool supportsOperation( OutDevSupportType ) const; - 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 bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ); + Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE; + virtual bool GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) SAL_OVERRIDE; + virtual bool GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) SAL_OVERRIDE; + virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE; + virtual void DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE; + virtual bool supportsOperation( OutDevSupportType ) const SAL_OVERRIDE; + 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 bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) SAL_OVERRIDE; virtual bool drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, - com::sun::star::drawing::LineCap); - virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ); - virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ); + com::sun::star::drawing::LineCap) 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 ); + PCONSTSALPOINT* pPtAry ) SAL_OVERRIDE; virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, - const sal_uInt8* pFlgAry ); + const sal_uInt8* pFlgAry ) SAL_OVERRIDE; virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, - const sal_uInt8* pFlgAry ); + const sal_uInt8* pFlgAry ) SAL_OVERRIDE; virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, - const sal_uInt8* const* pFlgAry ); + const sal_uInt8* const* pFlgAry ) SAL_OVERRIDE; virtual void copyArea( long nDestX, long nDestY, @@ -216,29 +216,29 @@ public: long nSrcY, long nSrcWidth, long nSrcHeight, - sal_uInt16 nFlags ); + sal_uInt16 nFlags ) SAL_OVERRIDE; virtual void copyBits( const SalTwoRect& rPosAry, - SalGraphics* pSrcGraphics ); + SalGraphics* pSrcGraphics ) SAL_OVERRIDE; virtual void drawBitmap( const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap ); + 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 ); - virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ); - virtual SalColor getPixel( long nX, long nY ); - virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ); - virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ); + SalColor nMaskColor ) SAL_OVERRIDE; + virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; + virtual SalColor getPixel( long nX, long nY ) SAL_OVERRIDE; + 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_uLong nSize ); + virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) 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; #ifdef IOS void SetVirDevGraphics( CGLayerRef xLayer, CGContextRef xContext, int = 0 ); diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index d071e4c23537..dd557d13ff8d 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -48,8 +48,8 @@ public: virtual ~SvpSalTimer(); // overload all pure virtual methods - virtual void Start( sal_uLong nMS ); - virtual void Stop(); + virtual void Start( sal_uLong nMS ) SAL_OVERRIDE; + virtual void Stop() SAL_OVERRIDE; }; class SvpSalFrame; diff --git a/vcl/inc/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx index 2c404ee2b048..b8a3b3fa52c4 100644 --- a/vcl/inc/headless/svpprn.hxx +++ b/vcl/inc/headless/svpprn.hxx @@ -30,7 +30,7 @@ class SvpSalInfoPrinter : public PspSalInfoPrinter { public: - virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); + virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) SAL_OVERRIDE; }; class SvpSalPrinter : public PspSalPrinter diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx index 1f0376ecc196..33926757a0c8 100644 --- a/vcl/inc/headless/svpvd.hxx +++ b/vcl/inc/headless/svpvd.hxx @@ -41,12 +41,12 @@ public: virtual ~SvpSalVirtualDevice(); // SalVirtualDevice - virtual SalGraphics* AcquireGraphics(); - virtual void ReleaseGraphics( SalGraphics* pGraphics ); + virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE; + virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE; - virtual bool SetSize( long nNewDX, long nNewDY ); - virtual bool SetSizeUsingBuffer( long nNewDX, long nNewDY, const basebmp::RawMemorySharedArray &pBuffer ); - virtual void GetSize( long& rWidth, long& rHeight ); + virtual bool SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE; + virtual bool SetSizeUsingBuffer( long nNewDX, long nNewDY, const basebmp::RawMemorySharedArray &pBuffer ) SAL_OVERRIDE; + virtual void GetSize( long& rWidth, long& rHeight ) SAL_OVERRIDE; }; #endif // INCLUDED_VCL_INC_HEADLESS_SVPVD_HXX diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx index aad06c5f33e2..1409f2659ec1 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -46,9 +46,9 @@ private: protected: DECL_LINK( TimerHdl, Timer* ); - virtual void Paint( const Rectangle& ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual OUString GetText() const; + virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; void ImplShow(); public: @@ -69,7 +69,7 @@ public: Size CalcOutSize() const; const Rectangle& GetHelpArea() const { return maHelpArea; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 502b04ee5b76..d0c3f709a02d 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -241,14 +241,14 @@ private: ::vcl::QuickSelectionEngine maQuickSelectionEngine; protected: - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; bool SelectEntries( sal_Int32 nSelect, LB_EVENT_TYPE eLET, bool bShift = false, bool bCtrl = false, bool bSelectPosChange = false ); void ImplPaint( sal_Int32 nPos, bool bErase = false, bool bLayout = false ); @@ -261,11 +261,11 @@ protected: void ImplHideFocusRect(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; ImplListBoxWindow( Window* pParent, WinBits nWinStyle ); ~ImplListBoxWindow(); @@ -374,9 +374,9 @@ public: protected: // ISearchableStringList - virtual ::vcl::StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const; - virtual ::vcl::StringEntryIdentifier NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const; - virtual void SelectEntry( ::vcl::StringEntryIdentifier _entry ); + virtual ::vcl::StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const SAL_OVERRIDE; + virtual ::vcl::StringEntryIdentifier NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const SAL_OVERRIDE; + virtual void SelectEntry( ::vcl::StringEntryIdentifier _entry ) SAL_OVERRIDE; }; class ImplListBox : public Control @@ -397,11 +397,11 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer; protected: - virtual void GetFocus(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void GetFocus() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void ImplResizeControls(); void ImplCheckScrollBars(); @@ -418,9 +418,9 @@ public: const ImplEntryList* GetEntryList() const { return maLBWindow.GetEntryList(); } ImplListBoxWindow* GetMainWindow() { return &maLBWindow; } - virtual void Resize(); - virtual const Wallpaper& GetDisplayBackground() const; - virtual Window* GetPreferredKeyInputWindow(); + virtual void Resize() SAL_OVERRIDE; + virtual const Wallpaper& GetDisplayBackground() const SAL_OVERRIDE; + virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; sal_Int32 InsertEntry( sal_Int32 nPos, const OUString& rStr ); sal_Int32 InsertEntry( sal_Int32 nPos, const OUString& rStr, const Image& rImage ); @@ -517,7 +517,7 @@ private: bool mbAutoWidth; protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: ImplListBoxFloatingWindow( Window* pParent ); @@ -534,8 +534,8 @@ public: void StartFloat( bool bStartTracking ); virtual void setPosSizePixel( long nX, long nY, - long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) + long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ) SAL_OVERRIDE; + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE { FloatingWindow::SetPosSizePixel( rNewPos, rNewSize ); } void SetDropDownLineCount( sal_uInt16 n ) { mnDDLineCount = n; } @@ -543,7 +543,7 @@ public: sal_Int32 GetPopupModeStartSaveSelection() const { return mnPopupModeStartSaveSelection; } - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; }; class ImplWin : public Control @@ -567,18 +567,18 @@ private: void ImplDraw( bool bLayout = false ); protected: - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; public: ImplWin( Window* pParent, WinBits nWinStyle = 0 ); ~ImplWin() {}; - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; sal_Int32 GetItemPos() const { return mnItemPos; } void SetItemPos( sal_Int32 n ) { mnItemPos = n; } @@ -619,7 +619,7 @@ public: ImplBtn( Window* pParent, WinBits nWinStyle = 0 ); ~ImplBtn() {}; - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MBDown(); void SetMBDownHdl( const Link& rLink ) { maMBDownHdl = rLink; } diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 11e4ea0e8907..a026b1d8a71f 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -65,10 +65,10 @@ namespace vcl PrintPreviewWindow( Window* pParent ); virtual ~PrintPreviewWindow(); - virtual void Paint( const Rectangle& rRect ); - virtual void Command( const CommandEvent& ); - virtual void Resize(); - virtual void DataChanged( const DataChangedEvent& ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; void setPreview( const GDIMetaFile&, const Size& i_rPaperSize, const OUString& i_rPaperName, @@ -88,9 +88,9 @@ namespace vcl ShowNupOrderWindow( Window* pParent ); virtual ~ShowNupOrderWindow(); - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; - virtual void Paint( const Rectangle& ); + virtual void Paint( const Rectangle& ) SAL_OVERRIDE; void setValues( int i_nOrderMode, int i_nColumns, int i_nRows ) { @@ -243,9 +243,9 @@ namespace vcl void storeToSettings(); com::sun::star::beans::PropertyValue* getValueForWindow( Window* ) const; - virtual void Resize(); - virtual void Command( const CommandEvent& ); - virtual void DataChanged( const DataChangedEvent& ); + virtual void Resize() SAL_OVERRIDE; + virtual void Command( const CommandEvent& ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; DECL_LINK( SelectHdl, ListBox* ); DECL_LINK( ClickHdl, Button* ); diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 57e7480369fd..d3b70fcadf82 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -240,23 +240,23 @@ protected: class VCL_PLUGIN_PUBLIC MultiSalLayout : public SalLayout { public: - virtual void DrawText( SalGraphics& ) const; + virtual void DrawText( SalGraphics& ) const SAL_OVERRIDE; virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const SAL_OVERRIDE; - virtual long FillDXArray( sal_Int32* pDXArray ) const; - virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const; + virtual long FillDXArray( sal_Int32* pDXArray ) const SAL_OVERRIDE; + virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const SAL_OVERRIDE; virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos, int&, sal_Int32* pGlyphAdvAry, int* pCharPosAry, - const PhysicalFontFace** pFallbackFonts ) const; - virtual bool GetOutline( SalGraphics&, ::basegfx::B2DPolyPolygonVector& ) const; + const PhysicalFontFace** pFallbackFonts ) const SAL_OVERRIDE; + virtual bool GetOutline( SalGraphics&, ::basegfx::B2DPolyPolygonVector& ) const SAL_OVERRIDE; // used only by OutputDevice::ImplLayout, TODO: make friend explicit MultiSalLayout( SalLayout& rBaseLayout, const PhysicalFontFace* pBaseFont = NULL ); virtual bool AddFallback( SalLayout& rFallbackLayout, ImplLayoutRuns&, const PhysicalFontFace* pFallbackFont ); - virtual bool LayoutText( ImplLayoutArgs& ); - virtual void AdjustLayout( ImplLayoutArgs& ); - virtual void InitFont() const; + virtual bool LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE; + virtual void AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE; + virtual void InitFont() const SAL_OVERRIDE; void SetInComplete(bool bInComplete = true); @@ -265,9 +265,9 @@ protected: private: // dummy implementations - virtual void MoveGlyph( int, long ) {} - virtual void DropGlyph( int ) {} - virtual void Simplify( bool ) {} + virtual void MoveGlyph( int, long ) SAL_OVERRIDE {} + virtual void DropGlyph( int ) SAL_OVERRIDE {} + virtual void Simplify( bool ) SAL_OVERRIDE {} // enforce proper copy semantic SAL_DLLPRIVATE MultiSalLayout( const MultiSalLayout& ); @@ -327,7 +327,7 @@ public: // used by layout engines void AppendGlyph( const GlyphItem& ); void Reserve(int size) { m_GlyphItems.reserve(size + 1); } - virtual void AdjustLayout( ImplLayoutArgs& ); + virtual void AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE; virtual void ApplyDXArray( ImplLayoutArgs& ); virtual void Justify( long nNewWidth ); void KashidaJustify( long nIndex, int nWidth ); @@ -335,24 +335,24 @@ public: void SortGlyphItems(); // used by upper layers - virtual long GetTextWidth() const; - virtual long FillDXArray( sal_Int32* pDXArray ) const; + virtual long GetTextWidth() const SAL_OVERRIDE; + virtual long FillDXArray( sal_Int32* pDXArray ) const SAL_OVERRIDE; virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const SAL_OVERRIDE; - virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const; + virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const SAL_OVERRIDE; // used by display layers virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos, int&, sal_Int32* pGlyphAdvAry = NULL, int* pCharPosAry = NULL, - const PhysicalFontFace** pFallbackFonts = NULL ) const; + const PhysicalFontFace** pFallbackFonts = NULL ) const SAL_OVERRIDE; protected: GenericSalLayout(); virtual ~GenericSalLayout(); // for glyph+font+script fallback - virtual void MoveGlyph( int nStart, long nNewXPos ); - virtual void DropGlyph( int nStart ); - virtual void Simplify( bool bIsBase ); + virtual void MoveGlyph( int nStart, long nNewXPos ) SAL_OVERRIDE; + virtual void DropGlyph( int nStart ) SAL_OVERRIDE; + virtual void Simplify( bool bIsBase ) SAL_OVERRIDE; bool GetCharWidths( sal_Int32* pCharWidths ) const; diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 5795c83d327a..e4d54bb363c5 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -98,7 +98,7 @@ namespace vcl { class DisplayConnection; class SettingsConfigItem; class DeleteO class LocaleConfigurationListener : public utl::ConfigurationListener { public: - virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE; }; struct ImplSVAppData diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx index dee69c690161..dd5de8b03539 100644 --- a/vcl/inc/textlayout.hxx +++ b/vcl/inc/textlayout.hxx @@ -59,7 +59,7 @@ namespace vcl const OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength - ) const; + ) const SAL_OVERRIDE; virtual void DrawText( const Point& _rStartPoint, const OUString& _rText, @@ -67,20 +67,20 @@ namespace vcl sal_Int32 _nLength, MetricVector* _pVector, OUString* _pDisplayText - ); + ) SAL_OVERRIDE; virtual bool GetCaretPositions( const OUString& _rText, sal_Int32* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength - ) const; + ) const SAL_OVERRIDE; virtual sal_Int32 GetTextBreak( const OUString& _rText, long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const SAL_OVERRIDE; - virtual bool DecomposeTextRectAction() const; + virtual bool DecomposeTextRectAction() const SAL_OVERRIDE; private: OutputDevice& m_rTargetDevice; diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index 85c664ac4e2a..36196de95439 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -87,8 +87,8 @@ class GtkSalTimer : public SalTimer public: GtkSalTimer(); ~GtkSalTimer(); - virtual void Start( sal_uLong nMS ); - virtual void Stop(); + virtual void Start( sal_uLong nMS ) SAL_OVERRIDE; + virtual void Stop() SAL_OVERRIDE; bool Expired(); sal_uLong m_nTimeoutMS; @@ -105,7 +105,7 @@ public: virtual ~GtkData(); virtual void Init(); - virtual void Dispose(); + virtual void Dispose() SAL_OVERRIDE; virtual void initNWF(); virtual void deInitNWF(); @@ -116,8 +116,8 @@ public: void Yield( bool bWait, bool bHandleAllCurrentEvents ); inline GdkDisplay *GetGdkDisplay(); - virtual void ErrorTrapPush(); - virtual bool ErrorTrapPop( bool bIgnoreError ); + virtual void ErrorTrapPush() SAL_OVERRIDE; + virtual bool ErrorTrapPop( bool bIgnoreError ) SAL_OVERRIDE; }; class GtkSalFrame; @@ -145,9 +145,13 @@ public: GtkSalSystem* getSystem() const { return m_pSys; } - virtual void deregisterFrame( SalFrame* pFrame ); + virtual void deregisterFrame( SalFrame* pFrame ) SAL_OVERRIDE; GdkCursor *getCursor( PointerStyle ePointerStyle ); +#if GTK_CHECK_VERSION(3,0,0) virtual int CaptureMouse( SalFrame* pFrame ); +#else + virtual int CaptureMouse( SalFrame* pFrame ) SAL_OVERRIDE; +#endif int GetDefaultScreen() { return m_pSys->GetDisplayBuiltInScreen(); } SalX11Screen GetDefaultXScreen() { return m_pSys->GetDisplayDefaultXScreen(); } @@ -156,7 +160,7 @@ public: #if GTK_CHECK_VERSION(3,0,0) // int GetScreenCount() { return m_pSys->GetDisplayScreenCount(); } #else - virtual ScreenData *initScreen( SalX11Screen nXScreen ) const; + virtual ScreenData *initScreen( SalX11Screen nXScreen ) const SAL_OVERRIDE; #endif GdkFilterReturn filterGdkEvent( GdkXEvent* sys_event, @@ -166,12 +170,12 @@ public: void screenSizeChanged( GdkScreen* ); void monitorsChanged( GdkScreen* ); - virtual void PostUserEvent(); + virtual void PostUserEvent() SAL_OVERRIDE; #if GTK_CHECK_VERSION(3,0,0) guint32 GetLastUserEventTime( bool /* b */ ) { return GDK_CURRENT_TIME; } // horrible hack #else - virtual bool Dispatch( XEvent *pEvent ); + virtual bool Dispatch( XEvent *pEvent ) SAL_OVERRIDE; #endif }; diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 76a8ec5f83b4..4466ca6dc155 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -351,100 +351,100 @@ public: // SalGraphics or NULL, but two Graphics for all SalFrames // must be returned - virtual SalGraphics* AcquireGraphics(); - virtual void ReleaseGraphics( SalGraphics* pGraphics ); + virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE; + virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE; // Event must be destroyed, when Frame is destroyed // When Event is called, SalInstance::Yield() must be returned - virtual bool PostEvent( void* pData ); + virtual bool PostEvent( void* pData ) SAL_OVERRIDE; - virtual void SetTitle( const OUString& rTitle ); - virtual void SetIcon( sal_uInt16 nIcon ); - virtual void SetMenu( SalMenu *pSalMenu ); + virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE; + virtual void SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE; + virtual void SetMenu( SalMenu *pSalMenu ) SAL_OVERRIDE; virtual SalMenu* GetMenu( void ); - virtual void DrawMenuBar(); + virtual void DrawMenuBar() SAL_OVERRIDE; void EnsureAppMenuWatch(); - virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ); + virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) SAL_OVERRIDE; // Before the window is visible, a resize event // must be sent with the correct size - virtual void Show( bool bVisible, bool bNoActivate = false ); - virtual void Enable( bool bEnable ); + virtual void Show( bool bVisible, bool bNoActivate = false ) SAL_OVERRIDE; + virtual void Enable( bool bEnable ) SAL_OVERRIDE; // Set ClientSize and Center the Window to the desktop // and send/post a resize message - 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 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; // Enable/Disable ScreenSaver, SystemAgents, ... - virtual void StartPresentation( bool bStart ); + virtual void StartPresentation( bool bStart ) SAL_OVERRIDE; // Show Window over all other Windows - virtual void SetAlwaysOnTop( bool bOnTop ); + virtual void SetAlwaysOnTop( bool bOnTop ) SAL_OVERRIDE; // Window to top and grab focus - virtual void ToTop( sal_uInt16 nFlags ); + virtual void ToTop( sal_uInt16 nFlags ) SAL_OVERRIDE; // this function can call with the same // pointer style - virtual void SetPointer( PointerStyle ePointerStyle ); - virtual void CaptureMouse( bool bMouse ); - virtual void SetPointerPos( long nX, long nY ); + virtual void SetPointer( PointerStyle ePointerStyle ) SAL_OVERRIDE; + virtual void CaptureMouse( bool bMouse ) SAL_OVERRIDE; + virtual void SetPointerPos( long nX, long nY ) SAL_OVERRIDE; // flush output buffer using SalFrame::Flush; - virtual void Flush(); + virtual void Flush() SAL_OVERRIDE; // flush output buffer, wait till outstanding operations are done - virtual void Sync(); + virtual void Sync() SAL_OVERRIDE; - virtual void SetInputContext( SalInputContext* pContext ); - virtual void EndExtTextInput( sal_uInt16 nFlags ); + virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE; + virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE; - virtual OUString GetKeyName( sal_uInt16 nKeyCode ); - virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); + virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE; + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) SAL_OVERRIDE; // returns the input language used for the last key stroke // may be LANGUAGE_DONTKNOW if not supported by the OS - 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; // returns system data (most prominent: window handle) - virtual const SystemEnvData* GetSystemData() const; + virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE; // get current modifier and button mask - virtual SalPointerState GetPointerState(); + virtual SalPointerState GetPointerState() SAL_OVERRIDE; - virtual SalIndicatorState GetIndicatorState(); + virtual SalIndicatorState GetIndicatorState() SAL_OVERRIDE; - virtual void SimulateKeyPress( sal_uInt16 nKeyCode ); + virtual void SimulateKeyPress( sal_uInt16 nKeyCode ) SAL_OVERRIDE; // set new parent window - virtual void SetParent( SalFrame* pNewParent ); + virtual void SetParent( SalFrame* pNewParent ) SAL_OVERRIDE; // reparent window to act as a plugin; implementation // may choose to use a new system window internally // return false to indicate failure - virtual bool SetPluginParent( SystemParentData* pNewParent ); + virtual bool SetPluginParent( SystemParentData* pNewParent ) SAL_OVERRIDE; - virtual void SetScreenNumber( unsigned int ); - virtual void SetApplicationID( const OUString &rWMClass ); + virtual void SetScreenNumber( unsigned int ) SAL_OVERRIDE; + virtual void SetApplicationID( const OUString &rWMClass ) SAL_OVERRIDE; // shaped system windows // set clip region to none (-> rectangular windows, normal state) - virtual void ResetClipRegion(); + virtual void ResetClipRegion() SAL_OVERRIDE; // start setting the clipregion consisting of nRects rectangles - virtual void BeginSetClipRegion( sal_uLong nRects ); + virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE; // add a rectangle to the clip region - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); + virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; // done setting up the clipregion - virtual void EndSetClipRegion(); + virtual void EndSetClipRegion() SAL_OVERRIDE; static GtkSalFrame *getFromWindow( GtkWindow *pWindow ); diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index d3c540b0307f..d13ad94aa785 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -134,30 +134,30 @@ public: static bool bNeedPixmapPaint; // native widget methods - virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); + virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ) SAL_OVERRIDE; 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& rCaption ); + const OUString& rCaption ) SAL_OVERRIDE; virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption, - Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); + Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) SAL_OVERRIDE; //helper methods for frame's UpdateSettings void updateSettings( AllSettings& rSettings ); static void refreshFontconfig( GtkSettings *pSettings ); static void signalSettingsNotify( GObject*, GParamSpec *pSpec, gpointer ); - virtual bool setClipRegion( const Region& ); - virtual void ResetClipRegion(); + virtual bool setClipRegion( const Region& ) SAL_OVERRIDE; + virtual void ResetClipRegion() SAL_OVERRIDE; // some themes set the background pixmap of our window EVERY time // a control is painted; but presentation effects need // the background set to None; workaround: set the background // before copyBits virtual void copyBits( const SalTwoRect& rPosAry, - SalGraphics* pSrcGraphics ); + SalGraphics* pSrcGraphics ) SAL_OVERRIDE; protected: typedef std::list< Rectangle > clipList; diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index 750382073935..259611112651 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -42,8 +42,8 @@ class GtkYieldMutex : public SalYieldMutex public: GtkYieldMutex(); - virtual void acquire(); - virtual void release(); + virtual void acquire() SAL_OVERRIDE; + virtual void release() SAL_OVERRIDE; void ThreadsEnter(); void ThreadsLeave(); diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx index 34710ff87f64..11a38e940b34 100644 --- a/vcl/inc/unx/gtk/gtkobject.hxx +++ b/vcl/inc/unx/gtk/gtkobject.hxx @@ -44,18 +44,18 @@ public: virtual ~GtkSalObject(); // overload all pure virtual methods - virtual void ResetClipRegion(); - virtual sal_uInt16 GetClipRegionType(); - virtual void BeginSetClipRegion( sal_uLong nRects ); - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); - virtual void EndSetClipRegion(); + virtual void ResetClipRegion() SAL_OVERRIDE; + virtual sal_uInt16 GetClipRegionType() SAL_OVERRIDE; + virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE; + virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; + virtual void EndSetClipRegion() SAL_OVERRIDE; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); - virtual void Show( bool bVisible ); + virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; + virtual void Show( bool bVisible ) SAL_OVERRIDE; - virtual void SetForwardKey( bool bEnable ); + virtual void SetForwardKey( bool bEnable ) SAL_OVERRIDE; - virtual const SystemEnvData* GetSystemData() const; + virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE; }; #endif // INCLUDED_VCL_INC_UNX_GTK_GTKOBJECT_HXX diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx index 8e955a32d1d7..56dfe8bfb1cb 100644 --- a/vcl/inc/unx/gtk/gtkprn.hxx +++ b/vcl/inc/unx/gtk/gtkprn.hxx @@ -27,8 +27,8 @@ public: virtual bool StartJob( const OUString* i_pFileName, const OUString& i_rJobName, const OUString& i_rAppName, ImplJobSetup* io_pSetupData, - vcl::PrinterController& io_rController); - virtual bool EndJob(); + vcl::PrinterController& io_rController) SAL_OVERRIDE; + virtual bool EndJob() SAL_OVERRIDE; private: bool impl_doJob( @@ -44,7 +44,7 @@ private: class VCL_DLLPUBLIC GtkSalInfoPrinter : public PspSalInfoPrinter { public: - sal_uLong GetCapabilities(const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType); + sal_uLong GetCapabilities(const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType) SAL_OVERRIDE; }; diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index a2e59e77fb4f..c9df33c7bb76 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -58,21 +58,21 @@ public: GtkSalMenu( bool bMenuBar ); virtual ~GtkSalMenu(); - 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 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 const GtkSalFrame* GetFrame() const; - virtual void CheckItem( unsigned nPos, bool bCheck ); - virtual void EnableItem( unsigned nPos, bool bEnable ); - virtual void ShowItem( unsigned nPos, bool bShow ); - 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 KeyCode& rKeyCode, const OUString& rKeyName ); - virtual void GetSystemMenuData( SystemMenuData* pData ); + virtual void CheckItem( unsigned nPos, bool bCheck ) SAL_OVERRIDE; + virtual void EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE; + virtual void ShowItem( unsigned nPos, bool bShow ) 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 KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE; + virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE; virtual void SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; } virtual Menu* GetMenu() { return mpVCLMenu; } diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx index 46c6402e357d..1c6a7621bc0c 100644 --- a/vcl/inc/unx/gtk/gtksys.hxx +++ b/vcl/inc/unx/gtk/gtksys.hxx @@ -26,15 +26,15 @@ public: virtual ~GtkSalSystem(); static GtkSalSystem *GetSingleton(); - virtual bool IsUnifiedDisplay(); - virtual unsigned int GetDisplayScreenCount(); - virtual unsigned int GetDisplayBuiltInScreen(); - virtual OUString GetDisplayScreenName (unsigned int nScreen); - virtual Rectangle GetDisplayScreenPosSizePixel (unsigned int nScreen); + virtual bool IsUnifiedDisplay() SAL_OVERRIDE; + virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE; + virtual unsigned int GetDisplayBuiltInScreen() SAL_OVERRIDE; + virtual OUString GetDisplayScreenName (unsigned int nScreen) SAL_OVERRIDE; + virtual Rectangle GetDisplayScreenPosSizePixel (unsigned int nScreen) SAL_OVERRIDE; virtual int ShowNativeDialog (const OUString& rTitle, const OUString& rMessage, const std::list< OUString >& rButtons, - int nDefButton); + int nDefButton) SAL_OVERRIDE; SalX11Screen GetDisplayDefaultXScreen() { return getXScreenFromDisplayScreen( GetDisplayBuiltInScreen() ); } int GetDisplayXScreenCount(); diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx index bec53de9f708..4bb50d0ad473 100644 --- a/vcl/inc/unx/i18n_status.hxx +++ b/vcl/inc/unx/i18n_status.hxx @@ -43,8 +43,8 @@ public: X11ImeStatus() {} virtual ~X11ImeStatus(); - virtual bool canToggle(); - virtual void toggle(); + virtual bool canToggle() SAL_OVERRIDE; + virtual void toggle() SAL_OVERRIDE; }; class I18NStatus diff --git a/vcl/inc/unx/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx index 53537afd66db..e2d28dee7f62 100644 --- a/vcl/inc/unx/kde/kdedata.hxx +++ b/vcl/inc/unx/kde/kdedata.hxx @@ -30,9 +30,9 @@ public: KDEData( SalInstance *pInstance ) : X11SalData( SAL_DATA_KDE3, pInstance ) {} virtual ~KDEData(); - virtual void Init(); - virtual void initNWF(); - virtual void deInitNWF(); + virtual void Init() SAL_OVERRIDE; + virtual void initNWF() SAL_OVERRIDE; + virtual void deInitNWF() SAL_OVERRIDE; }; class SalKDEDisplay : public SalX11Display @@ -62,11 +62,11 @@ public: KDESalFrame( SalFrame* pParent, sal_uLong ); virtual ~KDESalFrame(); - virtual SalGraphics* AcquireGraphics(); - virtual void ReleaseGraphics( SalGraphics *pGraphics ); - virtual void updateGraphics( bool bClear ); - virtual void UpdateSettings( AllSettings& rSettings ); - virtual void Show( bool bVisible, bool bNoActivate ); + virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE; + virtual void ReleaseGraphics( SalGraphics *pGraphics ) SAL_OVERRIDE; + virtual void updateGraphics( bool bClear ) SAL_OVERRIDE; + virtual void UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE; + virtual void Show( bool bVisible, bool bNoActivate ) SAL_OVERRIDE; }; class KDESalInstance : public X11SalInstance @@ -75,13 +75,13 @@ public: KDESalInstance( SalYieldMutex* pMutex ) : X11SalInstance( pMutex ) {} virtual ~KDESalInstance() {} - virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ); + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ) SAL_OVERRIDE; - virtual bool hasNativeFileSelection() const { return true; } + virtual bool hasNativeFileSelection() const SAL_OVERRIDE { return true; } virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 > createFilePicker( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& ); + com::sun::star::uno::XComponentContext >& ) SAL_OVERRIDE; }; class KDEXLib : public SalXLib @@ -100,7 +100,7 @@ public: m_nFakeCmdLineArgs( 0 ) {} virtual ~KDEXLib(); - virtual void Init(); + virtual void Init() SAL_OVERRIDE; void doStartup(); }; diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h index 1d22fbd4e2dc..f472d51e834f 100644 --- a/vcl/inc/unx/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -118,18 +118,18 @@ public: const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal - ); + ) SAL_OVERRIDE; - virtual bool Create( const SalBitmap& rSalBmp ); + virtual bool Create( const SalBitmap& rSalBmp ) SAL_OVERRIDE; virtual bool Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics - ); + ) SAL_OVERRIDE; virtual bool Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount - ); + ) SAL_OVERRIDE; virtual bool Create( const ::com::sun::star::uno::Reference< @@ -137,16 +137,16 @@ public: > xBitmapCanvas, Size& rSize, bool bMask = false - ); + ) SAL_OVERRIDE; - virtual void Destroy(); + virtual void Destroy() SAL_OVERRIDE; - virtual Size GetSize() const; - virtual sal_uInt16 GetBitCount() const; + virtual Size GetSize() const SAL_OVERRIDE; + virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE; - virtual BitmapBuffer* AcquireBuffer( bool bReadOnly ); - virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ); - virtual bool GetSystemData( BitmapSystemData& rData ); + virtual BitmapBuffer* AcquireBuffer( bool bReadOnly ) SAL_OVERRIDE; + virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) SAL_OVERRIDE; + virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE; }; diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx index f5890bc06e53..f2f7b1e8cc15 100644 --- a/vcl/inc/unx/saldata.hxx +++ b/vcl/inc/unx/saldata.hxx @@ -63,7 +63,7 @@ public: virtual ~X11SalData(); virtual void Init(); - virtual void Dispose(); + virtual void Dispose() SAL_OVERRIDE; virtual void initNWF(); virtual void deInitNWF(); @@ -78,8 +78,8 @@ public: void Timeout() const; // X errors - virtual void ErrorTrapPush(); - virtual bool ErrorTrapPop( bool bIgnoreError ); + virtual void ErrorTrapPush() SAL_OVERRIDE; + virtual bool ErrorTrapPop( bool bIgnoreError ) SAL_OVERRIDE; void XError( Display *pDisp, XErrorEvent *pEvent ); bool HasXErrorOccurred() const { return m_aXErrorHandlerStack.back().m_bWas; } diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 5d179e71b89a..564f78f7286f 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -378,7 +378,7 @@ public: std::list< SalObject* >& getSalObjects() { return m_aSalObjects; } - virtual void PostUserEvent() = 0; + virtual void PostUserEvent() SAL_OVERRIDE = 0; }; inline GC SalDisplay::GetGC( sal_uInt16 nDepth, SalX11Screen nXScreen ) const @@ -397,9 +397,9 @@ public: SalX11Display( Display* pDisp ); virtual ~SalX11Display(); - virtual bool Dispatch( XEvent *pEvent ); + virtual bool Dispatch( XEvent *pEvent ) SAL_OVERRIDE; virtual void Yield(); - virtual void PostUserEvent(); + virtual void PostUserEvent() SAL_OVERRIDE; bool IsEvent(); void SetupInput( SalI18N_InputMethod *pInputMethod ); diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 931764170861..8b0d0fa67028 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -210,67 +210,67 @@ public: bool appendUnicodeSequence( sal_Unicode ); bool endUnicodeSequence(); - virtual SalGraphics* AcquireGraphics(); - virtual void ReleaseGraphics( SalGraphics* pGraphics ); + virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE; + virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE; // call with true to clear graphics (setting None as drawable) // call with false to setup graphics with window (GetWindow()) virtual void updateGraphics( bool bClear ); - virtual bool PostEvent( void* pData ); - - virtual void SetTitle( const OUString& rTitle ); - virtual void SetIcon( sal_uInt16 nIcon ); - virtual void SetMenu( SalMenu* pMenu ); - virtual void DrawMenuBar(); - - virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ); - virtual void Show( bool bVisible, bool bNoActivate = false ); - virtual void Enable( bool bEnable ); - virtual void SetMinClientSize( long nWidth, long nHeight ); - virtual void SetMaxClientSize( long nWidth, long nHeight ); - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ); - virtual void GetClientSize( long& rWidth, long& rHeight ); - virtual void GetWorkArea( Rectangle& rRect ); - virtual SalFrame* GetParent() const; - virtual void SetWindowState( const SalFrameState* pState ); - virtual bool GetWindowState( SalFrameState* pState ); - virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nMonitor ); - 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 bool PostEvent( void* pData ) SAL_OVERRIDE; + + virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE; + virtual void SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE; + virtual void SetMenu( SalMenu* pMenu ) SAL_OVERRIDE; + virtual void DrawMenuBar() SAL_OVERRIDE; + + virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) SAL_OVERRIDE; + virtual void Show( bool bVisible, bool bNoActivate = false ) SAL_OVERRIDE; + virtual void Enable( bool bEnable ) SAL_OVERRIDE; + virtual void SetMinClientSize( long nWidth, long nHeight ) SAL_OVERRIDE; + virtual void SetMaxClientSize( long nWidth, long nHeight ) SAL_OVERRIDE; + virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) SAL_OVERRIDE; + virtual void GetClientSize( long& rWidth, long& rHeight ) SAL_OVERRIDE; + virtual void GetWorkArea( Rectangle& rRect ) SAL_OVERRIDE; + virtual SalFrame* GetParent() const SAL_OVERRIDE; + virtual void SetWindowState( const SalFrameState* pState ) SAL_OVERRIDE; + virtual bool GetWindowState( SalFrameState* pState ) SAL_OVERRIDE; + virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nMonitor ) SAL_OVERRIDE; + virtual void StartPresentation( bool bStart ) SAL_OVERRIDE; + virtual void SetAlwaysOnTop( bool bOnTop ) SAL_OVERRIDE; + virtual void ToTop( sal_uInt16 nFlags ) SAL_OVERRIDE; + virtual void SetPointer( PointerStyle ePointerStyle ) SAL_OVERRIDE; + virtual void CaptureMouse( bool bMouse ) SAL_OVERRIDE; + virtual void SetPointerPos( long nX, long nY ) SAL_OVERRIDE; using SalFrame::Flush; - virtual void Flush(); - virtual void Sync(); - virtual void SetInputContext( SalInputContext* pContext ); - virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual OUString GetKeyName( sal_uInt16 nKeyCode ); - virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); - virtual LanguageType GetInputLanguage(); - virtual void UpdateSettings( AllSettings& rSettings ); - virtual void Beep(); - virtual const SystemEnvData* GetSystemData() const; - virtual SalPointerState GetPointerState(); - virtual SalIndicatorState GetIndicatorState(); - virtual void SimulateKeyPress( sal_uInt16 nKeyCode ); - virtual void SetParent( SalFrame* pNewParent ); - virtual bool SetPluginParent( SystemParentData* pNewParent ); - - virtual void SetScreenNumber( unsigned int ); - virtual void SetApplicationID( const OUString &rWMClass ); + virtual void Flush() SAL_OVERRIDE; + virtual void Sync() SAL_OVERRIDE; + virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE; + virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE; + virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE; + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) SAL_OVERRIDE; + virtual LanguageType GetInputLanguage() SAL_OVERRIDE; + virtual void UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE; + virtual void Beep() SAL_OVERRIDE; + virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE; + virtual SalPointerState GetPointerState() SAL_OVERRIDE; + virtual SalIndicatorState GetIndicatorState() SAL_OVERRIDE; + virtual void SimulateKeyPress( sal_uInt16 nKeyCode ) SAL_OVERRIDE; + virtual void SetParent( SalFrame* pNewParent ) SAL_OVERRIDE; + virtual bool SetPluginParent( SystemParentData* pNewParent ) SAL_OVERRIDE; + + virtual void SetScreenNumber( unsigned int ) SAL_OVERRIDE; + virtual void SetApplicationID( const OUString &rWMClass ) SAL_OVERRIDE; // shaped system windows // set clip region to none (-> rectangular windows, normal state) - virtual void ResetClipRegion(); + virtual void ResetClipRegion() SAL_OVERRIDE; // start setting the clipregion consisting of nRects rectangles - virtual void BeginSetClipRegion( sal_uIntPtr nRects ); + virtual void BeginSetClipRegion( sal_uIntPtr nRects ) SAL_OVERRIDE; // add a rectangle to the clip region - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); + virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; // done setting up the clipregion - virtual void EndSetClipRegion(); + virtual void EndSetClipRegion() SAL_OVERRIDE; static Bool checkKeyReleaseForRepeat( Display*, XEvent*, XPointer pX11SalFrame ); diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index dc7a46ab8967..527aa87406b0 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -207,33 +207,33 @@ public: SalX11Screen GetScreenNumber() const { return m_nXScreen; } // overload all pure virtual methods - virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ); - virtual sal_uInt16 GetBitCount() const; - virtual long GetGraphicsWidth() const; + virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE; + virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE; + virtual long GetGraphicsWidth() const SAL_OVERRIDE; virtual long GetGraphicsHeight() const; - virtual void ResetClipRegion(); - virtual bool setClipRegion( const Region& ); + virtual void ResetClipRegion() SAL_OVERRIDE; + virtual bool setClipRegion( const Region& ) SAL_OVERRIDE; - virtual void SetLineColor(); - virtual void SetLineColor( SalColor nSalColor ); - virtual void SetFillColor(); + virtual void SetLineColor() SAL_OVERRIDE; + virtual void SetLineColor( SalColor nSalColor ) SAL_OVERRIDE; + virtual void SetFillColor() SAL_OVERRIDE; - virtual void SetFillColor( SalColor nSalColor ); + virtual void SetFillColor( SalColor nSalColor ) SAL_OVERRIDE; - virtual void SetXORMode( bool bSet, bool ); + virtual void SetXORMode( bool bSet, bool ) SAL_OVERRIDE; - virtual void SetROPLineColor( SalROPColor nROPColor ); - virtual void SetROPFillColor( SalROPColor nROPColor ); + virtual void SetROPLineColor( SalROPColor nROPColor ) SAL_OVERRIDE; + virtual void SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE; - virtual void SetTextColor( SalColor nSalColor ); - virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ); - virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); - virtual const ImplFontCharMap* GetImplFontCharMap() const; - virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; - virtual void GetDevFontList( PhysicalFontCollection* ); - virtual void ClearDevFontCache(); - virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ); + virtual void SetTextColor( SalColor nSalColor ) SAL_OVERRIDE; + virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE; + virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE; + virtual const ImplFontCharMap* GetImplFontCharMap() const SAL_OVERRIDE; + virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE; + virtual void GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE; + virtual void ClearDevFontCache() SAL_OVERRIDE; + virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE; virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, sal_GlyphId* pGlyphIDs, @@ -241,53 +241,53 @@ public: sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo - ); - virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded ); + ) SAL_OVERRIDE; + virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded ) SAL_OVERRIDE; virtual const void* GetEmbedFontData( const PhysicalFontFace*, const sal_Ucs* pUnicodes, sal_Int32* pWidths, FontSubsetInfo& rInfo, - long* pDataLen ); - virtual void FreeEmbedFontData( const void* pData, long nDataLen ); + long* pDataLen ) SAL_OVERRIDE; + virtual void FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE; virtual void GetGlyphWidths( const PhysicalFontFace*, bool bVertical, Int32Vector& rWidths, - Ucs2UIntMap& rUnicodeEnc ); - virtual bool GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ); - virtual bool GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ); - virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ); - virtual void DrawServerFontLayout( const ServerFontLayout& ); - virtual bool supportsOperation( OutDevSupportType ) const; - 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 ); + Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE; + virtual bool GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) SAL_OVERRIDE; + virtual bool GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) SAL_OVERRIDE; + virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE; + virtual void DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE; + virtual bool supportsOperation( OutDevSupportType ) const SAL_OVERRIDE; + 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; void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose ); - virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ); - virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ); + 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 ); - virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ); + 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); + com::sun::star::drawing::LineCap) SAL_OVERRIDE; virtual bool drawFilledTrapezoids( const ::basegfx::B2DTrapezoid*, int nTrapCount, double fTransparency ); #if 1 // TODO: remove these obselete methods virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, - const sal_uInt8* pFlgAry ); + const sal_uInt8* pFlgAry ) SAL_OVERRIDE; virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, - const sal_uInt8* pFlgAry ); + const sal_uInt8* pFlgAry ) SAL_OVERRIDE; virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, - const sal_uInt8* const* pFlgAry ); + const sal_uInt8* const* pFlgAry ) SAL_OVERRIDE; #endif virtual void copyArea( long nDestX, @@ -296,42 +296,42 @@ public: long nSrcY, long nSrcWidth, long nSrcHeight, - sal_uInt16 nFlags ); + sal_uInt16 nFlags ) SAL_OVERRIDE; virtual void copyBits( const SalTwoRect& rPosAry, - SalGraphics* pSrcGraphics ); + SalGraphics* pSrcGraphics ) SAL_OVERRIDE; virtual void drawBitmap( const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap ); + 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& rMaskBitmap ); + const SalBitmap& rMaskBitmap ) SAL_OVERRIDE; virtual void drawMask( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, - SalColor nMaskColor ); - virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ); - virtual SalColor getPixel( long nX, long nY ); - virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ); - virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ); + SalColor nMaskColor ) SAL_OVERRIDE; + virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; + virtual SalColor getPixel( long nX, long nY ) SAL_OVERRIDE; + 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; 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); + const SalBitmap* pAlphaBitmap) SAL_OVERRIDE; virtual bool drawAlphaRect( long nX, long nY, long nWidth, - long nHeight, sal_uInt8 nTransparency ); + long nHeight, sal_uInt8 nTransparency ) 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; /* use to handle GraphicsExpose/NoExpose after XCopyArea & friends * if pFrame is not NULL, corresponding Paint events are generated diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h index 72330e9b53c7..cea08dd6da96 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -74,10 +74,10 @@ public: // dtrans implementation virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > - CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments ); - virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource(); - virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget(); - virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService); + CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments ) SAL_OVERRIDE; + virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource() SAL_OVERRIDE; + virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget() SAL_OVERRIDE; + virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) SAL_OVERRIDE; }; #endif // INCLUDED_VCL_INC_UNX_SALINST_H diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h index 93dc2f0bd9de..566c8e0f78af 100644 --- a/vcl/inc/unx/salmenu.h +++ b/vcl/inc/unx/salmenu.h @@ -29,19 +29,19 @@ public: X11SalMenu() {} virtual ~X11SalMenu(); - 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 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 KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE; + virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE; }; class X11SalMenuItem : public SalMenuItem diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h index 5bb5990d0d30..01fbc998cda5 100644 --- a/vcl/inc/unx/salobj.h +++ b/vcl/inc/unx/salobj.h @@ -73,17 +73,17 @@ public: virtual ~X11SalObject(); // overload all pure virtual methods - 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 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 ); - virtual void Show( bool bVisible ); - virtual void GrabFocus(); + virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; + virtual void Show( bool bVisible ) SAL_OVERRIDE; + virtual void GrabFocus() SAL_OVERRIDE; - virtual const SystemEnvData* GetSystemData() const; + virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE; }; #endif // INCLUDED_VCL_INC_UNX_SALOBJ_H diff --git a/vcl/inc/unx/saltimer.h b/vcl/inc/unx/saltimer.h index f93acf889452..45692f766d43 100644 --- a/vcl/inc/unx/saltimer.h +++ b/vcl/inc/unx/saltimer.h @@ -31,8 +31,8 @@ public: virtual ~X11SalTimer(); // overload all pure virtual methods - void Start( sal_uIntPtr nMS ); - void Stop(); + void Start( sal_uIntPtr nMS ) SAL_OVERRIDE; + void Stop() SAL_OVERRIDE; }; #endif diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h index b50dd087dd39..1ec20174160d 100644 --- a/vcl/inc/unx/salvd.h +++ b/vcl/inc/unx/salvd.h @@ -76,12 +76,12 @@ public: int GetHeight() const { return nDY_; } SalX11Screen GetXScreenNumber() const { return m_nXScreen; } - virtual SalGraphics* AcquireGraphics(); - virtual void ReleaseGraphics( SalGraphics* pGraphics ); + virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE; + virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE; // Set new size, without saving the old contents - virtual bool SetSize( long nNewDX, long nNewDY ); - virtual void GetSize( long& rWidth, long& rHeight ); + virtual bool SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE; + virtual void GetSize( long& rWidth, long& rHeight ) SAL_OVERRIDE; }; diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx index bdcc61e49012..47c37de7e755 100644 --- a/vcl/inc/unx/x11/x11sys.hxx +++ b/vcl/inc/unx/x11/x11sys.hxx @@ -32,15 +32,15 @@ public: virtual ~X11SalSystem(); // overload pure virtual methods - virtual unsigned int GetDisplayScreenCount(); - virtual bool IsUnifiedDisplay(); - virtual unsigned int GetDisplayBuiltInScreen(); - virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ); - virtual OUString GetDisplayScreenName( unsigned int nScreen ); + virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE; + virtual bool IsUnifiedDisplay() 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 ShowNativeDialog( const OUString& rTitle, const OUString& rMessage, const std::list< OUString >& rButtons, - int nDefButton ); + int nDefButton ) SAL_OVERRIDE; }; #endif // INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX diff --git a/vcl/inc/xconnection.hxx b/vcl/inc/xconnection.hxx index d9042feb73d2..34c7758bc02b 100644 --- a/vcl/inc/xconnection.hxx +++ b/vcl/inc/xconnection.hxx @@ -46,15 +46,15 @@ namespace vcl { void start(); void terminate(); - virtual bool dispatchEvent( void* pData, int nBytes ); - virtual bool dispatchErrorEvent( void* pData, int nBytes ); + virtual bool dispatchEvent( void* pData, int nBytes ) SAL_OVERRIDE; + virtual bool dispatchErrorEvent( void* pData, int nBytes ) SAL_OVERRIDE; // XDisplayConnection - virtual void SAL_CALL addEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler, sal_Int32 eventMask ) throw(std::exception); - virtual void SAL_CALL removeEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception); - virtual void SAL_CALL addErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception); - virtual void SAL_CALL removeErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getIdentifier() throw(std::exception); + virtual void SAL_CALL addEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler, sal_Int32 eventMask ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getIdentifier() throw(std::exception) SAL_OVERRIDE; }; diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index 22f64bd7811a..10228b591f57 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -250,10 +250,10 @@ private: const sal_Int32 mnBitsPerPixel; // XBitmap - virtual geometry::IntegerSize2D SAL_CALL getSize() throw (uno::RuntimeException, std::exception) { return maSize; } - virtual ::sal_Bool SAL_CALL hasAlpha( ) throw (uno::RuntimeException, std::exception) { return mnBitsPerPixel != 8; } + virtual geometry::IntegerSize2D SAL_CALL getSize() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return maSize; } + virtual ::sal_Bool SAL_CALL hasAlpha( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mnBitsPerPixel != 8; } virtual uno::Reference< rendering::XBitmap > SAL_CALL getScaledBitmap( const geometry::RealSize2D&, - sal_Bool ) throw (uno::RuntimeException, std::exception) { return this; } + sal_Bool ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return this; } // XIntegerReadOnlyBitmap virtual uno::Sequence< ::sal_Int8 > SAL_CALL getData( rendering::IntegerBitmapLayout& bitmapLayout, @@ -261,7 +261,7 @@ private: throw (lang::IndexOutOfBoundsException, rendering::VolatileContentDestroyedException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE( "X1 out of bounds", rect.X1 >= 0 ); CPPUNIT_ASSERT_MESSAGE( "Y1 out of bounds", rect.Y1 >= 0 ); @@ -310,7 +310,7 @@ private: throw (lang::IndexOutOfBoundsException, rendering::VolatileContentDestroyedException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE("getPixel: method not implemented", false); return uno::Sequence< sal_Int8 >(); @@ -324,7 +324,7 @@ private: return aRet; } - virtual rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (uno::RuntimeException, std::exception) + virtual rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { rendering::IntegerBitmapLayout aLayout( maLayout ); @@ -340,7 +340,7 @@ private: } // XBitmapPalette - virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE( "Got palette getNumberOfEntries interface call without handing out palette", getPalette().is() ); @@ -352,7 +352,7 @@ private: ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE( "Got palette getIndex interface call without handing out palette", getPalette().is() ); @@ -371,7 +371,7 @@ private: ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE( "Got palette setIndex interface call without handing out palette", getPalette().is()); @@ -389,7 +389,7 @@ private: } }; - virtual uno::Reference< rendering::XColorSpace > SAL_CALL getColorSpace( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< rendering::XColorSpace > SAL_CALL getColorSpace( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { // this is the method from XBitmapPalette. Return palette color // space here @@ -397,24 +397,24 @@ private: } // XIntegerBitmapColorSpace - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return rendering::RenderingIntent::PERCEPTUAL; } virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties() throw (uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE("getProperties: method not implemented", false ); return uno::Sequence< ::beans::PropertyValue >(); @@ -423,7 +423,7 @@ private: virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >&, const uno::Reference< rendering::XColorSpace >& ) throw (uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE("convertColorSpace: method not implemented", false); return uno::Sequence< double >(); @@ -432,7 +432,7 @@ private: virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& ) throw (lang::IllegalArgumentException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE("convertToRGB: method not implemented", false); return uno::Sequence< rendering::RGBColor >(); @@ -441,7 +441,7 @@ private: virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& ) throw (lang::IllegalArgumentException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE("convertToARGB: method not implemented", false); return uno::Sequence< rendering::ARGBColor >(); @@ -450,7 +450,7 @@ private: virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& ) throw (lang::IllegalArgumentException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE("convertToPARGB: method not implemented", false); return uno::Sequence< rendering::ARGBColor >(); @@ -459,7 +459,7 @@ private: virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& ) throw (lang::IllegalArgumentException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE("convertFromRGB: method not implemented", false); return uno::Sequence< double >(); @@ -468,7 +468,7 @@ private: virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE("convertFromARGB: this method is not expected to be called!", false); return uno::Sequence< double >(); @@ -477,23 +477,23 @@ private: virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE("convertFromPARGB: this method is not expected to be called!", false); return uno::Sequence< double >(); } - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mnBitsPerPixel; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return maComponentBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return util::Endianness::LITTLE; } @@ -502,7 +502,7 @@ private: const uno::Reference< rendering::XColorSpace >& ) throw (lang::IllegalArgumentException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE("convertFromIntegerColorSpace: method not implemented", false); return uno::Sequence< double >(); @@ -512,14 +512,14 @@ private: const uno::Reference< rendering::XIntegerBitmapColorSpace >& ) throw (lang::IllegalArgumentException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE("convertToIntegerColorSpace: method not implemented", false); return uno::Sequence< sal_Int8 >(); } virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) + uno::RuntimeException, std::exception) SAL_OVERRIDE { const uno::Sequence< rendering::ARGBColor > aTemp( convertIntegerToARGB(deviceColor) ); const sal_Size nLen(aTemp.getLength()); @@ -536,7 +536,7 @@ private: } virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) + uno::RuntimeException, std::exception) SAL_OVERRIDE { const sal_Size nLen( deviceColor.getLength() ); const sal_Int32 nBytesPerPixel(mnBitsPerPixel == 8 ? 1 : 4); @@ -576,7 +576,7 @@ private: const uno::Sequence< ::sal_Int8 >& deviceColor) throw (lang::IllegalArgumentException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { const sal_Size nLen( deviceColor.getLength() ); const sal_Int32 nBytesPerPixel(mnBitsPerPixel == 8 ? 1 : 4); @@ -617,7 +617,7 @@ private: const uno::Sequence< rendering::RGBColor >&) throw (lang::IllegalArgumentException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE("convertIntegerFromRGB: method not implemented", false); return uno::Sequence< sal_Int8 >(); @@ -625,7 +625,7 @@ private: virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE("convertIntegerFromARGB: method not implemented", false); return uno::Sequence< sal_Int8 >(); @@ -634,7 +634,7 @@ private: virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { CPPUNIT_ASSERT_MESSAGE("convertIntegerFromPARGB: method not implemented", false); return uno::Sequence< sal_Int8 >(); diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx index f7faae4c056c..fe672d098438 100644 --- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx @@ -32,7 +32,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - unsigned int, unsigned int, unsigned int); + unsigned int, unsigned int, unsigned int) SAL_OVERRIDE; void checkExportImport(const OUString& aFilterShortName); diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 614b6c7bfda4..88489efde49b 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -328,9 +328,9 @@ private: public: DbgWindow(); - virtual bool Close(); - virtual void Resize(); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool Close() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void InsertLine( const OUString& rLine ); void Update() { WorkWindow::Update(); maLstBox.Update(); } @@ -394,7 +394,7 @@ public: DbgDialog(); DECL_LINK( ClickHdl, Button* ); - void RequestHelp( const HelpEvent& rHEvt ); + void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; }; static sal_Char aDbgInfoBuf[12288]; @@ -1389,7 +1389,7 @@ class DbgMessageBox : public ErrorBox AddButton(OUString("Copy"), COPY_BUTTON_ID, 0); } - virtual void Click() + virtual void Click() SAL_OVERRIDE { if( GetCurButtonId() == COPY_BUTTON_ID ) vcl::unohelper::TextDataObject::CopyStringTo( m_aMessage, GetClipboard() ); @@ -1412,7 +1412,7 @@ public: } protected: - virtual long doIt(); + virtual long doIt() SAL_OVERRIDE; }; long SolarMessageBoxExecutor::doIt() @@ -1515,7 +1515,7 @@ public: } protected: - virtual long doIt(); + virtual long doIt() SAL_OVERRIDE; }; long SolarWindowPrinter::doIt() diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index 478701c98267..cf430b4a08ff 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -76,12 +76,12 @@ class VCLSession: virtual ~VCLSession() {} - virtual void SAL_CALL addSessionManagerListener( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ); - virtual void SAL_CALL removeSessionManagerListener( const css::uno::Reference< XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception ); - virtual void SAL_CALL queryInteraction( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ); - virtual void SAL_CALL interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ); - virtual void SAL_CALL saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL cancelShutdown() throw( RuntimeException, std::exception ); + virtual void SAL_CALL addSessionManagerListener( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeSessionManagerListener( const css::uno::Reference< XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL queryInteraction( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL cancelShutdown() throw( RuntimeException, std::exception ) SAL_OVERRIDE; void callSaveRequested( bool bShutdown, bool bCancelable ); void callShutdownCancelled(); diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 10430142580c..21a3d1a7a4e7 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -244,7 +244,7 @@ public: // XCurrentContext virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_prevContext; }; diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 9e1aeb8397e0..bccd5f16b72f 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -201,7 +201,7 @@ oslSignalHandler pExceptionHandler = NULL; class DummyApplication : public Application { public: - int Main() { return EXIT_SUCCESS; }; + int Main() SAL_OVERRIDE { return EXIT_SUCCESS; }; }; class DesktopEnvironmentContext: public cppu::WeakImplHelper1< com::sun::star::uno::XCurrentContext > @@ -212,7 +212,7 @@ public: // XCurrentContext virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_xNextContext; @@ -325,7 +325,7 @@ namespace */ class VCLUnoWrapperDeleter : public cppu::WeakImplHelper1<com::sun::star::lang::XEventListener> { - virtual void SAL_CALL disposing(lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing(lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; }; void diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index a4d615424827..c584aad08b31 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -78,9 +78,9 @@ public: * XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) SAL_OVERRIDE; static OUString getImplementationName_static(); static Sequence< OUString > getSupportedServiceNames_static(); @@ -90,33 +90,33 @@ public: */ virtual Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setContents( const Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getName() - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; /* * XClipboardEx */ virtual sal_Int8 SAL_CALL getRenderingCapabilities() - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; /* * XClipboardNotifier */ virtual void SAL_CALL addClipboardListener( const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeClipboardListener( const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; }; GenericClipboard::~GenericClipboard() @@ -221,8 +221,8 @@ public: /* * XSingleServiceFactory */ - virtual Reference< XInterface > SAL_CALL createInstance() throw(std::exception); - virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& rArgs ) throw(std::exception); + virtual Reference< XInterface > SAL_CALL createInstance() throw(std::exception) SAL_OVERRIDE; + virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& rArgs ) throw(std::exception) SAL_OVERRIDE; }; @@ -290,17 +290,17 @@ public: virtual ~GenericDragSource(); // XDragSource - virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception); - virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception); + virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) SAL_OVERRIDE; virtual void SAL_CALL startDrag( const datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, const Reference< datatransfer::XTransferable >& transferable, const Reference< datatransfer::dnd::XDragSourceListener >& listener - ) throw(std::exception); + ) throw(std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ); + virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE; static Sequence< OUString > getSupportedServiceNames_static() { @@ -403,15 +403,15 @@ public: virtual ~GenericDropTarget(); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( Exception, std::exception ); + virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( Exception, std::exception ) SAL_OVERRIDE; // XDropTarget - virtual void SAL_CALL addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception); - virtual void SAL_CALL removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception); - virtual sal_Bool SAL_CALL isActive() throw(std::exception); - virtual void SAL_CALL setActive( sal_Bool active ) throw(std::exception); - virtual sal_Int8 SAL_CALL getDefaultActions() throw(std::exception); - virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(std::exception); + virtual void SAL_CALL addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isActive() throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setActive( sal_Bool active ) throw(std::exception) SAL_OVERRIDE; + virtual sal_Int8 SAL_CALL getDefaultActions() throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(std::exception) SAL_OVERRIDE; static Sequence< OUString > getSupportedServiceNames_static() { diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index d6133ea65d57..7eb2f1f86ff2 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -55,15 +55,15 @@ FontIdentificator() {} // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ) throw (RuntimeException, std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& ) throw (Exception, RuntimeException, std::exception); + virtual void SAL_CALL initialize( const Sequence< Any >& ) throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; // XMaterialHolder - virtual Any SAL_CALL getMaterial() throw(RuntimeException, std::exception); + virtual Any SAL_CALL getMaterial() throw(RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx index 9308728bb6f6..ccff6a6ca52a 100644 --- a/vcl/source/edit/textdat2.hxx +++ b/vcl/source/edit/textdat2.hxx @@ -251,17 +251,17 @@ private: public: TextSelFunctionSet( TextView* pView ); - virtual void BeginDrag(); + virtual void BeginDrag() SAL_OVERRIDE; - virtual void CreateAnchor(); + virtual void CreateAnchor() SAL_OVERRIDE; - virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ); + virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ) SAL_OVERRIDE; - virtual bool IsSelectionAtPoint( const Point& rPointPixel ); - virtual void DeselectAll(); + virtual bool IsSelectionAtPoint( const Point& rPointPixel ) SAL_OVERRIDE; + virtual void DeselectAll() SAL_OVERRIDE; - virtual void DeselectAtPoint( const Point& ); - virtual void DestroyAnchor(); + virtual void DeselectAtPoint( const Point& ) SAL_OVERRIDE; + virtual void DestroyAnchor() SAL_OVERRIDE; }; diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx index f8382db56904..2980641c28bf 100644 --- a/vcl/source/edit/textund2.hxx +++ b/vcl/source/edit/textund2.hxx @@ -35,10 +35,10 @@ public: TextUndoDelPara( TextEngine* pTextEngine, TextNode* pNode, sal_uLong nPara ); ~TextUndoDelPara(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment () const; + virtual OUString GetComment () const SAL_OVERRIDE; }; @@ -53,10 +53,10 @@ public: TextUndoConnectParas( TextEngine* pTextEngine, sal_uLong nPara, sal_uInt16 nSepPos ); ~TextUndoConnectParas(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment () const; + virtual OUString GetComment () const SAL_OVERRIDE; }; @@ -71,10 +71,10 @@ public: TextUndoSplitPara( TextEngine* pTextEngine, sal_uLong nPara, sal_uInt16 nSepPos ); ~TextUndoSplitPara(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment () const; + virtual OUString GetComment () const SAL_OVERRIDE; }; @@ -88,12 +88,12 @@ public: TYPEINFO_OVERRIDE(); TextUndoInsertChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual bool Merge( SfxUndoAction *pNextAction ); + virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE; - virtual OUString GetComment () const; + virtual OUString GetComment () const SAL_OVERRIDE; }; @@ -107,10 +107,10 @@ public: TYPEINFO_OVERRIDE(); TextUndoRemoveChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment () const; + virtual OUString GetComment () const SAL_OVERRIDE; }; @@ -124,10 +124,10 @@ public: TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelection& rESel ); ~TextUndoSetAttribs(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment () const; + virtual OUString GetComment () const SAL_OVERRIDE; }; #endif // INCLUDED_VCL_SOURCE_EDIT_TEXTUND2_HXX diff --git a/vcl/source/edit/textundo.hxx b/vcl/source/edit/textundo.hxx index c1385686163b..f5eacc78addf 100644 --- a/vcl/source/edit/textundo.hxx +++ b/vcl/source/edit/textundo.hxx @@ -44,9 +44,9 @@ public: ~TextUndoManager(); using SfxUndoManager::Undo; - virtual bool Undo(); + virtual bool Undo() SAL_OVERRIDE; using SfxUndoManager::Redo; - virtual bool Redo(); + virtual bool Redo() SAL_OVERRIDE; }; @@ -70,10 +70,10 @@ public: TextEngine* GetTextEngine() const { return mpTextEngine; } - virtual void Undo() = 0; - virtual void Redo() = 0; + virtual void Undo() SAL_OVERRIDE = 0; + virtual void Redo() SAL_OVERRIDE = 0; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; #endif // INCLUDED_VCL_SOURCE_EDIT_TEXTUNDO_HXX diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 9caeba98aa5a..fd3dbfbdac2f 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -75,14 +75,14 @@ public: SvMemoryStream& GetHTMLStream() { return maHTMLStream; } // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::datatransfer::XTransferable - ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; TETextDataObject::TETextDataObject( const OUString& rText ) : maText( rText ) diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 29c432aed51a..6d5a91164ee8 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -55,18 +55,18 @@ public: ExtTextEngine* GetTextEngine() const { return mpExtTextEngine; } ExtTextView* GetTextView() const { return mpExtTextView; } - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvent ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; bool IsAutoFocusHide() const { return mbFocusSelectionHide; } void SetAutoFocusHide( bool bAutoHide ) { mbFocusSelectionHide = bAutoHide; } @@ -95,7 +95,7 @@ private: mutable Selection maSelection; protected: - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; void ImpUpdateSrollBarVis( WinBits nWinStyle ); void ImpInitScrollBars(); void ImpSetScrollBarRanges(); diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index a033e9b063bc..4605abdd890e 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -97,12 +97,12 @@ protected: SvStream& mrStm; virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& rData ) - throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) + throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { mrStm.Write( rData.getConstArray(), rData.getLength() ); } virtual void SAL_CALL flush() - throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) + throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { mrStm.Flush(); } - virtual void SAL_CALL closeOutput() throw(std::exception) {} + virtual void SAL_CALL closeOutput() throw(std::exception) SAL_OVERRIDE {} public: diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx index ae0d35d735ad..94e0470b1eb8 100644 --- a/vcl/source/filter/sgvmain.hxx +++ b/vcl/source/filter/sgvmain.hxx @@ -140,7 +140,7 @@ public: sal_uInt8 Layer; friend SvStream& ReadObjkType(SvStream& rIStream, ObjkType& rObjk); friend bool ObjOverSeek(SvStream& rInp, ObjkType& rObjk); - virtual void Draw(OutputDevice& rOut); + virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; }; #define StrkSize 38 @@ -152,7 +152,7 @@ public: PointType Pos1; // start point PointType Pos2; // end point friend SvStream& ReadStrkType(SvStream& rIStream, StrkType& rStrk); - virtual void Draw(OutputDevice& rOut); + virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; }; #define RectSize 52 @@ -168,7 +168,7 @@ public: sal_uInt16 DrehWink; // 315...<45 sal_uInt16 Slant; // >270...<90 friend SvStream& ReadRectType(SvStream& rIStream, RectType& rRect); - virtual void Draw(OutputDevice& rOut); + virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; }; #define PolySize 44 @@ -183,7 +183,7 @@ public: sal_uInt32 SD_EckP; // pointer to corner point (StarDraw) PointType* EckP; // pointer to corner points (StarView (is not read from disk!)) friend SvStream& ReadPolyType(SvStream& rIStream, PolyType& rPoly); - virtual void Draw(OutputDevice& rOut); + virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; }; #define PolyClosBit 0x01 // kinds of Poly: 0: polyLine 1: polygon @@ -199,7 +199,7 @@ public: sal_uInt32 SD_EckP; // pointer to corner points (StarDraw) PointType* EckP; // pointer to corner points (StarView (is not read from disk!)) friend SvStream& ReadSplnType(SvStream& rIStream, SplnType& rSpln); - virtual void Draw(OutputDevice& rOut); + virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; }; // kinds of Spline: see Poly @@ -216,7 +216,7 @@ public: sal_uInt16 StartWink; // and not for full circles sal_uInt16 RelWink; // and full ellipses friend SvStream& ReadCircType(SvStream& rIStream, CircType& rCirc); - virtual void Draw(OutputDevice& rOut); + virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; }; #define CircFull 0x00 /* kinds of circle: 0: full circle */ #define CircSect 0x01 /* 1: circle sector */ @@ -241,7 +241,7 @@ public: sal_Int16 FitBreit; // width to format for Fit2Size UCHAR* Buffer; // this variable is not set by reading from disk, but explicit! friend SvStream& ReadTextType(SvStream& rIStream, TextType& rText); - virtual void Draw(OutputDevice& rOut); + virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; }; #define TextOutlBit 0x01 /* 1=Sourcecode for outliner (ignored byDrawObjekt()) */ #define TextFitSBit 0x02 /* Bit1: 1=Text-Fit2Size, also outliner (2.0) */ @@ -271,7 +271,7 @@ public: sal_uInt8 GrfFlg; // (SD20) 0=nSGF 1=Pcx 2=HPGL 4=Raw $FF=Undef (to fix DrawBmp) INetURLObject aFltPath; // for GraphicFilter friend SvStream& ReadBmapType(SvStream& rIStream, BmapType& rBmap); - virtual void Draw(OutputDevice& rOut); + virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; void SetPaths( const INetURLObject rFltPath ); }; diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index c4b50b157acd..83f68152e798 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -348,7 +348,7 @@ public: void initialCffRead( void); bool emitAsType1( class Type1Emitter&, const sal_GlyphId* pGlyphIds, const U8* pEncoding, - GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& ); + GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& ) SAL_OVERRIDE; // used by charstring converter void setCharStringType( int); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 29353a11aeca..b37c880cffa9 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2209,9 +2209,9 @@ public: ImplPdfBuiltinFontData( const PDFWriterImpl::BuiltinFont& ); const PDFWriterImpl::BuiltinFont* GetBuiltinFont() const { return &mrBuiltin; } - virtual PhysicalFontFace* Clone() const { return new ImplPdfBuiltinFontData(*this); } - virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const; - virtual sal_IntPtr GetFontId() const { return reinterpret_cast<sal_IntPtr>(&mrBuiltin); } + virtual PhysicalFontFace* Clone() const SAL_OVERRIDE { return new ImplPdfBuiltinFontData(*this); } + virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE; + virtual sal_IntPtr GetFontId() const SAL_OVERRIDE { return reinterpret_cast<sal_IntPtr>(&mrBuiltin); } }; inline const ImplPdfBuiltinFontData* GetPdfFontData( const PhysicalFontFace* pFontData ) @@ -6821,9 +6821,9 @@ class PDFStreamIf : PDFStreamIf( PDFWriterImpl* pWriter ) : m_pWriter( pWriter ), m_bWrite( true ) {} virtual ~PDFStreamIf(); - virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(std::exception); - virtual void SAL_CALL flush() throw(std::exception); - virtual void SAL_CALL closeOutput() throw(std::exception); + virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL flush() throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeOutput() throw(std::exception) SAL_OVERRIDE; }; } diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 357cee4bef2f..d64d68a59a4d 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -1112,7 +1112,7 @@ public: } // XMaterialHolder - virtual uno::Any SAL_CALL getMaterial() throw(std::exception) + virtual uno::Any SAL_CALL getMaterial() throw(std::exception) SAL_OVERRIDE { return uno::makeAny( sal_Int64(maID) ); } diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index 05b44b2dd939..b54a0421bfd7 100644 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -79,11 +79,11 @@ namespace vcl virtual ~ReferenceDeviceTextLayout(); // ITextLayout - virtual long GetTextWidth( const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ) const; - virtual void DrawText( const Point& _rStartPoint, const OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength, MetricVector* _pVector, OUString* _pDisplayText ); - virtual bool GetCaretPositions( const OUString& _rText, sal_Int32* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const; + virtual long GetTextWidth( const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ) const SAL_OVERRIDE; + virtual void DrawText( const Point& _rStartPoint, const OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength, MetricVector* _pVector, OUString* _pDisplayText ) SAL_OVERRIDE; + virtual bool GetCaretPositions( const OUString& _rText, sal_Int32* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const SAL_OVERRIDE; virtual sal_Int32 GetTextBreak(const OUString& _rText, long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength) const SAL_OVERRIDE; - virtual bool DecomposeTextRectAction() const; + virtual bool DecomposeTextRectAction() const SAL_OVERRIDE; public: // equivalents to the respective OutputDevice methods, which take the reference device into account diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index 2ad6a542c611..c35548823895 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -428,25 +428,25 @@ namespace vcl private: uno::Sequence< sal_Int8 > m_aComponentTags; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_aComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return uno::Sequence< beans::PropertyValue >(); } virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) + uno::RuntimeException, std::exception) SAL_OVERRIDE { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -454,7 +454,7 @@ namespace vcl convertToARGB(deviceColor)); return targetColorSpace->convertFromARGB(aIntermediate); } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -471,7 +471,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -488,7 +488,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -505,7 +505,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -522,7 +522,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -539,7 +539,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); diff --git a/vcl/source/uipreviewer/previewer.cxx b/vcl/source/uipreviewer/previewer.cxx index 923c79dfb946..346f4d3ccc0b 100644 --- a/vcl/source/uipreviewer/previewer.cxx +++ b/vcl/source/uipreviewer/previewer.cxx @@ -23,8 +23,8 @@ class UIPreviewApp : public Application { public: - virtual void Init(); - virtual int Main(); + virtual void Init() SAL_OVERRIDE; + virtual int Main() SAL_OVERRIDE; }; using namespace com::sun::star; diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 4e62e93907cf..f3f2f42db8a4 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -59,17 +59,17 @@ public: ImplDockingWindowWrapper* pDockingWin ); ~ImplDockFloatWin2(); - virtual void Move(); - virtual void Resize(); - virtual void TitleButtonClick( sal_uInt16 nButton ); - virtual void Pin(); - virtual void Roll(); - virtual void PopupModeEnd(); - virtual void Resizing( Size& rSize ); - virtual bool Close(); + virtual void Move() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void TitleButtonClick( sal_uInt16 nButton ) SAL_OVERRIDE; + virtual void Pin() SAL_OVERRIDE; + virtual void Roll() SAL_OVERRIDE; + virtual void PopupModeEnd() SAL_OVERRIDE; + virtual void Resizing( Size& rSize ) SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, - sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); + sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ) SAL_OVERRIDE; sal_uLong GetLastTicks() const { return mnLastTicks; } }; @@ -498,14 +498,14 @@ public: ImplPopupFloatWin( Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip ); ~ImplPopupFloatWin(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Resize(); - virtual Window* GetPreferredKeyInputWindow(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; Rectangle GetDragRect() const; Point GetToolboxPosition() const; diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index c8d0cb7f83a6..dabd203107f3 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -74,14 +74,14 @@ public: DockingWindow* pDockingWin ); ~ImplDockFloatWin(); - virtual void Move(); - virtual void Resize(); - virtual void TitleButtonClick( sal_uInt16 nButton ); - virtual void Pin(); - virtual void Roll(); - virtual void PopupModeEnd(); - virtual void Resizing( Size& rSize ); - virtual bool Close(); + virtual void Move() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void TitleButtonClick( sal_uInt16 nButton ) SAL_OVERRIDE; + virtual void Pin() SAL_OVERRIDE; + virtual void Roll() SAL_OVERRIDE; + virtual void PopupModeEnd() SAL_OVERRIDE; + virtual void Resizing( Size& rSize ) SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; sal_uLong GetLastTicks() const { return mnLastTicks; } }; diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 65193d1d8584..2bd976881439 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -514,8 +514,8 @@ private: DECL_LINK(AutoScroll, void *); DECL_LINK( ShowHideListener, VclWindowEvent* ); - void StateChanged( StateChangedType nType ); - void DataChanged( const DataChangedEvent& rDCEvt ); + void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; protected: Region ImplCalcClipRegion( bool bIncludeLogo = true ) const; void ImplInitClipRegion(); @@ -534,14 +534,14 @@ public: void doShutdown(); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvent ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void Resize(); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; void SetFocusId( sal_uLong nId ) { nSaveFocusId = nId; } sal_uLong GetFocusId() const { return nSaveFocusId; } @@ -565,7 +565,7 @@ public: void SetPosInParent( sal_uInt16 nPos ) { nPosInParent = nPos; } sal_uInt16 GetPosInParent() const { return nPosInParent; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; // To get the transparent mouse-over look, the closer is actually a toolbox @@ -580,7 +580,7 @@ public: DecoToolBox( Window* pParent, WinBits nStyle = 0 ); void ImplInit(); - void DataChanged( const DataChangedEvent& rDCEvt ); + void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetImages( long nMaxHeight = 0, bool bForce = false ); @@ -730,10 +730,10 @@ private: DECL_LINK( ToolboxEventHdl, VclWindowEvent* ); DECL_LINK( ShowHideListener, VclWindowEvent* ); - void StateChanged( StateChangedType nType ); - void DataChanged( const DataChangedEvent& rDCEvt ); - void LoseFocus(); - void GetFocus(); + void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + void LoseFocus() SAL_OVERRIDE; + void GetFocus() SAL_OVERRIDE; public: MenuBarWindow( Window* pParent ); @@ -741,13 +741,13 @@ public: void ShowButtons( bool bClose, bool bFloat, bool bHide ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvent ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; void SetFocusId( sal_uLong nId ) { nSaveFocusId = nId; } sal_uLong GetFocusId() const { return nSaveFocusId; } @@ -757,7 +757,7 @@ public: PopupMenu* GetActivePopup() const { return pActivePopup; } void PopupClosed( Menu* pMenu ); sal_uInt16 GetHighlightedItem() const { return nHighlightedItem; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; void SetAutoPopup( bool bAuto ) { mbAutoPopup = bAuto; } void ImplLayoutChanged(); diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index bd6ee20204f0..b7c6503f3dae 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -60,9 +60,9 @@ private: protected: - virtual void Paint( const Rectangle& rRect ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index 995c25b645c6..b6b2bbd8e08c 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -104,14 +104,14 @@ public: XIMStatusWindow( bool bOn ); virtual ~XIMStatusWindow(); - virtual void setPosition( SalFrame* ); - virtual void setText( const OUString & ); - virtual OUString getText() const; - virtual void show( bool bShow, I18NStatus::ShowReason eReason ); - virtual void toggle( bool bOn ); + virtual void setPosition( SalFrame* ) SAL_OVERRIDE; + virtual void setText( const OUString & ) SAL_OVERRIDE; + virtual OUString getText() const SAL_OVERRIDE; + virtual void show( bool bShow, I18NStatus::ShowReason eReason ) SAL_OVERRIDE; + virtual void toggle( bool bOn ) SAL_OVERRIDE; // overload WorkWindow::DataChanged - virtual void DataChanged( const DataChangedEvent& rEvt ); + virtual void DataChanged( const DataChangedEvent& rEvt ) SAL_OVERRIDE; }; } @@ -321,16 +321,16 @@ public: IIIMPStatusWindow( SalFrame* pParent, bool bOn ); // for initial position virtual ~IIIMPStatusWindow(); - virtual void setText( const OUString & ); - virtual OUString getText() const; - virtual void show( bool bShow, I18NStatus::ShowReason eReason ); - virtual void toggle( bool bOn ); + virtual void setText( const OUString & ) SAL_OVERRIDE; + virtual OUString getText() const SAL_OVERRIDE; + virtual void show( bool bShow, I18NStatus::ShowReason eReason ) SAL_OVERRIDE; + virtual void toggle( bool bOn ) SAL_OVERRIDE; void layout(); // overload Window focus handler - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; // overload WorkWindow::DataChanged - virtual void DataChanged( const DataChangedEvent& rEvt ); + virtual void DataChanged( const DataChangedEvent& rEvt ) SAL_OVERRIDE; }; } diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index f92b6ed9728c..223bdef545f0 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -59,10 +59,10 @@ public: private: virtual ~IceSalSession() {} - virtual void queryInteraction(); - virtual void interactionDone(); - virtual void saveDone(); - virtual bool cancelShutdown(); + virtual void queryInteraction() SAL_OVERRIDE; + virtual void interactionDone() SAL_OVERRIDE; + virtual void saveDone() SAL_OVERRIDE; + virtual bool cancelShutdown() SAL_OVERRIDE; }; } diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index 40bbb3f9e256..8d705c3a8cc8 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -49,26 +49,26 @@ class NetWMAdaptor : public WMAdaptor { void setNetWMState( X11SalFrame* pFrame ) const; void initAtoms(); - virtual bool isValid() const; + virtual bool isValid() const SAL_OVERRIDE; public: NetWMAdaptor( SalDisplay* ); virtual ~NetWMAdaptor(); - virtual void setWMName( X11SalFrame* pFrame, const OUString& rWMName ) const; - virtual void maximizeFrame( X11SalFrame* pFrame, bool bHorizontal = true, bool bVertical = true ) const; - virtual void shade( X11SalFrame* pFrame, bool bToShaded ) const; - virtual void setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eType, int nDecorationFlags, X11SalFrame* pTransientFrame = NULL ) const; - virtual void enableAlwaysOnTop( X11SalFrame* pFrame, bool bEnable ) const; - virtual int handlePropertyNotify( X11SalFrame* pFrame, XPropertyEvent* pEvent ) const; - virtual void showFullScreen( X11SalFrame* pFrame, bool bFullScreen ) const; - virtual void frameIsMapping( X11SalFrame* pFrame ) const; + virtual void setWMName( X11SalFrame* pFrame, const OUString& rWMName ) const SAL_OVERRIDE; + virtual void maximizeFrame( X11SalFrame* pFrame, bool bHorizontal = true, bool bVertical = true ) const SAL_OVERRIDE; + virtual void shade( X11SalFrame* pFrame, bool bToShaded ) const SAL_OVERRIDE; + virtual void setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eType, int nDecorationFlags, X11SalFrame* pTransientFrame = NULL ) const SAL_OVERRIDE; + virtual void enableAlwaysOnTop( X11SalFrame* pFrame, bool bEnable ) const SAL_OVERRIDE; + virtual int handlePropertyNotify( X11SalFrame* pFrame, XPropertyEvent* pEvent ) const SAL_OVERRIDE; + virtual void showFullScreen( X11SalFrame* pFrame, bool bFullScreen ) const SAL_OVERRIDE; + virtual void frameIsMapping( X11SalFrame* pFrame ) const SAL_OVERRIDE; virtual void setFrameStruts( X11SalFrame* pFrame, int left, int right, int top, int bottom, int left_start_y, int left_end_y, int right_start_y, int right_end_y, int top_start_x, int top_end_x, - int bottom_start_x, int bottom_end_x ) const; - virtual void setUserTime( X11SalFrame* i_pFrame, long i_nUserTime ) const; + int bottom_start_x, int bottom_end_x ) const SAL_OVERRIDE; + virtual void setUserTime( X11SalFrame* i_pFrame, long i_nUserTime ) const SAL_OVERRIDE; }; class GnomeWMAdaptor : public WMAdaptor @@ -77,15 +77,15 @@ class GnomeWMAdaptor : public WMAdaptor void setGnomeWMState( X11SalFrame* pFrame ) const; void initAtoms(); - virtual bool isValid() const; + virtual bool isValid() const SAL_OVERRIDE; public: GnomeWMAdaptor( SalDisplay * ); virtual ~GnomeWMAdaptor(); - virtual void maximizeFrame( X11SalFrame* pFrame, bool bHorizontal = true, bool bVertical = true ) const; - virtual void shade( X11SalFrame* pFrame, bool bToShaded ) const; - virtual void enableAlwaysOnTop( X11SalFrame* pFrame, bool bEnable ) const; - virtual int handlePropertyNotify( X11SalFrame* pFrame, XPropertyEvent* pEvent ) const; + virtual void maximizeFrame( X11SalFrame* pFrame, bool bHorizontal = true, bool bVertical = true ) const SAL_OVERRIDE; + virtual void shade( X11SalFrame* pFrame, bool bToShaded ) const SAL_OVERRIDE; + virtual void enableAlwaysOnTop( X11SalFrame* pFrame, bool bEnable ) const SAL_OVERRIDE; + virtual int handlePropertyNotify( X11SalFrame* pFrame, XPropertyEvent* pEvent ) const SAL_OVERRIDE; }; } diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx index 4ecbc7349933..f2758222c9f2 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.hxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx @@ -68,54 +68,54 @@ namespace x11 { */ virtual OUString SAL_CALL getImplementationName( ) - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; /* * XClipboard */ virtual com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setContents( const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getName() - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; /* * XClipboardEx */ virtual sal_Int8 SAL_CALL getRenderingCapabilities() - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; /* * XClipboardNotifier */ virtual void SAL_CALL addClipboardListener( const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeClipboardListener( const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; /* * SelectionAdaptor */ - virtual com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > getTransferable(); - virtual void clearTransferable(); - virtual void fireContentsChanged(); - virtual com::sun::star::uno::Reference< XInterface > getReference() throw(); + virtual com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > getTransferable() SAL_OVERRIDE; + virtual void clearTransferable() SAL_OVERRIDE; + virtual void fireContentsChanged() SAL_OVERRIDE; + virtual com::sun::star::uno::Reference< XInterface > getReference() throw() SAL_OVERRIDE; }; diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx index 109086f29d62..ba3849f50079 100644 --- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx @@ -49,9 +49,9 @@ namespace x11 { virtual ~DropTargetDropContext(); // XDropTargetDropContext - virtual void SAL_CALL acceptDrop( sal_Int8 dragOperation ) throw(std::exception); - virtual void SAL_CALL rejectDrop() throw(std::exception); - virtual void SAL_CALL dropComplete( sal_Bool success ) throw(std::exception); + virtual void SAL_CALL acceptDrop( sal_Int8 dragOperation ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL rejectDrop() throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dropComplete( sal_Bool success ) throw(std::exception) SAL_OVERRIDE; }; class DropTargetDragContext : @@ -68,8 +68,8 @@ namespace x11 { virtual ~DropTargetDragContext(); // XDropTargetDragContext - virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw(std::exception); - virtual void SAL_CALL rejectDrag() throw(std::exception); + virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL rejectDrag() throw(std::exception) SAL_OVERRIDE; }; class DragSourceContext : @@ -86,10 +86,10 @@ namespace x11 { virtual ~DragSourceContext(); // XDragSourceContext - virtual sal_Int32 SAL_CALL getCurrentCursor() throw(std::exception); - virtual void SAL_CALL setCursor( sal_Int32 cursorId ) throw(std::exception); - virtual void SAL_CALL setImage( sal_Int32 imageId ) throw(std::exception); - virtual void SAL_CALL transferablesFlavorsChanged() throw(std::exception); + virtual sal_Int32 SAL_CALL getCurrentCursor() throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCursor( sal_Int32 cursorId ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setImage( sal_Int32 imageId ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL transferablesFlavorsChanged() throw(std::exception) SAL_OVERRIDE; }; } // namespace diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index fe7306596203..d26852410867 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -94,21 +94,21 @@ namespace x11 { void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( ::com::sun::star::uno::Exception, std::exception ); + virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( ::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE; // XDropTarget - virtual void SAL_CALL addDropTargetListener( const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception); - virtual void SAL_CALL removeDropTargetListener( const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception); - virtual sal_Bool SAL_CALL isActive() throw(std::exception); - virtual void SAL_CALL setActive( sal_Bool active ) throw(std::exception); - virtual sal_Int8 SAL_CALL getDefaultActions() throw(std::exception); - virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(std::exception); + virtual void SAL_CALL addDropTargetListener( const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeDropTargetListener( const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isActive() throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setActive( sal_Bool active ) throw(std::exception) SAL_OVERRIDE; + virtual sal_Int8 SAL_CALL getDefaultActions() throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(std::exception); + virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > - SAL_CALL getSupportedServiceNames() throw(std::exception); + SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; }; class SelectionManagerHolder : @@ -126,23 +126,23 @@ namespace x11 { virtual ~SelectionManagerHolder(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(std::exception); + virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > - SAL_CALL getSupportedServiceNames() throw(std::exception); + SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ); + virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE; // XDragSource - virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception); - virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception); + virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) SAL_OVERRIDE; virtual void SAL_CALL startDrag( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& transferable, const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener >& listener - ) throw(std::exception); + ) throw(std::exception) SAL_OVERRIDE; }; @@ -476,35 +476,35 @@ namespace x11 { void shutdown() throw(); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ); + virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE; // XEventHandler - virtual sal_Bool SAL_CALL handleEvent( const Any& event ) throw(std::exception); + virtual sal_Bool SAL_CALL handleEvent( const Any& event ) throw(std::exception) SAL_OVERRIDE; // XDragSource - virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception); - virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception); + virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) SAL_OVERRIDE; virtual void SAL_CALL startDrag( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& transferable, const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener >& listener - ) throw(std::exception); + ) throw(std::exception) SAL_OVERRIDE; // SelectionAdaptor for XdndSelection Drag (we are drag source) - virtual com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > getTransferable() throw(); - virtual void clearTransferable() throw(); - virtual void fireContentsChanged() throw(); - virtual com::sun::star::uno::Reference< XInterface > getReference() throw(); + virtual com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > getTransferable() throw() SAL_OVERRIDE; + virtual void clearTransferable() throw() SAL_OVERRIDE; + virtual void fireContentsChanged() throw() SAL_OVERRIDE; + virtual com::sun::star::uno::Reference< XInterface > getReference() throw() SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTerminateListener virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/vcl/unx/generic/dtrans/X11_transferable.hxx b/vcl/unx/generic/dtrans/X11_transferable.hxx index d1263a64d6b2..d96fcbbcb33c 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.hxx +++ b/vcl/unx/generic/dtrans/X11_transferable.hxx @@ -47,13 +47,13 @@ namespace x11 { throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception - ); + ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace diff --git a/vcl/unx/generic/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx index a359dc77a921..d4a4633f0976 100644 --- a/vcl/unx/generic/dtrans/config.cxx +++ b/vcl/unx/generic/dtrans/config.cxx @@ -33,8 +33,8 @@ class DtransX11ConfigItem : public ::utl::ConfigItem { sal_Int32 m_nSelectionTimeout; - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames ); - virtual void Commit(); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; public: DtransX11ConfigItem(); virtual ~DtransX11ConfigItem(); diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index bf92b77383a7..868da22aaa80 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -64,7 +64,7 @@ namespace psp m_aQueues; OUString m_aCommand; - virtual void run(); + virtual void run() SAL_OVERRIDE; public: SystemQueueInfo(); diff --git a/vcl/unx/gtk/a11y/atklistener.hxx b/vcl/unx/gtk/a11y/atklistener.hxx index 8b3cb7fff5d3..3255bcf3b78d 100644 --- a/vcl/unx/gtk/a11y/atklistener.hxx +++ b/vcl/unx/gtk/a11y/atklistener.hxx @@ -36,11 +36,11 @@ public: // XEventListener virtual void disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleEventListener virtual void notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; AtkObjectWrapper *mpWrapper; AccessibleVector m_aChildList; diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index e8fe27a65d7c..e9309aa40fc8 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -181,10 +181,10 @@ public: throw (lang::IndexOutOfBoundsException, uno::RuntimeException); // XEventListener - virtual void disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception); + virtual void disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleEventListener - virtual void notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException, std::exception ); + virtual void notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; /*****************************************************************************/ diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index 4daa294e98b0..94634ca7dd7a 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -70,124 +70,124 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XExecutableDialog functions virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL execute() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XFilePicker functions virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setDefaultName( const OUString& aName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) throw( com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getDisplayDirectory( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XFilePicker2 functions virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFilterManager functions virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) - throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) - throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getCurrentFilter( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XFilterGroupManager functions virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFilePickerControlAccess functions virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) - throw(::com::sun::star::uno::RuntimeException, std::exception ); + throw(::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFilePreview virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getTargetColorDepth( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAvailableWidth( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAvailableHeight( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& aImage ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL getShowState( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCancellable virtual void SAL_CALL cancel( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventListener diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx index e4ca5bf62892..a7081c382be4 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx @@ -42,33 +42,33 @@ class SalGtkFolderPicker : virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL execute( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XFolderPicker functions virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) - throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getDisplayDirectory( ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getDirectory( ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setDescription( const OUString& rDescription ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XCancellable virtual void SAL_CALL cancel( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventListener diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx index a3ae4690189e..6a72e7f61b01 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx @@ -93,27 +93,27 @@ public: // XTopWindowListener using cppu::WeakComponentImplHelperBase::disposing; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& ) - throw(::com::sun::star::uno::RuntimeException, std::exception) {} + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {} virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) {} + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {} virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) {} + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {} virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) {} + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {} virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) {} + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {} virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) {} + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {} virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) {} + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {} // XTerminateListener virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: RunDialog(GtkWidget *pDialog, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit > &rToolkit, diff --git a/vcl/unx/kde/UnxCommandThread.hxx b/vcl/unx/kde/UnxCommandThread.hxx index c70959a78a96..7f963c4a8d22 100644 --- a/vcl/unx/kde/UnxCommandThread.hxx +++ b/vcl/unx/kde/UnxCommandThread.hxx @@ -115,7 +115,7 @@ public: ::com::sun::star::uno::Any SAL_CALL getValue(); protected: - virtual void SAL_CALL run(); + virtual void SAL_CALL run() SAL_OVERRIDE; virtual void SAL_CALL handleCommand( const OUString &rCommand/*, bool &rQuit*/ ); ::std::list< OUString > SAL_CALL tokenize( const OUString &rCommand ); diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx index 4f639763018f..e1b54c312d69 100644 --- a/vcl/unx/kde/UnxFilePicker.hxx +++ b/vcl/unx/kde/UnxFilePicker.hxx @@ -78,39 +78,39 @@ public: // XFilePickerNotifier - virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XFilePicker functions - virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XFilterManager functions - virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFilePickerControlAccess functions - virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /* TODO XFilePreview @@ -126,15 +126,15 @@ public: // XFilePicker2 virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XCancellable - virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventListener @@ -142,9 +142,9 @@ public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: // prevent copy and assignment diff --git a/vcl/unx/kde/UnxNotifyThread.hxx b/vcl/unx/kde/UnxNotifyThread.hxx index 993bcd61c6c6..399bc72efc6e 100644 --- a/vcl/unx/kde/UnxNotifyThread.hxx +++ b/vcl/unx/kde/UnxNotifyThread.hxx @@ -71,7 +71,7 @@ public: */ protected: - virtual void SAL_CALL run(); + virtual void SAL_CALL run() SAL_OVERRIDE; }; #endif // INCLUDED_VCL_UNX_KDE_UNXNOTIFYTHREAD_HXX diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index 4bb265bc9aa6..b9385ca791cf 100644 --- a/vcl/unx/kde/kdedata.cxx +++ b/vcl/unx/kde/kdedata.cxx @@ -54,7 +54,7 @@ class VCLKDEApplication : public KApplication public: VCLKDEApplication() : KApplication() {} - virtual void commitData(QSessionManager &sm); + virtual void commitData(QSessionManager &sm) SAL_OVERRIDE; }; void VCLKDEApplication::commitData(QSessionManager&) diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 0ca0cd8f916e..f95740fbe8fe 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -1209,19 +1209,19 @@ class KDESalGraphics : public X11SalGraphics public: KDESalGraphics() {} virtual ~KDESalGraphics() {} - virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); + virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ) SAL_OVERRIDE; 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; }; /** What widgets can be drawn the native way. diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx index 3cde3cf140e7..7ac1d2e223ad 100644 --- a/vcl/unx/kde4/KDE4FilePicker.hxx +++ b/vcl/unx/kde4/KDE4FilePicker.hxx @@ -87,34 +87,34 @@ public: virtual ~KDE4FilePicker(); // XFilePickerNotifier - virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XFilePicker functions - virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XFilterManager functions - virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFilePickerControlAccess functions - virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /* TODO XFilePreview @@ -129,22 +129,22 @@ public: // XFilePicker2 functions virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &rArguments ) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XCancellable - virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject &rEvent ) throw( ::com::sun::star::uno::RuntimeException ); using cppu::WeakComponentImplHelperBase::disposing; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private Q_SLOTS: // XExecutableDialog functions diff --git a/vcl/unx/kde4/KDEData.hxx b/vcl/unx/kde4/KDEData.hxx index 56adb6806832..b7099da161c0 100644 --- a/vcl/unx/kde4/KDEData.hxx +++ b/vcl/unx/kde4/KDEData.hxx @@ -29,9 +29,9 @@ class KDEData : public X11SalData : X11SalData( SAL_DATA_KDE4, pInstance ) {} virtual ~KDEData(); - virtual void Init(); - virtual void initNWF(); - virtual void deInitNWF(); + virtual void Init() SAL_OVERRIDE; + virtual void initNWF() SAL_OVERRIDE; + virtual void deInitNWF() SAL_OVERRIDE; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/kde4/KDESalDisplay.hxx b/vcl/unx/kde4/KDESalDisplay.hxx index 61beecba0f88..f4a41467e238 100644 --- a/vcl/unx/kde4/KDESalDisplay.hxx +++ b/vcl/unx/kde4/KDESalDisplay.hxx @@ -27,7 +27,7 @@ class SalKDEDisplay : public SalX11Display SalKDEDisplay( Display* pDisp ); virtual ~SalKDEDisplay(); static SalKDEDisplay* self(); - virtual void Yield(); + virtual void Yield() SAL_OVERRIDE; bool checkDirectInputEvent( XEvent* ev ); private: Atom xim_protocol; diff --git a/vcl/unx/kde4/KDESalFrame.hxx b/vcl/unx/kde4/KDESalFrame.hxx index 39ddc5ee655a..ca45b3463d9e 100644 --- a/vcl/unx/kde4/KDESalFrame.hxx +++ b/vcl/unx/kde4/KDESalFrame.hxx @@ -42,11 +42,11 @@ class KDESalFrame : public X11SalFrame KDESalFrame( SalFrame* pParent, sal_uLong nStyle ); virtual ~KDESalFrame(); - virtual SalGraphics* AcquireGraphics(); - virtual void ReleaseGraphics( SalGraphics *pGraphics ); - virtual void updateGraphics( bool bClear ); - virtual void UpdateSettings( AllSettings& rSettings ); - virtual void Show( bool bVisible, bool bNoActivate ); + virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE; + virtual void ReleaseGraphics( SalGraphics *pGraphics ) SAL_OVERRIDE; + virtual void updateGraphics( bool bClear ) SAL_OVERRIDE; + virtual void UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE; + virtual void Show( bool bVisible, bool bNoActivate ) SAL_OVERRIDE; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx index d865d43204e7..768b133dbc72 100644 --- a/vcl/unx/kde4/KDESalGraphics.hxx +++ b/vcl/unx/kde4/KDESalGraphics.hxx @@ -43,7 +43,7 @@ class KDESalGraphics : public X11SalGraphics @param part Specification of the widget's part if it consists of more than one. @return true if the platform supports native drawing of the widget type defined by part. */ - virtual bool IsNativeControlSupported( ControlType type, ControlPart part ); + virtual bool IsNativeControlSupported( ControlType type, ControlPart part ) SAL_OVERRIDE; /** Test whether the position is in the native widget. If the return value is TRUE, bIsInside contains information whether @@ -67,7 +67,7 @@ class KDESalGraphics : public X11SalGraphics virtual bool drawNativeControl( ControlType type, ControlPart part, const Rectangle& rControlRegion, ControlState nControlState, const ImplControlValue& aValue, - const OUString& aCaption ); + const OUString& aCaption ) SAL_OVERRIDE; /** Check if the bounding regions match. @@ -90,7 +90,7 @@ class KDESalGraphics : public X11SalGraphics const Rectangle& rControlRegion, ControlState nControlState, const ImplControlValue& aValue, const OUString& aCaption, - Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); + Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) SAL_OVERRIDE; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/kde4/KDESalInstance.hxx b/vcl/unx/kde4/KDESalInstance.hxx index f73af0d27a3d..5d042aa9862a 100644 --- a/vcl/unx/kde4/KDESalInstance.hxx +++ b/vcl/unx/kde4/KDESalInstance.hxx @@ -29,13 +29,13 @@ class KDESalInstance : public X11SalInstance public: KDESalInstance( SalYieldMutex* pMutex ) : X11SalInstance( pMutex ) {} virtual ~KDESalInstance() {} - virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ); + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ) SAL_OVERRIDE; - virtual bool hasNativeFileSelection() const { return true; } + virtual bool hasNativeFileSelection() const SAL_OVERRIDE { return true; } virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 > createFilePicker( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& ); + com::sun::star::uno::XComponentContext >& ) SAL_OVERRIDE; int getFrameWidth(); }; diff --git a/vcl/unx/kde4/KDEXLib.hxx b/vcl/unx/kde4/KDEXLib.hxx index a88258c5985e..e45543d47f26 100644 --- a/vcl/unx/kde4/KDEXLib.hxx +++ b/vcl/unx/kde4/KDEXLib.hxx @@ -78,14 +78,14 @@ class KDEXLib : public QObject, public SalXLib KDEXLib(); virtual ~KDEXLib(); - virtual void Init(); - virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ); - virtual void Insert( int fd, void* data, YieldFunc pending, YieldFunc queued, YieldFunc handle ); - virtual void Remove( int fd ); - virtual void StartTimer( sal_uLong nMS ); - virtual void StopTimer(); - virtual void Wakeup(); - virtual void PostUserEvent(); + virtual void Init() SAL_OVERRIDE; + virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ) SAL_OVERRIDE; + virtual void Insert( int fd, void* data, YieldFunc pending, YieldFunc queued, YieldFunc handle ) SAL_OVERRIDE; + virtual void Remove( int fd ) SAL_OVERRIDE; + virtual void StartTimer( sal_uLong nMS ) SAL_OVERRIDE; + virtual void StopTimer() SAL_OVERRIDE; + virtual void Wakeup() SAL_OVERRIDE; + virtual void PostUserEvent() SAL_OVERRIDE; void doStartup(); bool haveQt4SocketExcludeFix() { return m_haveQt4SocketExcludeFix; } diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx b/vcl/unx/kde4/VCLKDEApplication.hxx index 4ce0b2ca4f67..79859b81ddbd 100644 --- a/vcl/unx/kde4/VCLKDEApplication.hxx +++ b/vcl/unx/kde4/VCLKDEApplication.hxx @@ -19,6 +19,10 @@ #pragma once +#include <sal/config.h> + +#include <sal/types.h> + #define Region QtXRegion #include <kapplication.h> @@ -29,7 +33,7 @@ class VCLKDEApplication : public KApplication { public: VCLKDEApplication(); - virtual bool x11EventFilter(XEvent* event); + virtual bool x11EventFilter(XEvent* event) SAL_OVERRIDE; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |