diff options
| author | Oliver Bolte <obo@openoffice.org> | 2003-09-04 10:46:50 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2003-09-04 10:46:50 +0000 |
| commit | 3d78272c2a18f12665b8b1637bbc9df1c1fd03be (patch) | |
| tree | af13a70fc13de560076197084447f8e84418de39 /sw/source/core | |
| parent | 5c94356d32233d0ed95eeec8a2bbd1a05c4e359b (diff) | |
INTEGRATION: CWS geordi2q04 (1.23.192); FILE MERGED
2003/09/03 12:09:32 rt 1.23.192.1: #111934#: Join CWS os16.
Diffstat (limited to 'sw/source/core')
| -rw-r--r-- | sw/source/core/edit/editsh.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index a70bfe5c2988..b377f80f75b4 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: editsh.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: vg $ $Date: 2003-04-17 16:11:01 $ + * last change: $Author: obo $ $Date: 2003-09-04 11:46:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -366,7 +366,8 @@ const GraphicObject& SwEditShell::GetGraphicObj() const USHORT SwEditShell::GetGraphicType() const { SwGrfNode *pGrfNode = _GetGrfNode(); - return pGrfNode->GetGrfObj().GetType(); + ASSERT( pGrfNode, "SwEditShell::GetGraphicType() without graphic node" ) + return pGrfNode ? pGrfNode->GetGrfObj().GetType() : GRAPHIC_NONE; } /****************************************************************************** |