User: ihi Date: 2006/08/04 06:57:56 Modified: dba/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
Log: INTEGRATION: CWS dba204c (1.68.6); FILE MERGED 2006/07/27 11:20:44 fs 1.68.6.2: RESYNC: (1.68-1.70); FILE MERGED 2006/07/19 13:37:11 fs 1.68.6.1: during #i67530#: OTableFieldDescription::Set/GetDatabaseName is never used File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: SelectionBrowseBox.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx?r1=1.70&r2=1.71 Delta lines: +0 -4 ------------------- --- SelectionBrowseBox.cxx 26 Jul 2006 07:48:50 -0000 1.70 +++ SelectionBrowseBox.cxx 4 Aug 2006 13:57:54 -0000 1.71 @@ -1057,7 +1057,6 @@ OQueryTableWindow* pEntryTab = static_cast<OQueryTableWindow*>(aIter->second); if (pEntryTab) { - pEntry->SetDatabase(pEntryTab->GetComposedName()); pEntry->SetTable(pEntryTab->GetTableName()); pEntry->SetTabWindow(pEntryTab); } @@ -1067,7 +1066,6 @@ else { pEntry->SetAlias(::rtl::OUString()); - pEntry->SetDatabase(::rtl::OUString()); pEntry->SetTable(::rtl::OUString()); pEntry->SetTabWindow(NULL); } @@ -1672,7 +1670,6 @@ aInfo->SetFieldIndex(nFieldIndex); aInfo->SetFieldType(pInf->GetKeyType()); aInfo->SetAlias(pSourceWin->GetAliasName()); - aInfo->SetDatabase(pSourceWin->GetComposedName()); aInfo->SetDataType(pInf->GetDataType()); aInfo->SetVisible(bVis); @@ -2698,7 +2695,6 @@ OQueryTableWindow* pEntryTab = static_cast<OQueryTableWindow*>(aIter->second); if (pEntryTab) { - _pEntry->SetDatabase(pEntryTab->GetComposedName()); _pEntry->SetTable(pEntryTab->GetTableName()); _pEntry->SetTabWindow(pEntryTab); bRet = sal_True; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
