[Libreoffice-commits] core.git: sfx2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Dec 18 12:00:51 UTC 2018
sfx2/source/appl/sfxhelp.cxx | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit e801f17c1d312f189c8de6dca0ec7f90b4fdcdc5
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Dec 18 11:04:06 2018 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Dec 18 13:00:27 2018 +0100
When showing --with-help=html offline help fails, fall back to online help
Change-Id: I6a74b94adc26923f9e83dd09d9b1d077a73b5d05
Reviewed-on: https://gerrit.libreoffice.org/65322
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 7a3eb65a1867..32bdcab980f8 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -863,9 +863,8 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const
// display" code below:
if (SfxContentHelper::IsHelpErrorDocument(aHelpURL))
{
- if ( impl_hasHTMLHelpInstalled() )
+ if ( impl_hasHTMLHelpInstalled() && impl_showOfflineHelp(aHelpURL) )
{
- impl_showOfflineHelp(aHelpURL);
return true;
}
@@ -1021,9 +1020,8 @@ bool SfxHelp::Start_Impl(const OUString& rURL, weld::Widget* pWidget, const OUSt
// display" code below:
if (SfxContentHelper::IsHelpErrorDocument(aHelpURL))
{
- if ( impl_hasHTMLHelpInstalled() )
+ if ( impl_hasHTMLHelpInstalled() && impl_showOfflineHelp(aHelpURL) )
{
- impl_showOfflineHelp(aHelpURL);
return true;
}
More information about the Libreoffice-commits
mailing list