diff options
author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-01-08 22:50:33 +0100 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-01-08 22:50:33 +0100 |
commit | 93857a0ec92ee511c0ddce90004cd40e338a93f5 (patch) | |
tree | 715aa886d24de2ddd636766ab292043a25dda231 /sw/source/ui/uiview/viewling.cxx | |
parent | 3a66e8444c9086c53a27159a1a0edad3b6e85ff5 (diff) | |
parent | 9d43ce3490eb06668cd7fa6e7d29b7a7ced18957 (diff) |
autorecovery: merge after rebase to m69
Diffstat (limited to 'sw/source/ui/uiview/viewling.cxx')
-rw-r--r-- | sw/source/ui/uiview/viewling.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index 09014ea3afcf..d4a114ecc8a9 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -842,10 +842,9 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) else { SfxViewFrame *pSfxViewFrame = GetViewFrame(); - SfxFrame *pSfxFrame = pSfxViewFrame? pSfxViewFrame->GetFrame() : 0; uno::Reference< frame::XFrame > xFrame; - if (pSfxFrame) - xFrame = pSfxFrame->GetFrameInterface(); + if ( pSfxViewFrame ) + xFrame = pSfxViewFrame->GetFrame().GetFrameInterface(); com::sun::star::util::URL aURL; uno::Reference< frame::XDispatchProvider > xDispatchProvider( xFrame, UNO_QUERY ); uno::Reference< lang::XMultiServiceFactory > xMgr( utl::getProcessServiceFactory(), uno::UNO_QUERY ); |