User: rt Date: 2007-07-06 08:34:22+0000 Modified: dba/dbaccess/source/ui/misc/UITools.cxx
Log: INTEGRATION: CWS oj14 (1.58.4); FILE MERGED 2007/06/23 21:22:54 fs 1.58.4.8: RESYNC: (1.70-1.71); FILE MERGED 2007/06/04 18:45:50 oj 1.58.4.7: RESYNC: (1.68-1.70); FILE MERGED 2006/12/18 16:23:05 oj 1.58.4.6: RESYNC: (1.66-1.68); FILE MERGED 2006/11/07 09:34:32 oj 1.58.4.5: RESYNC: (1.60-1.66); FILE MERGED 2006/07/04 08:12:57 oj 1.58.4.4: RESYNC: (1.59-1.60); FILE MERGED 2006/04/25 13:03:16 oj 1.58.4.3: new include 2006/03/20 07:48:44 oj 1.58.4.2: use of module client helper 2006/01/03 07:49:18 oj 1.58.4.1: changed module client File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: UITools.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/UITools.cxx?r1=1.71&r2=1.72 Delta lines: +12 -11 --------------------- --- UITools.cxx 2007-06-05 14:42:00+0000 1.71 +++ UITools.cxx 2007-07-06 08:34:20+0000 1.72 @@ -250,9 +250,6 @@ #ifndef _DBU_MISC_HRC_ #include "dbu_misc.hrc" #endif -#ifndef _DBAUI_MODULE_DBU_HXX_ -#include "moduledbu.hxx" -#endif #ifndef _DBAUI_SQLMESSAGE_HXX_ #include "sqlmessage.hxx" #endif @@ -1525,6 +1522,9 @@ // ----------------------------------------------------------------------------- void setEvalDateFormatForFormatter(Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter) { + OSL_ENSURE( _rxFormatter.is(),"setEvalDateFormatForFormatter: Formatter is NULL!"); + if ( _rxFormatter.is() ) + { Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = _rxFormatter->getNumberFormatsSupplier(); Reference< XUnoTunnel > xTunnel(xSupplier,UNO_QUERY); @@ -1536,6 +1536,7 @@ SvNumberFormatter* pFormatter = pSupplierImpl->GetNumberFormatter(); pFormatter->SetEvalDateFormat(NF_EVALDATEFORMAT_FORMAT); } + } } // ----------------------------------------------------------------------------- TOTypeInfoSP queryPrimaryKeyType(const OTypeInfoMap& _rTypeInfo) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
