diff options
| -rw-r--r-- | include/vcl/window.hxx | 1 | ||||
| -rw-r--r-- | vcl/inc/svdata.hxx | 11 | ||||
| -rw-r--r-- | vcl/inc/window.h | 3 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 10 |
4 files changed, 0 insertions, 25 deletions
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index d69de6d57e17..11a81069d1b5 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -40,7 +40,6 @@ #include <memory> class VirtualDevice; -struct ImplDelData; struct ImplSVEvent; struct ImplWinData; struct ImplFrameData; diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index e43b0d4a676d..628f45dcff8b 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -366,17 +366,6 @@ bool ImplInitAccessBridge(); FieldUnitStringList* ImplGetFieldUnits(); FieldUnitStringList* ImplGetCleanedFieldUnits(); -// ImplDelData is used as a "dog tag" by a window when it -// does something that could indirectly destroy the window -// TODO: wild destruction of a window should not be possible - -struct ImplDelData -{ - ImplDelData* mpNext; - VclPtr<vcl::Window> mpWindow; - bool mbDel; -}; - struct ImplSVEvent { void* mpData; diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 5203564f5ed2..db8bdfb0b6d1 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -28,8 +28,6 @@ #include <vector> #include <set> -struct ImplDelData; - namespace vcl { class Window; } @@ -209,7 +207,6 @@ public: // The canvas interface for this VCL window. Is persistent after the first GetCanvas() call css::uno::WeakReference< css::rendering::XCanvas > mxCanvas; - ImplDelData* mpFirstDel; void* mpUserData; vcl::Cursor* mpCursor; Pointer maPointer; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index fbe64960bb23..1d04005eb0ef 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -510,15 +510,6 @@ void Window::dispose() OutputDevice *pOutDev = GetOutDev(); pOutDev->ReleaseGraphics(); - // notify ImplDelData subscribers of this window about the window deletion - ImplDelData* pDelData = mpWindowImpl->mpFirstDel; - while ( pDelData ) - { - pDelData->mbDel = true; - pDelData->mpWindow.clear(); // #112873# pDel is not associated with a Window anymore - pDelData = pDelData->mpNext; - } - // remove window from the lists ImplRemoveWindow( true ); @@ -628,7 +619,6 @@ WindowImpl::WindowImpl( WindowType nType ) mpLastFocusWindow = nullptr; // window for focus restore mpDlgCtrlDownWindow = nullptr; // window for dialog control mnChildEventListenersIteratingCount = 0; - mpFirstDel = nullptr; // Dtor notification list mpUserData = nullptr; // user data mpCursor = nullptr; // cursor mpControlFont = nullptr; // font properties |