diff options
| author | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2011-01-15 17:21:37 +0100 |
|---|---|---|
| committer | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2011-01-15 17:21:37 +0100 |
| commit | 2ce9a356b9c14263008c3c182d5e69508d2c9107 (patch) | |
| tree | f3e07ed0cf867aea00cfd1ac1bbce09ccfabe323 /sc/source/ui/view/drawview.cxx | |
| parent | df4eb12515da36973ad00eb2ae2b18ca303646c7 (diff) | |
| parent | a7417580c63270351601a7aef27c11247a831206 (diff) | |
chart46: merge with DEV300_m97
Diffstat (limited to 'sc/source/ui/view/drawview.cxx')
| -rw-r--r-- | sc/source/ui/view/drawview.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 489da0cc4899..3307398b5ef8 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -530,19 +530,15 @@ void ScDrawView::MarkListHasChanged() SfxViewFrame* pViewFrame = pViewSh->GetViewFrame(); BOOL bOle = pViewSh->GetViewFrame()->GetFrame().IsInPlace(); + uno::Sequence< embed::VerbDescriptor > aVerbs; if ( pOle2Obj && !bOle ) { uno::Reference < embed::XEmbeddedObject > xObj = pOle2Obj->GetObjRef(); + DBG_ASSERT( xObj.is(), "SdrOle2Obj ohne ObjRef" ); if (xObj.is()) - pViewSh->SetVerbs( xObj->getSupportedVerbs() ); - else - { - DBG_ERROR("SdrOle2Obj ohne ObjRef"); - pViewSh->SetVerbs( 0 ); - } + aVerbs = xObj->getSupportedVerbs(); } - else - pViewSh->SetVerbs( 0 ); + pViewSh->SetVerbs( aVerbs ); // Image-Map Editor |