[Libreoffice-commits] .: svtools/source

[Libreoffice Gerrit user]

 svtools/source/table/tabledatawindow.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 3d934d48606acf8c5c96d0d8b96e2f202db1f37d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Aug 20 22:01:08 2012 -0500

    gridfixes: #i112465# delegate RequestHelp to the base class,
    
    when we do not have own help to display
    
    Change-Id: I953144aa0921e849df14e9de31010e8904dffc5f
    Reviewed-on: https://gerrit.libreoffice.org/539
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index cc84f53..4f69758 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -142,18 +142,26 @@ namespace svt { namespace table
 
         if ( !sHelpText.isEmpty() )
         {
+            // hide the standard (singleton) help window, so we do not have two help windows open at the same time
+            Help::HideBalloonAndQuickHelp();
+
             Rectangle const aControlScreenRect(
                 OutputToScreenPixel( Point( 0, 0 ) ),
                 GetOutputSizePixel()
             );
 
             if ( m_nTipWindowHandle )
+            {
                 Help::UpdateTip( m_nTipWindowHandle, this, aControlScreenRect, sHelpText );
+            }
             else
                 m_nTipWindowHandle = Help::ShowTip( this, aControlScreenRect, sHelpText, nHelpStyle );
         }
         else
+        {
             impl_hideTipWindow();
+            Window::RequestHelp( rHEvt );
+        }
     }
 
     //------------------------------------------------------------------------------------------------------------------