summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-08-27 13:40:23 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-08-27 13:40:23 +0000
commit20840d4d1cde75038e3dc59a399f878fe7008aa4 (patch)
tree944a868b73ab94b16c9b06d6257ee8ed3c785e0c /sfx2
parent2082e2e1d9539873ca6f5638729389ff89b2adc1 (diff)
INTEGRATION: CWS fwk96_DEV300 (1.96.138); FILE MERGED
2008/08/20 12:29:15 mav 1.96.138.1: #158424# check the pointer
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/view/topfrm.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx
index ab2e03dd40..eda31d3574 100644
--- a/sfx2/source/view/topfrm.cxx
+++ b/sfx2/source/view/topfrm.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: topfrm.cxx,v $
- * $Revision: 1.96 $
+ * $Revision: 1.97 $
*
* This file is part of OpenOffice.org.
*
@@ -1237,7 +1237,7 @@ SfxTopViewFrame::SfxTopViewFrame
{
UnlockAdjustPosSizePixel();
}
- else if ( GetViewShell()->UseObjectSize() )
+ else if ( GetViewShell() && GetViewShell()->UseObjectSize() )
{
// initiale Gr"o\se festlegen
// Zuerst die logischen Koordinaten von IP-Objekt und EditWindow