diff options
| author | Thomas Benisch <tbe@openoffice.org> | 2010-01-15 15:21:56 +0100 |
|---|---|---|
| committer | Thomas Benisch <tbe@openoffice.org> | 2010-01-15 15:21:56 +0100 |
| commit | 6a1e783a74418fd307d9092ea2809e50176f10ee (patch) | |
| tree | b57adde4b9d67e68a9e510a8e17bd703dd3d6e2d /sc/source/ui/docshell/docsh3.cxx | |
| parent | 1421b1785afd319e2425b5d7d3899b06ba903325 (diff) | |
dr75: #i101099# [Collaboration] Changes are not correctly shown
Diffstat (limited to 'sc/source/ui/docshell/docsh3.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh3.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 380f4635cdcf..6e3aaa2b971b 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -1093,6 +1093,16 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck { aSourceRange = pDel->GetOverAllRange().MakeRange(); GetDocFunc().DeleteCells( aSourceRange, NULL, DEL_DELROWS, TRUE, FALSE ); + + // #i101099# [Collaboration] Changes are not correctly shown + if ( bShared ) + { + ScChangeAction* pAct = pThisTrack->GetLast(); + if ( pAct && pAct->GetType() == eSourceType && pAct->IsDeletedIn() && !pSourceAction->IsDeletedIn() ) + { + pAct->RemoveAllDeletedIn(); + } + } } } break; |