svn commit: r1569041 - /openoffice/trunk/main/framework/source/layoutmanager/layoutmanager.cxx

[orw]

Author: orw
Date: Mon Feb 17 16:20:12 2014
New Revision: 1569041

URL: http://svn.apache.org/r1569041
Log:
124096: correct clearance of <LayoutManager::m_xDockingAreaAcceptor> on 
disposing


Modified:
    openoffice/trunk/main/framework/source/layoutmanager/layoutmanager.cxx

Modified: openoffice/trunk/main/framework/source/layoutmanager/layoutmanager.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/layoutmanager/layoutmanager.cxx?rev=1569041&r1=1569040&r2=1569041&view=diff
==============================================================================
--- openoffice/trunk/main/framework/source/layoutmanager/layoutmanager.cxx 
(original)
+++ openoffice/trunk/main/framework/source/layoutmanager/layoutmanager.cxx Mon 
Feb 17 16:20:12 2014
@@ -2895,6 +2895,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();
@@ -2939,7 +2941,6 @@ throw( RuntimeException )
         m_xFrame.clear();
         delete m_pGlobalSettings;
         m_pGlobalSettings = 0;
-                m_xDockingAreaAcceptor = Reference< ui::XDockingAreaAcceptor 
>();
 
         bDisposeAndClear = sal_True;
     }