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 --- canvas/workben/canvasdemo.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'canvas/workben') diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index 4a8143c23a87..af2319ab514b 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -64,7 +64,7 @@ class DemoApp : public Application { public: virtual void Main(); - virtual USHORT Exception( USHORT nError ); + virtual void Exception( ExceptionCategory nCategory ); }; static void PrintHelp() @@ -621,15 +621,14 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) } } -USHORT DemoApp::Exception( USHORT 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 v1.2.3