diff options
Diffstat (limited to 'cui/source/inc/cfg.hxx')
-rw-r--r-- | cui/source/inc/cfg.hxx | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index c23e1f0af162..e768576f1857 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -66,7 +66,7 @@ private: public: SvxConfigDialog( vcl::Window*, const SfxItemSet* ); - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; void SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame); }; @@ -189,12 +189,12 @@ public: virtual ~MenuSaveInData(); /// methods inherited from SaveInData - SvxEntries* GetEntries() SAL_OVERRIDE; - void SetEntries( SvxEntries* ) SAL_OVERRIDE; - bool HasURL( const OUString& URL ) SAL_OVERRIDE { (void)URL; return false; } - bool HasSettings() SAL_OVERRIDE { return m_xMenuSettings.is(); } - void Reset() SAL_OVERRIDE; - bool Apply() SAL_OVERRIDE; + SvxEntries* GetEntries() override; + void SetEntries( SvxEntries* ) override; + bool HasURL( const OUString& URL ) override { (void)URL; return false; } + bool HasSettings() override { return m_xMenuSettings.is(); } + void Reset() override; + bool Apply() override; }; class SvxConfigEntry @@ -299,24 +299,24 @@ protected: public: SvxMenuEntriesListBox(vcl::Window*, SvxConfigPage*); virtual ~SvxMenuEntriesListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; - virtual bool NotifyAcceptDrop( SvTreeListEntry* pEntry ) SAL_OVERRIDE; + virtual bool NotifyAcceptDrop( SvTreeListEntry* pEntry ) override; virtual TriState NotifyMoving( SvTreeListEntry*, SvTreeListEntry*, - SvTreeListEntry*&, sal_uLong& ) SAL_OVERRIDE; + SvTreeListEntry*&, sal_uLong& ) override; virtual TriState NotifyCopying( SvTreeListEntry*, SvTreeListEntry*, - SvTreeListEntry*&, sal_uLong&) SAL_OVERRIDE; + SvTreeListEntry*&, sal_uLong&) override; virtual DragDropMode NotifyStartDrag( - TransferDataContainer&, SvTreeListEntry* ) SAL_OVERRIDE; + TransferDataContainer&, SvTreeListEntry* ) override; - virtual void DragFinished( sal_Int8 ) SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 ) override; - void KeyInput( const KeyEvent& rKeyEvent ) SAL_OVERRIDE; + void KeyInput( const KeyEvent& rKeyEvent ) override; }; class SvxConfigPage : public SfxTabPage @@ -395,7 +395,7 @@ protected: public: virtual ~SvxConfigPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static bool CanConfig( const OUString& rModuleId ); @@ -410,8 +410,8 @@ public: bool MoveEntryData( SvTreeListEntry* pSourceEntry, SvTreeListEntry* pTargetEntry ); - bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - void Reset( const SfxItemSet* ) SAL_OVERRIDE; + bool FillItemSet( SfxItemSet* ) override; + void Reset( const SfxItemSet* ) override; virtual bool DeleteSelectedContent() = 0; virtual void DeleteSelectedTopLevel() = 0; @@ -448,16 +448,16 @@ private: DECL_LINK_TYPED( AddCommandsHdl, Button *, void ); DECL_LINK_TYPED( AddFunctionHdl, SvxScriptSelectorDialog&, void ); - void Init() SAL_OVERRIDE; - void UpdateButtonStates() SAL_OVERRIDE; - short QueryReset() SAL_OVERRIDE; - bool DeleteSelectedContent() SAL_OVERRIDE; - void DeleteSelectedTopLevel() SAL_OVERRIDE; + void Init() override; + void UpdateButtonStates() override; + short QueryReset() override; + bool DeleteSelectedContent() override; + void DeleteSelectedTopLevel() override; public: SvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SvxMenuConfigPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SaveInData* CreateSaveInData( const css::uno::Reference < @@ -465,7 +465,7 @@ public: const css::uno::Reference < css::ui::XUIConfigurationManager >&, const OUString& aModuleId, - bool docConfig ) SAL_OVERRIDE; + bool docConfig ) override; }; class SvxMainMenuOrganizerDialog : public ModalDialog @@ -491,7 +491,7 @@ public: vcl::Window*, SvxEntries*, SvxConfigEntry*, bool bCreateMenu = false ); virtual ~SvxMainMenuOrganizerDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SvxEntries* GetEntries() { return mpEntries;} SvxConfigEntry* GetSelectedEntry(); @@ -507,8 +507,8 @@ class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox protected: - virtual void CheckButtonHdl() SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void CheckButtonHdl() override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void BuildCheckBoxButtonImages( SvLBoxButtonData* ); Image GetSizedImage( VirtualDevice& aDev, const Size& aNewSize, const Image& aImage ); @@ -517,15 +517,15 @@ public: SvxToolbarEntriesListBox(vcl::Window* pParent, SvxToolbarConfigPage* pPg); virtual ~SvxToolbarEntriesListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; virtual TriState NotifyMoving( - SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong& ) SAL_OVERRIDE; + SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong& ) override; virtual TriState NotifyCopying( - SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong&) SAL_OVERRIDE; + SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong&) override; - void KeyInput( const KeyEvent& rKeyEvent ) SAL_OVERRIDE; + void KeyInput( const KeyEvent& rKeyEvent ) override; }; class SvxToolbarConfigPage : public SvxConfigPage @@ -541,22 +541,22 @@ private: DECL_LINK_TYPED( AddFunctionHdl, SvxScriptSelectorDialog&, void ); DECL_LINK_TYPED( MoveHdl, Button *, void ); - void UpdateButtonStates() SAL_OVERRIDE; - short QueryReset() SAL_OVERRIDE; - void Init() SAL_OVERRIDE; - bool DeleteSelectedContent() SAL_OVERRIDE; - void DeleteSelectedTopLevel() SAL_OVERRIDE; + void UpdateButtonStates() override; + short QueryReset() override; + void Init() override; + bool DeleteSelectedContent() override; + void DeleteSelectedTopLevel() override; public: SvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SvxToolbarConfigPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SvTreeListEntry* AddFunction( SvTreeListEntry* pTarget = NULL, bool bFront = false, bool bAllowDuplicates = true ); - void MoveEntry( bool bMoveUp ) SAL_OVERRIDE; + void MoveEntry( bool bMoveUp ) override; SaveInData* CreateSaveInData( const css::uno::Reference < @@ -564,7 +564,7 @@ public: const css::uno::Reference < css::ui::XUIConfigurationManager >&, const OUString& aModuleId, - bool docConfig ) SAL_OVERRIDE; + bool docConfig ) override; }; class ToolbarSaveInData : public SaveInData @@ -611,12 +611,12 @@ public: css::uno::Reference< css::frame::XFrame > xFrame, const OUString& rResourceURL, sal_Int32 nStyle ); - SvxEntries* GetEntries() SAL_OVERRIDE; - void SetEntries( SvxEntries* ) SAL_OVERRIDE; - bool HasSettings() SAL_OVERRIDE; - bool HasURL( const OUString& rURL ) SAL_OVERRIDE; - void Reset() SAL_OVERRIDE; - bool Apply() SAL_OVERRIDE; + SvxEntries* GetEntries() override; + void SetEntries( SvxEntries* ) override; + bool HasSettings() override; + bool HasURL( const OUString& rURL ) override; + void Reset() override; + bool Apply() override; }; class SvxNewToolbarDialog : public ModalDialog @@ -628,7 +628,7 @@ private: public: SvxNewToolbarDialog(vcl::Window* pWindow, const OUString& rName); virtual ~SvxNewToolbarDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; VclPtr<ListBox> m_pSaveInListBox; @@ -684,7 +684,7 @@ public: ); virtual ~SvxIconSelectorDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; css::uno::Reference< css::graphic::XGraphic > GetSelectedIcon(); @@ -718,7 +718,7 @@ private: public: SvxIconChangeDialog(vcl::Window *pWindow, const OUString& aMessage); virtual ~SvxIconChangeDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif // INCLUDED_CUI_SOURCE_INC_CFG_HXX |