[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/window/builder.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ef0be13a2aff3fe42a99c0c92a7c39e23c864bfe
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 10 20:20:21 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Feb 11 10:13:03 2021 +0100

    support setting tooltip for tabpages
    
    doesn't actually have an effect in practice yet though
    
    Change-Id: I1d88f4b1c8caa44ad542f9666d86449c078ff93c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110727
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 30c06a9f6ba5..bca2a7ae9cba 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2620,11 +2620,13 @@ void VclBuilder::handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &read
     VclBuilder::stringmap::iterator aFind = aProperties.find(OString("label"));
     if (aFind != aProperties.end())
     {
+        OUString sTooltip(extractTooltipText(aProperties));
         if (pTabControl)
         {
             sal_uInt16 nPageId = pTabControl->GetCurPageId();
             pTabControl->SetPageText(nPageId, aFind->second);
             pTabControl->SetPageName(nPageId, sIDs.back());
+            pTabControl->SetHelpText(nPageId, sTooltip);
             if (!context.empty())
             {
                 TabPage* pPage = pTabControl->GetTabPage(nPageId);
@@ -2649,7 +2651,6 @@ void VclBuilder::handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &read
         {
             OUString sLabel(BuilderUtils::convertMnemonicMarkup(aFind->second));
             OUString sIconName(extractIconName(aProperties));
-            OUString sTooltip(extractTooltipText(aProperties));
             pVerticalTabControl->InsertPage(sIDs.front(), sLabel, FixedImage::loadThemeImage(sIconName), sTooltip,
                                             pVerticalTabControl->GetPageParent()->GetWindow(GetWindowType::LastChild));
         }