diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 08:43:30 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 08:43:30 +0000 |
| commit | 894c1207709fd9d117b16a458698fe68c588cfdd (patch) | |
| tree | 3a03bce640f6f1ec1f256d67428680fad587159a /sw/source/ui/app/mainwn.cxx | |
| parent | 399d2a65f3e388d47bc6d47546cbd492fef256e3 (diff) | |
INTEGRATION: CWS geordi2q10 (1.3.298); FILE MERGED
2003/11/27 12:40:15 rt 1.3.298.1: #111934#: join CWS os21
Diffstat (limited to 'sw/source/ui/app/mainwn.cxx')
| -rw-r--r-- | sw/source/ui/app/mainwn.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/ui/app/mainwn.cxx index 4330776a4ad2..4f0d99a01e31 100644 --- a/sw/source/ui/app/mainwn.cxx +++ b/sw/source/ui/app/mainwn.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mainwn.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: vg $ $Date: 2003-04-17 15:12:32 $ + * last change: $Author: rt $ $Date: 2003-12-01 09:43:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -175,7 +175,9 @@ void EndProgress( SwDocShell *pDocShell ) pProgressContainer->Remove( i ); delete pProgress->pProgress; delete pProgress; - if ( !pProgressContainer->Count() ) + //#112337# it may happen that the container has been removed + //while rescheduling + if ( pProgressContainer && !pProgressContainer->Count() ) delete pProgressContainer, pProgressContainer = 0; } } |