diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2009-09-30 00:18:39 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2009-09-30 00:18:39 -0400 |
| commit | c363eab53e44378091b4bb7ab653d1eb074d0094 (patch) | |
| tree | d8e286a48ed97f06cd597e7ede326900e64ad463 /sc/source/ui/undo/undoblk.cxx | |
| parent | ddf9f3eea0511c5971f88c9b4eb08a63a8a8d7fd (diff) | |
| parent | c4c825af22a19fa4aeb17c86df03256a081cb83a (diff) | |
rebased to DEV300_m60.
Diffstat (limited to 'sc/source/ui/undo/undoblk.cxx')
| -rw-r--r-- | sc/source/ui/undo/undoblk.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index e44f5e7a6478..8cc45d41a2e6 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -64,6 +64,7 @@ #include "transobj.hxx" #include "refundo.hxx" #include "undoolk.hxx" +#include "clipparam.hxx" #include "sc.hrc" @@ -441,7 +442,7 @@ void ScUndoDeleteCells::DoChange( const BOOL bUndo ) for( i=0; i<nCount && bUndo; i++ ) { pRefUndoDoc->CopyToDocument( aEffRange.aStart.Col(), aEffRange.aStart.Row(), pTabs[i], aEffRange.aEnd.Col(), aEffRange.aEnd.Row(), pTabs[i]+pScenarios[i], - IDF_ALL, FALSE, pDoc ); + IDF_ALL | IDF_NOCAPTIONS, FALSE, pDoc ); } ScRange aWorkRange( aEffRange ); @@ -1316,9 +1317,8 @@ void __EXPORT ScUndoDragDrop::Redo() aSourceMark.SelectTable( nTab, TRUE ); // do not clone objects and note captions into clipdoc (see above) - pDoc->CopyToClip( aSrcRange.aStart.Col(), aSrcRange.aStart.Row(), - aSrcRange.aEnd.Col(), aSrcRange.aEnd.Row(), - bCut, pClipDoc, FALSE, &aSourceMark, bKeepScenarioFlags, FALSE, FALSE ); + ScClipParam aClipParam(aSrcRange, bCut); + pDoc->CopyToClip(aClipParam, pClipDoc, &aSourceMark, false, bKeepScenarioFlags, false, false); if (bCut) { @@ -1729,8 +1729,8 @@ void __EXPORT ScUndoEnterMatrix::Undo() ScDocument* pDoc = pDocShell->GetDocument(); - pDoc->DeleteAreaTab( aBlockRange, IDF_ALL ); - pUndoDoc->CopyToDocument( aBlockRange, IDF_ALL, FALSE, pDoc ); + pDoc->DeleteAreaTab( aBlockRange, IDF_ALL & ~IDF_NOTE ); + pUndoDoc->CopyToDocument( aBlockRange, IDF_ALL & ~IDF_NOTE, FALSE, pDoc ); pDocShell->PostPaint( aBlockRange, PAINT_GRID ); pDocShell->PostDataChanged(); ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); |