diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-02-09 13:09:34 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-02-09 13:09:34 +0000 |
| commit | 4ab5d7248182c02d0f8c0741b9a5724037d6c2cf (patch) | |
| tree | f9e6d7c5b8df7ab26ee968e692b3a14d0358188f /sfx2 | |
| parent | 1e10a9bbdf504596bc9eabf6febee61a431d7520 (diff) | |
INTEGRATION: CWS fwk32 (1.57.120); FILE MERGED
2006/01/23 17:18:33 mba 1.57.120.1: #124861#: check ViewFrame ptr before usage
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 6c4e3c7ed0d5..e8abbf320719 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -4,9 +4,9 @@ * * $RCSfile: viewsh.cxx,v $ * - * $Revision: 1.59 $ + * $Revision: 1.60 $ * - * last change: $Author: rt $ $Date: 2006-02-09 13:59:29 $ + * last change: $Author: rt $ $Date: 2006-02-09 14:09:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1397,7 +1397,7 @@ void SfxViewShell::SetScrollingMode( SfxScrollingMode eMode ) SfxObjectShell* SfxViewShell::GetObjectShell() { - return GetViewFrame()->GetObjectShell(); + return pFrame ? pFrame->GetObjectShell() : NULL; } //-------------------------------------------------------------------- |