Tag: cws_src680_dba204c User: fs Date: 2006/07/27 04:20:46 Modified: dba/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
Log: RESYNC: (1.68-1.70); FILE MERGED 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.68.6.1&r2=1.68.6.2 Delta lines: +9 -6 ------------------- --- SelectionBrowseBox.cxx 19 Jul 2006 13:37:11 -0000 1.68.6.1 +++ SelectionBrowseBox.cxx 27 Jul 2006 11:20:44 -0000 1.68.6.2 @@ -1532,8 +1532,11 @@ for(USHORT nPos=getFields().size();aIter != getFields().rend();++aIter,--nPos) { pEntry = *aIter; - if (pEntry->GetAlias() == ::rtl::OUString(rAliasName) ) + if ( pEntry->GetAlias().equals( rAliasName ) ) + { RemoveField( GetColumnId( nPos ) ); + break; + } } if (bWasEditing) @@ -2738,8 +2741,8 @@ else { // nur COUNT(*) erlaubt - sal_Bool bCountRemoved = sal_False; - if ( bCountRemoved = !isFieldNameAsterix(_pEntry->GetField()) ) + sal_Bool bCountRemoved = !isFieldNameAsterix(_pEntry->GetField()); + if ( bCountRemoved ) m_pFunctionCell->RemoveEntry(1); if ( !bCountRemoved && m_pFunctionCell->GetEntryCount() < 2) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
