include/sfx2/sfxhelp.hxx | 1 +
sfx2/source/appl/sfxhelp.cxx | 19 +++++++++++++++----
2 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit 60dd4825ba8fbab211fbb31961ea11873406a280
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Mar 22 16:16:36 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Mar 22 21:00:55 2021 +0100
tdf#140539 don't allow help to be relaunched during launch
its fine once it is launched to fire help again, just not during
the launch itself via the yield-call done during html load that
probably exists to let the progress bar redraw
Change-Id: I42e0bf670023d91f70cb1de3fa0fda23e82d0678
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112921
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx
index f07c2017287f..c71b643d162e 100644
--- a/include/sfx2/sfxhelp.hxx
+++ b/include/sfx2/sfxhelp.hxx
@@ -28,6 +28,7 @@
class SFX2_DLLPUBLIC SfxHelp final : public Help
{
bool bIsDebug;
+ bool bLaunchingHelp; // tdf#140539 don't allow help to be
re-launched during help launch
private:
SAL_DLLPRIVATE static bool Start_Impl(const OUString& rURL, weld::Widget*
pWidget, const OUString& rKeyword);
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 6732fb5b0e63..e16d5cab7865 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -338,8 +338,9 @@ OUString SfxHelp_Impl::GetHelpText( const OUString&
aCommandURL, const OUString&
return SfxContentHelper::GetActiveHelpString(
aHelpURL.makeStringAndClear() );
}
-SfxHelp::SfxHelp() :
- bIsDebug( false )
+SfxHelp::SfxHelp()
+ : bIsDebug(false)
+ , bLaunchingHelp(false)
{
// read the environment variable "HELP_DEBUG"
// if it's set, you will see debug output on active help
@@ -691,12 +692,22 @@ void SfxHelp::SearchKeyword( const OUString& rKeyword )
bool SfxHelp::Start( const OUString& rURL, const vcl::Window* pWindow )
{
- return Start_Impl( rURL, pWindow, OUString() );
+ if (bLaunchingHelp)
+ return true;
+ bLaunchingHelp = true;
+ bool bRet = Start_Impl( rURL, pWindow, OUString() );
+ bLaunchingHelp = false;
+ return bRet;
}
bool SfxHelp::Start(const OUString& rURL, weld::Widget* pWidget)
{
- return Start_Impl(rURL, pWidget, OUString());
+ if (bLaunchingHelp)
+ return true;
+ bLaunchingHelp = true;
+ bool bRet = Start_Impl(rURL, pWidget, OUString());
+ bLaunchingHelp = false;
+ return bRet;
}
/// Redirect the vnd.sun.star.help:// urls to http://help.libreoffice.org
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
