mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS mbafixesfor22 (1.26.8); FILE MERGED

Browse Source 
2007/01/18 13:06:01 mav 1.26.8.1: #i73611# handle the error cases correctly
This commit is contained in:
Oliver Bolte
2007-01-25 10:40:04 +00:00
parent df442d05ff
commit b618458f34
1 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
embedserv/source/embed/docholder.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: docholder.cxx,v $ * $RCSfile: docholder.cxx,v $
* *
* $Revision: 1.27 $ * $Revision: 1.28 $
* *
* last change: $Author: obo $ $Date: 2007-01-23 07:34:08 $ * last change: $Author: obo $ $Date: 2007-01-25 11:40:04 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -710,32 +710,19 @@ void DocumentHolder::DisconnectFrameDocument()
void DocumentHolder::CloseDocument() void DocumentHolder::CloseDocument()
{ {
try DisconnectFrameDocument();
uno::Reference< util::XCloseable > xCloseable(
m_xDocument, uno::UNO_QUERY );
if ( xCloseable.is() )
{ {
uno::Reference< util::XModifyBroadcaster > xModifiable( m_xDocument, uno::UNO_QUERY_THROW ); try
xModifiable->removeModifyListener( (util::XModifyListener*)this );
}
catch( uno::Exception& )
{}
uno::Reference< util::XCloseBroadcaster > xBroadcaster(
m_xDocument, uno::UNO_QUERY );
if ( xBroadcaster.is() )
{
xBroadcaster->removeCloseListener( (util::XCloseListener*)this );
uno::Reference< util::XCloseable > xCloseable(
xBroadcaster, uno::UNO_QUERY );
if ( xCloseable.is() )
{ {
try xCloseable->close( sal_True );
{
xCloseable->close( sal_True );
}
catch( uno::Exception& )
{}
} }
catch( uno::Exception& )
{}
} }
m_pIDispatch = NULL; m_pIDispatch = NULL;
@@ -745,10 +732,14 @@ void DocumentHolder::CloseDocument()
void DocumentHolder::CloseFrame() void DocumentHolder::CloseFrame()
{ {
uno::Reference< util::XCloseBroadcaster > xBroadcaster( try
m_xFrame, uno::UNO_QUERY ); {
if ( xBroadcaster.is() ) uno::Reference< util::XCloseBroadcaster > xBroadcaster(
m_xFrame, uno::UNO_QUERY_THROW );
xBroadcaster->removeCloseListener( (util::XCloseListener*)this ); xBroadcaster->removeCloseListener( (util::XCloseListener*)this );
}
catch( uno::Exception& )
{}
uno::Reference<util::XCloseable> xCloseable( uno::Reference<util::XCloseable> xCloseable(
m_xFrame,uno::UNO_QUERY); m_xFrame,uno::UNO_QUERY);
@@ -1561,10 +1552,14 @@ void SAL_CALL
DocumentHolder::notifyClosing( DocumentHolder::notifyClosing(
const lang::EventObject& aSource ) const lang::EventObject& aSource )
{ {
uno::Reference< util::XCloseBroadcaster > xEventBroadcaster( try
aSource.Source, uno::UNO_QUERY ); {
if ( xEventBroadcaster.is() ) uno::Reference< util::XCloseBroadcaster > xEventBroadcaster(
aSource.Source, uno::UNO_QUERY_THROW );
xEventBroadcaster->removeCloseListener( (util::XCloseListener*)this ); xEventBroadcaster->removeCloseListener( (util::XCloseListener*)this );
}
catch( uno::Exception& )
{}
if ( m_xDocument.is() && m_xDocument == aSource.Source ) if ( m_xDocument.is() && m_xDocument == aSource.Source )
{ {