Tag: cws_src680_hsqlcsv User: fs Date: 2006/12/18 00:02:36 Modified: dba/dbaccess/source/ui/misc/UITools.cxx
Log: RESYNC: (1.65-1.68); 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.2&r2=1.61.18.3 Delta lines: +24 -17 --------------------- --- UITools.cxx 11 Oct 2006 09:15:23 -0000 1.61.18.2 +++ UITools.cxx 18 Dec 2006 08:02:33 -0000 1.61.18.3 @@ -739,19 +739,19 @@ pInfo->bNullable = (sal_Int32)aValue == ColumnValue::NULLABLE; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - pInfo->bCaseSensitive = aValue; + pInfo->bCaseSensitive = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); pInfo->nSearchType = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - pInfo->bUnsigned = aValue; + pInfo->bUnsigned = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - pInfo->bCurrency = aValue; + pInfo->bCurrency = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - pInfo->bAutoIncrement = aValue; + pInfo->bAutoIncrement = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); pInfo->aLocalTypeName = aValue; @@ -1056,14 +1056,16 @@ aFD.StyleName = rFont.GetStyleName(); aFD.Height = (sal_Int16)rFont.GetSize().Height(); aFD.Width = (sal_Int16)rFont.GetSize().Width(); - aFD.Family = rFont.GetFamily(); + aFD.Family = sal::static_int_cast< sal_Int16 >(rFont.GetFamily()); aFD.CharSet = rFont.GetCharSet(); - aFD.Pitch = rFont.GetPitch(); + aFD.Pitch = sal::static_int_cast< sal_Int16 >(rFont.GetPitch()); aFD.CharacterWidth = ConvertFontWidth( rFont.GetWidthType() ); aFD.Weight = ConvertFontWeight( rFont.GetWeight() ); aFD.Slant = (::com::sun::star::awt::FontSlant)rFont.GetItalic(); - aFD.Underline = rFont.GetUnderline(); - aFD.Strikeout = rFont.GetStrikeout(); + aFD.Underline = sal::static_int_cast< sal_Int16 >( + rFont.GetUnderline()); + aFD.Strikeout = sal::static_int_cast< sal_Int16 >( + rFont.GetStrikeout()); aFD.Orientation = rFont.GetOrientation(); aFD.Kerning = rFont.IsKerning(); aFD.WordLineMode = rFont.IsWordLineMode(); @@ -1370,12 +1372,18 @@ // check if SQL92 name checking is enabled sal_Bool isSQL92CheckEnabled(const Reference<XConnection>& _xConnection) { - return ::dbtools::isDataSourcePropertyEnabled(_xConnection,PROPERTY_ENABLESQL92CHECK); + return ::dbtools::getBooleanDataSourceSetting( _xConnection, PROPERTY_ENABLESQL92CHECK ); } // ----------------------------------------------------------------------------- sal_Bool isAppendTableAliasEnabled(const Reference<XConnection>& _xConnection) { - return ::dbtools::isDataSourcePropertyEnabled(_xConnection,INFO_APPEND_TABLE_ALIAS,sal_False); + return ::dbtools::getBooleanDataSourceSetting( _xConnection, INFO_APPEND_TABLE_ALIAS ); +} + +// ----------------------------------------------------------------------------- +sal_Bool generateAsBeforeTableAlias(const Reference<XConnection>& _xConnection) +{ + return ::dbtools::getBooleanDataSourceSetting( _xConnection, INFO_AS_BEFORE_CORRELATION_NAME ); } // ----------------------------------------------------------------------------- @@ -1930,8 +1938,7 @@ aValue.Value <<= _xContent; aArguments[2] <<= aValue; - ::rtl::OUString sServiceName = - (_bCollection ? ((_bForm) ? SERVICE_NAME_FORM_COLLECTION : SERVICE_NAME_REPORT_COLLECTION) : SERVICE_SDB_DOCUMENTDEFINITION); + ::rtl::OUString sServiceName(_bCollection ? ((_bForm) ? SERVICE_NAME_FORM_COLLECTION : SERVICE_NAME_REPORT_COLLECTION) : SERVICE_SDB_DOCUMENTDEFINITION); Reference<XContent > xNew(xORB->createInstanceWithArguments(sServiceName,aArguments),UNO_QUERY); Reference<XNameContainer> xNameContainer(xNameAccess,UNO_QUERY); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
