diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-06-06 12:19:59 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-06-06 16:25:43 +0200 |
| commit | 84c75676bfe6f745d5bc70a74f8a7e82778227e2 (patch) | |
| tree | 9974f3e25f83b98a7a14737351941941a68c2e36 /vcl/source | |
| parent | 7cea20d132f8f419bab28ed954635e29a16e5ae2 (diff) | |
if we don't have local help then Help::GetHelpText will be empty
anyway, so we can skip that work on Window::GetHelpText.
It might even be that by now all the a11y/extended-tips are in the local
.ui files and the whole fallback to local help is redundant and should
be removed. But that's not done here.
Change-Id: I03b759aba6d1619aff37ded6764fbe3b6ded9555
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168494
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/window.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 8411888fe9ee..a58a46f45ec2 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -76,6 +76,7 @@ #include <tools/debug.hxx> #include <tools/json_writer.hxx> #include <boost/property_tree/ptree.hpp> +#include <config_features.h> #include <cassert> #include <typeinfo> @@ -3110,6 +3111,7 @@ const OUString& Window::GetHelpText() const if ( !mpWindowImpl->maHelpText.getLength() && bStrHelpId ) { +#if HAVE_FEATURE_LOCAL_HELP if ( !IsDialog() && (mpWindowImpl->mnType != WindowType::TABPAGE) && (mpWindowImpl->mnType != WindowType::FLOATINGWINDOW) ) { Help* pHelp = Application::GetHelp(); @@ -3119,6 +3121,7 @@ const OUString& Window::GetHelpText() const mpWindowImpl->mbHelpTextDynamic = false; } } +#endif } else if( mpWindowImpl->mbHelpTextDynamic && bStrHelpId ) { |