diff options
| author | Andre Fischer <af@apache.org> | 2014-02-18 09:21:55 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-19 10:26:40 +0000 |
| commit | ce96f8b02e490b74bff57ca57a2c6a86c3041e32 (patch) | |
| tree | ed32cae50b791f9798f448d05e0b3b34fdca7304 /framework | |
| parent | 5bb7c0ab476ca108aecb5bf43ec9adc6d173f13b (diff) | |
Resolves: #i122576# Reset the docking area acceptor in the destructor
(cherry picked from commit 0e90517f3dd568cfe2be4bf8c256b94c9401d046)
Conflicts:
framework/source/layoutmanager/layoutmanager.cxx
Change-Id: Ib053a1b474434f81608a04ca0d30dd32fe410e5a
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index d1267dbed9fd..2b570dd0410b 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -155,6 +155,7 @@ LayoutManager::~LayoutManager() { Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) ); m_aAsyncLayoutTimer.Stop(); + setDockingAreaAcceptor(NULL); delete m_pGlobalSettings; } |