diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-24 14:37:15 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-24 14:37:15 +0000 |
| commit | 5ad01c53a1c62acf070e43f699d5155a82dbc9d7 (patch) | |
| tree | efcfb49564fb31e64c380aa9732f75ae2b51ac7c /sc/source | |
| parent | c832844e4ff7b5bf4dbd32c3dfd401b7393bf135 (diff) | |
CWS-TOOLING: integrate CWS calcdelrows_DEV300
2009-04-14 09:17:29 +0200 nn r270747 : #i100895# for collaboration, allow rejection regardless of IsDeletedIn
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/core/tool/chgtrack.cxx | 7 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh3.cxx | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index 8d69b86770b1..5f1213e79b35 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -4851,8 +4851,13 @@ BOOL ScChangeTrack::RejectAll() } -BOOL ScChangeTrack::Reject( ScChangeAction* pAct ) +BOOL ScChangeTrack::Reject( ScChangeAction* pAct, bool bShared ) { + // #i100895# When collaboration changes are reversed, it must be possible + // to reject a deleted row above another deleted row. + if ( bShared && pAct->IsDeletedIn() ) + pAct->RemoveAllDeletedIn(); + if ( !pAct->IsRejectable() ) return FALSE; diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 6e4940f96fd3..fcdfa8612a02 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -1292,7 +1292,7 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell ) ScChangeAction* pAction = pThisTrack->GetLast(); while ( pAction && pAction->GetActionNumber() >= nStartShared ) { - pThisTrack->Reject( pAction ); + pThisTrack->Reject( pAction, true ); pAction = pAction->GetPrev(); } |