summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/browser/dbloader.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/browser/dbloader.cxx')
-rw-r--r--dbaccess/source/ui/browser/dbloader.cxx13
1 files changed, 11 insertions, 2 deletions
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 4448d5b63..1174a1308 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -324,7 +324,16 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const ::
}
catch(const Exception&)
{
- DBG_UNHANDLED_EXCEPTION();
+ // Does this need to be shown to the user?
+ bSuccess = false;
+ try
+ {
+ ::comphelper::disposeComponent( xController );
+ }
+ catch( const Exception& )
+ {
+ DBG_UNHANDLED_EXCEPTION();
+ }
}
}
@@ -342,7 +351,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const ::
}
else
if ( rListener.is() )
- rListener->loadCancelled( this );
+ rListener->loadCancelled( this );
}
// -----------------------------------------------------------------------