diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-15 14:43:08 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-15 14:43:08 +0000 |
| commit | 6c8883aa51b7222034fa6aff6616577f08d03156 (patch) | |
| tree | 28e91a3eea47e453d6cbe1767d7c19a5184bda66 /basctl | |
| parent | be60fc3c9d4642474da8da307bc6c45343931265 (diff) | |
INTEGRATION: CWS thiscomponent_SRC680 (1.45.24); FILE MERGED
2008/01/08 14:31:05 fs 1.45.24.1: #i85078# don't reset SfxObjectShell::WorkingDocument to NULL, always preserve the last working document
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/basidesh.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 1cd68036dcc3..2222d92ca4fd 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -4,9 +4,9 @@ * * $RCSfile: basidesh.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: kz $ $Date: 2007-10-09 15:22:02 $ + * last change: $Author: ihi $ $Date: 2008-01-15 15:43:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -242,7 +242,8 @@ __EXPORT BasicIDEShell::~BasicIDEShell() SetWindow( 0 ); SetCurWindow( 0 ); SfxObjectShell* pCurrentShell( SfxObjectShell::Current() ); - SfxObjectShell::SetWorkingDocument( pCurrentShell ? pCurrentShell->GetModel() : Reference< frame::XModel >() ); + if ( pCurrentShell ) + SfxObjectShell::SetWorkingDocument( pCurrentShell->GetModel() ); // Alle Fenster zerstoeren: IDEBaseWindow* pWin = aIDEWindowTable.First(); |