diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-02-17 16:20:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-18 16:11:05 +0000 |
| commit | 6ba4d125f61f1cfe737190628e84f7fc75263382 (patch) | |
| tree | 3913bb67f69f11e7db56c5c1d89174c996812612 /framework/source/layoutmanager | |
| parent | b612871fff5747d4752e8f32910e8616add44e75 (diff) | |
Related: #i124096# correct LayoutManager::m_xDockingAreaAcceptor clear...
on disposing
(cherry picked from commit 50b10da7434d774ac463c148bbaeb051d2b3a22d)
Conflicts:
framework/source/layoutmanager/layoutmanager.cxx
Change-Id: I51fe74698f00fadba9afaeb0f8e9f66b85f208cb
Diffstat (limited to 'framework/source/layoutmanager')
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index ca60d0aca1a4..d1267dbed9fd 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; } |