From e4647b2f1f0c2d4906f1a56fe47f14c99bc0069d Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Mon, 11 Apr 2005 09:04:46 +0000
Subject: [PATCH] INTEGRATION: CWS dba32 (1.21.20); FILE MERGED 2005/04/05
 13:03:35 fs 1.21.20.1: #i46699# don't assume existing model when leaning up
 after an error while loading

---
 dbaccess/source/ui/browser/dbloader.cxx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 9925d545d36b..8a4408fe8f7d 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbloader.cxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: vg $ $Date: 2005-03-10 16:45:19 $
+ *  last change: $Author: hr $ $Date: 2005-04-11 10:04:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -351,8 +351,10 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const ::
                 bSuccess = sal_False;
                 try
                 {
-                    xController->attachModel(NULL);
-                    xModel->disconnectController( xController );
+                    if ( xController.is() )
+                        xController->attachModel(NULL);
+                    if ( xModel.is() )
+                        xModel->disconnectController( xController );
                 }
                 catch( const Exception& )
                 {