diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-08-30 16:34:16 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-08-30 16:34:16 +0000 |
| commit | d1e01f859dc10e74dcd1272ee7a28c0987f5c402 (patch) | |
| tree | 1728b2d8fcbe550ad3f55fa8c65d1781964dba04 /sfx2 | |
| parent | d70ca9af0746d59abbd13e67c02831eb15bb5771 (diff) | |
INTEGRATION: CWS help2 (1.21.28); FILE MERGED
2004/08/27 11:28:21 abi 1.21.28.2: #117735# removed fprintf
2004/08/27 11:21:05 abi 1.21.28.1: #117735# temporary fix
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/helpinterceptor.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index a804e1e5a8d1..289b49269e79 100644 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: helpinterceptor.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: kz $ $Date: 2004-06-10 13:28:11 $ + * last change: $Author: kz $ $Date: 2004-08-30 17:34:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,7 +116,7 @@ HelpInterceptor_Impl::~HelpInterceptor_Impl() void HelpInterceptor_Impl::addURL( const String& rURL ) { - if ( !m_pHistory ) + if ( !m_pHistory ) m_pHistory = new HelpHistoryList_Impl; ULONG nCount = m_pHistory->Count(); if ( nCount && m_nCurPos < ( nCount - 1 ) ) @@ -204,8 +204,10 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch( if ( m_xSlaveDispatcher.is() ) xResult = m_xSlaveDispatcher->queryDispatch( aURL, aTargetFrameName, nSearchFlags ); - INetURLObject aObj( aURL.Complete ); - sal_Bool bHelpURL = ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP ); + // INetURLObject aObj( aURL.Complete ); + // sal_Bool bHelpURL = ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP ); + BOOL bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString::createFromAscii("vnd.sun.star.help"),0); + if ( bHelpURL ) { DBG_ASSERT( xResult.is(), "invalid dispatch" ); |