[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Kohei Yoshida]

 sc/source/ui/view/cellsh2.cxx |    1 +
 sc/source/ui/view/tabview.cxx |   14 ++------------
 2 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit 7921b5931a4a870dcde495255b36f8a312bbf055
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Fri Jan 6 17:30:27 2012 -0500

    Fixed the validation message popup disappearing when scrolling etc.
    
    When the popup goes outside the visible area & get scrolled back in,
    it would disappear.  Also, when setting the hint message on in the
    dialog and clicking OK should show the popup right away.

diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index dcc4d9f..a51e8b9 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -911,6 +911,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                             aData.ResetError();                         // reset only bShowError
 
                         pTabViewShell->SetValidation( aData );
+                        pTabViewShell->TestHintWindow();
                         rReq.Done( *pOutSet );
                     }
                     //after end execute from !IsModalInputMode, it is safer to delay deleting
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 6d1652f..a5fdf31 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1301,10 +1301,6 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
 
 void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, bool bUpdBars )
 {
-    bool bHasHint = HasHintWindow();
-    if (bHasHint)
-        RemoveHintWindow();
-
     SCCOL nOldX = aViewData.GetPosX(eWhich);
     SCsCOL nNewX = static_cast<SCsCOL>(nOldX) + static_cast<SCsCOL>(nDeltaX);
     if ( nNewX < 0 )
@@ -1384,16 +1380,11 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, bool bUpdBars )
 
     SetNewVisArea();            // MapMode muss schon gesetzt sein
 
-    if (bHasHint)
-        TestHintWindow();       // neu positionieren
+    TestHintWindow();
 }
 
 void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, bool bUpdBars )
 {
-    bool bHasHint = HasHintWindow();
-    if (bHasHint)
-        RemoveHintWindow();
-
     SCROW nOldY = aViewData.GetPosY(eWhich);
     SCsROW nNewY = static_cast<SCsROW>(nOldY) + static_cast<SCsROW>(nDeltaY);
     if ( nNewY < 0 )
@@ -1474,8 +1465,7 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, bool bUpdBars )
 
     SetNewVisArea();            // MapMode muss schon gesetzt sein
 
-    if (bHasHint)
-        TestHintWindow();       // neu positionieren
+    TestHintWindow();
 }
 
 void ScTabView::ScrollLines( long nDeltaX, long nDeltaY )