Tag: cws_src680_dba201 User: fs Date: 05/07/11 01:48:33 Modified: /dba/dbaccess/source/ui/control/ FieldDescControl.cxx
Log: RESYNC: (1.38-1.39); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: FieldDescControl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/FieldDescControl.cxx?r1=1.38.42.2&r2=1.38.42.3 Delta lines: +30 -22 --------------------- --- FieldDescControl.cxx 25 Apr 2005 12:41:35 -0000 1.38.42.2 +++ FieldDescControl.cxx 11 Jul 2005 08:48:30 -0000 1.38.42.3 @@ -811,9 +811,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 @@ -840,7 +841,6 @@ // nur fuer AutoIncrement eine Sonderbehandlung if (pListBox == pAutoIncrement) { -//#i46266# pListBox->SaveValue(); if(pListBox->GetSelectEntryPos() == 1) { // no DeactivateAggregate( tpAutoIncrementValue ); @@ -871,7 +871,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() ) @@ -900,6 +899,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 }, @@ -908,7 +908,6 @@ { pDefault, pDefaultText, 3 }, { pFormatSample, pFormatText, 4 }, { pBoolDefault, pBoolDefaultText, 1 }, - { m_pAutoIncrementValue, m_pAutoIncrementValueText, 3 }, }; long nMaxWidth = 0; @@ -1091,7 +1090,7 @@ m_pTypeText->SetText( ModuleRes(STR_TAB_FIELD_DATATYPE) ); m_pType = new OPropListBoxCtrl( this, STR_HELP_AUTOINCREMENT, FIELD_PRPOERTY_TYPE, WB_DROPDOWN ); m_pType->SetHelpId(HID_TAB_ENT_TYPE); - m_pType->SetDropDownLineCount(5); + m_pType->SetDropDownLineCount(20); { const OTypeInfoMap* pTypeInfo = getTypeInfo(); OTypeInfoMap::const_iterator aIter = pTypeInfo->begin(); @@ -1717,6 +1716,7 @@ if ( pFieldDescr->IsAutoIncrement() ) { pAutoIncrement->SelectEntryPos( 0 ); // yes + ActivateAggregate( tpAutoIncrementValue ); if ( m_pAutoIncrementValue ) m_pAutoIncrementValue->SetText(pFieldDescr->GetAutoIncrementValue()); DeactivateAggregate( tpRequired ); @@ -1851,27 +1851,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]
