[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/appl/sfxhelp.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 1db0e536516b912c6b5e266a05f50a0dbfc58e67
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:27:53 2018 +0100

    When showing --with-help=html offline help fails, fall back to online help
    
    Change-Id: I6a74b94adc26923f9e83dd09d9b1d077a73b5d05
    Reviewed-on: https://gerrit.libreoffice.org/65323
    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 42748f9cc52d..4f753c6b442d 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -877,9 +877,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;
         }
 
@@ -1035,9 +1034,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;
         }