diff options
Diffstat (limited to 'sc/source/ui/docshell/dbdocfun.cxx')
-rw-r--r-- | sc/source/ui/docshell/dbdocfun.cxx | 161 |
1 files changed, 18 insertions, 143 deletions
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 94578f2e957f..187621dc2b26 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -47,6 +47,7 @@ #include "queryentry.hxx" #include "markdata.hxx" #include "progress.hxx" +#include <undosort.hxx> #include <set> #include <memory> @@ -430,8 +431,6 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, ScDocument& rDoc = rDocShell.GetDocument(); if (bRecord && !rDoc.IsUndoEnabled()) bRecord = false; - SCTAB nSrcTab = nTab; - ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer(); ScDBData* pDBData = rDoc.GetDBAtArea( nTab, rSortParam.nCol1, rSortParam.nRow1, rSortParam.nCol2, rSortParam.nRow2 ); @@ -441,28 +440,25 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, return false; } - ScDBData* pDestData = NULL; - ScRange aOldDest; bool bCopy = !rSortParam.bInplace; if ( bCopy && rSortParam.nDestCol == rSortParam.nCol1 && rSortParam.nDestRow == rSortParam.nRow1 && rSortParam.nDestTab == nTab ) bCopy = false; + ScSortParam aLocalParam( rSortParam ); if ( bCopy ) { - aLocalParam.MoveToDest(); - if ( !ValidColRow( aLocalParam.nCol2, aLocalParam.nRow2 ) ) - { - if (!bApi) - rDocShell.ErrorMessage(STR_PASTE_FULL); + // Copy the data range to the destination then move the sort range to it. + ScRange aSrcRange(rSortParam.nCol1, rSortParam.nRow1, nTab, rSortParam.nCol2, rSortParam.nRow2, nTab); + ScAddress aDestPos(rSortParam.nDestCol,rSortParam.nDestRow,rSortParam.nDestTab); + + ScDocFunc& rDocFunc = rDocShell.GetDocFunc(); + bool bRet = rDocFunc.MoveBlock(aSrcRange, aDestPos, false, bRecord, bPaint, bApi); + + if (!bRet) return false; - } - nTab = rSortParam.nDestTab; - pDestData = rDoc.GetDBAtCursor( rSortParam.nDestCol, rSortParam.nDestRow, - rSortParam.nDestTab, true ); - if (pDestData) - pDestData->GetArea(aOldDest); + aLocalParam.MoveToDest(); } ScEditableTester aTester( &rDoc, nTab, aLocalParam.nCol1,aLocalParam.nRow1, @@ -511,133 +507,23 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, if ( aQueryParam.GetEntry(0).bDoQuery ) bRepeatQuery = true; - if (bRepeatQuery && bCopy) - { - if ( aQueryParam.bInplace || - aQueryParam.nDestCol != rSortParam.nDestCol || - aQueryParam.nDestRow != rSortParam.nDestRow || - aQueryParam.nDestTab != rSortParam.nDestTab ) // Query auf selben Zielbereich? - bRepeatQuery = false; - } - - ScUndoSort* pUndoAction = 0; - if ( bRecord ) - { - // Referenzen ausserhalb des Bereichs werden nicht veraendert ! - - ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); - // Zeilenhoehen immer (wegen automatischer Anpassung) - //! auf ScBlockUndo umstellen - pUndoDoc->InitUndo( &rDoc, nTab, nTab, false, true ); - - /* #i59745# Do not copy note captions to undo document. All existing - caption objects will be repositioned while sorting which is tracked - in drawing undo. When undo is executed, the old positions will be - restored, and the cells with the old notes (which still refer to the - existing captions) will be copied back into the source document. */ - rDoc.CopyToDocument( aLocalParam.nCol1, aLocalParam.nRow1, nTab, - aLocalParam.nCol2, aLocalParam.nRow2, nTab, - IDF_ALL|IDF_NOCAPTIONS, false, pUndoDoc ); - - const ScRange* pR = 0; - if (pDestData) - { - /* #i59745# Do not copy note captions from destination range to - undo document. All existing caption objects will be removed - which is tracked in drawing undo. When undo is executed, the - caption objects are reinserted with drawing undo, and the cells - with the old notes (which still refer to the existing captions) - will be copied back into the source document. */ - rDoc.CopyToDocument( aOldDest, IDF_ALL|IDF_NOCAPTIONS, false, pUndoDoc ); - pR = &aOldDest; - } - - // Zeilenhoehen immer (wegen automatischer Anpassung) - //! auf ScBlockUndo umstellen -// if (bRepeatQuery) - rDoc.CopyToDocument( 0, aLocalParam.nRow1, nTab, MAXCOL, aLocalParam.nRow2, nTab, - IDF_NONE, false, pUndoDoc ); - - ScDBCollection* pUndoDB = NULL; - ScDBCollection* pDocDB = rDoc.GetDBCollection(); - if (!pDocDB->empty()) - pUndoDB = new ScDBCollection( *pDocDB ); - - pUndoAction = new ScUndoSort( &rDocShell, nTab, rSortParam, pUndoDoc, pUndoDB, pR ); - rDocShell.GetUndoManager()->AddUndoAction( pUndoAction ); - - // #i59745# collect all drawing undo actions affecting cell note captions - if( pDrawLayer ) - pDrawLayer->BeginCalcUndo(false); - } - - if ( bCopy ) - { - if (pDestData) - rDoc.DeleteAreaTab(aOldDest, IDF_CONTENTS); // Zielbereich vorher loeschen - - ScRange aSource( rSortParam.nCol1,rSortParam.nRow1,nSrcTab, - rSortParam.nCol2,rSortParam.nRow2,nSrcTab ); - ScAddress aDest( rSortParam.nDestCol, rSortParam.nDestRow, rSortParam.nDestTab ); - - rDocShell.GetDocFunc().MoveBlock( aSource, aDest, false, false, false, true ); - } + sc::ReorderParam aUndoParam; // don't call ScDocument::Sort with an empty SortParam (may be empty here if bCopy is set) if (aLocalParam.GetSortKeyCount() && aLocalParam.maKeyState[0].bDoSort) { ScProgress aProgress(&rDocShell, ScGlobal::GetRscString(STR_PROGRESS_SORTING), 0); - rDoc.Sort( nTab, aLocalParam, bRepeatQuery, &aProgress ); + rDoc.Sort(nTab, aLocalParam, bRepeatQuery, &aProgress, &aUndoParam); } - bool bSave = true; - if (bCopy) - { - ScSortParam aOldSortParam; - pDBData->GetSortParam( aOldSortParam ); - if (aOldSortParam.GetSortKeyCount() && - aOldSortParam.maKeyState[0].bDoSort && aOldSortParam.bInplace) - { - bSave = false; - aOldSortParam.nDestCol = rSortParam.nDestCol; - aOldSortParam.nDestRow = rSortParam.nDestRow; - aOldSortParam.nDestTab = rSortParam.nDestTab; - pDBData->SetSortParam( aOldSortParam ); // dann nur DestPos merken - } - } - if (bSave) // Parameter merken + if (bRecord) { - pDBData->SetSortParam( rSortParam ); - pDBData->SetHeader( rSortParam.bHasHeader ); //! ??? - pDBData->SetByRow( rSortParam.bByRow ); //! ??? + // Set up an undo object. + sc::UndoSort* pUndoAction = new sc::UndoSort(&rDocShell, aUndoParam); + rDocShell.GetUndoManager()->AddUndoAction(pUndoAction); } - if (bCopy) // neuen DB-Bereich merken - { - // Tabelle umschalten von aussen (View) - //! SetCursor ??!?! - - ScRange aDestPos( aLocalParam.nCol1, aLocalParam.nRow1, nTab, - aLocalParam.nCol2, aLocalParam.nRow2, nTab ); - ScDBData* pNewData; - if (pDestData) - pNewData = pDestData; // Bereich vorhanden -> anpassen - else // Bereich ab Cursor/Markierung wird angelegt - pNewData = rDocShell.GetDBData(aDestPos, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); - if (pNewData) - { - pNewData->SetArea( nTab, - aLocalParam.nCol1,aLocalParam.nRow1, - aLocalParam.nCol2,aLocalParam.nRow2 ); - pNewData->SetSortParam( aLocalParam ); - pNewData->SetHeader( aLocalParam.bHasHeader ); //! ??? - pNewData->SetByRow( aLocalParam.bByRow ); - } - else - { - OSL_FAIL("Zielbereich nicht da"); - } - } + pDBData->SetSortParam(rSortParam); ScRange aDirtyRange( aLocalParam.nCol1, nStartRow, nTab, @@ -657,23 +543,12 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, nStartX = 0; nEndX = MAXCOL; } - if (pDestData) - { - if ( nEndX < aOldDest.aEnd.Col() ) - nEndX = aOldDest.aEnd.Col(); - if ( nEndY < aOldDest.aEnd.Row() ) - nEndY = aOldDest.aEnd.Row(); - } rDocShell.PostPaint(ScRange(nStartX, nStartY, nTab, nEndX, nEndY, nTab), nPaint); } if (!bUniformRowHeight) rDocShell.AdjustRowHeight(nStartRow, aLocalParam.nRow2, nTab); - // #i59745# set collected drawing undo actions at sorting undo action - if( pUndoAction && pDrawLayer ) - pUndoAction->SetDrawUndoAction( pDrawLayer->GetCalcUndo() ); - aModificator.SetDocumentModified(); return true; |