From 84c75676bfe6f745d5bc70a74f8a7e82778227e2 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 6 Jun 2024 12:19:59 +0100 Subject: if we don't have local help then Help::GetHelpText will be empty MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- vcl/source/window/window.cxx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'vcl/source') 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 #include #include +#include #include #include @@ -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 ) { -- cgit