summaryrefslogtreecommitdiff
path: root/basctl/source/basicide
diff options
context:
space:
mode:
Diffstat (limited to 'basctl/source/basicide')
-rw-r--r--basctl/source/basicide/basdoc.hxx4
-rw-r--r--basctl/source/basicide/basicbox.hxx38
-rw-r--r--basctl/source/basicide/basicrenderable.hxx6
-rw-r--r--basctl/source/basicide/baside2.hxx132
-rw-r--r--basctl/source/basicide/baside2b.cxx4
-rw-r--r--basctl/source/basicide/basidesh.cxx8
-rw-r--r--basctl/source/basicide/bastype2.hxx28
-rw-r--r--basctl/source/basicide/doceventnotifier.cxx6
-rw-r--r--basctl/source/basicide/layout.hxx4
-rw-r--r--basctl/source/basicide/linenumberwindow.hxx4
-rw-r--r--basctl/source/basicide/macrodlg.hxx2
-rw-r--r--basctl/source/basicide/moduldl2.cxx8
-rw-r--r--basctl/source/basicide/moduldlg.hxx28
-rw-r--r--basctl/source/basicide/objdlg.hxx4
-rw-r--r--basctl/source/basicide/scriptdocument.cxx20
-rw-r--r--basctl/source/basicide/tbxctl.hxx8
-rw-r--r--basctl/source/basicide/unomodel.hxx22
17 files changed, 163 insertions, 163 deletions
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index d70296a25192..58dabe4cd3f3 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -38,14 +38,14 @@ class DocShell: public SfxObjectShell
protected:
virtual void Draw( OutputDevice *, const JobSetup & rSetup,
- sal_uInt16 nAspect = ASPECT_CONTENT );
+ sal_uInt16 nAspect = ASPECT_CONTENT ) SAL_OVERRIDE;
virtual void FillClass( SvGlobalName * pClassName,
sal_uInt32 * pFormat,
OUString * pAppName,
OUString * pFullTypeName,
OUString * pShortTypeName,
sal_Int32 nVersion,
- bool bTemplate = false ) const;
+ bool bTemplate = false ) const SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE();
diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx
index f0ced9f3b25d..ed658d146d90 100644
--- a/basctl/source/basicide/basicbox.hxx
+++ b/basctl/source/basicide/basicbox.hxx
@@ -38,8 +38,8 @@ public:
~LibBoxControl();
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
- const SfxPoolItem* pState );
- virtual Window* CreateItemWindow( Window *pParent );
+ const SfxPoolItem* pState ) SAL_OVERRIDE;
+ virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE;
};
/** base class for list boxes which need to update their content according to the list
@@ -57,15 +57,15 @@ protected:
private:
// DocumentEventListener
- virtual void onDocumentCreated( const ScriptDocument& _rDocument );
- virtual void onDocumentOpened( const ScriptDocument& _rDocument );
- virtual void onDocumentSave( const ScriptDocument& _rDocument );
- virtual void onDocumentSaveDone( const ScriptDocument& _rDocument );
- virtual void onDocumentSaveAs( const ScriptDocument& _rDocument );
- virtual void onDocumentSaveAsDone( const ScriptDocument& _rDocument );
- virtual void onDocumentClosed( const ScriptDocument& _rDocument );
- virtual void onDocumentTitleChanged( const ScriptDocument& _rDocument );
- virtual void onDocumentModeChanged( const ScriptDocument& _rDocument );
+ 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;
private:
DocumentEventNotifier m_aNotifier;
@@ -88,11 +88,11 @@ private:
void NotifyIDE();
// DocListenerBox
- virtual void FillBox();
+ virtual void FillBox() SAL_OVERRIDE;
protected:
- virtual void Select();
- virtual bool PreNotify( NotifyEvent& rNEvt );
+ virtual void Select() SAL_OVERRIDE;
+ virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
public:
LibBox( Window* pParent,
@@ -111,8 +111,8 @@ public:
LanguageBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~LanguageBoxControl();
- virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
- virtual Window* CreateItemWindow( Window *pParent );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE;
+ virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE;
};
class LanguageBox : public DocListenerBox
@@ -128,11 +128,11 @@ private:
void SetLanguage();
// DocListenerBox
- virtual void FillBox();
+ virtual void FillBox() SAL_OVERRIDE;
protected:
- virtual void Select();
- virtual bool PreNotify( NotifyEvent& rNEvt );
+ virtual void Select() SAL_OVERRIDE;
+ virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
public:
LanguageBox( Window* pParent );
diff --git a/basctl/source/basicide/basicrenderable.hxx b/basctl/source/basicide/basicrenderable.hxx
index 8b6f800bf977..77224b3201ed 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 com::sun::star::uno::Any& aSelection,
const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue >& xOptions)
- throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> SAL_CALL getRenderer (
sal_Int32 nRenderer,
const com::sun::star::uno::Any& rSelection,
const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rxOptions)
- throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL render (
sal_Int32 nRenderer,
const com::sun::star::uno::Any& rSelection,
const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rxOptions)
- throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 3201d2c6f799..eba6dedda468 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -107,10 +107,10 @@ private:
class ProgressInfo;
boost::scoped_ptr<ProgressInfo> pProgress;
- virtual void DataChanged(DataChangedEvent const & rDCEvt);
+ virtual void DataChanged(DataChangedEvent const & rDCEvt) SAL_OVERRIDE;
using Window::Notify;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
void ImpDoHighlight( sal_uLong nLineOff );
void ImplSetFont();
@@ -121,7 +121,7 @@ private:
virtual
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
- GetComponentInterface(sal_Bool bCreate = true);
+ GetComponentInterface(sal_Bool bCreate = true) SAL_OVERRIDE;
CodeCompleteDataCache aCodeCompleteCache;
boost::scoped_ptr< CodeCompleteWindow > pCodeCompleteWnd;
OUString GetActualSubName( sal_uLong nLine ); // gets the actual subroutine name according to line number
@@ -134,15 +134,15 @@ private:
TextSelection GetLastHighlightPortionTextSelection();
protected:
- virtual void Paint( const Rectangle& );
- virtual void Resize();
- virtual void KeyInput( const KeyEvent& rKeyEvt );
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt );
- virtual void Command( const CommandEvent& rCEvt );
- virtual void LoseFocus();
- virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void Paint( 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;
void DoSyntaxHighlight( sal_uLong nPara );
OUString GetWordAtCursor();
@@ -183,16 +183,16 @@ private:
BreakPointList aBreakPointList;
bool bErrorMarker;
- virtual void DataChanged(DataChangedEvent const & rDCEvt);
+ virtual void DataChanged(DataChangedEvent const & rDCEvt) SAL_OVERRIDE;
void setBackgroundColor(Color aColor);
protected:
- virtual void Paint( const Rectangle& );
+ virtual void Paint( const Rectangle& ) SAL_OVERRIDE;
BreakPoint* FindBreakPoint( const Point& rMousePos );
void ShowMarker( bool bShow );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void Command( const CommandEvent& rCEvt );
+ virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
bool SyncYOffset();
@@ -214,8 +214,8 @@ class WatchTreeListBox : public SvHeaderTabListBox
OUString aEditingRes;
protected:
- virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel );
- virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText );
+ virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ) SAL_OVERRIDE;
+ virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) SAL_OVERRIDE;
bool ImplBasicEntryEdited( SvTreeListEntry* pEntry, const OUString& rResult );
SbxBase* ImplGetSBXForEntry( SvTreeListEntry* pEntry, bool& rbArrayElement );
@@ -224,11 +224,11 @@ public:
WatchTreeListBox( Window* pParent, WinBits nWinBits );
~WatchTreeListBox();
- void RequestingChildren( SvTreeListEntry * pParent );
+ void RequestingChildren( SvTreeListEntry * pParent ) SAL_OVERRIDE;
void UpdateWatches( bool bBasicStopped = false );
using SvTabListBox::SetTabs;
- virtual void SetTabs();
+ virtual void SetTabs() SAL_OVERRIDE;
};
@@ -243,8 +243,8 @@ private:
HeaderBar aHeaderBar;
protected:
- virtual void Resize();
- virtual void Paint( const Rectangle& rRect );
+ virtual void Resize() SAL_OVERRIDE;
+ virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
DECL_LINK( ButtonHdl, ImageButton * );
DECL_LINK(TreeListHdl, void *);
@@ -271,8 +271,8 @@ private:
OUString aStackStr;
protected:
- virtual void Resize();
- virtual void Paint( const Rectangle& rRect );
+ virtual void Resize() SAL_OVERRIDE;
+ virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
public:
StackWindow (Layout* pParent);
@@ -290,10 +290,10 @@ private:
EditorWindow aEdtWindow;
ScrollBar aEWVScrollBar;
- virtual void DataChanged(DataChangedEvent const & rDCEvt);
+ virtual void DataChanged(DataChangedEvent const & rDCEvt) SAL_OVERRIDE;
protected:
- virtual void Resize();
+ virtual void Resize() SAL_OVERRIDE;
DECL_LINK( ScrollHdl, ScrollBar * );
public:
@@ -328,11 +328,11 @@ private:
sal_Int32 FormatAndPrint( Printer* pPrinter, sal_Int32 nPage = -1 );
SbModuleRef XModule();
protected:
- virtual void Resize();
- virtual void GetFocus();
- virtual void Paint( const Rectangle& );
- virtual void DoInit();
- virtual void DoScroll( ScrollBar* pCurScrollBar );
+ virtual void Resize() SAL_OVERRIDE;
+ virtual void GetFocus() SAL_OVERRIDE;
+ virtual void Paint( const Rectangle& ) SAL_OVERRIDE;
+ virtual void DoInit() SAL_OVERRIDE;
+ virtual void DoScroll( ScrollBar* pCurScrollBar ) SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE();
@@ -341,21 +341,21 @@ public:
~ModulWindow();
- virtual void ExecuteCommand (SfxRequest& rReq);
- virtual void ExecuteGlobal (SfxRequest& rReq);
- virtual void GetState( SfxItemSet& );
- virtual void StoreData();
- virtual void UpdateData();
- virtual bool CanClose();
+ 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;
// return number of pages to be printed
- virtual sal_Int32 countPages( Printer* pPrinter );
+ virtual sal_Int32 countPages( Printer* pPrinter ) SAL_OVERRIDE;
// print page
- virtual void printPage( sal_Int32 nPage, Printer* pPrinter );
- virtual OUString GetTitle();
- virtual EntryDescriptor CreateEntryDescriptor();
- virtual bool AllowUndo();
- virtual void SetReadOnly (bool bReadOnly);
- virtual bool IsReadOnly();
+ 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;
StarBASIC* GetBasic() { XModule(); return xBasic; }
@@ -390,14 +390,14 @@ public:
BasicStatus& GetBasicStatus() { return aStatus; }
- virtual bool IsModified ();
- virtual bool IsPasteAllowed ();
+ virtual bool IsModified () SAL_OVERRIDE;
+ virtual bool IsPasteAllowed () SAL_OVERRIDE;
void FrameWindowMoved();
void ShowCursor( bool bOn );
- virtual sal_uInt16 GetSearchOptions();
- virtual sal_uInt16 StartSearchAndReplace (SvxSearchItem const&, bool bFromStart = false);
+ virtual sal_uInt16 GetSearchOptions() SAL_OVERRIDE;
+ virtual sal_uInt16 StartSearchAndReplace (SvxSearchItem const&, bool bFromStart = false) SAL_OVERRIDE;
EditorWindow& GetEditorWindow() { return aXEditorWindow.GetEdtWindow(); }
BreakPointWindow& GetBreakPointWindow() { return aXEditorWindow.GetBrkWindow(); }
@@ -408,22 +408,22 @@ public:
BreakPointList& GetBreakPoints() { return GetBreakPointWindow().GetBreakPoints(); }
ModulWindowLayout& GetLayout () { return rLayout; }
- virtual void BasicStarted();
- virtual void BasicStopped();
+ virtual void BasicStarted() SAL_OVERRIDE;
+ virtual void BasicStopped() SAL_OVERRIDE;
virtual ::svl::IUndoManager*
- GetUndoManager();
+ GetUndoManager() SAL_OVERRIDE;
const OUString& GetModule() const { return m_aModule; }
void SetModule( const OUString& aModule ) { m_aModule = aModule; }
- virtual void Activating ();
- virtual void Deactivating ();
+ virtual void Activating () SAL_OVERRIDE;
+ virtual void Deactivating () SAL_OVERRIDE;
- virtual void OnNewDocument ();
- virtual char const* GetHid () const;
- virtual ItemType GetType () const;
- virtual bool HasActiveEditor () const;
+ virtual void OnNewDocument () SAL_OVERRIDE;
+ virtual char const* GetHid () const SAL_OVERRIDE;
+ virtual ItemType GetType () const SAL_OVERRIDE;
+ virtual bool HasActiveEditor () const SAL_OVERRIDE;
void UpdateModule ();
};
@@ -434,10 +434,10 @@ public:
ModulWindowLayout (Window* pParent, ObjectCatalog&);
public:
// Layout:
- virtual void Activating (BaseWindow&);
- virtual void Deactivating ();
- virtual void GetState (SfxItemSet&, unsigned nWhich);
- virtual void UpdateDebug (bool bBasicStopped);
+ 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;
public:
void BasicAddWatch (OUString const&);
void BasicRemoveWatch ();
@@ -445,9 +445,9 @@ public:
protected:
// Window:
- virtual void Paint (const Rectangle& rRect);
+ virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE;
// Layout:
- virtual void OnFirstSize (long nWidth, long nHeight);
+ virtual void OnFirstSize (long nWidth, long nHeight) SAL_OVERRIDE;
private:
// main child window
@@ -457,7 +457,7 @@ private:
StackWindow aStackWindow;
ObjectCatalog& rObjectCatalog;
private:
- virtual void DataChanged (DataChangedEvent const& rDCEvt);
+ virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE;
private:
// SyntaxColors -- stores Basic syntax highlighting colors
class SyntaxColors : public utl::ConfigurationListener
@@ -472,7 +472,7 @@ private:
Color GetColor (TokenTypes eType) const { return aColors[eType]; }
private:
- virtual void ConfigurationChanged (utl::ConfigurationBroadcaster*, sal_uInt32);
+ virtual void ConfigurationChanged (utl::ConfigurationBroadcaster*, sal_uInt32) SAL_OVERRIDE;
void NewConfig (bool bFirst);
private:
@@ -509,7 +509,7 @@ public:
DECL_LINK(ImplSelectHdl, void*);
protected:
- virtual void KeyInput( const KeyEvent& rKeyEvt );
+ virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE;
};
class CodeCompleteWindow: public Window
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index b9d890011360..c99b8654e8d0 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -196,14 +196,14 @@ public:
private:
virtual ~ChangesListener() {}
- virtual void SAL_CALL disposing(lang::EventObject const &) throw (RuntimeException, std::exception)
+ virtual void SAL_CALL disposing(lang::EventObject const &) throw (RuntimeException, std::exception) SAL_OVERRIDE
{
osl::MutexGuard g(editor_.mutex_);
editor_.notifier_.clear();
}
virtual void SAL_CALL propertiesChange(
- Sequence< beans::PropertyChangeEvent > const &) throw (RuntimeException, std::exception)
+ Sequence< beans::PropertyChangeEvent > const &) throw (RuntimeException, std::exception) SAL_OVERRIDE
{
SolarMutexGuard g;
editor_.ImplSetFont();
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index df54b84f83b3..0059ff3ed30f 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -105,17 +105,17 @@ public:
}
// XEventListener
- virtual void SAL_CALL disposing( const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) {}
+ virtual void SAL_CALL disposing( const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE {}
// XContainerListener
- virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) throw( uno::RuntimeException, std::exception )
+ virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE
{
OUString sModuleName;
if( mpShell && ( Event.Accessor >>= sModuleName ) )
mpShell->FindBasWin( mpShell->m_aCurDocument, mpShell->m_aCurLibName, sModuleName, true, false );
}
- virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) throw( com::sun::star::uno::RuntimeException, std::exception ) { }
- virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) throw( com::sun::star::uno::RuntimeException, std::exception )
+ virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { }
+ virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
{
OUString sModuleName;
if( mpShell && ( Event.Accessor >>= sModuleName ) )
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index e20cbd5ed5f4..d4214e5cc5a5 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -178,13 +178,13 @@ private:
DocumentEventNotifier m_aNotifier;
void Init();
void SetEntryBitmaps( SvTreeListEntry * pEntry, const Image& rImage );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
protected:
- virtual void RequestingChildren( SvTreeListEntry* pParent );
- virtual void ExpandedHdl();
- virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource );
- virtual bool ExpandingHdl();
+ virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE;
+ virtual void ExpandedHdl() SAL_OVERRIDE;
+ virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ) SAL_OVERRIDE;
+ virtual bool ExpandingHdl() SAL_OVERRIDE;
void ImpCreateLibEntries( SvTreeListEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation );
void ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
@@ -193,15 +193,15 @@ protected:
SvTreeListEntry* ImpFindEntry( SvTreeListEntry* pParent, const OUString& rText );
// DocumentEventListener
- virtual void onDocumentCreated( const ScriptDocument& _rDocument );
- virtual void onDocumentOpened( const ScriptDocument& _rDocument );
- virtual void onDocumentSave( const ScriptDocument& _rDocument );
- virtual void onDocumentSaveDone( const ScriptDocument& _rDocument );
- virtual void onDocumentSaveAs( const ScriptDocument& _rDocument );
- virtual void onDocumentSaveAsDone( const ScriptDocument& _rDocument );
- virtual void onDocumentClosed( const ScriptDocument& _rDocument );
- virtual void onDocumentTitleChanged( const ScriptDocument& _rDocument );
- virtual void onDocumentModeChanged( const ScriptDocument& _rDocument );
+ 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;
public:
TreeListBox(Window* pParent, const ResId& rRes);
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx
index f64a4be4d85b..b51853bfb654 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -74,13 +74,13 @@ namespace basctl
~Impl ();
// XDocumentEventListener
- virtual void SAL_CALL documentEventOccured( const DocumentEvent& Event ) throw (RuntimeException, std::exception);
+ virtual void SAL_CALL documentEventOccured( const DocumentEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
// XEventListener
- virtual void SAL_CALL disposing( const csslang::EventObject& Event ) throw (RuntimeException, std::exception);
+ virtual void SAL_CALL disposing( const csslang::EventObject& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
// ComponentHelper
- virtual void SAL_CALL disposing();
+ virtual void SAL_CALL disposing() SAL_OVERRIDE;
private:
/// determines whether the instance is already disposed
diff --git a/basctl/source/basicide/layout.hxx b/basctl/source/basicide/layout.hxx
index 764ebd706405..8a9fc9971d0e 100644
--- a/basctl/source/basicide/layout.hxx
+++ b/basctl/source/basicide/layout.hxx
@@ -64,8 +64,8 @@ protected:
protected:
// Window:
- virtual void Resize ();
- virtual void DataChanged (DataChangedEvent const& rDCEvt);
+ virtual void Resize () SAL_OVERRIDE;
+ virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_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 667ef0ab8eca..6c6cbaceb065 100644
--- a/basctl/source/basicide/linenumberwindow.hxx
+++ b/basctl/source/basicide/linenumberwindow.hxx
@@ -24,10 +24,10 @@ private:
int m_nWidth;
long m_nCurYOffset;
int m_nBaseWidth;
- virtual void DataChanged (DataChangedEvent const& rDCEvt);
+ virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE;
protected:
- virtual void Paint( const Rectangle& );
+ virtual void Paint( const Rectangle& ) SAL_OVERRIDE;
public:
LineNumberWindow (Window* pParent, ModulWindow* pModulWin);
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index 9308f69de582..17a7cc8a5d8b 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -96,7 +96,7 @@ public:
void DeleteMacro();
SbMethod* CreateMacro();
- virtual short Execute();
+ virtual short Execute() SAL_OVERRIDE;
void SetMode (Mode);
Mode GetMode () const { return nMode; }
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 462c894065e0..7c6cca87672c 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -85,7 +85,7 @@ class DummyInteractionHandler : public HandlerImpl_BASE
public:
DummyInteractionHandler( const Reference< task::XInteractionHandler2 >& xHandler ) : m_xHandler( xHandler ){}
- virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& rRequest ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+ virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& rRequest ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
if ( m_xHandler.is() )
{
@@ -116,7 +116,7 @@ public:
LibLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rTxt ) :
SvLBoxString( pEntry, nFlags, rTxt ) {}
- virtual void Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
+ virtual void Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE;
};
void LibLBoxString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* pEntry)
@@ -1122,9 +1122,9 @@ public:
// Methods
virtual Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler()
- throw(RuntimeException, std::exception);
+ throw(RuntimeException, std::exception) SAL_OVERRIDE;
virtual Reference< XProgressHandler > SAL_CALL getProgressHandler()
- throw(RuntimeException, std::exception);
+ throw(RuntimeException, std::exception) SAL_OVERRIDE;
};
Reference< task::XInteractionHandler > OLibCommandEnvironment::getInteractionHandler()
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index 8783ee5abae2..f3487bfa9de8 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -97,16 +97,16 @@ public:
class ExtTreeListBox : public TreeListBox
{
protected:
- virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel );
- virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText );
+ virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ) SAL_OVERRIDE;
+ virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) SAL_OVERRIDE;
- virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvTreeListEntry* pEntry );
- virtual bool NotifyAcceptDrop( SvTreeListEntry* pEntry );
+ virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvTreeListEntry* pEntry ) SAL_OVERRIDE;
+ virtual bool NotifyAcceptDrop( SvTreeListEntry* pEntry ) SAL_OVERRIDE;
virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
- SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos );
+ SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ) SAL_OVERRIDE;
virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
- SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos );
+ SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ) SAL_OVERRIDE;
sal_Bool NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove );
@@ -133,9 +133,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);
- virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel );
- virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText );
+ 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;
void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; }
@@ -174,7 +174,7 @@ public:
OrganizeDialog( Window* pParent, sal_Int16 tabId, EntryDescriptor& rDesc );
~OrganizeDialog();
- virtual short Execute();
+ virtual short Execute() SAL_OVERRIDE;
DECL_LINK( ActivatePageHdl, TabControl * );
};
@@ -199,8 +199,8 @@ protected:
TabDialog* pTabDlg;
- virtual void ActivatePage();
- virtual void DeactivatePage();
+ virtual void ActivatePage() SAL_OVERRIDE;
+ virtual void DeactivatePage() SAL_OVERRIDE;
public:
ObjectPage(Window* pParent, const OString& rName, sal_uInt16 nMode);
@@ -243,8 +243,8 @@ protected:
void InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
void SetCurLib();
SvTreeListEntry* ImpInsertLibEntry( const OUString& rLibName, sal_uLong nPos );
- virtual void ActivatePage();
- virtual void DeactivatePage();
+ virtual void ActivatePage() SAL_OVERRIDE;
+ virtual void DeactivatePage() SAL_OVERRIDE;
TabDialog* pTabDlg;
diff --git a/basctl/source/basicide/objdlg.hxx b/basctl/source/basicide/objdlg.hxx
index 408e54b5313c..b090fc23ebfd 100644
--- a/basctl/source/basicide/objdlg.hxx
+++ b/basctl/source/basicide/objdlg.hxx
@@ -52,8 +52,8 @@ private:
TreeListBox aTree;
private:
- virtual void Resize (); // Window
- virtual void ToggleFloatingMode (); // DockingWindow
+ virtual void Resize () SAL_OVERRIDE; // Window
+ virtual void ToggleFloatingMode () SAL_OVERRIDE; // DockingWindow
void ArrangeWindows ();
};
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 8cc5cd51ae8a..02a128646e64 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -140,7 +140,7 @@ namespace basctl
virtual ~FilterDocuments() {}
- virtual bool includeDocument( const docs::DocumentDescriptor& _rDocument ) const;
+ virtual bool includeDocument( const docs::DocumentDescriptor& _rDocument ) const SAL_OVERRIDE;
private:
bool impl_isDocumentVisible_nothrow( const docs::DocumentDescriptor& _rDocument ) const;
@@ -279,15 +279,15 @@ namespace basctl
protected:
// DocumentEventListener
- virtual void onDocumentCreated( const ScriptDocument& _rDocument );
- virtual void onDocumentOpened( const ScriptDocument& _rDocument );
- virtual void onDocumentSave( const ScriptDocument& _rDocument );
- virtual void onDocumentSaveDone( const ScriptDocument& _rDocument );
- virtual void onDocumentSaveAs( const ScriptDocument& _rDocument );
- virtual void onDocumentSaveAsDone( const ScriptDocument& _rDocument );
- virtual void onDocumentClosed( const ScriptDocument& _rDocument );
- virtual void onDocumentTitleChanged( const ScriptDocument& _rDocument );
- virtual void onDocumentModeChanged( const ScriptDocument& _rDocument );
+ 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;
private:
bool impl_initDocument_nothrow( const Reference< XModel >& _rxModel );
diff --git a/basctl/source/basicide/tbxctl.hxx b/basctl/source/basicide/tbxctl.hxx
index 18eefab9af17..7058a6cf0196 100644
--- a/basctl/source/basicide/tbxctl.hxx
+++ b/basctl/source/basicide/tbxctl.hxx
@@ -39,18 +39,18 @@ private:
protected:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
- const SfxPoolItem* pState );
+ const SfxPoolItem* pState ) SAL_OVERRIDE;
public:
SFX_DECL_TOOLBOX_CONTROL();
TbxControls(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~TbxControls() {}
- virtual SfxPopupWindowType GetPopupWindowType() const;
- virtual SfxPopupWindow* CreatePopupWindow();
+ virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;
+ virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE;
using SfxToolBoxControl::Select;
- void Select( sal_uInt16 nModifier );
+ void Select( sal_uInt16 nModifier ) SAL_OVERRIDE;
};
} // namespace basctl
diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx
index 6d38b19accfd..c96ad9f891eb 100644
--- a/basctl/source/basicide/unomodel.hxx
+++ b/basctl/source/basicide/unomodel.hxx
@@ -35,31 +35,31 @@ public:
virtual ~SIDEModel();
//XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL acquire( ) throw();
- virtual void SAL_CALL release( ) throw();
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE;
+ virtual void SAL_CALL release( ) throw() SAL_OVERRIDE;
//XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XServiceInfo
virtual OUString SAL_CALL getImplementationName(void)
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void)
- throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XStorable2
virtual void SAL_CALL storeSelf( const ::com::sun::star::uno::Sequence< css::beans::PropertyValue >& )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { notImplemented(); }
+ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { notImplemented(); }
// XStorable
- virtual void SAL_CALL store() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL store() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL storeAsURL( const OUString& sURL,
const ::com::sun::star::uno::Sequence< css::beans::PropertyValue >& seqArguments )
- throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL storeToURL( const OUString& sURL,
const ::com::sun::star::uno::Sequence< css::beans::PropertyValue >& seqArguments )
- throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static();
static OUString getImplementationName_Static();
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 17:40:01 +0000