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

INTEGRATION: CWS xmlfix2 (1.80.24); FILE MERGED

Browse Source 
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...)
This commit is contained in:
Rüdiger Timm
2008-06-06 11:13:32 +00:00
parent d5607b04eb
commit c8574d0239
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sfx2/source/doc/objxtor.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: objxtor.cxx,v $ * $RCSfile: objxtor.cxx,v $
* $Revision: 1.83 $ * $Revision: 1.84 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -160,7 +160,7 @@ public:
virtual void SAL_CALL disposing( const lang::EventObject& ) virtual void SAL_CALL disposing( const lang::EventObject& )
throw ( uno::RuntimeException ); throw ( uno::RuntimeException );
virtual void SAL_CALL modified( const lang::EventObject& ) virtual void SAL_CALL modified( const lang::EventObject& )
throw (uno::RuntimeException ); throw ( uno::RuntimeException );
}; };
void SAL_CALL SfxDocInfoListener_Impl::modified( const lang::EventObject& ) void SAL_CALL SfxDocInfoListener_Impl::modified( const lang::EventObject& )
@@ -481,15 +481,6 @@ sal_Bool SfxObjectShell::Close()
pImp->bClosing = sal_True; pImp->bClosing = sal_True;
Reference< util::XCloseable > xCloseable( GetBaseModel(), UNO_QUERY ); Reference< util::XCloseable > xCloseable( GetBaseModel(), UNO_QUERY );
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
GetModel(), uno::UNO_QUERY_THROW);
uno::Reference<util::XModifyBroadcaster> xMB(
xDPS->getDocumentProperties(), uno::UNO_QUERY);
if (xMB.is()) {
xMB->removeModifyListener(pImp->m_xDocInfoListener);
}
pImp->m_xDocInfoListener.clear();
if ( xCloseable.is() ) if ( xCloseable.is() )
{ {
try try