User: hr Date: 2006/08/15 03:49:26 Modified: dba/dbaccess/source/ui/browser/genericcontroller.cxx
Log: INTEGRATION: CWS dba30 (1.63.14); FILE MERGED 2006/07/19 12:40:33 fs 1.63.14.8: RESYNC: (1.68-1.70); FILE MERGED 2006/05/08 11:20:46 fs 1.63.14.7: RESYNC: (1.67-1.68); FILE MERGED 2006/04/20 06:48:20 oj 1.63.14.6: RESYNC: (1.66-1.67); FILE MERGED 2005/12/15 08:56:52 fs 1.63.14.5: refined the clipboard handling, to removed potential problems found during #124875# 2005/10/13 15:11:22 fs 1.63.14.4: RESYNC: (1.65-1.66); FILE MERGED 2005/09/30 07:00:44 fs 1.63.14.3: RESYNC: (1.63-1.65); FILE MERGED 2005/08/22 14:54:39 fs 1.63.14.2: some minor speedups in the query composer, and some RTL_LOGs for #i48403# 2005/04/06 07:23:30 fs 1.63.14.1: OSL_DEBUG_LEVEL condition corrected 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.71&r2=1.72 Delta lines: +12 -4 -------------------- --- genericcontroller.cxx 11 Aug 2006 17:16:40 -0000 1.71 +++ genericcontroller.cxx 15 Aug 2006 10:49:24 -0000 1.72 @@ -123,6 +123,9 @@ #ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> #endif +#ifndef _RTL_LOGFILE_HXX_ +#include <rtl/logfile.hxx> +#endif #include <algorithm> using namespace ::com::sun::star::uno; @@ -738,7 +741,15 @@ // for locking in the proper order (SolarMutex and m_aMutex), and b) this would be too many places // for the time frame of the fix. // #i52602# / [EMAIL PROTECTED] / 2005-07-29 - executeChecked(_aURL,aArgs); + +#ifdef TIMELOG + ::rtl::OString sLog( "OGenericUnoController::dispatch( '" ); + sLog += ::rtl::OString( _aURL.Main.getStr(), _aURL.Main.getLength(), osl_getThreadTextEncoding() ); + sLog += ::rtl::OString( "' )" ); + RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "[EMAIL PROTECTED]", sLog.getStr() ); +#endif + + executeUnChecked(_aURL,aArgs); } // ----------------------------------------------------------------------- @@ -1024,10 +1035,7 @@ // ----------------------------------------------------------------------------- void OGenericUnoController::loadMenu(const Reference< XFrame >& _xFrame) { - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager = getLayoutManager(_xFrame); - - if ( xLayoutManager.is() ) { xLayoutManager->lock(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
