diff options
Diffstat (limited to 'desktop/source/deployment')
38 files changed, 288 insertions, 288 deletions
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx index aa6d54b04ce3..4191403b54f5 100644 --- a/desktop/source/deployment/dp_log.cxx +++ b/desktop/source/deployment/dp_log.cxx @@ -48,7 +48,7 @@ class ProgressLogImpl : public ::dp_misc::MutexHolder, public t_log_helper void log_write( OString const & text ); protected: - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; virtual ~ProgressLogImpl(); public: @@ -56,9 +56,9 @@ public: Reference<XComponentContext> const & xContext ); // XProgressHandler - virtual void SAL_CALL push( Any const & Status ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL update( Any const & Status ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL pop() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL push( Any const & Status ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL update( Any const & Status ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL pop() throw (RuntimeException, std::exception) override; }; diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index 820147286636..f5464222acdc 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx @@ -38,7 +38,7 @@ public: DependencyDialog( vcl::Window * parent, std::vector< OUString > const & dependencies); virtual ~DependencyDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: DependencyDialog(DependencyDialog &) = delete; diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 49916e151d85..c8c3954aa1bc 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -137,15 +137,15 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl public: explicit ExtBoxWithBtns_Impl(vcl::Window* pParent); virtual ~ExtBoxWithBtns_Impl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void InitFromDialog(ExtMgrDialog *pParentDialog); - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; - virtual void RecalcAll() SAL_OVERRIDE; - virtual void selectEntry( const long nPos ) SAL_OVERRIDE; + virtual void RecalcAll() override; + virtual void selectEntry( const long nPos ) override; void enableButtons( bool bEnable ); }; diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 7df43d1ffe54..1038f095ab90 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -143,21 +143,21 @@ class ExtMgrDialog : public ModelessDialog, public: ExtMgrDialog( vcl::Window * pParent, TheExtensionManager *pManager, Dialog::InitFlag eFlag = Dialog::InitFlag::Default ); virtual ~ExtMgrDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool Close() override; - virtual void showProgress( bool bStart ) SAL_OVERRIDE; + virtual void showProgress( bool bStart ) override; virtual void updateProgress( const OUString &rText, - const css::uno::Reference< css::task::XAbortChannel > &xAbortChannel) SAL_OVERRIDE; - virtual void updateProgress( const long nProgress ) SAL_OVERRIDE; + const css::uno::Reference< css::task::XAbortChannel > &xAbortChannel) override; + virtual void updateProgress( const long nProgress ) override; - virtual void updatePackageInfo( const css::uno::Reference< css::deployment::XPackage > &xPackage ) SAL_OVERRIDE; + virtual void updatePackageInfo( const css::uno::Reference< css::deployment::XPackage > &xPackage ) override; void setGetExtensionsURL( const OUString &rURL ); virtual long addPackageToList( const css::uno::Reference< css::deployment::XPackage > &, - bool bLicenseMissing = false ) SAL_OVERRIDE; + bool bLicenseMissing = false ) override; bool enablePackage(const css::uno::Reference< css::deployment::XPackage > &xPackage, bool bEnable ); bool removePackage(const css::uno::Reference< css::deployment::XPackage > &xPackage ); @@ -166,8 +166,8 @@ public: TheExtensionManager* getExtensionManager() const { return m_pManager; } - virtual void prepareChecking() SAL_OVERRIDE; - virtual void checkEntries() SAL_OVERRIDE; + virtual void prepareChecking() override; + virtual void checkEntries() override; css::uno::Sequence< OUString > raiseAddPicker(); }; @@ -212,24 +212,24 @@ class UpdateRequiredDialog : public ModalDialog, public: UpdateRequiredDialog( vcl::Window * pParent, TheExtensionManager *pManager ); virtual ~UpdateRequiredDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual short Execute() SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual short Execute() override; + virtual bool Close() override; - virtual void showProgress( bool bStart ) SAL_OVERRIDE; + virtual void showProgress( bool bStart ) override; virtual void updateProgress( const OUString &rText, - const css::uno::Reference< css::task::XAbortChannel > &xAbortChannel) SAL_OVERRIDE; - virtual void updateProgress( const long nProgress ) SAL_OVERRIDE; + const css::uno::Reference< css::task::XAbortChannel > &xAbortChannel) override; + virtual void updateProgress( const long nProgress ) override; - virtual void updatePackageInfo( const css::uno::Reference< css::deployment::XPackage > &xPackage ) SAL_OVERRIDE; + virtual void updatePackageInfo( const css::uno::Reference< css::deployment::XPackage > &xPackage ) override; virtual long addPackageToList( const css::uno::Reference< css::deployment::XPackage > &, - bool bLicenseMissing = false ) SAL_OVERRIDE; + bool bLicenseMissing = false ) override; bool enablePackage( const css::uno::Reference< css::deployment::XPackage > &xPackage, bool bEnable ); - virtual void prepareChecking() SAL_OVERRIDE; - virtual void checkEntries() SAL_OVERRIDE; + virtual void prepareChecking() override; + virtual void checkEntries() override; }; @@ -239,7 +239,7 @@ class ShowLicenseDialog : public ModalDialog public: ShowLicenseDialog(vcl::Window * pParent, const css::uno::Reference< css::deployment::XPackage > &xPackage); virtual ~ShowLicenseDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; @@ -252,8 +252,8 @@ public: css::uno::Reference< css::uno::XComponentContext> const & xComponentContext ); // XExecutableDialog - virtual void SAL_CALL setTitle( OUString const & title ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL execute() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setTitle( OUString const & title ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int16 SAL_CALL execute() throw ( css::uno::RuntimeException, std::exception ) override; }; } // namespace dp_gui diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 95085b07793a..853ab217bea1 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -163,20 +163,20 @@ public: // XCommandEnvironment virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; virtual uno::Reference< ucb::XProgressHandler > SAL_CALL getProgressHandler() - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; // XInteractionHandler virtual void SAL_CALL handle( uno::Reference< task::XInteractionRequest > const & xRequest ) - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; // XProgressHandler virtual void SAL_CALL push( uno::Any const & Status ) - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; virtual void SAL_CALL update( uno::Any const & Status ) - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL pop() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL pop() throw ( uno::RuntimeException, std::exception ) override; }; @@ -235,7 +235,7 @@ public: private: virtual ~Thread(); - virtual void execute() SAL_OVERRIDE; + virtual void execute() override; void _insert(const TExtensionCmd& rExtCmd); diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index c2df79dc9443..1a58a17fe25f 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -102,7 +102,7 @@ public: // XEventListener virtual void SAL_CALL disposing(css::lang::EventObject const& evt) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; @@ -174,13 +174,13 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox public: explicit ExtensionBox_Impl(vcl::Window* pParent); virtual ~ExtensionBox_Impl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle &rPaintRect ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle &rPaintRect ) override; + virtual void Resize() override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual Size GetOptimalSize() const override; void SetExtraSize( long nSize ) { m_nExtraHeight = nSize; } TEntry_Impl GetEntryData( long nPos ) { return m_vEntries[ nPos ]; } @@ -209,12 +209,12 @@ public: //These functions are used for automatic testing /** @return The count of the entries in the list box. */ - virtual sal_Int32 getItemCount() const SAL_OVERRIDE; + virtual sal_Int32 getItemCount() const override; /** @return The index of the first selected entry in the list box. When nothing is selected, which is the case when getItemCount returns '0', then this function returns ENTRY_NOTFOUND */ - virtual sal_Int32 getSelIndex() const SAL_OVERRIDE; + virtual sal_Int32 getSelIndex() const override; }; } diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index d669fb4096e4..9dbfebe5dfae 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -56,8 +56,8 @@ public: virtual ~MyApp(); // Application - virtual int Main() SAL_OVERRIDE; - virtual void DeInit() SAL_OVERRIDE; + virtual int Main() override; + virtual void DeInit() override; }; @@ -156,14 +156,14 @@ public: // XAsynchronousExecutableDialog virtual void SAL_CALL setDialogTitle( OUString const & aTitle ) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual void SAL_CALL startExecuteModal( Reference< ui::dialogs::XDialogClosedListener > const & xListener ) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; // XJobExecutor virtual void SAL_CALL trigger( OUString const & event ) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; }; diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index a66630342012..e709b51a7609 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx @@ -112,17 +112,17 @@ public: // XEventListener virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XTerminateListener virtual void SAL_CALL queryTermination( css::lang::EventObject const & evt ) - throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL notifyTermination( css::lang::EventObject const & evt ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XModifyListener virtual void SAL_CALL modified( css::lang::EventObject const & evt ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace dp_gui diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 5fb517d72a20..7b6133cce877 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -212,7 +212,7 @@ public: private: virtual ~Thread(); - virtual void execute() SAL_OVERRIDE; + virtual void execute() override; void handleSpecificError( uno::Reference< deployment::XPackage > const & package, diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index 024c43722e75..fc1ab43029e1 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -85,11 +85,11 @@ public: std::vector< dp_gui::UpdateData > * updateData); virtual ~UpdateDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; void notifyMenubar( bool bPrepareOnly, bool bRecheckOnly ); static void createNotifyJob( bool bPrepareOnly, @@ -118,9 +118,9 @@ private: explicit CheckListBox(UpdateDialog::CheckListBox &) = delete; void operator =(UpdateDialog::CheckListBox &) = delete; - virtual void MouseButtonDown(MouseEvent const & event) SAL_OVERRIDE; - virtual void MouseButtonUp(MouseEvent const & event) SAL_OVERRIDE; - virtual void KeyInput(KeyEvent const & event) SAL_OVERRIDE; + virtual void MouseButtonDown(MouseEvent const & event) override; + virtual void MouseButtonUp(MouseEvent const & event) override; + virtual void KeyInput(KeyEvent const & event) override; void handlePopupMenu( const Point &rPos ); diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index faf80922fe9d..dfd848e4c2b0 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -89,7 +89,7 @@ public: private: virtual ~Thread(); - virtual void execute() SAL_OVERRIDE; + virtual void execute() override; void downloadExtensions(); void download(OUString const & aUrls, UpdateData & aUpdatData); void installExtensions(); @@ -129,21 +129,21 @@ public: // XCommandEnvironment virtual cssu::Reference<css::task::XInteractionHandler > SAL_CALL - getInteractionHandler() throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + getInteractionHandler() throw (cssu::RuntimeException, std::exception) override; virtual cssu::Reference<css::ucb::XProgressHandler > - SAL_CALL getProgressHandler() throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getProgressHandler() throw (cssu::RuntimeException, std::exception) override; // XInteractionHandler virtual void SAL_CALL handle( cssu::Reference<css::task::XInteractionRequest > const & xRequest ) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (cssu::RuntimeException, std::exception) override; // XProgressHandler virtual void SAL_CALL push( cssu::Any const & Status ) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (cssu::RuntimeException, std::exception) override; virtual void SAL_CALL update( cssu::Any const & Status ) - throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL pop() throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; + throw (cssu::RuntimeException, std::exception) override; + virtual void SAL_CALL pop() throw (cssu::RuntimeException, std::exception) override; }; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index 2b624ba8bdeb..65fc9c592336 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -60,10 +60,10 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xCtx); virtual ~UpdateInstallDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - bool Close() SAL_OVERRIDE; - virtual short Execute() SAL_OVERRIDE; + bool Close() override; + virtual short Execute() override; private: UpdateInstallDialog(UpdateInstallDialog &) = delete; diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 11ae66fefb1a..9a2401cad95e 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -56,7 +56,7 @@ class LicenseView : public MultiLineEdit, public SfxListener public: LicenseView( vcl::Window* pParent, WinBits nStyle ); virtual ~LicenseView(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void ScrollDown( ScrollType eScroll ); @@ -67,7 +67,7 @@ public: void SetScrolledHdl( const Link<LicenseView&,void>& rHdl ) { maScrolledHdl = rHdl; } - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; protected: using MultiLineEdit::Notify; @@ -99,9 +99,9 @@ struct LicenseDialogImpl : public ModalDialog const OUString & sExtensionName, const OUString & sLicenseText); virtual ~LicenseDialogImpl() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Activate() SAL_OVERRIDE; + virtual void Activate() override; }; diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx index c482ee1481a3..121153535635 100644 --- a/desktop/source/deployment/gui/license_dialog.hxx +++ b/desktop/source/deployment/gui/license_dialog.hxx @@ -44,8 +44,8 @@ public: // XExecutableDialog virtual void SAL_CALL setTitle( OUString const & title ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception) override; }; } #endif diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h index 16de82563dc0..22a287f66461 100644 --- a/desktop/source/deployment/inc/dp_interact.h +++ b/desktop/source/deployment/inc/dp_interact.h @@ -118,7 +118,7 @@ public: inline bool isAborted() const { return m_aborted; } // XAbortChannel - virtual void SAL_CALL sendAbort() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL sendAbort() throw (css::uno::RuntimeException, std::exception) override; class SAL_DLLPRIVATE Chain { diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx index b8e95cce08df..ebc3cb52e6fb 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.hxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx @@ -49,21 +49,21 @@ public: // XCommandEnvironment virtual css::uno::Reference<css::task::XInteractionHandler > SAL_CALL - getInteractionHandler() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::ucb::XProgressHandler > - SAL_CALL getProgressHandler() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getProgressHandler() throw (css::uno::RuntimeException, std::exception) override; // XInteractionHandler virtual void SAL_CALL handle( css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XProgressHandler virtual void SAL_CALL push( css::uno::Any const & Status ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL update( css::uno::Any const & Status ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL pop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL pop() throw (css::uno::RuntimeException, std::exception) override; }; class TmpRepositoryCommandEnv : public BaseCommandEnv @@ -75,7 +75,7 @@ public: // XInteractionHandler virtual void SAL_CALL handle( css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; @@ -98,7 +98,7 @@ public: // XInteractionHandler virtual void SAL_CALL handle( css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; @@ -116,7 +116,7 @@ public: // XInteractionHandler virtual void SAL_CALL handle( css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; @@ -135,7 +135,7 @@ public: // XInteractionHandler virtual void SAL_CALL handle( css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // Set to true if a PlatformException or a DependencyException were handled. css::uno::Any m_Exception; diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index d4e939c887e0..6ec3ff4e6eaf 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -55,19 +55,19 @@ public: // XModifyBroadcaster virtual void SAL_CALL addModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; //XExtensionManager virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackageTypeInfo> > SAL_CALL getSupportedPackageTypes() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL - createAbortChannel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createAbortChannel() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL addExtension( OUString const & url, @@ -79,7 +79,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeExtension( OUString const & identifier, @@ -91,7 +91,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL enableExtension( css::uno::Reference<css::deployment::XPackage> const & extension, @@ -101,7 +101,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL disableExtension( css::uno::Reference<css::deployment::XPackage> const & extension, @@ -111,7 +111,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL checkPrerequisitesAndEnable( css::uno::Reference<css::deployment::XPackage> const & extension, @@ -121,7 +121,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> > SAL_CALL getDeployedExtensions( @@ -132,7 +132,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::deployment::XPackage> SAL_CALL getDeployedExtension( @@ -144,7 +144,7 @@ public: css::deployment::DeploymentException, css::ucb::CommandFailedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL getExtensionsWithSameIdentifier( @@ -155,7 +155,7 @@ public: css::deployment::DeploymentException, css::ucb::CommandFailedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > > SAL_CALL getAllExtensions( @@ -165,7 +165,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL reinstallDeployedExtensions( sal_Bool force, OUString const & repository, @@ -176,7 +176,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL synchronize( css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, @@ -185,17 +185,17 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL getExtensionsWithUnacceptedLicenses( OUString const & repository, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv) throw (css::deployment::DeploymentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isReadOnlyRepository(OUString const & repository) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index bc2787a1782a..774fc462e27e 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -68,11 +68,11 @@ class PackageInformationProvider : // XPackageInformationProvider virtual OUString SAL_CALL getPackageLocation( const OUString& extensionId ) - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL isUpdateAvailable( const OUString& extensionId ) - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL getExtensionList() - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; private: diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h index 46e5a262b86c..ab49b7ee17d6 100644 --- a/desktop/source/deployment/manager/dp_manager.h +++ b/desktop/source/deployment/manager/dp_manager.h @@ -105,21 +105,21 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper // XCommandEnvironment virtual css::uno::Reference<css::task::XInteractionHandler> SAL_CALL - getInteractionHandler() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::ucb::XProgressHandler> SAL_CALL - getProgressHandler() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getProgressHandler() throw (css::uno::RuntimeException, std::exception) override; // XProgressHandler virtual void SAL_CALL push( css::uno::Any const & Status ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL update( css::uno::Any const & Status ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL pop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL pop() throw (css::uno::RuntimeException, std::exception) override; }; protected: inline void check(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; virtual ~PackageManagerImpl(); inline PackageManagerImpl( @@ -137,31 +137,31 @@ public: const & xComponentContext, OUString const & context ); // 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 addEventListener( css::uno::Reference<css::lang::XEventListener> const & xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( css::uno::Reference<css::lang::XEventListener> const & xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XModifyBroadcaster virtual void SAL_CALL addModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPackageManager virtual OUString SAL_CALL getContext() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL - createAbortChannel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createAbortChannel() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL addPackage( OUString const & url, @@ -173,7 +173,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL importExtension( css::uno::Reference<css::deployment::XPackage> const & extension, @@ -183,7 +183,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePackage( OUString const & id, OUString const & fileName, @@ -193,7 +193,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; OUString getDeployPath( ActivePackages::Data const & data ); css::uno::Reference<css::deployment::XPackage> SAL_CALL getDeployedPackage_( @@ -209,7 +209,7 @@ public: css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) throw (css::deployment::DeploymentException, css::ucb::CommandFailedException, - css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> > getDeployedPackages_( @@ -222,7 +222,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL reinstallDeployedPackages( sal_Bool force, @@ -232,10 +232,10 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual ::sal_Bool SAL_CALL isReadOnly( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual ::sal_Bool SAL_CALL synchronize( css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, @@ -244,13 +244,13 @@ public: css::ucb::ContentCreationException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL getExtensionsWithUnacceptedLicenses( css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv) throw (css::deployment::DeploymentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL checkPrerequisites( css::uno::Reference<css::deployment::XPackage> const & extension, @@ -260,7 +260,7 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; }; diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index 12522068a066..97bba6c5901c 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.cxx @@ -52,7 +52,7 @@ class PackageManagerFactoryImpl : private MutexHolder, public t_pmfac_helper protected: inline void check(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; public: virtual ~PackageManagerFactoryImpl(); @@ -61,7 +61,7 @@ public: // XPackageManagerFactory virtual Reference<deployment::XPackageManager> SAL_CALL getPackageManager( - OUString const & context ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + OUString const & context ) throw (RuntimeException, std::exception) override; }; diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 984e253e7d26..a27c1718eb9a 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -66,10 +66,10 @@ public: virtual ~EmptyNodeList(); - virtual ::sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL - item(::sal_Int32 index) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + item(::sal_Int32 index) throw (css::uno::RuntimeException, std::exception) override; }; EmptyNodeList::EmptyNodeList() {} @@ -152,14 +152,14 @@ public: bool exist() { return m_bExist;} // XCommandEnvironment virtual css::uno::Reference<css::task::XInteractionHandler > SAL_CALL - getInteractionHandler() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::ucb::XProgressHandler > - SAL_CALL getProgressHandler() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getProgressHandler() throw (css::uno::RuntimeException, std::exception) override; // XInteractionHandler virtual void SAL_CALL handle( css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; ExtensionDescription::ExtensionDescription( diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx index 69f855865bb4..dfa91101479b 100644 --- a/desktop/source/deployment/misc/dp_interact.cxx +++ b/desktop/source/deployment/misc/dp_interact.cxx @@ -50,13 +50,13 @@ public: cppu::UnoType<task::XInteractionContinuation>::get().isAssignableFrom(m_type) ); } // XInterface - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; virtual Any SAL_CALL queryInterface( Type const & type ) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; // XInteractionContinuation - virtual void SAL_CALL select() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL select() throw (RuntimeException, std::exception) override; }; // XInterface diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx index ec2aff2c33b7..2fa6172e428f 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx @@ -65,10 +65,10 @@ namespace component { class ComponentBackendDb: public dp_registry::backend::BackendDb { protected: - virtual OUString getDbNSName() SAL_OVERRIDE; - virtual OUString getNSPrefix() SAL_OVERRIDE; - virtual OUString getRootElementName() SAL_OVERRIDE; - virtual OUString getKeyElementName() SAL_OVERRIDE; + virtual OUString getDbNSName() override; + virtual OUString getNSPrefix() override; + virtual OUString getRootElementName() override; + virtual OUString getKeyElementName() override; public: struct Data diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index f595e9f0170e..35b0205e5394 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -128,19 +128,19 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend void componentLiveRemoval(ComponentBackendDb::Data const & data); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // Package virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; const Reference<registry::XSimpleRegistry> getRDB() const; @@ -162,13 +162,13 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; public: ComponentsPackageImpl( ::rtl::Reference<PackageRegistryBackend> const & myBackend, @@ -184,19 +184,19 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend const bool m_jarFile; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // Package virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; public: TypelibraryPackageImpl( @@ -231,13 +231,13 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; private: OUString const m_aPlatform; @@ -274,9 +274,9 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, bool bRemoved, OUString const & identifier, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; const Reference<deployment::XPackageTypeInfo> m_xDynComponentTypeInfo; const Reference<deployment::XPackageTypeInfo> m_xJavaComponentTypeInfo; @@ -324,11 +324,11 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (RuntimeException, std::exception) override; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE; + uno::RuntimeException, std::exception) override; using PackageRegistryBackend::disposing; diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 128484a1bd04..31cca388ff30 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -75,13 +75,13 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; public: inline PackageImpl( @@ -110,14 +110,14 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, bool bRemoved, OUString const & identifier, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; #if HAVE_FEATURE_EXTENSIONS // for backwards compatibility - nil if no (compatible) back-compat db present ::std::unique_ptr<PersistentMap> m_registeredPackages; #endif - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; const Reference<deployment::XPackageTypeInfo> m_xConfDataTypeInfo; const Reference<deployment::XPackageTypeInfo> m_xConfSchemaTypeInfo; @@ -148,10 +148,10 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (RuntimeException, std::exception) override; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE; + uno::RuntimeException, std::exception) override; using PackageRegistryBackend::disposing; }; diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx index b1de325ed5ca..e38b3885dc15 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx @@ -42,13 +42,13 @@ namespace configuration { class ConfigurationBackendDb: public dp_registry::backend::BackendDb { protected: - virtual OUString getDbNSName() SAL_OVERRIDE; + virtual OUString getDbNSName() override; - virtual OUString getNSPrefix() SAL_OVERRIDE; + virtual OUString getNSPrefix() override; - virtual OUString getRootElementName() SAL_OVERRIDE; + virtual OUString getRootElementName() override; - virtual OUString getKeyElementName() SAL_OVERRIDE; + virtual OUString getKeyElementName() override; public: struct Data diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 7c8b9282c6cc..3eb0c06c0a5a 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -92,7 +92,7 @@ class PackageRegistryImpl : private MutexHolder, public t_helper protected: inline void check(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; virtual ~PackageRegistryImpl(); PackageRegistryImpl() : t_helper( getMutex() ) {} @@ -105,7 +105,7 @@ public: Reference<XComponentContext> const & xComponentContext ); // XUpdatable - virtual void SAL_CALL update() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL update() throw (RuntimeException, std::exception) override; // XPackageRegistry virtual Reference<deployment::XPackage> SAL_CALL bindPackage( @@ -114,12 +114,12 @@ public: throw (deployment::DeploymentException, deployment::InvalidRemovedParameterException, CommandFailedException, - lang::IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + lang::IllegalArgumentException, RuntimeException, std::exception) override; virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (RuntimeException, std::exception) override; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; }; diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 9be5d9c53bfc..18d1e7786c5e 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -50,13 +50,13 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<dp_misc::AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<dp_misc::AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; bool getFileAttributes(sal_uInt64& out_Attributes); bool isUrlTargetInExtension(); @@ -79,7 +79,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend // PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, bool bRemoved, - OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ) override; void addDataToDb(OUString const & url); bool hasActiveEntry(OUString const & url); @@ -93,10 +93,10 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (RuntimeException, std::exception) override; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE; + uno::RuntimeException, std::exception) override; using PackageRegistryBackend::disposing; }; diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx index dcf3135a437f..da5ff6cf7099 100644 --- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx +++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx @@ -42,13 +42,13 @@ namespace executable { class ExecutableBackendDb: public dp_registry::backend::RegisteredDb { protected: - virtual OUString getDbNSName() SAL_OVERRIDE; + virtual OUString getDbNSName() override; - virtual OUString getNSPrefix() SAL_OVERRIDE; + virtual OUString getNSPrefix() override; - virtual OUString getRootElementName() SAL_OVERRIDE; + virtual OUString getRootElementName() override; - virtual OUString getKeyElementName() SAL_OVERRIDE; + virtual OUString getKeyElementName() override; public: diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 67ca90f68a46..f6e5a4b3e06c 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -64,13 +64,13 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; public: @@ -85,7 +85,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend //XPackage virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() throw (deployment::DeploymentException, deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; }; friend class PackageImpl; @@ -93,7 +93,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, bool bRemoved, OUString const & identifier, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; void implProcessHelp( PackageImpl * package, bool doRegisterPackage, Reference<ucb::XCommandEnvironment> const & xCmdEnv); @@ -119,10 +119,10 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (RuntimeException, std::exception) override; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE; + uno::RuntimeException, std::exception) override; }; diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx index 031cccb42786..191e1a54d293 100644 --- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx +++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx @@ -41,13 +41,13 @@ namespace help { class HelpBackendDb: public dp_registry::backend::BackendDb { protected: - virtual OUString getDbNSName() SAL_OVERRIDE; + virtual OUString getDbNSName() override; - virtual OUString getNSPrefix() SAL_OVERRIDE; + virtual OUString getNSPrefix() override; - virtual OUString getRootElementName() SAL_OVERRIDE; + virtual OUString getRootElementName() override; - virtual OUString getKeyElementName() SAL_OVERRIDE; + virtual OUString getKeyElementName() override; public: struct Data diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 67b0ddfb29f5..d5c29eade70d 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -69,7 +69,7 @@ protected: void check() const; void fireModified(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; void checkAborted( ::rtl::Reference< ::dp_misc::AbortChannel > const & abortChannel ); @@ -120,40 +120,40 @@ public: {} // XPackageTypeInfo virtual OUString SAL_CALL getMediaType() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getDescription() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getShortDescription() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getFileFilter() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getIcon( sal_Bool highContrast, sal_Bool smallIcon ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; // 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 addEventListener( css::uno::Reference<css::lang::XEventListener> const & xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( css::uno::Reference<css::lang::XEventListener> const & xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XModifyBroadcaster virtual void SAL_CALL addModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPackage virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL - createAbortChannel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createAbortChannel() throw (css::uno::RuntimeException, std::exception) override; virtual css::beans::Optional< css::beans::Ambiguous<sal_Bool> > SAL_CALL isRegistered( css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, @@ -161,7 +161,7 @@ public: throw (css::deployment::DeploymentException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual ::sal_Int32 SAL_CALL checkPrerequisites( const css::uno::Reference< css::task::XAbortChannel >& xAbortChannel, @@ -171,14 +171,14 @@ public: css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual ::sal_Bool SAL_CALL checkDependencies( const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv ) throw (css::deployment::DeploymentException, css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL registerPackage( sal_Bool startup, @@ -188,7 +188,7 @@ public: css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL revokePackage( sal_Bool startup, css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, @@ -197,9 +197,9 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isBundle() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> > SAL_CALL getBundle( css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, @@ -208,39 +208,39 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::beans::Optional< OUString > SAL_CALL getIdentifier() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getVersion() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getURL() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getDisplayName() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getDescription() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getLicenseText() throw (css::deployment::DeploymentException, css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getUpdateInformationURLs() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::beans::StringPair SAL_CALL getPublisherInfo() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getIcon( sal_Bool bHighContrast ) throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::deployment::XPackageTypeInfo> SAL_CALL - getPackageType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getPackageType() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL exportTo( OUString const & destFolderURL, OUString const & newTitle, @@ -248,15 +248,15 @@ public: css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) throw (css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::ucb::ContentCreationException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::ucb::ContentCreationException, css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getRepositoryName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() throw (css::deployment::DeploymentException, css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isRemoved() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; @@ -306,7 +306,7 @@ protected: = 0; void check(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; virtual ~PackageRegistryBackend(); PackageRegistryBackend( @@ -350,7 +350,7 @@ public: // XEventListener virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPackageRegistry virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL bindPackage( @@ -360,7 +360,7 @@ public: throw (css::deployment::DeploymentException, css::deployment::InvalidRemovedParameterException, css::ucb::CommandFailedException, - css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // virtual void SAL_CALL packageRemoved( // OUString const & url, OUString const & mediaType) diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx index 4d0060eadc61..a5f06976855c 100644 --- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx +++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx @@ -43,10 +43,10 @@ namespace bundle { class ExtensionBackendDb: public dp_registry::backend::BackendDb { protected: - virtual OUString getDbNSName() SAL_OVERRIDE; - virtual OUString getNSPrefix() SAL_OVERRIDE; - virtual OUString getRootElementName() SAL_OVERRIDE; - virtual OUString getKeyElementName() SAL_OVERRIDE; + virtual OUString getDbNSName() override; + virtual OUString getNSPrefix() override; + virtual OUString getRootElementName() override; + virtual OUString getKeyElementName() override; public: struct Data diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 4f974ec102aa..6a9dc3fa317c 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -147,15 +147,15 @@ class BackendImpl : public ImplBaseT virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<ucb::XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<ucb::XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<ucb::XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<ucb::XCommandEnvironment> const & xCmdEnv ) override; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; @@ -170,7 +170,7 @@ class BackendImpl : public ImplBaseT OUString const & identifier); // XPackage - virtual sal_Bool SAL_CALL isBundle() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isBundle() throw (RuntimeException, std::exception) override; virtual Sequence< Reference<deployment::XPackage> > SAL_CALL getBundle( Reference<task::XAbortChannel> const & xAbortChannel, @@ -178,14 +178,14 @@ class BackendImpl : public ImplBaseT throw (deployment::DeploymentException, ucb::CommandFailedException, ucb::CommandAbortedException, - lang::IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + lang::IllegalArgumentException, RuntimeException, std::exception) override; virtual OUString SAL_CALL getDescription() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override; virtual OUString SAL_CALL getLicenseText() throw (deployment::DeploymentException, deployment::ExtensionRemovedException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual void SAL_CALL exportTo( OUString const & destFolderURL, OUString const & newTitle, @@ -195,7 +195,7 @@ class BackendImpl : public ImplBaseT ucb::CommandFailedException, ucb::CommandAbortedException, ucb::ContentCreationException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual ::sal_Int32 SAL_CALL checkPrerequisites( const Reference< task::XAbortChannel >& xAbortChannel, @@ -205,34 +205,34 @@ class BackendImpl : public ImplBaseT deployment::DeploymentException, ucb::CommandFailedException, ucb::CommandAbortedException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL checkDependencies( const Reference< ucb::XCommandEnvironment >& xCmdEnv ) throw (deployment::DeploymentException, deployment::ExtensionRemovedException, ucb::CommandFailedException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual beans::Optional<OUString> SAL_CALL getIdentifier() - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual OUString SAL_CALL getVersion() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override; virtual Sequence<OUString> SAL_CALL getUpdateInformationURLs() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override; virtual beans::StringPair SAL_CALL getPublisherInfo() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override; virtual OUString SAL_CALL getDisplayName() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override; virtual Reference< graphic::XGraphic > SAL_CALL getIcon( sal_Bool bHighContrast ) throw (deployment::ExtensionRemovedException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; }; friend class PackageImpl; @@ -251,9 +251,9 @@ class BackendImpl : public ImplBaseT virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, bool bRemoved, OUString const & identifier, - Reference<ucb::XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<ucb::XCommandEnvironment> const & xCmdEnv ) override; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; public: BackendImpl( @@ -262,18 +262,18 @@ public: Reference<deployment::XPackageRegistry> const & xRootRegistry ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( OUString const& name ) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (RuntimeException, std::exception) override; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE; + uno::RuntimeException, std::exception) override; using ImplBaseT::disposing; }; diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index 635865677115..a02ee3f6688c 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -62,13 +62,13 @@ class BackendImpl : public t_helper virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; public: PackageImpl( @@ -84,7 +84,7 @@ class BackendImpl : public t_helper virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, bool bRemoved, OUString const & identifier, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; void addDataToDb(OUString const & url); bool hasActiveEntry(OUString const & url); @@ -99,14 +99,14 @@ public: Reference<XComponentContext> const & xComponentContext ); // XUpdatable - virtual void SAL_CALL update() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL update() throw (RuntimeException, std::exception) override; // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (RuntimeException, std::exception) override; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE; + uno::RuntimeException, std::exception) override; }; diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx index d4f1c2753410..c1a6024f4d86 100644 --- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx +++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx @@ -40,13 +40,13 @@ namespace script { class ScriptBackendDb: public dp_registry::backend::RegisteredDb { protected: - virtual OUString getDbNSName() SAL_OVERRIDE; + virtual OUString getDbNSName() override; - virtual OUString getNSPrefix() SAL_OVERRIDE; + virtual OUString getNSPrefix() override; - virtual OUString getRootElementName() SAL_OVERRIDE; + virtual OUString getRootElementName() override; - virtual OUString getKeyElementName() SAL_OVERRIDE; + virtual OUString getKeyElementName() override; public: diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx index 11051e6fb532..0c7459d42d0b 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx @@ -49,32 +49,32 @@ public: bool isParsed() { return m_bIsParsed; } // XDocumentHandler virtual void SAL_CALL startDocument() - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs ) throw ( css::xml::sax::SAXException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endElement( const OUString & aName ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL characters( const OUString & aChars ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL ignorableWhitespace( const OUString & aWhitespaces ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL processingInstruction( const OUString & aTarget, const OUString & aData ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; }; } } diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 6e5d99629c6f..98d044d6ecf8 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -61,13 +61,13 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; public: PackageImpl( @@ -77,10 +77,10 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend // XPackage virtual OUString SAL_CALL getDescription() throw (deployment::ExtensionRemovedException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual OUString SAL_CALL getLicenseText() throw (deployment::ExtensionRemovedException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; }; friend class PackageImpl; @@ -88,7 +88,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, bool bRemoved, OUString const & identifier, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; const Reference<deployment::XPackageTypeInfo> m_xTypeInfo; @@ -100,10 +100,10 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (RuntimeException, std::exception) override; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE; + uno::RuntimeException, std::exception) override; }; BackendImpl * BackendImpl::PackageImpl::getMyBackend() const |