summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /basctl
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/basicide/basdoc.hxx4
-rw-r--r--basctl/source/basicide/basicbox.hxx44
-rw-r--r--basctl/source/basicide/basicrenderable.hxx6
-rw-r--r--basctl/source/basicide/baside2.hxx152
-rw-r--r--basctl/source/basicide/baside2b.cxx4
-rw-r--r--basctl/source/basicide/basidesh.cxx8
-rw-r--r--basctl/source/basicide/bastype2.hxx32
-rw-r--r--basctl/source/basicide/brkdlg.hxx2
-rw-r--r--basctl/source/basicide/doceventnotifier.cxx6
-rw-r--r--basctl/source/basicide/layout.hxx6
-rw-r--r--basctl/source/basicide/linenumberwindow.hxx6
-rw-r--r--basctl/source/basicide/macrodlg.hxx4
-rw-r--r--basctl/source/basicide/moduldl2.cxx8
-rw-r--r--basctl/source/basicide/moduldlg.hxx44
-rw-r--r--basctl/source/basicide/objdlg.hxx6
-rw-r--r--basctl/source/basicide/scriptdocument.cxx20
-rw-r--r--basctl/source/basicide/unomodel.hxx22
-rw-r--r--basctl/source/inc/accessibledialogcontrolshape.hxx50
-rw-r--r--basctl/source/inc/accessibledialogwindow.hxx62
-rw-r--r--basctl/source/inc/baside3.hxx70
-rw-r--r--basctl/source/inc/basidectrlr.hxx16
-rw-r--r--basctl/source/inc/basidesh.hxx50
-rw-r--r--basctl/source/inc/bastypes.hxx24
-rw-r--r--basctl/source/inc/dlgedclip.hxx8
-rw-r--r--basctl/source/inc/dlgedfunc.hxx12
-rw-r--r--basctl/source/inc/dlgedlist.hxx12
-rw-r--r--basctl/source/inc/dlgedmod.hxx2
-rw-r--r--basctl/source/inc/dlgedobj.hxx32
-rw-r--r--basctl/source/inc/dlgedpage.hxx6
-rw-r--r--basctl/source/inc/dlgedview.hxx6
-rw-r--r--basctl/source/inc/managelang.hxx4
-rw-r--r--basctl/source/inc/propbrw.hxx6
-rw-r--r--basctl/source/inc/sbxitem.hxx4
33 files changed, 369 insertions, 369 deletions
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index d507b468bd12..487a5b60bbd5 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -36,14 +36,14 @@ class DocShell: public SfxObjectShell
protected:
virtual void Draw( OutputDevice *, const JobSetup & rSetup,
- sal_uInt16 nAspect = ASPECT_CONTENT ) SAL_OVERRIDE;
+ sal_uInt16 nAspect = ASPECT_CONTENT ) override;
virtual void FillClass( SvGlobalName * pClassName,
SotClipboardFormatId * pFormat,
OUString * pAppName,
OUString * pFullTypeName,
OUString * pShortTypeName,
sal_Int32 nVersion,
- bool bTemplate = false ) const SAL_OVERRIDE;
+ bool bTemplate = false ) const override;
public:
TYPEINFO_OVERRIDE();
diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx
index 0ff594c711b3..91027417acdc 100644
--- a/basctl/source/basicide/basicbox.hxx
+++ b/basctl/source/basicide/basicbox.hxx
@@ -35,8 +35,8 @@ public:
LibBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
- const SfxPoolItem* pState ) SAL_OVERRIDE;
- virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE;
+ const SfxPoolItem* pState ) override;
+ virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override;
};
/** base class for list boxes which need to update their content according to the list
@@ -48,22 +48,22 @@ class DocListenerBox :public ListBox
protected:
DocListenerBox( vcl::Window* pParent );
virtual ~DocListenerBox();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
protected:
virtual void FillBox() = 0;
private:
// DocumentEventListener
- virtual void onDocumentCreated( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentOpened( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentSave( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentSaveDone( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentSaveAs( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentSaveAsDone( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentClosed( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentTitleChanged( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentModeChanged( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
+ virtual void onDocumentCreated( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentOpened( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentSave( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentSaveDone( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentSaveAs( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentSaveAsDone( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentClosed( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentTitleChanged( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentModeChanged( const ScriptDocument& _rDocument ) override;
private:
DocumentEventNotifier m_aNotifier;
@@ -86,17 +86,17 @@ private:
void NotifyIDE();
// DocListenerBox
- virtual void FillBox() SAL_OVERRIDE;
+ virtual void FillBox() override;
protected:
- virtual void Select() SAL_OVERRIDE;
- virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+ virtual void Select() override;
+ virtual bool PreNotify( NotifyEvent& rNEvt ) override;
public:
LibBox( vcl::Window* pParent,
const css::uno::Reference< css::frame::XFrame >& rFrame );
virtual ~LibBox();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
using Window::Update;
void Update( const SfxStringItem* pItem );
@@ -109,8 +109,8 @@ public:
LanguageBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
- virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE;
- virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE;
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override;
+ virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override;
};
class LanguageBox : public DocListenerBox
@@ -126,16 +126,16 @@ private:
void SetLanguage();
// DocListenerBox
- virtual void FillBox() SAL_OVERRIDE;
+ virtual void FillBox() override;
protected:
- virtual void Select() SAL_OVERRIDE;
- virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+ virtual void Select() override;
+ virtual bool PreNotify( NotifyEvent& rNEvt ) override;
public:
LanguageBox( vcl::Window* pParent );
virtual ~LanguageBox();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
using Window::Update;
void Update( const SfxStringItem* pItem );
diff --git a/basctl/source/basicide/basicrenderable.hxx b/basctl/source/basicide/basicrenderable.hxx
index 9fce279dd215..5698ccc945d6 100644
--- a/basctl/source/basicide/basicrenderable.hxx
+++ b/basctl/source/basicide/basicrenderable.hxx
@@ -45,19 +45,19 @@ public:
virtual sal_Int32 SAL_CALL getRendererCount (
const css::uno::Any& aSelection,
const css::uno::Sequence<css::beans::PropertyValue >& xOptions)
- throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getRenderer (
sal_Int32 nRenderer,
const css::uno::Any& rSelection,
const css::uno::Sequence<css::beans::PropertyValue>& rxOptions)
- throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL render (
sal_Int32 nRenderer,
const css::uno::Any& rSelection,
const css::uno::Sequence<css::beans::PropertyValue>& rxOptions)
- throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
};
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index ca6aa2dfaf8a..94b2f18c67b1 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -94,10 +94,10 @@ private:
class ProgressInfo;
std::unique_ptr<ProgressInfo> pProgress;
- virtual void DataChanged(DataChangedEvent const & rDCEvt) SAL_OVERRIDE;
+ virtual void DataChanged(DataChangedEvent const & rDCEvt) override;
using Window::Notify;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
void ImpDoHighlight( sal_uLong nLineOff );
void ImplSetFont();
@@ -106,7 +106,7 @@ private:
bool bDoSyntaxHighlight;
bool bDelayHighlight;
- virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface(bool bCreate = true) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface(bool bCreate = true) override;
CodeCompleteDataCache aCodeCompleteCache;
VclPtr<CodeCompleteWindow> pCodeCompleteWnd;
OUString GetActualSubName( sal_uLong nLine ); // gets the actual subroutine name according to line number
@@ -119,15 +119,15 @@ private:
TextSelection GetLastHighlightPortionTextSelection();
protected:
- virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE;
- virtual void Resize() SAL_OVERRIDE;
- virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE;
- virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
- virtual void LoseFocus() SAL_OVERRIDE;
- virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override;
+ virtual void Resize() override;
+ virtual void KeyInput( const KeyEvent& rKeyEvt ) override;
+ virtual void MouseMove( const MouseEvent& rMEvt ) override;
+ virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
+ virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
+ virtual void Command( const CommandEvent& rCEvt ) override;
+ virtual void LoseFocus() override;
+ virtual void RequestHelp( const HelpEvent& rHEvt ) override;
void DoSyntaxHighlight( sal_uLong nPara );
OUString GetWordAtCursor();
@@ -136,7 +136,7 @@ protected:
public:
EditorWindow (vcl::Window* pParent, ModulWindow*);
virtual ~EditorWindow();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
ExtTextEngine* GetEditEngine() const { return pEditEngine.get(); }
ExtTextView* GetEditView() const { return pEditView.get(); }
@@ -171,16 +171,16 @@ private:
BreakPointList aBreakPointList;
bool bErrorMarker;
- virtual void DataChanged(DataChangedEvent const & rDCEvt) SAL_OVERRIDE;
+ virtual void DataChanged(DataChangedEvent const & rDCEvt) override;
void setBackgroundColor(Color aColor);
protected:
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
BreakPoint* FindBreakPoint( const Point& rMousePos );
void ShowMarker(vcl::RenderContext& rRenderContext);
- virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
+ virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
+ virtual void Command( const CommandEvent& rCEvt ) override;
bool SyncYOffset();
@@ -201,8 +201,8 @@ class WatchTreeListBox : public SvHeaderTabListBox
OUString aEditingRes;
protected:
- virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ) SAL_OVERRIDE;
- virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) SAL_OVERRIDE;
+ virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ) override;
+ virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) override;
bool ImplBasicEntryEdited( SvTreeListEntry* pEntry, const OUString& rResult );
SbxBase* ImplGetSBXForEntry( SvTreeListEntry* pEntry, bool& rbArrayElement );
@@ -210,13 +210,13 @@ protected:
public:
WatchTreeListBox( vcl::Window* pParent, WinBits nWinBits );
virtual ~WatchTreeListBox();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
- void RequestingChildren( SvTreeListEntry * pParent ) SAL_OVERRIDE;
+ void RequestingChildren( SvTreeListEntry * pParent ) override;
void UpdateWatches( bool bBasicStopped = false );
using SvTabListBox::SetTabs;
- virtual void SetTabs() SAL_OVERRIDE;
+ virtual void SetTabs() override;
};
@@ -231,8 +231,8 @@ private:
VclPtr<HeaderBar> aHeaderBar;
protected:
- virtual void Resize() SAL_OVERRIDE;
- virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Resize() override;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
DECL_LINK_TYPED( ButtonHdl, Button *, void );
DECL_LINK_TYPED(TreeListHdl, SvTreeListBox*, void);
@@ -243,7 +243,7 @@ protected:
public:
explicit WatchWindow (Layout* pParent);
virtual ~WatchWindow();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void AddWatch( const OUString& rVName );
bool RemoveSelectedWatch();
@@ -258,13 +258,13 @@ private:
OUString aStackStr;
protected:
- virtual void Resize() SAL_OVERRIDE;
- virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Resize() override;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
public:
explicit StackWindow (Layout* pParent);
virtual ~StackWindow();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void UpdateCalls();
};
@@ -278,16 +278,16 @@ private:
VclPtr<EditorWindow> aEdtWindow;
VclPtr<ScrollBar> aEWVScrollBar;
- virtual void DataChanged(DataChangedEvent const & rDCEvt) SAL_OVERRIDE;
+ virtual void DataChanged(DataChangedEvent const & rDCEvt) override;
protected:
- virtual void Resize() SAL_OVERRIDE;
+ virtual void Resize() override;
DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
public:
explicit ComplexEditorWindow( ModulWindow* pParent );
virtual ~ComplexEditorWindow();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
BreakPointWindow& GetBrkWindow() { return *aBrkWindow.get(); }
LineNumberWindow& GetLineNumberWindow() { return *aLineNumberWindow.get(); }
EditorWindow& GetEdtWindow() { return *aEdtWindow.get(); }
@@ -317,33 +317,33 @@ private:
sal_Int32 FormatAndPrint( Printer* pPrinter, sal_Int32 nPage = -1 );
SbModuleRef XModule();
protected:
- virtual void Resize() SAL_OVERRIDE;
- virtual void GetFocus() SAL_OVERRIDE;
- virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE;
- virtual void DoInit() SAL_OVERRIDE;
- virtual void DoScroll( ScrollBar* pCurScrollBar ) SAL_OVERRIDE;
+ virtual void Resize() override;
+ virtual void GetFocus() override;
+ virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override;
+ virtual void DoInit() override;
+ virtual void DoScroll( ScrollBar* pCurScrollBar ) override;
public:
ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, OUString& aModule );
virtual ~ModulWindow();
- virtual void dispose() SAL_OVERRIDE;
-
- virtual void ExecuteCommand (SfxRequest& rReq) SAL_OVERRIDE;
- virtual void ExecuteGlobal (SfxRequest& rReq) SAL_OVERRIDE;
- virtual void GetState( SfxItemSet& ) SAL_OVERRIDE;
- virtual void StoreData() SAL_OVERRIDE;
- virtual void UpdateData() SAL_OVERRIDE;
- virtual bool CanClose() SAL_OVERRIDE;
+ virtual void dispose() override;
+
+ virtual void ExecuteCommand (SfxRequest& rReq) override;
+ virtual void ExecuteGlobal (SfxRequest& rReq) override;
+ virtual void GetState( SfxItemSet& ) override;
+ virtual void StoreData() override;
+ virtual void UpdateData() override;
+ virtual bool CanClose() override;
// return number of pages to be printed
- virtual sal_Int32 countPages( Printer* pPrinter ) SAL_OVERRIDE;
+ virtual sal_Int32 countPages( Printer* pPrinter ) override;
// print page
- virtual void printPage( sal_Int32 nPage, Printer* pPrinter ) SAL_OVERRIDE;
- virtual OUString GetTitle() SAL_OVERRIDE;
- virtual EntryDescriptor CreateEntryDescriptor() SAL_OVERRIDE;
- virtual bool AllowUndo() SAL_OVERRIDE;
- virtual void SetReadOnly (bool bReadOnly) SAL_OVERRIDE;
- virtual bool IsReadOnly() SAL_OVERRIDE;
+ virtual void printPage( sal_Int32 nPage, Printer* pPrinter ) override;
+ virtual OUString GetTitle() override;
+ virtual EntryDescriptor CreateEntryDescriptor() override;
+ virtual bool AllowUndo() override;
+ virtual void SetReadOnly (bool bReadOnly) override;
+ virtual bool IsReadOnly() override;
StarBASIC* GetBasic() { XModule(); return xBasic; }
@@ -377,13 +377,13 @@ public:
BasicStatus& GetBasicStatus() { return aStatus; }
- virtual bool IsModified () SAL_OVERRIDE;
- virtual bool IsPasteAllowed () SAL_OVERRIDE;
+ virtual bool IsModified () override;
+ virtual bool IsPasteAllowed () override;
void ShowCursor( bool bOn );
- virtual SearchOptionFlags GetSearchOptions() SAL_OVERRIDE;
- virtual sal_uInt16 StartSearchAndReplace (SvxSearchItem const&, bool bFromStart = false) SAL_OVERRIDE;
+ virtual SearchOptionFlags GetSearchOptions() override;
+ virtual sal_uInt16 StartSearchAndReplace (SvxSearchItem const&, bool bFromStart = false) override;
EditorWindow& GetEditorWindow() { return aXEditorWindow->GetEdtWindow(); }
BreakPointWindow& GetBreakPointWindow() { return aXEditorWindow->GetBrkWindow(); }
@@ -394,22 +394,22 @@ public:
BreakPointList& GetBreakPoints() { return GetBreakPointWindow().GetBreakPoints(); }
ModulWindowLayout& GetLayout () { return rLayout; }
- virtual void BasicStarted() SAL_OVERRIDE;
- virtual void BasicStopped() SAL_OVERRIDE;
+ virtual void BasicStarted() override;
+ virtual void BasicStopped() override;
virtual ::svl::IUndoManager*
- GetUndoManager() SAL_OVERRIDE;
+ GetUndoManager() override;
const OUString& GetModule() const { return m_aModule; }
void SetModule( const OUString& aModule ) { m_aModule = aModule; }
- virtual void Activating () SAL_OVERRIDE;
- virtual void Deactivating () SAL_OVERRIDE;
+ virtual void Activating () override;
+ virtual void Deactivating () override;
- virtual void OnNewDocument () SAL_OVERRIDE;
- virtual char const* GetHid () const SAL_OVERRIDE;
- virtual ItemType GetType () const SAL_OVERRIDE;
- virtual bool HasActiveEditor () const SAL_OVERRIDE;
+ virtual void OnNewDocument () override;
+ virtual char const* GetHid () const override;
+ virtual ItemType GetType () const override;
+ virtual bool HasActiveEditor () const override;
void UpdateModule ();
};
@@ -419,13 +419,13 @@ class ModulWindowLayout: public Layout
public:
ModulWindowLayout (vcl::Window* pParent, ObjectCatalog&);
virtual ~ModulWindowLayout();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
public:
// Layout:
- virtual void Activating (BaseWindow&) SAL_OVERRIDE;
- virtual void Deactivating () SAL_OVERRIDE;
- virtual void GetState (SfxItemSet&, unsigned nWhich) SAL_OVERRIDE;
- virtual void UpdateDebug (bool bBasicStopped) SAL_OVERRIDE;
+ virtual void Activating (BaseWindow&) override;
+ virtual void Deactivating () override;
+ virtual void GetState (SfxItemSet&, unsigned nWhich) override;
+ virtual void UpdateDebug (bool bBasicStopped) override;
public:
void BasicAddWatch (OUString const&);
void BasicRemoveWatch ();
@@ -433,9 +433,9 @@ public:
protected:
// Window:
- virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
+ virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
// Layout:
- virtual void OnFirstSize (long nWidth, long nHeight) SAL_OVERRIDE;
+ virtual void OnFirstSize (long nWidth, long nHeight) override;
private:
// main child window
@@ -445,7 +445,7 @@ private:
VclPtr<StackWindow> aStackWindow;
ObjectCatalog& rObjectCatalog;
private:
- virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE;
+ virtual void DataChanged (DataChangedEvent const& rDCEvt) override;
private:
// SyntaxColors -- stores Basic syntax highlighting colors
class SyntaxColors : public utl::ConfigurationListener
@@ -460,7 +460,7 @@ private:
Color GetColor (TokenTypes eType) const { return aColors[eType]; }
private:
- virtual void ConfigurationChanged (utl::ConfigurationBroadcaster*, sal_uInt32) SAL_OVERRIDE;
+ virtual void ConfigurationChanged (utl::ConfigurationBroadcaster*, sal_uInt32) override;
void NewConfig (bool bFirst);
private:
@@ -492,14 +492,14 @@ private:
public:
explicit CodeCompleteListBox( CodeCompleteWindow* pPar );
virtual ~CodeCompleteListBox();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void InsertSelectedEntry(); //insert the selected entry
DECL_LINK_TYPED(ImplDoubleClickHdl, ListBox&, void);
DECL_LINK_TYPED(ImplSelectHdl, ListBox&, void);
protected:
- virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE;
+ virtual void KeyInput( const KeyEvent& rKeyEvt ) override;
};
class CodeCompleteWindow: public vcl::Window
@@ -515,7 +515,7 @@ private:
public:
explicit CodeCompleteWindow( EditorWindow* pPar );
virtual ~CodeCompleteWindow();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void InsertEntry( const OUString& aStr );
void ClearListBox();
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 4580924d08ab..b8ce19afb907 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -186,14 +186,14 @@ public:
private:
virtual ~ChangesListener() {}
- virtual void SAL_CALL disposing(lang::EventObject const &) throw (RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL disposing(lang::EventObject const &) throw (RuntimeException, std::exception) override
{
osl::MutexGuard g(editor_.mutex_);
editor_.notifier_.clear();
}
virtual void SAL_CALL propertiesChange(
- Sequence< beans::PropertyChangeEvent > const &) throw (RuntimeException, std::exception) SAL_OVERRIDE
+ Sequence< beans::PropertyChangeEvent > const &) throw (RuntimeException, std::exception) override
{
SolarMutexGuard g;
editor_.ImplSetFont();
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 7410fea52fb6..6e7524260b22 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -103,17 +103,17 @@ public:
}
// XEventListener
- virtual void SAL_CALL disposing( const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE {}
+ virtual void SAL_CALL disposing( const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) override {}
// XContainerListener
- virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE
+ virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) throw( uno::RuntimeException, std::exception ) override
{
OUString sModuleName;
if( mpShell && ( Event.Accessor >>= sModuleName ) )
mpShell->FindBasWin( mpShell->m_aCurDocument, mpShell->m_aCurLibName, sModuleName, true );
}
- virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { }
- virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE
+ virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) throw( css::uno::RuntimeException, std::exception ) override { }
+ virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) throw( css::uno::RuntimeException, std::exception ) override
{
OUString sModuleName;
if( mpShell && ( Event.Accessor >>= sModuleName ) )
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index 66b01b5323ce..1f111d8a7db7 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -178,14 +178,14 @@ private:
DocumentEventNotifier m_aNotifier;
void Init();
void SetEntryBitmaps( SvTreeListEntry * pEntry, const Image& rImage );
- virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
protected:
- virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE;
- virtual void ExpandedHdl() SAL_OVERRIDE;
- virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ) SAL_OVERRIDE;
- virtual bool ExpandingHdl() SAL_OVERRIDE;
- virtual void KeyInput( const KeyEvent& rEvt ) SAL_OVERRIDE;
+ virtual void RequestingChildren( SvTreeListEntry* pParent ) override;
+ virtual void ExpandedHdl() override;
+ virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ) override;
+ virtual bool ExpandingHdl() override;
+ virtual void KeyInput( const KeyEvent& rEvt ) override;
bool OpenCurrent();
void ImpCreateLibEntries( SvTreeListEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation );
@@ -195,21 +195,21 @@ protected:
SvTreeListEntry* ImpFindEntry( SvTreeListEntry* pParent, const OUString& rText );
// DocumentEventListener
- virtual void onDocumentCreated( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentOpened( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentSave( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentSaveDone( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentSaveAs( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentSaveAsDone( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentClosed( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentTitleChanged( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentModeChanged( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
+ virtual void onDocumentCreated( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentOpened( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentSave( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentSaveDone( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentSaveAs( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentSaveAsDone( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentClosed( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentTitleChanged( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentModeChanged( const ScriptDocument& _rDocument ) override;
public:
TreeListBox(vcl::Window* pParent, const ResId& rRes);
TreeListBox(vcl::Window* pParent, WinBits nStyle);
virtual ~TreeListBox();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void ScanEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
void ScanAllEntries();
diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx
index 9d032b6ca513..58acdac44066 100644
--- a/basctl/source/basicide/brkdlg.hxx
+++ b/basctl/source/basicide/brkdlg.hxx
@@ -54,7 +54,7 @@ protected:
public:
BreakPointDialog( vcl::Window* pParent, BreakPointList& rBrkList );
virtual ~BreakPointDialog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void SetCurrentBreakPoint( BreakPoint* pBrk );
};
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx
index 9be5a4573e7a..c35a1b1e7d73 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -71,13 +71,13 @@ namespace basctl
virtual ~Impl ();
// XDocumentEventListener
- virtual void SAL_CALL documentEventOccured( const DocumentEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL documentEventOccured( const DocumentEvent& Event ) throw (RuntimeException, std::exception) override;
// XEventListener
- virtual void SAL_CALL disposing( const csslang::EventObject& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const csslang::EventObject& Event ) throw (RuntimeException, std::exception) override;
// ComponentHelper
- virtual void SAL_CALL disposing() SAL_OVERRIDE;
+ virtual void SAL_CALL disposing() override;
private:
/// determines whether the instance is already disposed
diff --git a/basctl/source/basicide/layout.hxx b/basctl/source/basicide/layout.hxx
index 037ab56b44e2..22762a0bdd7a 100644
--- a/basctl/source/basicide/layout.hxx
+++ b/basctl/source/basicide/layout.hxx
@@ -52,7 +52,7 @@ public:
virtual void UpdateDebug (bool bBasicStopped ) = 0;
virtual ~Layout();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
protected:
explicit Layout(vcl::Window* pParent);
@@ -63,8 +63,8 @@ protected:
bool HasSize () const { return !bFirstSize; }
// Window:
- virtual void Resize () SAL_OVERRIDE;
- virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE;
+ virtual void Resize () override;
+ virtual void DataChanged (DataChangedEvent const& rDCEvt) override;
// new:
virtual void OnFirstSize (long nWidth, long nHeight) = 0;
diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx
index 3da08a26ed75..3c1bd61acd95 100644
--- a/basctl/source/basicide/linenumberwindow.hxx
+++ b/basctl/source/basicide/linenumberwindow.hxx
@@ -23,15 +23,15 @@ private:
int m_nWidth;
long m_nCurYOffset;
int m_nBaseWidth;
- virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE;
+ virtual void DataChanged (DataChangedEvent const& rDCEvt) override;
protected:
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
public:
LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWin);
virtual ~LineNumberWindow();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void DoScroll( long nHorzScroll, long nVertScroll );
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index b4f621e42f07..96394545d78c 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -87,13 +87,13 @@ private:
public:
MacroChooser( vcl::Window* pParent, bool bCreateEntries = true );
virtual ~MacroChooser();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
SbMethod* GetMacro();
void DeleteMacro();
SbMethod* CreateMacro();
- virtual short Execute() SAL_OVERRIDE;
+ virtual short Execute() override;
void SetMode (Mode);
Mode GetMode () const { return nMode; }
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 1ddf3d735e89..0c503a3c7877 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -80,7 +80,7 @@ public:
{
}
- virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& rRequest ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& rRequest ) throw (css::uno::RuntimeException, std::exception) override
{
if ( m_xHandler.is() )
{
@@ -115,7 +115,7 @@ public:
SvLBoxString( pEntry, nFlags, rTxt ) {}
virtual void Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,
- const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) SAL_OVERRIDE;
+ const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override;
};
void LibLBoxString::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::RenderContext& rRenderContext,
@@ -1170,9 +1170,9 @@ public:
// Methods
virtual Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler()
- throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(RuntimeException, std::exception) override;
virtual Reference< XProgressHandler > SAL_CALL getProgressHandler()
- throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(RuntimeException, std::exception) override;
};
Reference< task::XInteractionHandler > OLibCommandEnvironment::getInteractionHandler()
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index e23e6c4f810f..958509b80ed7 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -55,7 +55,7 @@ private:
public:
NewObjectDialog (vcl::Window* pParent, ObjectMode::Mode, bool bCheckName = false);
virtual ~NewObjectDialog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
OUString GetObjectName() const { return m_pEdit->GetText(); }
void SetObjectName( const OUString& rName )
{
@@ -72,7 +72,7 @@ class GotoLineDialog : public ModalDialog
public:
explicit GotoLineDialog(vcl::Window * pParent);
virtual ~GotoLineDialog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
sal_Int32 GetLineNumber() const;
};
@@ -89,7 +89,7 @@ private:
public:
explicit ExportDialog( vcl::Window * pParent );
virtual ~ExportDialog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
bool isExportAsPackage () const { return mbExportAsPackage; }
};
@@ -98,16 +98,16 @@ public:
class ExtTreeListBox : public TreeListBox
{
protected:
- virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ) SAL_OVERRIDE;
- virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) SAL_OVERRIDE;
+ virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ) override;
+ virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) override;
- virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvTreeListEntry* pEntry ) SAL_OVERRIDE;
- virtual bool NotifyAcceptDrop( SvTreeListEntry* pEntry ) SAL_OVERRIDE;
+ virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvTreeListEntry* pEntry ) override;
+ virtual bool NotifyAcceptDrop( SvTreeListEntry* pEntry ) override;
virtual TriState NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
- SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ) SAL_OVERRIDE;
+ SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ) override;
virtual TriState NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
- SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ) SAL_OVERRIDE;
+ SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ) override;
TriState NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos, bool bMove );
@@ -126,7 +126,7 @@ private:
public:
CheckBox(vcl::Window* pParent, WinBits nStyle);
virtual ~CheckBox();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
SvTreeListEntry* DoInsertEntry( const OUString& rStr, sal_uLong nPos = LISTBOX_APPEND );
SvTreeListEntry* FindEntry( const OUString& rName );
@@ -134,9 +134,9 @@ public:
void CheckEntryPos( sal_uLong nPos );
bool IsChecked( sal_uLong nPos ) const;
- virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE;
- virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ) SAL_OVERRIDE;
- virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) SAL_OVERRIDE;
+ virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind) override;
+ virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ) override;
+ virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) override;
void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; }
@@ -154,7 +154,7 @@ private:
public:
explicit LibDialog(vcl::Window* pParent);
virtual ~LibDialog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void SetStorageName( const OUString& rName );
@@ -174,9 +174,9 @@ private:
public:
OrganizeDialog( vcl::Window* pParent, sal_Int16 tabId, EntryDescriptor& rDesc );
virtual ~OrganizeDialog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
- virtual short Execute() SAL_OVERRIDE;
+ virtual short Execute() override;
DECL_LINK_TYPED( ActivatePageHdl, TabControl*, void );
};
@@ -201,13 +201,13 @@ protected:
VclPtr<TabDialog> pTabDlg;
- virtual void ActivatePage() SAL_OVERRIDE;
- virtual void DeactivatePage() SAL_OVERRIDE;
+ virtual void ActivatePage() override;
+ virtual void DeactivatePage() override;
public:
ObjectPage(vcl::Window* pParent, const OString& rName, sal_uInt16 nMode);
virtual ~ObjectPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void SetCurrentEntry( EntryDescriptor& rDesc );
void SetTabDlg( TabDialog* p ) { pTabDlg = p;}
@@ -247,15 +247,15 @@ protected:
void InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
void SetCurLib();
SvTreeListEntry* ImpInsertLibEntry( const OUString& rLibName, sal_uLong nPos );
- virtual void ActivatePage() SAL_OVERRIDE;
- virtual void DeactivatePage() SAL_OVERRIDE;
+ virtual void ActivatePage() override;
+ virtual void DeactivatePage() override;
VclPtr<TabDialog> pTabDlg;
public:
explicit LibPage(vcl::Window* pParent);
virtual ~LibPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void SetTabDlg( TabDialog* p ) { pTabDlg = p;}
};
diff --git a/basctl/source/basicide/objdlg.hxx b/basctl/source/basicide/objdlg.hxx
index eee31c2201dc..48b2d15feb94 100644
--- a/basctl/source/basicide/objdlg.hxx
+++ b/basctl/source/basicide/objdlg.hxx
@@ -37,7 +37,7 @@ class ObjectCatalog : public DockingWindow
public:
explicit ObjectCatalog(vcl::Window* pParent);
virtual ~ObjectCatalog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
public:
void UpdateEntries () { aTree->UpdateEntries(); }
void SetCurrentEntry (BaseWindow* pCurWin);
@@ -49,8 +49,8 @@ private:
VclPtr<TreeListBox> aTree;
private:
- virtual void Resize () SAL_OVERRIDE; // Window
- virtual void ToggleFloatingMode () SAL_OVERRIDE; // DockingWindow
+ virtual void Resize () override; // Window
+ virtual void ToggleFloatingMode () override; // DockingWindow
void ArrangeWindows ();
};
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index e728186d91e5..4ce587241c0c 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -130,7 +130,7 @@ namespace basctl
virtual ~FilterDocuments() {}
- virtual bool includeDocument( const docs::DocumentDescriptor& _rDocument ) const SAL_OVERRIDE;
+ virtual bool includeDocument( const docs::DocumentDescriptor& _rDocument ) const override;
private:
static bool impl_isDocumentVisible_nothrow( const docs::DocumentDescriptor& _rDocument );
@@ -268,15 +268,15 @@ namespace basctl
protected:
// DocumentEventListener
- virtual void onDocumentCreated( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentOpened( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentSave( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentSaveDone( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentSaveAs( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentSaveAsDone( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentClosed( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentTitleChanged( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentModeChanged( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
+ virtual void onDocumentCreated( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentOpened( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentSave( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentSaveDone( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentSaveAs( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentSaveAsDone( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentClosed( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentTitleChanged( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentModeChanged( const ScriptDocument& _rDocument ) override;
private:
bool impl_initDocument_nothrow( const Reference< XModel >& _rxModel );
diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx
index 4f218bdb565f..c6ec667a20ae 100644
--- a/basctl/source/basicide/unomodel.hxx
+++ b/basctl/source/basicide/unomodel.hxx
@@ -34,31 +34,31 @@ public:
virtual ~SIDEModel();
//XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE;
- virtual void SAL_CALL release( ) throw() SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL acquire( ) throw() override;
+ virtual void SAL_CALL release( ) throw() override;
//XTypeProvider
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
//XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XStorable2
virtual void SAL_CALL storeSelf( const css::uno::Sequence< css::beans::PropertyValue >& )
- throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { notImplemented(); }
+ throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override { notImplemented(); }
// XStorable
- virtual void SAL_CALL store() throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL store() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL storeAsURL( const OUString& sURL,
const css::uno::Sequence< css::beans::PropertyValue >& seqArguments )
- throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL storeToURL( const OUString& sURL,
const css::uno::Sequence< css::beans::PropertyValue >& seqArguments )
- throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
static OUString getImplementationName_Static();
diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx
index d0293c650c91..bdf45d1b3c60 100644
--- a/basctl/source/inc/accessibledialogcontrolshape.hxx
+++ b/basctl/source/inc/accessibledialogcontrolshape.hxx
@@ -82,10 +82,10 @@ protected:
void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
// OCommonAccessibleComponent
- virtual css::awt::Rectangle implGetBounds() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::awt::Rectangle implGetBounds() throw (css::uno::RuntimeException, std::exception) override;
// XComponent
- virtual void SAL_CALL disposing() SAL_OVERRIDE;
+ virtual void SAL_CALL disposing() override;
public:
AccessibleDialogControlShape (DialogWindow*, DlgEdObj*);
@@ -98,41 +98,41 @@ public:
DECLARE_XTYPEPROVIDER()
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) throw (css::uno::RuntimeException, std::exception) override;
// XPropertyChangeListener
- virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
// XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
// XAccessibleComponent
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleExtendedComponent
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) override;
};
} // namespace basctl
diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx
index bec472af6f2c..29c6fda7c276 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -104,17 +104,17 @@ protected:
void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
// OCommonAccessibleComponent
- virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override;
// XComponent
- virtual void SAL_CALL disposing() SAL_OVERRIDE;
+ virtual void SAL_CALL disposing() override;
public:
AccessibleDialogWindow (basctl::DialogWindow*);
virtual ~AccessibleDialogWindow();
// SfxListener
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
// XInterface
DECLARE_XINTERFACE()
@@ -123,46 +123,46 @@ public:
DECLARE_XTYPEPROVIDER()
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
// XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
// XAccessibleComponent
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleExtendedComponent
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleSelection
- virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL clearAccessibleSelection()
throw (css::uno::RuntimeException,
- std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ std::exception) override;
+ virtual void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
};
} // namespace basctl
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index c374e5d00c9c..89a240fd9a8e 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -62,28 +62,28 @@ private:
OUString aCurPath;
protected:
- virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
- virtual void Resize() SAL_OVERRIDE;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
+ virtual void Resize() override;
- virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
- virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
- virtual void LoseFocus() SAL_OVERRIDE;
+ virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
+ virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
+ virtual void MouseMove( const MouseEvent& rMEvt ) override;
+ virtual void KeyInput( const KeyEvent& rKEvt ) override;
+ virtual void Command( const CommandEvent& rCEvt ) override;
+ virtual void LoseFocus() override;
DECL_STATIC_LINK_TYPED( DialogWindow, NotifyUndoActionHdl, SdrUndoAction *, void );
- virtual void DoInit() SAL_OVERRIDE;
- virtual void DoScroll( ScrollBar* pCurScrollBar ) SAL_OVERRIDE;
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
+ virtual void DoInit() override;
+ virtual void DoScroll( ScrollBar* pCurScrollBar ) override;
+ virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
void InitSettings(bool bFont, bool bForeground, bool bBackground);
public:
DialogWindow (DialogWindowLayout* pParent, ScriptDocument const& rDocument, const OUString& aLibName, const OUString& aName, css::uno::Reference<css::container::XNameContainer> const& xDialogModel);
DialogWindow( DialogWindow* pCurView ); // never implemented
- virtual void ExecuteCommand( SfxRequest& rReq ) SAL_OVERRIDE;
- virtual void GetState( SfxItemSet& ) SAL_OVERRIDE;
+ virtual void ExecuteCommand( SfxRequest& rReq ) override;
+ virtual void GetState( SfxItemSet& ) override;
DlgEditor& GetEditor() const { return *pEditor; }
css::uno::Reference< css::container::XNameContainer > GetDialog() const;
DlgEdModel& GetModel() const;
@@ -95,28 +95,28 @@ public:
bool SaveDialog();
bool ImportDialog();
- virtual OUString GetTitle() SAL_OVERRIDE;
- virtual EntryDescriptor CreateEntryDescriptor() SAL_OVERRIDE;
- virtual void SetReadOnly (bool bReadOnly) SAL_OVERRIDE;
- virtual bool IsReadOnly() SAL_OVERRIDE;
+ virtual OUString GetTitle() override;
+ virtual EntryDescriptor CreateEntryDescriptor() override;
+ virtual void SetReadOnly (bool bReadOnly) override;
+ virtual bool IsReadOnly() override;
- virtual void StoreData() SAL_OVERRIDE;
- virtual bool IsModified() SAL_OVERRIDE;
- virtual bool IsPasteAllowed() SAL_OVERRIDE;
+ virtual void StoreData() override;
+ virtual bool IsModified() override;
+ virtual bool IsPasteAllowed() override;
- virtual svl::IUndoManager* GetUndoManager() SAL_OVERRIDE;
+ virtual svl::IUndoManager* GetUndoManager() override;
// return number of pages to be printed
- virtual sal_Int32 countPages( Printer* pPrinter ) SAL_OVERRIDE;
+ virtual sal_Int32 countPages( Printer* pPrinter ) override;
// print page
- virtual void printPage (sal_Int32 nPage, Printer*) SAL_OVERRIDE;
+ virtual void printPage (sal_Int32 nPage, Printer*) override;
- virtual void Activating () SAL_OVERRIDE;
- virtual void Deactivating () SAL_OVERRIDE;
+ virtual void Activating () override;
+ virtual void Deactivating () override;
- virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
- virtual char const* GetHid () const SAL_OVERRIDE;
- virtual ItemType GetType () const SAL_OVERRIDE;
+ virtual char const* GetHid () const override;
+ virtual ItemType GetType () const override;
};
@@ -127,21 +127,21 @@ class DialogWindowLayout : public Layout
public:
DialogWindowLayout (vcl::Window* pParent, ObjectCatalog&);
virtual ~DialogWindowLayout();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
public:
void ShowPropertyBrowser ();
void UpdatePropertyBrowser ();
void DisablePropertyBrowser ();
public:
// Layout:
- virtual void Activating (BaseWindow&) SAL_OVERRIDE;
- virtual void Deactivating () SAL_OVERRIDE;
- virtual void ExecuteGlobal (SfxRequest&) SAL_OVERRIDE;
- virtual void GetState (SfxItemSet&, unsigned nWhich) SAL_OVERRIDE;
- virtual void UpdateDebug (bool) SAL_OVERRIDE {};
+ virtual void Activating (BaseWindow&) override;
+ virtual void Deactivating () override;
+ virtual void ExecuteGlobal (SfxRequest&) override;
+ virtual void GetState (SfxItemSet&, unsigned nWhich) override;
+ virtual void UpdateDebug (bool) override {};
protected:
// Layout:
- virtual void OnFirstSize (long nWidth, long nHeight) SAL_OVERRIDE;
+ virtual void OnFirstSize (long nWidth, long nHeight) override;
private:
// child window
diff --git a/basctl/source/inc/basidectrlr.hxx b/basctl/source/inc/basidectrlr.hxx
index 56eb1f105bd2..01e15d5a884e 100644
--- a/basctl/source/inc/basidectrlr.hxx
+++ b/basctl/source/inc/basidectrlr.hxx
@@ -45,23 +45,23 @@ public:
virtual ~Controller();
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL acquire() throw() SAL_OVERRIDE;
- virtual void SAL_CALL release() throw() SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL acquire() throw() override;
+ virtual void SAL_CALL release() throw() override;
// XTypeProvider ( ::SfxBaseController )
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override;
// XPropertySet
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override;
// OPropertySetHelper
- virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
+ virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
protected:
// OPropertyArrayUsageHelper
- virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
+ virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
};
} // namespace basctl
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 1dd3fc13b9ee..49ef4509b6d1 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -111,10 +111,10 @@ private:
static unsigned nShellCount;
private:
- virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ) SAL_OVERRIDE;
- virtual void OuterResizePixel( const Point &rPos, const Size &rSize ) SAL_OVERRIDE;
+ virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ) override;
+ virtual void OuterResizePixel( const Point &rPos, const Size &rSize ) override;
sal_uInt16 InsertWindowInTable (BaseWindow* pNewWin);
- virtual bool PrepareClose( bool bUI ) SAL_OVERRIDE;
+ virtual bool PrepareClose( bool bUI ) override;
void SetCurWindow (BaseWindow* pNewWin, bool bUpdateTabBar = false, bool bRememberAsCurrent = true);
void ManageToolbars();
@@ -125,24 +125,24 @@ private:
VclPtr<ModulWindow> ShowActiveModuleWindow( StarBASIC* pBasic );
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
- virtual void Activate(bool bMDI) SAL_OVERRIDE;
- virtual void Deactivate(bool bMDI) SAL_OVERRIDE;
+ virtual void Activate(bool bMDI) override;
+ virtual void Deactivate(bool bMDI) override;
- virtual void Move() SAL_OVERRIDE;
- virtual void ShowCursor( bool bOn = true ) SAL_OVERRIDE;
+ virtual void Move() override;
+ virtual void ShowCursor( bool bOn = true ) override;
// DocumentEventListener
- virtual void onDocumentCreated( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentOpened( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentSave( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentSaveDone( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentSaveAs( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentSaveAsDone( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentClosed( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentTitleChanged( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
- virtual void onDocumentModeChanged( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
+ virtual void onDocumentCreated( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentOpened( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentSave( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentSaveDone( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentSaveAs( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentSaveAsDone( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentClosed( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentTitleChanged( const ScriptDocument& _rDocument ) override;
+ virtual void onDocumentModeChanged( const ScriptDocument& _rDocument ) override;
public:
TYPEINFO_OVERRIDE();
@@ -168,15 +168,15 @@ public:
SdrView* GetCurDlgView() const;
- svl::IUndoManager* GetUndoManager() SAL_OVERRIDE;
+ svl::IUndoManager* GetUndoManager() override;
- virtual css::uno::Reference< css::view::XRenderable > GetRenderable() SAL_OVERRIDE;
+ virtual css::uno::Reference< css::view::XRenderable > GetRenderable() override;
// virtual sal_uInt16 Print( SfxProgress &rProgress, sal_Bool bIsAPI, PrintDialog *pPrintDialog = 0 );
- virtual SfxPrinter* GetPrinter( bool bCreate ) SAL_OVERRIDE;
- virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE;
- virtual OUString GetSelectionText( bool bCompleteWords ) SAL_OVERRIDE;
- virtual bool HasSelection( bool bText ) const SAL_OVERRIDE;
+ virtual SfxPrinter* GetPrinter( bool bCreate ) override;
+ virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) override;
+ virtual OUString GetSelectionText( bool bCompleteWords ) override;
+ virtual bool HasSelection( bool bText ) const override;
void GetState( SfxItemSet& );
void ExecuteGlobal( SfxRequest& rReq );
@@ -184,7 +184,7 @@ public:
void ExecuteBasic( SfxRequest& rReq );
void ExecuteDialog( SfxRequest& rReq );
- virtual bool HasUIFeature( sal_uInt32 nFeature ) SAL_OVERRIDE;
+ virtual bool HasUIFeature( sal_uInt32 nFeature ) override;
bool CallBasicErrorHdl( StarBASIC* pBasic );
long CallBasicBreakHdl( StarBASIC* pBasic );
@@ -206,7 +206,7 @@ public:
const OUString& rDestLibName, const OUString& rDlgName );
virtual css::uno::Reference< css::frame::XModel >
- GetCurrentDocument() const SAL_OVERRIDE;
+ GetCurrentDocument() const override;
void UpdateObjectCatalog () { aObjectCatalog->UpdateEntries(); }
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 5f7d627d8543..92ff5b5746c4 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -82,7 +82,7 @@ public:
DockingWindow (vcl::Window* pParent);
DockingWindow (Layout* pParent);
virtual ~DockingWindow();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void ResizeIfDocking (Point const&, Size const&);
void ResizeIfDocking (Size const&);
Size GetDockingSize () const { return aDockingRect.GetSize(); }
@@ -92,11 +92,11 @@ public:
void Hide ();
protected:
- virtual bool Docking( const Point& rPos, Rectangle& rRect ) SAL_OVERRIDE;
- virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ) SAL_OVERRIDE;
- virtual void ToggleFloatingMode() SAL_OVERRIDE;
- virtual bool PrepareToggleFloatingMode() SAL_OVERRIDE;
- virtual void StartDocking() SAL_OVERRIDE;
+ virtual bool Docking( const Point& rPos, Rectangle& rRect ) override;
+ virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ) override;
+ virtual void ToggleFloatingMode() override;
+ virtual bool PrepareToggleFloatingMode() override;
+ virtual void StartDocking() override;
private:
// the position and the size of the floating window
@@ -121,11 +121,11 @@ private:
class TabBar : public ::TabBar
{
protected:
- virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
+ virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
+ virtual void Command( const CommandEvent& rCEvt ) override;
- virtual TabBarAllowRenamingReturnCode AllowRenaming() SAL_OVERRIDE;
- virtual void EndRenaming() SAL_OVERRIDE;
+ virtual TabBarAllowRenamingReturnCode AllowRenaming() override;
+ virtual void EndRenaming() override;
public:
TabBar (vcl::Window* pParent);
@@ -169,7 +169,7 @@ protected:
public:
BaseWindow( vcl::Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName );
virtual ~BaseWindow();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void Init();
virtual void DoInit();
@@ -183,7 +183,7 @@ public:
virtual void ExecuteCommand (SfxRequest&);
virtual void ExecuteGlobal (SfxRequest&);
virtual void GetState (SfxItemSet&) = 0;
- virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+ virtual bool Notify( NotifyEvent& rNEvt ) override;
virtual void StoreData();
virtual void UpdateData();
diff --git a/basctl/source/inc/dlgedclip.hxx b/basctl/source/inc/dlgedclip.hxx
index 5a42822150ec..2ab8422ab31b 100644
--- a/basctl/source/inc/dlgedclip.hxx
+++ b/basctl/source/inc/dlgedclip.hxx
@@ -42,12 +42,12 @@ public:
virtual ~DlgEdTransferableImpl();
// XTransferable
- virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& rFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& rFlavor ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& rFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& rFlavor ) throw(css::uno::RuntimeException, std::exception) override;
// XClipboardOwner
- virtual void SAL_CALL lostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL lostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) throw(css::uno::RuntimeException, std::exception) override;
};
} // namespace basctl
diff --git a/basctl/source/inc/dlgedfunc.hxx b/basctl/source/inc/dlgedfunc.hxx
index 50148b3baa66..9f6118784dca 100644
--- a/basctl/source/inc/dlgedfunc.hxx
+++ b/basctl/source/inc/dlgedfunc.hxx
@@ -58,9 +58,9 @@ public:
explicit DlgEdFuncInsert (DlgEditor& rParent);
virtual ~DlgEdFuncInsert ();
- virtual bool MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual bool MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual bool MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual bool MouseButtonDown( const MouseEvent& rMEvt ) override;
+ virtual bool MouseButtonUp( const MouseEvent& rMEvt ) override;
+ virtual bool MouseMove( const MouseEvent& rMEvt ) override;
};
@@ -76,9 +76,9 @@ public:
explicit DlgEdFuncSelect (DlgEditor& rParent);
virtual ~DlgEdFuncSelect ();
- virtual bool MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual bool MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- virtual bool MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual bool MouseButtonDown( const MouseEvent& rMEvt ) override;
+ virtual bool MouseButtonUp( const MouseEvent& rMEvt ) override;
+ virtual bool MouseMove( const MouseEvent& rMEvt ) override;
};
diff --git a/basctl/source/inc/dlgedlist.hxx b/basctl/source/inc/dlgedlist.hxx
index 04a0de8dd4dd..a6ed50c8cfcd 100644
--- a/basctl/source/inc/dlgedlist.hxx
+++ b/basctl/source/inc/dlgedlist.hxx
@@ -45,10 +45,10 @@ public:
virtual ~DlgEdPropListenerImpl();
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
// XPropertyChangeListener
- virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override;
};
@@ -68,12 +68,12 @@ public:
virtual ~DlgEdEvtContListenerImpl();
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
// XContainerListener
- virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
};
} // namespace basctl
diff --git a/basctl/source/inc/dlgedmod.hxx b/basctl/source/inc/dlgedmod.hxx
index 453b92567873..52a8868c181a 100644
--- a/basctl/source/inc/dlgedmod.hxx
+++ b/basctl/source/inc/dlgedmod.hxx
@@ -43,7 +43,7 @@ public:
DlgEdModel();
virtual ~DlgEdModel();
- virtual SdrPage* AllocPage(bool bMasterPage) SAL_OVERRIDE;
+ virtual SdrPage* AllocPage(bool bMasterPage) override;
};
} // namespace basctl
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index ddbf7e7e517e..712658df7cb1 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -62,9 +62,9 @@ protected:
DlgEdObj(const OUString& rModelName,
const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSFac);
- virtual void NbcMove( const Size& rSize ) SAL_OVERRIDE;
- virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE;
- virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE;
+ virtual void NbcMove( const Size& rSize ) override;
+ virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override;
+ virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override;
using SfxListener::StartListening;
void StartListening();
@@ -89,19 +89,19 @@ public:
TYPEINFO_OVERRIDE();
virtual ~DlgEdObj();
- virtual void SetPage(SdrPage* pNewPage) SAL_OVERRIDE;
+ virtual void SetPage(SdrPage* pNewPage) override;
void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; }
DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; }
- virtual sal_uInt32 GetObjInventor() const SAL_OVERRIDE;
- virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE;
+ virtual sal_uInt32 GetObjInventor() const override;
+ virtual sal_uInt16 GetObjIdentifier() const override;
- virtual DlgEdObj* Clone() const SAL_OVERRIDE; // not working yet
+ virtual DlgEdObj* Clone() const override; // not working yet
void clonedFrom(const DlgEdObj* _pSource); // not working yet
// FullDrag support
- virtual SdrObject* getFullDragClone() const SAL_OVERRIDE;
+ virtual SdrObject* getFullDragClone() const override;
bool supportsService( OUString const & serviceName ) const;
OUString GetDefaultName() const;
@@ -128,7 +128,7 @@ public:
void SAL_CALL _elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException);
void SAL_CALL _elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException);
- virtual void SetLayer(SdrLayerID nLayer) SAL_OVERRIDE;
+ virtual void SetLayer(SdrLayerID nLayer) override;
bool MakeDataAware( const css::uno::Reference< css::frame::XModel >& xModel );
};
@@ -152,9 +152,9 @@ private:
explicit DlgEdForm (DlgEditor&);
protected:
- virtual void NbcMove( const Size& rSize ) SAL_OVERRIDE;
- virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE;
- virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE;
+ virtual void NbcMove( const Size& rSize ) override;
+ virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override;
+ virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override;
public:
TYPEINFO_OVERRIDE();
@@ -167,12 +167,12 @@ public:
void RemoveChild( DlgEdObj* pDlgEdObj );
std::vector<DlgEdObj*> const& GetChildren() const { return pChildren; }
- virtual void UpdateStep() SAL_OVERRIDE;
+ virtual void UpdateStep() override;
- virtual void SetRectFromProps() SAL_OVERRIDE;
- virtual void SetPropsFromRect() SAL_OVERRIDE;
+ virtual void SetRectFromProps() override;
+ virtual void SetPropsFromRect() override;
- virtual void PositionAndSizeChange( const css::beans::PropertyChangeEvent& evt ) SAL_OVERRIDE;
+ virtual void PositionAndSizeChange( const css::beans::PropertyChangeEvent& evt ) override;
void UpdateTabIndices();
void UpdateTabOrder();
diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx
index 3a3d1097d4de..f839e89a7179 100644
--- a/basctl/source/inc/dlgedpage.hxx
+++ b/basctl/source/inc/dlgedpage.hxx
@@ -45,13 +45,13 @@ public:
explicit DlgEdPage( DlgEdModel& rModel, bool bMasterPage = false );
virtual ~DlgEdPage();
- virtual SdrPage* Clone() const SAL_OVERRIDE;
- virtual SdrPage* Clone( SdrModel* pNewModel ) const SAL_OVERRIDE;
+ virtual SdrPage* Clone() const override;
+ virtual SdrPage* Clone( SdrModel* pNewModel ) const override;
void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; }
DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; }
- virtual SdrObject* SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum) SAL_OVERRIDE;
+ virtual SdrObject* SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum) override;
protected:
DlgEdPage(const DlgEdPage& rSrcPage);
diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx
index 11b8247a1115..20188c2d53a4 100644
--- a/basctl/source/inc/dlgedview.hxx
+++ b/basctl/source/inc/dlgedview.hxx
@@ -43,13 +43,13 @@ public:
DlgEdView (SdrModel& rModel, OutputDevice& rOut, DlgEditor& rEditor);
virtual ~DlgEdView();
- virtual void MarkListHasChanged() SAL_OVERRIDE;
- virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) SAL_OVERRIDE;
+ virtual void MarkListHasChanged() override;
+ virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) override;
protected:
/// override to handle HitTest for some objects specially
using SdrView::CheckSingleSdrObjectHit;
- virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, SdrSearchOptions nOptions, const SetOfByte* pMVisLay) const SAL_OVERRIDE;
+ virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, SdrSearchOptions nOptions, const SetOfByte* pMVisLay) const override;
};
} // namespace basctl
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index c6017299d7f5..a9a8eca872e9 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -74,7 +74,7 @@ private:
public:
ManageLanguageDialog( vcl::Window* pParent, std::shared_ptr<LocalizationMgr> _pLMgr );
virtual ~ManageLanguageDialog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
};
class SetDefaultLanguageDialog : public ModalDialog
@@ -94,7 +94,7 @@ private:
public:
SetDefaultLanguageDialog(vcl::Window* pParent, std::shared_ptr<LocalizationMgr> xLMgr);
virtual ~SetDefaultLanguageDialog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
css::uno::Sequence< css::lang::Locale > GetLocales() const;
};
diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx
index cec3da86f138..d215e91374ce 100644
--- a/basctl/source/inc/propbrw.hxx
+++ b/basctl/source/inc/propbrw.hxx
@@ -56,8 +56,8 @@ private:
protected:
SdrView* pView;
- virtual void Resize() SAL_OVERRIDE;
- virtual bool Close() SAL_OVERRIDE;
+ virtual void Resize() override;
+ virtual bool Close() override;
typedef std::vector< css::uno::Reference< css::uno::XInterface> > InterfaceArray;
@@ -73,7 +73,7 @@ protected:
public:
explicit PropBrw (DialogWindowLayout&);
virtual ~PropBrw();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
using Window::Update;
// note: changing the Context document to an instance other than the one given in the ctor is not supported
// currently
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index 26c32555e612..37dd1ffe4e55 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -48,8 +48,8 @@ public:
SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, ItemType);
SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, const OUString& aMethodName, ItemType eType);
- virtual SfxPoolItem* Clone(SfxItemPool *pPool = 0) const SAL_OVERRIDE;
- virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone(SfxItemPool *pPool = 0) const override;
+ virtual bool operator==(const SfxPoolItem&) const override;
ScriptDocument const& GetDocument () const { return m_aDocument; }
OUString const& GetLibName () const { return m_aLibName; }
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 13:29:14 +0000