Bugzilla – Attachment 41157 Details for
Bug 32338
[WIKIHELP]: Missing context sensitive Help
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Fix for the problem
0001-wikihelp-Use-the-right-Help-ID-URL-when-the-help-is-.patch (text/plain), 2.48 KB, created by
Jan Holesovsky
on 2010-12-15 14:15:45 UTC
(
hide
)
Description:
Fix for the problem
Filename:
MIME Type:
Creator:
Jan Holesovsky
Created:
2010-12-15 14:15:45 UTC
Size:
2.48 KB
patch
obsolete
>From 3be61d6854441af24f52f1b306a91537ba289174 Mon Sep 17 00:00:00 2001 >From: Jan Holesovsky <kendy@suse.cz> >Date: Wed, 15 Dec 2010 22:56:22 +0100 >Subject: [PATCH] wikihelp: Use the right Help ID URL, fdo#32338. > >The offline help has a fallback mechanism that (for non-existing Help IDs) >tries to traverse the parent windows to find at least something. This is not >desired in the case of on-line help, because there we can easily define new >redirects, without recompiling LibreOffice. >--- > sfx2/source/appl/sfxhelp.cxx | 20 +++++++++++++------- > 1 files changed, 13 insertions(+), 7 deletions(-) > >diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx >index 339e664..2fb3e01 100644 >--- a/sfx2/source/appl/sfxhelp.cxx >+++ b/sfx2/source/appl/sfxhelp.cxx >@@ -745,6 +745,17 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >& rHelpTask , > return pHelpWindow; > } > >+/// Check for built-in help >+static bool impl_hasHelpInstalled() >+{ >+ String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") ); >+ AppendConfigToken_Impl( aHelpRootURL, sal_True ); >+ Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL ); >+ >+ return ( aFactories.getLength() != 0 ); >+} >+ >+/// Redirect the vnd.sun.star.help:// urls to http://help.libreoffice.org > static bool impl_showOnlineHelp( const String& rURL ) > { > String aInternal( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) ); >@@ -811,13 +822,8 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) > } > } > >- // check if help is available >- String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") ); >- AppendConfigToken_Impl( aHelpRootURL, sal_True ); >- Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL ); >- if ( 0 == aFactories.getLength() ) >+ if ( !impl_hasHelpInstalled() ) > { >- // no factories -> no help -> try online > if ( impl_showOnlineHelp( aHelpURL ) ) > return TRUE; > else >@@ -871,7 +877,7 @@ BOOL SfxHelp::Start( ULONG nHelpId, const Window* pWindow ) > { > String aHelpModuleName( GetHelpModuleName_Impl() ); > String aHelpURL = CreateHelpURL( nHelpId, aHelpModuleName ); >- if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) >+ if ( impl_hasHelpInstalled() && pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) > { > // no help found -> try with parent help id. > Window* pParent = pWindow->GetParent(); >-- >1.7.3.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 32338
: 41157