Searched refs:aConflictsList (Results 1 – 1 of 1) sorted by relevance
| /trunk/main/sc/source/ui/docshell/ |
| H A D | docsh3.cxx | 1264 ScConflictsList aConflictsList; in MergeSharedDocument() local
1265 … aFinder( pSharedTrack, nActStartShared, nActEndShared, nActStartOwn, nActEndOwn, aConflictsList ); in MergeSharedDocument()
1268 … ScConflictsListHelper::TransformConflictsList( aConflictsList, NULL, &aOwnInverseMergeMap ); in MergeSharedDocument()
1273 … ScConflictsDlg aDlg( GetActiveDialogParent(), GetViewData(), &rSharedDoc, aConflictsList ); in MergeSharedDocument()
1321 if ( !aConflictsList.empty() ) in MergeSharedDocument()
1323 … ScConflictsListHelper::TransformConflictsList( aConflictsList, &aSharedMergeMap, NULL ); in MergeSharedDocument()
1324 ScConflictsResolver aResolver( pThisTrack, aConflictsList ); in MergeSharedDocument()
1350 if ( !aConflictsList.empty() ) in MergeSharedDocument()
1352 … ScConflictsListHelper::TransformConflictsList( aConflictsList, NULL, &aOwnMergeMap ); in MergeSharedDocument()
1353 ScConflictsResolver aResolver( pThisTrack, aConflictsList ); in MergeSharedDocument()
|
Completed in 13 milliseconds