[Libreoffice-commits] core.git: sfx2/source

[Michael Meeks]

 sfx2/source/dialog/dockwin.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 1394e45450e58d23223ac3bea264a15e0b2b9078
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri May 8 11:07:22 2015 +0100

    tdf#91128 - Dockwin post-dispose crash fix.
    
    Change-Id: I46252c272d45209f8cb3fd072df4109440d3fcae

diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 0c6af19..8b4b8f3 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -450,7 +450,7 @@ void SfxDockingWindow::Resize()
 {
     DockingWindow::Resize();
     Invalidate();
-    if ( pImp->bConstructed && pMgr )
+    if ( pImp && pImp->bConstructed && pMgr )
     {
         if ( IsFloatingMode() )
         {
@@ -501,7 +501,7 @@ bool SfxDockingWindow::PrepareToggleFloatingMode()
 */
 
 {
-    if (!pImp->bConstructed)
+    if (!pImp || !pImp->bConstructed)
         return true;
 
     if ( (Application::IsInModalMode() && IsFloatingMode()) || !pMgr )
@@ -554,7 +554,7 @@ void SfxDockingWindow::ToggleFloatingMode()
     SfxDockingWindow::ToggleFloatingMode() must be called.
 */
 {
-    if ( !pImp->bConstructed || !pMgr )
+    if ( !pImp || !pImp->bConstructed || !pMgr )
         return;                                 // No Handler call
 
     // Remember old alignment and then switch.
@@ -638,7 +638,7 @@ void SfxDockingWindow::StartDocking()
     the end.
 */
 {
-    if ( !pImp->bConstructed || !pMgr )
+    if ( !pImp || !pImp->bConstructed || !pMgr )
         return;
     SfxChildIdentifier eIdent = SfxChildIdentifier::DOCKINGWINDOW;
     if ( pImp->bSplitable )
@@ -672,7 +672,7 @@ bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
     if ( Application::IsInModalMode() )
         return true;
 
-    if ( !pImp->bConstructed || !pMgr )
+    if ( !pImp || !pImp->bConstructed || !pMgr )
     {
         rRect.SetSize( Size() );
         return IsFloatingMode();
@@ -771,7 +771,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode )
     SfxDockingWindow::EndDocking() must be called first.
 */
 {
-    if ( !pImp->bConstructed || IsDockingCanceled() || !pMgr )
+    if ( !pImp || !pImp->bConstructed || IsDockingCanceled() || !pMgr )
         return;
 
     SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();
@@ -1242,7 +1242,7 @@ void SfxDockingWindow::FillInfo(SfxChildWinInfo& rInfo) const
     if ( !pMgr )
         return;
 
-    if ( GetFloatingWindow() && pImp->bConstructed )
+    if ( GetFloatingWindow() && pImp && pImp->bConstructed )
         pImp->aWinState = GetFloatingWindow()->GetWindowState();
 
     rInfo.aWinState = pImp->aWinState;