diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-12-02 13:40:39 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-12-02 13:40:39 +0100 |
| commit | eb212e1b70b85cba3377d299da631c5f52a6d9f5 (patch) | |
| tree | 7ceca989e62f53884780a20d09062e80c492c685 /dbaccess/source/ui/browser | |
| parent | 277dfe5fdd74b6c261e22f9726be01be32acfb0f (diff) | |
| parent | a6b178909a2fe68c35c98b33aa0bd4c6a0e9f0e1 (diff) | |
merge with db33a
Diffstat (limited to 'dbaccess/source/ui/browser')
| -rw-r--r-- | dbaccess/source/ui/browser/dbloader.cxx | 13 | ||||
| -rw-r--r-- | dbaccess/source/ui/browser/genericcontroller.cxx | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index 87f924129c16..913dea5c54fe 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 ); } // ----------------------------------------------------------------------- diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index dbbdd16c21cc..dc2734a0414a 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -282,6 +282,7 @@ OGenericUnoController::OGenericUnoController(const Reference< XMultiServiceFacto } } +#ifdef WNT // ----------------------------------------------------------------------------- OGenericUnoController::OGenericUnoController() :OGenericUnoController_Base( getMutex() ) @@ -302,6 +303,7 @@ OGenericUnoController::OGenericUnoController() // we simply abort here. abort(); } +#endif // ----------------------------------------------------------------------------- OGenericUnoController::~OGenericUnoController() |