diff options
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/ImageListProvider.hxx | 2 | ||||
-rw-r--r-- | include/vcl/accel.hxx | 6 | ||||
-rw-r--r-- | include/vcl/btndlg.hxx | 2 | ||||
-rw-r--r-- | include/vcl/button.hxx | 8 | ||||
-rw-r--r-- | include/vcl/dndhelp.hxx | 10 | ||||
-rw-r--r-- | include/vcl/dockwin.hxx | 10 | ||||
-rw-r--r-- | include/vcl/edit.hxx | 6 | ||||
-rw-r--r-- | include/vcl/fixed.hxx | 2 | ||||
-rw-r--r-- | include/vcl/gdimtf.hxx | 4 | ||||
-rw-r--r-- | include/vcl/graphicfilter.hxx | 2 | ||||
-rw-r--r-- | include/vcl/menu.hxx | 6 | ||||
-rw-r--r-- | include/vcl/outdev.hxx | 8 | ||||
-rw-r--r-- | include/vcl/print.hxx | 2 | ||||
-rw-r--r-- | include/vcl/printerinfomanager.hxx | 4 | ||||
-rw-r--r-- | include/vcl/scrbar.hxx | 2 | ||||
-rw-r--r-- | include/vcl/slider.hxx | 4 | ||||
-rw-r--r-- | include/vcl/spin.hxx | 4 | ||||
-rw-r--r-- | include/vcl/split.hxx | 8 | ||||
-rw-r--r-- | include/vcl/status.hxx | 4 | ||||
-rw-r--r-- | include/vcl/timer.hxx | 2 | ||||
-rw-r--r-- | include/vcl/toolbox.hxx | 8 | ||||
-rw-r--r-- | include/vcl/vclmedit.hxx | 2 | ||||
-rw-r--r-- | include/vcl/window.hxx | 20 |
23 files changed, 63 insertions, 63 deletions
diff --git a/include/vcl/ImageListProvider.hxx b/include/vcl/ImageListProvider.hxx index 924720b17842..1aa35dc238cd 100644 --- a/include/vcl/ImageListProvider.hxx +++ b/include/vcl/ImageListProvider.hxx @@ -39,7 +39,7 @@ namespace vcl /* abstract */ class IImageListProvider { public: - virtual ImageList getImageList(ImageListType) = 0; + ; protected: ~IImageListProvider() {} diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx index 5088dc57ff21..d0394bb94cf5 100644 --- a/include/vcl/accel.hxx +++ b/include/vcl/accel.hxx @@ -68,9 +68,9 @@ public: Accelerator( const ResId& rResId ); virtual ~Accelerator(); - virtual void Activate(); - virtual void Deactivate(); - virtual void Select(); + void Activate(); + void Deactivate(); + void Select(); void InsertItem( sal_uInt16 nItemId, const vcl::KeyCode& rKeyCode ); void InsertItem( const ResId& rResId ); diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index 81df3d1e9090..5601f1ffc93d 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -44,7 +44,7 @@ public: virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void Click(); + void Click(); void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; } const Size& GetPageSizePixel() const { return maPageSize; } diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index ee9ea29d8aff..7e59b06e3ede 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -168,9 +168,9 @@ public: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + void UserDraw( const UserDrawEvent& rUDEvt ); - virtual void Toggle(); + void Toggle(); void SetSymbol( SymbolType eSymbol ); SymbolType GetSymbol() const { return meSymbol; } @@ -358,7 +358,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Toggle(); + void Toggle(); bool IsStateChanged() const { return mbStateChanged; } @@ -474,7 +474,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Toggle(); + void Toggle(); void SetState( TriState eState ); TriState GetState() const { return meState; } diff --git a/include/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx index 116f46ac0797..a4d671214888 100644 --- a/include/vcl/dndhelp.hxx +++ b/include/vcl/dndhelp.hxx @@ -64,16 +64,16 @@ public: virtual void dragDropEnd(const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) + void dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) + void dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) + void dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) + void dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); @@ -90,7 +90,7 @@ public: virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) + void dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 691478164b6c..ca9325a1494f 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -173,7 +173,7 @@ public: void SetFloatStyle( WinBits nWinStyle ); WinBits GetFloatStyle() const { return mnFloatBits;} - virtual void setPosSizePixel( long nX, long nY, + void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); void SetPosSizePixel( const Point& rNewPos, @@ -311,10 +311,10 @@ public: virtual bool PrepareToggleFloatingMode(); virtual void ToggleFloatingMode(); - virtual void TitleButtonClick( sal_uInt16 nButton ); - virtual void Pin(); - virtual void Roll(); - virtual void PopupModeEnd(); + void TitleButtonClick( sal_uInt16 nButton ); + void Pin(); + void Roll(); + void PopupModeEnd(); virtual void Resizing( Size& rSize ); virtual bool Close(); virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index e61d31f56b72..9479fcbdeba8 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -223,8 +223,8 @@ public: virtual void SetText( const OUString& rStr, const Selection& rNewSelection ); virtual OUString GetText() const SAL_OVERRIDE; - virtual void SetPlaceholderText( const OUString& rStr ); - virtual OUString GetPlaceholderText() const; + void SetPlaceholderText( const OUString& rStr ); + OUString GetPlaceholderText() const; void SaveValue() { maSaveValue = GetText(); } const OUString& GetSavedValue() const { return maSaveValue; } @@ -244,7 +244,7 @@ public: virtual Size CalcMinimumSizeForText(const OUString &rString) const; virtual Size GetOptimalSize() const SAL_OVERRIDE; virtual Size CalcSize(sal_Int32 nChars) const; - virtual sal_Int32 GetMaxVisChars() const; + sal_Int32 GetMaxVisChars() const; sal_Int32 GetCharPos( const Point& rWindowPos ) const; diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 4e335516d021..92b0967127f3 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -185,7 +185,7 @@ public: virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + void UserDraw( const UserDrawEvent& rUDEvt ); virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetImage( const Image& rImage ); diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 30c2934888ef..8ff335346d8f 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -118,8 +118,8 @@ private: protected: - virtual void Linker( OutputDevice* pOut, bool bLink ); - virtual long Hook(); + void Linker( OutputDevice* pOut, bool bLink ); + long Hook(); public: GDIMetaFile(); diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 0515e205707e..8ae868fe7fdc 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -188,7 +188,7 @@ public: if bExtendedInfo == true the file header is used to derive as many properties as possible (size, color, etc.) */ - virtual bool Detect( bool bExtendedInfo = false ); + bool Detect( bool bExtendedInfo = false ); /** @return the file format, GFF_NOT if no format was recognized */ sal_uInt16 GetFileFormat() const { return nFormat; } diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 9b7e522b5ab0..a1986ba634f0 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -213,11 +213,11 @@ protected: public: virtual ~Menu(); - virtual void Activate(); - virtual void Deactivate(); + void Activate(); + void Deactivate(); virtual void Highlight(); virtual void Select(); - virtual void RequestHelp( const HelpEvent& rHEvt ); + void RequestHelp( const HelpEvent& rHEvt ); void InsertItem( sal_uInt16 nItemId, const OUString& rStr, MenuItemBits nItemBits = MenuItemBits::NONE, diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index c7a2adec1f0b..c8adafd90137 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -498,8 +498,8 @@ public: sal_uInt16 nFlags = 0 ); // Call before and after a paint operation to reduce flushing - virtual void BeginPaint(); - virtual void EndPaint(); + void BeginPaint(); + void EndPaint(); protected: @@ -1569,9 +1569,9 @@ public: void EnableMapMode( bool bEnable = true ); bool IsMapModeEnabled() const { return mbMap; } - virtual void SetMapMode(); + void SetMapMode(); virtual void SetMapMode( const MapMode& rNewMapMode ); - virtual void SetRelativeMapMode( const MapMode& rNewMapMode ); + void SetRelativeMapMode( const MapMode& rNewMapMode ); const MapMode& GetMapMode() const { return maMapMode; } // #i75163# diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 00c05547bded..bfa9469f5a48 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -304,7 +304,7 @@ public: static const QueueInfo* GetQueueInfo( const OUString& rPrinterName, bool bStatusUpdate ); static OUString GetDefaultPrinterName(); - virtual void Error(); + void Error(); const OUString& GetName() const { return maPrinterName; } const OUString& GetDriverName() const { return maDriver; } diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx index d99afbe1d7c6..c761429ea126 100644 --- a/include/vcl/printerinfomanager.hxx +++ b/include/vcl/printerinfomanager.hxx @@ -178,10 +178,10 @@ public: // primarily used internally // returns the printer queue names - virtual const std::list< SystemPrintQueue >& getSystemPrintQueues(); + const std::list< SystemPrintQueue >& getSystemPrintQueues(); // similar but returnse whole commandlines - virtual void getSystemPrintCommands( std::list< OUString >& rCommands ); + void getSystemPrintCommands( std::list< OUString >& rCommands ); // abstract print command // returns a stdio FILE* that a postscript file may be written to diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index db0a673842d7..0208635477ce 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -105,7 +105,7 @@ public: virtual void LoseFocus() SAL_OVERRIDE; using Window::Scroll; - virtual void Scroll(); + void Scroll(); virtual void EndScroll(); long DoScroll( long nNewPos ); diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index bc30d29d4060..859852e458c1 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -83,8 +83,8 @@ public: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Slide(); - virtual void EndSlide(); + void Slide(); + void EndSlide(); void EnableDrag( bool bEnable = true ) { mbFullDrag = bEnable; } diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index 1900822b1844..243107afd804 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -59,8 +59,8 @@ public: explicit SpinButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~SpinButton(); - virtual void Up(); - virtual void Down(); + void Up(); + void Down(); virtual void Resize() SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index 1ed55f4ab909..81ffe4ffe14f 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -65,9 +65,9 @@ public: explicit Splitter( vcl::Window* pParent, WinBits nStyle = WB_VSCROLL ); virtual ~Splitter(); - virtual void StartSplit(); - virtual void EndSplit(); - virtual void Split(); + void StartSplit(); + void EndSplit(); + void Split(); virtual void Splitting( Point& rSplitPos ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -89,7 +89,7 @@ public: const Rectangle& GetDragRectPixel() const { return maDragRect; } vcl::Window* GetDragWindow() const { return mpRefWin; } - virtual void SetSplitPosPixel( long nPos ); + void SetSplitPosPixel( long nPos ); long GetSplitPosPixel() const { return mnSplitPos; } bool IsHorizontal() const { return mbHorzSplit; } diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index b6433ef89531..124f26c9302e 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -125,8 +125,8 @@ public: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Click(); - virtual void DoubleClick(); + void Click(); + void DoubleClick(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); void InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index 11e8f3fa875d..602bad2b4aea 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -110,7 +110,7 @@ class VCL_DLLPUBLIC Idle : public Timer void Start() { Timer::Start(); } void Stop() { Timer::Stop(); } - virtual void DoIdle(); + void DoIdle(); virtual void Timeout() SAL_OVERRIDE { DoIdle(); } }; diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 2d6961da1286..9b9d2c21f6e9 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -290,13 +290,13 @@ public: virtual ~ToolBox(); virtual void Click(); - virtual void DoubleClick(); + void DoubleClick(); virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; - virtual void Highlight(); + void Highlight(); virtual void Select(); - virtual void Customize( const ToolBoxCustomizeEvent& rCEvt ); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + void Customize( const ToolBoxCustomizeEvent& rCEvt ); + void UserDraw( const UserDrawEvent& rUDEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index fe5280d1ba2d..786764bdf7bf 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -89,7 +89,7 @@ public: virtual void ReplaceSelected( const OUString& rStr ) SAL_OVERRIDE; virtual void DeleteSelected() SAL_OVERRIDE; virtual OUString GetSelected() const SAL_OVERRIDE; - virtual OUString GetSelected( LineEnd aSeparator ) const; + OUString GetSelected( LineEnd aSeparator ) const; virtual void Cut() SAL_OVERRIDE; virtual void Copy() SAL_OVERRIDE; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index c021333ba744..d4827439bfd5 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -704,7 +704,7 @@ public: virtual void Erase() SAL_OVERRIDE; virtual void Erase( const Rectangle& rRect ) SAL_OVERRIDE { ::OutputDevice::Erase( rRect ); } - virtual void PostPaint(); + void PostPaint(); virtual void Draw( ::OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Move(); virtual void Resize(); @@ -797,7 +797,7 @@ public: using ::OutputDevice::SetSettings; virtual void SetSettings( const AllSettings& rSettings ) SAL_OVERRIDE; - virtual void SetSettings( const AllSettings& rSettings, bool bChild ); + void SetSettings( const AllSettings& rSettings, bool bChild ); void UpdateSettings( const AllSettings& rSettings, bool bChild = false ); void NotifyAllChildren( DataChangedEvent& rDCEvt ); @@ -959,10 +959,10 @@ public: // window extents of the client window, coordinates to be used in SetPosPixel Rectangle GetClientWindowExtentsRelative( vcl::Window *pRelativeWindow ) const; - virtual bool IsScrollable() const; + bool IsScrollable() const; virtual void Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags = 0 ); - virtual void Scroll( long nHorzScroll, long nVertScroll, + void Scroll( long nHorzScroll, long nVertScroll, const Rectangle& rRect, sal_uInt16 nFlags = 0 ); virtual void Invalidate( sal_uInt16 nFlags = 0 ); virtual void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 ); @@ -1105,7 +1105,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface( bool bCreate = true ); - virtual void SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ); + void SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ); /** @name Accessibility */ @@ -1224,13 +1224,13 @@ public: void SetCreatedWithToolkit( bool b ); // Drag and Drop interfaces - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > GetDropTarget(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > GetDragSource(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > GetDragGestureRecognizer(); + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > GetDropTarget(); + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > GetDragSource(); + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > GetDragGestureRecognizer(); // Clipboard/Selection interfaces - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetClipboard(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetPrimarySelection(); + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetClipboard(); + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetPrimarySelection(); /* * Widgets call this to inform their owner container that the widget wants |