diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-09-30 05:48:28 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-09-30 05:48:28 +0000 |
| commit | 716636d558e9cc9b910da6d127314d2b20cdf0b6 (patch) | |
| tree | d266019c3c89a0649074f3290439d74010ec618c /sc/source/ui/docshell/docsh3.cxx | |
| parent | abda8e12d8cd23c2cd1bb870b097eddfdee38825 (diff) | |
CWS-TOOLING: integrate CWS koheicoderemoval
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 ) |