diff options
Diffstat (limited to 'vcl/inc')
48 files changed, 688 insertions, 684 deletions
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; }; |