User: ihi Date: 2006/08/04 06:58:16 Modified: dba/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
Log: INTEGRATION: CWS dba204c (1.8.28); FILE MERGED 2006/07/19 13:35:39 fs 1.8.28.1: during #i67530#: m_aDatabaseName is never used File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: TableFieldDescription.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/TableFieldDescription.cxx?r1=1.8&r2=1.9 Delta lines: +1 -7 ------------------- --- TableFieldDescription.cxx 20 Jun 2006 03:28:25 -0000 1.8 +++ TableFieldDescription.cxx 4 Aug 2006 13:58:13 -0000 1.9 @@ -76,7 +76,6 @@ ,m_aAliasName(rRS.GetAlias()) // table range ,m_aFieldName(rRS.GetField()) // column ,m_aFieldAlias(rRS.GetFieldAlias()) // column alias - ,m_aDatabaseName(rRS.GetDatabase()) // qualifier or catalog ,m_aFunctionName(rRS.GetFunction()) // Funktionsname ,m_pTabWindow(rRS.GetTabWindow()) ,m_eDataType(rRS.GetDataType()) @@ -119,7 +118,6 @@ return ( m_eOrderDir != rDesc.GetOrderDir() || m_eDataType != rDesc.GetDataType() || m_aAliasName != rDesc.GetAlias() || - m_aDatabaseName != rDesc.GetDatabase() || m_aFunctionName != rDesc.GetFunction() || m_aFieldName != rDesc.GetField() || m_aTableName != rDesc.GetTable() || @@ -133,7 +131,7 @@ { m_vecCriteria.clear(); ::std::vector< ::rtl::OUString>().swap( m_vecCriteria ); - m_aTableName = m_aAliasName = m_aFieldName = m_aFieldAlias = m_aDatabaseName = m_aFunctionName = ::rtl::OUString(); + m_aTableName = m_aAliasName = m_aFieldName = m_aFieldAlias = m_aFunctionName = ::rtl::OUString(); m_pTabWindow = NULL; m_eDataType = 1000; m_bVisible = sal_False; @@ -217,8 +215,6 @@ aFieldDesc[nPos].Value >>= m_aFieldName; else if ( aFieldDesc[nPos].Name == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FieldAlias")) ) aFieldDesc[nPos].Value >>= m_aFieldAlias; - else if ( aFieldDesc[nPos].Name == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DatabaseName")) ) - aFieldDesc[nPos].Value >>= m_aDatabaseName; else if ( aFieldDesc[nPos].Name == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FunctionName")) ) aFieldDesc[nPos].Value >>= m_aFunctionName; else if ( aFieldDesc[nPos].Name == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataType")) ) @@ -262,8 +258,6 @@ aFieldDesc[nPos++].Value <<= m_aFieldName; aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FieldAlias")); aFieldDesc[nPos++].Value <<= m_aFieldAlias; - aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DatabaseName")); - aFieldDesc[nPos++].Value <<= m_aDatabaseName; aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FunctionName")); aFieldDesc[nPos++].Value <<= m_aFunctionName; aFieldDesc[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataType")); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
