Tag: cws_src680_dba20blocker User: fs Date: 05/06/23 06:34:43 Modified: /dba/dbaccess/source/ui/control/ ColumnControlWindow.cxx, FieldDescControl.cxx
Log: copying fix for #i46266# into this CWS File Changes: Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: ColumnControlWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/ColumnControlWindow.cxx?r1=1.3&r2=1.3.134.1 Delta lines: +7 -5 ------------------- --- ColumnControlWindow.cxx 27 Oct 2004 12:56:28 -0000 1.3 +++ ColumnControlWindow.cxx 23 Jun 2005 13:34:40 -0000 1.3.134.1 @@ -2,9 +2,9 @@ * * $RCSfile: ColumnControlWindow.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.134.1 $ * - * last change: $Author: pjunck $ $Date: 2004/10/27 12:56:28 $ + * last change: $Author: fs $ $Date: 2005/06/23 13:34:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,7 +116,7 @@ { case tpFormat: case tpDefault: - case tpAutoIncrement: +// case tpAutoIncrement: case tpColumnName: break; default: @@ -130,7 +130,7 @@ { case tpFormat: case tpDefault: - case tpAutoIncrement: +// case tpAutoIncrement: case tpColumnName: break; default: @@ -207,6 +207,8 @@ Init(); ::dbaui::fillTypeInfo(m_xConnection,m_sTypeNames,m_aDestTypeInfo,m_aDestTypeInfoIndex); + // read autoincrement value set in the datasource + ::dbaui::fillAutoIncrementValue(m_xConnection,m_bAutoIncrementEnabled,m_sAutoIncrementValue); } } // ----------------------------------------------------------------------------- File [changed]: FieldDescControl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/FieldDescControl.cxx?r1=1.38&r2=1.38.78.1 Delta lines: +4 -4 ------------------- --- FieldDescControl.cxx 17 Feb 2005 11:07:04 -0000 1.38 +++ FieldDescControl.cxx 23 Jun 2005 13:34:41 -0000 1.38.78.1 @@ -2,9 +2,9 @@ * * $RCSfile: FieldDescControl.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.38.78.1 $ * - * last change: $Author: vg $ $Date: 2005/02/17 11:07:04 $ + * last change: $Author: fs $ $Date: 2005/06/23 13:34:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -836,7 +836,7 @@ // nur fuer AutoIncrement eine Sonderbehandlung if (pListBox == pAutoIncrement) { - pListBox->SaveValue(); +//#i46266# pListBox->SaveValue(); if(pListBox->GetSelectEntryPos() == 1) { // no DeactivateAggregate( tpAutoIncrementValue ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
