diff options
| author | Ingrid Halama <iha@openoffice.org> | 2010-04-09 10:24:13 +0200 |
|---|---|---|
| committer | Ingrid Halama <iha@openoffice.org> | 2010-04-09 10:24:13 +0200 |
| commit | cba8a6f937aea45938401957dcca617172cb3d57 (patch) | |
| tree | ada9ad0e9a7ef05a7c9db84110121602c13898f5 /sc/source/ui/unoobj/dispuno.cxx | |
| parent | 13d7655a877492f67814c1a269bcb52264f0e3e1 (diff) | |
| parent | 6a30f2a3025a9db27d1230d9498570964cd74e3f (diff) | |
chart45: merge with DEV300_m76
Diffstat (limited to 'sc/source/ui/unoobj/dispuno.cxx')
| -rw-r--r-- | sc/source/ui/unoobj/dispuno.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index cff547ce2652..6c82871d02da 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -65,9 +65,7 @@ uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( SfxViewShell* SfxViewFrame* pViewFrame = pViewShell->GetViewFrame(); if (pViewFrame) { - SfxFrame* pFrame = pViewFrame->GetFrame(); - if (pFrame) - return uno::Reference<view::XSelectionSupplier>( pFrame->GetController(), uno::UNO_QUERY ); + return uno::Reference<view::XSelectionSupplier>( pViewFrame->GetFrame().GetController(), uno::UNO_QUERY ); } } return uno::Reference<view::XSelectionSupplier>(); @@ -81,8 +79,7 @@ ScDispatchProviderInterceptor::ScDispatchProviderInterceptor(ScTabViewShell* pVi { if ( pViewShell ) { - SfxFrame* pFrame = pViewShell->GetViewFrame()->GetFrame(); - m_xIntercepted.set(uno::Reference<frame::XDispatchProviderInterception>(pFrame->GetFrameInterface(), uno::UNO_QUERY)); + m_xIntercepted.set(uno::Reference<frame::XDispatchProviderInterception>(pViewShell->GetViewFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY)); if (m_xIntercepted.is()) { comphelper::increment( m_refCount ); |