diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-06-06 16:37:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-06-06 21:08:42 +0200 |
| commit | dc346060164e800c7fed7859b17c19ddd2e027c9 (patch) | |
| tree | dfec2a35f0508650b83c4b9a6a0419acdc533e2f /vcl/source/window/window.cxx | |
| parent | 69ebf09889c551c41aac951d2df97ff0e75d841c (diff) | |
drop searching for widget extended tips in the offline help
by now these extended tips for the widgets of the general ui appear in
the .ui file directly instead as accessibility descriptions instead.
In any case, the default build configs of
distro-configs/LibreOfficeLinux.conf
distro-configs/LibreOfficeMacOSX.conf
distro-configs/LibreOfficeWin64.conf
use --with-help=html
where these ahelps are not available. So, existing in the classic help only.
Change-Id: Ie27736e9140e445c7f8986a741c2002f2efa9ccb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168505
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'vcl/source/window/window.cxx')
| -rw-r--r-- | vcl/source/window/window.cxx | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index a58a46f45ec2..d8261ec5acf0 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -26,7 +26,6 @@ #include <comphelper/diagnose_ex.hxx> #include <vcl/salgtype.hxx> #include <vcl/event.hxx> -#include <vcl/help.hxx> #include <vcl/cursor.hxx> #include <vcl/svapp.hxx> #include <vcl/transfer.hxx> @@ -76,7 +75,6 @@ #include <tools/debug.hxx> #include <tools/json_writer.hxx> #include <boost/property_tree/ptree.hpp> -#include <config_features.h> #include <cassert> #include <typeinfo> @@ -3106,29 +3104,15 @@ const Wallpaper& Window::GetDisplayBackground() const const OUString& Window::GetHelpText() const { - OUString aStrHelpId( GetHelpId() ); - bool bStrHelpId = !aStrHelpId.isEmpty(); + const OUString& rStrHelpId(GetHelpId()); + const bool bStrHelpId = !rStrHelpId.isEmpty(); - if ( !mpWindowImpl->maHelpText.getLength() && bStrHelpId ) - { -#if HAVE_FEATURE_LOCAL_HELP - if ( !IsDialog() && (mpWindowImpl->mnType != WindowType::TABPAGE) && (mpWindowImpl->mnType != WindowType::FLOATINGWINDOW) ) - { - Help* pHelp = Application::GetHelp(); - if ( pHelp ) - { - mpWindowImpl->maHelpText = pHelp->GetHelpText(aStrHelpId, this); - mpWindowImpl->mbHelpTextDynamic = false; - } - } -#endif - } - else if( mpWindowImpl->mbHelpTextDynamic && bStrHelpId ) + if (mpWindowImpl->mbHelpTextDynamic && bStrHelpId) { static const char* pEnv = getenv( "HELP_DEBUG" ); if( pEnv && *pEnv ) { - mpWindowImpl->maHelpText = mpWindowImpl->maHelpText + "\n------------------\n" + aStrHelpId; + mpWindowImpl->maHelpText = mpWindowImpl->maHelpText + "\n------------------\n" + rStrHelpId; } mpWindowImpl->mbHelpTextDynamic = false; } |