Tag: cws_src680_dba205b User: oj Date: 2006/08/03 06:05:23 Modified: dba/dbaccess/source/ui/tabledesign/TEditControl.cxx dba/dbaccess/source/ui/tabledesign/TEditControl.hxx
Log: #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.51&r2=1.51.30.1 Delta lines: +14 -11 --------------------- --- TEditControl.cxx 20 Jun 2006 03:32:09 -0000 1.51 +++ TEditControl.cxx 3 Aug 2006 13:05:20 -0000 1.51.30.1 @@ -4,9 +4,9 @@ * * $RCSfile: TEditControl.cxx,v $ * - * $Revision: 1.51 $ + * $Revision: 1.51.30.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:32:09 $ + * last change: $Author: oj $ $Date: 2006/08/03 13:05:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -714,7 +714,7 @@ { ////////////////////////////////////////////////////////////////////// // Type umstellen - SwitchType(GetView()->getController()->getTypeInfo(pTypeCell->GetSelectEntryPos())); + resetType(); } break; } @@ -818,12 +818,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); @@ -839,7 +834,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() { File [changed]: TEditControl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TEditControl.hxx?r1=1.18.34.1&r2=1.18.34.2 Delta lines: +4 -2 ------------------- --- TEditControl.hxx 3 Aug 2006 09:30:03 -0000 1.18.34.1 +++ TEditControl.hxx 3 Aug 2006 13:05:21 -0000 1.18.34.2 @@ -4,9 +4,9 @@ * * $RCSfile: TEditControl.hxx,v $ * - * $Revision: 1.18.34.1 $ + * $Revision: 1.18.34.2 $ * - * last change: $Author: oj $ $Date: 2006/08/03 09:30:03 $ + * last change: $Author: oj $ $Date: 2006/08/03 13:05:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -232,6 +232,8 @@ /** InvalidateFeatures invalidates the slots SID_UNDO | SID_REDO | SID_SAVEDOC */ void InvalidateFeatures(); + + void resetType(); }; } #endif // DBAUI_TABLEEDITORCONTROL_HXX --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
