User: kz Date: 2008-03-05 16:53:01+0000 Modified: dba/dbaccess/source/ui/browser/genericcontroller.cxx
Log: INTEGRATION: CWS dba30a (1.81.74); FILE MERGED 2008/02/05 21:38:27 fs 1.81.74.1: #i85879# cleanup the toolbar mess in the data source browser File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.81&r2=1.82 Delta lines: +7 -21 -------------------- --- genericcontroller.cxx 2007-09-26 14:48:32+0000 1.81 +++ genericcontroller.cxx 2008-03-05 16:52:59+0000 1.82 @@ -132,6 +132,7 @@ #include <algorithm> #include <hash_map> +using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; @@ -1065,28 +1066,13 @@ { try { -/*AS // #104032# OJ - URL aURL; - aURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc")); - if (m_xUrlTransformer.is()) - m_xUrlTransformer->parseStrict(aURL); - Reference< XDispatchProvider > xDispProv(m_xCurrentFrame, UNO_QUERY); - Reference< XDispatch > xCloseDispatch; - if (xDispProv.is()) - xCloseDispatch = xDispProv->queryDispatch(aURL, m_xCurrentFrame->getName(), FrameSearchFlag::SELF); - OSL_ENSURE(xCloseDispatch.is(), "SbaTableQueryBrowser::OnAsyncCloseTask: could not get a dispatcher!"); - if ( xCloseDispatch.is() && xCloseDispatch != *this ) - { - xCloseDispatch->dispatch(aURL, Sequence< PropertyValue >()); + Reference< util::XCloseable > xCloseable( m_xCurrentFrame, UNO_QUERY_THROW ); + xCloseable->close( sal_False ); // false - holds the owner ship for this frame inside this object! } - else*/ + catch( const Exception& ) { - Reference< ::com::sun::star::util::XCloseable > xCloseable(m_xCurrentFrame,UNO_QUERY); - if(xCloseable.is()) - xCloseable->close(sal_False); // false - holds the owner ship for this frame inside this object! - } + DBG_UNHANDLED_EXCEPTION(); } - catch(const Exception&) {} } return 0L; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
