Tag: cws_src680_dba20blocker User: fs Date: 05/06/24 02:13:42 Modified: /dba/dbaccess/source/ui/control/ ColumnControlWindow.cxx, FieldDescControl.cxx
Log: #i46266# 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.134.2&r2=1.3.134.3 Delta lines: +6 -4 ------------------- --- ColumnControlWindow.cxx 23 Jun 2005 13:56:20 -0000 1.3.134.2 +++ ColumnControlWindow.cxx 24 Jun 2005 09:13:39 -0000 1.3.134.3 @@ -2,9 +2,9 @@ * * $RCSfile: ColumnControlWindow.cxx,v $ * - * $Revision: 1.3.134.2 $ + * $Revision: 1.3.134.3 $ * - * last change: $Author: fs $ $Date: 2005/06/23 13:56:20 $ + * last change: $Author: fs $ $Date: 2005/06/24 09:13:39 $ * * 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.78.2&r2=1.38.78.3 Delta lines: +27 -20 --------------------- --- FieldDescControl.cxx 23 Jun 2005 13:56:20 -0000 1.38.78.2 +++ FieldDescControl.cxx 24 Jun 2005 09:13:39 -0000 1.38.78.3 @@ -2,9 +2,9 @@ * * $RCSfile: FieldDescControl.cxx,v $ * - * $Revision: 1.38.78.2 $ + * $Revision: 1.38.78.3 $ * - * last change: $Author: fs $ $Date: 2005/06/23 13:56:20 $ + * last change: $Author: fs $ $Date: 2005/06/24 09:13:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -807,9 +807,10 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox *, pListBox ) { DBG_CHKTHIS(OFieldDescControl,NULL); - if(pListBox->GetSavedValue() == pListBox->GetSelectEntryPos() || !pActFieldDescr) + if ( !pActFieldDescr ) return 0; + if ( pListBox->GetSavedValue() != pListBox->GetSelectEntryPos() ) SetModified(sal_True); // Sonderbehandlund f"ur Bool Felder @@ -836,7 +837,6 @@ // nur fuer AutoIncrement eine Sonderbehandlung if (pListBox == pAutoIncrement) { - pListBox->SaveValue(); if(pListBox->GetSelectEntryPos() == 1) { // no DeactivateAggregate( tpAutoIncrementValue ); @@ -867,7 +867,6 @@ if(pListBox == m_pType) { - pListBox->SaveValue(); TOTypeInfoSP pTypeInfo = getTypeInfo(m_pType->GetSelectEntryPos()); pActFieldDescr->FillFromTypeInfo(pTypeInfo,sal_True,sal_False); // SetType(pTypeInfo); if ( pTypeInfo.get() ) @@ -896,6 +895,7 @@ { m_pColumnName, m_pColumnNameText, 1}, { m_pType, m_pTypeText, 1}, { pAutoIncrement, pAutoIncrementText, 1 }, + { m_pAutoIncrementValue, m_pAutoIncrementValueText, 3 }, { pNumType, pNumTypeText, 1 }, { pRequired, pRequiredText, 1 }, { pTextLen, pTextLenText, 1 }, @@ -904,7 +904,6 @@ { pDefault, pDefaultText, 3 }, { pFormatSample, pFormatText, 4 }, { pBoolDefault, pBoolDefaultText, 1 }, - { m_pAutoIncrementValue, m_pAutoIncrementValueText, 3 }, }; long nMaxWidth = 0; @@ -1839,27 +1838,35 @@ IMPL_LINK(OFieldDescControl, OnControlFocusGot, Control*, pControl ) { String strHelpText; - if ((pControl == pLength) || (pControl == pScale) || (pControl == pTextLen)) + OPropNumericEditCtrl* pNumeric = dynamic_cast< OPropNumericEditCtrl* >( pControl ); + if ( pNumeric ) { - ((OPropNumericEditCtrl*)pControl)->SaveValue(); - strHelpText =((OPropNumericEditCtrl*)pControl)->GetHelp(); + pNumeric->SaveValue(); + strHelpText = pNumeric->GetHelp(); } - if(pControl == m_pColumnName) + + OPropColumnEditCtrl* pColumn = dynamic_cast< OPropColumnEditCtrl* >( pControl ); + if ( pColumn ) { - ((OPropColumnEditCtrl*)pControl)->SaveValue(); - strHelpText =((OPropColumnEditCtrl*)pControl)->GetHelp(); + pColumn->SaveValue(); + strHelpText = pColumn->GetHelp(); } - else if ((pControl == pDefault) || (pControl == pFormatSample) || (pControl == m_pAutoIncrementValue) ) + + OPropEditCtrl* pEdit = dynamic_cast< OPropEditCtrl* >( pControl ); + if ( pEdit ) { - ((OPropEditCtrl*)pControl)->SaveValue(); - strHelpText =((OPropEditCtrl*)pControl)->GetHelp(); + pEdit->SaveValue(); + strHelpText = pEdit->GetHelp(); } - else if ((pControl == pRequired) || (pControl == pNumType) || (pControl == pAutoIncrement) || (pControl == pBoolDefault) || (pControl == m_pType)) + + OPropListBoxCtrl* pListBox = dynamic_cast< OPropListBoxCtrl* >( pControl ); + if ( pListBox ) { - ((OPropListBoxCtrl*)pControl)->SaveValue(); - strHelpText =((OPropListBoxCtrl*)pControl)->GetHelp(); + pListBox->SaveValue(); + strHelpText = pListBox->GetHelp(); } - else if (pControl == pFormat) + + if (pControl == pFormat) strHelpText =String(ModuleRes(STR_HELP_FORMAT_BUTTON)); if (strHelpText.Len() && (pHelp != NULL)) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
