diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-01-27 17:41:29 +0100 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-01-27 17:41:29 +0100 |
| commit | 42babf975a2369372124fa0e97796c2950b7b47b (patch) | |
| tree | 649335710e95fba36f737e2c307d4f0cbfb9cd99 /sc/source/ui/docshell/docsh3.cxx | |
| parent | 60fdd54890f04949f1b82d4f7a4903e65f165a7c (diff) | |
| parent | 9d2aea11389d86aa97eba7015509be90a2c1f9fb (diff) | |
dr75: rebase merge
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 1416c57f1165..59ab20fb2545 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -1091,6 +1091,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; |