diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-02-17 12:20:57 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-02-17 12:24:47 -0500 |
| commit | 9e49b6abe7cedd2ac7137170f76ec5d7e14bd295 (patch) | |
| tree | d2186cc98a2f312afa7413eaa958fdaba22891ff | |
| parent | 6a5df6427913af1df99e770ea68daaeeeea02e7c (diff) | |
fdo#75032: Skip notes when copying values from undo document.
Notes undo redo are handled separately by the drawing layer.
Change-Id: Iae37ac86889d7a25f25e6dd0b69f724107c6798a
| -rw-r--r-- | sc/source/ui/undo/undoblk.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index 2b30fed702f8..694e17122c34 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -414,8 +414,11 @@ void ScUndoDeleteCells::DoChange( const sal_Bool bUndo ) // if Undo, restore references for( i=0; i<nCount && bUndo; i++ ) { + // Cell note objects are handled separately. Ignore them here. + sal_uInt16 nFlags = IDF_ALL; + nFlags &= ~IDF_NOTE; pRefUndoDoc->CopyToDocument( aEffRange.aStart.Col(), aEffRange.aStart.Row(), pTabs[i], aEffRange.aEnd.Col(), aEffRange.aEnd.Row(), pTabs[i]+pScenarios[i], - IDF_ALL | IDF_NOCAPTIONS, false, pDoc ); + nFlags, false, pDoc ); } ScRange aWorkRange( aEffRange ); |