User: hr Date: 05/09/23 05:22:57 Modified: /dba/dbaccess/source/ui/control/ FieldDescControl.cxx
Log: INTEGRATION: CWS dba201b (1.38.58); FILE MERGED 2005/09/21 08:01:00 oj 1.38.58.5: RESYNC: (1.39-1.40); FILE MERGED 2005/08/12 11:20:41 oj 1.38.58.4: #i48851# set default value to empty when string is zero 2005/07/11 13:37:15 fs 1.38.58.3: merging CWS dba201 into CWS dba201b 2005/07/11 07:21:49 oj 1.38.58.2: RESYNC: (1.38-1.39); FILE MERGED 2005/07/05 13:35:47 oj 1.38.58.1: #i48851# store default for bool as string 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.40&r2=1.41 Delta lines: +19 -7 -------------------- --- FieldDescControl.cxx 8 Sep 2005 14:31:50 -0000 1.40 +++ FieldDescControl.cxx 23 Sep 2005 12:22:54 -0000 1.41 @@ -239,6 +239,7 @@ ,m_pActFocusWindow(NULL) ,m_bRight(sal_False) ,m_nWidth(50) + ,m_bAdded(sal_False) { DBG_CTOR(OFieldDescControl,NULL); @@ -299,6 +300,7 @@ ,m_pActFocusWindow(NULL) ,m_bRight(sal_False) ,m_nWidth(50) + ,m_bAdded(sal_False) { DBG_CTOR(OFieldDescControl,NULL); @@ -334,6 +336,8 @@ ::std::auto_ptr<Window> aTemp(m_pHorzScroll); m_pHorzScroll = NULL; } + if ( m_bAdded ) + ::dbaui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); pLastFocusWindow = NULL; ////////////////////////////////////////////////////////////////////// @@ -453,7 +457,7 @@ nLastVisible = static_cast<sal_uInt16>((szOverallSize.Height() - CONTROL_SPACING_Y - nHScrollHeight) / (CONTROL_SPACING_Y + CONTROL_HEIGHT)); else nLastVisible = static_cast<sal_uInt16>((szOverallSize.Height() - CONTROL_SPACING_Y) / (CONTROL_SPACING_Y + CONTROL_HEIGHT)); - bNeedVScrollBar = nActive > nLastVisible; + bNeedVScrollBar = nActive>nLastVisible; if (bNeedVScrollBar) { @@ -843,8 +847,6 @@ { TOTypeInfoSP pTypeInfo = getTypeInfo(m_pType->GetSelectEntryPos()); pActFieldDescr->FillFromTypeInfo(pTypeInfo,sal_True,sal_False); // SetType(pTypeInfo); - if ( pTypeInfo.get() ) - pActFieldDescr->SetTypeName(pTypeInfo->getDBName()); DisplayData(pActFieldDescr); CellModified(-1, m_pType->GetPos()); @@ -1503,11 +1505,19 @@ ////////////////////////////////////////////////////////////////////// // Zeiger des gespeicherten Focus zuruecksetzen pLastFocusWindow = NULL; + if ( m_bAdded ) + { ::dbaui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); + m_bAdded = sal_False; + } return; } + if ( !m_bAdded ) + { ::dbaui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::AddWindow)); + m_bAdded = sal_True; + } TOTypeInfoSP pFieldType; if( pFieldDescr ) @@ -1938,7 +1948,7 @@ sal_uInt32 nFormatKey; try { - if ( isTextFormat(pFieldDescr,nFormatKey) ) + if ( isTextFormat(pFieldDescr,nFormatKey) || pBoolDefault ) { pFieldDescr->SetControlDefault(makeAny(sDefault)); } @@ -1962,7 +1972,9 @@ catch(const Exception&) { } - } + } // if ( sDefault.getLength() ) + else + pFieldDescr->SetControlDefault(Any()); if((pRequired && pRequired->GetSelectEntryPos() == 0) || pFieldDescr->IsPrimaryKey() || (pBoolDefault && pBoolDefault->GetEntryCount() == 2)) // yes pFieldDescr->SetIsNullable( ColumnValue::NO_NULLS ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
