diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-18 11:04:06 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-18 13:00:27 +0100 |
| commit | e801f17c1d312f189c8de6dca0ec7f90b4fdcdc5 (patch) | |
| tree | 23a41ef21f37b591d0394d80f5c3754618472dd7 /sfx2/source/appl/sfxhelp.cxx | |
| parent | 7802d99c35f5acfa43203f1dd6d1752af4e7c0b6 (diff) | |
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@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sfx2/source/appl/sfxhelp.cxx')
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
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; } |