diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-06-10 12:27:54 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-06-10 12:27:54 +0000 |
| commit | 2286907c058d0ef73288567e62718702a647b8df (patch) | |
| tree | d87407e93c34ac73fa1d326d4ddbad4f48231795 /sfx2 | |
| parent | f5455b1ae5433715c4a5ad97946ef1ebd6c0ca0f (diff) | |
INTEGRATION: CWS fwk02ea (1.4.504); FILE MERGED
2004/05/28 09:28:27 as 1.4.504.1: #i28652# repair jump marks, load content synchron
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/helpdispatch.cxx | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx index fd058c9d09f9..33b60a7ac4f9 100644 --- a/sfx2/source/appl/helpdispatch.cxx +++ b/sfx2/source/appl/helpdispatch.cxx @@ -2,9 +2,9 @@ * * $RCSfile: helpdispatch.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: pb $ $Date: 2001-11-30 14:24:15 $ + * last change: $Author: kz $ $Date: 2004-06-10 13:27:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -125,26 +125,16 @@ void SAL_CALL HelpDispatch_Impl::dispatch( } } - // save url to history - m_rInterceptor.addURL( aURL.Complete ); - // then dispatch + // if a keyword was found, then open it SfxHelpWindow_Impl* pHelpWin = m_rInterceptor.GetHelpWindow(); DBG_ASSERT( pHelpWin, "invalid HelpWindow" ); - if ( !bHasKeyword || - INetURLObject( aURL.Complete ).GetHost() != pHelpWin->GetFactory() ) - { - Reference < XNotifyingDispatch > xNotifyingDisp( m_xRealDispatch, UNO_QUERY ); - if ( xNotifyingDisp.is() ) - { - OpenStatusListener_Impl* pListener = (OpenStatusListener_Impl*)pHelpWin->getOpenListener().get(); - DBG_ASSERT( pListener, "invalid XDispatchResultListener" ); - pListener->SetURL( aURL.Complete ); - xNotifyingDisp->dispatchWithNotification( aURL, aArgs, pListener ); - } - } - // if a keyword was found, then open it if ( bHasKeyword ) + { pHelpWin->OpenKeyword( sKeyword ); + return; + } + + pHelpWin->loadHelpContent(aURL.Complete); } // ----------------------------------------------------------------------- |