summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-01-20 16:36:19 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-01-21 07:18:38 +0000
commit90d892664a6c49a8ae25a72ddccf54dba9d0e429 (patch)
treed9bb4a7307e349b88a4d528854abb44e4323f563 /desktop
parentea6fdbaeeb51ad695f1c3754b796b7273eb4baad (diff)
loplugin: unused return values
Change-Id: I4eb1f0c9245c04058fd5e47046f043f8840a79c7 Reviewed-on: https://gerrit.libreoffice.org/21628 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/inc/app.hxx4
-rw-r--r--desktop/source/app/app.cxx3
2 files changed, 3 insertions, 4 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index d07d2853da38..89b8803f23b5 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -75,8 +75,8 @@ class Desktop : public Application
virtual void Init() override;
virtual void InitFinished() override;
virtual void DeInit() override;
- virtual bool QueryExit() override;
- virtual sal_uInt16 Exception(sal_uInt16 nError) override;
+ virtual bool QueryExit() override;
+ virtual void Exception(sal_uInt16 nError) override;
virtual void OverrideSystemSettings( AllSettings& rSettings ) override;
virtual void AppEvent( const ApplicationEvent& rAppEvent ) override;
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index da4f41298125..11f25e668083 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1184,7 +1184,7 @@ void restartOnMac(bool passArguments) {
}
-sal_uInt16 Desktop::Exception(sal_uInt16 nError)
+void Desktop::Exception(sal_uInt16 nError)
{
// protect against recursive calls
static bool bInException = false;
@@ -1250,7 +1250,6 @@ sal_uInt16 Desktop::Exception(sal_uInt16 nError)
}
OSL_ASSERT(false); // unreachable
- return 0;
}
void Desktop::AppEvent( const ApplicationEvent& rAppEvent )