From 223bb798f6f1917b926aa2fb293709ef63725a64 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 14 Feb 2017 16:09:42 +0100 Subject: Some simplifications, using UNO_QUERY_THROW Change-Id: I1db6d47af232f35a8d8596a7a18c3c3e7a272f4b Reviewed-on: https://gerrit.libreoffice.org/34253 Tested-by: Stephan Bergmann Reviewed-by: Stephan Bergmann --- toolkit/source/awt/vclxtoolkit.cxx | 25 +++++-------------------- toolkit/source/controls/dialogcontrol.cxx | 24 ++++++------------------ 2 files changed, 11 insertions(+), 38 deletions(-) (limited to 'toolkit') diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 5feba0603a6d..2b4f3f856795 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -1921,10 +1921,7 @@ void SAL_CALL VCLXToolkit::pause(sal_Int32 nMilliseconds) void SAL_CALL VCLXToolkit::keyPress( const css::awt::KeyEvent & aKeyEvent ) { - css::uno::Reference xWindow ( aKeyEvent.Source, css::uno::UNO_QUERY ); - if( !xWindow.is() ) - throw css::uno::RuntimeException( "invalid event source" ); - + css::uno::Reference xWindow ( aKeyEvent.Source, css::uno::UNO_QUERY_THROW ); VclPtr pWindow = VCLUnoHelper::GetWindow( xWindow ); if( !pWindow ) throw css::uno::RuntimeException( "invalid event source" ); @@ -1935,10 +1932,7 @@ void SAL_CALL VCLXToolkit::keyPress( const css::awt::KeyEvent & aKeyEvent ) void SAL_CALL VCLXToolkit::keyRelease( const css::awt::KeyEvent & aKeyEvent ) { - css::uno::Reference xWindow ( aKeyEvent.Source, css::uno::UNO_QUERY ); - if( !xWindow.is() ) - throw css::uno::RuntimeException( "invalid event source" ); - + css::uno::Reference xWindow ( aKeyEvent.Source, css::uno::UNO_QUERY_THROW ); VclPtr pWindow = VCLUnoHelper::GetWindow( xWindow ); if( !pWindow ) throw css::uno::RuntimeException( "invalid event source" ); @@ -1950,10 +1944,7 @@ void SAL_CALL VCLXToolkit::keyRelease( const css::awt::KeyEvent & aKeyEvent ) void SAL_CALL VCLXToolkit::mousePress( const css::awt::MouseEvent & aMouseEvent ) { - css::uno::Reference xWindow ( aMouseEvent.Source, css::uno::UNO_QUERY ); - if( !xWindow.is() ) - throw css::uno::RuntimeException( "invalid event source" ); - + css::uno::Reference xWindow ( aMouseEvent.Source, css::uno::UNO_QUERY_THROW ); VclPtr pWindow = VCLUnoHelper::GetWindow( xWindow ); if( !pWindow ) throw css::uno::RuntimeException( "invalid event source" ); @@ -1964,10 +1955,7 @@ void SAL_CALL VCLXToolkit::mousePress( const css::awt::MouseEvent & aMouseEvent void SAL_CALL VCLXToolkit::mouseRelease( const css::awt::MouseEvent & aMouseEvent ) { - css::uno::Reference xWindow ( aMouseEvent.Source, css::uno::UNO_QUERY ); - if( !xWindow.is() ) - throw css::uno::RuntimeException( "invalid event source" ); - + css::uno::Reference xWindow ( aMouseEvent.Source, css::uno::UNO_QUERY_THROW ); VclPtr pWindow = VCLUnoHelper::GetWindow( xWindow ); if( !pWindow ) throw css::uno::RuntimeException( "invalid event source" ); @@ -1978,10 +1966,7 @@ void SAL_CALL VCLXToolkit::mouseRelease( const css::awt::MouseEvent & aMouseEven void SAL_CALL VCLXToolkit::mouseMove( const css::awt::MouseEvent & aMouseEvent ) { - css::uno::Reference xWindow ( aMouseEvent.Source, css::uno::UNO_QUERY ); - if( !xWindow.is() ) - throw css::uno::RuntimeException( "invalid event source" ); - + css::uno::Reference xWindow ( aMouseEvent.Source, css::uno::UNO_QUERY_THROW ); VclPtr pWindow = VCLUnoHelper::GetWindow( xWindow ); if( !pWindow ) throw css::uno::RuntimeException( "invalid event source" ); diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index ba0d503e6231..b7f719313943 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -704,41 +704,31 @@ void SAL_CALL UnoMultiPageControl::dispose() // css::awt::XSimpleTabController ::sal_Int32 SAL_CALL UnoMultiPageControl::insertTab() { - Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); - if ( !xMultiPage.is() ) - throw RuntimeException(); + Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY_THROW ); return xMultiPage->insertTab(); } void SAL_CALL UnoMultiPageControl::removeTab( ::sal_Int32 ID ) { - Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); - if ( !xMultiPage.is() ) - throw RuntimeException(); + Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY_THROW ); xMultiPage->removeTab( ID ); } void SAL_CALL UnoMultiPageControl::setTabProps( ::sal_Int32 ID, const Sequence< NamedValue >& Properties ) { - Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); - if ( !xMultiPage.is() ) - throw RuntimeException(); + Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY_THROW ); xMultiPage->setTabProps( ID, Properties ); } Sequence< NamedValue > SAL_CALL UnoMultiPageControl::getTabProps( ::sal_Int32 ID ) { - Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); - if ( !xMultiPage.is() ) - throw RuntimeException(); + Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY_THROW ); return xMultiPage->getTabProps( ID ); } void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) { - Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); - if ( !xMultiPage.is() ) - throw RuntimeException(); + Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY_THROW ); xMultiPage->activateTab( ID ); ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ), uno::makeAny( ID ), true ); @@ -746,9 +736,7 @@ void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) ::sal_Int32 SAL_CALL UnoMultiPageControl::getActiveTabID() { - Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); - if ( !xMultiPage.is() ) - throw RuntimeException(); + Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY_THROW ); return xMultiPage->getActiveTabID(); } -- cgit