[Libreoffice-commits] .: vcl/inc vcl/source

[Libreoffice Gerrit user]

 vcl/inc/vcl/help.hxx    |   20 +++++++++++---------
 vcl/source/app/help.cxx |    9 +++++++++
 2 files changed, 20 insertions(+), 9 deletions(-)

New commits:
commit a1a165f1af228bcd206bc6be91bcc98e4c06bcfc
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Aug 20 21:35:06 2012 -0500

    gridfixes: #i112465# introduce HideBalloonAndQuickHelp
    
    Change-Id: Iea03d691755ac86fae4a0ac6697b726f21925ae7
    Reviewed-on: https://gerrit.libreoffice.org/538
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx
index 7f85301..1906bca 100644
--- a/vcl/inc/vcl/help.hxx
+++ b/vcl/inc/vcl/help.hxx
@@ -78,28 +78,28 @@ public:
     void                SetHelpFile( const String& rFileName ) { maHelpFile = rFileName; }
     const String&       GetHelpFile() const { return maHelpFile; }
 
-    virtual sal_Bool        Start( const XubString& rHelpId, const Window* pWindow );
-    virtual sal_Bool        SearchKeyword( const XubString& rKeyWord );
+    virtual sal_Bool    Start( const XubString& rHelpId, const Window* pWindow );
+    virtual sal_Bool    SearchKeyword( const XubString& rKeyWord );
     virtual void        OpenHelpAgent( const rtl::OString& rHelpId );
     virtual XubString   GetHelpText( const String& aHelpURL, const Window* pWindow );
 
     static void         EnableContextHelp();
     static void         DisableContextHelp();
-    static sal_Bool         IsContextHelpEnabled();
+    static sal_Bool     IsContextHelpEnabled();
 
     static void         EnableExtHelp();
     static void         DisableExtHelp();
-    static sal_Bool         IsExtHelpEnabled();
-    static sal_Bool         StartExtHelp();
-    static sal_Bool         EndExtHelp();
+    static sal_Bool     IsExtHelpEnabled();
+    static sal_Bool     StartExtHelp();
+    static sal_Bool     EndExtHelp();
 
     static void         EnableBalloonHelp();
     static void         DisableBalloonHelp();
-    static sal_Bool         IsBalloonHelpEnabled();
-    static sal_Bool         ShowBalloon( Window* pParent,
+    static sal_Bool     IsBalloonHelpEnabled();
+    static sal_Bool     ShowBalloon( Window* pParent,
                                      const Point& rScreenPos,
                                      const XubString& rHelpText );
-    static sal_Bool         ShowBalloon( Window* pParent,
+    static sal_Bool     ShowBalloon( Window* pParent,
                                      const Point& rScreenPos,
                                      const Rectangle&,
                                      const XubString& rHelpText );
@@ -118,6 +118,8 @@ public:
                                        sal_uInt16 nStyle = 0 )
                             { return Help::ShowQuickHelp( pParent, rScreenRect, rHelpText, XubString(), nStyle ); }
 
+    static void         HideBalloonAndQuickHelp();
+
     static sal_uLong    ShowTip( Window* pParent,
                                  const Rectangle& rScreenRect,
                                  const XubString& rText, sal_uInt16 nStyle = 0 );
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 7a3f174..45e7721 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -250,6 +250,15 @@ sal_Bool Help::ShowQuickHelp( Window* pParent,
 
 // -----------------------------------------------------------------------
 
+void Help::HideBalloonAndQuickHelp()
+{
+    HelpTextWindow const * pHelpWin = ImplGetSVData()->maHelpData.mpHelpWin;
+    bool const bIsVisible = ( pHelpWin != NULL ) && pHelpWin->IsVisible();
+    ImplDestroyHelpWindow( bIsVisible );
+}
+
+// -----------------------------------------------------------------------
+
 sal_uIntPtr Help::ShowTip( Window* pParent, const Rectangle& rScreenRect,
                      const XubString& rText, sal_uInt16 nStyle )
 {