Searched refs:aConflictsList (Results 1 – 1 of 1) sorted by relevance
| /trunk/main/sc/source/ui/docshell/ |
| H A D | docsh3.cxx | 1258 ScConflictsList aConflictsList; in MergeSharedDocument() local
1259 … aFinder( pSharedTrack, nActStartShared, nActEndShared, nActStartOwn, nActEndOwn, aConflictsList ); in MergeSharedDocument()
1262 … ScConflictsListHelper::TransformConflictsList( aConflictsList, NULL, &aOwnInverseMergeMap ); in MergeSharedDocument()
1267 … ScConflictsDlg aDlg( GetActiveDialogParent(), GetViewData(), &rSharedDoc, aConflictsList ); in MergeSharedDocument()
1315 if ( !aConflictsList.empty() ) in MergeSharedDocument()
1317 … ScConflictsListHelper::TransformConflictsList( aConflictsList, &aSharedMergeMap, NULL ); in MergeSharedDocument()
1318 ScConflictsResolver aResolver( pThisTrack, aConflictsList ); in MergeSharedDocument()
1344 if ( !aConflictsList.empty() ) in MergeSharedDocument()
1346 … ScConflictsListHelper::TransformConflictsList( aConflictsList, NULL, &aOwnMergeMap ); in MergeSharedDocument()
1347 ScConflictsResolver aResolver( pThisTrack, aConflictsList ); in MergeSharedDocument()
|