From 7d902940508decad933c19bc97e5409873ab5189 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 11 May 2016 16:10:39 +0200 Subject: convert EXCEPTION_ to scoped enum - simplify VCLExceptionSignal_impl - drop "minor" part of error code, nobody passes it in, and nobody checks it - rename Display to UserInterface, to prevent -Werror=shadow Change-Id: I503fd8a50ded30d59c30fb388796f6b1a0c058de Reviewed-on: https://gerrit.libreoffice.org/24892 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- slideshow/test/demoshow.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'slideshow/test') diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx index 17560f8bc5ea..1183c7d3e27e 100644 --- a/slideshow/test/demoshow.cxx +++ b/slideshow/test/demoshow.cxx @@ -301,7 +301,7 @@ class DemoApp : public Application { public: virtual void Main(); - virtual sal_uInt16 Exception( sal_uInt16 nError ); + virtual void Exception( ExceptionCategory nCategory ); }; class ChildWindow : public vcl::Window @@ -481,15 +481,14 @@ void DemoWindow::Resize() // TODO } -sal_uInt16 DemoApp::Exception( sal_uInt16 nError ) +void DemoApp::Exception( ExceptionCategory nCategory ) { - switch( nError & EXCEPTION_MAJORTYPE ) + switch( nCategory ) { - case EXCEPTION_RESOURCENOTLOADED: + case ExceptionCategory::ResourceNotLoaded: Abort( "Error: could not load language resources.\nPlease check your installation.\n" ); break; } - return 0; } void DemoApp::Main() -- cgit