include/svx/sdr/overlay/overlaymanager.hxx | 3 ---
sc/source/ui/inc/gridwin.hxx | 2 --
sc/source/ui/view/gridwin.cxx | 9 ---------
sc/source/ui/view/gridwin4.cxx | 3 ---
sc/source/ui/view/tabview.cxx | 3 ---
sc/source/ui/view/tabview3.cxx | 6 ------
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 ---
11 files changed, 55 deletions(-)
New commits:
commit 897d70c1f710c88f9c321cf72af739b21de427ca
Author: Armin Le Grand (allotropia) <armin.le.grand.ext...@allotropia.de>
AuthorDate: Wed Feb 19 15:52:03 2025 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sun Mar 2 19:33:52 2025 +0100
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 <thorsten.behr...@allotropia.de>
Tested-by: Jenkins
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx
b/include/svx/sdr/overlay/overlaymanager.hxx
index 350aca310ff1..3ce37976a99d 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -90,9 +90,6 @@ namespace sdr::overlay
// complete redraw
virtual void completeRedraw(const vcl::Region& rRegion,
OutputDevice* pPreRenderDevice = nullptr) const;
- // flush. Do buffered updates.
- virtual void flush();
-
// get the OutputDevice
OutputDevice& getOutputDevice() const { return mrOutputDevice; }
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 232c1d0bc9d1..66f7067081eb 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -361,9 +361,7 @@ public:
virtual void dispose() override;
virtual void KeyInput(const KeyEvent& rKEvt) override;
- // #i70788# flush and get overlay
rtl::Reference<sdr::overlay::OverlayManager> getOverlayManager() const;
- void flushOverlayManager();
virtual OUString GetSurroundingText() const override;
virtual Selection GetSurroundingTextSelection() const override;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index eb7cbb2e27a7..986a3119caa6 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -7424,15 +7424,6 @@ rtl::Reference<sdr::overlay::OverlayManager>
ScGridWindow::getOverlayManager() c
return rtl::Reference<sdr::overlay::OverlayManager>();
}
-void ScGridWindow::flushOverlayManager()
-{
- // #i70788# get the OverlayManager safely
- rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager =
getOverlayManager();
-
- if (xOverlayManager.is())
- xOverlayManager->flush();
-}
-
ScViewData& ScGridWindow::getViewData()
{
return mrViewData;
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 2ede73ce874f..77e102519760 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1351,9 +1351,6 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice,
const ScTableInfo& rTableI
if (mrViewData.HasEditView(eWhich))
{
- // flush OverlayManager before changing the MapMode
- flushOverlayManager();
-
// set MapMode for text edit
rDevice.SetMapMode(mrViewData.GetLogicMode());
}
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 03258c9fdaf2..fcb156e60d24 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2384,7 +2384,6 @@ void ScTabView::SetNewVisArea()
for (i=0; i<4; i++)
if (pGridWin[i] && aDrawMode[i] != aOldMode[i])
{
- pGridWin[i]->flushOverlayManager(); // #i79909# flush overlays
before switching to edit MapMode
pGridWin[i]->SetMapMode(aOldMode[i]);
}
@@ -2409,8 +2408,6 @@ void ScTabView::SetNewVisArea()
ScGridWindow *pGridWindow = GetViewData().GetActiveWin();
pGridWindow->DrawEditView(*pGridWindow->GetOutDev(), pEditView);
-
- pGridWindow->flushOverlayManager();
pGridWindow->GetOutDev()->SetMapMode(GetViewData().GetLogicMode());
if (bInPlaceVisCursor)
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index f9e534d55cd2..c725ea4c8f4e 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2225,9 +2225,6 @@ void ScTabView::MakeEditView( ScEditEngineDefaulter*
pEngine, SCCOL nCol, SCROW
pGridWin[i]->DeleteAutoFillOverlay();
pGridWin[i]->DeleteCopySourceOverlay();
- // flush OverlayManager before changing MapMode to text edit
- pGridWin[i]->flushOverlayManager();
-
// MapMode must be set after HideCursor
pGridWin[i]->SetMapMode(aViewData.GetLogicMode());
@@ -3223,9 +3220,6 @@ void ScTabView::ZoomChanged()
if ( pWin && aViewData.HasEditView( aViewData.GetActivePart() ) )
{
- // flush OverlayManager before changing the MapMode
- pWin->flushOverlayManager();
-
// make sure the EditView's position and size are updated
// with the right (logic, not drawing) MapMode
pWin->SetMapMode( aViewData.GetLogicMode() );
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<sdr::overlay::OverlayManager>&
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();
}
}
}
