User: obo Date: 06/01/16 07:30:43 Modified: /dba/dbaccess/source/ui/tabledesign/ TEditControl.cxx
Log: INTEGRATION: CWS dba202b (1.44.42); FILE MERGED 2005/12/12 09:25:37 oj 1.44.42.2: #122561# check if we have a type info 2005/11/28 11:08:23 oj 1.44.42.1: #128264# check row field desc 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.45&r2=1.46 Delta lines: +5 -4 ------------------- --- TEditControl.cxx 21 Dec 2005 13:37:17 -0000 1.45 +++ TEditControl.cxx 16 Jan 2006 15:30:40 -0000 1.46 @@ -496,7 +496,7 @@ break; case FIELD_TYPE: { - if( pActFieldDescr ) + if ( pActFieldDescr && pActFieldDescr->getTypeInfo() ) aInitString = pActFieldDescr->getTypeInfo()->aUIName; ////////////////////////////////////////////////////////////// @@ -890,7 +890,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); @@ -964,12 +964,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++; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
