From da7b76a58baf82dd40a3aa10fa07f584b7e9342b Mon Sep 17 00:00:00 2001 From: Peter Burow Date: Wed, 17 Oct 2001 10:07:10 +0000 Subject: fix: #92010# no special handling for first dispatch required any longer --- sfx2/source/appl/newhelp.cxx | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'sfx2/source/appl/newhelp.cxx') diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 1b44cd505c56..8070d4fb42ab 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: newhelp.cxx,v $ * - * $Revision: 1.64 $ + * $Revision: 1.65 $ * - * last change: $Author: pb $ $Date: 2001-10-15 07:37:17 $ + * last change: $Author: pb $ $Date: 2001-10-17 11:07:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2230,7 +2230,10 @@ IMPL_LINK( SfxHelpWindow_Impl, OpenHdl, SfxHelpIndexWindow_Impl* , EMPTYARG ) URL aURL; aURL.Complete = aEntry; PARSE_URL( aURL ); - Reference < XDispatch > xDisp = pHelpInterceptor->queryDispatch( aURL, String(), 0 ); + + Reference < XDispatchProvider > xProv( pTextWin->getFrame(), UNO_QUERY ); + Reference < XDispatch > xDisp = xProv.is() ? xProv->queryDispatch( aURL, String(), 0 ) + : Reference < XDispatch >(); if ( xDisp.is() ) { if ( !IsWait() ) @@ -2405,17 +2408,6 @@ void SfxHelpWindow_Impl::SetHelpURL( const String& rURL ) { INetURLObject aObj( rURL ); SetFactory( aObj.GetHost() ); - pHelpInterceptor->SetStartURL( rURL ); - - URL aURL; - aURL.Complete = rURL; - PARSE_URL( aURL ); - - String aTarget( DEFINE_CONST_UNICODE("_self") ); - Reference < XDispatchProvider > xProv( pTextWin->getFrame(), UNO_QUERY ); - Reference < XDispatch > xDisp = xProv.is() ? - xProv->queryDispatch( aURL, aTarget, 0 ) : Reference < XDispatch >(); - AddURLListener( aURL, xDisp ); } // ----------------------------------------------------------------------- -- cgit