User: kz Date: 2008-05-05 15:53:53+0000 Modified: dba/dbaccess/source/ui/browser/unodatbr.cxx
Log: INTEGRATION: CWS dba30b (1.196.4); FILE MERGED 2008/04/15 22:12:57 fs 1.196.4.2: RESYNC: (1.196-1.198); FILE MERGED 2008/03/16 14:05:17 fs 1.196.4.1: some exception handling re-factoring File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.199&r2=1.200 Delta lines: +41 -41 --------------------- --- unodatbr.cxx 2008-04-22 15:19:46+0000 1.199 +++ unodatbr.cxx 2008-05-05 15:53:50+0000 1.200 @@ -43,7 +43,6 @@ #include "dlgsave.hxx" #include "HtmlReader.hxx" #include "imageprovider.hxx" -#include "linkeddocuments.hxx" #include "listviewitems.hxx" #include "QEnumTypes.hxx" #include "RtfReader.hxx" @@ -98,6 +97,7 @@ #include <com/sun/star/util/XFlushable.hpp> #include <com/sun/star/sdb/XDocumentDataSource.hpp> #include <com/sun/star/document/MacroExecMode.hpp> +#include <com/sun/star/frame/XComponentLoader.hpp> /** === end UNO includes === **/ #include <comphelper/extract.hxx> @@ -767,9 +767,9 @@ xProp->setPropertyValue(PROPERTY_ALIGN,makeAny(::com::sun::star::awt::TextAlign::LEFT)); } } - catch(Exception&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "SbaTableQueryBrowser::propertyChange: caught an exception!"); + DBG_UNHANDLED_EXCEPTION(); } } @@ -815,9 +815,9 @@ transferChangedControlProperty(evt.PropertyName, evt.NewValue); } } - catch(Exception&) + catch( const Exception& ) { - DBG_ERROR("SbaTableQueryBrowser::propertyChange: caught an exception!"); + DBG_UNHANDLED_EXCEPTION(); } } @@ -1140,9 +1140,9 @@ { feature->second.xDispatcher->addStatusListener( this, feature->second.aURL ); } - catch(Exception&) + catch( const Exception& ) { - OSL_ENSURE( 0, "SbaTableQueryBrowser::connectExternalDispatches: caught an exception while attaching a status listener!!" ); + DBG_UNHANDLED_EXCEPTION(); } } @@ -1307,9 +1307,9 @@ aReturn <<= aDescriptor.createPropertyValueSequence(); } } - catch(const Exception&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "SbaTableQueryBrowser::getSelection: caught an exception while retrieving the selection!"); + DBG_UNHANDLED_EXCEPTION(); } return aReturn; @@ -1593,9 +1593,9 @@ { OSL_ENSURE(sal_False, "SbaTableQueryBrowser::GetState: object already disposed!"); } - catch(Exception&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "SbaTableQueryBrowser::GetState: caught a strange exception!!"); + DBG_UNHANDLED_EXCEPTION(); } } @@ -1799,9 +1799,9 @@ xDispatch->dispatch(aParentUrl, aDescriptor.createPropertyValueSequence()); } - catch(Exception&) + catch( const Exception& ) { - DBG_ERROR("SbaTableQueryBrowser::Execute(ID_BROWSER_?): could not dispatch the slot (caught an exception)!"); + DBG_UNHANDLED_EXCEPTION(); } } } @@ -2026,9 +2026,9 @@ else OSL_ENSURE(sal_False, "SbaTableQueryBrowser::OnExpandEntry: something strange happended!"); } - catch(const Exception&) + catch( const Exception& ) { - OSL_ENSURE(sal_False, "SbaTableQueryBrowser, OnExpandEntry: caught an unknown exception while populating the tables!"); + DBG_UNHANDLED_EXCEPTION(); } if (aInfo.isValid()) showError(aInfo); @@ -2094,9 +2094,9 @@ DBG_ERROR("SbaTableQueryBrowser::ensureEntryObject: no XQueryDefinitionsSupplier interface!"); } } - catch(Exception&) + catch( const Exception& ) { - DBG_ERROR("SbaTableQueryBrowser::ensureEntryObject: caught an exception while retrieving the queries container!"); + DBG_UNHANDLED_EXCEPTION(); } break; @@ -3271,9 +3271,9 @@ } } } - catch(::com::sun::star::uno::Exception&) + catch( const Exception& ) { - DBG_ERROR("SbaTableQueryBrowser::implAdministrate: caught an exception while creating/executing the dialog!"); + DBG_UNHANDLED_EXCEPTION(); } } @@ -3471,7 +3471,7 @@ } catch( const Exception& ) { - OSL_ENSURE( sal_False, "SbaTableQueryBrowser::implGetQuerySignature: caught an exception!" ); + DBG_UNHANDLED_EXCEPTION(); } return sal_False; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
