summaryrefslogtreecommitdiff
path: root/vcl/source/app
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-26 16:37:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-26 16:39:26 +0100
commit70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch)
treea70f4957c454b443520cbf91250c41d9eea80017 /vcl/source/app
parent8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff)
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'vcl/source/app')
-rw-r--r--vcl/source/app/dbggui.cxx14
-rw-r--r--vcl/source/app/session.cxx12
-rw-r--r--vcl/source/app/svdata.cxx2
-rw-r--r--vcl/source/app/svmain.cxx6
4 files changed, 17 insertions, 17 deletions
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 614b6c7bfda4..88489efde49b 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -328,9 +328,9 @@ private:
public:
DbgWindow();
- virtual bool Close();
- virtual void Resize();
- virtual bool PreNotify( NotifyEvent& rNEvt );
+ virtual bool Close() SAL_OVERRIDE;
+ virtual void Resize() SAL_OVERRIDE;
+ virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
void InsertLine( const OUString& rLine );
void Update() { WorkWindow::Update(); maLstBox.Update(); }
@@ -394,7 +394,7 @@ public:
DbgDialog();
DECL_LINK( ClickHdl, Button* );
- void RequestHelp( const HelpEvent& rHEvt );
+ void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
};
static sal_Char aDbgInfoBuf[12288];
@@ -1389,7 +1389,7 @@ class DbgMessageBox : public ErrorBox
AddButton(OUString("Copy"), COPY_BUTTON_ID, 0);
}
- virtual void Click()
+ virtual void Click() SAL_OVERRIDE
{
if( GetCurButtonId() == COPY_BUTTON_ID )
vcl::unohelper::TextDataObject::CopyStringTo( m_aMessage, GetClipboard() );
@@ -1412,7 +1412,7 @@ public:
}
protected:
- virtual long doIt();
+ virtual long doIt() SAL_OVERRIDE;
};
long SolarMessageBoxExecutor::doIt()
@@ -1515,7 +1515,7 @@ public:
}
protected:
- virtual long doIt();
+ virtual long doIt() SAL_OVERRIDE;
};
long SolarWindowPrinter::doIt()
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 478701c98267..cf430b4a08ff 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -76,12 +76,12 @@ class VCLSession:
virtual ~VCLSession() {}
- virtual void SAL_CALL addSessionManagerListener( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception );
- virtual void SAL_CALL removeSessionManagerListener( const css::uno::Reference< XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception );
- virtual void SAL_CALL queryInteraction( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception );
- virtual void SAL_CALL interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception );
- virtual void SAL_CALL saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception );
- virtual sal_Bool SAL_CALL cancelShutdown() throw( RuntimeException, std::exception );
+ virtual void SAL_CALL addSessionManagerListener( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL removeSessionManagerListener( const css::uno::Reference< XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL queryInteraction( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL cancelShutdown() throw( RuntimeException, std::exception ) SAL_OVERRIDE;
void callSaveRequested( bool bShutdown, bool bCancelable );
void callShutdownCancelled();
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 10430142580c..21a3d1a7a4e7 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -244,7 +244,7 @@ public:
// XCurrentContext
virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name )
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_prevContext;
};
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 9e1aeb8397e0..bccd5f16b72f 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -201,7 +201,7 @@ oslSignalHandler pExceptionHandler = NULL;
class DummyApplication : public Application
{
public:
- int Main() { return EXIT_SUCCESS; };
+ int Main() SAL_OVERRIDE { return EXIT_SUCCESS; };
};
class DesktopEnvironmentContext: public cppu::WeakImplHelper1< com::sun::star::uno::XCurrentContext >
@@ -212,7 +212,7 @@ public:
// XCurrentContext
virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name )
- throw (com::sun::star::uno::RuntimeException, std::exception);
+ throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_xNextContext;
@@ -325,7 +325,7 @@ namespace
*/
class VCLUnoWrapperDeleter : public cppu::WeakImplHelper1<com::sun::star::lang::XEventListener>
{
- virtual void SAL_CALL disposing(lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception);
+ virtual void SAL_CALL disposing(lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
void