diff options
Diffstat (limited to 'embeddedobj/source/general')
-rw-r--r-- | embeddedobj/source/general/docholder.cxx | 36 | ||||
-rw-r--r-- | embeddedobj/source/general/xcreator.cxx | 5 |
2 files changed, 16 insertions, 25 deletions
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index f7b1044fff12..b48ffdfe5c64 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -229,14 +229,12 @@ void DocumentHolder::CloseFrame() catch( const uno::Exception& ) { } else { - uno::Reference<lang::XComponent> xComp( m_xFrame,uno::UNO_QUERY ); - if( xComp.is() ) - xComp->dispose(); + if( m_xFrame.is() ) + m_xFrame->dispose(); } - uno::Reference< lang::XComponent > xComp( m_xHatchWindow, uno::UNO_QUERY ); - if ( xComp.is() ) - xComp->dispose(); + if ( m_xHatchWindow.is() ) + m_xHatchWindow->dispose(); m_xHatchWindow.clear(); m_xOwnWindow.clear(); @@ -272,8 +270,7 @@ void DocumentHolder::FreeOffice() void DocumentHolder::CloseDocument( bool bDeliverOwnership, bool bWaitForClose ) { - uno::Reference< util::XCloseBroadcaster > xBroadcaster( m_xComponent, uno::UNO_QUERY ); - if ( xBroadcaster.is() ) + if ( m_xComponent.is() ) { uno::Reference< document::XEventBroadcaster > xEventBroadcaster( m_xComponent, uno::UNO_QUERY ); if ( xEventBroadcaster.is() ) @@ -287,13 +284,9 @@ void DocumentHolder::CloseDocument( bool bDeliverOwnership, bool bWaitForClose ) xModifyBroadcaster->removeModifyListener( static_cast<util::XModifyListener*>(this) ); } - uno::Reference< util::XCloseable > xCloseable( xBroadcaster, uno::UNO_QUERY ); - if ( xCloseable.is() ) - { - m_bAllowClosing = true; - m_bWaitForClose = bWaitForClose; - xCloseable->close( bDeliverOwnership ); - } + m_bAllowClosing = true; + m_bWaitForClose = bWaitForClose; + m_xComponent->close( bDeliverOwnership ); } m_xComponent = nullptr; @@ -718,7 +711,7 @@ bool DocumentHolder::ShowUI( const uno::Reference< css::frame::XLayoutManager >& // by unlocking the LM each layout change will now resize the containers window; pending layouts will be processed now xOwnLM->setVisible( true ); - uno::Reference< frame::XFramesSupplier > xSupp( m_xFrame->getCreator(), uno::UNO_QUERY ); + uno::Reference< frame::XFramesSupplier > xSupp = m_xFrame->getCreator(); if ( xSupp.is() ) xSupp->setActiveFrame( m_xFrame ); @@ -737,7 +730,7 @@ bool DocumentHolder::ShowUI( const uno::Reference< css::frame::XLayoutManager >& // activation failed; reestablish old state try { - uno::Reference< frame::XFramesSupplier > xSupp( m_xFrame->getCreator(), uno::UNO_QUERY ); + uno::Reference< frame::XFramesSupplier > xSupp = m_xFrame->getCreator(); if ( xSupp.is() ) xSupp->setActiveFrame( nullptr ); @@ -787,7 +780,7 @@ bool DocumentHolder::HideUI( const uno::Reference< css::frame::XLayoutManager >& if ( xOwnLM.is() ) { try { - uno::Reference< frame::XFramesSupplier > xSupp( m_xFrame->getCreator(), uno::UNO_QUERY ); + uno::Reference< frame::XFramesSupplier > xSupp = m_xFrame->getCreator(); if ( xSupp.is() ) xSupp->setActiveFrame( nullptr ); @@ -932,9 +925,8 @@ void DocumentHolder::SetComponent( const uno::Reference< util::XCloseable >& xDo m_bReadOnly = bReadOnly; m_bAllowClosing = false; - uno::Reference< util::XCloseBroadcaster > xBroadcaster( m_xComponent, uno::UNO_QUERY ); - if ( xBroadcaster.is() ) - xBroadcaster->addCloseListener( static_cast<util::XCloseListener*>(this) ); + if ( m_xComponent.is() ) + m_xComponent->addCloseListener( static_cast<util::XCloseListener*>(this) ); uno::Reference< document::XEventBroadcaster > xEventBroadcaster( m_xComponent, uno::UNO_QUERY ); if ( xEventBroadcaster.is() ) @@ -1277,7 +1269,7 @@ void SAL_CALL DocumentHolder::activated( ) } else { - uno::Reference< frame::XFramesSupplier > xSupp( m_xFrame->getCreator(), uno::UNO_QUERY ); + uno::Reference< frame::XFramesSupplier > xSupp = m_xFrame->getCreator(); if ( xSupp.is() ) xSupp->setActiveFrame( m_xFrame ); } diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index 54d8476d5471..522cc07d7942 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -138,9 +138,8 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta } try { - uno::Reference< lang::XComponent > xComp( xSubStorage, uno::UNO_QUERY ); - if ( xComp.is() ) - xComp->dispose(); + if ( xSubStorage.is() ) + xSubStorage->dispose(); } catch ( const uno::Exception& ) { |