expose a way to drop ownership of a window from builder tree

Change-Id: I6f6bff32271ed1d6c328ba211a6b1249fda039dd

1 files changed, 6 insertions, 1 deletions

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 98055fc65d09..e336a052b5db 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2998,12 +2998,17 @@ void VclBuilder::delete_by_name(const OString& sID)
 
 void VclBuilder::delete_by_window(const Window *pWindow)
 {
+    drop_ownership(pWindow);
+    delete pWindow;
+}
+
+void VclBuilder::drop_ownership(const Window *pWindow)
+{
     for (std::vector<WinAndId>::iterator aI = m_aChildren.begin(),
          aEnd = m_aChildren.end(); aI != aEnd; ++aI)
     {
         if (aI->m_pWindow == pWindow)
         {
-            delete aI->m_pWindow;
             m_aChildren.erase(aI);
             break;
         }