From 897d70c1f710c88f9c321cf72af739b21de427ca Mon Sep 17 00:00:00 2001 From: "Armin Le Grand (allotropia)" Date: Wed, 19 Feb 2025 15:52:03 +0100 Subject: Remove OverlayManager::flush() mechanism This is a follow-up to 'Avoid short blinking of text when activating TextEdit' commit. The update using the timer works nowadays flawless, so no longer needed. I separated the two places in two commits because this one handles some places I do not know good enough to be completely sure, so it would be simpler to turn back in case of (unexpected) problems. Change-Id: I336515838949585b98101ff566e9137b898da82f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181906 Reviewed-by: Thorsten Behrens Tested-by: Jenkins --- svx/inc/sdr/overlay/overlaymanagerbuffered.hxx | 3 --- svx/source/sdr/overlay/overlaymanager.cxx | 5 ----- svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 6 ------ svx/source/svdraw/svdcrtv.cxx | 12 ------------ svx/source/svdraw/svddrgv.cxx | 3 --- 5 files changed, 29 deletions(-) (limited to 'svx') diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx index a5acd6abc3ee..cc2a1fe5c217 100644 --- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx +++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx @@ -62,9 +62,6 @@ namespace sdr::overlay // complete redraw virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = nullptr) const override; - // flush. Do buffered updates. - virtual void flush() override; - // invalidate the given range at local OutputDevice virtual void invalidateRange(const basegfx::B2DRange& rRange) override; }; diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 3e0098eb26cf..b31197ab59ac 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -255,11 +255,6 @@ namespace sdr::overlay ImpDrawMembers(aRegionRange, rTarget); } - void OverlayManager::flush() - { - // default has nothing to do - } - void OverlayManager::add(OverlayObject& rOverlayObject) { OSL_ENSURE(nullptr == rOverlayObject.mpOverlayManager, "OverlayObject is added twice to an OverlayManager (!)"); diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index a58ec8192004..754f9ea5deb2 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -388,12 +388,6 @@ namespace sdr::overlay OverlayManager::completeRedraw(rRegion, pPreRenderDevice); } - void OverlayManagerBuffered::flush() - { - // call timer handler direct - ImpBufferTimerHandler(nullptr); - } - void OverlayManagerBuffered::invalidateRange(const basegfx::B2DRange& rRange) { if(rRange.isEmpty()) diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 67c6c07f22b0..8f5fb5f2af50 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -820,18 +820,6 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/) mpCreateViewExtraData->CreateAndShowOverlay(*this, nullptr, aPoly); } - - // #i101679# Force changed overlay to be shown - for(sal_uInt32 a(0); a < PaintWindowCount(); a++) - { - SdrPaintWindow* pCandidate = GetPaintWindow(a); - const rtl::Reference& xOverlayManager = pCandidate->GetOverlayManager(); - - if (xOverlayManager.is()) - { - xOverlayManager->flush(); - } - } } maDragStat.SetShown(true); diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index 645cb8fd2bef..792b85376534 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -827,9 +827,6 @@ void SdrDragView::ShowDragObj(bool IsSizeValid) mpCurrentSdrDragMethod->CreateOverlayGeometry( *xOverlayManager, rPageWindow.GetObjectContact(), IsSizeValid); - - // #i101679# Force changed overlay to be shown - xOverlayManager->flush(); } } } -- cgit