diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-09-19 09:55:12 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-09-19 09:55:12 +0000 |
| commit | 98be3290112fc78441dbb7589e40c7b54148e2f6 (patch) | |
| tree | f54b0f029c6690b77c66c0cc2065ac6297ecdd83 /sw/source/core | |
| parent | a78a65036d76e54dc1b3d50a8f5888c3a27ee73c (diff) | |
INTEGRATION: CWS geordi2q05 (1.45.158); FILE MERGED
2003/09/19 07:54:02 rt 1.45.158.1: #111934#: join CWS sw02pp1
Diffstat (limited to 'sw/source/core')
| -rw-r--r-- | sw/source/core/access/acccontext.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 50c0168ad9d8..dcdc1e406173 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: acccontext.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: rt $ $Date: 2003-06-12 08:06:41 $ + * last change: $Author: rt $ $Date: 2003-09-19 10:55:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -218,8 +218,9 @@ Window *SwAccessibleContext::GetWindow() SwCrsrShell* SwAccessibleContext::GetCrsrShell() { SwCrsrShell* pCrsrShell; - ViewShell* pViewShell = GetMap()->GetShell(); - if( pViewShell->ISA( SwCrsrShell ) ) + ViewShell* pViewShell = GetMap() ? GetMap()->GetShell() : 0; + ASSERT( pViewShell, "no view shell" ); + if( pViewShell && pViewShell->ISA( SwCrsrShell ) ) pCrsrShell = static_cast<SwCrsrShell*>( pViewShell ); else pCrsrShell = NULL; @@ -231,8 +232,9 @@ const SwCrsrShell* SwAccessibleContext::GetCrsrShell() const { // just like non-const GetCrsrShell const SwCrsrShell* pCrsrShell; - const ViewShell* pViewShell = GetMap()->GetShell(); - if( pViewShell->ISA( SwCrsrShell ) ) + const ViewShell* pViewShell = GetMap() ? GetMap()->GetShell() : 0; + ASSERT( pViewShell, "no view shell" ); + if( pViewShell && pViewShell->ISA( SwCrsrShell ) ) pCrsrShell = static_cast<const SwCrsrShell*>( pViewShell ); else pCrsrShell = NULL; |