User: ihi Date: 2007-11-20 19:07:51+0000 Modified: dba/reportdesign/source/ui/dlg/GroupsSorting.cxx
Log: INTEGRATION: CWS reportdesign01 (1.5.20); FILE MERGED 2007/10/30 10:57:12 oj 1.5.20.2: #i83122# always fill columns 2007/09/21 12:56:06 oj 1.5.20.1: #i77142# deactivate cell when accept drag File Changes: Directory: /dba/reportdesign/source/ui/dlg/ =========================================== File [changed]: GroupsSorting.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/dlg/GroupsSorting.cxx?r1=1.5&r2=1.6 Delta lines: +9 -0 ------------------- --- GroupsSorting.cxx 2007-08-03 10:00:35+0000 1.5 +++ GroupsSorting.cxx 2007-11-20 19:07:49+0000 1.6 @@ -297,6 +297,13 @@ { DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL); sal_Int8 nAction = DND_ACTION_NONE; + if ( IsEditing() ) + { + USHORT nPos = m_pComboCell->GetSelectEntryPos(); + if ( COMBOBOX_ENTRY_NOTFOUND != nPos || m_pComboCell->GetText().Len() ) + SaveModified(); + DeactivateCell(); + } if ( IsDropFormatSupported( OGroupExchange::getReportGroupId() ) && m_pParent->getGroups()->getCount() > 1 && rEvt.GetWindow() == &GetDataWindow() ) { nAction = DND_ACTION_MOVE; @@ -1173,6 +1180,8 @@ sal_Int32 nDataType = sdbc::DataType::VARCHAR; try { + if ( !m_xColumns.is() ) + fillColumns(); if ( m_xColumns.is() && m_xColumns->hasByName(_sColumnName) ) { uno::Reference< beans::XPropertySet> xColumn(m_xColumns->getByName(_sColumnName),uno::UNO_QUERY); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
