From c8574d02391968538f45a1b8b52fddc9bfe8acb5 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 6 Jun 2008 11:13:32 +0000 Subject: INTEGRATION: CWS xmlfix2 (1.80.24); FILE MERGED 2008/05/15 17:28:10 mst 1.80.24.2: RESYNC: (1.80-1.83); FILE MERGED 2008/04/09 16:22:40 mst 1.80.24.1: fix issue #i87115# - sfx2/source/doc/objxtor.cxx + SfxObjectShell::Close: do not deregistering the document info listener; it should be unnecessary (and it also seems impossible to do correctly...) --- sfx2/source/doc/objxtor.cxx | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 1a0e7f174ad9..e80d323118f2 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: objxtor.cxx,v $ - * $Revision: 1.83 $ + * $Revision: 1.84 $ * * This file is part of OpenOffice.org. * @@ -160,7 +160,7 @@ public: virtual void SAL_CALL disposing( const lang::EventObject& ) throw ( uno::RuntimeException ); virtual void SAL_CALL modified( const lang::EventObject& ) - throw (uno::RuntimeException ); + throw ( uno::RuntimeException ); }; void SAL_CALL SfxDocInfoListener_Impl::modified( const lang::EventObject& ) @@ -481,15 +481,6 @@ sal_Bool SfxObjectShell::Close() pImp->bClosing = sal_True; Reference< util::XCloseable > xCloseable( GetBaseModel(), UNO_QUERY ); - uno::Reference xDPS( - GetModel(), uno::UNO_QUERY_THROW); - uno::Reference xMB( - xDPS->getDocumentProperties(), uno::UNO_QUERY); - if (xMB.is()) { - xMB->removeModifyListener(pImp->m_xDocInfoListener); - } - pImp->m_xDocInfoListener.clear(); - if ( xCloseable.is() ) { try -- cgit