rename vcl::Window::Update to PaintImmediately

To make the code easier to read.

Change-Id: Iebc648150391939fba5d1cd815c72dbcf02ceec6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90378
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

64 files changed, 127 insertions, 137 deletions

diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index 4c403812f0f6..6b8d03c2420a 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -615,7 +615,7 @@ namespace accessibility
         if ( m_pTabBar )
         {
             m_pTabBar->SetCurPageId( m_pTabBar->GetPageId( static_cast<sal_uInt16>(nChildIndex) ) );
-            m_pTabBar->Update();
+            m_pTabBar->PaintImmediately();
             m_pTabBar->ActivatePage();
             m_pTabBar->Select();
         }
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index f9e8b2674eba..2aa29d74df71 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -437,7 +437,7 @@ void ModulWindow::LoadBasic()
             GetEditEngine()->SetUpdateMode( false );
             GetEditView()->Read( *pStream );
             GetEditEngine()->SetUpdateMode( true );
-            GetEditorWindow().Update();
+            GetEditorWindow().PaintImmediately();
             GetEditorWindow().ForceSyntaxTimeout();
             GetEditorWindow().DestroyProgress();
             ErrCode nError = aMedium.GetError();
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index b8bdd5628726..83f09d64297e 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1002,7 +1002,7 @@ void EditorWindow::CreateEditEngine()
     rModulWindow.GetBreakPointWindow().GetCurYOffset() = 0;
     rModulWindow.GetLineNumberWindow().GetCurYOffset() = 0;
     pEditEngine->SetUpdateMode(true);
-    rModulWindow.Update();   // has only been invalidated at UpdateMode = true
+    rModulWindow.PaintImmediately();   // has only been invalidated at UpdateMode = true
 
     pEditView->ShowCursor();
 
