framework/source/layoutmanager/layoutmanager.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 6ba4d125f61f1cfe737190628e84f7fc75263382
Author: Oliver-Rainer Wittmann <o...@apache.org>
Date: Mon Feb 17 16:20:12 2014 +0000
Related: #i124096# correct LayoutManager::m_xDockingAreaAcceptor clear...
on disposing
(cherry picked from commit 50b10da7434d774ac463c148bbaeb051d2b3a22d)
Conflicts:
framework/source/layoutmanager/layoutmanager.cxx
Change-Id: I51fe74698f00fadba9afaeb0f8e9f66b85f208cb
diff --git a/framework/source/layoutmanager/layoutmanager.cxx
b/framework/source/layoutmanager/layoutmanager.cxx
index ca60d0a..d1267dbe 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -2835,6 +2835,8 @@ throw( RuntimeException )
// Our frame gets disposed, release all our references that depends on
a working frame reference.
Application::RemoveEventListener( LINK( this, LayoutManager,
SettingsChanged ) );
+ setDockingAreaAcceptor( Reference< ui::XDockingAreaAcceptor >() );
+
// destroy all elements, it's possible that dettaching is NOT called!
implts_destroyElements();
impl_clearUpMenuBar();
@@ -2883,7 +2885,6 @@ throw( RuntimeException )
m_xFrame.clear();
delete m_pGlobalSettings;
m_pGlobalSettings = 0;
- m_xDockingAreaAcceptor = Reference< ui::XDockingAreaAcceptor >();
bDisposeAndClear = sal_True;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
