summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-28 16:55:03 +0000
committerAndras Timar <andras.timar@collabora.com>2014-03-03 04:32:05 -0600
commitff2704d22bab86d9e58df812bc01482cfb4bb262 (patch)
tree9889ec868d816ef20195e14dee5b7caee9f7194c
parent97197e881d609404288eaa903fa7db2c3b0c70b6 (diff)
Resolves: rhbz#1007697 Update on a Window triggering delete on window
Reviewed-on: https://gerrit.libreoffice.org/8396 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 1ec2880679d88c89901ce00fe30dd78e584f6960) Conflicts: svx/source/svdraw/sdrpaintwindow.cxx vcl/source/window/window.cxx Change-Id: Ic6374ce45e3a3ba97217ae77e91f9143f46e277b Reviewed-on: https://gerrit.libreoffice.org/8400 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--svx/source/svdraw/sdrpaintwindow.cxx96
-rw-r--r--vcl/source/window/window.cxx5
2 files changed, 83 insertions, 18 deletions
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index 6ab2b4051849..da94126cb55e 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -22,35 +22,95 @@
#include <svx/svdpntv.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/svapp.hxx>
+#include <set>
+#include <vector>
+
+//rhbz#1007697 do this in two loops, one to collect the candidates
+//and another to update them because updating a candidate can
+//trigger the candidate to be deleted, so asking for its
+//sibling after that is going to fail hard
+class CandidateMgr
+{
+ std::vector<Window*> m_aCandidates;
+ std::set<Window*> m_aDeletedCandidates;
+ DECL_LINK(WindowEventListener, VclSimpleEvent*);
+public:
+ void PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect);
+ ~CandidateMgr();
+};
+
+IMPL_LINK(CandidateMgr, WindowEventListener, VclSimpleEvent*, pEvent)
+{
+ VclWindowEvent* pWinEvent = dynamic_cast< VclWindowEvent* >( pEvent );
+ if (pWinEvent)
+ {
+ Window* pWindow = pWinEvent->GetWindow();
+ if (pWinEvent->GetId() == VCLEVENT_OBJECT_DYING)
+ {
+ m_aDeletedCandidates.insert(pWindow);
+ }
+ }
+ return 0;
+}
+
+CandidateMgr::~CandidateMgr()
+{
+ for (std::vector<Window*>::iterator aI = m_aCandidates.begin();
+ aI != m_aCandidates.end(); ++aI)
+ {
+ Window* pCandidate = *aI;
+ if (m_aDeletedCandidates.find(pCandidate) != m_aDeletedCandidates.end())
+ continue;
+ pCandidate->RemoveEventListener(LINK(this, CandidateMgr, WindowEventListener));
+ }
+}
void PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect)
{
- if (rWindow.IsChildTransparentModeEnabled())
+ if (!rWindow.IsChildTransparentModeEnabled())
+ return;
+
+ CandidateMgr aManager;
+ aManager.PaintTransparentChildren(rWindow, rPixelRect);
+}
+
+void CandidateMgr::PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect)
+{
+ Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD );
+ while (pCandidate)
{
- Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD );
- while (pCandidate)
+ if (pCandidate->IsPaintTransparent())
{
- if (pCandidate->IsPaintTransparent())
+ const Rectangle aCandidatePosSizePixel(
+ pCandidate->GetPosPixel(),
+ pCandidate->GetSizePixel());
+
+ if (aCandidatePosSizePixel.IsOver(rPixelRect))
{
- const Rectangle aCandidatePosSizePixel(
- pCandidate->GetPosPixel(),
- pCandidate->GetSizePixel());
-
- if (aCandidatePosSizePixel.IsOver(rPixelRect))
- {
- pCandidate->Invalidate(
- INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
- // important: actually paint the child here!
- pCandidate->Update();
- }
+ m_aCandidates.push_back(pCandidate);
+ pCandidate->AddEventListener(LINK(this, CandidateMgr, WindowEventListener));
}
- pCandidate = pCandidate->GetWindow( WINDOW_NEXT );
}
+ pCandidate = pCandidate->GetWindow( WINDOW_NEXT );
}
-}
-////////////////////////////////////////////////////////////////////////////////////////////////////
+ for (std::vector<Window*>::iterator aI = m_aCandidates.begin();
+ aI != m_aCandidates.end(); ++aI)
+ {
+ pCandidate = *aI;
+ if (m_aDeletedCandidates.find(pCandidate) != m_aDeletedCandidates.end())
+ continue;
+ //rhbz#1007697 this can cause the window itself to be
+ //deleted. So we are listening to see if that happens
+ //and if so, then skip the update
+ pCandidate->Invalidate(INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN);
+ // important: actually paint the child here!
+ if (m_aDeletedCandidates.find(pCandidate) != m_aDeletedCandidates.end())
+ continue;
+ pCandidate->Update();
+ }
+}
SdrPreRenderDevice::SdrPreRenderDevice(OutputDevice& rOriginal)
: mrOutputDevice(rOriginal)
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 470f91225127..da28672f5893 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -7512,6 +7512,8 @@ void Window::Update()
// if there is something to paint, trigger a Paint
if ( pUpdateWindow->mpWindowImpl->mnPaintFlags & (IMPL_PAINT_PAINT | IMPL_PAINT_PAINTCHILDREN) )
{
+ ImplDelData aDogTag(this);
+
// trigger an update also for system windows on top of us,
// otherwise holes would remain
Window* pUpdateOverlapWindow = ImplGetFirstOverlapWindow()->mpWindowImpl->mpFirstOverlap;
@@ -7522,6 +7524,9 @@ void Window::Update()
}
pUpdateWindow->ImplCallPaint( NULL, pUpdateWindow->mpWindowImpl->mnPaintFlags );
+
+ if (aDogTag.IsDead())
+ return;
}
if ( bFlush )