diff options
Diffstat (limited to 'dbaccess/source/ui')
173 files changed, 1628 insertions, 1628 deletions
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 87ba2f22ac98..687f8bfb2860 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -393,14 +393,14 @@ namespace dbaui // initalizing members // state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const SAL_OVERRIDE; + virtual FeatureState GetState(sal_uInt16 nId) const override; // execute a feature - virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; // OGenericUnoController - virtual void onLoadedMenu( const css::uno::Reference< css::frame::XLayoutManager >& _xLayoutManager ) SAL_OVERRIDE; + virtual void onLoadedMenu( const css::uno::Reference< css::frame::XLayoutManager >& _xLayoutManager ) override; - virtual css::uno::Reference< css::frame::XModel > getPrivateModel() const SAL_OVERRIDE + virtual css::uno::Reference< css::frame::XModel > getPrivateModel() const override { return m_xModel; } @@ -414,8 +414,8 @@ namespace dbaui DECLARE_XTYPEPROVIDER( ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // need by registration static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); @@ -423,43 +423,43 @@ namespace dbaui SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // css::frame::XController - virtual void SAL_CALL attachFrame(const css::uno::Reference< css::frame::XFrame > & xFrame) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL attachModel(const css::uno::Reference< css::frame::XModel > & xModel) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL attachFrame(const css::uno::Reference< css::frame::XFrame > & xFrame) throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL attachModel(const css::uno::Reference< css::frame::XModel > & xModel) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) override; // css::container::XContainerListener - virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override; // XDatabaseDocumentUI - virtual css::uno::Reference< css::sdbc::XDataSource > SAL_CALL getDataSource() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getApplicationMainWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getActiveConnection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< css::uno::Reference< css::lang::XComponent > > SAL_CALL getSubComponents() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isConnected( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XDataSource > SAL_CALL getDataSource() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getApplicationMainWindow() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getActiveConnection() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::lang::XComponent > > SAL_CALL getSubComponents() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isConnected( ) throw (css::uno::RuntimeException, std::exception) override; // DO NOT CALL with getMutex() held!! - virtual void SAL_CALL connect( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::beans::Pair< ::sal_Int32, OUString > SAL_CALL identifySubComponent( const css::uno::Reference< css::lang::XComponent >& SubComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL closeSubComponents( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponent( ::sal_Int32 ObjectType, const OUString& ObjectName, sal_Bool ForEditing ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentWithArguments( ::sal_Int32 ObjectType, const OUString& ObjectName, sal_Bool ForEditing, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::lang::XComponent > SAL_CALL createComponent( ::sal_Int32 ObjectType, css::uno::Reference< css::lang::XComponent >& o_DocumentDefinition ) throw (css::lang::IllegalArgumentException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::lang::XComponent > SAL_CALL createComponentWithArguments( ::sal_Int32 ObjectType, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, css::uno::Reference< css::lang::XComponent >& o_DocumentDefinition ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL connect( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::Pair< ::sal_Int32, OUString > SAL_CALL identifySubComponent( const css::uno::Reference< css::lang::XComponent >& SubComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL closeSubComponents( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponent( ::sal_Int32 ObjectType, const OUString& ObjectName, sal_Bool ForEditing ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentWithArguments( ::sal_Int32 ObjectType, const OUString& ObjectName, sal_Bool ForEditing, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL createComponent( ::sal_Int32 ObjectType, css::uno::Reference< css::lang::XComponent >& o_DocumentDefinition ) throw (css::lang::IllegalArgumentException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL createComponentWithArguments( ::sal_Int32 ObjectType, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, css::uno::Reference< css::lang::XComponent >& o_DocumentDefinition ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XContextMenuInterception - virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override; // XSelectionSupplier - virtual sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getSelection( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getSelection( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; /** retrieves the current connection, creates it if necessary @@ -516,32 +516,32 @@ namespace dbaui void containerFound( const css::uno::Reference< css::container::XContainer >& _xContainer); // IController - virtual void executeUnChecked(const css::util::URL& _rCommand, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; - virtual void executeChecked(const css::util::URL& _rCommand, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; - virtual void executeUnChecked(sal_uInt16 _nCommandId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; - virtual void executeChecked(sal_uInt16 _nCommandId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; - virtual bool isCommandEnabled(sal_uInt16 _nCommandId) const SAL_OVERRIDE; - virtual bool isCommandEnabled( const OUString& _rCompleteCommandURL ) const SAL_OVERRIDE; - virtual sal_uInt16 registerCommandURL( const OUString& _rCompleteCommandURL ) SAL_OVERRIDE; - virtual void notifyHiContrastChanged() SAL_OVERRIDE; - virtual bool isDataSourceReadOnly() const SAL_OVERRIDE; + virtual void executeUnChecked(const css::util::URL& _rCommand, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; + virtual void executeChecked(const css::util::URL& _rCommand, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; + virtual void executeUnChecked(sal_uInt16 _nCommandId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; + virtual void executeChecked(sal_uInt16 _nCommandId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; + virtual bool isCommandEnabled(sal_uInt16 _nCommandId) const override; + virtual bool isCommandEnabled( const OUString& _rCompleteCommandURL ) const override; + virtual sal_uInt16 registerCommandURL( const OUString& _rCompleteCommandURL ) override; + virtual void notifyHiContrastChanged() override; + virtual bool isDataSourceReadOnly() const override; virtual css::uno::Reference< css::frame::XController > - getXController() throw( css::uno::RuntimeException ) SAL_OVERRIDE; - virtual bool interceptUserInput( const NotifyEvent& _rEvent ) SAL_OVERRIDE; + getXController() throw( css::uno::RuntimeException ) override; + virtual bool interceptUserInput( const NotifyEvent& _rEvent ) override; // IControlActionListener overridables - virtual bool requestQuickHelp( const SvTreeListEntry* _pEntry, OUString& _rText ) const SAL_OVERRIDE; - virtual bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ) SAL_OVERRIDE; - virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ) SAL_OVERRIDE; - virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ) SAL_OVERRIDE; + virtual bool requestQuickHelp( const SvTreeListEntry* _pEntry, OUString& _rText ) const override; + virtual bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ) override; + virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ) override; + virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ) override; // IContextMenuProvider - virtual PopupMenu* getContextMenu( Control& _rControl ) const SAL_OVERRIDE; - virtual IController& getCommandController() SAL_OVERRIDE; + virtual PopupMenu* getContextMenu( Control& _rControl ) const override; + virtual IController& getCommandController() override; virtual ::cppu::OInterfaceContainerHelper* - getContextMenuInterceptors() SAL_OVERRIDE; + getContextMenuInterceptors() override; virtual css::uno::Any - getCurrentSelection( Control& _rControl ) const SAL_OVERRIDE; + getCurrentSelection( Control& _rControl ) const override; void OnInvalidateClipboard(); DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void ); @@ -558,15 +558,15 @@ namespace dbaui void disconnect(); // late construction - virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; - virtual void describeSupportedFeatures() SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) override; + virtual void describeSupportedFeatures() override; protected: // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; // OComponentHelper - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index d1877b1b1e7b..73e00dba2604 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -130,10 +130,10 @@ namespace DECL_LINK_TYPED(OnDisableInput, void*, void); void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); protected: - virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; + virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: OTablePreviewWindow( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; }; OTablePreviewWindow::OTablePreviewWindow(vcl::Window* pParent, WinBits nStyle) : Window( pParent, nStyle) { diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 63a08451dd9d..d499006deab4 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -64,12 +64,12 @@ namespace dbaui bool ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const; void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); protected: - virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; + virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: explicit OPreviewWindow(vcl::Window* _pParent); // Window overrides - virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) override; void setGraphic(const Graphic& _rGraphic ) { m_aGraphicObj.SetGraphic(_rGraphic); } }; @@ -168,11 +168,11 @@ namespace dbaui public: OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode); virtual ~OAppDetailPageHelper(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // Window overrides - virtual void Resize() SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Resize() override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; /** creates the tables page @param _xConnection @@ -347,7 +347,7 @@ namespace dbaui bool _bTable); protected: - void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + void DataChanged( const DataChangedEvent& rDCEvt ) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_APP_APPDETAILPAGEHELPER_HXX diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index ec25f2c0e326..776b5d094313 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -57,27 +57,27 @@ namespace dbaui public: explicit OCreationList( OTasksWindow& _rParent ); // Window overrides - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; inline void resetLastActive() { m_pLastActiveEntry = NULL;} void updateHelpText(); protected: - virtual void PreparePaint(vcl::RenderContext& rRenderContext, SvTreeListEntry& rEntry) SAL_OVERRIDE; - virtual Rectangle GetFocusRect( SvTreeListEntry* _pEntry, long _nLine ) SAL_OVERRIDE; - virtual void ModelHasCleared() SAL_OVERRIDE; + virtual void PreparePaint(vcl::RenderContext& rRenderContext, SvTreeListEntry& rEntry) override; + virtual Rectangle GetFocusRect( SvTreeListEntry* _pEntry, long _nLine ) override; + virtual void ModelHasCleared() override; // IMnemonicEntryList - virtual void SelectSearchEntry( const void* _pEntry ) SAL_OVERRIDE; - virtual void ExecuteSearchEntry( const void* _pEntry ) const SAL_OVERRIDE; + virtual void SelectSearchEntry( const void* _pEntry ) override; + virtual void ExecuteSearchEntry( const void* _pEntry ) const override; private: void onSelected( SvTreeListEntry* _pEntry ) const; @@ -120,14 +120,14 @@ namespace dbaui DECL_LINK_TYPED( OnEntrySelectHdl, SvTreeListBox*, void ); void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); protected: - virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; + virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetailView); virtual ~OTasksWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // Window overrides - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; OApplicationDetailView* getDetailView() const { return m_pDetailView; } @@ -156,14 +156,14 @@ namespace dbaui void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); protected: - virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; + virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode); virtual ~OApplicationDetailView(); // Window overrides - virtual void dispose() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; + virtual void dispose() override; + virtual void GetFocus() override; /** creates the tables page @param _xConnection @@ -192,12 +192,12 @@ namespace dbaui inline OAppBorderWindow& getBorderWin() const { return m_rBorderWin; } inline OTasksWindow& getTasksWindow() const { return *static_cast< OTasksWindow* >( m_aTasks->getChildWindow() ); } - bool isCutAllowed() SAL_OVERRIDE ; - bool isCopyAllowed() SAL_OVERRIDE ; - bool isPasteAllowed() SAL_OVERRIDE; - void copy() SAL_OVERRIDE; - void cut() SAL_OVERRIDE; - void paste() SAL_OVERRIDE; + bool isCutAllowed() override ; + bool isCopyAllowed() override ; + bool isPasteAllowed() override; + void copy() override; + void cut() override; + void paste() override; /** return the qualified name. @param _pEntry diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx index b5a135cc2cf7..a998345ed301 100644 --- a/dbaccess/source/ui/app/AppIconControl.hxx +++ b/dbaccess/source/ui/app/AppIconControl.hxx @@ -34,14 +34,14 @@ namespace dbaui public: explicit OApplicationIconControl(vcl::Window* _pParent); virtual ~OApplicationIconControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } protected: // DropTargetHelper overridables - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ) override; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_APP_APPICONCONTROL_HXX diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index 479271214365..aa6108fe2fc0 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -40,20 +40,20 @@ namespace dbaui DECL_LINK_TYPED( OnContainerSelectHdl, SvtIconChoiceCtrl*, void ); DECL_LINK_TYPED( ChangeToLastSelected, void*, void ); protected: - virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; + virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: OApplicationSwapWindow( vcl::Window* _pParent, OAppBorderWindow& _rBorderWindow ); virtual ~OApplicationSwapWindow(); // Window overrides - virtual void dispose() SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void dispose() override; + virtual void Resize() override; - bool isCutAllowed() SAL_OVERRIDE { return false; } - bool isCopyAllowed() SAL_OVERRIDE { return false; } - bool isPasteAllowed() SAL_OVERRIDE { return false; } - void copy() SAL_OVERRIDE { } - void cut() SAL_OVERRIDE { } - void paste() SAL_OVERRIDE { } + bool isCutAllowed() override { return false; } + bool isCopyAllowed() override { return false; } + bool isPasteAllowed() override { return false; } + void copy() override { } + void cut() override { } + void paste() override { } inline sal_Int32 GetEntryCount() const { return m_aIconControl->GetEntryCount(); } inline SvxIconChoiceCtrlEntry* GetEntry( sal_uLong nPos ) const { return m_aIconControl->GetEntry(nPos); } diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx index 938d6197c26a..d22938df00ee 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.hxx +++ b/dbaccess/source/ui/app/AppTitleWindow.hxx @@ -32,17 +32,17 @@ namespace dbaui bool m_bShift; void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); protected: - virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; + virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift = true); virtual ~OTitleWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // Window overrides - virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; + virtual void Resize() override; + virtual void GetFocus() override; - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; /** sets the child window which should be displayed below the title. It will be destroyed at the end. @param _pChild diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index b249729ebf33..556fcf9fcaf5 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -52,15 +52,15 @@ namespace dbaui void ImplInitSettings(); protected: // Window - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; public: OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePreviewMode); virtual ~OAppBorderWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // Window overrides - virtual void GetFocus() SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() override; + virtual void Resize() override; OApplicationView* getView() const { return m_pView;} OApplicationSwapWindow* getPanel() const; @@ -91,13 +91,13 @@ namespace dbaui protected: // return the Rectangle where I can paint myself - virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE; + virtual void resizeDocumentView(Rectangle& rRect) override; // OEventListenerAdapter - virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE; + virtual void _disposing( const css::lang::EventObject& _rSource ) override; // Window - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; public: OApplicationView( vcl::Window* pParent ,const css::uno::Reference< css::uno::XComponentContext >& @@ -105,7 +105,7 @@ namespace dbaui ,PreviewMode _ePreviewMode ); virtual ~OApplicationView(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /// automatically creates mnemonics for the icon/texts in our left hand side panel void createIconAutoMnemonics( MnemonicGenerator& _rMnemonics ); @@ -114,18 +114,18 @@ namespace dbaui void setTaskExternalMnemonics( MnemonicGenerator& _rMnemonics ); // Window overrides - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual void GetFocus() override; inline OApplicationController& getAppController() const { return m_rAppController; } // IClipboardTest - virtual bool isCutAllowed() SAL_OVERRIDE; - virtual bool isCopyAllowed() SAL_OVERRIDE; - virtual bool isPasteAllowed() SAL_OVERRIDE; - virtual void copy() SAL_OVERRIDE; - virtual void cut() SAL_OVERRIDE; - virtual void paste() SAL_OVERRIDE; + virtual bool isCutAllowed() override; + virtual bool isCopyAllowed() override; + virtual bool isPasteAllowed() override; + virtual void copy() override; + virtual void cut() override; + virtual void paste() override; /// get the left panel inline OApplicationSwapWindow* getPanel() const { return m_pWin->getPanel(); } diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx index dd6237612bc1..3500205f7cb4 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.hxx +++ b/dbaccess/source/ui/app/subcomponentmanager.hxx @@ -48,10 +48,10 @@ namespace dbaui void disposing(); // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; // XDatabaseDocumentUI helpers css::uno::Sequence< css::uno::Reference< css::lang::XComponent> > diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 7f845cfc1c1c..d998829bff98 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -138,7 +138,7 @@ public: Sequence< PropertyValue > getValues() const { return m_aValues; } // XInteractionSupplyParameters - virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException, std::exception) override; }; void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException, std::exception) @@ -161,82 +161,82 @@ public: explicit FormControllerImpl(SbaXDataBrowserController* pOwner); // XFormController - virtual css::uno::Reference< css::form::runtime::XFormOperations > SAL_CALL getFormOperations() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::awt::XControl > SAL_CALL getCurrentControl() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addActivateListener(const css::uno::Reference< css::form::XFormControllerListener > & l) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeActivateListener(const css::uno::Reference< css::form::XFormControllerListener > & l) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addChildController( const css::uno::Reference< css::form::runtime::XFormController >& _ChildController ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Reference< css::form::runtime::XFormControllerContext > SAL_CALL getContext() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setContext( const css::uno::Reference< css::form::runtime::XFormControllerContext >& _context ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& _interactionHandler ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::form::runtime::XFormOperations > SAL_CALL getFormOperations() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XControl > SAL_CALL getCurrentControl() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addActivateListener(const css::uno::Reference< css::form::XFormControllerListener > & l) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeActivateListener(const css::uno::Reference< css::form::XFormControllerListener > & l) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addChildController( const css::uno::Reference< css::form::runtime::XFormController >& _ChildController ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override; + virtual css::uno::Reference< css::form::runtime::XFormControllerContext > SAL_CALL getContext() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setContext( const css::uno::Reference< css::form::runtime::XFormControllerContext >& _context ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& _interactionHandler ) throw (css::uno::RuntimeException, std::exception) override; // XChild, base of XFormController - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XComponent, base of XFormController - virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XIndexAccess, base of XFormController - virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XElementAccess, base of XIndexAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; // XEnumerationAccess, base of XElementAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException, std::exception) override; // XModifyBroadcaster, base of XFormController - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XConfirmDeleteBroadcaster, base of XFormController - virtual void SAL_CALL addConfirmDeleteListener( const css::uno::Reference< css::form::XConfirmDeleteListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeConfirmDeleteListener( const css::uno::Reference< css::form::XConfirmDeleteListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addConfirmDeleteListener( const css::uno::Reference< css::form::XConfirmDeleteListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeConfirmDeleteListener( const css::uno::Reference< css::form::XConfirmDeleteListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XSQLErrorBroadcaster, base of XFormController - virtual void SAL_CALL addSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; // XRowSetApproveBroadcaster, base of XFormController - virtual void SAL_CALL addRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) throw (css::uno::RuntimeException, std::exception) override; // XDatabaseParameterBroadcaster2, base of XFormController - virtual void SAL_CALL addDatabaseParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeDatabaseParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addDatabaseParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeDatabaseParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XDatabaseParameterBroadcaster, base of XDatabaseParameterBroadcaster2 - virtual void SAL_CALL addParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XModeSelector, base of XFormController - virtual void SAL_CALL setMode( const OUString& aMode ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getMode( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedModes( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsMode( const OUString& aMode ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMode( const OUString& aMode ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getMode( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedModes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMode( const OUString& aMode ) throw (css::uno::RuntimeException, std::exception) override; // XTabController, base of XFormController - virtual void SAL_CALL setModel(const css::uno::Reference< css::awt::XTabControllerModel > & Model) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Reference< css::awt::XTabControllerModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setContainer(const css::uno::Reference< css::awt::XControlContainer > & _Container) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Reference< css::awt::XControlContainer > SAL_CALL getContainer() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl > > SAL_CALL getControls() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL autoTabOrder() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL activateTabOrder() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL activateFirst() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL activateLast() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setModel(const css::uno::Reference< css::awt::XTabControllerModel > & Model) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XTabControllerModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setContainer(const css::uno::Reference< css::awt::XControlContainer > & _Container) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XControlContainer > SAL_CALL getContainer() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl > > SAL_CALL getControls() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL autoTabOrder() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL activateTabOrder() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL activateFirst() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL activateLast() throw( css::uno::RuntimeException, std::exception ) override; // XFrameActionListener - virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; protected: virtual ~FormControllerImpl(); diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index cb9ccaa4a35b..3b2d2a2a139b 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -74,9 +74,9 @@ public: virtual ~DBContentLoader(); // XServiceInfo - OUString SAL_CALL getImplementationName() throw(std::exception ) SAL_OVERRIDE; - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) SAL_OVERRIDE; + OUString SAL_CALL getImplementationName() throw(std::exception ) override; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) override; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) override; // static methods static OUString getImplementationName_Static() throw( ) @@ -90,8 +90,8 @@ public: // XLoader virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const OUString& _rURL, const Sequence< PropertyValue >& _rArgs, - const Reference< XLoadEventListener > & _rListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancel() throw(std::exception) SAL_OVERRIDE; + const Reference< XLoadEventListener > & _rListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel() throw(std::exception) override; }; diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx index 378ae86e47de..0e9525ef3e28 100644 --- a/dbaccess/source/ui/browser/dbtreeview.hxx +++ b/dbaccess/source/ui/browser/dbtreeview.hxx @@ -36,13 +36,13 @@ namespace dbaui VclPtr<DBTreeListBox> m_pTreeListBox; protected: // window overridables - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; public: DBTreeView( vcl::Window* pParent, WinBits nBits ); virtual ~DBTreeView(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /** sets a handler which is called when an list box entry is to be expanded. <p>When calling the link, the parameter is an SvTreeListEntry marking the entry to be expanded. @@ -57,7 +57,7 @@ namespace dbaui DBTreeListBox& getListBox() const { return *m_pTreeListBox; } - virtual void GetFocus() SAL_OVERRIDE; + virtual void GetFocus() override; }; } diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 4d0350d3220e..2869dbc7820f 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1107,7 +1107,7 @@ namespace virtual ~FilterByEntryDataId() {} - virtual bool includeEntry( SvTreeListEntry* _pEntry ) const SAL_OVERRIDE; + virtual bool includeEntry( SvTreeListEntry* _pEntry ) const override; }; bool FilterByEntryDataId::includeEntry( SvTreeListEntry* _pEntry ) const diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 771266a5cfe6..baf251536fd2 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -101,23 +101,23 @@ namespace dbaui protected: virtual ~ORelationControl() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE { m_pListCell.disposeAndClear(); ORelationControl_Base::dispose(); } - virtual void Resize() SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; - virtual bool PreNotify(NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void dispose() override { m_pListCell.disposeAndClear(); ORelationControl_Base::dispose(); } + virtual void Resize() override; + virtual Size GetOptimalSize() const override; + virtual bool PreNotify(NotifyEvent& rNEvt ) override; - virtual bool IsTabAllowed(bool bForward) const SAL_OVERRIDE; + virtual bool IsTabAllowed(bool bForward) const override; void Init(const TTableConnectionData::value_type& _pConnData); - virtual void Init() SAL_OVERRIDE { ORelationControl_Base::Init(); } - virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) SAL_OVERRIDE; - virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) SAL_OVERRIDE; - virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const SAL_OVERRIDE; - virtual bool SeekRow( long nRow ) SAL_OVERRIDE; - virtual bool SaveModified() SAL_OVERRIDE; - virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const SAL_OVERRIDE; - - virtual void CellModified() SAL_OVERRIDE; + virtual void Init() override { ORelationControl_Base::Init(); } + virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) override; + virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) override; + virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const override; + virtual bool SeekRow( long nRow ) override; + virtual bool SaveModified() override; + virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const override; + + virtual void CellModified() override; DECL_LINK_TYPED( AsynchDeactivate, void*, void ); private: diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 8535e7bcbbfc..5c0075d0fe27 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -523,10 +523,10 @@ namespace { } - virtual sal_Bool SAL_CALL select( const Any& xSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual Any SAL_CALL getSelection( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL select( const Any& xSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) override; + virtual Any SAL_CALL getSelection( ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) override; protected: virtual ~SelectionSupplier() diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index bb6b3cde2ab2..554c289031c3 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -49,7 +49,7 @@ private: virtual ~ChangesListener() {} virtual void SAL_CALL disposing(css::lang::EventObject const &) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { osl::MutexGuard g(editor_.m_mutex); editor_.m_notifier.clear(); @@ -57,7 +57,7 @@ private: virtual void SAL_CALL propertiesChange( css::uno::Sequence< css::beans::PropertyChangeEvent > const &) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { SolarMutexGuard g; editor_.ImplSetFont(); diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 2f80e5d3c678..e025e00eb165 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -42,7 +42,7 @@ namespace dbaui public: OConnectionHelper( vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs); virtual ~OConnectionHelper(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; VclPtr<FixedText> m_pFT_Connection; VclPtr<OConnectionURLEdit> m_pConnectionURL; VclPtr<PushButton> m_pPB_Connection; @@ -54,13 +54,13 @@ namespace dbaui // setting/retrieving the current connection URL // necessary because for some types, the URL must be decoded for display purposes ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance - virtual bool PreNotify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& _rNEvt ) override; // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; // setting/retrieving the current connection URL // necessary because for some types, the URL must be decoded for display purposes diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 10d13b8aa43e..bd2f3051ac5d 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -57,11 +57,11 @@ namespace dbaui public: virtual ~OConnectionTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet ); - virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; + virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; /** changes the connection URL. <p>The new URL must be of the type which is currently selected, only the parts which do not @@ -74,7 +74,7 @@ namespace dbaui private: /** enables the test connection button, if allowed */ - virtual bool checkTestConnection() SAL_OVERRIDE; + virtual bool checkTestConnection() override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index 7b221793f111..6b9284e65bac 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -48,21 +48,21 @@ namespace dbaui public: virtual ~OConnectionTabPageSetup(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<OGenericAdministrationPage> CreateDbaseTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); static VclPtr<OGenericAdministrationPage> CreateMSAccessTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); static VclPtr<OGenericAdministrationPage> CreateADOTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); static VclPtr<OGenericAdministrationPage> CreateODBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); static VclPtr<OGenericAdministrationPage> CreateUserDefinedTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); - virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; + virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; protected: OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId); - virtual bool checkTestConnection() SAL_OVERRIDE; + virtual bool checkTestConnection() override; // nControlFlags is a combination of the CBTP_xxx-constants }; diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 58d2a3e2ec5b..0baf12edd62f 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -39,19 +39,19 @@ namespace dbaui class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; static VclPtr<OGenericAdministrationPage> CreateSpreadSheetTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); OSpreadSheetConnectionPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); virtual ~OSpreadSheetConnectionPageSetup(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: VclPtr<CheckBox> m_pPasswordrequired; protected: - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; }; @@ -61,17 +61,17 @@ namespace dbaui public: VclPtr<OTextConnectionHelper> m_pTextConnectionHelper; - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; static VclPtr<OGenericAdministrationPage> CreateTextTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); OTextConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual ~OTextConnectionPageSetup(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: - virtual bool prepareLeave() SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - bool checkTestConnection() SAL_OVERRIDE; + virtual bool prepareLeave() override; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + bool checkTestConnection() override; private: DECL_LINK_TYPED(ImplGetExtensionHdl, OTextConnectionHelper*, void); @@ -81,17 +81,17 @@ namespace dbaui class OLDAPConnectionPageSetup : public OGenericAdministrationPage { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; static VclPtr<OGenericAdministrationPage> CreateLDAPTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); OLDAPConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual ~OLDAPConnectionPageSetup(); - virtual void dispose() SAL_OVERRIDE; - virtual Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); } + virtual void dispose() override; + virtual Link<> getControlModifiedLink() override { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); } protected: - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; DECL_LINK(OnEditModified,Edit*); private: @@ -116,18 +116,18 @@ namespace dbaui public: MySQLNativeSetupPage( vcl::Window* _pParent, const SfxItemSet& _rCoreAttrs ); virtual ~MySQLNativeSetupPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<OGenericAdministrationPage> Create( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); protected: - virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) SAL_OVERRIDE; - virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) SAL_OVERRIDE; + virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) override; + virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) override; - virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK( this, MySQLNativeSetupPage, OnModified ); } + virtual Link<> getControlModifiedLink() override { return LINK( this, MySQLNativeSetupPage, OnModified ); } private: DECL_LINK( OnModified, Edit* ); @@ -145,16 +145,16 @@ namespace dbaui , sal_uInt16 _nHeaderTextResId , sal_uInt16 _nDriverClassId ); virtual ~OGeneralSpecialJDBCConnectionPageSetup(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<OGenericAdministrationPage> CreateMySQLJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); static VclPtr<OGenericAdministrationPage> CreateOracleJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); protected: - virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified); } + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual Link<> getControlModifiedLink() override { return LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified); } DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); DECL_LINK(OnEditModified,Edit*); @@ -182,16 +182,16 @@ namespace dbaui public: OJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual ~OJDBCConnectionPageSetup(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<OGenericAdministrationPage> CreateJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); protected: - virtual bool checkTestConnection() SAL_OVERRIDE; + virtual bool checkTestConnection() override; - virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); DECL_LINK(OnEditModified,Edit*); @@ -213,17 +213,17 @@ namespace dbaui OMySQLIntroPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); virtual ~OMySQLIntroPageSetup(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<OMySQLIntroPageSetup> CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet ); ConnectionType getMySQLMode(); void SetClickHdl( const Link<OMySQLIntroPageSetup *, void>& rLink ) { maClickHdl = rLink; } protected: - virtual bool FillItemSet(SfxItemSet* _rSet) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* _rSet) override; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; private: VclPtr<RadioButton> m_pODBCDatabase; @@ -239,11 +239,11 @@ namespace dbaui class OAuthentificationPageSetup : public OGenericAdministrationPage { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; static VclPtr<OGenericAdministrationPage> CreateAuthentificationTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); OAuthentificationPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); virtual ~OAuthentificationPageSetup(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: VclPtr<FixedText> m_pFTHelpText; @@ -253,16 +253,16 @@ namespace dbaui VclPtr<PushButton> m_pPBTestConnection; protected: - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; }; // OFinalDBPageSetup class OFinalDBPageSetup : public OGenericAdministrationPage { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; static VclPtr<OGenericAdministrationPage> CreateFinalDBTabPageSetup( vcl::Window* pParent, const SfxItemSet& _rAttrSet); VclPtr<FixedText> m_pFTFinalHeader; @@ -276,20 +276,20 @@ namespace dbaui OFinalDBPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); virtual ~OFinalDBPageSetup(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool IsDatabaseDocumentToBeRegistered(); bool IsDatabaseDocumentToBeOpened(); bool IsTableWizardToBeStarted(); void enableTableWizardCheckBox( bool _bSupportsTableCreation); /// may be used in SetXXXHdl calls to controls, is a link to <method>OnControlModified</method> - Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGenericAdministrationPage, OnControlModified); } + Link<> getControlModifiedLink() override { return LINK(this, OGenericAdministrationPage, OnControlModified); } DECL_LINK_TYPED(OnOpenSelected, Button*, void); protected: - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index 89474ed541b1..d53091c5f3b9 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -49,7 +49,7 @@ namespace dbaui public: OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections ); virtual ~OTextConnectionHelper(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr<FixedText> m_pExtensionHeader; diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 023bccd470e9..65febc17a78c 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -63,7 +63,7 @@ class OPasswordDialog : public ModalDialog public: OPasswordDialog( vcl::Window* pParent,const OUString& _sUserName); virtual ~OPasswordDialog() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE + virtual void dispose() override { m_pUser.clear(); m_pEDOldPassword.clear(); diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 6cf91135bb7c..599a5b5632dc 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -65,17 +65,17 @@ public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet ); virtual ~OUserAdmin(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetUser(); // subclasses must override this, but it isn't pure virtual - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_USERADMIN_HXX diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 39db714b11c9..88617c12eb55 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -38,7 +38,7 @@ namespace dbaui } // IWindowEventFilter - virtual bool payAttentionTo( const VclWindowEvent& _rEvent ) const SAL_OVERRIDE + virtual bool payAttentionTo( const VclWindowEvent& _rEvent ) const override { return ( _rEvent.GetId() == VCLEVENT_WINDOW_ENABLED ) || ( _rEvent.GetId() == VCLEVENT_WINDOW_DISABLED ) @@ -56,7 +56,7 @@ namespace dbaui } // IWindowOperator - virtual void operateOn( const VclWindowEvent& _rTrigger, vcl::Window& _rOperateOn ) const SAL_OVERRIDE; + virtual void operateOn( const VclWindowEvent& _rTrigger, vcl::Window& _rOperateOn ) const override; private: const OUString m_sDisabledText; diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index d1865751a3bf..b92b3cd56cb0 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -55,7 +55,7 @@ namespace dbaui public: MySQLNativeSettings( vcl::Window& _rParent, const Link<>& _rControlModificationLink ); virtual ~MySQLNativeSettings(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ); void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ); diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index f046c46e2f1f..c2928216ea8e 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -47,8 +47,8 @@ namespace dbaui explicit OSaveValueWrapper(T* _pSaveValue) : m_pSaveValue(_pSaveValue) { OSL_ENSURE(m_pSaveValue,"Illegal argument!"); } - virtual bool SaveValue() SAL_OVERRIDE { m_pSaveValue->SaveValue(); return true;} // bool return value only for stl - virtual bool Disable() SAL_OVERRIDE { m_pSaveValue->Disable(); return true;} // bool return value only for stl + virtual bool SaveValue() override { m_pSaveValue->SaveValue(); return true;} // bool return value only for stl + virtual bool Disable() override { m_pSaveValue->Disable(); return true;} // bool return value only for stl }; template < class T > class ODisableWrapper : public ISaveValueWrapper @@ -58,8 +58,8 @@ namespace dbaui explicit ODisableWrapper(T* _pSaveValue) : m_pSaveValue(_pSaveValue) { OSL_ENSURE(m_pSaveValue,"Illegal argument!"); } - virtual bool SaveValue() SAL_OVERRIDE { return true;} // bool return value only for stl - virtual bool Disable() SAL_OVERRIDE { m_pSaveValue->Disable(); return true;} // bool return value only for stl + virtual bool SaveValue() override { return true;} // bool return value only for stl + virtual bool Disable() override { m_pSaveValue->Disable(); return true;} // bool return value only for stl }; // OGenericAdministrationPage @@ -116,24 +116,24 @@ namespace dbaui bool getSelectedDataSource(OUString& _sReturn, OUString& _sCurr); // svt::IWizardPageController - virtual void initializePage() SAL_OVERRIDE; - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; - virtual bool canAdvance() const SAL_OVERRIDE; + virtual void initializePage() override; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; + virtual bool canAdvance() const override; void SetRoadmapStateValue( bool _bDoEnable ) { m_abEnableRoadmap = _bDoEnable; } bool GetRoadmapStateValue() const { return m_abEnableRoadmap; } protected: /// default implementation: call FillItemSet, call prepareLeave, - virtual sfxpg DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet* pSet) override; using SfxTabPage::DeactivatePage; /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_False - virtual void Reset(const SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* _rCoreAttrs) override; /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_True - virtual void ActivatePage(const SfxItemSet& _rSet) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& _rSet) override; // TabPage overridables - virtual void ActivatePage() SAL_OVERRIDE; + virtual void ActivatePage() override; protected: void callModifiedHdl() const { if (m_aModifiedHandler.IsSet()) m_aModifiedHandler.Call(this); } diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index d4dddc19c449..66561d890bc3 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -76,13 +76,13 @@ public: virtual ~TableListFacade(); private: - virtual void updateTableObjectList( bool _bAllowViews ) SAL_OVERRIDE; - virtual OUString getSelectedName( OUString& _out_rAliasName ) const SAL_OVERRIDE; - virtual bool isLeafSelected() const SAL_OVERRIDE; + virtual void updateTableObjectList( bool _bAllowViews ) override; + virtual OUString getSelectedName( OUString& _out_rAliasName ) const override; + virtual bool isLeafSelected() const override; // OContainerListener - virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; }; TableListFacade::~TableListFacade() @@ -236,13 +236,13 @@ public: virtual ~QueryListFacade(); private: - virtual void updateTableObjectList( bool _bAllowViews ) SAL_OVERRIDE; - virtual OUString getSelectedName( OUString& _out_rAliasName ) const SAL_OVERRIDE; - virtual bool isLeafSelected() const SAL_OVERRIDE; + virtual void updateTableObjectList( bool _bAllowViews ) override; + virtual OUString getSelectedName( OUString& _out_rAliasName ) const override; + virtual bool isLeafSelected() const override; // OContainerListener - virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; }; QueryListFacade::~QueryListFacade() diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index 9d31cd4f2918..2472f8ff13f3 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -72,22 +72,22 @@ namespace dbaui bool m_bHasMaxRowScan; public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; SpecialSettingsPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta ); protected: virtual ~SpecialSettingsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // OGenericAdministrationPage overridables - virtual void implInitControls (const SfxItemSet& _rSet, bool _bSaveValue ) SAL_OVERRIDE; + virtual void implInitControls (const SfxItemSet& _rSet, bool _bSaveValue ) override; // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; private: void impl_initBooleanSettings(); @@ -110,23 +110,23 @@ namespace dbaui m_aControlDependencies; public: - virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; + virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override; GeneratedValuesPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: // nControlFlags is a combination of the CBTP_xxx-constants virtual ~GeneratedValuesPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // subclasses must override this, but it isn't pure virtual - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; }; } diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index 9cf8ac1ada4c..8afac21cf89d 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -113,7 +113,7 @@ protected: public: ODbaseIndexDialog( vcl::Window * pParent, const OUString& aDataSrcName ); virtual ~ODbaseIndexDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 0b2ff3a3bbe4..3a3cb7ab054d 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -890,10 +890,10 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument() void doLoadAsync(); // XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; private: DECL_LINK_TYPED( OnOpenDocument, void*, void ); diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index c035af296823..b3c0a555a56a 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -65,23 +65,23 @@ namespace dbaui sal_uInt32 m_nControlFlags; public: - virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; + virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override; // nControlFlags is a combination of the CBTP_xxx-constants OCommonBehaviourTabPage(vcl::Window* pParent, const OString& rId, const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags); protected: virtual ~OCommonBehaviourTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // subclasses must override this, but it isn't pure virtual - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; private: DECL_LINK_TYPED(CharsetSelectHdl, ListBox&, void); }; @@ -90,11 +90,11 @@ namespace dbaui class ODbaseDetailsPage : public OCommonBehaviourTabPage { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; ODbaseDetailsPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); virtual ~ODbaseDetailsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr<CheckBox> m_pShowDeleted; VclPtr<FixedText> m_pFT_Message; @@ -103,7 +103,7 @@ namespace dbaui OUString m_sDsn; protected: - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; private: DECL_LINK_TYPED( OnButtonClicked, Button *, void ); @@ -120,13 +120,13 @@ namespace dbaui class OOdbcDetailsPage : public OCommonBehaviourTabPage { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; OOdbcDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual ~OOdbcDetailsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; private: VclPtr<CheckBox> m_pUseCatalog; }; @@ -135,15 +135,15 @@ namespace dbaui class OUserDriverDetailsPage : public OCommonBehaviourTabPage { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; OUserDriverDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual ~OUserDriverDetailsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; private: VclPtr<FixedText> m_pFTHostname; VclPtr<Edit> m_pEDHostname; @@ -169,12 +169,12 @@ namespace dbaui , bool bShowSocket = true ); virtual ~OGeneralSpecialJDBCDetailsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: - virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); DECL_LINK(OnEditModified,Edit*); @@ -200,7 +200,7 @@ namespace dbaui MySQLNativePage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual ~MySQLNativePage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr<FixedText> m_pSeparator1; @@ -212,23 +212,23 @@ namespace dbaui VclPtr<CheckBox> m_pPasswordRequired; protected: - virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; }; // OOdbcDetailsPage class OLDAPDetailsPage : public OCommonBehaviourTabPage { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; OLDAPDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual ~OLDAPDetailsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; private: VclPtr<Edit> m_pETBaseDN; VclPtr<CheckBox> m_pCBUseSSL; @@ -251,19 +251,19 @@ namespace dbaui class OTextDetailsPage : public OCommonBehaviourTabPage { public: - virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; OTextDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); VclPtr<OTextConnectionHelper> m_pTextConnectionHelper; protected: virtual ~OTextDetailsPage(); - virtual void dispose() SAL_OVERRIDE; - virtual bool prepareLeave() SAL_OVERRIDE; + virtual void dispose() override; + virtual bool prepareLeave() override; - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; private: }; diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index 3d65b7982b33..0fc204c6b3d9 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -40,8 +40,8 @@ namespace dbaui DbuTypeCollectionItem(sal_Int16 nWhich = 0, ::dbaccess::ODsnTypeCollection* _pCollection = NULL); DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource); - virtual bool operator==(const SfxPoolItem& _rItem) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const SAL_OVERRIDE; + virtual bool operator==(const SfxPoolItem& _rItem) const override; + virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const override; ::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; } }; diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 8d8c6112c9c7..115f2b640567 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -54,11 +54,11 @@ protected: public: ODatasourceSelectDialog( vcl::Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet = NULL ); virtual ~ODatasourceSelectDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetSelected() const { return m_pDatasource->GetSelectEntry();} void Select( const OUString& _rEntry ) { m_pDatasource->SelectEntry(_rEntry); } - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; protected: DECL_LINK_TYPED( ListDblClickHdl, ListBox&, void ); diff --git a/dbaccess/source/ui/dlg/finteraction.hxx b/dbaccess/source/ui/dlg/finteraction.hxx index 12057275d2a3..78f9620af7f6 100644 --- a/dbaccess/source/ui/dlg/finteraction.hxx +++ b/dbaccess/source/ui/dlg/finteraction.hxx @@ -46,7 +46,7 @@ namespace dbaui protected: // XInteractionHandler - virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ) throw (css::uno::RuntimeException, std::exception) override; virtual ~OFilePickerInteractionHandler(); }; diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index 5330cc8fab65..7869805dd4d9 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -66,7 +66,7 @@ namespace dbaui public: virtual ~OGeneralPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /// set a handler which gets called every time the user selects a new type void SetTypeSelectHandler( const Link<OGeneralPage&,void>& _rHandler ) { m_aTypeSelectHandler = _rHandler; } @@ -76,16 +76,16 @@ namespace dbaui protected: // SfxTabPage overridables - virtual void Reset( const SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* _rCoreAttrs ) override; - virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) SAL_OVERRIDE; + virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) override; virtual OUString getDatasourceName( const SfxItemSet& _rSet ); virtual bool approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName ); // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; void onTypeSelected(const OUString& _sURLPrefix); void initializeTypeList(); @@ -107,10 +107,10 @@ namespace dbaui OGeneralPageDialog( vcl::Window* pParent, const SfxItemSet& _rItems ); protected: - virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; - virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) SAL_OVERRIDE; - virtual void setParentTitle( const OUString& _sURLPrefix ) SAL_OVERRIDE; + virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) override; + virtual void setParentTitle( const OUString& _sURLPrefix ) override; }; // OGeneralPageWizard @@ -119,7 +119,7 @@ namespace dbaui public: OGeneralPageWizard( vcl::Window* pParent, const SfxItemSet& _rItems ); virtual ~OGeneralPageWizard(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; public: enum CreationMode { @@ -170,13 +170,13 @@ namespace dbaui DocumentDescriptor GetSelectedDocument() const; protected: - virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; - virtual void GetFocus() SAL_OVERRIDE; + virtual void GetFocus() override; - virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) SAL_OVERRIDE; - virtual OUString getDatasourceName( const SfxItemSet& _rSet ) SAL_OVERRIDE; - virtual bool approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName ) SAL_OVERRIDE; + virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) override; + virtual OUString getDatasourceName( const SfxItemSet& _rSet ) override; + virtual bool approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName ) override; ::std::vector< OUString> m_aEmbeddedURLPrefixes; diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 975b96a4b090..abe080af2f0e 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -52,8 +52,8 @@ namespace dbaui void SetAdditionalModifyHdl(const Link<>& _rHdl); protected: - virtual bool WantMouseEvent() const SAL_OVERRIDE { return true; } - virtual void SetModifyHdl(const Link<>& _rHdl) SAL_OVERRIDE; + virtual bool WantMouseEvent() const override { return true; } + virtual void SetModifyHdl(const Link<>& _rHdl) override; private: void implCheckLinks(); diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx index aa80fd2d3270..8b72335950d1 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.hxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx @@ -37,8 +37,8 @@ namespace dbaui explicit OptionalBoolItem( sal_Int16 nWhich ); OptionalBoolItem( const OptionalBoolItem& _rSource ); - virtual bool operator==( const SfxPoolItem& _rItem ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& _rItem ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const override; bool HasValue() const { return !!m_aValue; } void ClearValue() { m_aValue.reset(); } diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index ab0a577085de..3a0b31e19b32 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -84,7 +84,7 @@ namespace { } - virtual Image getImage() const SAL_OVERRIDE + virtual Image getImage() const override { if ( !m_defaultImage ) m_defaultImage = Image( ModuleRes( m_defaultImageID ) ); @@ -102,7 +102,7 @@ namespace { } - virtual OUString getLabel() const SAL_OVERRIDE + virtual OUString getLabel() const override { return m_label; } @@ -303,7 +303,7 @@ class OExceptionChainDialog : public ModalDialog public: OExceptionChainDialog( vcl::Window* pParent, const ExceptionDisplayChain& _rExceptions ); virtual ~OExceptionChainDialog() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE + virtual void dispose() override { m_pExceptionList.clear(); m_pExceptionText.clear(); diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index eb56894e750c..609967b7ff27 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -49,20 +49,20 @@ namespace dbaui VclPtr<OTableSubscriptionDialog> m_pTablesDlg; public: - virtual bool FillItemSet(SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet* _pSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* _rCoreAttrs) override; + virtual sfxpg DeactivatePage(SfxItemSet* _pSet) override; using OGenericAdministrationPage::DeactivatePage; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; OTableSubscriptionPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,OTableSubscriptionDialog* _pTablesDlg); virtual ~OTableSubscriptionPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; + virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; DECL_LINK_TYPED( OnTreeEntryCompare, const SvSortData&, sal_Int32 ); DECL_LINK( OnTreeEntryChecked, Control* ); @@ -84,7 +84,7 @@ namespace dbaui /// (un)check all entries void CheckAll( bool bCheck = true ); - virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; + virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; // checks the tables according to the filter given // in oppsofite to implCheckTables, this method handles the case of an empty sequence, too ... diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index c62020bd8fd4..f1ac9a1682cb 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -57,7 +57,7 @@ namespace dbaui ,const OUString& _sDefaultName ,const css::uno::Reference< css::uno::XComponentContext >& _rxContext); virtual ~OCollectionView(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; css::uno::Reference< css::ucb::XContent> getSelectedFolder() const { return m_xContent;} OUString getName() const; }; diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx index 02a9409143a6..7a1cf40b5f5e 100644 --- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx +++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx @@ -42,15 +42,15 @@ namespace dbaui OUString m_sAutoIncrementValue; bool m_bAutoIncrementEnabled; protected: - virtual void ActivateAggregate( EControlType eType ) SAL_OVERRIDE; - virtual void DeactivateAggregate( EControlType eType ) SAL_OVERRIDE; + virtual void ActivateAggregate( EControlType eType ) override; + virtual void DeactivateAggregate( EControlType eType ) override; - virtual css::lang::Locale GetLocale() const SAL_OVERRIDE; - virtual css::uno::Reference< css::util::XNumberFormatter > GetFormatter() const SAL_OVERRIDE; - virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) SAL_OVERRIDE; - virtual bool isAutoIncrementValueEnabled() const SAL_OVERRIDE; - virtual OUString getAutoIncrementValue() const SAL_OVERRIDE; - virtual void CellModified(long nRow, sal_uInt16 nColId ) SAL_OVERRIDE; + virtual css::lang::Locale GetLocale() const override; + virtual css::uno::Reference< css::util::XNumberFormatter > GetFormatter() const override; + virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) override; + virtual bool isAutoIncrementValueEnabled() const override; + virtual OUString getAutoIncrementValue() const override; + virtual void CellModified(long nRow, sal_uInt16 nColId ) override; public: OColumnControlWindow(vcl::Window* pParent @@ -58,9 +58,9 @@ namespace dbaui void setConnection(const css::uno::Reference< css::sdbc::XConnection>& _xCon); - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE; - virtual css::uno::Reference< css::sdbc::XConnection> getConnection() SAL_OVERRIDE; - virtual const OTypeInfoMap* getTypeInfo() const SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() override; + virtual css::uno::Reference< css::sdbc::XConnection> getConnection() override; + virtual const OTypeInfoMap* getTypeInfo() const override; TOTypeInfoSP getDefaultTyp() const; }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index 1c2f0d85478a..aba4a567a741 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -40,53 +40,53 @@ namespace dbaui protected: /** this function is called upon disposing the component */ - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; public: OConnectionLineAccess(OTableConnection* _pLine); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire( ) throw () override { // here inline is allowed because we do not use this class outside this dll VCLXAccessibleComponent::acquire( ); } - virtual void SAL_CALL release( ) throw () SAL_OVERRIDE + virtual void SAL_CALL release( ) throw () override { // here inline is allowed because we do not use this class outside this dll VCLXAccessibleComponent::release( ); } // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - static methods static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleComponent - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleRelationSet - virtual sal_Int32 SAL_CALL getRelationCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getRelationCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_CONNECTIONLINEACCESS_HXX diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index e944ebe76bc2..3e4849725c9a 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -36,7 +36,7 @@ namespace dbaui public: OPropColumnEditCtrl(vcl::Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); } + virtual bool IsModified() const override { return IsValueChangedFromSaved(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } @@ -51,7 +51,7 @@ namespace dbaui public: OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); } + virtual bool IsModified() const override { return IsValueChangedFromSaved(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } @@ -65,7 +65,7 @@ namespace dbaui public: OPropNumericEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); } + virtual bool IsModified() const override { return IsValueChangedFromSaved(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index fdbe72116fd4..16d2ca9f8180 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -175,7 +175,7 @@ namespace dbaui public: OFieldDescControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar); virtual ~OFieldDescControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void DisplayData(OFieldDescription* pFieldDescr ); @@ -196,9 +196,9 @@ namespace dbaui void paste(); void Init(); - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void Resize() override; virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() = 0; virtual css::uno::Reference< css::sdbc::XConnection> getConnection() = 0; diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index 3332e77b1c43..348911878e03 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -38,7 +38,7 @@ namespace dbaui TYPEINFO_OVERRIDE(); OCommentUndoAction(sal_uInt16 nCommentID) { m_strComment = OUString(ModuleRes(nCommentID)); } - virtual OUString GetComment() const SAL_OVERRIDE { return m_strComment; } + virtual OUString GetComment() const override { return m_strComment; } }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_GENERALUNDO_HXX diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx index 641c3752cc98..78368ceecb32 100644 --- a/dbaccess/source/ui/inc/HtmlReader.hxx +++ b/dbaccess/source/ui/inc/HtmlReader.hxx @@ -38,10 +38,10 @@ namespace dbaui bool m_bSDNum; protected: - virtual void NextToken( int nToken ) SAL_OVERRIDE; // base class - virtual bool CreateTable(int nToken) SAL_OVERRIDE; + virtual void NextToken( int nToken ) override; // base class + virtual bool CreateTable(int nToken) override; virtual TypeSelectionPageFactory - getTypeSelectionPageFactory() SAL_OVERRIDE; + getTypeSelectionPageFactory() override; void TableDataOn(SvxCellHorJustify& eVal); void TableFontOn(css::awt::FontDescriptor& _rFont,sal_Int32 &_rTextColor); @@ -67,8 +67,8 @@ namespace dbaui const OTypeInfoMap* _pInfoMap, bool _bAutoIncrementEnabled); - virtual SvParserState CallParser() SAL_OVERRIDE;// base class - virtual void release() SAL_OVERRIDE; + virtual SvParserState CallParser() override;// base class + virtual void release() override; ///< @attention recovers only valid data if 1. CTOR has been used }; diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index a330b05b781b..93fee35d5de0 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -47,15 +47,15 @@ namespace dbaui // XServiceInfo - static methods static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException,css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException,css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; void notifyAccessibleEvent( const sal_Int16 _nEventId, diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index 1ccdd560618a..91a80f70df2f 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -56,9 +56,9 @@ namespace dbaui Point m_aMinimumTableViewSize; // state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const SAL_OVERRIDE; + virtual FeatureState GetState(sal_uInt16 nId) const override; // execute a feature - virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; /** loads the information for the windows. @param i_rViewSettings @@ -88,8 +88,8 @@ namespace dbaui inline OAddTableDlg* getAddTableDialog()const { return m_pAddTableDialog; } // OSingleDocumentController overridables - virtual void reconnect( bool _bUI ) SAL_OVERRIDE; - virtual void impl_onModifyChanged() SAL_OVERRIDE; + virtual void reconnect( bool _bUI ) override; + virtual void impl_onModifyChanged() override; // own overridables /** determines whether or not it's allowed for database views to participate in the game @@ -117,12 +117,12 @@ namespace dbaui // UNO interface overridables // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; // css::lang::XComponent - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // css::frame::XController - virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) override; // misc /** only defines a method to save a SQLException in d&d methods to show the error at a later state @@ -148,7 +148,7 @@ namespace dbaui virtual short saveModified() = 0; // called when the orignal state should be reseted (first time load) virtual void reset() = 0; - virtual void describeSupportedFeatures() SAL_OVERRIDE; + virtual void describeSupportedFeatures() override; AddTableDialogContext& impl_getDialogContext() const; }; diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index 53ed8ef74c57..a89fbf432150 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -44,15 +44,15 @@ namespace dbaui OJoinController& _rController, const css::uno::Reference< css::uno::XComponentContext >& ); virtual ~OJoinDesignView(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // set the view readonly or not virtual void setReadOnly(bool _bReadOnly); // set the statement for representation /// late construction - virtual void Construct() SAL_OVERRIDE; - virtual void initialize() SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rEvt ) SAL_OVERRIDE; + virtual void Construct() override; + virtual void initialize() override; + virtual void KeyInput( const KeyEvent& rEvt ) override; void SaveTabWinUIConfig(OTableWindow* pWin); OJoinController& getController() const { return m_rController; } @@ -62,7 +62,7 @@ namespace dbaui OScrollWindowHelper* getScrollHelper() const { return m_pScrollWindow; } protected: // return the Rectangle where I can paint myself - virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE; + virtual void resizeDocumentView(Rectangle& rRect) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_JOINDESIGNVIEW_HXX diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx index 96ba728e78d7..0ec87f2e88f4 100644 --- a/dbaccess/source/ui/inc/JoinExchange.hxx +++ b/dbaccess/source/ui/inc/JoinExchange.hxx @@ -47,12 +47,12 @@ namespace dbaui // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; - virtual void SAL_CALL release( ) throw() SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire( ) throw() override; + virtual void SAL_CALL release( ) throw() override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(css::uno::RuntimeException, std::exception) override; void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, IDragTransferableListener* _pListener ); @@ -60,9 +60,9 @@ namespace dbaui static bool isFormatAvailable( const DataFlavorExVector& _rFormats ,SotClipboardFormatId _nSlotID=SotClipboardFormatId::SBA_JOIN); protected: - virtual void AddSupportedFormats() SAL_OVERRIDE; - virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE; - virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; + virtual void AddSupportedFormats() override; + virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; + virtual void DragFinished( sal_Int8 nDropAction ) override; static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index c80c2331f490..cbe7edc79e3e 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -58,12 +58,12 @@ namespace dbaui VclPtr<OJoinTableView> m_pTableView; protected: - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; public: OScrollWindowHelper( vcl::Window* pParent); virtual ~OScrollWindowHelper(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void setTableView(OJoinTableView* _pTableView); @@ -114,15 +114,15 @@ namespace dbaui public: OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView ); virtual ~OJoinTableView(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // window override - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void KeyInput( const KeyEvent& rEvt ) override; // Accessibility - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; // own methods ScrollBar& GetHScrollBar() { return static_cast<OScrollWindowHelper*>(GetParent())->GetHScrollBar(); } @@ -226,11 +226,11 @@ namespace dbaui /** @note used by AddTabDlg to see if more tables can be added */ virtual bool IsAddAllowed(); - virtual bool PreNotify(NotifyEvent& rNEvt) SAL_OVERRIDE; + virtual bool PreNotify(NotifyEvent& rNEvt) override; // DnD stuff - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; /** @note can be used for special ui handling after d&d */ virtual void lookForUiActivities(); @@ -269,20 +269,20 @@ namespace dbaui ,const OUString& _rWinName); protected: - virtual void MouseButtonUp( const MouseEvent& rEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; virtual void ConnDoubleClicked( OTableConnection* pConnection ); void SetDefaultTabWinPosSize( OTableWindow* pTabWin ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; - virtual void dragFinished( ) SAL_OVERRIDE; + virtual void dragFinished( ) override; /// @note here the physical position (that can be changed while /// resizing) is used, as no scrolling can take place while resizing - virtual void Command(const CommandEvent& rEvt) SAL_OVERRIDE; + virtual void Command(const CommandEvent& rEvt) override; virtual OTableWindowData* CreateImpl(const OUString& _rComposedName ,const OUString& _sTableName diff --git a/dbaccess/source/ui/inc/LimitBox.hxx b/dbaccess/source/ui/inc/LimitBox.hxx index 6ff436daa170..73d29bd47217 100644 --- a/dbaccess/source/ui/inc/LimitBox.hxx +++ b/dbaccess/source/ui/inc/LimitBox.hxx @@ -25,12 +25,12 @@ class LimitBox: public NumericBox public: LimitBox( vcl::Window* pParent, WinBits nStyle ); - virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE; + virtual OUString CreateFieldText( sal_Int64 nValue ) const override; - virtual void Reformat() SAL_OVERRIDE; - virtual void ReformatAll() SAL_OVERRIDE; + virtual void Reformat() override; + virtual void ReformatAll() override; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; private: void LoadDefaultLimits(); diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index acfc7eb420cf..82b1b6146c3f 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -76,30 +76,30 @@ namespace dbaui public: OQueryDesignView(OQueryContainerWindow* pParent, OQueryController& _rController,const css::uno::Reference< css::uno::XComponentContext >& ); virtual ~OQueryDesignView(); - virtual void dispose() SAL_OVERRIDE; - - virtual bool isCutAllowed() SAL_OVERRIDE; - virtual bool isPasteAllowed() SAL_OVERRIDE; - virtual bool isCopyAllowed() SAL_OVERRIDE; - virtual void copy() SAL_OVERRIDE; - virtual void cut() SAL_OVERRIDE; - virtual void paste() SAL_OVERRIDE; + virtual void dispose() override; + + virtual bool isCutAllowed() override; + virtual bool isPasteAllowed() override; + virtual bool isCopyAllowed() override; + virtual void copy() override; + virtual void cut() override; + virtual void paste() override; // clears the whole query - virtual void clear() SAL_OVERRIDE; + virtual void clear() override; // set the view readonly or not - virtual void setReadOnly(bool _bReadOnly) SAL_OVERRIDE; + virtual void setReadOnly(bool _bReadOnly) override; // check if the statement is correct when not returning false bool checkStatement(); // set the statement for representation - virtual void setStatement(const OUString& _rsStatement) SAL_OVERRIDE; + virtual void setStatement(const OUString& _rsStatement) override; // returns the current sql statement - virtual OUString getStatement() SAL_OVERRIDE; + virtual OUString getStatement() override; /// late construction - virtual void Construct() SAL_OVERRIDE; - virtual void initialize() SAL_OVERRIDE; + virtual void Construct() override; + virtual void initialize() override; // Window overrides - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual void GetFocus() override; bool isSlotEnabled(sal_Int32 _nSlotId); void setSlotEnabled(sal_Int32 _nSlotId, bool _bEnable); @@ -150,7 +150,7 @@ namespace dbaui ,OTableFieldDescRef& aInfo); protected: // return the Rectangle where I can paint myself - virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE; + virtual void resizeDocumentView(Rectangle& rRect) override; DECL_LINK_TYPED( SplitHdl, Splitter*, void ); private: diff --git a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx index a083b4cca893..59e45656cbad 100644 --- a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx +++ b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx @@ -30,7 +30,7 @@ public: QueryPropertiesDialog( vcl::Window* pParent, const bool bDistinct, const sal_Int64 nLimit ); virtual ~QueryPropertiesDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool getDistinct() const; sal_Int64 getLimit() const; diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index a0647da33f3d..b66c7633acb7 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -42,17 +42,17 @@ namespace dbaui class OQueryTableView : public OJoinTableView { protected: - virtual void ConnDoubleClicked(OTableConnection* pConnection) SAL_OVERRIDE; - virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE; + virtual void ConnDoubleClicked(OTableConnection* pConnection) override; + virtual void KeyInput(const KeyEvent& rEvt) override; - virtual VclPtr<OTableWindow> createWindow(const TTableWindowData::value_type& _pData) SAL_OVERRIDE; + virtual VclPtr<OTableWindow> createWindow(const TTableWindowData::value_type& _pData) override; /** called when init fails at the tablewindowdata because the m_xTable object could not provide columns, but no exception was thrown. Expected to throw. */ - virtual void onNoColumns_throw() SAL_OVERRIDE; + virtual void onNoColumns_throw() override; - virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const SAL_OVERRIDE; + virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const override; public: OQueryTableView(vcl::Window* pParent,OQueryDesignView* pView); @@ -60,8 +60,8 @@ namespace dbaui /// base class overwritten: create and delete windows /// (not really delete, as it becomes an UndoAction) bool ContainsTabWin(const OTableWindow& rTabWin); // #i122589# Allow to check if OTableWindow is registered - virtual void AddTabWin( const OUString& _rTableName, const OUString& _rAliasName, bool bNewTable = false ) SAL_OVERRIDE; - virtual void RemoveTabWin(OTableWindow* pTabWin) SAL_OVERRIDE; + virtual void AddTabWin( const OUString& _rTableName, const OUString& _rAliasName, bool bNewTable = false ) override; + virtual void RemoveTabWin(OTableWindow* pTabWin) override; /// AddTabWin, setting an alias void AddTabWin(const OUString& strDatabase, const OUString& strTableName, const OUString& strAlias, bool bNewTable = false); @@ -70,9 +70,9 @@ namespace dbaui bool FindTableFromField(const OUString& rFieldName, OTableFieldDescRef& rInfo, sal_uInt16& rCnt); /// base class overwritten: create and delete Connections - virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) SAL_OVERRIDE; + virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) override; - virtual bool RemoveConnection( OTableConnection* _pConn ,bool _bDelete) SAL_OVERRIDE; + virtual bool RemoveConnection( OTableConnection* _pConn ,bool _bDelete) override; // transfer of connections from and to UndoAction @@ -90,7 +90,7 @@ namespace dbaui void HideTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction); /// ensure visibility of TabWins (+ and invalidate connections) - virtual void EnsureVisible(const OTableWindow* _pWin) SAL_OVERRIDE; + virtual void EnsureVisible(const OTableWindow* _pWin) override; /// how many tables with a certain alias do I already have? sal_Int32 CountTableAlias(const OUString& rName, sal_Int32& rMax); @@ -100,10 +100,10 @@ namespace dbaui /// rebuild everything (TabWins, Connections) /// (PRECONDITION: ClearAll was called previously) - virtual void ReSync() SAL_OVERRIDE; + virtual void ReSync() override; /// delete everything hard (TabWins, Connections), without any notifications - virtual void ClearAll() SAL_OVERRIDE; + virtual void ClearAll() override; // used by AddTabDlg to see if tables can still be added //virtual sal_Bool IsAddAllowed(); @@ -115,7 +115,7 @@ namespace dbaui virtual OTableWindowData* CreateImpl(const OUString& _rComposedName ,const OUString& _sTableName - ,const OUString& _rWinName) SAL_OVERRIDE; + ,const OUString& _rWinName) override; /** opens the join dialog and allows to create a new join connection */ void createNewConnection(); diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx index ff447f27a476..821f28271e86 100644 --- a/dbaccess/source/ui/inc/QueryTextView.hxx +++ b/dbaccess/source/ui/inc/QueryTextView.hxx @@ -32,9 +32,9 @@ namespace dbaui public: OQueryTextView( OQueryContainerWindow* pParent ); virtual ~OQueryTextView(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void GetFocus() SAL_OVERRIDE; + virtual void GetFocus() override; bool isCutAllowed(); void copy(); @@ -50,7 +50,7 @@ namespace dbaui OQueryContainerWindow* getContainerWindow() { return static_cast< OQueryContainerWindow* >( GetParent() ); } protected: - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYTEXTVIEW_HXX diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx index f9c490a7a039..16ad3d2736ce 100644 --- a/dbaccess/source/ui/inc/RTableConnectionData.hxx +++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx @@ -48,7 +48,7 @@ namespace dbaui bool IsDestPrimKey() const { return checkPrimaryKey(getReferencedTable()->getTable(),JTCS_TO); } protected: - virtual OConnectionLineDataRef CreateLineDataObj() SAL_OVERRIDE; + virtual OConnectionLineDataRef CreateLineDataObj() override; ORelationTableConnectionData& operator=( const ORelationTableConnectionData& rConnData ); public: @@ -59,14 +59,14 @@ namespace dbaui const OUString& rConnName = OUString() ); virtual ~ORelationTableConnectionData(); - virtual void CopyFrom(const OTableConnectionData& rSource) SAL_OVERRIDE; - virtual OTableConnectionData* NewInstance() const SAL_OVERRIDE { return new ORelationTableConnectionData(); } + virtual void CopyFrom(const OTableConnectionData& rSource) override; + virtual OTableConnectionData* NewInstance() const override { return new ORelationTableConnectionData(); } /** Update create a new relation @return true if successful */ - virtual bool Update() SAL_OVERRIDE; + virtual bool Update() override; void SetCardinality(); inline void SetUpdateRules( sal_Int32 nAttr ){ m_nUpdateRules = nAttr; } diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index db8b2df3a476..9488158b848c 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -34,11 +34,11 @@ namespace dbaui bool m_bRelationsPossible; protected: // all the features which should be handled by this class - virtual void describeSupportedFeatures() SAL_OVERRIDE; + virtual void describeSupportedFeatures() override; // state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const SAL_OVERRIDE; + virtual FeatureState GetState(sal_uInt16 nId) const override; // execute a feature - virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; void loadData(); TTableWindowData::value_type existsTable(const OUString& _rComposedTableName,bool _bCase) const; @@ -52,11 +52,11 @@ namespace dbaui void mergeData(const TTableConnectionData& _aConnectionData); - virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // need by registration static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); @@ -64,15 +64,15 @@ namespace dbaui SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // OJoinController overridables - virtual bool allowViews() const SAL_OVERRIDE; - virtual bool allowQueries() const SAL_OVERRIDE; + virtual bool allowViews() const override; + virtual bool allowQueries() const override; private: // ask the user if the design should be saved when it is modified - virtual short saveModified() SAL_OVERRIDE; - virtual void reset() SAL_OVERRIDE; - virtual void impl_initialize() SAL_OVERRIDE; - virtual OUString getPrivateTitle( ) const SAL_OVERRIDE; + virtual short saveModified() override; + virtual void reset() override; + virtual void impl_initialize() override; + virtual OUString getPrivateTitle( ) const override; DECL_LINK_TYPED( OnThreadFinished, void*, void ); }; } diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx index 5f8698c82634..a3898ec52112 100644 --- a/dbaccess/source/ui/inc/RelationDesignView.hxx +++ b/dbaccess/source/ui/inc/RelationDesignView.hxx @@ -36,12 +36,12 @@ namespace dbaui // set the statement for representation /// late construction - virtual void Construct() SAL_OVERRIDE; - virtual void initialize() SAL_OVERRIDE; + virtual void Construct() override; + virtual void initialize() override; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual void GetFocus() override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDESIGNVIEW_HXX diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index 22eac4147ac9..5173eb78ef7f 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -61,19 +61,19 @@ namespace dbaui const TTableConnectionData::value_type& pConnectionData, bool bAllowTableSelect = false ); virtual ~ORelationDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; /** setValid set the valid inside, can be used for OK buttons @param _bValid true when the using control allows an update */ - virtual void setValid(bool _bValid) SAL_OVERRIDE; + virtual void setValid(bool _bValid) override; /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists @param _pConnectionData the connection which exists between the new tables */ - virtual void notifyConnectionChange() SAL_OVERRIDE; + virtual void notifyConnectionChange() override; protected: void Init(const TTableConnectionData::value_type& _pConnectionData); diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx index fe544612c873..aef883609645 100644 --- a/dbaccess/source/ui/inc/RelationTableView.hxx +++ b/dbaccess/source/ui/inc/RelationTableView.hxx @@ -37,38 +37,38 @@ namespace dbaui ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; bool m_bInRemove; - virtual void ConnDoubleClicked( OTableConnection* pConnection ) SAL_OVERRIDE; - virtual void AddTabWin(const OUString& _rComposedName, const OUString& rWinName, bool bNewTable = false) SAL_OVERRIDE; + virtual void ConnDoubleClicked( OTableConnection* pConnection ) override; + virtual void AddTabWin(const OUString& _rComposedName, const OUString& rWinName, bool bNewTable = false) override; - virtual VclPtr<OTableWindow> createWindow(const TTableWindowData::value_type& _pData) SAL_OVERRIDE; + virtual VclPtr<OTableWindow> createWindow(const TTableWindowData::value_type& _pData) override; /** determines whether the classes Init method should accept a query name, or only table names */ - virtual bool allowQueries() const SAL_OVERRIDE; + virtual bool allowQueries() const override; // OContainerListener - virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; public: ORelationTableView( vcl::Window* pParent, ORelationDesignView* pView ); virtual ~ORelationTableView(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void RemoveTabWin( OTableWindow* pTabWin ) SAL_OVERRIDE; - virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) SAL_OVERRIDE; - virtual bool RemoveConnection(OTableConnection* pConn,bool _bDelete) SAL_OVERRIDE; + virtual void RemoveTabWin( OTableWindow* pTabWin ) override; + virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) override; + virtual bool RemoveConnection(OTableConnection* pConn,bool _bDelete) override; - virtual void ReSync() SAL_OVERRIDE; + virtual void ReSync() override; /// Creates a dialogue for a completely new relation. void AddNewRelation(); /// used by AddTabDlg to check if tables can be added - virtual bool IsAddAllowed() SAL_OVERRIDE; + virtual bool IsAddAllowed() override; - virtual void lookForUiActivities() SAL_OVERRIDE; + virtual void lookForUiActivities() override; }; } #endif diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx index 3ef2d7137e35..f0da7197d161 100644 --- a/dbaccess/source/ui/inc/RtfReader.hxx +++ b/dbaccess/source/ui/inc/RtfReader.hxx @@ -31,10 +31,10 @@ namespace dbaui ::std::vector<sal_Int32> m_vecColor; protected: - virtual bool CreateTable(int nToken) SAL_OVERRIDE; - virtual void NextToken( int nToken ) SAL_OVERRIDE; // base class + virtual bool CreateTable(int nToken) override; + virtual void NextToken( int nToken ) override; // base class virtual TypeSelectionPageFactory - getTypeSelectionPageFactory() SAL_OVERRIDE; + getTypeSelectionPageFactory() override; virtual ~ORTFReader(); @@ -55,10 +55,10 @@ namespace dbaui const OTypeInfoMap* _pInfoMap, bool _bAutoIncrementEnabled); - virtual SvParserState CallParser() SAL_OVERRIDE;// base class + virtual SvParserState CallParser() override;// base class /// @note Only recovers correct data if 2. CTOR has been used. /// Otherwise, the SbaColumnList will be returned without changes - virtual void release() SAL_OVERRIDE; + virtual void release() override; }; typedef tools::SvRef<ORTFReader> ORTFReaderRef; diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index ec4532a0335c..ee5fb14d401e 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -65,7 +65,7 @@ namespace dbaui // Window overrides // virtual bool PreNotify( NotifyEvent& rNEvt ); // Edit - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; }; class OSQLNameComboBox : public ComboBox @@ -85,7 +85,7 @@ namespace dbaui // Window overrides // Edit - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; }; } diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx index 4ca37253aeec..38d4720ac058 100644 --- a/dbaccess/source/ui/inc/TableConnection.hxx +++ b/dbaccess/source/ui/inc/TableConnection.hxx @@ -65,7 +65,7 @@ namespace dbaui eventually. */ virtual ~OTableConnection(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OTableConnection& operator=( const OTableConnection& rConn ); @@ -97,7 +97,7 @@ namespace dbaui inline OJoinTableView* GetParent() const { return m_pParent; } virtual void Draw(vcl::RenderContext& rRenderContext, const Rectangle& rRect); using Window::Draw; - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; }; } #endif diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index c64ca9961741..e6b600e822dd 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -70,15 +70,15 @@ namespace dbaui void reload(); // all the features which should be handled by this class - virtual void describeSupportedFeatures() SAL_OVERRIDE; + virtual void describeSupportedFeatures() override; // state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const SAL_OVERRIDE; + virtual FeatureState GetState(sal_uInt16 nId) const override; // execute a feature - virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; - virtual void losingConnection( ) SAL_OVERRIDE; + virtual void losingConnection( ) override; - virtual OUString getPrivateTitle( ) const SAL_OVERRIDE; + virtual OUString getPrivateTitle( ) const override; void doEditIndexes(); bool doSaveDoc(bool _bSaveAs); @@ -97,7 +97,7 @@ namespace dbaui inline bool isAutoIncrementValueEnabled() const { return m_bAllowAutoIncrementValue; } inline const OUString& getAutoIncrementValue() const { return m_sAutoIncrementValue; } - virtual void impl_onModifyChanged() SAL_OVERRIDE; + virtual void impl_onModifyChanged() override; inline ::std::vector< std::shared_ptr<OTableRow> >& getRows() { return m_vRowList; } @@ -111,19 +111,19 @@ namespace dbaui inline TOTypeInfoSP getTypeInfoFallBack() const { return m_pTypeInfo; } - virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; // css::frame::XController - virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) override; // css::lang::XComponent - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // need by registration static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); @@ -133,7 +133,7 @@ namespace dbaui protected: void startTableListening(); void stopTableListening(); - virtual void impl_initialize() SAL_OVERRIDE; + virtual void impl_initialize() override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLECONTROLLER_HXX diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index d3f3eb5e469e..78bff5364b0b 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -57,9 +57,9 @@ namespace dbaui sal_uInt16 GetCurUndoActId(){ return m_nCurUndoActId; } // IClipboardTest - virtual void cut() SAL_OVERRIDE; - virtual void copy() SAL_OVERRIDE; - virtual void paste() SAL_OVERRIDE; + virtual void cut() override; + virtual void copy() override; + virtual void paste() override; protected: void Paste( long nRow ); @@ -73,11 +73,11 @@ namespace dbaui virtual bool IsInsertNewAllowed( long nRow ) = 0; virtual bool IsDeleteAllowed( long nRow ) = 0; - virtual RowStatus GetRowStatus(long nRow) const SAL_OVERRIDE; - virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rEvt ) SAL_OVERRIDE; + virtual RowStatus GetRowStatus(long nRow) const override; + virtual void KeyInput(const KeyEvent& rEvt) override; + virtual void Command( const CommandEvent& rEvt ) override; - virtual void Init() SAL_OVERRIDE; + virtual void Init() override; }; } #endif diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx index dff21594fde6..65308c3881aa 100644 --- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx +++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx @@ -35,25 +35,25 @@ namespace dbaui VclPtr<MultiLineEdit> m_pTextWin; protected: - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; public: OTableDesignHelpBar( vcl::Window* pParent ); virtual ~OTableDesignHelpBar(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetHelpText( const OUString& rText ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; // IClipboardTest - virtual bool isCutAllowed() SAL_OVERRIDE; - virtual bool isCopyAllowed() SAL_OVERRIDE; - virtual bool isPasteAllowed() SAL_OVERRIDE; + virtual bool isCutAllowed() override; + virtual bool isCopyAllowed() override; + virtual bool isPasteAllowed() override; - virtual void copy() SAL_OVERRIDE; - virtual void cut() SAL_OVERRIDE; - virtual void paste() SAL_OVERRIDE; + virtual void copy() override; + virtual void cut() override; + virtual void paste() override; }; } #endif diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index d1f4ca42ec31..27ded225b463 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -39,14 +39,14 @@ namespace dbaui void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); DECL_LINK_TYPED( SplitHdl, Splitter*, void ); protected: - virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; + virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: OTableBorderWindow(vcl::Window* pParent); virtual ~OTableBorderWindow(); // Window overrides - virtual void dispose() SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; + virtual void dispose() override; + virtual void Resize() override; + virtual void GetFocus() override; OTableEditorCtrl* GetEditorCtrl() const { return m_pEditorCtrl; } OTableFieldDescWin* GetDescWin() const { return m_pFieldDescWin; } @@ -70,18 +70,18 @@ namespace dbaui protected: // return the Rectangle where I can paint myself - virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE; + virtual void resizeDocumentView(Rectangle& rRect) override; public: OTableDesignView( vcl::Window* pParent, const css::uno::Reference< css::uno::XComponentContext >&, OTableController& _rController); virtual ~OTableDesignView(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // Window overrides - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual void GetFocus() override; OTableEditorCtrl* GetEditorCtrl() const { return m_pWin ? m_pWin->GetEditorCtrl() : NULL; } OTableFieldDescWin* GetDescWin() const { return m_pWin ? m_pWin->GetDescWin() : NULL; } @@ -90,17 +90,17 @@ namespace dbaui css::lang::Locale getLocale() const { return m_aLocale;} // IClipboardTest - virtual bool isCutAllowed() SAL_OVERRIDE; - virtual bool isCopyAllowed() SAL_OVERRIDE; - virtual bool isPasteAllowed() SAL_OVERRIDE; - virtual void copy() SAL_OVERRIDE; - virtual void cut() SAL_OVERRIDE; - virtual void paste() SAL_OVERRIDE; + virtual bool isCutAllowed() override; + virtual bool isCopyAllowed() override; + virtual bool isPasteAllowed() override; + virtual void copy() override; + virtual void cut() override; + virtual void paste() override; // set the view readonly or not void setReadOnly(bool _bReadOnly); - virtual void initialize() SAL_OVERRIDE; + virtual void initialize() override; void reSync(); // resync window data with realdata }; } diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index d7886860482a..ec7d5891e4fc 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -61,7 +61,7 @@ class OTableGrantControl : public ::svt::EditBrowseBox public: OTableGrantControl( vcl::Window* pParent, WinBits nBits); virtual ~OTableGrantControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void UpdateTables(); void setUserName(const OUString& _sUserName); void setGrantUser(const css::uno::Reference< css::sdbcx::XAuthorizable>& _xGrantUser); @@ -69,7 +69,7 @@ public: void setTablesSupplier(const css::uno::Reference< css::sdbcx::XTablesSupplier >& _xTablesSup); void setComponentContext(const css::uno::Reference< css::uno::XComponentContext>& _rxContext); - virtual void Init() SAL_OVERRIDE; + virtual void Init() override; // IAccessibleTableProvider /** Creates the accessible object of a data table cell. @@ -78,22 +78,22 @@ public: @return The XAccessible interface of the specified cell. */ virtual css::uno::Reference< css::accessibility::XAccessible > - CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ) SAL_OVERRIDE; + CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ) override; protected: - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; - virtual bool PreNotify(NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify(NotifyEvent& rNEvt ) override; - virtual bool IsTabAllowed(bool bForward) const SAL_OVERRIDE; - virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) SAL_OVERRIDE; - virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) SAL_OVERRIDE; - virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const SAL_OVERRIDE; - virtual bool SeekRow( long nRow ) SAL_OVERRIDE; - virtual bool SaveModified() SAL_OVERRIDE; - virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const SAL_OVERRIDE; + virtual bool IsTabAllowed(bool bForward) const override; + virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) override; + virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) override; + virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const override; + virtual bool SeekRow( long nRow ) override; + virtual bool SaveModified() override; + virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const override; - virtual void CellModified() SAL_OVERRIDE; + virtual void CellModified() override; private: DECL_LINK_TYPED( AsynchActivate, void*, void ); diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx index 764a1822d806..1ca3c0520a89 100644 --- a/dbaccess/source/ui/inc/TableRowExchange.hxx +++ b/dbaccess/source/ui/inc/TableRowExchange.hxx @@ -33,10 +33,10 @@ namespace dbaui public: OTableRowExchange(const ::std::vector< std::shared_ptr<OTableRow> >& _rvTableRow); protected: - virtual void AddSupportedFormats() SAL_OVERRIDE; - virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE; - virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; - virtual void ObjectReleased() SAL_OVERRIDE; + virtual void AddSupportedFormats() override; + virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; + virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ) override; + virtual void ObjectReleased() override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEROWEXCHANGE_HXX diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 98cd998ec0ce..c41f396dd86f 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -70,16 +70,16 @@ namespace dbaui bool m_bActive; // OContainerListener - virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; protected: - virtual void Resize() SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Resize() override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void MouseMove( const MouseEvent& rEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rEvt ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; VclPtr<OTableWindowListBox> CreateListBox(); // called at FIRST Init @@ -124,7 +124,7 @@ namespace dbaui public: virtual ~OTableWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // late Constructor, see also CreateListbox and FillListbox virtual bool Init(); @@ -132,9 +132,9 @@ namespace dbaui OJoinTableView* getTableView(); const OJoinTableView* getTableView() const; OJoinDesignView* getDesignView(); - void SetPosPixel( const Point& rNewPos ) SAL_OVERRIDE; - void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE; - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE; + void SetPosPixel( const Point& rNewPos ) override; + void SetSizePixel( const Size& rNewSize ) override; + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) override; OUString getTitle() const; void SetBoldTitle( bool bBold ); @@ -173,13 +173,13 @@ namespace dbaui Rectangle getSizingRect(const Point& _rPos,const Size& _rOutputSize) const; // window override - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Command(const CommandEvent& rEvt) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void GetFocus() override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual void Command(const CommandEvent& rEvt) override; // Accessibility - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; // do I have connections to the outside? bool ExistsAConn() const; diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx index ff555519c3c6..ffe7c92fc44e 100644 --- a/dbaccess/source/ui/inc/TableWindowAccess.hxx +++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx @@ -42,56 +42,56 @@ namespace dbaui protected: /** this function is called upon disposing the component */ - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; + virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; public: OTableWindowAccess( OTableWindow* _pTable); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire( ) throw () override { // here inline is allowed because we do not use this class outside this dll VCLXAccessibleComponent::acquire( ); } - virtual void SAL_CALL release( ) throw () SAL_OVERRIDE + virtual void SAL_CALL release( ) throw () override { // here inline is allowed because we do not use this class outside this dll VCLXAccessibleComponent::release( ); } // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - static methods static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException,css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException,css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleComponent - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleExtendedComponent - virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleRelationSet - virtual sal_Int32 SAL_CALL getRelationCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getRelationCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWACCESS_HXX diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx index 776d85147065..77b66ceb0a56 100644 --- a/dbaccess/source/ui/inc/TableWindowData.hxx +++ b/dbaccess/source/ui/inc/TableWindowData.hxx @@ -87,7 +87,7 @@ namespace dbaui inline css::uno::Reference< css::container::XNameAccess > getColumns() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xColumns; } // OEventListenerAdapter - virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE; + virtual void _disposing( const css::lang::EventObject& _rSource ) override; }; typedef ::std::vector< std::shared_ptr<OTableWindowData> > TTableWindowData; diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index 2bca53be2179..2a5fc96f267c 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -64,29 +64,29 @@ namespace dbaui bool m_bReallyScrolled : 1; protected: - virtual void LoseFocus() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void NotifyScrolled() SAL_OVERRIDE; - virtual void NotifyEndScroll() SAL_OVERRIDE; + virtual void LoseFocus() override; + virtual void GetFocus() override; + virtual void NotifyScrolled() override; + virtual void NotifyEndScroll() override; - virtual bool PreNotify(NotifyEvent& rNEvt) SAL_OVERRIDE; + virtual bool PreNotify(NotifyEvent& rNEvt) override; - virtual void dragFinished( ) SAL_OVERRIDE; + virtual void dragFinished( ) override; public: OTableWindowListBox(OTableWindow* pParent); virtual ~OTableWindowListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // DnD stuff - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; // window - virtual void Command(const CommandEvent& rEvt) SAL_OVERRIDE; + virtual void Command(const CommandEvent& rEvt) override; OTableWindow* GetTabWin(){ return m_pTabWin; } SvTreeListEntry* GetEntryFromText( const OUString& rEntryText ); diff --git a/dbaccess/source/ui/inc/TableWindowTitle.hxx b/dbaccess/source/ui/inc/TableWindowTitle.hxx index 3d009e3c603e..e38a65bf007c 100644 --- a/dbaccess/source/ui/inc/TableWindowTitle.hxx +++ b/dbaccess/source/ui/inc/TableWindowTitle.hxx @@ -29,21 +29,21 @@ namespace dbaui VclPtr<OTableWindow> m_pTabWin; protected: - virtual void Command(const CommandEvent& rEvt) SAL_OVERRIDE; + virtual void Command(const CommandEvent& rEvt) override; // virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rEvt ) override; + virtual void KeyInput( const KeyEvent& rEvt ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; public: OTableWindowTitle( OTableWindow* pParent ); virtual ~OTableWindowTitle(); - virtual void dispose() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void dispose() override; + virtual void LoseFocus() override; + virtual void GetFocus() override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; // window override - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWTITLE_HXX diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index d43d731c038a..9b728079f90f 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -54,7 +54,7 @@ class ODbDataSourceAdministrationHelper; ,const css::uno::Any& _aDataSourceName ); virtual ~OTableSubscriptionDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // forwards from ODbDataSourceAdministrationHelper void successfullyConnected(); @@ -64,10 +64,10 @@ class ODbDataSourceAdministrationHelper; css::uno::Reference< css::beans::XPropertySet > getCurrentDataSource(); inline void endExecution() { m_bStopExecution = true; } - virtual const SfxItemSet* getOutputSet() const SAL_OVERRIDE; - virtual SfxItemSet* getWriteOutputSet() SAL_OVERRIDE; + virtual const SfxItemSet* getOutputSet() const override; + virtual SfxItemSet* getWriteOutputSet() override; - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index 8424a2497518..91fc0c82ea1f 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -115,7 +115,7 @@ namespace dbaui bool isCheckEnabled() const { return m_bCheckOnly; } private: - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; void impl_initFromDescriptor( const svx::ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit ); }; @@ -139,8 +139,8 @@ namespace dbaui : ODatabaseImportExport(_rxConnection,_rxNumberF,_rM) {} - virtual bool Write() SAL_OVERRIDE; - virtual bool Read() SAL_OVERRIDE; + virtual bool Write() override; + virtual bool Read() override; }; // HTML Import and Export #define SBA_HTML_FONTSIZES 7 @@ -182,8 +182,8 @@ namespace dbaui , m_nIndent(0) {} - virtual bool Write() SAL_OVERRIDE; - virtual bool Read() SAL_OVERRIDE; + virtual bool Write() override; + virtual bool Read() override; }; // normal RowSet Import and Export @@ -201,7 +201,7 @@ namespace dbaui bool insertNewRow(); protected: - virtual void initialize() SAL_OVERRIDE; + virtual void initialize() override; public: // export data @@ -217,8 +217,8 @@ namespace dbaui : ODatabaseImportExport(_rxConnection,NULL,_rM) {} - virtual bool Write() SAL_OVERRIDE; - virtual bool Read() SAL_OVERRIDE; + virtual bool Write() override; + virtual bool Read() override; private: using ODatabaseImportExport::initialize; diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 1171efd114cd..9e654552e69e 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -51,7 +51,7 @@ namespace dbaui css::uno::Reference< css::sdbc::XConnection> m_xConnection; bool m_bOwnConnection; protected: - virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SAL_OVERRIDE; + virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) override; public: OUserAdminDlg( vcl::Window* _pParent ,SfxItemSet* _pItems @@ -60,22 +60,22 @@ namespace dbaui ,const css::uno::Reference< css::sdbc::XConnection>& _xConnection); virtual ~OUserAdminDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual const SfxItemSet* getOutputSet() const SAL_OVERRIDE; - virtual SfxItemSet* getWriteOutputSet() SAL_OVERRIDE; + virtual const SfxItemSet* getOutputSet() const override; + virtual SfxItemSet* getWriteOutputSet() override; - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; // forwards to ODbDataSourceAdministrationHelper - virtual css::uno::Reference< css::uno::XComponentContext > getORB() const SAL_OVERRIDE; - virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() SAL_OVERRIDE; - virtual css::uno::Reference< css::sdbc::XDriver > getDriver() SAL_OVERRIDE; - virtual OUString getDatasourceType(const SfxItemSet& _rSet) const SAL_OVERRIDE; - virtual void clearPassword() SAL_OVERRIDE; - virtual bool saveDatasource() SAL_OVERRIDE; - virtual void setTitle(const OUString& _sTitle) SAL_OVERRIDE; - virtual void enableConfirmSettings( bool _bEnable ) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XComponentContext > getORB() const override; + virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override; + virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override; + virtual void clearPassword() override; + virtual bool saveDatasource() override; + virtual void setTitle(const OUString& _sTitle) override; + virtual void enableConfirmSettings( bool _bEnable ) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx index dcc6deddedc3..51957716716f 100644 --- a/dbaccess/source/ui/inc/VertSplitView.hxx +++ b/dbaccess/source/ui/inc/VertSplitView.hxx @@ -35,17 +35,17 @@ namespace dbaui void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); DECL_LINK_TYPED( SplitHdl, Splitter*, void ); protected: - virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; + virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: OSplitterView(vcl::Window* _pParent,bool _bVertical = true); virtual ~OSplitterView(); // Window overrides - virtual void dispose() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; + virtual void dispose() override; + virtual void GetFocus() override; void setSplitter(Splitter* _pSplitter); void set(vcl::Window* _pRight,Window* _pLeft = NULL); - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_VERTSPLITVIEW_HXX diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index 4c9931d4d477..5bd246238378 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -59,14 +59,14 @@ namespace dbaui void SetAppendDataRadio(); public: - virtual void Reset() SAL_OVERRIDE; - virtual void ActivatePage() SAL_OVERRIDE; - virtual bool LeavePage() SAL_OVERRIDE; - virtual OUString GetTitle() const SAL_OVERRIDE ; + virtual void Reset() override; + virtual void ActivatePage() override; + virtual bool LeavePage() override; + virtual OUString GetTitle() const override ; OCopyTable( vcl::Window * pParent ); virtual ~OCopyTable(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool IsOptionDefData() const { return m_pRB_DefData->IsChecked(); } bool IsOptionDef() const { return m_pRB_Def->IsChecked(); } diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index b40dbf5ec093..8346438e1c0e 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -73,14 +73,14 @@ namespace dbaui const ::comphelper::UStringMixEqual& _aCase); public: - virtual void Reset ( ) SAL_OVERRIDE; - virtual void ActivatePage() SAL_OVERRIDE; - virtual bool LeavePage() SAL_OVERRIDE; - virtual OUString GetTitle() const SAL_OVERRIDE ; + virtual void Reset ( ) override; + virtual void ActivatePage() override; + virtual bool LeavePage() override; + virtual OUString GetTitle() const override ; OWizColumnSelect(vcl::Window* pParent); virtual ~OWizColumnSelect(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WCOLUMNSELECT_HXX diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 143f1252b608..fc067b11aa21 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -66,7 +66,7 @@ namespace dbaui virtual ~TExportColumnFindFunctor() {} - bool operator()(const OUString& _sColumnName) const SAL_OVERRIDE + bool operator()(const OUString& _sColumnName) const override { return m_pColumns->find(_sColumnName) != m_pColumns->end(); } @@ -86,7 +86,7 @@ namespace dbaui virtual ~TMultiListBoxEntryFindFunctor() {} - bool operator()(const OUString& _sColumnName) const SAL_OVERRIDE + bool operator()(const OUString& _sColumnName) const override { return ::std::any_of(m_pVector->begin(),m_pVector->end(), ::std::bind2nd(m_aCase, _sColumnName)); @@ -159,18 +159,18 @@ namespace dbaui ); // ICopyTableSourceObject overridables - virtual OUString getQualifiedObjectName() const SAL_OVERRIDE; - virtual bool isView() const SAL_OVERRIDE; - virtual void copyUISettingsTo( const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; - virtual void copyFilterAndSortingTo(const css::uno::Reference< css::sdbc::XConnection >& _xConnection, const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; + virtual OUString getQualifiedObjectName() const override; + virtual bool isView() const override; + virtual void copyUISettingsTo( const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const override; + virtual void copyFilterAndSortingTo(const css::uno::Reference< css::sdbc::XConnection >& _xConnection, const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const override; virtual css::uno::Sequence< OUString > - getColumnNames() const SAL_OVERRIDE; + getColumnNames() const override; virtual css::uno::Sequence< OUString > - getPrimaryKeyColumnNames() const SAL_OVERRIDE; - virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const SAL_OVERRIDE; - virtual OUString getSelectStatement() const SAL_OVERRIDE; + getPrimaryKeyColumnNames() const override; + virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const override; + virtual OUString getSelectStatement() const override; virtual ::utl::SharedUNOComponent< css::sdbc::XPreparedStatement > - getPreparedSelectStatement() const SAL_OVERRIDE; + getPreparedSelectStatement() const override; }; // NamedTableCopySource @@ -193,18 +193,18 @@ namespace dbaui ); // ICopyTableSourceObject overridables - virtual OUString getQualifiedObjectName() const SAL_OVERRIDE; - virtual bool isView() const SAL_OVERRIDE; - virtual void copyUISettingsTo( const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; - virtual void copyFilterAndSortingTo(const css::uno::Reference< css::sdbc::XConnection >& _xConnection,const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; + virtual OUString getQualifiedObjectName() const override; + virtual bool isView() const override; + virtual void copyUISettingsTo( const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const override; + virtual void copyFilterAndSortingTo(const css::uno::Reference< css::sdbc::XConnection >& _xConnection,const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const override; virtual css::uno::Sequence< OUString > - getColumnNames() const SAL_OVERRIDE; + getColumnNames() const override; virtual css::uno::Sequence< OUString > - getPrimaryKeyColumnNames() const SAL_OVERRIDE; - virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const SAL_OVERRIDE; - virtual OUString getSelectStatement() const SAL_OVERRIDE; + getPrimaryKeyColumnNames() const override; + virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const override; + virtual OUString getSelectStatement() const override; virtual ::utl::SharedUNOComponent< css::sdbc::XPreparedStatement > - getPreparedSelectStatement() const SAL_OVERRIDE; + getPreparedSelectStatement() const override; private: void impl_ensureColumnInfo_throw(); @@ -324,9 +324,9 @@ namespace dbaui ); virtual ~OCopyTableWizard(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool DeactivatePage() SAL_OVERRIDE; + virtual bool DeactivatePage() override; OKButton& GetOKButton() { return static_cast<OKButton&>(*m_pbFinish); } Wizard_Button_Style GetPressedButton() const { return m_ePressed; } void EnableButton(Wizard_Button_Style eStyle, bool bEnable); diff --git a/dbaccess/source/ui/inc/WExtendPages.hxx b/dbaccess/source/ui/inc/WExtendPages.hxx index e51abe09a9bd..b1a4a9782b43 100644 --- a/dbaccess/source/ui/inc/WExtendPages.hxx +++ b/dbaccess/source/ui/inc/WExtendPages.hxx @@ -28,7 +28,7 @@ namespace dbaui class OWizHTMLExtend : public OWizTypeSelect { protected: - virtual SvParser* createReader(sal_Int32 _nRows) SAL_OVERRIDE; + virtual SvParser* createReader(sal_Int32 _nRows) override; public: OWizHTMLExtend(vcl::Window* pParent, SvStream& _rStream) : OWizTypeSelect( pParent, &_rStream ) @@ -41,7 +41,7 @@ namespace dbaui class OWizRTFExtend : public OWizTypeSelect { protected: - virtual SvParser* createReader(sal_Int32 _nRows) SAL_OVERRIDE; + virtual SvParser* createReader(sal_Int32 _nRows) override; public: OWizRTFExtend(vcl::Window* pParent,SvStream& _rStream) : OWizTypeSelect( pParent, &_rStream ) @@ -55,7 +55,7 @@ namespace dbaui class OWizNormalExtend : public OWizTypeSelect { protected: - virtual SvParser* createReader(sal_Int32 _nRows) SAL_OVERRIDE; + virtual SvParser* createReader(sal_Int32 _nRows) override; public: OWizNormalExtend(vcl::Window* pParent); }; diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index bcc63c59ac46..e4a96a568518 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -33,14 +33,14 @@ namespace dbaui { bool m_bReadOnly; protected: - virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE; + virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) override; public: OColumnTreeBox( vcl::Window* pParent, WinBits nBits = WB_BORDER ); void FillListBox( const ODatabaseExport::TColumnVector& _rList); void SetReadOnly(bool _bRo=true) { m_bReadOnly = _bRo; } - virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) SAL_OVERRIDE; + virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) override; private: using OMarkableTreeListBox::Select; @@ -72,14 +72,14 @@ namespace dbaui DECL_LINK_TYPED( TableListRightSelectHdl, SvTreeListBox*, void ); public: - virtual void Reset ( ) SAL_OVERRIDE; - virtual void ActivatePage() SAL_OVERRIDE; - virtual bool LeavePage() SAL_OVERRIDE; - virtual OUString GetTitle() const SAL_OVERRIDE ; + virtual void Reset ( ) override; + virtual void ActivatePage() override; + virtual bool LeavePage() override; + virtual OUString GetTitle() const override ; OWizNameMatching(vcl::Window* pParent); virtual ~OWizNameMatching(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WNAMEMATCH_HXX diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx index 6a5d3ab48eb1..f90ccc0c9666 100644 --- a/dbaccess/source/ui/inc/WTabPage.hxx +++ b/dbaccess/source/ui/inc/WTabPage.hxx @@ -36,7 +36,7 @@ namespace dbaui public: virtual ~OWizardPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; virtual void Reset ( ) = 0; virtual bool LeavePage() = 0; virtual OUString GetTitle() const = 0; diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index e25a0c148b99..38eab2ac471b 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -38,25 +38,25 @@ namespace dbaui { protected: VclPtr<vcl::Window> m_pParentTabPage; - virtual void ActivateAggregate( EControlType eType ) SAL_OVERRIDE; - virtual void DeactivateAggregate( EControlType eType ) SAL_OVERRIDE; + virtual void ActivateAggregate( EControlType eType ) override; + virtual void DeactivateAggregate( EControlType eType ) override; - virtual void CellModified(long nRow, sal_uInt16 nColId ) SAL_OVERRIDE; + virtual void CellModified(long nRow, sal_uInt16 nColId ) override; - virtual css::lang::Locale GetLocale() const SAL_OVERRIDE; - virtual css::uno::Reference< css::util::XNumberFormatter > GetFormatter() const SAL_OVERRIDE; - virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) SAL_OVERRIDE; - virtual const OTypeInfoMap* getTypeInfo() const SAL_OVERRIDE; - virtual bool isAutoIncrementValueEnabled() const SAL_OVERRIDE; - virtual OUString getAutoIncrementValue() const SAL_OVERRIDE; + virtual css::lang::Locale GetLocale() const override; + virtual css::uno::Reference< css::util::XNumberFormatter > GetFormatter() const override; + virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) override; + virtual const OTypeInfoMap* getTypeInfo() const override; + virtual bool isAutoIncrementValueEnabled() const override; + virtual OUString getAutoIncrementValue() const override; public: OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage, OTableDesignHelpBar* pHelpBar=NULL); virtual ~OWizTypeSelectControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE; - virtual css::uno::Reference< css::sdbc::XConnection> getConnection() SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() override; + virtual css::uno::Reference< css::sdbc::XConnection> getConnection() override; }; // Wizard Page: OWizTypeSelectList @@ -69,7 +69,7 @@ namespace dbaui sal_uInt16 _nPos, bool _bSet = false); protected: - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; VclPtr<vcl::Window> m_pParentTabPage; public: OWizTypeSelectList( vcl::Window* pParent, WinBits nStyle = WB_BORDER ) @@ -78,7 +78,7 @@ namespace dbaui , m_pParentTabPage(NULL) {} virtual ~OWizTypeSelectList(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetPKey(bool bPKey) { m_bPKey = bPKey; } void SetParentTabPage(vcl::Window* pParentTabPage) { m_pParentTabPage = pParentTabPage; } }; @@ -114,14 +114,14 @@ namespace dbaui void EnableAuto(bool bEnable); public: - virtual void Reset ( ) SAL_OVERRIDE; - virtual void ActivatePage( ) SAL_OVERRIDE; - virtual bool LeavePage() SAL_OVERRIDE; - virtual OUString GetTitle() const SAL_OVERRIDE; + virtual void Reset ( ) override; + virtual void ActivatePage( ) override; + virtual bool LeavePage() override; + virtual OUString GetTitle() const override; OWizTypeSelect(vcl::Window* pParent, SvStream* _pStream = NULL ); virtual ~OWizTypeSelect(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; inline void setDisplayRow(sal_Int32 _nRow) { m_nDisplayRow = _nRow - 1; } inline void setDuplicateName(bool _bDuplicateName) { m_bDuplicateName = _bDuplicateName; } diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index 098c69ac66ec..82df080702ff 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -81,7 +81,7 @@ namespace dbaui vcl::Window* _pParent, IAddTableDialogContext& _rContext ); virtual ~OAddTableDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void Update(); @@ -89,7 +89,7 @@ namespace dbaui IAddTableDialogContext& _rContext ); private: - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; bool impl_isAddAllowed(); void impl_addTable(); diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index 628ed2e7b318..1b1c46acbb67 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -42,7 +42,7 @@ namespace dbaui ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; protected: - virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SAL_OVERRIDE; + virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) override; public: AdvancedSettingsDialog( vcl::Window* _pParent @@ -51,25 +51,25 @@ namespace dbaui ,const css::uno::Any& _aDataSourceName); virtual ~AdvancedSettingsDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /// determines whether or not the given data source type has any advanced setting static bool doesHaveAnyAdvancedSettings( const OUString& _sURL ); - virtual const SfxItemSet* getOutputSet() const SAL_OVERRIDE; - virtual SfxItemSet* getWriteOutputSet() SAL_OVERRIDE; + virtual const SfxItemSet* getOutputSet() const override; + virtual SfxItemSet* getWriteOutputSet() override; - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; // forwards to ODbDataSourceAdministrationHelper - virtual css::uno::Reference< css::uno::XComponentContext > getORB() const SAL_OVERRIDE; - virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() SAL_OVERRIDE; - virtual css::uno::Reference< css::sdbc::XDriver > getDriver() SAL_OVERRIDE; - virtual OUString getDatasourceType(const SfxItemSet& _rSet) const SAL_OVERRIDE; - virtual void clearPassword() SAL_OVERRIDE; - virtual bool saveDatasource() SAL_OVERRIDE; - virtual void setTitle(const OUString& _sTitle) SAL_OVERRIDE; - virtual void enableConfirmSettings( bool _bEnable ) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XComponentContext > getORB() const override; + virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override; + virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override; + virtual void clearPassword() override; + virtual bool saveDatasource() override; + virtual void setTitle(const OUString& _sTitle) override; + virtual void enableConfirmSettings( bool _bEnable ) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 4005aaf8009b..1db7c72962a1 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -144,74 +144,74 @@ namespace dbaui UnoDataBrowserView* getBrowserView() const { return static_cast< UnoDataBrowserView*>(getView()); } // late construction - virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) override; // UNO - virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; // css::lang::XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; // css::util::XModifyListener - virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override; // css::container::XContainerListener - virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override; // XModule - virtual void SAL_CALL setIdentifier( const OUString& Identifier ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getIdentifier( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setIdentifier( const OUString& Identifier ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getIdentifier( ) throw (css::uno::RuntimeException, std::exception) override; // css::awt::XFocusListener - virtual void SAL_CALL focusGained(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL focusLost(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL focusGained(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL focusLost(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) override; // css::frame::XController - virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) override; // css::lang::XComponent - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // css::frame::XFrameActionListener - virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override; // css::sdb::XSQLErrorListener - virtual void SAL_CALL errorOccured(const css::sdb::SQLErrorEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL errorOccured(const css::sdb::SQLErrorEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override; // css::form::XDatabaseParameterListener - virtual sal_Bool SAL_CALL approveParameter(const css::form::DatabaseParameterEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL approveParameter(const css::form::DatabaseParameterEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override; // css::form::XConfirmDeleteListener - virtual sal_Bool SAL_CALL confirmDelete(const css::sdb::RowChangeEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL confirmDelete(const css::sdb::RowChangeEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override; // css::form::XLoadListener - virtual void SAL_CALL loaded(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL unloaded(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL loaded(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL unloaded(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override; // css::form::XResetListener - virtual sal_Bool SAL_CALL approveReset(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL resetted(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL approveReset(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL resetted(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; // SbaGridListener - virtual void RowChanged() SAL_OVERRIDE; - virtual void ColumnChanged() SAL_OVERRIDE; - virtual void SelectionChanged() SAL_OVERRIDE; - virtual void CellActivated() SAL_OVERRIDE; - virtual void CellDeactivated() SAL_OVERRIDE; - virtual void BeforeDrop() SAL_OVERRIDE; - virtual void AfterDrop() SAL_OVERRIDE; + virtual void RowChanged() override; + virtual void ColumnChanged() override; + virtual void SelectionChanged() override; + virtual void CellActivated() override; + virtual void CellDeactivated() override; + virtual void BeforeDrop() override; + virtual void AfterDrop() override; public: @@ -219,14 +219,14 @@ namespace dbaui virtual ~SbaXDataBrowserController(); // all the features which should be handled by this class - virtual void describeSupportedFeatures() SAL_OVERRIDE; + virtual void describeSupportedFeatures() override; // state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const SAL_OVERRIDE; + virtual FeatureState GetState(sal_uInt16 nId) const override; // execute a feature - virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; - virtual void startFrameListening( const css::uno::Reference< css::frame::XFrame >& _rxFrame ) SAL_OVERRIDE; - virtual void stopFrameListening( const css::uno::Reference< css::frame::XFrame >& _rxFrame ) SAL_OVERRIDE; + virtual void startFrameListening( const css::uno::Reference< css::frame::XFrame >& _rxFrame ) override; + virtual void stopFrameListening( const css::uno::Reference< css::frame::XFrame >& _rxFrame ) override; virtual css::uno::Reference< css::sdbc::XRowSet > CreateForm(); // our default implementation simply instantiates a stardiv.one.form.component.Form service diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index 4c116418f397..acc2584a1f62 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -62,7 +62,7 @@ namespace dbaui IController& _rController, const css::uno::Reference< css::uno::XComponentContext >& ); virtual ~UnoDataBrowserView(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /// late construction void Construct(const css::uno::Reference< css::awt::XControlModel >& xModel); @@ -82,10 +82,10 @@ namespace dbaui css::uno::Reference< css::awt::XControlContainer > getContainer() { return m_xMe; } protected: - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE; - virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual void GetFocus() override; + virtual void resizeDocumentView(Rectangle& rRect) override; + virtual void _disposing( const css::lang::EventObject& _rSource ) override; private: using ODataView::Construct; diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx index d269bae7a7b5..6354d6ab041a 100644 --- a/dbaccess/source/ui/inc/charsets.hxx +++ b/dbaccess/source/ui/inc/charsets.hxx @@ -56,7 +56,7 @@ namespace dbaui const_iterator end() const; protected: - virtual bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const SAL_OVERRIDE; + virtual bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const override; private: using OCharsetDisplay_Base::find; diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index c0fd692f1509..f5096b5b34d9 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -43,14 +43,14 @@ class OConnectionURLEdit : public Edit public: OConnectionURLEdit(vcl::Window* pParent, WinBits _nBits,bool _bShowPrefix = false); virtual ~OConnectionURLEdit(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; public: // Edit overridables - virtual void SetText(const OUString& _rStr) SAL_OVERRIDE; - virtual void SetText(const OUString& _rStr, const Selection& _rNewSelection) SAL_OVERRIDE; - virtual OUString GetText() const SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void SetText(const OUString& _rStr) override; + virtual void SetText(const OUString& _rStr, const Selection& _rNewSelection) override; + virtual OUString GetText() const override; + virtual void Resize() override; /** Shows the Prefix @param _bShowPrefix diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx index a14d8c096694..f9b69323e02e 100644 --- a/dbaccess/source/ui/inc/databaseobjectview.hxx +++ b/dbaccess/source/ui/inc/databaseobjectview.hxx @@ -156,7 +156,7 @@ namespace dbaui ::comphelper::NamedValueCollection& i_rDispatchArgs, const css::uno::Any& _aDataSource, const OUString& _rObjectName - ) SAL_OVERRIDE; + ) override; public: QueryDesigner( @@ -175,13 +175,13 @@ namespace dbaui ::comphelper::NamedValueCollection& i_rDispatchArgs, const css::uno::Any& _aDataSource, const OUString& _rObjectName - ) SAL_OVERRIDE; + ) override; virtual css::uno::Reference< css::lang::XComponent > doCreateView( const css::uno::Any& _rDataSource, const OUString& _rObjectName, const ::comphelper::NamedValueCollection& i_rCreationArgs - ) SAL_OVERRIDE; + ) override; public: TableDesigner( @@ -214,7 +214,7 @@ namespace dbaui ::comphelper::NamedValueCollection& i_rDispatchArgs, const css::uno::Any& _aDataSource, const OUString& _rQualifiedName - ) SAL_OVERRIDE; + ) override; public: ResultSetBrowser( diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 70ea77286d32..ec6fb37fe932 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -66,7 +66,7 @@ public: const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); virtual ~ODbAdminDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /** create and return an item set for use with the dialog. @param _pTypeCollection pointer to an <type>ODatasourceMap</type>. May be NULL, in this case @@ -83,25 +83,25 @@ public: */ void selectDataSource(const css::uno::Any& _aDataSourceName); - virtual const SfxItemSet* getOutputSet() const SAL_OVERRIDE; - virtual SfxItemSet* getWriteOutputSet() SAL_OVERRIDE; + virtual const SfxItemSet* getOutputSet() const override; + virtual SfxItemSet* getWriteOutputSet() override; // forwards to ODbDataSourceAdministrationHelper - virtual css::uno::Reference< css::uno::XComponentContext > getORB() const SAL_OVERRIDE; - virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() SAL_OVERRIDE; - virtual css::uno::Reference< css::sdbc::XDriver > getDriver() SAL_OVERRIDE; - virtual OUString getDatasourceType(const SfxItemSet& _rSet) const SAL_OVERRIDE; - virtual void clearPassword() SAL_OVERRIDE; - virtual bool saveDatasource() SAL_OVERRIDE; - virtual void setTitle(const OUString& _sTitle) SAL_OVERRIDE; - virtual void enableConfirmSettings( bool _bEnable ) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XComponentContext > getORB() const override; + virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override; + virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override; + virtual void clearPassword() override; + virtual bool saveDatasource() override; + virtual void setTitle(const OUString& _sTitle) override; + virtual void enableConfirmSettings( bool _bEnable ) override; protected: // adds a new detail page and remove all the old ones void addDetailPage(sal_uInt16 _nPageId,sal_uInt16 _nTextId,CreateTabPage pCreateFunc); - virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SAL_OVERRIDE; - virtual short Ok() SAL_OVERRIDE; + virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) override; + virtual short Ok() override; protected: inline bool isUIEnabled() const { return m_bUIEnabled; } diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index e6fdac6a4ea3..e8190d660e1d 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -73,13 +73,13 @@ namespace dbaui ); // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; protected: - virtual void AddSupportedFormats() SAL_OVERRIDE; - virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE; - virtual void ObjectReleased() SAL_OVERRIDE; - virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void AddSupportedFormats() override; + virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; + virtual void ObjectReleased() override; + virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ) override; }; } diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 5db4296ee697..cf473ec2ec51 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -83,7 +83,7 @@ namespace dbaui ,WinBits nWinStyle=0 ,bool _bHandleEnterKey = false); virtual ~DBTreeListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } void setContextMenuProvider( IContextMenuProvider* _pContextMenuProvider ) { m_pContextMenuProvider = _pContextMenuProvider; } @@ -100,40 +100,40 @@ namespace dbaui void EnableExpandHandler(SvTreeListEntry* _pEntry); SvTreeListEntry* GetEntryPosByName( const OUString& aName, SvTreeListEntry* pStart = NULL, const IEntryFilter* _pFilter = NULL ) const; - virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; - virtual void SelectHdl() SAL_OVERRIDE; - virtual void DeselectHdl() SAL_OVERRIDE; + virtual void RequestingChildren( SvTreeListEntry* pParent ) override; + virtual void SelectHdl() override; + virtual void DeselectHdl() override; // Window - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp, SvLBoxButtonKind eButtonKind) override; // enable editing for tables/views and queries - virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ) SAL_OVERRIDE; - virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) SAL_OVERRIDE; + virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ) override; + virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) override; - virtual bool DoubleClickHdl() SAL_OVERRIDE; + virtual bool DoubleClickHdl() override; - virtual std::unique_ptr<PopupMenu> CreateContextMenu() SAL_OVERRIDE; - virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; + virtual std::unique_ptr<PopupMenu> CreateContextMenu() override; + virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) override; void SetEnterKeyHdl(const Link<DBTreeListBox*,void>& rNewHdl) {m_aEnterKeyHdl = rNewHdl;} void clearCurrentSelection() { m_aSelectedEntries.clear(); } protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; // DragSourceHelper overridables - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override; // DropTargetHelper overridables - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ) override; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ) override; - virtual void ModelHasRemoved( SvTreeListEntry* pEntry ) SAL_OVERRIDE; - virtual void ModelHasEntryInvalidated( SvTreeListEntry* pEntry ) SAL_OVERRIDE; + virtual void ModelHasRemoved( SvTreeListEntry* pEntry ) override; + virtual void ModelHasEntryInvalidated( SvTreeListEntry* pEntry ) override; void implStopSelectionTimer(); void implStartSelectionTimer(); diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index f306650acfb2..596450f2a065 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -72,29 +72,29 @@ public: ,const css::uno::Any& _aDataSourceName ); virtual ~ODbTypeWizDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual const SfxItemSet* getOutputSet() const SAL_OVERRIDE; - virtual SfxItemSet* getWriteOutputSet() SAL_OVERRIDE; + virtual const SfxItemSet* getOutputSet() const override; + virtual SfxItemSet* getWriteOutputSet() override; // forwards to ODbDataSourceAdministrationHelper - virtual css::uno::Reference< css::uno::XComponentContext > getORB() const SAL_OVERRIDE; - virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() SAL_OVERRIDE; - virtual css::uno::Reference< css::sdbc::XDriver > getDriver() SAL_OVERRIDE; - virtual OUString getDatasourceType(const SfxItemSet& _rSet) const SAL_OVERRIDE; - virtual void clearPassword() SAL_OVERRIDE; - virtual bool saveDatasource() SAL_OVERRIDE; - virtual void setTitle(const OUString& _sTitle) SAL_OVERRIDE; - virtual void enableConfirmSettings( bool _bEnable ) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XComponentContext > getORB() const override; + virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override; + virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override; + virtual void clearPassword() override; + virtual bool saveDatasource() override; + virtual void setTitle(const OUString& _sTitle) override; + virtual void enableConfirmSettings( bool _bEnable ) override; protected: /// to override to create new pages - virtual VclPtr<TabPage> createPage(WizardState _nState) SAL_OVERRIDE; - virtual WizardState determineNextState(WizardState _nCurrentState) const SAL_OVERRIDE; - virtual bool leaveState(WizardState _nState) SAL_OVERRIDE; + virtual VclPtr<TabPage> createPage(WizardState _nState) override; + virtual WizardState determineNextState(WizardState _nCurrentState) const override; + virtual bool leaveState(WizardState _nState) override; virtual ::svt::IWizardPageController* - getPageController( TabPage* _pCurrentPage ) const SAL_OVERRIDE; - virtual bool onFinish() SAL_OVERRIDE; + getPageController( TabPage* _pCurrentPage ) const override; + virtual bool onFinish() override; protected: diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 058e79b274fa..b536279c0319 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -99,21 +99,21 @@ public: ,const css::uno::Any& _aDataSourceName ); virtual ~ODbTypeWizDialogSetup(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual const SfxItemSet* getOutputSet() const SAL_OVERRIDE; - virtual SfxItemSet* getWriteOutputSet() SAL_OVERRIDE; + virtual const SfxItemSet* getOutputSet() const override; + virtual SfxItemSet* getWriteOutputSet() override; // forwards to ODbDataSourceAdministrationHelper - virtual css::uno::Reference< css::uno::XComponentContext > getORB() const SAL_OVERRIDE; - virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() SAL_OVERRIDE; - virtual css::uno::Reference< css::sdbc::XDriver > getDriver() SAL_OVERRIDE; - virtual OUString getDatasourceType(const SfxItemSet& _rSet) const SAL_OVERRIDE; - virtual void clearPassword() SAL_OVERRIDE; - virtual void setTitle(const OUString& _sTitle) SAL_OVERRIDE; - virtual void enableConfirmSettings( bool _bEnable ) SAL_OVERRIDE; - virtual bool saveDatasource() SAL_OVERRIDE; - virtual OUString getStateDisplayName( WizardState _nState ) const SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XComponentContext > getORB() const override; + virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override; + virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override; + virtual void clearPassword() override; + virtual void setTitle(const OUString& _sTitle) override; + virtual void enableConfirmSettings( bool _bEnable ) override; + virtual bool saveDatasource() override; + virtual OUString getStateDisplayName( WizardState _nState ) const override; /** returns <TRUE/> if the database should be opened, otherwise <FALSE/>. */ @@ -125,11 +125,11 @@ public: protected: /// to override to create new pages - virtual VclPtr<TabPage> createPage(WizardState _nState) SAL_OVERRIDE; - virtual bool leaveState(WizardState _nState) SAL_OVERRIDE; - virtual void enterState(WizardState _nState) SAL_OVERRIDE; - virtual ::svt::IWizardPageController* getPageController( TabPage* _pCurrentPage ) const SAL_OVERRIDE; - virtual bool onFinish() SAL_OVERRIDE; + virtual VclPtr<TabPage> createPage(WizardState _nState) override; + virtual bool leaveState(WizardState _nState) override; + virtual void enterState(WizardState _nState) override; + virtual ::svt::IWizardPageController* getPageController( TabPage* _pCurrentPage ) const override; + virtual bool onFinish() override; protected: void resetPages(const css::uno::Reference< css::beans::XPropertySet >& _rxDatasource); diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx index 18af1cb5098c..b0e2fdfd4007 100644 --- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx +++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx @@ -64,7 +64,7 @@ namespace dbaui virtual bool isNameValid( const OUString& _rObjectName, ::dbtools::SQLExceptionInfo& _out_rErrorToDisplay - ) const SAL_OVERRIDE; + ) const override; private: HierarchicalNameCheck(); // never implemented @@ -114,7 +114,7 @@ namespace dbaui virtual bool isNameValid( const OUString& _rObjectName, ::dbtools::SQLExceptionInfo& _out_rErrorToDisplay - ) const SAL_OVERRIDE; + ) const override; private: DynamicTableOrQueryNameCheck(); // never implemented diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index 8b0e4a1a2163..eae1c5499b9e 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -72,7 +72,7 @@ namespace dbaui vcl::Window* _pParent, const css::uno::Reference< css::sdbc::XConnection >& _rxConn); virtual ~DirectSQLDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /// number of history entries sal_Int32 getHistorySize() const; @@ -82,7 +82,7 @@ namespace dbaui void switchToHistory(sal_Int32 _nHistoryPos, bool _bUpdateListBox = true); // OEventListenerAdapter - virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE; + virtual void _disposing( const css::lang::EventObject& _rSource ) override; protected: DECL_LINK_TYPED( OnExecute, Button*, void ); diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx index 4bf07d1b3406..4edb12c484f9 100644 --- a/dbaccess/source/ui/inc/dlgattr.hxx +++ b/dbaccess/source/ui/inc/dlgattr.hxx @@ -35,9 +35,9 @@ namespace dbaui public: SbaSbAttrDlg(vcl::Window * pParent, const SfxItemSet*, SvNumberFormatter*, bool bHasFormat, bool bRow = false); virtual ~SbaSbAttrDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 9f883a3f7b68..2896b68f64ef 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -66,7 +66,7 @@ namespace dbaui const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS); virtual ~OSaveAsDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString getName() const; OUString getCatalog() const; diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index 90f7092e428b..82e3a2a0bc1c 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -45,7 +45,7 @@ namespace dbaui public: DlgSize( vcl::Window * pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard = -1 ); virtual ~DlgSize(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; sal_Int32 GetValue(); }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx index 737c8c5ece0b..09c0ea6a6fe9 100644 --- a/dbaccess/source/ui/inc/exsrcbrw.hxx +++ b/dbaccess/source/ui/inc/exsrcbrw.hxx @@ -51,44 +51,44 @@ namespace dbaui // UNO DECLARE_UNO3_DEFAULTS(SbaExternalSourceBrowser, OGenericUnoController) - virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; // virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > getIdlClasses(); // static css::uno::Reference< css::reflection::XIdlClass > getStaticIdlClass(); // css::frame::XDispatch - virtual void SAL_CALL dispatch(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispatch(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) throw(css::uno::RuntimeException, std::exception) override; // css::frame::XDispatchProvider - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( css::uno::RuntimeException, std::exception ) override; // css::util::XModifyListener - virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override; // css::util::XModifyBroadcaster - virtual void SAL_CALL addModifyListener(const css::uno::Reference< css::util::XModifyListener > & aListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener > & aListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addModifyListener(const css::uno::Reference< css::util::XModifyListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override; // css::lang::XComponent - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // css::form::XLoadListener - virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override; // css::lang::XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; protected: virtual ~SbaExternalSourceBrowser(); - virtual css::uno::Reference< css::sdbc::XRowSet > CreateForm() SAL_OVERRIDE; - virtual bool InitializeForm( const css::uno::Reference< css::beans::XPropertySet >& i_formProperties ) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XRowSet > CreateForm() override; + virtual bool InitializeForm( const css::uno::Reference< css::beans::XPropertySet >& i_formProperties ) override; - virtual bool LoadForm() SAL_OVERRIDE; + virtual bool LoadForm() override; void Attach(const css::uno::Reference< css::sdbc::XRowSet > & xMaster); diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx index db2dbd860b5f..ea87b32a7a11 100644 --- a/dbaccess/source/ui/inc/formadapter.hxx +++ b/dbaccess/source/ui/inc/formadapter.hxx @@ -162,267 +162,267 @@ namespace dbaui // UNO DECLARE_UNO3_DEFAULTS(SbaXFormAdapter, SbaXFormAdapter_BASE1) - virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; // css::sdbc::XCloseable - virtual void SAL_CALL close() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL close() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // css::sdbc::XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // css::sdbc::XColumnLocate - virtual sal_Int32 SAL_CALL findColumn(const OUString& columnName) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL findColumn(const OUString& columnName) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // css::sdbcx::XColumnsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns() throw(css::uno::RuntimeException, std::exception) override; // css::sdbc::XRow - virtual sal_Bool SAL_CALL wasNull() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getString(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getBoolean(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int8 SAL_CALL getByte(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getShort(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getInt(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getLong(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getFloat(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getDouble(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Date SAL_CALL getDate(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Time SAL_CALL getTime(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::DateTime SAL_CALL getTimestamp(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getObject(sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL wasNull() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getString(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getBoolean(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int8 SAL_CALL getByte(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getShort(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getInt(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getLong(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getFloat(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getDouble(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::Date SAL_CALL getDate(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::Time SAL_CALL getTime(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::DateTime SAL_CALL getTimestamp(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getObject(sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // css::sdbcx::XRowLocate - virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL moveToBookmark(const css::uno::Any& bookmark) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL moveRelativeToBookmark(const css::uno::Any& bookmark, sal_Int32 rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL compareBookmarks(const css::uno::Any& first, const css::uno::Any& second) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasOrderedBookmarks() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL hashBookmark(const css::uno::Any& bookmark) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL moveToBookmark(const css::uno::Any& bookmark) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL moveRelativeToBookmark(const css::uno::Any& bookmark, sal_Int32 rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL compareBookmarks(const css::uno::Any& first, const css::uno::Any& second) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasOrderedBookmarks() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL hashBookmark(const css::uno::Any& bookmark) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // css::sdbc::XRowUpdate - virtual void SAL_CALL updateNull(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateByte(sal_Int32 columnIndex, sal_Int8 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateShort(sal_Int32 columnIndex, sal_Int16 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateInt(sal_Int32 columnIndex, sal_Int32 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateLong(sal_Int32 columnIndex, sal_Int64 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateFloat(sal_Int32 columnIndex, float x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateDouble(sal_Int32 columnIndex, double x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateString(sal_Int32 columnIndex, const OUString& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateBytes(sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateDate(sal_Int32 columnIndex, const css::util::Date& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateTime(sal_Int32 columnIndex, const css::util::Time& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateTimestamp(sal_Int32 columnIndex, const css::util::DateTime& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateBinaryStream(sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateCharacterStream(sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateObject(sal_Int32 columnIndex, const css::uno::Any& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateNumericObject(sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateNull(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateByte(sal_Int32 columnIndex, sal_Int8 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateShort(sal_Int32 columnIndex, sal_Int16 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateInt(sal_Int32 columnIndex, sal_Int32 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateLong(sal_Int32 columnIndex, sal_Int64 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateFloat(sal_Int32 columnIndex, float x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateDouble(sal_Int32 columnIndex, double x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateString(sal_Int32 columnIndex, const OUString& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateBytes(sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateDate(sal_Int32 columnIndex, const css::util::Date& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateTime(sal_Int32 columnIndex, const css::util::Time& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateTimestamp(sal_Int32 columnIndex, const css::util::DateTime& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateBinaryStream(sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateCharacterStream(sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateObject(sal_Int32 columnIndex, const css::uno::Any& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateNumericObject(sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // css::sdbc::XResultSet - virtual sal_Bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isBeforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAfterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL beforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL afterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL absolute(sal_Int32 row) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL relative(sal_Int32 rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL previous() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL refreshRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL rowUpdated() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL rowInserted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL rowDeleted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isBeforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAfterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL beforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL afterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL absolute(sal_Int32 row) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL relative(sal_Int32 rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL previous() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refreshRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL rowUpdated() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL rowInserted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL rowDeleted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // css::sdbc::XResultSetUpdate - virtual void SAL_CALL insertRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updateRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL deleteRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancelRowUpdates() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL moveToInsertRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL moveToCurrentRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL deleteRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancelRowUpdates() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL moveToInsertRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL moveToCurrentRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // css::sdbc::XRowSet - virtual void SAL_CALL execute() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener >& listener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener >& listener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL execute() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener >& listener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener >& listener) throw(css::uno::RuntimeException, std::exception) override; // css::sdbcx::XDeleteRows - virtual css::uno::Sequence<sal_Int32> SAL_CALL deleteRows(const css::uno::Sequence< css::uno::Any >& rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int32> SAL_CALL deleteRows(const css::uno::Sequence< css::uno::Any >& rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // css::sdbc::XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL clearWarnings() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getWarnings() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearWarnings() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // css::sdb::XRowSetApproveBroadcaster - virtual void SAL_CALL addRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener) throw(css::uno::RuntimeException, std::exception) override; // css::sdbc::XSQLErrorBroadcaster - virtual void SAL_CALL addSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener) throw(css::uno::RuntimeException, std::exception) override; // css::sdb::XResultSetAccess - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL createResultSet() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL createResultSet() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // css::form::XLoadable - virtual void SAL_CALL load() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL unload() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL reload() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isLoaded() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addLoadListener(const css::uno::Reference< css::form::XLoadListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeLoadListener(const css::uno::Reference< css::form::XLoadListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL load() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unload() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reload() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isLoaded() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addLoadListener(const css::uno::Reference< css::form::XLoadListener >& aListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeLoadListener(const css::uno::Reference< css::form::XLoadListener >& aListener) throw(css::uno::RuntimeException, std::exception) override; // css::sdbc::XParameters - virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const css::util::Date& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const css::util::Time& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const css::uno::Any& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL clearParameters() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const css::util::Date& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const css::util::Time& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const css::uno::Any& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearParameters() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // css::form::XDatabaseParameterBroadcaster - virtual void SAL_CALL addParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener) throw(css::uno::RuntimeException, std::exception) override; // css::container::XChild - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setParent(const css::uno::Reference< css::uno::XInterface >& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent(const css::uno::Reference< css::uno::XInterface >& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // css::form::XSubmit - virtual void SAL_CALL submit(const css::uno::Reference< css::awt::XControl >& aControl, const css::awt::MouseEvent& aMouseEvt) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addSubmitListener(const css::uno::Reference< css::form::XSubmitListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeSubmitListener(const css::uno::Reference< css::form::XSubmitListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL submit(const css::uno::Reference< css::awt::XControl >& aControl, const css::awt::MouseEvent& aMouseEvt) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addSubmitListener(const css::uno::Reference< css::form::XSubmitListener >& aListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeSubmitListener(const css::uno::Reference< css::form::XSubmitListener >& aListener) throw(css::uno::RuntimeException, std::exception) override; // css::awt::XTabControllerModel - virtual sal_Bool SAL_CALL getGroupControl() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setGroupControl(sal_Bool GroupControl) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setControlModels(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Controls) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > SAL_CALL getControlModels() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setGroup(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rGroup, const OUString& GroupName) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getGroupCount() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL getGroup(sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rGroup, OUString& Name) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL getGroupByName(const OUString& Name, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rGroup) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getGroupControl() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setGroupControl(sal_Bool GroupControl) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setControlModels(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Controls) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > SAL_CALL getControlModels() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setGroup(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rGroup, const OUString& GroupName) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getGroupCount() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL getGroup(sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rGroup, OUString& Name) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL getGroupByName(const OUString& Name, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rGroup) throw(css::uno::RuntimeException, std::exception) override; // css::lang::XComponent - virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& xListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& xListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) throw(css::uno::RuntimeException, std::exception) override; // css::beans::XFastPropertySet - virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const css::uno::Any& aValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const css::uno::Any& aValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // css::container::XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setName(const OUString& aName) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName(const OUString& aName) throw(css::uno::RuntimeException, std::exception) override; // css::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream >& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream >& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream >& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream >& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; // css::beans::XMultiPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues(const css::uno::Sequence< OUString >& aPropertyNames) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertiesChangeListener(const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertiesChangeListener(const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL firePropertiesChangeEvent(const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues(const css::uno::Sequence< OUString >& aPropertyNames) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener(const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener(const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firePropertiesChangeEvent(const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) throw(css::uno::RuntimeException, std::exception) override; // css::beans::XPropertySet - virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // css::util::XCancellable - virtual void SAL_CALL cancel() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel() throw(css::uno::RuntimeException, std::exception) override; // css::beans::XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates(const css::uno::Sequence< OUString >& aPropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyToDefault(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getPropertyDefault(const OUString& aPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates(const css::uno::Sequence< OUString >& aPropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyToDefault(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault(const OUString& aPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // css::form::XReset - virtual void SAL_CALL reset() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& aListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reset() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& aListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& aListener) throw(css::uno::RuntimeException, std::exception) override; // css::container::XNameContainer - virtual void SAL_CALL insertByName(const OUString& aName, const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeByName(const OUString& Name) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertByName(const OUString& aName, const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByName(const OUString& Name) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // css::container::XNameReplace - virtual void SAL_CALL replaceByName(const OUString& aName, const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL replaceByName(const OUString& aName, const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // css::container::XNameAccess - virtual css::uno::Any SAL_CALL getByName(const OUString& aName) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getByName(const OUString& aName) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw(css::uno::RuntimeException, std::exception) override; // css::container::XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override ; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // css::container::XIndexContainer - virtual void SAL_CALL insertByIndex(sal_Int32 _rIndex, const css::uno::Any& Element) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeByIndex(sal_Int32 _rIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertByIndex(sal_Int32 _rIndex, const css::uno::Any& Element) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByIndex(sal_Int32 _rIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // css::container::XIndexReplace - virtual void SAL_CALL replaceByIndex(sal_Int32 _rIndex, const css::uno::Any& Element) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL replaceByIndex(sal_Int32 _rIndex, const css::uno::Any& Element) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // css::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // css::container::XContainer - virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener >& xListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener >& xListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener >& xListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener >& xListener) throw(css::uno::RuntimeException, std::exception) override; // css::container::XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // css::lang::XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) override; // css::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override; protected: // container handling diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 5121ac52080e..9e8cfe1c4dd0 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -54,7 +54,7 @@ namespace dbaui void SetEndEditHdl(const Link<SvTreeListEntry*,bool>& _rHdl) { m_aEndEditHdl = _rHdl; } - virtual bool Select(SvTreeListEntry* pEntry, bool bSelect) SAL_OVERRIDE; + virtual bool Select(SvTreeListEntry* pEntry, bool bSelect) override; void enableSelectHandler(); void disableSelectHandler(); @@ -67,7 +67,7 @@ namespace dbaui } protected: - virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) SAL_OVERRIDE; + virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) override; private: using SvTreeListBox::Select; @@ -109,19 +109,19 @@ namespace dbaui sal_Int32 _nMaxColumnsInIndex ); virtual ~DbaIndexDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; //TO-DO, remove when all other OToolBoxHelper are converted to .ui - virtual void resizeControls(const Size&) SAL_OVERRIDE; + virtual void resizeControls(const Size&) override; /** will be called when the id of the image list needs to change @param _eBitmapSet <svtools/imgdef.hxx> */ - virtual void setImageList(sal_Int16 _eBitmapSet) SAL_OVERRIDE; + virtual void setImageList(sal_Int16 _eBitmapSet) override; protected: void fillIndexList(); void updateToolbox(); diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 207fd9cf6266..adbec31dbf3d 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -52,31 +52,31 @@ namespace dbaui public: IndexFieldsControl( vcl::Window* _pParent, WinBits nWinStyle); virtual ~IndexFieldsControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void Init(const css::uno::Sequence< OUString >& _rAvailableFields, sal_Int32 _nMaxColumnsInIndex,bool _bAddIndexAppendix); void initializeFrom(const IndexFields& _rFields); void commitTo(IndexFields& _rFields); - bool SaveModified() SAL_OVERRIDE; - bool IsModified() const SAL_OVERRIDE; + bool SaveModified() override; + bool IsModified() const override; const IndexFields& GetSavedValue() const { return m_aSavedValue; } void SaveValue() { m_aSavedValue = m_aFields; } void SetModifyHdl(const Link<>& _rHdl) { m_aModifyHdl = _rHdl; } - virtual OUString GetCellText(long _nRow,sal_uInt16 nColId) const SAL_OVERRIDE; + virtual OUString GetCellText(long _nRow,sal_uInt16 nColId) const override; protected: // EditBrowseBox overridables - virtual void PaintCell( OutputDevice& _rDev, const Rectangle& _rRect, sal_uInt16 _nColumnId ) const SAL_OVERRIDE; - virtual bool SeekRow(long nRow) SAL_OVERRIDE; - virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) SAL_OVERRIDE; - virtual bool IsTabAllowed(bool bForward) const SAL_OVERRIDE; + virtual void PaintCell( OutputDevice& _rDev, const Rectangle& _rRect, sal_uInt16 _nColumnId ) const override; + virtual bool SeekRow(long nRow) override; + virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) override; + virtual bool IsTabAllowed(bool bForward) const override; - ::svt::CellController* GetController(long _nRow, sal_uInt16 _nColumnId) SAL_OVERRIDE; - void InitController(::svt::CellControllerRef&, long _nRow, sal_uInt16 _nColumnId) SAL_OVERRIDE; + ::svt::CellController* GetController(long _nRow, sal_uInt16 _nColumnId) override; + void InitController(::svt::CellControllerRef&, long _nRow, sal_uInt16 _nColumnId) override; protected: OUString GetRowCellText(const IndexFields::const_iterator& _rRow,sal_uInt16 nColId) const; diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx index d632d0da07f0..68e911776f5e 100644 --- a/dbaccess/source/ui/inc/listviewitems.hxx +++ b/dbaccess/source/ui/inc/listviewitems.hxx @@ -39,11 +39,11 @@ namespace dbaui { } - virtual sal_uInt16 GetType() const SAL_OVERRIDE; + virtual sal_uInt16 GetType() const override; virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext, - const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) SAL_OVERRIDE; - virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* _pViewData) SAL_OVERRIDE; + const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; + virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* _pViewData) override; bool isEmphasized() const { return m_bEmphasized; } void emphasize(bool _bEmphasize) { m_bEmphasized = _bEmphasize; } diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx index 889716f641ed..08b1886acb8e 100644 --- a/dbaccess/source/ui/inc/marktree.hxx +++ b/dbaccess/source/ui/inc/marktree.hxx @@ -40,17 +40,17 @@ class OMarkableTreeListBox : public DBTreeListBox public: OMarkableTreeListBox( vcl::Window* pParent, WinBits nWinStyle=0 ); virtual ~OMarkableTreeListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void CheckButtonHdl() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void CheckButtonHdl() override; void CheckButtons(); // make the button states consistent (bottom-up) /// the handler given is called whenever the check state of one or more items changed void SetCheckHandler(const Link<>& _rHdl) { m_aCheckButtonHandler = _rHdl; } protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect) override; virtual void checkedButton_noBroadcast(SvTreeListEntry* _pEntry); SvButtonState implDetermineState(SvTreeListEntry* _pEntry); diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index b51b6c6ec04f..5b4515c1834c 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -62,7 +62,7 @@ namespace dbaui OUString GetSelectedDocumentFilter() const; protected: - virtual void RequestHelp( const HelpEvent& _rHEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& _rHEvt ) override; StringPair impl_getDocumentAtIndex( sal_uInt16 _nListIndex, bool _bSystemNotation = false ) const; diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index 19addb46e505..424191dfae01 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -84,7 +84,7 @@ namespace dbaui const css::uno::Reference< css::sdbc::XConnection > & _rxConnection, const css::uno::Reference< css::uno::XComponentContext >& rxContext); virtual ~OParameterDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; css::uno::Sequence< css::beans::PropertyValue > getValues() const { return m_aFinalValues; } diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx index 0c8c49f7462b..311cd7253fb4 100644 --- a/dbaccess/source/ui/inc/propertysetitem.hxx +++ b/dbaccess/source/ui/inc/propertysetitem.hxx @@ -40,8 +40,8 @@ namespace dbaui const css::uno::Reference< css::beans::XPropertySet >& _rxSet); OPropertySetItem(const OPropertySetItem& _rSource); - virtual bool operator==(const SfxPoolItem& _rItem) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const SAL_OVERRIDE; + virtual bool operator==(const SfxPoolItem& _rItem) const override; + virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index 80aef5ec0c22..e28ba481fa10 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -50,11 +50,11 @@ namespace dbaui public: OQueryContainerWindow(vcl::Window* pParent, OQueryController& _rController,const css::uno::Reference< css::uno::XComponentContext >&); virtual ~OQueryContainerWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Construct() SAL_OVERRIDE; + virtual void Construct() override; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; // show the beamer void showPreview(const css::uno::Reference< css::frame::XFrame >& _xFrame); @@ -82,21 +82,21 @@ namespace dbaui OUString getStatement() { return m_pViewSwitch->getStatement( ); } void setStatement( const OUString& _rsStatement ) { m_pViewSwitch->setStatement( _rsStatement ); } - void initialize() SAL_OVERRIDE { m_pViewSwitch->initialize(); } + void initialize() override { m_pViewSwitch->initialize(); } void SaveUIConfig() { m_pViewSwitch->SaveUIConfig(); } bool reset( ::dbtools::SQLExceptionInfo* _pErrorInfo ) { return m_pViewSwitch->reset( _pErrorInfo ); } bool switchView( ::dbtools::SQLExceptionInfo* _pErrorInfo ); void forceInitialView(); - virtual void GetFocus() SAL_OVERRIDE; + virtual void GetFocus() override; protected: // re-arrange the controls belonging to the document itself - virtual void resizeAll( const Rectangle& _rPlayground ) SAL_OVERRIDE; + virtual void resizeAll( const Rectangle& _rPlayground ) override; // arrange derived classes controls in the rectangle given - virtual void resizeDocumentView(Rectangle& _rPlayground) SAL_OVERRIDE; + virtual void resizeDocumentView(Rectangle& _rPlayground) override; }; // end of temp classes diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index cf9c2aefc39d..fd18022a3878 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -115,14 +115,14 @@ namespace dbaui protected: // all the features which should be handled by this class - virtual void describeSupportedFeatures() SAL_OVERRIDE; + virtual void describeSupportedFeatures() override; // state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const SAL_OVERRIDE; + virtual FeatureState GetState(sal_uInt16 nId) const override; // execute a feature - virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; - virtual void reconnect( bool _bUI ) SAL_OVERRIDE; - virtual OUString getPrivateTitle( ) const SAL_OVERRIDE; + virtual void reconnect( bool _bUI ) override; + virtual OUString getPrivateTitle( ) const override; OQueryContainerWindow* getContainer() const { return static_cast< OQueryContainerWindow* >( getView() ); } @@ -135,7 +135,7 @@ namespace dbaui void clearFields(); - virtual void impl_onModifyChanged() SAL_OVERRIDE; + virtual void impl_onModifyChanged() override; // should the statement be parsed by our own sql parser bool isEscapeProcessing() const { return m_bEscapeProcessing; } @@ -160,22 +160,22 @@ namespace dbaui ::connectivity::OSQLParser& getParser() { return m_aSqlParser; } ::connectivity::OSQLParseTreeIterator& getParseIterator() { return *m_pSqlIterator; } - virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) override; DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) // XPropertySet - virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; // css::lang::XComponent - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // need by registration static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); @@ -183,13 +183,13 @@ namespace dbaui SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XController - virtual css::uno::Any SAL_CALL getViewData() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL restoreViewData(const css::uno::Any& Data) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getViewData() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL restoreViewData(const css::uno::Any& Data) throw( css::uno::RuntimeException, std::exception ) override; private: - virtual void onLoadedMenu(const css::uno::Reference< css::frame::XLayoutManager >& _xLayoutManager) SAL_OVERRIDE; + virtual void onLoadedMenu(const css::uno::Reference< css::frame::XLayoutManager >& _xLayoutManager) override; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue( @@ -197,21 +197,21 @@ namespace dbaui css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue - ) throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; + ) throw (css::lang::IllegalArgumentException) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue - ) throw (css::uno::Exception, std::exception ) SAL_OVERRIDE; + ) throw (css::uno::Exception, std::exception ) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle - ) const SAL_OVERRIDE; + ) const override; - virtual OJoinDesignView* getJoinView() SAL_OVERRIDE; + virtual OJoinDesignView* getJoinView() override; // ask the user if the design should be saved when it is modified - virtual short saveModified() SAL_OVERRIDE; - virtual void reset() SAL_OVERRIDE; - virtual void impl_initialize() SAL_OVERRIDE; + virtual short saveModified() override; + virtual void reset() override; + virtual void impl_initialize() override; void impl_reset( const bool i_bIgnoreQuerySettings = false ); /// tells the user that we needed to switch to SQL view automatically @@ -227,8 +227,8 @@ namespace dbaui void setEscapeProcessing_fireEvent( const bool _bEscapeProcessing ); // OJoinController overridables - virtual bool allowViews() const SAL_OVERRIDE; - virtual bool allowQueries() const SAL_OVERRIDE; + virtual bool allowViews() const override; + virtual bool allowQueries() const override; private: DECL_LINK_TYPED( OnExecuteAddTable, void*, void ); diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index 3347734bfcd0..1b7a2ed960b1 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -113,7 +113,7 @@ namespace dbaui const css::uno::Reference< css::container::XNameAccess>& _rxCols ); virtual ~DlgFilterCrit(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void BuildWherePart(); diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index 6b086812e1d9..7bfc7d834f68 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -84,7 +84,7 @@ namespace dbaui const css::uno::Reference< css::sdb::XSingleSelectQueryComposer>& _rxComposer, const css::uno::Reference< css::container::XNameAccess>& _rxCols); virtual ~DlgOrderCrit(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void BuildOrderPart(); diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx index 8b2730fd5f1b..4ab846f38260 100644 --- a/dbaccess/source/ui/inc/queryview.hxx +++ b/dbaccess/source/ui/inc/queryview.hxx @@ -38,7 +38,7 @@ namespace dbaui // clears the whole query virtual void clear() = 0; // set the view readonly or not - virtual void setReadOnly(bool _bReadOnly) SAL_OVERRIDE = 0; + virtual void setReadOnly(bool _bReadOnly) override = 0; // set the statement for representation virtual void setStatement(const OUString& _rsStatement) = 0; // returns the current sql statement diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 22b63a3cef2d..7247b80c9b65 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -62,15 +62,15 @@ namespace dbaui // UNO DECLARE_UNO3_DEFAULTS(SbaXGridControl, FmXGridControl) - virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; // css::lang::XServiceInfo - OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + OUString SAL_CALL getImplementationName() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; // need by registration static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); @@ -78,17 +78,17 @@ namespace dbaui SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // css::frame::XDispatch - virtual void SAL_CALL dispatch(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispatch(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) override; // css::lang::XComponent - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit > & rToolkit, const css::uno::Reference< css::awt::XWindowPeer > & rParentPeer) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit > & rToolkit, const css::uno::Reference< css::awt::XWindowPeer > & rParentPeer) throw( css::uno::RuntimeException, std::exception ) override; protected: - virtual FmXGridPeer* imp_CreatePeer(vcl::Window* pParent) SAL_OVERRIDE; + virtual FmXGridPeer* imp_CreatePeer(vcl::Window* pParent) override; }; // SbaXGridPeer @@ -105,29 +105,29 @@ namespace dbaui virtual ~SbaXGridPeer(); // UNO - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { FmXGridPeer::acquire(); } - virtual void SAL_CALL release() throw() SAL_OVERRIDE { FmXGridPeer::release(); } - virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() override { FmXGridPeer::acquire(); } + virtual void SAL_CALL release() throw() override { FmXGridPeer::release(); } + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override; static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); - sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 > & rId ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 > & rId ) throw (css::uno::RuntimeException, std::exception) override; static SbaXGridPeer* getImplementation(const css::uno::Reference< css::uno::XInterface>& _rxIFace); // css::frame::XDispatch - virtual void SAL_CALL dispatch(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispatch(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) override; // css::frame::XDispatchProvider - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( css::uno::RuntimeException, std::exception ) override; // css::lang::XComponent - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; protected: - virtual VclPtr<FmGridControl> imp_CreateControl(vcl::Window* pParent, WinBits nStyle) SAL_OVERRIDE; + virtual VclPtr<FmGridControl> imp_CreateControl(vcl::Window* pParent, WinBits nStyle) override; #ifdef _MSC_VER typedef css::frame::XStatusListener xstlist_type; typedef css::uno::Reference< xstlist_type > xlistener_type; @@ -174,15 +174,15 @@ namespace dbaui protected: // FmGridHeader overridables - virtual void PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu) SAL_OVERRIDE; - virtual void PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMenu& rMenu, sal_uInt16 nExecutionResult) SAL_OVERRIDE; + virtual void PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu) override; + virtual void PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMenu& rMenu, sal_uInt16 nExecutionResult) override; private: // DragSourceHelper overridables - virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) override; // Window overridables - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; bool ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMousePos); @@ -228,15 +228,15 @@ namespace dbaui public: SbaGridControl(css::uno::Reference< css::uno::XComponentContext >,Window* pParent, FmXGridPeer* _pPeer, WinBits nBits = WB_TABSTOP); virtual ~SbaGridControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void Select() SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void Select() override; void SetMasterListener(SbaGridListener* pListener) { m_pMasterListener = pListener; } - virtual void ActivateCell(long nRow, sal_uInt16 nCol, bool bSetCellFocus = true) SAL_OVERRIDE; - virtual void DeactivateCell(bool bUpdate = true) SAL_OVERRIDE; + virtual void ActivateCell(long nRow, sal_uInt16 nCol, bool bSetCellFocus = true) override; + virtual void DeactivateCell(bool bUpdate = true) override; void ActivateCell() { FmGridControl::ActivateCell(); } bool IsAllSelected() const { return (GetSelectRowCount() == GetRowCount()) && (GetRowCount() > 0); } @@ -251,9 +251,9 @@ namespace dbaui @return The description of the specified object. */ - virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const SAL_OVERRIDE; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override; - virtual void DeleteSelectedRows() SAL_OVERRIDE; + virtual void DeleteSelectedRows() override; /** copies the currently selected rows to the clipboard @precond at least one row is selected @@ -262,25 +262,25 @@ namespace dbaui protected: // DragSourceHelper overridables - virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) override; // BrowseBox overridables - virtual void CursorMoved() SAL_OVERRIDE; - virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const BrowserMouseEvent& rMEvt) SAL_OVERRIDE; + virtual void CursorMoved() override; + virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ) override; + virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) override; + virtual void MouseButtonDown( const BrowserMouseEvent& rMEvt) override; // EditBrowseBox overridables - virtual VclPtr<BrowserHeader> imp_CreateHeaderBar(BrowseBox* pParent) SAL_OVERRIDE; - virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol) SAL_OVERRIDE; + virtual VclPtr<BrowserHeader> imp_CreateHeaderBar(BrowseBox* pParent) override; + virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol) override; // DbGridControl overridables - virtual void PreExecuteRowContextMenu(sal_uInt16 nRow, PopupMenu& rMenu) SAL_OVERRIDE; - virtual void PostExecuteRowContextMenu(sal_uInt16 nRow, const PopupMenu& rMenu, sal_uInt16 nExecutionResult) SAL_OVERRIDE; + virtual void PreExecuteRowContextMenu(sal_uInt16 nRow, PopupMenu& rMenu) override; + virtual void PostExecuteRowContextMenu(sal_uInt16 nRow, const PopupMenu& rMenu, sal_uInt16 nExecutionResult) override; // DbGridControl overridables - virtual void onRowChange() SAL_OVERRIDE; - virtual void onColumnChange() SAL_OVERRIDE; + virtual void onRowChange() override; + virtual void onColumnChange() override; // my own overridables void BeforeDrop(); diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx index 0d88cdb2ca42..c5b097de4db0 100644 --- a/dbaccess/source/ui/inc/sbamultiplex.hxx +++ b/dbaccess/source/ui/inc/sbamultiplex.hxx @@ -55,8 +55,8 @@ namespace dbaui public: OSbaWeakSubObject(::cppu::OWeakObject& rParent) : m_rParent(rParent) { } - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { m_rParent.acquire(); } - virtual void SAL_CALL release() throw() SAL_OVERRIDE { m_rParent.release(); } + virtual void SAL_CALL acquire() throw() override { m_rParent.acquire(); } + virtual void SAL_CALL release() throw() override { m_rParent.release(); } }; // declaration of a listener multiplexer class @@ -71,16 +71,16 @@ namespace dbaui ::osl::Mutex& rMutex); \ DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject) \ virtual css::uno::Any SAL_CALL queryInterface( \ - const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; \ \ /* css::lang::XEventListener */ \ - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) override; \ #define DECLARE_MULTIPLEXER_VOID_METHOD(methodname, eventtype) \ - virtual void SAL_CALL methodname(const eventtype& e) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + virtual void SAL_CALL methodname(const eventtype& e) throw (css::uno::RuntimeException, std::exception) override; \ #define DECLARE_MULTIPLEXER_BOOL_METHOD(methodname, eventtype) \ - virtual sal_Bool SAL_CALL methodname(const eventtype& e) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + virtual sal_Bool SAL_CALL methodname(const eventtype& e) throw (css::uno::RuntimeException, std::exception) override; \ #define END_DECLARE_LISTENER_MULTIPLEXER() \ /* resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators */ \ @@ -192,12 +192,12 @@ namespace dbaui classname( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); \ DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject) \ virtual css::uno::Any SAL_CALL queryInterface( \ - const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; \ \ /* css::lang::XEventListener */ \ - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) override; \ \ - virtual void SAL_CALL methodname(const eventtype& e) throw exceptions SAL_OVERRIDE; \ + virtual void SAL_CALL methodname(const eventtype& e) throw exceptions override; \ \ public: \ void addInterface(const OUString& rName, const css::uno::Reference< css::uno::XInterface >& rListener); \ diff --git a/dbaccess/source/ui/inc/singledoccontroller.hxx b/dbaccess/source/ui/inc/singledoccontroller.hxx index 1e3a8d97026c..984e6c45d2af 100644 --- a/dbaccess/source/ui/inc/singledoccontroller.hxx +++ b/dbaccess/source/ui/inc/singledoccontroller.hxx @@ -44,7 +44,7 @@ namespace dbaui virtual ~OSingleDocumentController(); // OComponentHelper - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; public: /// need for undo's and redo's @@ -60,14 +60,14 @@ namespace dbaui void addUndoActionAndInvalidate( SfxUndoAction* pAction ); // OGenericUnoController - virtual FeatureState GetState( sal_uInt16 nId ) const SAL_OVERRIDE; - virtual void Execute( sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs ) SAL_OVERRIDE; + virtual FeatureState GetState( sal_uInt16 nId ) const override; + virtual void Execute( sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs ) override; // XUndoManagerSupplier - virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager( ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; private: ::std::unique_ptr< OSingleDocumentController_Data > m_pData; diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index d33b0379eb9e..a11d636e817b 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -58,18 +58,18 @@ namespace dbaui void ImplSetFont(); protected: - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void GetFocus() override; DECL_LINK(ModifyHdl, void*); public: OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle = WB_LEFT | WB_VSCROLL |WB_BORDER); virtual ~OSqlEdit(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // Edit overridables - virtual void SetText(const OUString& rNewText) SAL_OVERRIDE; + virtual void SetText(const OUString& rNewText) override; using MultiLineEditSyntaxHighlight::SetText; // own functionality @@ -81,7 +81,7 @@ namespace dbaui void stopTimer(); void startTimer(); - virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE; + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) override; using MultiLineEditSyntaxHighlight::Notify; }; } diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index d8987a3b9026..e4a7e8f6069c 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -90,7 +90,7 @@ public: const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL ); virtual ~OSQLMessageBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: void Construct( WinBits nStyle, MessageType eImage ); diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index e4f589e80d59..84395bd42c51 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -40,8 +40,8 @@ public: OStringListItem(sal_Int16 nWhich, const css::uno::Sequence< OUString >& _rList); OStringListItem(const OStringListItem& _rSource); - virtual bool operator==(const SfxPoolItem& _rItem) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const SAL_OVERRIDE; + virtual bool operator==(const SfxPoolItem& _rItem) const override; + virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const override; css::uno::Sequence< OUString > getList() const { return m_aList; } }; diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index fdd64f5c0dd4..adc390ba7f05 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -122,9 +122,9 @@ public: static bool isWildcardChecked(SvTreeListEntry* _pEntry); protected: - virtual void InitEntry(SvTreeListEntry* _pEntry, const OUString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind) SAL_OVERRIDE; + virtual void InitEntry(SvTreeListEntry* _pEntry, const OUString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind) override; - virtual void checkedButton_noBroadcast(SvTreeListEntry* _pEntry) SAL_OVERRIDE; + virtual void checkedButton_noBroadcast(SvTreeListEntry* _pEntry) override; void implEmphasize(SvTreeListEntry* _pEntry, bool _bChecked, bool _bUpdateDescendants = true, bool _bUpdateAncestors = true); diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx index 82845985dcd3..eb57f1a442c7 100644 --- a/dbaccess/source/ui/inc/textconnectionsettings.hxx +++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx @@ -39,14 +39,14 @@ namespace dbaui public: TextConnectionSettingsDialog( vcl::Window* _pParent, SfxItemSet& _rItems ); virtual ~TextConnectionSettingsDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /** initializes a set of PropertyStorage instances, which are bound to the text-connection relevant items in our item sets */ static void bindItemStorages( SfxItemSet& _rSet, PropertyValues& _rValues ); - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; private: VclPtr<OTextConnectionHelper> m_pTextConnectionHelper; diff --git a/dbaccess/source/ui/inc/toolboxcontroller.hxx b/dbaccess/source/ui/inc/toolboxcontroller.hxx index dd34ce07315f..3e76fc23c8e9 100644 --- a/dbaccess/source/ui/inc/toolboxcontroller.hxx +++ b/dbaccess/source/ui/inc/toolboxcontroller.hxx @@ -46,18 +46,18 @@ namespace dbaui OToolboxController(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; // XServiceInfo DECLARE_SERVICE_INFO_STATIC(); // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XToolbarController - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override; }; } // dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX diff --git a/dbaccess/source/ui/inc/undosqledit.hxx b/dbaccess/source/ui/inc/undosqledit.hxx index 66a2f48795c3..2309ba1176a2 100644 --- a/dbaccess/source/ui/inc/undosqledit.hxx +++ b/dbaccess/source/ui/inc/undosqledit.hxx @@ -33,8 +33,8 @@ namespace dbaui VclPtr<OSqlEdit> m_pOwner; OUString m_strNextText; - virtual void Undo() SAL_OVERRIDE { ToggleText(); } - virtual void Redo() SAL_OVERRIDE { ToggleText(); } + virtual void Undo() override { ToggleText(); } + virtual void Redo() override { ToggleText(); } void ToggleText(); public: diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx index 2238680c9b9b..b30de4afe0f3 100644 --- a/dbaccess/source/ui/inc/unoadmin.hxx +++ b/dbaccess/source/ui/inc/unoadmin.hxx @@ -53,8 +53,8 @@ protected: virtual ~ODatabaseAdministrationDialog(); protected: // OGenericUnoDialog overridables - virtual void destroyDialog() SAL_OVERRIDE; - virtual void implInitialize(const css::uno::Any& _rValue) SAL_OVERRIDE; + virtual void destroyDialog() override; + virtual void implInitialize(const css::uno::Any& _rValue) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 2fb4e710abbe..61f5c70412da 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -115,7 +115,7 @@ namespace dbaui ::boost::optional< bool > m_aDocScriptSupport; // relevant if and only if we are associated with exactly one DBDoc - virtual OUString getPrivateTitle( ) const SAL_OVERRIDE; + virtual OUString getPrivateTitle( ) const override; // attribute access public: SbaTableQueryBrowser(const css::uno::Reference< css::uno::XComponentContext >& _rM); @@ -147,104 +147,104 @@ namespace dbaui DECLARE_UNO3_DEFAULTS(SbaTableQueryBrowser,SbaXDataBrowserController) // late construction - virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; // css::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override; // css::frame::XController - virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL attachFrame(const css::uno::Reference< css::frame::XFrame > & xFrame) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL attachFrame(const css::uno::Reference< css::frame::XFrame > & xFrame) throw( css::uno::RuntimeException, std::exception ) override; // css::lang::XComponent - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; // XSelectionSupplier - virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getSelection( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getSelection( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XContainerListener - virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; // css::frame::XFrameActionListener - virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override; //IController - virtual void notifyHiContrastChanged() SAL_OVERRIDE; + virtual void notifyHiContrastChanged() override; // XScriptInvocationContext - virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception) override; // XContextMenuInterception - virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override; // XDatabaseRegistrationsListener - virtual void SAL_CALL registeredDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL revokedDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL changedDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL registeredDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL revokedDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changedDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; protected: // SbaXDataBrowserController overridables - virtual bool InitializeForm( const css::uno::Reference< css::beans::XPropertySet >& i_formProperties ) SAL_OVERRIDE; - virtual bool InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid) SAL_OVERRIDE; + virtual bool InitializeForm( const css::uno::Reference< css::beans::XPropertySet >& i_formProperties ) override; + virtual bool InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid) override; - virtual bool preReloadForm() SAL_OVERRIDE; - virtual void postReloadForm() SAL_OVERRIDE; + virtual bool preReloadForm() override; + virtual void postReloadForm() override; - virtual void addModelListeners(const css::uno::Reference< css::awt::XControlModel > & _xGridControlModel) SAL_OVERRIDE; - virtual void removeModelListeners(const css::uno::Reference< css::awt::XControlModel > & _xGridControlModel) SAL_OVERRIDE; + virtual void addModelListeners(const css::uno::Reference< css::awt::XControlModel > & _xGridControlModel) override; + virtual void removeModelListeners(const css::uno::Reference< css::awt::XControlModel > & _xGridControlModel) override; - virtual void AddColumnListener(const css::uno::Reference< css::beans::XPropertySet > & xCol) SAL_OVERRIDE; - virtual void RemoveColumnListener(const css::uno::Reference< css::beans::XPropertySet > & xCol) SAL_OVERRIDE; + virtual void AddColumnListener(const css::uno::Reference< css::beans::XPropertySet > & xCol) override; + virtual void RemoveColumnListener(const css::uno::Reference< css::beans::XPropertySet > & xCol) override; - virtual void LoadFinished(bool _bWasSynch) SAL_OVERRIDE; + virtual void LoadFinished(bool _bWasSynch) override; - virtual void criticalFail() SAL_OVERRIDE; + virtual void criticalFail() override; - virtual void describeSupportedFeatures() SAL_OVERRIDE; - virtual FeatureState GetState(sal_uInt16 nId) const SAL_OVERRIDE; - virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void describeSupportedFeatures() override; + virtual FeatureState GetState(sal_uInt16 nId) const override; + virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; // IControlActionListener overridables - virtual bool requestQuickHelp( const SvTreeListEntry* _pEntry, OUString& _rText ) const SAL_OVERRIDE; - virtual bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ) SAL_OVERRIDE; - virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ) SAL_OVERRIDE; - virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ) SAL_OVERRIDE; + virtual bool requestQuickHelp( const SvTreeListEntry* _pEntry, OUString& _rText ) const override; + virtual bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ) override; + virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ) override; + virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ) override; // IContextMenuProvider - virtual PopupMenu* getContextMenu( Control& _rControl ) const SAL_OVERRIDE; - virtual IController& getCommandController() SAL_OVERRIDE; + virtual PopupMenu* getContextMenu( Control& _rControl ) const override; + virtual IController& getCommandController() override; virtual ::cppu::OInterfaceContainerHelper* - getContextMenuInterceptors() SAL_OVERRIDE; + getContextMenuInterceptors() override; virtual css::uno::Any - getCurrentSelection( Control& _rControl ) const SAL_OVERRIDE; + getCurrentSelection( Control& _rControl ) const override; - virtual void impl_initialize() SAL_OVERRIDE; + virtual void impl_initialize() override; // SbaGridListener overridables - virtual void RowChanged() SAL_OVERRIDE; - virtual void ColumnChanged() SAL_OVERRIDE; - virtual void SelectionChanged() SAL_OVERRIDE; + virtual void RowChanged() override; + virtual void ColumnChanged() override; + virtual void SelectionChanged() override; // methods for showing/hiding the explorer part bool haveExplorer() const; @@ -260,7 +260,7 @@ namespace dbaui // select the path of the entry (which must be an entry without children) void selectPath(SvTreeListEntry* _pEntry, bool _bSelect = true); - virtual void loadMenu(const css::uno::Reference< css::frame::XFrame >& _xFrame) SAL_OVERRIDE; + virtual void loadMenu(const css::uno::Reference< css::frame::XFrame >& _xFrame) override; private: // check the state of the external slot given, update any UI elements if necessary diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index c365565cffdf..a2e516757c5f 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -44,11 +44,11 @@ protected: public: // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - static methods static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); @@ -57,21 +57,21 @@ public: SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; protected: - virtual void SAL_CALL initialize(css::uno::Sequence< css::uno::Any > const & args) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize(css::uno::Sequence< css::uno::Any > const & args) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // OPropertySetHelper overridables // (overwrittin these three, because we have some special handling for our property) - virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue) throw(css::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue) throw(css::lang::IllegalArgumentException) override; // OGenericUnoDialog overridables - virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE; + virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx index 1f3d28b3d486..54f9569d38bf 100644 --- a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx +++ b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx @@ -40,39 +40,39 @@ namespace dbaui { } virtual ~ORowUpdateHelper() {} - virtual void updateString(sal_Int32 _nPos, const OUString& _sValue) SAL_OVERRIDE + virtual void updateString(sal_Int32 _nPos, const OUString& _sValue) override { m_xRowUpdate->updateString(_nPos, _sValue); } - virtual void updateDouble(sal_Int32 _nPos,const double& _nValue) SAL_OVERRIDE + virtual void updateDouble(sal_Int32 _nPos,const double& _nValue) override { m_xRowUpdate->updateDouble(_nPos, _nValue); } - virtual void updateDate(sal_Int32 _nPos,const css::util::Date& _nValue) SAL_OVERRIDE + virtual void updateDate(sal_Int32 _nPos,const css::util::Date& _nValue) override { m_xRowUpdate->updateDate(_nPos, _nValue); } - virtual void updateTime(sal_Int32 _nPos,const css::util::Time& _nValue) SAL_OVERRIDE + virtual void updateTime(sal_Int32 _nPos,const css::util::Time& _nValue) override { m_xRowUpdate->updateTime(_nPos, _nValue); } - virtual void updateTimestamp(sal_Int32 _nPos,const css::util::DateTime& _nValue) SAL_OVERRIDE + virtual void updateTimestamp(sal_Int32 _nPos,const css::util::DateTime& _nValue) override { m_xRowUpdate->updateTimestamp(_nPos, _nValue); } - virtual void updateInt(sal_Int32 _nPos,const sal_Int32& _nValue) SAL_OVERRIDE + virtual void updateInt(sal_Int32 _nPos,const sal_Int32& _nValue) override { m_xRowUpdate->updateInt(_nPos, _nValue); } - virtual void updateNull(sal_Int32 _nPos, ::sal_Int32) SAL_OVERRIDE + virtual void updateNull(sal_Int32 _nPos, ::sal_Int32) override { m_xRowUpdate->updateNull(_nPos); } - virtual void moveToInsertRow() SAL_OVERRIDE + virtual void moveToInsertRow() override { m_xResultSetUpdate->moveToInsertRow(); } - virtual void insertRow() SAL_OVERRIDE + virtual void insertRow() override { m_xResultSetUpdate->insertRow(); } @@ -90,38 +90,38 @@ namespace dbaui { } virtual ~OParameterUpdateHelper() {} - virtual void updateString(sal_Int32 _nPos, const OUString& _sValue) SAL_OVERRIDE + virtual void updateString(sal_Int32 _nPos, const OUString& _sValue) override { m_xParameters->setString(_nPos, _sValue); } - virtual void updateDouble(sal_Int32 _nPos,const double& _nValue) SAL_OVERRIDE + virtual void updateDouble(sal_Int32 _nPos,const double& _nValue) override { m_xParameters->setDouble(_nPos, _nValue); } - virtual void updateDate(sal_Int32 _nPos,const css::util::Date& _nValue) SAL_OVERRIDE + virtual void updateDate(sal_Int32 _nPos,const css::util::Date& _nValue) override { m_xParameters->setDate(_nPos, _nValue); } - virtual void updateTime(sal_Int32 _nPos,const css::util::Time& _nValue) SAL_OVERRIDE + virtual void updateTime(sal_Int32 _nPos,const css::util::Time& _nValue) override { m_xParameters->setTime(_nPos, _nValue); } - virtual void updateTimestamp(sal_Int32 _nPos,const css::util::DateTime& _nValue) SAL_OVERRIDE + virtual void updateTimestamp(sal_Int32 _nPos,const css::util::DateTime& _nValue) override { m_xParameters->setTimestamp(_nPos, _nValue); } - virtual void updateInt(sal_Int32 _nPos,const sal_Int32& _nValue) SAL_OVERRIDE + virtual void updateInt(sal_Int32 _nPos,const sal_Int32& _nValue) override { m_xParameters->setInt(_nPos, _nValue); } - virtual void updateNull(sal_Int32 _nPos, ::sal_Int32 sqlType) SAL_OVERRIDE + virtual void updateNull(sal_Int32 _nPos, ::sal_Int32 sqlType) override { m_xParameters->setNull(_nPos,sqlType); } - virtual void moveToInsertRow() SAL_OVERRIDE + virtual void moveToInsertRow() override { } - virtual void insertRow() SAL_OVERRIDE + virtual void insertRow() override { m_xPrepared->executeUpdate(); } diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 8ab22d6d4fa2..22c3c29ab07c 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -408,18 +408,18 @@ public: static const DummyCopySource& Instance(); // ICopyTableSourceObject overridables - virtual OUString getQualifiedObjectName() const SAL_OVERRIDE; - virtual bool isView() const SAL_OVERRIDE; - virtual void copyUISettingsTo( const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; - virtual void copyFilterAndSortingTo(const css::uno::Reference< css::sdbc::XConnection >& _xConnection, const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const SAL_OVERRIDE; + virtual OUString getQualifiedObjectName() const override; + virtual bool isView() const override; + virtual void copyUISettingsTo( const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const override; + virtual void copyFilterAndSortingTo(const css::uno::Reference< css::sdbc::XConnection >& _xConnection, const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) const override; virtual css::uno::Sequence< OUString > - getColumnNames() const SAL_OVERRIDE; + getColumnNames() const override; virtual css::uno::Sequence< OUString > - getPrimaryKeyColumnNames() const SAL_OVERRIDE; - virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const SAL_OVERRIDE; - virtual OUString getSelectStatement() const SAL_OVERRIDE; + getPrimaryKeyColumnNames() const override; + virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const override; + virtual OUString getSelectStatement() const override; virtual ::utl::SharedUNOComponent< XPreparedStatement > - getPreparedSelectStatement() const SAL_OVERRIDE; + getPreparedSelectStatement() const override; }; const DummyCopySource& DummyCopySource::Instance() diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 9fb7ad10ff64..a32640c471df 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -341,7 +341,7 @@ public: } virtual void Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext, - const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) SAL_OVERRIDE; + const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; }; void OColumnString::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::RenderContext& rRenderContext, diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx index 55a73e38d669..f10b18cf92b9 100644 --- a/dbaccess/source/ui/misc/controllerframe.cxx +++ b/dbaccess/source/ui/misc/controllerframe.cxx @@ -79,16 +79,16 @@ namespace dbaui virtual ~FrameWindowActivationListener(); // XTopWindowListener - virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; private: void impl_checkDisposed_throw() const; diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx b/dbaccess/source/ui/misc/dbaundomanager.cxx index 35a943dd441d..873b8fab3a83 100644 --- a/dbaccess/source/ui/misc/dbaundomanager.cxx +++ b/dbaccess/source/ui/misc/dbaundomanager.cxx @@ -76,8 +76,8 @@ namespace dbaui ::framework::UndoManagerHelper aUndoHelper; // IUndoManagerImplementation - virtual ::svl::IUndoManager& getImplUndoManager() SAL_OVERRIDE; - virtual Reference< XUndoManager > getThis() SAL_OVERRIDE; + virtual ::svl::IUndoManager& getImplUndoManager() override; + virtual Reference< XUndoManager > getThis() override; }; ::svl::IUndoManager& UndoManager_Impl::getImplUndoManager() @@ -101,8 +101,8 @@ namespace dbaui virtual ~OslMutexFacade() {} - virtual void acquire() SAL_OVERRIDE; - virtual void release() SAL_OVERRIDE; + virtual void acquire() override; + virtual void release() override; private: ::osl::Mutex& m_rMutex; @@ -137,8 +137,8 @@ namespace dbaui } // IMutexGuard - virtual void clear() SAL_OVERRIDE; - virtual ::framework::IMutex& getGuardedMutex() SAL_OVERRIDE; + virtual void clear() override; + virtual ::framework::IMutex& getGuardedMutex() override; private: ::osl::ResettableMutexGuard m_aGuard; diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 312750b5c09f..a6324ffd7ceb 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -88,12 +88,12 @@ public: // IAddTableDialogContext virtual css::uno::Reference< css::sdbc::XConnection > - getConnection() const SAL_OVERRIDE; - virtual bool allowViews() const SAL_OVERRIDE; - virtual bool allowQueries() const SAL_OVERRIDE; - virtual bool allowAddition() const SAL_OVERRIDE; - virtual void addTableWindow( const OUString& _rQualifiedTableName, const OUString& _rAliasName ) SAL_OVERRIDE; - virtual void onWindowClosing( const vcl::Window* _pWindow ) SAL_OVERRIDE; + getConnection() const override; + virtual bool allowViews() const override; + virtual bool allowQueries() const override; + virtual bool allowAddition() const override; + virtual void addTableWindow( const OUString& _rQualifiedTableName, const OUString& _rAliasName ) override; + virtual void onWindowClosing( const vcl::Window* _pWindow ) override; private: OJoinTableView* getTableView() const; diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx index 9561f1dfd36e..a40ca30dd8bc 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx @@ -38,7 +38,7 @@ namespace dbaui protected: // for creation and duplication of lines of own type - virtual OConnectionLineDataRef CreateLineDataObj() SAL_OVERRIDE; + virtual OConnectionLineDataRef CreateLineDataObj() override; OQueryTableConnectionData& operator=( const OQueryTableConnectionData& rConnData ); public: @@ -48,15 +48,15 @@ namespace dbaui const OUString& rConnName=OUString()); virtual ~OQueryTableConnectionData(); - virtual void CopyFrom(const OTableConnectionData& rSource) SAL_OVERRIDE; - virtual OTableConnectionData* NewInstance() const SAL_OVERRIDE; + virtual void CopyFrom(const OTableConnectionData& rSource) override; + virtual OTableConnectionData* NewInstance() const override; /** Update create a new connection @return true if successful */ - virtual bool Update() SAL_OVERRIDE; + virtual bool Update() override; OUString GetAliasName(EConnectionSide nWhich) const; diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx index fd30978d2af2..ae895710f8f7 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx @@ -43,24 +43,24 @@ namespace dbaui } // late Constructor, the base class CREATES Listbox on first call - virtual bool Init() SAL_OVERRIDE; + virtual bool Init() override; bool ExistsField(const OUString& strFieldName, OTableFieldDescRef& rInfo); bool ExistsAVisitedConn() const; - virtual OUString GetName() const SAL_OVERRIDE { return GetWinName(); } + virtual OUString GetName() const override { return GetWinName(); } protected: - virtual void KeyInput( const KeyEvent& rEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rEvt ) override; - virtual void OnEntryDoubleClicked(SvTreeListEntry* pEntry) SAL_OVERRIDE; + virtual void OnEntryDoubleClicked(SvTreeListEntry* pEntry) override; // is called from DoubleClickHdl of the ListBox /** delete the user data with the equal type as created within createUserData @param _pUserData The user data store in the listbox entries. Created with a call to createUserData. _pUserData may be <NULL/>. */ - virtual void deleteUserData(void*& _pUserData) SAL_OVERRIDE; + virtual void deleteUserData(void*& _pUserData) override; /** creates user information that will be append at the ListBoxentry @param _xColumn @@ -72,7 +72,7 @@ namespace dbaui */ virtual void* createUserData(const css::uno::Reference< css::beans::XPropertySet>& _xColumn, - bool _bPrimaryKey) SAL_OVERRIDE; + bool _bPrimaryKey) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLEWINDOW_HXX diff --git a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx index 0c0db3f649b1..e5fac04e8a51 100644 --- a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx @@ -31,8 +31,8 @@ namespace dbaui public: explicit OQueryAddTabConnUndoAction(OQueryTableView* pOwner); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; }; // OQueryDelTabConnUndoAction - Undo-Klasse fuer Einfuegen einer Connection @@ -42,8 +42,8 @@ namespace dbaui public: explicit OQueryDelTabConnUndoAction(OQueryTableView* pOwner); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYADDTABCONNUNDOACTION_HXX diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx index b9a9f4a60463..cbd54cc5d2e6 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx @@ -33,8 +33,8 @@ namespace dbaui VclPtr<OSelectionBrowseBox> pOwner; sal_uInt16 m_nColumnPostion; - virtual void Undo() SAL_OVERRIDE = 0; - virtual void Redo() SAL_OVERRIDE = 0; + virtual void Undo() override = 0; + virtual void Redo() override = 0; public: OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID); @@ -64,8 +64,8 @@ namespace dbaui void SetCellContents(const OUString& str) { m_strNextCellContents = str; } void SetCellIndex(sal_Int32 nIndex) { m_nCellIndex = nIndex; } - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE { Undo(); } + virtual void Undo() override; + virtual void Redo() override { Undo(); } }; // OTabFieldSizedUndoAct - undo class to change the column width @@ -80,8 +80,8 @@ namespace dbaui inline void SetOriginalWidth(long nWidth) { m_nNextWidth = nWidth; } - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE { Undo(); } + virtual void Undo() override; + virtual void Redo() override { Undo(); } }; // OTabFieldUndoAct - base class for undos in the fieldlist of a query design, which are used to change complete field descriptions @@ -102,8 +102,8 @@ namespace dbaui class OTabFieldDelUndoAct : public OTabFieldUndoAct { protected: - virtual void Undo() SAL_OVERRIDE { pOwner->EnterUndoMode();pOwner->InsertColumn(pDescr, m_nColumnPostion);pOwner->LeaveUndoMode(); } - virtual void Redo() SAL_OVERRIDE { pOwner->EnterUndoMode();pOwner->RemoveColumn(pDescr->GetColumnId());pOwner->LeaveUndoMode(); } + virtual void Undo() override { pOwner->EnterUndoMode();pOwner->InsertColumn(pDescr, m_nColumnPostion);pOwner->LeaveUndoMode(); } + virtual void Redo() override { pOwner->EnterUndoMode();pOwner->RemoveColumn(pDescr->GetColumnId());pOwner->LeaveUndoMode(); } public: explicit OTabFieldDelUndoAct(OSelectionBrowseBox* pSelBrwBox) : OTabFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_TABFIELDDELETE) { } @@ -115,8 +115,8 @@ namespace dbaui class OTabFieldCreateUndoAct : public OTabFieldUndoAct { protected: - virtual void Undo() SAL_OVERRIDE { pOwner->EnterUndoMode();pOwner->RemoveColumn(pDescr->GetColumnId());pOwner->LeaveUndoMode();} - virtual void Redo() SAL_OVERRIDE { pOwner->EnterUndoMode();pOwner->InsertColumn(pDescr, m_nColumnPostion);pOwner->LeaveUndoMode();} + virtual void Undo() override { pOwner->EnterUndoMode();pOwner->RemoveColumn(pDescr->GetColumnId());pOwner->LeaveUndoMode();} + virtual void Redo() override { pOwner->EnterUndoMode();pOwner->InsertColumn(pDescr, m_nColumnPostion);pOwner->LeaveUndoMode();} public: explicit OTabFieldCreateUndoAct(OSelectionBrowseBox* pSelBrwBox) : OTabFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_TABFIELDCREATE) { } @@ -127,8 +127,8 @@ namespace dbaui class OTabFieldMovedUndoAct : public OTabFieldUndoAct { protected: - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE + virtual void Undo() override; + virtual void Redo() override { Undo(); } diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx index b8c9f52ad0c1..d8f027a37c65 100644 --- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx @@ -39,8 +39,8 @@ namespace dbaui public: OJoinMoveTabWinUndoAct(OJoinTableView* pOwner, const Point& ptOriginalPosition, OTableWindow* pTabWin); - virtual void Undo() SAL_OVERRIDE { TogglePosition(); } - virtual void Redo() SAL_OVERRIDE { TogglePosition(); } + virtual void Undo() override { TogglePosition(); } + virtual void Redo() override { TogglePosition(); } }; inline OJoinMoveTabWinUndoAct::OJoinMoveTabWinUndoAct(OJoinTableView* pOwner, const Point& ptOriginalPosition, OTableWindow* pTabWin) diff --git a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx index f30b54423cb3..7cc039a01343 100644 --- a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx @@ -42,8 +42,8 @@ namespace dbaui // here returns physical and not logical coordinates // (in contrary to QueryMoveTabWinUndoAct) - virtual void Undo() SAL_OVERRIDE { ToggleSizePosition(); } - virtual void Redo() SAL_OVERRIDE { ToggleSizePosition(); } + virtual void Undo() override { ToggleSizePosition(); } + virtual void Redo() override { ToggleSizePosition(); } }; inline OJoinSizeTabWinUndoAct::OJoinSizeTabWinUndoAct(OJoinTableView* pOwner, const Point& ptOriginalPos, const Size& szOriginalSize, OTableWindow* pTabWin) diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx index 6541a4ed5b42..8aa978482c7e 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx @@ -36,8 +36,8 @@ namespace dbaui OQueryTabConnUndoAction(OQueryTableView* pOwner, sal_uInt16 nCommentID); virtual ~OQueryTabConnUndoAction(); - virtual void Undo() SAL_OVERRIDE = 0; - virtual void Redo() SAL_OVERRIDE = 0; + virtual void Undo() override = 0; + virtual void Redo() override = 0; void SetConnection(OQueryTableConnection* pConn) { m_pConnection = pConn; } // now SetOwnership please diff --git a/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx index 83dd52b3f2a5..85b8a39d514c 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx @@ -32,8 +32,8 @@ namespace dbaui explicit OQueryTabWinShowUndoAct(OQueryTableView* pOwner); virtual ~OQueryTabWinShowUndoAct(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; }; // OQueryTabWinDelUndoAct - undo class to delete a TabWins @@ -44,8 +44,8 @@ namespace dbaui explicit OQueryTabWinDelUndoAct(OQueryTableView* pOwner); virtual ~OQueryTabWinDelUndoAct(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYTABWINSHOWUNDOACT_HXX diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx index aea22ac3dec8..1b67e46af85d 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx @@ -44,8 +44,8 @@ namespace dbaui void SetOwnership(bool bTakeIt) { m_bOwnerOfObjects = bTakeIt; } - virtual void Undo() SAL_OVERRIDE = 0; - virtual void Redo() SAL_OVERRIDE = 0; + virtual void Undo() override = 0; + virtual void Redo() override = 0; // access to the TabWin void SetTabWin(OQueryTableWindow* pTW) { m_pTabWin = pTW; } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index a6240cbe6b71..205cc8615818 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -247,11 +247,11 @@ namespace { VclPtr<OSelectionBrowseBox> m_pBrowseBox; protected: - virtual void Select() SAL_OVERRIDE; + virtual void Select() override; public: explicit OSelectionBrwBoxHeader(OSelectionBrowseBox* pParent); virtual ~OSelectionBrwBoxHeader() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE { m_pBrowseBox.clear(); ::svt::EditBrowserHeader::dispose(); } + virtual void dispose() override { m_pBrowseBox.clear(); ::svt::EditBrowserHeader::dispose(); } }; OSelectionBrwBoxHeader::OSelectionBrwBoxHeader(OSelectionBrowseBox* pParent) : ::svt::EditBrowserHeader(pParent,WB_BUTTONSTYLE|WB_DRAG) diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index fe825dcb4213..64711312a660 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -81,7 +81,7 @@ namespace dbaui public: explicit OSelectionBrowseBox( vcl::Window* pParent ); virtual ~OSelectionBrowseBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void initialize(); OTableFieldDescRef InsertField( const OJoinExchangeData& jxdSource, sal_uInt16 _nColumnPosition = BROWSER_INVALIDID, bool bVis=true, bool bActivate=true ); @@ -131,9 +131,9 @@ namespace dbaui void paste(); void copy(); - virtual void GetFocus() SAL_OVERRIDE; - virtual void DeactivateCell(bool bUpdate = true) SAL_OVERRIDE; - virtual void ColumnMoved( sal_uInt16 nColId ) SAL_OVERRIDE { ColumnMoved(nColId,true); } + virtual void GetFocus() override; + virtual void DeactivateCell(bool bUpdate = true) override; + virtual void ColumnMoved( sal_uInt16 nColId ) override { ColumnMoved(nColId,true); } void ColumnMoved( sal_uInt16 nColId, bool _bCreateUndo); void Fill(); @@ -154,7 +154,7 @@ namespace dbaui @return the text out of the cell */ - virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const SAL_OVERRIDE; + virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const override; /** returns the description of the row. @param _nRow @@ -162,7 +162,7 @@ namespace dbaui @return The header text of the specified row. */ - virtual OUString GetRowDescription( sal_Int32 _nRow ) const SAL_OVERRIDE; + virtual OUString GetRowDescription( sal_Int32 _nRow ) const override; /** return the name of the specified object. @param eObjType @@ -172,41 +172,41 @@ namespace dbaui @return The name of the specified object. */ - virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const SAL_OVERRIDE; + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override; // IAccessibleTableProvider /** Creates the accessible object of a data table cell. @param nRow The row index of the cell. @param nColumnId The column ID of the cell. @return The XAccessible interface of the specified cell. */ - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ) override; protected: - virtual bool SeekRow( long nRow ) SAL_OVERRIDE; + virtual bool SeekRow( long nRow ) override; - virtual void PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const SAL_OVERRIDE; + virtual void PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const override; virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, - sal_uInt16 nColumnId ) const SAL_OVERRIDE; + sal_uInt16 nColumnId ) const override; - virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const BrowserMouseEvent& rEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const BrowserMouseEvent& rEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rEvt ) SAL_OVERRIDE; - virtual void Command(const CommandEvent& rEvt) SAL_OVERRIDE; - virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ) override; + virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) override; + virtual void MouseButtonDown( const BrowserMouseEvent& rEvt ) override; + virtual void MouseButtonUp( const BrowserMouseEvent& rEvt ) override; + virtual void KeyInput( const KeyEvent& rEvt ) override; + virtual void Command(const CommandEvent& rEvt) override; + virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY) override; - virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol) SAL_OVERRIDE; - virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) SAL_OVERRIDE; - virtual void CellModified() SAL_OVERRIDE; - virtual bool SaveModified() SAL_OVERRIDE; - virtual void Init() SAL_OVERRIDE; - virtual void ColumnResized( sal_uInt16 nColId ) SAL_OVERRIDE; + virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol) override; + virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) override; + virtual void CellModified() override; + virtual bool SaveModified() override; + virtual void Init() override; + virtual void ColumnResized( sal_uInt16 nColId ) override; - virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) SAL_OVERRIDE; + virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) override; // if you want to have an own header ... - virtual VclPtr<BrowserHeader> imp_CreateHeaderBar(BrowseBox* pParent) SAL_OVERRIDE; + virtual VclPtr<BrowserHeader> imp_CreateHeaderBar(BrowseBox* pParent) override; void stopTimer(); void startTimer(); diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index decbd5d64587..505f2e91a42f 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -35,7 +35,7 @@ class LimitBoxImpl: public LimitBox public: LimitBoxImpl( vcl::Window* pParent, LimitBoxController* pCtrl ); - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; private: LimitBoxController* m_pControl; diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx index 1866a423fcd5..5a2ad947c08a 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx @@ -36,25 +36,25 @@ class LimitBoxController: public svt::ToolboxController, virtual ~LimitBoxController(); /// XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; /// XServiceInfo DECLARE_SERVICE_INFO_STATIC(); /// XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; /// XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; /// XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override; void dispatchCommand( const css::uno::Sequence< css::beans::PropertyValue >& rArgs ); using svt::ToolboxController::dispatchCommand; diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 7cca1a54d88b..42b7de87c5f4 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -100,11 +100,11 @@ namespace dbaui class OViewController : public OQueryController { - virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) SAL_OVERRIDE + virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override { return getImplementationName_Static(); } - virtual Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE + virtual Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override { return getSupportedServiceNames_Static(); } diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index b69b7b9e0e3a..9b804323e7f8 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -69,18 +69,18 @@ namespace dbaui const css::uno::Reference< css::sdbc::XConnection >& _xConnection, bool _bAllowTableSelect); virtual ~DlgQryJoin(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; EJoinType GetJoinType() const { return eJoinType; }; /** setValid set the valid inside, can be used for OK buttons @param _bValid true when the using control allows an update */ - virtual void setValid(bool _bValid) SAL_OVERRIDE; + virtual void setValid(bool _bValid) override; /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists @param _pConnectionData the connection which exists between the new tables */ - virtual void notifyConnectionChange() SAL_OVERRIDE; + virtual void notifyConnectionChange() override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDLG_HXX diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.hxx b/dbaccess/source/ui/relationdesign/RTableConnection.hxx index 5739cf4ee683..02eccc775d15 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.hxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.hxx @@ -34,7 +34,7 @@ namespace dbaui ORelationTableConnection& operator=( const ORelationTableConnection& rConn ); - virtual void Draw(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Draw(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; using OTableConnection::Draw; }; } diff --git a/dbaccess/source/ui/relationdesign/RTableWindow.hxx b/dbaccess/source/ui/relationdesign/RTableWindow.hxx index 27d31189a098..6d28fb778cf2 100644 --- a/dbaccess/source/ui/relationdesign/RTableWindow.hxx +++ b/dbaccess/source/ui/relationdesign/RTableWindow.hxx @@ -33,7 +33,7 @@ namespace dbaui @return The composed name or the window name. */ - virtual OUString GetName() const SAL_OVERRIDE { return GetComposedName(); } + virtual OUString GetName() const override { return GetComposedName(); } }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_RELATIONDESIGN_RTABLEWINDOW_HXX diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index f86d61bf5198..bb8c09feee30 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -302,8 +302,8 @@ namespace } /// Working method which should be overridden. - virtual void SAL_CALL run() SAL_OVERRIDE; - virtual void SAL_CALL onTerminated() SAL_OVERRIDE; + virtual void SAL_CALL run() override; + virtual void SAL_CALL onTerminated() override; protected: virtual ~RelationLoader(){} diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx index 41bd5dd1fdc2..440a7ad859ab 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx @@ -34,15 +34,15 @@ namespace dbaui VclPtr<OTableFieldControl> m_pFieldControl; protected: - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; public: OFieldDescGenWin( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar ); virtual ~OFieldDescGenWin(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void GetFocus() override; + virtual void LoseFocus() override; void Init(); void DisplayData( OFieldDescription* pFieldDescr ); @@ -58,13 +58,13 @@ namespace dbaui OUString BoolStringUI(const OUString& rPersistentString) const; // IClipboardTest - virtual bool isCutAllowed() SAL_OVERRIDE; - virtual bool isCopyAllowed() SAL_OVERRIDE; - virtual bool isPasteAllowed() SAL_OVERRIDE; + virtual bool isCutAllowed() override; + virtual bool isCopyAllowed() override; + virtual bool isPasteAllowed() override; - virtual void copy() SAL_OVERRIDE; - virtual void cut() SAL_OVERRIDE; - virtual void paste() SAL_OVERRIDE; + virtual void copy() override; + virtual void cut() override; + virtual void paste() override; inline OTableFieldControl* getFieldControl() const { return m_pFieldControl; } }; diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index c7154600c34e..a66fc41bea19 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -87,31 +87,31 @@ namespace dbaui ClipboardInvalidator m_aInvalidate; protected: - virtual void Command( const CommandEvent& rEvt ) SAL_OVERRIDE; - virtual bool SeekRow(long nRow) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rEvt ) override; + virtual bool SeekRow(long nRow) override; virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, - sal_uInt16 nColumnId ) const SAL_OVERRIDE; + sal_uInt16 nColumnId ) const override; - virtual void CursorMoved() SAL_OVERRIDE; - virtual RowStatus GetRowStatus(long nRow) const SAL_OVERRIDE; + virtual void CursorMoved() override; + virtual RowStatus GetRowStatus(long nRow) const override; - virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol) SAL_OVERRIDE; - virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) SAL_OVERRIDE; + virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol) override; + virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) override; - virtual void CellModified() SAL_OVERRIDE; - virtual bool SaveModified() SAL_OVERRIDE; // is called before changing a cell (false prevents change) + virtual void CellModified() override; + virtual bool SaveModified() override; // is called before changing a cell (false prevents change) - virtual OUString GetCellText(long nRow, sal_uInt16 nColId) const SAL_OVERRIDE; - virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) SAL_OVERRIDE; + virtual OUString GetCellText(long nRow, sal_uInt16 nColId) const override; + virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) override; - virtual void CopyRows() SAL_OVERRIDE; - virtual void InsertRows( long nRow ) SAL_OVERRIDE; - virtual void DeleteRows() SAL_OVERRIDE; - virtual void InsertNewRows( long nRow ) SAL_OVERRIDE; + virtual void CopyRows() override; + virtual void InsertRows( long nRow ) override; + virtual void DeleteRows() override; + virtual void InsertNewRows( long nRow ) override; - virtual bool IsPrimaryKeyAllowed( long nRow ) SAL_OVERRIDE; - virtual bool IsInsertNewAllowed( long nRow ) SAL_OVERRIDE; - virtual bool IsDeleteAllowed( long nRow ) SAL_OVERRIDE; + virtual bool IsPrimaryKeyAllowed( long nRow ) override; + virtual bool IsInsertNewAllowed( long nRow ) override; + virtual bool IsDeleteAllowed( long nRow ) override; void ClearModified(); @@ -121,8 +121,8 @@ namespace dbaui public: explicit OTableEditorCtrl(vcl::Window* pParentWin); virtual ~OTableEditorCtrl(); - virtual void dispose() SAL_OVERRIDE; - virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol) SAL_OVERRIDE; + virtual void dispose() override; + virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol) override; SfxUndoManager& GetUndoManager() const; void SetDescrWin( OTableFieldDescWin* pWin ) @@ -137,12 +137,12 @@ namespace dbaui /// force displaying of the given row void DisplayData( long nRow, bool bGrabFocus = true ); - virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) SAL_OVERRIDE; - virtual void SetCellData( long nRow, sal_uInt16 nColId, const css::uno::Any& _rSaveData ) SAL_OVERRIDE; - virtual css::uno::Any GetCellData( long nRow, sal_uInt16 nColId ) SAL_OVERRIDE; - virtual void SetControlText( long nRow, sal_uInt16 nColId, const OUString& rText ) SAL_OVERRIDE; + virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) override; + virtual void SetCellData( long nRow, sal_uInt16 nColId, const css::uno::Any& _rSaveData ) override; + virtual css::uno::Any GetCellData( long nRow, sal_uInt16 nColId ) override; + virtual void SetControlText( long nRow, sal_uInt16 nColId, const OUString& rText ) override; - virtual OTableDesignView* GetView() const SAL_OVERRIDE; + virtual OTableDesignView* GetView() const override; ::std::vector< ::std::shared_ptr<OTableRow> >* GetRowList(){ return m_pRowList; } @@ -150,8 +150,8 @@ namespace dbaui void CellModified( long nRow, sal_uInt16 nColId ); void SetReadOnly( bool bRead=true ); - virtual void Init() SAL_OVERRIDE; - virtual void DeactivateCell(bool bUpdate = true) SAL_OVERRIDE; + virtual void Init() override; + virtual void DeactivateCell(bool bUpdate = true) override; bool IsCutAllowed( long nRow = -1 ); bool IsCopyAllowed( long nRow = -1 ); @@ -160,16 +160,16 @@ namespace dbaui OFieldDescription* GetFieldDescr( long nRow ); // Window overrides - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; // IClipboardTest - virtual bool isCutAllowed() SAL_OVERRIDE { return IsCutAllowed(); } - virtual bool isCopyAllowed() SAL_OVERRIDE { return IsCopyAllowed(); } - virtual bool isPasteAllowed() SAL_OVERRIDE { return IsPasteAllowed(); } + virtual bool isCutAllowed() override { return IsCutAllowed(); } + virtual bool isCopyAllowed() override { return IsCopyAllowed(); } + virtual bool isPasteAllowed() override { return IsPasteAllowed(); } - virtual void cut() SAL_OVERRIDE; - virtual void copy() SAL_OVERRIDE; - virtual void paste() SAL_OVERRIDE; + virtual void cut() override; + virtual void copy() override; + virtual void paste() override; private: DECL_LINK_TYPED( DelayedCut, void*, void ); diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx index 4e830e8b3b89..e8e84b7a0532 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx @@ -30,20 +30,20 @@ namespace dbaui { OTableEditorCtrl* GetCtrl() const; protected: - virtual void ActivateAggregate( EControlType eType ) SAL_OVERRIDE; - virtual void DeactivateAggregate( EControlType eType ) SAL_OVERRIDE; + virtual void ActivateAggregate( EControlType eType ) override; + virtual void DeactivateAggregate( EControlType eType ) override; // are to be implemented by the derived classes - virtual void CellModified(long nRow, sal_uInt16 nColId ) SAL_OVERRIDE; - virtual bool IsReadOnly() SAL_OVERRIDE; - virtual void SetModified(bool bModified) SAL_OVERRIDE; - virtual css::uno::Reference< css::util::XNumberFormatter > GetFormatter() const SAL_OVERRIDE; + virtual void CellModified(long nRow, sal_uInt16 nColId ) override; + virtual bool IsReadOnly() override; + virtual void SetModified(bool bModified) override; + virtual css::uno::Reference< css::util::XNumberFormatter > GetFormatter() const override; - virtual css::lang::Locale GetLocale() const SAL_OVERRIDE; + virtual css::lang::Locale GetLocale() const override; - virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) SAL_OVERRIDE; - virtual const OTypeInfoMap* getTypeInfo() const SAL_OVERRIDE; - virtual bool isAutoIncrementValueEnabled() const SAL_OVERRIDE; - virtual OUString getAutoIncrementValue() const SAL_OVERRIDE; + virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) override; + virtual const OTypeInfoMap* getTypeInfo() const override; + virtual bool isAutoIncrementValueEnabled() const override; + virtual OUString getAutoIncrementValue() const override; public: OTableFieldControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar); @@ -51,8 +51,8 @@ namespace dbaui OUString BoolStringPersistent(const OUString& rUIString) const { return OFieldDescControl::BoolStringPersistent(rUIString); } OUString BoolStringUI(const OUString& rPersistentString) const { return OFieldDescControl::BoolStringUI(rPersistentString); } - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE; - virtual css::uno::Reference< css::sdbc::XConnection> getConnection() SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() override; + virtual css::uno::Reference< css::sdbc::XConnection> getConnection() override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TABLEFIELDCONTROL_HXX diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index d52d3f021512..07634d3aaa95 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -49,13 +49,13 @@ namespace dbaui IClipboardTest* getActiveChild() const; protected: - virtual void Resize() SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; public: explicit OTableFieldDescWin( vcl::Window* pParent); virtual ~OTableFieldDescWin(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void Init(); @@ -64,9 +64,9 @@ namespace dbaui void SetReadOnly( bool bReadOnly ); // Window overrides - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; void SetControlText( sal_uInt16 nControlId, const OUString& rText ) { m_pGenPage->SetControlText(nControlId,rText); } @@ -78,13 +78,13 @@ namespace dbaui OUString BoolStringUI(const OUString& rPersistentString) const { return m_pGenPage->BoolStringUI(rPersistentString); } // IClipboardTest - virtual bool isCutAllowed() SAL_OVERRIDE; - virtual bool isCopyAllowed() SAL_OVERRIDE; - virtual bool isPasteAllowed() SAL_OVERRIDE; + virtual bool isCutAllowed() override; + virtual bool isCopyAllowed() override; + virtual bool isPasteAllowed() override; - virtual void copy() SAL_OVERRIDE; - virtual void cut() SAL_OVERRIDE; - virtual void paste() SAL_OVERRIDE; + virtual void copy() override; + virtual void cut() override; + virtual void paste() override; inline OFieldDescGenWin* getGenPage() const { return m_pGenPage; } inline OTableDesignHelpBar* getHelpBar() const { return m_pHelpBar; } diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx index d8b0905ecd21..730e3e60f893 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.hxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx @@ -37,8 +37,8 @@ namespace dbaui protected: VclPtr<OTableRowView> m_pTabDgnCtrl; - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; public: TYPEINFO_OVERRIDE(); OTableDesignUndoAct( OTableRowView* pOwner ,sal_uInt16 nCommentID); @@ -65,8 +65,8 @@ namespace dbaui css::uno::Any m_sOldText; css::uno::Any m_sNewText; - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; public: TYPEINFO_OVERRIDE(); OTableDesignCellUndoAct( OTableRowView* pOwner, long nRowID, sal_uInt16 nColumn ); @@ -81,8 +81,8 @@ namespace dbaui TOTypeInfoSP m_pOldType; TOTypeInfoSP m_pNewType; - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; public: TYPEINFO_OVERRIDE(); OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, sal_uInt16 nColumn, const TOTypeInfoSP& _pOldType ); @@ -94,8 +94,8 @@ namespace dbaui protected: ::std::vector< std::shared_ptr<OTableRow> > m_aDeletedRows; - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; public: TYPEINFO_OVERRIDE(); explicit OTableEditorDelUndoAct( OTableEditorCtrl* pOwner ); @@ -108,8 +108,8 @@ namespace dbaui ::std::vector< std::shared_ptr<OTableRow> > m_vInsertedRows; long m_nInsPos; - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; public: TYPEINFO_OVERRIDE(); OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, @@ -124,8 +124,8 @@ namespace dbaui long m_nInsPos; long m_nInsRows; - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; public: TYPEINFO_OVERRIDE(); OTableEditorInsNewUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition, long nInsertedRows ); @@ -139,8 +139,8 @@ namespace dbaui m_aInsKeys; VclPtr<OTableEditorCtrl> m_pEditorCtrl; - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; public: TYPEINFO_OVERRIDE(); OPrimKeyUndoAct( OTableEditorCtrl* pOwner, const MultiSelection& aDeletedKeys, const MultiSelection& aInsertedKeys ); diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index a277d9bd1958..412397f34211 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -43,11 +43,11 @@ namespace dbaui public: // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - static methods static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); @@ -56,14 +56,14 @@ namespace dbaui SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; protected: // OGenericUnoDialog overridables - virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE; + virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override; }; OAdvancedSettingsDialog::OAdvancedSettingsDialog(const Reference< XComponentContext >& _rxORB) diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index 058767e10ff8..d057de4633dc 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -36,13 +36,13 @@ namespace dbaui explicit OColumnControl(const css::uno::Reference< css::uno::XComponentContext>& rxContext); // UnoControl - virtual OUString GetComponentServiceName() SAL_OVERRIDE; + virtual OUString GetComponentServiceName() override; // XServiceInfo DECLARE_SERVICE_INFO_STATIC(); // css::awt::XControl - virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent) throw(css::uno::RuntimeException, std::exception) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx index ddcfd58f7590..33cc1717bb65 100644 --- a/dbaccess/source/ui/uno/ColumnModel.hxx +++ b/dbaccess/source/ui/uno/ColumnModel.hxx @@ -77,22 +77,22 @@ public: DECLARE_SERVICE_INFO_STATIC(); virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // css::uno::XAggregation - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; // css::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; // OPropertyArrayUsageHelper DECLARE_PROPERTYCONTAINER_DEFAULTS( ); - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx index 985063f27ca2..1990c8f61829 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.hxx +++ b/dbaccess/source/ui/uno/ColumnPeer.hxx @@ -40,8 +40,8 @@ namespace dbaui void setConnection(const css::uno::Reference< css::sdbc::XConnection>& _xCon); void setEditWidth(sal_Int32 _nWidth); // VCLXWindow - virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; }; } // namespace dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_COLUMNPEER_HXX diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx index f8dc22ba9c40..f35a6c4ed9dc 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx @@ -35,11 +35,11 @@ protected: public: // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - static methods static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); @@ -48,14 +48,14 @@ public: SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; protected: // OGenericUnoDialog overridables - virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE; + virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index 97e36962c34e..bb31037f89d5 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -37,11 +37,11 @@ protected: public: // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - static methods static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); @@ -50,15 +50,15 @@ public: SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; protected: // OGenericUnoDialog overridables - virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE; - virtual void executedDialog(sal_Int16 _nExecutionResult) SAL_OVERRIDE; + virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override; + virtual void executedDialog(sal_Int16 _nExecutionResult) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 95a9594f0ccb..4241bfa63763 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -35,11 +35,11 @@ protected: public: // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - static methods static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); @@ -48,14 +48,14 @@ public: SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; protected: // OGenericUnoDialog overridables - virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE; + virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index f6003a71850d..60b34f0ca42c 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -35,11 +35,11 @@ protected: public: // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - static methods static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); @@ -48,14 +48,14 @@ public: SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; protected: // OGenericUnoDialog overridables - virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE; + virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index 68b8b8f2c7fe..256e28603301 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -35,11 +35,11 @@ protected: public: // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - static methods static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); @@ -48,14 +48,14 @@ public: SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; protected: // OGenericUnoDialog overridables - virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE; + virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index ec437fdeae89..dafe18a81e96 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -56,7 +56,7 @@ namespace dbaui public: virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; DECLARE_PROPERTYCONTAINER_DEFAULTS( ); @@ -70,7 +70,7 @@ namespace dbaui private: // OGenericUnoDialog overridables - virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE; + virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override; }; // RowsetFilterDialog @@ -89,12 +89,12 @@ namespace dbaui vcl::Window* _pParent, const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, const css::uno::Reference< css::container::XNameAccess >& _rxColumns - ) SAL_OVERRIDE; + ) override; // OGenericUnoDialog overridables - virtual void executedDialog( sal_Int16 _nExecutionResult ) SAL_OVERRIDE; + virtual void executedDialog( sal_Int16 _nExecutionResult ) override; virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; }; @@ -114,12 +114,12 @@ namespace dbaui vcl::Window* _pParent, const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, const css::uno::Reference< css::container::XNameAccess >& _rxColumns - ) SAL_OVERRIDE; + ) override; // OGenericUnoDialog overridables - virtual void executedDialog( sal_Int16 _nExecutionResult ) SAL_OVERRIDE; + virtual void executedDialog( sal_Int16 _nExecutionResult ) override; virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 6428fbef135b..0a463f08dfc6 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -150,8 +150,8 @@ namespace dbaui { public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override; // XServiceInfo - static methods static Sequence< OUString > getSupportedServiceNames_Static() throw( RuntimeException ); @@ -159,30 +159,30 @@ namespace dbaui static Reference< XInterface > Create( const Reference< XMultiServiceFactory >& ); // XCopyTableWizard - virtual ::sal_Int16 SAL_CALL getOperation() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setOperation( ::sal_Int16 _operation ) throw (IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getDestinationTableName() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDestinationTableName( const OUString& _destinationTableName ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Optional< OUString > SAL_CALL getCreatePrimaryKey() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCreatePrimaryKey( const Optional< OUString >& _newPrimaryKey ) throw (IllegalArgumentException, SQLException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getUseHeaderLineAsColumnNames() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setUseHeaderLineAsColumnNames( sal_Bool _bUseHeaderLineAsColumnNames ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addCopyTableListener( const Reference< XCopyTableListener >& Listener ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeCopyTableListener( const Reference< XCopyTableListener >& Listener ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL getOperation() throw (RuntimeException, std::exception) override; + virtual void SAL_CALL setOperation( ::sal_Int16 _operation ) throw (IllegalArgumentException, RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDestinationTableName() throw (RuntimeException, std::exception) override; + virtual void SAL_CALL setDestinationTableName( const OUString& _destinationTableName ) throw (RuntimeException, std::exception) override; + virtual Optional< OUString > SAL_CALL getCreatePrimaryKey() throw (RuntimeException, std::exception) override; + virtual void SAL_CALL setCreatePrimaryKey( const Optional< OUString >& _newPrimaryKey ) throw (IllegalArgumentException, SQLException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getUseHeaderLineAsColumnNames() throw (RuntimeException, std::exception) override; + virtual void SAL_CALL setUseHeaderLineAsColumnNames( sal_Bool _bUseHeaderLineAsColumnNames ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL addCopyTableListener( const Reference< XCopyTableListener >& Listener ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL removeCopyTableListener( const Reference< XCopyTableListener >& Listener ) throw (RuntimeException, std::exception) override; // XCopyTableWizard::XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int16 SAL_CALL execute( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL execute( ) throw (RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override; // XPropertySet - virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; public: ::osl::Mutex& getMutex() { return m_aMutex; } @@ -193,8 +193,8 @@ namespace dbaui virtual ~CopyTableWizard(); // OGenericUnoDialog overridables - virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) SAL_OVERRIDE; - virtual void executedDialog( sal_Int16 _nExecutionResult ) SAL_OVERRIDE; + virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) override; + virtual void executedDialog( sal_Int16 _nExecutionResult ) override; private: /// ensures our current attribute values are reflected in the dialog diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 68485db39ea7..0ea184cc07ab 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -74,10 +74,10 @@ namespace dbaui ); // XInteractionHandler2 - virtual sal_Bool SAL_CALL handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& Request ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& Request ) throw (css::uno::RuntimeException, std::exception) override; // XInteractionHandler - virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) throw(css::uno::RuntimeException, std::exception) override; protected: bool diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index cd1e722d2cf4..007bf76c7b7f 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -75,37 +75,37 @@ namespace dbaui public: virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; DECLARE_SERVICE_INFO_STATIC( ); DECLARE_PROPERTYCONTAINER_DEFAULTS( ); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw(Exception, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) throw(IllegalArgumentException) SAL_OVERRIDE; - virtual void SAL_CALL getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw(Exception, std::exception) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) throw(IllegalArgumentException) override; + virtual void SAL_CALL getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const override; // Overrides to resolve inheritance ambiguity - virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw (css::uno::RuntimeException, std::exception) override { ODatabaseAdministrationDialog::setPropertyValue(p1, p2); } - virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override { return ODatabaseAdministrationDialog::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override { ODatabaseAdministrationDialog::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override { ODatabaseAdministrationDialog::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override { ODatabaseAdministrationDialog::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override { ODatabaseAdministrationDialog::removeVetoableChangeListener(p1, p2); } - virtual void SAL_CALL setTitle(const OUString& p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setTitle(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override { ODatabaseAdministrationDialog::setTitle(p1); } - virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception) override { return ODatabaseAdministrationDialog::execute(); } protected: // OGenericUnoDialog overridables - virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) SAL_OVERRIDE; - virtual void implInitialize( const css::uno::Any& _rValue ) SAL_OVERRIDE; + virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) override; + virtual void implInitialize( const css::uno::Any& _rValue ) override; protected: using OTextConnectionSettingsDialog_BASE::getFastPropertyValue; }; diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index f3b92fc304e1..ae9c22ac227a 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -49,7 +49,7 @@ namespace dbaui public: virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; DECLARE_SERVICE_INFO_STATIC( ); @@ -57,8 +57,8 @@ namespace dbaui protected: // OGenericUnoDialog overridables - virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE; - virtual void implInitialize(const css::uno::Any& _rValue) SAL_OVERRIDE; + virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override; + virtual void implInitialize(const css::uno::Any& _rValue) override; }; } // namespace dbaui |