sfx2/source/appl/sfxhelp.cxx | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 624f01b02569f0a514b357a4d591b8526c3f73f2
Author: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
AuthorDate: Wed Oct 23 08:22:52 2024 +0300
Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Thu Oct 24 06:10:05 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 <rafael.palma.l...@gmail.com>
Tested-by: Jenkins
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 47411f419f12..de9c54d90e5b 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);
}
