User: hr Date: 2007-08-02 14:36:32+0000 Modified: dba/reportdesign/source/ui/dlg/GroupsSorting.cxx
Log: INTEGRATION: CWS rpt23fix01 (1.2.2); FILE MERGED 2007/07/11 09:21:58 oj 1.2.2.1: #i77715# check for own window 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.3&r2=1.4 Delta lines: +16 -11 --------------------- --- GroupsSorting.cxx 2007-07-12 13:51:08+0000 1.3 +++ GroupsSorting.cxx 2007-08-02 14:36:30+0000 1.4 @@ -260,9 +260,9 @@ if ( m_aGroupPositions[nIndex] != NO_GROUP ) { uno::Reference< report::XGroup> xOrgGroup(xGroups->getByIndex(m_aGroupPositions[nIndex]),uno::UNO_QUERY); - uno::Reference< report::XGroup> xCopy = xGroups->createGroup(); - ::comphelper::copyProperties(xOrgGroup.get(),xCopy.get()); - vClipboardList.push_back( uno::makeAny(xCopy) ); + /*uno::Reference< report::XGroup> xCopy = xGroups->createGroup(); + ::comphelper::copyProperties(xOrgGroup.get(),xCopy.get());*/ + vClipboardList.push_back( uno::makeAny(xOrgGroup) ); } } catch(uno::Exception&) @@ -292,11 +292,11 @@ } } //------------------------------------------------------------------------------ -sal_Int8 OFieldExpressionControl::AcceptDrop( const BrowserAcceptDropEvent& /*rEvt*/ ) +sal_Int8 OFieldExpressionControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) { DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL); sal_Int8 nAction = DND_ACTION_NONE; - if ( IsDropFormatSupported( OGroupExchange::getReportGroupId() ) && m_pParent->getGroups()->getCount() > 1 ) + if ( IsDropFormatSupported( OGroupExchange::getReportGroupId() ) && m_pParent->getGroups()->getCount() > 1 && rEvt.GetWindow() == &GetDataWindow() ) { nAction = DND_ACTION_MOVE; } @@ -508,10 +508,15 @@ if ( xGroup.is() ) { USHORT nPos = m_pComboCell->GetSelectEntryPos(); + ::rtl::OUString sExpression; if ( COMBOBOX_ENTRY_NOTFOUND == nPos ) - xGroup->setExpression( m_pComboCell->GetText() ); + sExpression = m_pComboCell->GetText(); else - xGroup->setExpression( m_pComboCell->GetEntry(nPos) ); + { + sExpression = m_pComboCell->GetEntry(nPos); + } + xGroup->setExpression( sExpression ); + ::rptui::adjustSectionName(xGroup,nPos); if ( bAppend ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
