summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdview.cxx
diff options
context:
space:
mode:
authorNiklas Nebel <nn@openoffice.org>2010-06-10 10:33:55 +0200
committerNiklas Nebel <nn@openoffice.org>2010-06-10 10:33:55 +0200
commit88e530cb0c153655e43a5ee557421dc8dbdf2002 (patch)
tree79e1db44b816aa0c5c94de31410ecd64b0f4c686 /svx/source/svdraw/svdview.cxx
parenta8edc64ce0b3e6238a704218b84247a5e63dedbb (diff)
parente03596eaf693b9809cffe86c21658a5ce381d6c3 (diff)
calc55: merge with DEV300_m81
Diffstat (limited to 'svx/source/svdraw/svdview.cxx')
-rw-r--r--svx/source/svdraw/svdview.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 856820b6d864..7a4305b9581f 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1358,6 +1358,10 @@ SdrViewContext SdrView::GetContext() const
for( ULONG nMarkNum = 0; nMarkNum < nMarkAnz && ( bGraf || bMedia ); nMarkNum++ )
{
const SdrObject* pMarkObj = GetMarkedObjectByIndex( nMarkNum );
+ DBG_ASSERT( pMarkObj, "SdrView::GetContext(), null pointer in mark list!" );
+
+ if( !pMarkObj )
+ continue;
if( !pMarkObj->ISA( SdrGrafObj ) )
bGraf = FALSE;