Tag: cws_src680_os63 User: os Date: 06/02/08 09:50:56 Modified: /dba/dbaccess/source/ui/tabledesign/ TEditControl.cxx
Log: RESYNC: (1.44-1.46); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TEditControl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TEditControl.cxx?r1=1.42.52.3&r2=1.42.52.4 Delta lines: +6 -5 ------------------- --- TEditControl.cxx 16 Nov 2005 10:44:46 -0000 1.42.52.3 +++ TEditControl.cxx 8 Feb 2006 17:50:53 -0000 1.42.52.4 @@ -495,7 +495,7 @@ break; case FIELD_TYPE: { - if( pActFieldDescr ) + if ( pActFieldDescr && pActFieldDescr->getTypeInfo() ) aInitString = pActFieldDescr->getTypeInfo()->aUIName; ////////////////////////////////////////////////////////////// @@ -889,7 +889,7 @@ { pRow = (*m_pRowList)[nIndex]; OSL_ENSURE(pRow,"OTableEditorCtrl::CopyRows: Row is NULL!"); - if ( pRow ) + if ( pRow && pRow->GetActFieldDescr() ) { pClipboardRow = new OTableRow( *pRow ); vClipboardList.push_back( pClipboardRow); @@ -963,12 +963,13 @@ (*aStreamRef) >> *pRow; pRow->SetReadOnly( sal_False ); sal_Int32 nType = pRow->GetActFieldDescr()->GetType(); + if ( pRow->GetActFieldDescr() ) pRow->GetActFieldDescr()->SetType(GetView()->getController()->getTypeInfoByType(nType)); ////////////////////////////////////////////////////////////////////// // Anpassen des Feldnamens aFieldName = GenerateName( pRow->GetActFieldDescr()->GetName() ); pRow->GetActFieldDescr()->SetName( aFieldName ); - + pRow->SetPos(nInsertRow); m_pRowList->insert( m_pRowList->begin()+nInsertRow,pRow ); vInsertedUndoRedoRows.push_back(new OTableRow(*pRow)); nInsertRow++; @@ -1600,7 +1601,7 @@ if ( HANDLE_ID != nColId ) { - if ( nRow < 0 ) + if ( nRow < 0 && nColId != BROWSER_INVALIDID ) { // hit the header if ( 3 != nColId ) { // 3 would mean the last column, and this last column is auto-sized --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
