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
This commit is contained in:
Jens-Heiner Rechtien 2005-04-11 09:04:46 +00:00
parent 0719bace2b
commit e4647b2f1f

View file

@ -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& )
{