diff options
Diffstat (limited to 'sc/source/ui/docshell/docsh3.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh3.cxx | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index aea08c2c929c..b0094688903d 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docsh3.cxx,v $ - * $Revision: 1.38 $ + * $Revision: 1.37.32.2 $ * * This file is part of OpenOffice.org. * @@ -1172,19 +1172,6 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck UnlockPaint(); } -void lcl_MergeActionStates( ScChangeTrack* pOwnTrack, ScChangeTrack* pSharedTrack ) -{ - BOOL bIgnore100Sec = !pOwnTrack->IsTime100thSeconds() || !pSharedTrack->IsTime100thSeconds(); - ScChangeAction* pOwnAction = pOwnTrack->GetFirst(); - ScChangeAction* pSharedAction = pSharedTrack->GetFirst(); - while ( lcl_Equal( pOwnAction, pSharedAction, bIgnore100Sec ) ) - { - pOwnTrack->MergeActionState( pOwnAction, pSharedAction ); - pOwnAction = pOwnAction->GetNext(); - pSharedAction = pSharedAction->GetNext(); - } -} - bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell ) { if ( !pSharedDocShell ) |