Tag: cws_src680_execshellmacrogone User: rene Date: 2007-10-24 08:34:00+0000 Removed: dba/reportdesign/util/description.xml dba/reportdesign/util/THIRDPARTYREADMELICENSE.html dba/reportdesign/util/license_en_US.txt dba/reportdesign/util/license_de.txt dba/reportdesign/source/ui/misc/reportformula.cxx dba/reportdesign/source/ui/inc/reportformula.hxx
Modified: dba/reportdesign/java/com/sun/star/report/pentaho/makefile.mk dba/reportdesign/source/ui/dlg/GroupsSorting.cxx Log: RESYNC: (1.2-1.3); FILE MERGED File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/ ============================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/makefile.mk?r1=1.2.10.1&r2=1.2.10.2 Delta lines: +4 -4 ------------------- --- makefile.mk 2007-10-24 06:35:43+0000 1.2.10.1 +++ makefile.mk 2007-10-24 08:33:18+0000 1.2.10.2 @@ -35,7 +35,7 @@ PRJ = ..$/..$/..$/..$/..$/.. PRJNAME = reportdesign -TARGET = $(PRJNAME) +TARGET = sun-report-builder PACKAGE = com$/sun$/star$/report$/pentaho # we have circular dependencies nodep=true Directory: /dba/reportdesign/util/ ================================== File [removed]: description.xml Directory: /dba/reportdesign/util/ ================================== File [removed]: THIRDPARTYREADMELICENSE.html Directory: /dba/reportdesign/util/ ================================== File [removed]: license_en_US.txt Directory: /dba/reportdesign/util/ ================================== File [removed]: license_de.txt Directory: /dba/reportdesign/source/ui/misc/ ============================================ File [removed]: reportformula.cxx Directory: /dba/reportdesign/source/ui/inc/ =========================================== File [removed]: reportformula.hxx 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.2.4.1&r2=1.2.4.2 Delta lines: +85 -74 --------------------- --- GroupsSorting.cxx 2007-10-24 06:35:43+0000 1.2.4.1 +++ GroupsSorting.cxx 2007-10-24 08:33:45+0000 1.2.4.2 @@ -85,6 +85,7 @@ #ifndef RPTUI_TOOLS_HXX #include "UITools.hxx" #endif +#include "UndoActions.hxx" #ifndef REPORTDESIGN_SHARED_UISTRINGS_HRC #include "uistrings.hrc" #endif @@ -260,9 +261,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 +293,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; } @@ -330,9 +331,10 @@ if ( _aGroups.getLength() ) { m_bIgnoreEvent = true; + { sal_Int32 nRow = _nRow; - String sUndoAction(String(ModuleRes(RID_STR_UNDO_MOVE_GROUP))); - m_pParent->m_pController->getUndoMgr()->EnterListAction( sUndoAction, String() ); + String sUndoAction(ModuleRes(RID_STR_UNDO_MOVE_GROUP)); + UndoManagerListAction aListAction(*m_pParent->m_pController->getUndoMgr(),sUndoAction); uno::Reference< report::XGroups> xGroups = m_pParent->getGroups(); const uno::Any* pIter = _aGroups.getConstArray(); @@ -358,7 +360,7 @@ ++nRow; } } // for(;pIter != pEnd;++pIter) - m_pParent->m_pController->getUndoMgr()->LeaveListAction(); + } m_bIgnoreEvent = false; Invalidate(); } // if ( _aGroups.getLength() ) @@ -475,7 +477,7 @@ if ( m_aGroupPositions[nRow] == NO_GROUP ) { bAppend = sal_True; - String sUndoAction(String(ModuleRes(RID_STR_UNDO_APPEND_GROUP))); + String sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP)); m_pParent->m_pController->getUndoMgr()->EnterListAction( sUndoAction, String() ); xGroup = m_pParent->getGroups()->createGroup(); xGroup->setHeaderOn(sal_True); @@ -508,10 +510,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 ) @@ -819,7 +826,7 @@ if ( bFirstTime ) { bFirstTime = false; - String sUndoAction(String(ModuleRes(RID_STR_UNDO_REMOVE_SELECTION))); + String sUndoAction(ModuleRes(RID_STR_UNDO_REMOVE_SELECTION)); m_pParent->m_pController->getUndoMgr()->EnterListAction( sUndoAction, String() ); } @@ -925,8 +932,9 @@ if( (aTransferData.GetAny(aFlavor) >>= aGroups) && aGroups.getLength() ) { m_bIgnoreEvent = false; - String sUndoAction(String(ModuleRes(RID_STR_UNDO_APPEND_GROUP))); - m_pParent->m_pController->getUndoMgr()->EnterListAction( sUndoAction, String() ); + { + String sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP)); + UndoManagerListAction aListAction(*m_pParent->m_pController->getUndoMgr(),sUndoAction); uno::Reference<report::XGroups> xGroups = m_pParent->getGroups(); sal_Int32 nGroupPos = 0; @@ -958,7 +966,7 @@ if ( *aInsertPos != NO_GROUP ) ++*aInsertPos; } - m_pParent->m_pController->getUndoMgr()->LeaveListAction(); + } m_bIgnoreEvent = true; } } @@ -1143,7 +1151,7 @@ xGroup->setKeepTogether( m_aKeepTogetherLst.GetSelectEntryPos() ); if ( m_aGroupOnLst.GetSavedValue() != m_aGroupOnLst.GetSelectEntryPos() ) { - sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<long>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos()))); + sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_IntPtr>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos()))); xGroup->setGroupOn( nGroupOn ); } if ( m_aGroupIntervalEd.GetSavedValue().ToInt32() != m_aGroupIntervalEd.GetValue() ) @@ -1256,6 +1264,8 @@ { if ( pListBox && pListBox->GetSavedValue() != pListBox->GetSelectEntryPos() ) SaveData(nRow); + if ( pListBox == &m_aGroupOnLst ) + m_aGroupIntervalEd.Enable( pListBox->GetSelectEntryPos() != 0 ); } else if ( nGroupPos != NO_GROUP ) { @@ -1377,6 +1387,7 @@ m_aGroupOnLst.SelectEntryPos(nPos); m_aGroupIntervalEd.SetText(String::CreateFromInt32(_xGroup->getGroupInterval())); m_aGroupIntervalEd.SaveValue(); + m_aGroupIntervalEd.Enable( nPos != 0 ); m_aKeepTogetherLst.SelectEntryPos(_xGroup->getKeepTogether()); m_aOrderLst.SelectEntryPos(_xGroup->getSortAscending() ? 0 : 1); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
