[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/source

[Jan-Marek Glogowski]

 vcl/source/window/status.cxx |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit b192cf7791aa7a218b0657715f4c4ad2adf5bb4d
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Wed Feb 22 17:08:25 2017 +0100

    tdf#104482 Force updating progress bar on safe
    
    I don't know why the progress bar on load is handled differently
    then on safe. As a workaround, this converts all Flush() calls
    to Update() calls, but we should update the UI on safe correctly.
    
    Change-Id: I97d6fc5797d08e9556f7fa7f9f8110aef30b3772
    (cherry picked from commit 0b08eacd79a2133a07410dfb99bcc04bb9dd2199)
    Reviewed-on: https://gerrit.libreoffice.org/34551
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 5a48fbd..d2adcacf 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -1163,7 +1163,7 @@ void StatusBar::SetItemText( sal_uInt16 nItemId, const OUString& rText )
             {
                 Rectangle aRect = ImplGetItemRectPos(nPos);
                 Invalidate(aRect);
-                Flush();
+                Update();
             }
         }
     }
@@ -1216,7 +1216,7 @@ void StatusBar::SetItemData( sal_uInt16 nItemId, void* pNewData )
         {
             Rectangle aRect = ImplGetItemRectPos(nPos);
             Invalidate(aRect, InvalidateFlags::NoErase);
-            Flush();
+            Update();
         }
     }
 }
@@ -1246,7 +1246,7 @@ void StatusBar::RedrawItem(sal_uInt16 nItemId)
     {
         Rectangle aRect = ImplGetItemRectPos(nPos);
         Invalidate(aRect);
-        Flush();
+        Update();
     }
 }
 
@@ -1338,7 +1338,7 @@ void StatusBar::StartProgressMode( const OUString& rText )
     if ( IsReallyVisible() )
     {
         Invalidate();
-        Flush();
+        Update();
     }
 }
 
@@ -1353,7 +1353,7 @@ void StatusBar::SetProgressValue( sal_uInt16 nNewPercent )
     {
         bool bNeedErase = ImplGetSVData()->maNWFData.mbProgressNeedsErase;
         Invalidate(maPrgsFrameRect, bNeedErase ? InvalidateFlags::NONE : InvalidateFlags::NoErase);
-        Flush();
+        Update();
     }
     mnPercent = nNewPercent;
 }
@@ -1368,7 +1368,7 @@ void StatusBar::EndProgressMode()
     if ( IsReallyVisible() )
     {
         Invalidate();
-        Flush();
+        Update();
     }
 }
 
@@ -1385,7 +1385,7 @@ void StatusBar::SetText(const OUString& rText)
         {
             Invalidate();
             Window::SetText(rText);
-            Flush();
+            Update();
         }
     }
     else if (mbProgressMode)
@@ -1394,7 +1394,7 @@ void StatusBar::SetText(const OUString& rText)
         if (IsReallyVisible())
         {
             Invalidate();
-            Flush();
+            Update();
         }
     }
     else