sfx2/source/appl/sfxhelp.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
New commits: commit bd826f8acfd8856a0db8485612bf834a8e500881 Author: Ilmari Lauhakangas <[email protected]> AuthorDate: Wed Oct 23 08:22:52 2024 +0300 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Thu Oct 24 07:48:02 2024 +0200 tdf#163580 Open online Help, if warn option is not checked Change-Id: I438032955f399a8b4737d100bee8a3db54427525 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175468 Reviewed-by: Rafael Lima <[email protected]> Tested-by: Jenkins (cherry picked from commit 624f01b02569f0a514b357a4d591b8526c3f73f2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175491 Reviewed-by: Ilmari Lauhakangas <[email protected]> diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index f7612c6da0cd..5dff8048460a 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -1101,13 +1101,12 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow) xChanges->commit(); aBusy.decBusy(); } - // Checks whether the user clicked "Read Help Online" (RET_OK) or "Information on downloading offline help" (RET_YES) - if(retOnlineHelpBox == RET_OK || retOnlineHelpBox == RET_YES) + if(!bShowOfflineHelpPopUp || retOnlineHelpBox == RET_OK || retOnlineHelpBox == RET_YES) { bool bTopicExists; - if (retOnlineHelpBox == RET_OK) + if (!bShowOfflineHelpPopUp || retOnlineHelpBox == RET_OK) { bTopicExists = impl_showOnlineHelp(aHelpURL, pWeldWindow); } @@ -1288,13 +1287,12 @@ bool SfxHelp::Start_Impl(const OUString& rURL, weld::Widget* pWidget, const OUSt xChanges->commit(); aBusy.decBusy(); } - // Checks whether the user clicked "Read Help Online" (RET_OK) or "Information on downloading offline help" (RET_YES) - if(retOnlineHelpBox == RET_OK || retOnlineHelpBox == RET_YES) + if(!bShowOfflineHelpPopUp || retOnlineHelpBox == RET_OK || retOnlineHelpBox == RET_YES) { bool bTopicExists; - if (retOnlineHelpBox == RET_OK) + if (!bShowOfflineHelpPopUp || retOnlineHelpBox == RET_OK) { bTopicExists = impl_showOnlineHelp(aHelpURL, pWidget); }
