Tag: cws_src680_hsqlcsv User: fs Date: 2006/10/11 02:15:26 Modified: dba/dbaccess/source/ui/misc/UITools.cxx
Log: RESYNC: (1.61-1.65); FILE MERGED 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.61.18.1&r2=1.61.18.2 Delta lines: +9 -18 -------------------- --- UITools.cxx 14 Sep 2006 11:49:35 -0000 1.61.18.1 +++ UITools.cxx 11 Oct 2006 09:15:23 -0000 1.61.18.2 @@ -33,6 +33,9 @@ * ************************************************************************/ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_dbaccess.hxx" + #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" #endif @@ -565,7 +568,7 @@ || ( (aIter->second->nPrecision >= _nPrecision) && (aIter->second->nMaximumScale >= _nScale) - && (aIter->second->bAutoIncrement == _bAutoIncrement) + && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) ) ) ) @@ -582,7 +585,7 @@ if ( (aIter->second->aLocalTypeName.equalsIgnoreAsciiCase(_sTypeName)) && (nPrec >= _nPrecision) && (nScale >= _nScale) - && (aIter->second->bAutoIncrement == _bAutoIncrement) + && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) ) { OSL_ENSURE(sal_False, @@ -616,7 +619,7 @@ sal_Int32 nScale = aIter->second->nMaximumScale; if ( (nPrec >= _nPrecision) && (nScale >= _nScale) - && (aIter->second->bAutoIncrement == _bAutoIncrement) + && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) ) break; } @@ -990,18 +993,6 @@ OSL_ENSURE(0,"Invalid TextAlign!"); } return eJustify; -} -// ----------------------------------------------------------------------------- -void setColumnUiProperties( const Reference< XPropertySet>& _rxColumn,const OFieldDescription* _pFieldDesc) -{ - if ( _pFieldDesc->GetFormatKey() != NumberFormat::ALL && _rxColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_FORMATKEY) ) - _rxColumn->setPropertyValue(PROPERTY_FORMATKEY,makeAny(_pFieldDesc->GetFormatKey())); - if ( _pFieldDesc->GetHorJustify() != SVX_HOR_JUSTIFY_STANDARD && _rxColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_ALIGN) ) - _rxColumn->setPropertyValue(PROPERTY_ALIGN,makeAny(dbaui::mapTextAllign(_pFieldDesc->GetHorJustify()))); - if ( _pFieldDesc->GetDescription().getLength() && _rxColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_HELPTEXT) ) - _rxColumn->setPropertyValue(PROPERTY_HELPTEXT,makeAny(_pFieldDesc->GetDescription())); - if ( _pFieldDesc->GetControlDefault().hasValue() && _rxColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_CONTROLDEFAULT) ) - _rxColumn->setPropertyValue(PROPERTY_CONTROLDEFAULT,_pFieldDesc->GetControlDefault()); } // ----------------------------------------------------------------------------- float ConvertFontWeight( ::FontWeight eWeight ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