@@ -1412,7 +1412,7 @@ void BreakPointWindow::DoScroll( long nVertScroll )
 void BreakPointWindow::SetMarkerPos( sal_uInt16 nLine, bool bError )
 {
     if ( SyncYOffset() )
-        Update();
+        PaintImmediately();
 
     nMarkerPos = nLine;
     bErrorMarker = bError;
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 771823a2895d..26f5446227ad 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -308,7 +308,7 @@ void DlgEditor::DoScroll()
     if( !nX && !nY )
         return;
 
-    rWindow.Update();
+    rWindow.PaintImmediately();
 
     // #i31562#
     // When scrolling, someone was rescuing the Wallpaper and forced the window scroll to
@@ -321,7 +321,7 @@ void DlgEditor::DoScroll()
     rWindow.Scroll( -nX, -nY, ScrollFlags::Children);
     aMap.SetOrigin( Point( -aScrollPos.Width(), -aScrollPos.Height() ) );
     rWindow.SetMapMode( aMap );
-    rWindow.Update();
+    rWindow.PaintImmediately();
 
     DlgEdHint aHint( DlgEdHint::WINDOWSCROLLED );
     Broadcast( aHint );
diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx
index 3ec0f72e1fda..754ef71a7cc3 100644
--- a/basctl/source/dlged/dlgedview.cxx
+++ b/basctl/source/dlged/dlgedview.cxx
@@ -106,7 +106,7 @@ void DlgEdView::MakeVisible( const tools::Rectangle& rRect, vcl::Window& rWin )
             nScrollY = -nVisTop;
 
         // scroll window
-        rWin.Update();
+        rWin.PaintImmediately();
         rWin.Scroll( -nScrollX, -nScrollY );
         aMap.SetOrigin( Point( aOrg.X() - nScrollX, aOrg.Y() - nScrollY ) );
         rWin.SetMapMode( aMap );
diff --git a/basctl/source/inc/IDEComboBox.hxx b/basctl/source/inc/IDEComboBox.hxx
index 155256279906..2a9c46609fc2 100644
--- a/basctl/source/inc/IDEComboBox.hxx
+++ b/basctl/source/inc/IDEComboBox.hxx
@@ -137,7 +137,6 @@ public:
     virtual ~LibBox() override;
     virtual void dispose() override;
 
-    using Window::Update;
     /*!
      * Update selection in ComboBox of macro and dialog Library
      *
@@ -242,7 +241,6 @@ public:
     virtual ~LanguageBox() override;
     virtual void dispose() override;
 
-    using Window::Update;
     /*!
      * Update selection in ComboBox of macro and dialog Library
      *
diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx
index 4f21e2ec7cfd..eb0f5be21eed 100644
--- a/basctl/source/inc/propbrw.hxx
+++ b/basctl/source/inc/propbrw.hxx
@@ -71,7 +71,6 @@ public:
     explicit PropBrw (DialogWindowLayout&);
     virtual ~PropBrw() override;
     virtual void dispose() override;
-    using Window::Update;
     // note: changing the Context document to an instance other than the one given in the ctor is not supported
     // currently
     void    Update( const SfxViewShell* pShell );
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 9a126059522d..4321e07dc9c9 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -1134,7 +1134,7 @@ IMPL_LINK_NOARG(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, void)
     MouseEvent aMove( aPoint, 0, MouseEventModifiers::SIMPLEMOVE | MouseEventModifiers::SYNTHETIC );
     m_aTBPreview->MouseMove( aMove );
 
-    m_aTBPreview->Update();
+    m_aTBPreview->PaintImmediately();
 
     // execute the menu
     css::uno::Reference<css::uno::XComponentContext> xContext(getBorderWin().getView()->getORB());
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index f1bfbf0a2931..b724e866aa59 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -174,7 +174,7 @@ void UnoDataBrowserView::showStatus( const OUString& _rStatus )
         m_pStatus->SetText(_rStatus);
         m_pStatus->Show();
         Resize();
-        Update();
+        PaintImmediately();
     }
 }
 
@@ -185,7 +185,7 @@ void UnoDataBrowserView::hideStatus()
         return;
     m_pStatus->Hide();
     Resize();
-    Update();
+    PaintImmediately();
 }
 
 void UnoDataBrowserView::resizeDocumentView(tools::Rectangle& _rPlayground)
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 5b1fd6cd772a..d9aa87f38ccd 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -797,7 +797,7 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt )
         {
             Point aMousePos = rTEvt.GetMouseEvent().GetPosPixel();
             m_aSizingRect = m_pSizingWin->getSizingRect(aMousePos,m_aOutputSize);
-            Update();
+            PaintImmediately();
             ShowTracking( m_aSizingRect, ShowTrackFlags::Small | ShowTrackFlags::TrackWindow );
         }
     }
@@ -1057,7 +1057,7 @@ void OJoinTableView::ScrollWhileDragging()
 
     // redraw DraggingRect
     m_aDragRect = tools::Rectangle(m_ptPrevDraggingPos - m_aDragOffset, m_pDragWin->GetSizePixel());
-    Update();
+    PaintImmediately();
     ShowTracking( m_aDragRect, ShowTrackFlags::Small | ShowTrackFlags::TrackWindow );
 }
 
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index b90254ac7869..ab002e616915 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -820,7 +820,7 @@ bool OQueryTableView::ShowTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAc
 
             pTabWin->Show();
 
-            pTabWin->Update();
+            pTabWin->PaintImmediately();
             // We must call Update() in order to show the connections in the window correctly. This sounds strange,
             // but the Listbox  has an internal Member which is initialized when the Listbox is first shown (after the Listbox
             // is filled in Init). This Member will eventually be needed for
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 2fb7b048231f..888b6a139014 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2304,7 +2304,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
 
                     VclPtr<vcl::Window> pCompWindow = VCLUnoHelper::GetWindow(xBackingFrame->getComponentWindow());
                     if (pCompWindow)
-                        pCompWindow->Update();
+                        pCompWindow->PaintImmediately();
                 }
             }
         }
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 0162856b0e36..7616a6dc9ae7 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1305,7 +1305,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, ScrollRangeCheck nRangeCheck )
         bool bVisCursor = pCrsr->IsVisible();
         pCrsr->Hide();
         if (pOutWin)
-            pOutWin->Update();
+            pOutWin->PaintImmediately();
         if ( !IsVertical() )
             aVisDocStartPos.Move( -nRealDiffX, -nRealDiffY );
         else
@@ -1333,7 +1333,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, ScrollRangeCheck nRangeCheck )
         }
 
         if (pOutWin)
-            pOutWin->Update();
+            pOutWin->PaintImmediately();
         pCrsr->SetPos( pCrsr->GetPos() + Point( nRealDiffX, nRealDiffY ) );
         if ( bVisCursor )
         {
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index d6f985ae4912..fb24c7fa1e2a 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -79,7 +79,6 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC Svx3DWin final : public SfxDockingWindow
 {
     friend class        Svx3DChildWindow;
     friend class        Svx3DCtrlItem;
-    using Window::Update;
 
 private:
     std::unique_ptr<weld::ToggleButton> m_xBtnGeo;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 1a67b8cd797a..e4406f9ef8cd 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1071,7 +1071,7 @@ public:
     virtual void                        PixelInvalidate(const tools::Rectangle* pRectangle);
     void                                Validate();
     bool                                HasPaintEvent() const;
-    void                                Update();
+    void                                PaintImmediately();
     void                                Flush() override;
 
     // toggles new docking support, enabled via toolkit
diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx
index 4efe63e15f92..a19eedc0c74e 100644
--- a/reportdesign/source/ui/inc/propbrw.hxx
+++ b/reportdesign/source/ui/inc/propbrw.hxx
@@ -96,8 +96,6 @@ public:
     void                    setCurrentPage(const OUString& _sLastActivePage);
 
     ::Size getMinimumSize() const;
-private:
-    using Window::Update;
 };
 
 } // rptui
diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx
index cd9f455d7829..2d35fb1e74aa 100644
--- a/reportdesign/source/ui/report/SectionView.cxx
+++ b/reportdesign/source/ui/report/SectionView.cxx
@@ -106,7 +106,7 @@ void OSectionView::MakeVisible( const tools::Rectangle& rRect, vcl::Window& rWin
             nScrollY = -nVisTop;
 
         // scroll window
-        rWin.Update();
+        rWin.PaintImmediately();
         rWin.Scroll( -nScrollX, -nScrollY );
         aMap.SetOrigin( Point( aOrg.X() - nScrollX, aOrg.Y() - nScrollY ) );
         rWin.SetMapMode( aMap );
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index 9f248168fc5a..ed16810c7065 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -190,7 +190,7 @@ bool ScColBar::ResizeAllowed() const
 void ScColBar::DrawInvert( long nDragPosP )
 {
     tools::Rectangle aRect( nDragPosP,0, nDragPosP+HDR_SLIDERSIZE-1,GetOutputSizePixel().Width()-1 );
-    Update();
+    PaintImmediately();
     Invert(aRect);
 
     pTabView->GetViewData().GetView()->InvertVertical(meWhich,nDragPosP);
@@ -350,7 +350,7 @@ bool ScRowBar::ResizeAllowed() const
 void ScRowBar::DrawInvert( long nDragPosP )
 {
     tools::Rectangle aRect( 0,nDragPosP, GetOutputSizePixel().Width()-1,nDragPosP+HDR_SLIDERSIZE-1 );
-    Update();
+    PaintImmediately();
     Invert(aRect);
 
     pTabView->GetViewData().GetView()->InvertHorizontal(meWhich,nDragPosP);
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 22a31a15e4c7..3fe21ca5dd33 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -513,7 +513,7 @@ void ScDrawView::MarkListHasChanged()
 
         if(OUTDEV_WINDOW == rOutDev.GetOutDevType())
         {
-            static_cast<vcl::Window&>(rOutDev).Update();
+            static_cast<vcl::Window&>(rOutDev).PaintImmediately();
         }
     }
 
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 5e468e69f5a8..f1d64e6d639c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5135,7 +5135,7 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, bool bUp )
         // only redraw new frame (synchronously)
         pDocSh->Broadcast( ScIndexHint( SfxHintId::ScShowRangeFinder, nRFIndex ) );
 
-        Update();   // what you move, will be seen immediately
+        PaintImmediately();   // what you move, will be seen immediately
     }
 
     //  Timer for Scrolling
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index 7c6c6ad9a55e..fbb1bee09641 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -297,7 +297,7 @@ MapMode ScGridWindow::GetDrawMapMode( bool bForce )
 
 void ScGridWindow::DrawAfterScroll()
 {
-    Update(); // always, so the behaviour with and without DrawingLayer is the same
+    PaintImmediately(); // always, so the behaviour with and without DrawingLayer is the same
 
     ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
     if (pDrView)
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 7cbce3567ccf..bea2d3480d16 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1189,7 +1189,7 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, bool bUpdBars )
         // already have painted the column/row bar with updated position.  -
         // Therefore call Update once before on column/row bar
         if (pColBar[eWhich])
-            pColBar[eWhich]->Update();
+            pColBar[eWhich]->PaintImmediately();
 
         long nOldPos = aViewData.GetScrPos( nTrackX, 0, eWhich ).X();
         aViewData.SetPosX( eWhich, nNewX );
@@ -1207,14 +1207,14 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, bool bUpdBars )
             if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE )
                 pGridWin[SC_SPLIT_TOPRIGHT]->ScrollPixel( nDiff, 0 );
         }
-        if (pColBar[eWhich])     { pColBar[eWhich]->Scroll( nDiff,0 ); pColBar[eWhich]->Update(); }
+        if (pColBar[eWhich])     { pColBar[eWhich]->Scroll( nDiff,0 ); pColBar[eWhich]->PaintImmediately(); }
         if (pColOutline[eWhich]) pColOutline[eWhich]->ScrollPixel( nDiff );
         if (bUpdBars)
             UpdateScrollBars();
     }
 
     if (nDeltaX==1 || nDeltaX==-1)
-        pGridWin[aViewData.GetActivePart()]->Update();
+        pGridWin[aViewData.GetActivePart()]->PaintImmediately();
 
     ShowAllCursors();
 
@@ -1273,7 +1273,7 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, bool bUpdBars )
         UpdateHeaderWidth( &eWhich, &nUNew );               // adjust row headers
 
         if (pRowBar[eWhich])
-            pRowBar[eWhich]->Update();
+            pRowBar[eWhich]->PaintImmediately();
 
         long nOldPos = aViewData.GetScrPos( 0, nTrackY, eWhich ).Y();
         aViewData.SetPosY( eWhich, nNewY );
@@ -1291,14 +1291,14 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, bool bUpdBars )
             if ( aViewData.GetHSplitMode() != SC_SPLIT_NONE )
                 pGridWin[SC_SPLIT_BOTTOMRIGHT]->ScrollPixel( 0, nDiff );
         }
-        if (pRowBar[eWhich])     { pRowBar[eWhich]->Scroll( 0,nDiff ); pRowBar[eWhich]->Update(); }
+        if (pRowBar[eWhich])     { pRowBar[eWhich]->Scroll( 0,nDiff ); pRowBar[eWhich]->PaintImmediately(); }
         if (pRowOutline[eWhich]) pRowOutline[eWhich]->ScrollPixel( nDiff );
         if (bUpdBars)
             UpdateScrollBars();
     }
 
     if (nDeltaY==1 || nDeltaY==-1)
-        pGridWin[aViewData.GetActivePart()]->Update();
+        pGridWin[aViewData.GetActivePart()]->PaintImmediately();
 
     ShowAllCursors();
 
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 45c7f3492a86..cb88d457b7cc 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -477,7 +477,7 @@ void ScTabView::InvertHorizontal( ScVSplitPos eWhich, long nDragPos )
             if (pWin)
             {
                 tools::Rectangle aRect( 0,nDragPos, pWin->GetOutputSizePixel().Width()-1,nDragPos+HDR_SLIDERSIZE-1 );
-                pWin->Update();
+                pWin->PaintImmediately();
                 pWin->DoInvertRect( aRect );    // Pixel
             }
         }
@@ -492,7 +492,7 @@ void ScTabView::InvertVertical( ScHSplitPos eWhich, long nDragPos )
             if (pWin)
             {
                 tools::Rectangle aRect( nDragPos,0, nDragPos+HDR_SLIDERSIZE-1,pWin->GetOutputSizePixel().Height()-1 );
-                pWin->Update();
+                pWin->PaintImmediately();
                 pWin->DoInvertRect( aRect );    // Pixel
             }
         }
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index b075b748f0e3..dfd5eccf726d 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -241,8 +241,8 @@ void ScTabView::MakeDrawView( TriState nForceDesignMode )
             {
                 pGridWin[i]->SetMapMode(pGridWin[i]->GetDrawMapMode());
 
-                pGridWin[i]->Update();      // because of Invalidate in DrawView ctor (ShowPage),
-                                            // so that immediately can be drawn
+                pGridWin[i]->PaintImmediately(); // because of Invalidate in DrawView ctor (ShowPage),
+                                                 // so that immediately can be drawn
             }
         SfxRequest aSfxRequest(SID_OBJECT_SELECT, SfxCallMode::SLOT, aViewData.GetViewShell()->GetPool());
         SetDrawFuncPtr(new FuSelection(*aViewData.GetViewShell(), GetActiveWin(), pDrawView.get(),
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index 5014aebf9afc..cb3fb6f808d0 100644
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -397,7 +397,7 @@ void ScrollBarManager::SetTopLeft(const Point& rNewTopLeft)
         return;
 
     // Flush pending repaints before scrolling to avoid temporary artifacts.
-    mrSlideSorter.GetContentWindow()->Update();
+    mrSlideSorter.GetContentWindow()->PaintImmediately();
 
     if (mpVerticalScrollBar)
     {
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 671b52a3a49b..f7bb298d2b60 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -653,7 +653,7 @@ void Window::SetVisibleXY(double fX, double fY)
         maWinPos.setY( static_cast<long>(fY * maViewSize.Height()) );
     UpdateMapOrigin(false);
     Scroll(nOldX - maWinPos.X(), nOldY - maWinPos.Y(), ScrollFlags::Children);
-    Update();
+    PaintImmediately();
 }
 
 /**
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 72cc4599f03f..fd1269fde142 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -984,7 +984,7 @@ void SearchTabPage_Impl::ClearSearchResults()
     for ( sal_Int32 i = 0; i < nCount; ++i )
         delete static_cast<OUString*>(m_pResultsLB->GetEntryData(i));
     m_pResultsLB->Clear();
-    m_pResultsLB->Update();
+    m_pResultsLB->PaintImmediately();
 }
 
 
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 02b5b7c7a10e..fb193080652e 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -2267,7 +2267,7 @@ WaitWindow_Impl::WaitWindow_Impl() : WorkWindow(nullptr, WB_BORDER | WB_3DLOOK)
     SetOutputSizePixel(aRect.GetSize());
 
     Show();
-    Update();
+    PaintImmediately();
     Flush();
 }
 
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index ae7c4aca99a8..755bb3b5c667 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -521,7 +521,7 @@ void SmEditWindow::CreateEditView()
     ESelection eSelection;
 
     pEditView->SetSelection(eSelection);
-    Update();
+    PaintImmediately();
     pEditView->ShowCursor();
 
     pEditEngine->SetStatusEventHdl( LINK(this, SmEditWindow, EditStatusHdl) );
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index a76a6e82b83b..44154a3e4259 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -902,7 +902,7 @@ void SmViewShell::OuterResizePixel(const Point &rOfs, const Size &rSize)
     rWin.SetPosSizePixel(rOfs, rSize);
     if (GetDoc()->IsPreview())
         rWin.ZoomToFitInWindow();
-    rWin.Update();
+    rWin.PaintImmediately();
 }
 
 void SmViewShell::QueryObjAreaPixel( tools::Rectangle& rRect ) const
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 4c548c32d2c7..cd85b2756ea1 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -950,7 +950,7 @@ long BrowseBox::ScrollColumns( long nCols )
     if ( nCols )
     {
         pDataWin->Update();
-        Update();
+        PaintImmediately();
     }
     bScrolling = false;
     EndScroll();
diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx
index 2680dfcde131..fa42bfe293c3 100644
--- a/svtools/source/brwbox/brwhead.cxx
+++ b/svtools/source/brwbox/brwhead.cxx
@@ -66,7 +66,7 @@ void BrowserHeader::EndDrag()
 {
     // call before other actions, it looks more nice in most cases
     HeaderBar::EndDrag();
-    Update();
+    PaintImmediately();
 
     // not aborted?
     sal_uInt16 nId = GetCurItemId();
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 074ce53aec4f..f22ddb19e370 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -227,7 +227,7 @@ void BrowserDataWin::LeaveUpdateLock()
         DoOutstandingInvalidations();
         if (bUpdateOnUnlock )
         {
-            Control::Update();
+            Control::PaintImmediately();
             bUpdateOnUnlock = false;
         }
     }
@@ -246,7 +246,7 @@ void InitSettings_Impl(vcl::Window* pWin)
 void BrowserDataWin::Update()
 {
     if ( !nUpdateLock )
-        Control::Update();
+        Control::PaintImmediately();
     else
         bUpdateOnUnlock = true;
 }
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index ddf90b0305b4..920f0e99faf3 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -335,7 +335,7 @@ namespace svt
         if ( bActiveBeforeTracking )
         {
             DeactivateCell();
-            Update();
+            PaintImmediately();
         }
 
         BrowseBox::ImplStartTracking();
@@ -1008,7 +1008,7 @@ namespace svt
 
         // update if requested
         if (bUpdate)
-            Update();
+            PaintImmediately();
 
         // release the controller (asynchronously)
         if (nEndEvent)
@@ -1207,7 +1207,7 @@ namespace svt
         pCheckBoxPaint->GetBox().Enable(_bEnabled);
         pCheckBoxPaint->Show();
         pCheckBoxPaint->SetParentUpdateMode( false );
-        pCheckBoxPaint->Update();
+        pCheckBoxPaint->PaintImmediately();
         pCheckBoxPaint->Hide();
         pCheckBoxPaint->SetParentUpdateMode( true );
     }
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index 65754a1db569..b56fe3db82d4 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -309,7 +309,7 @@ void ScrollableWindow::Scroll( long nDeltaX, long nDeltaY, ScrollFlags )
     // scrolling?
     if ( nDeltaX != 0 || nDeltaY != 0 )
     {
-        Update();
+        PaintImmediately();
 
         // does the new area overlap the old one?
         if ( std::abs( static_cast<int>(aDeltaPix.Height()) ) < aOutPixSz.Height() ||
@@ -329,7 +329,7 @@ void ScrollableWindow::Scroll( long nDeltaX, long nDeltaY, ScrollFlags )
             Invalidate();
         }
 
-        Update();
+        PaintImmediately();
     }
 
     if ( !bScrolling )
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 5164e1937268..6670f1182121 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -329,7 +329,7 @@ void ImplTabSizer::ImplTrack( const Point& rScreenPos )
     if ( pParent->mnSplitSize < TABBAR_MINSIZE )
         pParent->mnSplitSize = TABBAR_MINSIZE;
     pParent->Split();
-    pParent->Update();
+    pParent->PaintImmediately();
 }
 
 void ImplTabSizer::MouseButtonDown( const MouseEvent& rMEvt )
@@ -949,7 +949,7 @@ void TabBar::MouseButtonDown(const MouseEvent& rMEvt)
             if (ImplDeactivatePage())
             {
                 SetCurPageId(nSelId);
-                Update();
+                PaintImmediately();
                 ImplActivatePage();
                 ImplSelect();
             }
@@ -1037,7 +1037,7 @@ void TabBar::MouseButtonDown(const MouseEvent& rMEvt)
             if (bSelectTab)
             {
                 ImplShowPage(nPos);
-                Update();
+                PaintImmediately();
                 ImplSelect();
             }
 
@@ -1094,7 +1094,7 @@ void TabBar::MouseButtonDown(const MouseEvent& rMEvt)
                 if (ImplDeactivatePage())
                 {
                     SetCurPageId(nSelId);
-                    Update();
+                    PaintImmediately();
                     ImplActivatePage();
                     ImplSelect();
                 }
@@ -2045,7 +2045,7 @@ bool TabBar::StartEditMode(sal_uInt16 nPageId)
     {
         ImplShowPage(nPos);
         ImplFormat();
-        Update();
+        PaintImmediately();
 
         mpImpl->mpEdit.disposeAndReset(VclPtr<TabBarEdit>::Create(this, WB_CENTER));
         tools::Rectangle aRect = GetPageRect( mnEditId );
@@ -2272,7 +2272,7 @@ bool TabBar::StartDrag(const CommandEvent& rCEvt, vcl::Region& rRegion)
             if (ImplDeactivatePage())
             {
                 SetCurPageId(nSelId);
-                Update();
+                PaintImmediately();
                 ImplActivatePage();
                 ImplSelect();
             }
@@ -2470,7 +2470,7 @@ void TabBar::SwitchPage(const Point& rPos)
                     if (ImplDeactivatePage())
                     {
                         SetCurPageId( mnSwitchId );
-                        Update();
+                        PaintImmediately();
                         ImplActivatePage();
                         ImplSelect();
                     }
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 336dd3260cf9..de8c41262e35 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -964,7 +964,7 @@ void DbCellControl::PaintCell( OutputDevice& _rDev, const tools::Rectangle& _rRe
 
         m_pPainter->SetPosSizePixel( _rRect.TopLeft(), _rRect.GetSize() );
         m_pPainter->Show();
-        m_pPainter->Update();
+        m_pPainter->PaintImmediately();
         m_pPainter->SetParentUpdateMode( false );
         m_pPainter->Hide();
         m_pPainter->SetParentUpdateMode( true );
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index f3d39189f67b..45158ce9fa47 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -362,7 +362,6 @@ namespace svxform
         virtual ~DataNavigator() override;
         virtual void dispose() override;
 
-        using Window::Update;
         using                       SfxDockingWindow::StateChanged;
 
         void                        StateChanged( sal_uInt16 nSID, SfxItemState eState,
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index 991c2022b6ab..f4561275bab1 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -105,7 +105,7 @@ void CandidateMgr::PaintTransparentChildren(vcl::Window const & rWindow, tools::
         // important: actually paint the child here!
         if (m_aDeletedCandidates.find(pCandidate) != m_aDeletedCandidates.end())
             continue;
-        pCandidate->Update();
+        pCandidate->PaintImmediately();
     }
 }
 
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 808d6a2a865a..8c15b31d5cc3 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -1058,7 +1058,7 @@ void SdrPaintView::MakeVisible(const tools::Rectangle& rRect, vcl::Window& rWin)
         if (dx!=0 || dy!=0) {
             rWin.Scroll(-dx,-dy);
             rWin.SetMapMode(aMap);
-            rWin.Update();
+            rWin.PaintImmediately();
         }
     } else {
         rWin.SetMapMode(aMap);
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index ba36e98f24c9..b4ab549709ba 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -178,7 +178,6 @@ namespace {
 
 class SvxFontNameBox_Impl : public FontNameBox
 {
-    using Window::Update;
 private:
     const FontList*                pFontList;
     ::std::unique_ptr<FontList>    m_aOwnFontList;
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 125bffeddf9b..cef9ecffb3e6 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -299,7 +299,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
             SolarMutexGuard aGuard;
 
             bool bPaintsFromSystem = maInvalidRect.HasArea();
-            GetWin()->Update();
+            GetWin()->PaintImmediately();
             if ( maInvalidRect.HasArea() )
             {
                 if ( bPaintsFromSystem )
@@ -1225,7 +1225,7 @@ void SwViewShell::VisPortChgd( const SwRect &rRect)
         Imp()->GetDrawView()->VisAreaChanged( GetWin() );
         Imp()->GetDrawView()->SetActualWin( GetWin() );
     }
-    GetWin()->Update();
+    GetWin()->PaintImmediately();
 
     if ( pPostItMgr ) // #i88070#
     {
@@ -1416,7 +1416,7 @@ bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const tools::Rectangle
                     }
 
                     Imp()->m_bSmoothUpdate = true;
-                    GetWin()->Update();
+                    GetWin()->PaintImmediately();
                     Imp()->m_bSmoothUpdate = false;
 
                     if(!Imp()->m_bStopSmooth)
@@ -1455,7 +1455,7 @@ bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const tools::Rectangle
                 }
             }
             pVout.disposeAndClear();
-            GetWin()->Update();
+            GetWin()->PaintImmediately();
             if ( !Imp()->m_bStopSmooth )
                 --mnLockPaint;
             SetFirstVisPageInvalid();
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 598d275d6089..672523a664fe 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1370,7 +1370,7 @@ void SwPagePreview::SetVisArea( const tools::Rectangle &rRect )
     // because then we do not really paint but the rectangles are just
     // bookmarked (in document coordinates).
     if( GetViewShell()->ActionPend() )
-        m_pViewWin->Update();
+        m_pViewWin->PaintImmediately();
 
     // Set at View-Win the current size
     m_aVisArea = aLR;
diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx
index 7f51a28b6c3c..49fe620c66af 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -235,7 +235,7 @@ void SwView::SetVisArea( const tools::Rectangle &rRect, bool bUpdateScrollbar )
     // shell, because then it is not really drawn but the rectangles will
     // be only marked (in document coordinates).
     if ( m_pWrtShell && m_pWrtShell->ActionPend() )
-        m_pWrtShell->GetWin()->Update();
+        m_pWrtShell->GetWin()->PaintImmediately();
 
     m_aVisArea = aLR;
 
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 951989e4f108..5dc536a957be 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -280,7 +280,7 @@ bool SwWrtShell::StartInputFieldDlg(SwField* pField, bool bPrevButton, bool bNex
     }
 
     pDlg.disposeAndClear();
-    GetWin()->Update();
+    GetWin()->PaintImmediately();
     return bRet;
 }
 
@@ -301,7 +301,7 @@ bool SwWrtShell::StartDropDownFieldDlg(SwField* pField, bool bPrevButton, bool b
 
     pDlg.disposeAndClear();
     bool bRet = RET_CANCEL == nRet;
-    GetWin()->Update();
+    GetWin()->PaintImmediately();
     if(RET_YES == nRet)
     {
         GetView().GetViewFrame()->GetDispatcher()->Execute(FN_EDIT_FIELD, SfxCallMode::SYNCHRON);
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index b1d1a13b711c..62d6ef49d477 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -2243,7 +2243,7 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY )
 
                 if ( bWasVisible && aOldPos == aPos )
                 {
-                    pWindow->Update();
+                    pWindow->PaintImmediately();
                     return;
                 }
 
@@ -2253,10 +2253,10 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY )
                 // of this window, as it may otherwise cause the parent
                 // to hide this window again
                 if( pWindow->GetParent() )
-                    pWindow->GetParent()->Update();
+                    pWindow->GetParent()->PaintImmediately();
 
                 pWindow->Show();
-                pWindow->Update();
+                pWindow->PaintImmediately();
                 pWindow->SetParentUpdateMode( false );
                 pWindow->Hide();
                 pWindow->SetParentUpdateMode( true );
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index b5a7cb4cc057..54f0dbbfb4d3 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -369,7 +369,7 @@ void HelpTextWindow::ImplShow()
     VclPtr<HelpTextWindow> xWindow( this );
     Show( true, ShowFlags::NoActivate );
     if( !xWindow->IsDisposed() )
-        Update();
+        PaintImmediately();
 }
 
 void HelpTextWindow::Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& )
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 43636df0f94a..b16fc3d9c46c 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -3315,7 +3315,7 @@ void CheckBox::GetFocus()
         Invalidate();
         // Trigger drawing to initialize the mouse rectangle, otherwise the mouse button down
         // handler would ignore the mouse event.
-        Update();
+        PaintImmediately();
     }
     else
         ShowFocus( ImplGetFocusRect() );
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 49ae5be42405..d177eb1fb7bc 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -441,7 +441,7 @@ void Edit::ImplInvalidateOrRepaint()
         Invalidate();
         // FIXME: this is currently only on macOS
         if( ImplGetSVData()->maNWFData.mbNoFocusRects )
-            Update();
+            PaintImmediately();
     }
     else
         Invalidate();
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index 9a762d64fbeb..4efb7596abbb 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -1857,7 +1857,7 @@ void SvxIconChoiceCtrl_Impl::ShowCursor( bool bShow )
 
 void SvxIconChoiceCtrl_Impl::HideDDIcon()
 {
-    pView->Update();
+    pView->PaintImmediately();
 }
 
 bool SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd )
@@ -2025,7 +2025,7 @@ void SvxIconChoiceCtrl_Impl::MakeVisible( const tools::Rectangle& rRect, bool bS
     if( GetUpdateMode() )
     {
         HideDDIcon();
-        pView->Update();
+        pView->PaintImmediately();
         ShowCursor( false );
     }
 
@@ -2063,7 +2063,7 @@ void SvxIconChoiceCtrl_Impl::MakeVisible( const tools::Rectangle& rRect, bool bS
     // check if we still need scrollbars
     CheckScrollBars();
     if( bScrollable && GetUpdateMode() )
-        pView->Update();
+        pView->PaintImmediately();
 
     // If the requested area can not be made completely visible, the
     // Vis-Rect-Changed handler is called in any case. This case may occur e.g.
@@ -2301,7 +2301,7 @@ void SvxIconChoiceCtrl_Impl::SelectRect( const tools::Rectangle& rRect, bool bAd
     nFlags |= IconChoiceFlags::SelectingRect;
 
     CheckBoundingRects();
-    pView->Update();
+    pView->PaintImmediately();
     const size_t nCount = maZOrderList.size();
 
     tools::Rectangle aRect( rRect );
@@ -2381,7 +2381,7 @@ void SvxIconChoiceCtrl_Impl::SelectRect( const tools::Rectangle& rRect, bool bAd
     if( !bAlreadySelectingRect )
         nFlags &= ~IconChoiceFlags::SelectingRect;
 
-    pView->Update();
+    pView->PaintImmediately();
     if( bResetClipRegion )
         pView->SetClipRegion();
 }
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 0ef0b31b9e45..52fe1dc48132 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -1976,11 +1976,11 @@ void ImplListBoxWindow::SetTopEntry( sal_Int32 nTop )
     {
         ImplClearLayoutData();
         long nDiff = mpEntryList->GetAddedHeight( mnTop, nTop );
-        Update();
+        PaintImmediately();
         ImplHideFocusRect();
         mnTop = nTop;
         Scroll( 0, nDiff );
-        Update();
+        PaintImmediately();
         if( HasFocus() )
             ImplShowFocusRect();
         maScrollHdl.Call( this );
@@ -2019,10 +2019,10 @@ void ImplListBoxWindow::ScrollHorz( long n )
     {
         ImplClearLayoutData();
         mnLeft = sal::static_int_cast<sal_uInt16>(mnLeft + nDiff);
-        Update();
+        PaintImmediately();
         ImplHideFocusRect();
         Scroll( -nDiff, 0 );
-        Update();
+        PaintImmediately();
         if( HasFocus() )
             ImplShowFocusRect();
         maScrollHdl.Call( this );
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 221664f7d9ae..e0a11cf877b6 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -817,7 +817,7 @@ void ScrollBar::ImplDragThumb( const Point& rMousePos )
             if (SupportsDoubleBuffering())
             {
                 Invalidate();
-                Update();
+                PaintImmediately();
             }
             else
                 ImplDraw(*this);
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index aec48bc32176..0fdc49441bbb 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -654,7 +654,7 @@ void Slider::MouseButtonDown( const MouseEvent& rMEvt )
             // store Start position for cancel and EndScroll delta
             mnStartPos = mnThumbPos;
             ImplDoMouseAction( rMousePos, meScrollType != ScrollType::Set );
-            Update();
+            PaintImmediately();
 
             if( meScrollType != ScrollType::Set )
                 StartTracking( nTrackFlags );
@@ -704,7 +704,7 @@ void Slider::Tracking( const TrackingEvent& rTEvt )
         {
             // after dragging, recalculate to a rounded Thumb position
             ImplCalc();
-            Update();
+            PaintImmediately();
         }
 
         meScrollType = ScrollType::DontKnow;
@@ -735,7 +735,7 @@ void Slider::Tracking( const TrackingEvent& rTEvt )
                 if ( nOldPos != mnThumbPos )
                 {
                     ImplUpdateRects();
-                    Update();
+                    PaintImmediately();
                     if ( nOldPos != mnThumbPos )
                     {
                         Slide();
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 02cfa74f83ac..b5dc9703e5ae 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -933,13 +933,13 @@ void TextView::Scroll( long ndX, long ndY )
     {
         bool bVisCursor = mpImpl->mpCursor->IsVisible();
         mpImpl->mpCursor->Hide();
-        mpImpl->mpWindow->Update();
+        mpImpl->mpWindow->PaintImmediately();
         mpImpl->maStartDocPos = aNewStartPos;
 
         if ( mpImpl->mpTextEngine->IsRightToLeft() )
             nDiffX = -nDiffX;
         mpImpl->mpWindow->Scroll( nDiffX, nDiffY );
-        mpImpl->mpWindow->Update();
+        mpImpl->mpWindow->PaintImmediately();
         mpImpl->mpCursor->SetPos( mpImpl->mpCursor->GetPos() + Point( nDiffX, nDiffY ) );
         if ( bVisCursor && !mpImpl->mbReadOnly )
             mpImpl->mpCursor->Show();
diff --git a/vcl/source/treelist/iconviewimpl.cxx b/vcl/source/treelist/iconviewimpl.cxx
index 5df7ae1a7345..c2640dfc0ccd 100644
--- a/vcl/source/treelist/iconviewimpl.cxx
+++ b/vcl/source/treelist/iconviewimpl.cxx
@@ -43,12 +43,12 @@ void IconViewImpl::CursorUp()
     m_nFlags &= ~LBoxFlags::Filling;
     long nEntryHeight = m_pView->GetEntryHeight();
     ShowCursor( false );
-    m_pView->Update();
+    m_pView->PaintImmediately();
     m_pStartEntry = pPrevFirstToDraw;
     tools::Rectangle aArea( GetVisibleArea() );
     aArea.AdjustBottom( -nEntryHeight );
     m_pView->Scroll( 0, nEntryHeight, aArea, ScrollFlags::NoChildren );
-    m_pView->Update();
+    m_pView->PaintImmediately();
     ShowCursor( true );
     m_pView->NotifyScrolled();
 }
@@ -67,11 +67,11 @@ void IconViewImpl::CursorDown()
     {
         m_nFlags &= ~LBoxFlags::Filling;
         ShowCursor( false );
-        m_pView->Update();
+        m_pView->PaintImmediately();
         m_pStartEntry = pNextFirstToDraw;
         tools::Rectangle aArea( GetVisibleArea() );
         m_pView->Scroll( 0, -(m_pView->GetEntryHeight()), aArea, ScrollFlags::NoChildren );
-        m_pView->Update();
+        m_pView->PaintImmediately();
         ShowCursor( true );
         m_pView->NotifyScrolled();
     }
@@ -105,9 +105,9 @@ void IconViewImpl::PageDown( sal_uInt16 nDelta )
         tools::Rectangle aArea( GetVisibleArea() );
         long nScroll = m_pView->GetEntryHeight() * static_cast<long>(nRealDelta);
         nScroll = -nScroll;
-        m_pView->Update();
+        m_pView->PaintImmediately();
         m_pView->Scroll( 0, nScroll, aArea, ScrollFlags::NoChildren );
-        m_pView->Update();
+        m_pView->PaintImmediately();
         m_pView->NotifyScrolled();
     }
 
@@ -139,9 +139,9 @@ void IconViewImpl::PageUp( sal_uInt16 nDelta )
     {
         long nEntryHeight = m_pView->GetEntryHeight();
         tools::Rectangle aArea( GetVisibleArea() );
-        m_pView->Update();
+        m_pView->PaintImmediately();
         m_pView->Scroll( 0, nEntryHeight*nRealDelta, aArea, ScrollFlags::NoChildren );
-        m_pView->Update();
+        m_pView->PaintImmediately();
         m_pView->NotifyScrolled();
     }
 
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index cbee4c937dee..d80f6b2fefc5 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -308,7 +308,7 @@ IMPL_LINK( SvImpLBox, ScrollUpDownHdl, ScrollBar *, pScrollBar, void )
     if( m_pView->IsEditingActive() )
     {
         m_pView->EndEditing( true ); // Cancel
-        m_pView->Update();
+        m_pView->PaintImmediately();
     }
     BeginScroll();
 
@@ -341,11 +341,11 @@ void SvImpLBox::CursorDown()
     {
         m_nFlags &= ~LBoxFlags::Filling;
         ShowCursor( false );
-        m_pView->Update();
+        m_pView->PaintImmediately();
         m_pStartEntry = pNextFirstToDraw;
         tools::Rectangle aArea( GetVisibleArea() );
         m_pView->Scroll( 0, -(m_pView->GetEntryHeight()), aArea, ScrollFlags::NoChildren );
-        m_pView->Update();
+        m_pView->PaintImmediately();
         ShowCursor( true );
         m_pView->NotifyScrolled();
     }
@@ -363,12 +363,12 @@ void SvImpLBox::CursorUp()
     m_nFlags &= ~LBoxFlags::Filling;
     long nEntryHeight = m_pView->GetEntryHeight();
     ShowCursor( false );
-    m_pView->Update();
+    m_pView->PaintImmediately();
     m_pStartEntry = pPrevFirstToDraw;
     tools::Rectangle aArea( GetVisibleArea() );
     aArea.AdjustBottom( -nEntryHeight );
     m_pView->Scroll( 0, nEntryHeight, aArea, ScrollFlags::NoChildren );
-    m_pView->Update();
+    m_pView->PaintImmediately();
     ShowCursor( true );
     m_pView->NotifyScrolled();
 }
@@ -390,22 +390,21 @@ void SvImpLBox::PageDown( sal_uInt16 nDelta )
     ShowCursor( false );
 
     m_nFlags &= ~LBoxFlags::Filling;
-    m_pView->Update();
     m_pStartEntry = pNext;
 
     if( nRealDelta >= m_nVisibleCount )
     {
         m_pView->Invalidate( GetVisibleArea() );
-        m_pView->Update();
+        m_pView->PaintImmediately();
     }
     else
     {
         tools::Rectangle aArea( GetVisibleArea() );
         long nScroll = m_pView->GetEntryHeight() * static_cast<long>(nRealDelta);
         nScroll = -nScroll;
-        m_pView->Update();
+        m_pView->PaintImmediately();
         m_pView->Scroll( 0, nScroll, aArea, ScrollFlags::NoChildren );
-        m_pView->Update();
+        m_pView->PaintImmediately();
         m_pView->NotifyScrolled();
     }
 
@@ -428,20 +427,19 @@ void SvImpLBox::PageUp( sal_uInt16 nDelta )
     m_nFlags &= ~LBoxFlags::Filling;
     ShowCursor( false );
 
-    m_pView->Update();
     m_pStartEntry = pPrev;
     if( nRealDelta >= m_nVisibleCount )
     {
         m_pView->Invalidate( GetVisibleArea() );
-        m_pView->Update();
+        m_pView->PaintImmediately();
     }
     else
     {
         long nEntryHeight = m_pView->GetEntryHeight();
         tools::Rectangle aArea( GetVisibleArea() );
-        m_pView->Update();
+        m_pView->PaintImmediately();
         m_pView->Scroll( 0, nEntryHeight*nRealDelta, aArea, ScrollFlags::NoChildren );
-        m_pView->Update();
+        m_pView->PaintImmediately();
         m_pView->NotifyScrolled();
     }
 
@@ -706,7 +704,7 @@ IMPL_LINK( SvImpLBox, ScrollLeftRightHdl, ScrollBar *, pScrollBar, void )
         if( m_pView->IsEditingActive() )
         {
             m_pView->EndEditing( true ); // Cancel
-            m_pView->Update();
+            m_pView->PaintImmediately();
         }
         m_pView->nFocusWidth = -1;
         KeyLeftRight( nDelta );
@@ -716,7 +714,7 @@ IMPL_LINK( SvImpLBox, ScrollLeftRightHdl, ScrollBar *, pScrollBar, void )
 void SvImpLBox::KeyLeftRight( long nDelta )
 {
     if( !(m_nFlags & LBoxFlags::InResize) )
-        m_pView->Update();
+        m_pView->PaintImmediately();
     BeginScroll();
     m_nFlags &= ~LBoxFlags::Filling;
     ShowCursor( false );
@@ -1251,7 +1249,7 @@ void SvImpLBox::AdjustScrollBars( Size& rSize )
         if( m_pView->IsEditingActive() )
         {
             m_pView->EndEditing( true ); // Cancel
-            m_pView->Update();
+            m_pView->PaintImmediately();
         }
         m_pView->nFocusWidth = -1;
         KeyLeftRight( nTemp );
@@ -1837,7 +1835,7 @@ void SvImpLBox::EntryInserted( SvTreeListEntry* pEntry )
     ShowVerSBar();
     ShowCursor( true );
     if( m_pStartEntry != m_pView->First() && (m_nFlags & LBoxFlags::Filling) )
-        m_pView->Update();
+        m_pView->PaintImmediately();
 }
 
 
@@ -3248,7 +3246,7 @@ IMPL_LINK(SvImpLBox, MyUserEvent, void*, pArg, void )
     if( !pArg )
     {
         m_pView->Invalidate();
-        m_pView->Update();
+        m_pView->PaintImmediately();
     }
     else
     {
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index 9e23479518a9..22c67368c52d 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -1190,7 +1190,7 @@ void SvTreeListBox::StartDrag( sal_Int8, const Point& rPosPixel )
 
     bool bOldUpdateMode = Control::IsUpdateMode();
     Control::SetUpdateMode( true );
-    Update();
+    PaintImmediately();
     Control::SetUpdateMode( bOldUpdateMode );
 
     // Disallow using the selection and its children as drop targets.
@@ -3383,7 +3383,7 @@ void SvTreeListBox::ModelNotification( SvListAction nActionId, SvTreeListEntry*
 
         case SvListAction::CLEARED:
             if( IsUpdateMode() )
-                Update();
+                PaintImmediately();
             break;
 
         default: break;
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 1c82fa805160..365f80614697 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -501,7 +501,7 @@ void MenuFloatingWindow::KillActivePopup( PopupMenu* pThisOnly )
             pPopup->pWindow->SetParentToDefaultWindow();
             pPopup->pWindow.disposeAndClear();
 
-            Update();
+            PaintImmediately();
         }
     }
 }
@@ -626,7 +626,7 @@ void MenuFloatingWindow::MouseMove( const MouseEvent& rMEvt )
 void MenuFloatingWindow::ImplScroll( bool bUp )
 {
     KillActivePopup();
-    Update();
+    PaintImmediately();
 
     if (!pMenu)
         return;
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 33cddf352ce4..b62abdaf56df 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -848,7 +848,7 @@ void Window::ImplInvalidate( const vcl::Region* pRegion, InvalidateFlags nFlags
     }
 
     if ( nFlags & InvalidateFlags::Update )
-        pOpaqueWindow->Update();        // start painting at the opaque parent
+        pOpaqueWindow->PaintImmediately();        // start painting at the opaque parent
 }
 
 void Window::ImplMoveInvalidateRegion( const tools::Rectangle& rRect,
@@ -1281,11 +1281,11 @@ bool Window::HasPaintEvent() const
     return false;
 }
 
-void Window::Update()
+void Window::PaintImmediately()
 {
     if ( mpWindowImpl->mpBorderWindow )
     {
-        mpWindowImpl->mpBorderWindow->Update();
+        mpWindowImpl->mpBorderWindow->PaintImmediately();
         return;
     }
 
@@ -1337,7 +1337,7 @@ void Window::Update()
         vcl::Window* pUpdateOverlapWindow = ImplGetFirstOverlapWindow()->mpWindowImpl->mpFirstOverlap;
         while ( pUpdateOverlapWindow )
         {
-             pUpdateOverlapWindow->Update();
+             pUpdateOverlapWindow->PaintImmediately();
              pUpdateOverlapWindow = pUpdateOverlapWindow->mpWindowImpl->mpNext;
         }
 
@@ -1824,7 +1824,7 @@ void Window::ImplScroll( const tools::Rectangle& rRect,
     }
 
     if ( nFlags & ScrollFlags::Update )
-        Update();
+        PaintImmediately();
 
     if ( mpWindowImpl->mpCursor )
         mpWindowImpl->mpCursor->ImplResume();
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 6a12d0cada6c..44b44d33e73d 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -303,7 +303,7 @@ void Splitter::Tracking( const TrackingEvent& rTEvt )
                 Split();
             }
 
-            GetParent()->Update();
+            GetParent()->PaintImmediately();
         }
         else
         {
@@ -422,7 +422,7 @@ void Splitter::ImplKbdTracking( vcl::KeyCode aKeyCode )
                 mnLastSplitPos = 0;
                 Split();
             }
-            GetParent()->Update();
+            GetParent()->PaintImmediately();
         }
     }
 }
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index b6d4e96f16d4..4c8dac465a47 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -2039,7 +2039,7 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt )
 
             if ( mbDragFull )
             {
-                Update();
+                PaintImmediately();
                 mnMStartPos = mnMSplitPos;
             }
         }
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index c7ba32cc9527..182c085a152e 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -233,7 +233,7 @@ void ToolBox::ImplCheckUpdate()
 
     // this is only required for transparent toolbars (see ImplDrawTransparentBackground() )
     if( !IsBackground() && HasPaintEvent() && !IsInPaint() )
-        Update();
+        PaintImmediately();
 }
 
 void ToolBox::ImplDrawGrip(vcl::RenderContext& rRenderContext,
@@ -3210,7 +3210,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt )
         if ( mbFormat )
         {
             ImplFormat();
-            Update();
+            PaintImmediately();
         }
 
         Point  aMousePos = rMEvt.GetPosPixel();
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 6ae5be59debb..e2613b3da9ec 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1623,7 +1623,7 @@ static void ImplHandlePaint( vcl::Window* pWindow, const tools::Rectangle& rBoun
         // (GetSizePixel does that for us)
         pWindow->GetSizePixel();
         // force drawing immediately
-        pWindow->Update();
+        pWindow->PaintImmediately();
     }
 }
 
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 35e9bdd13641..5ca05d716c85 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -2092,7 +2092,7 @@ class DemoPopup : public FloatingWindow
         SetBackground(Wallpaper(COL_YELLOW));
 
         Show( true, ShowFlags::NoActivate );
-        Update();
+        PaintImmediately();
     }
 
     virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle&) override