User: ihi Date: 2006/10/18 06:32:41 Modified: dba/dbaccess/source/ui/tabledesign/TEditControl.cxx
Log: INTEGRATION: CWS dba205b (1.51.30); FILE MERGED 2006/09/04 12:11:06 oj 1.51.30.2: RESYNC: (1.51-1.52); FILE MERGED 2006/08/03 13:05:20 oj 1.51.30.1: #137290# check if pos is listentrynotfound 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.55&r2=1.56 Delta lines: +11 -8 -------------------- --- TEditControl.cxx 12 Oct 2006 13:43:51 -0000 1.55 +++ TEditControl.cxx 18 Oct 2006 13:32:38 -0000 1.56 @@ -721,7 +721,7 @@ { ////////////////////////////////////////////////////////////////////// // Type umstellen - SwitchType(GetView()->getController()->getTypeInfo(pTypeCell->GetSelectEntryPos())); + resetType(); } break; } @@ -825,12 +825,7 @@ else { GetUndoManager()->AddUndoAction(new OTableEditorTypeSelUndoAct(this, GetCurRow(), nColId, GetFieldDescr(GetCurRow())->getTypeInfo())); - USHORT nPos = pTypeCell->GetSelectEntryPos(); - if(nPos != LISTBOX_ENTRY_NOTFOUND) - SwitchType( GetView()->getController()->getTypeInfo(nPos) ); - else - SwitchType(TOTypeInfoSP()); - + resetType(); } SaveData(nRow,nColId); @@ -846,7 +841,15 @@ GetView()->getController()->setModified( sal_True ); InvalidateFeatures(); } - +// ----------------------------------------------------------------------------- +void OTableEditorCtrl::resetType() +{ + USHORT nPos = pTypeCell->GetSelectEntryPos(); + if(nPos != LISTBOX_ENTRY_NOTFOUND) + SwitchType( GetView()->getController()->getTypeInfo(nPos) ); + else + SwitchType(TOTypeInfoSP()); +} //------------------------------------------------------------------------------ void OTableEditorCtrl::CellModified() { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
