diff options
Diffstat (limited to 'svx/source/inc/datanavi.hxx')
| -rw-r--r-- | svx/source/inc/datanavi.hxx | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index df846f608216..15626163fa8d 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -131,13 +131,13 @@ namespace svxform public: DataTreeListBox( vcl::Window* pParent, WinBits nBits ); virtual ~DataTreeListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual std::unique_ptr<PopupMenu> CreateContextMenu() SAL_OVERRIDE; - virtual void ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry ) 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 ) SAL_OVERRIDE; + virtual std::unique_ptr<PopupMenu> CreateContextMenu() override; + virtual void ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry ) override; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override; void SetGroup(DataGroupType _eGroup); void SetXFormsPage(XFormsPage* _pPage); @@ -287,14 +287,14 @@ namespace svxform bool RemoveEntry(); protected: - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; public: XFormsPage( vcl::Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup ); virtual ~XFormsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; inline bool HasModel() const { return m_bHasModel; } OUString SetModel( const XModel_ref& _xModel, sal_uInt16 _nPagePos ); @@ -367,13 +367,13 @@ namespace svxform bool IsAdditionalPage(sal_uInt16 nPageId) const; protected: - virtual void Resize() SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Resize() override; + virtual Size GetOptimalSize() const override; public: DataNavigatorWindow( vcl::Window* pParent, SfxBindings* pBindings ); virtual ~DataNavigatorWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static void SetDocModified(); void NotifyChanges( bool _bLoadAll = false ); @@ -393,22 +393,22 @@ namespace svxform VclPtr<DataNavigatorWindow> m_aDataWin; protected: - virtual void Resize() SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual Size CalcDockingSize( SfxChildAlignment ) SAL_OVERRIDE; - virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ) SAL_OVERRIDE; + virtual void Resize() override; + virtual bool Close() override; + virtual void GetFocus() override; + virtual Size CalcDockingSize( SfxChildAlignment ) override; + virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ) override; public: DataNavigator( SfxBindings* pBindings, SfxChildWindow* pMgr, vcl::Window* pParent ); virtual ~DataNavigator(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; using Window::Update; using SfxDockingWindow::StateChanged; void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; }; @@ -473,7 +473,7 @@ namespace svxform AddDataItemDialog( vcl::Window* pParent, ItemNode* _pNode, const XFormsUIHelper1_ref& _rUIHelper ); virtual ~AddDataItemDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void InitText( DataItemType _eType ); }; @@ -502,7 +502,7 @@ namespace svxform AddConditionDialog(vcl::Window* pParent, const OUString& _rPropertyName, const XPropertySet_ref& _rBinding); virtual ~AddConditionDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; XFormsUIHelper1_ref GetUIHelper() const { return m_xUIHelper; } OUString GetCondition() const { return m_pConditionED->GetText(); } @@ -539,7 +539,7 @@ namespace svxform public: NamespaceItemDialog( AddConditionDialog* pParent, XNameContainer_ref& _rContainer ); virtual ~NamespaceItemDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; @@ -557,7 +557,7 @@ namespace svxform public: ManageNamespaceDialog(vcl::Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit); virtual ~ManageNamespaceDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetNamespace(const OUString& _rPrefix, const OUString& _rURL) { @@ -602,7 +602,7 @@ namespace svxform AddSubmissionDialog( vcl::Window* pParent, ItemNode* _pNode, const XFormsUIHelper1_ref& _rUIHelper ); virtual ~AddSubmissionDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; inline const XSubmission_ref& GetNewSubmission() const { return m_xNewSubmission; } }; @@ -617,7 +617,7 @@ namespace svxform public: AddModelDialog( vcl::Window* pParent, bool _bEdit ); virtual ~AddModelDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetName() const { return m_pNameED->GetText(); } void SetName( const OUString& _rName ) { m_pNameED->SetText( _rName );} @@ -643,7 +643,7 @@ namespace svxform public: AddInstanceDialog( vcl::Window* pParent, bool _bEdit ); virtual ~AddInstanceDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetName() const { return m_pNameED->GetText(); } void SetName( const OUString& _rName ) { m_pNameED->SetText( _rName );} |