1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SC_SOURCE_UI_INC_CONFLICTSDLG_HXX
#define INCLUDED_SC_SOURCE_UI_INC_CONFLICTSDLG_HXX
#include <vcl/idle.hxx>
#include <svx/ctredlin.hxx>
#include "docsh.hxx"
class ScViewData;
class ScChangeTrack;
class ScChangeAction;
enum ScConflictAction
{
SC_CONFLICT_ACTION_NONE,
SC_CONFLICT_ACTION_KEEP_MINE,
SC_CONFLICT_ACTION_KEEP_OTHER
};
// struct ScConflictsListEntry
struct ScConflictsListEntry
{
ScConflictAction meConflictAction;
std::vector<sal_uLong> maSharedActions;
std::vector<sal_uLong> maOwnActions;
bool HasSharedAction( sal_uLong nSharedAction ) const;
bool HasOwnAction( sal_uLong nOwnAction ) const;
};
typedef ::std::vector< ScConflictsListEntry > ScConflictsList;
class ScConflictsListHelper
{
private:
static void Transform_Impl( std::vector<sal_uLong>& rActionList, ScChangeActionMergeMap* pMergeMap );
public:
static bool HasOwnAction( ScConflictsList& rConflictsList, sal_uLong nOwnAction );
static ScConflictsListEntry* GetSharedActionEntry( ScConflictsList& rConflictsList, sal_uLong nSharedAction );
static ScConflictsListEntry* GetOwnActionEntry( ScConflictsList& rConflictsList, sal_uLong nOwnAction );
static void TransformConflictsList( ScConflictsList& rConflictsList,
ScChangeActionMergeMap* pSharedMap, ScChangeActionMergeMap* pOwnMap );
};
class ScConflictsFinder final
{
private:
ScChangeTrack* const mpTrack;
sal_uLong const mnStartShared;
sal_uLong const mnEndShared;
sal_uLong const mnStartOwn;
sal_uLong const mnEndOwn;
ScConflictsList& mrConflictsList;
static bool DoActionsIntersect( const ScChangeAction* pAction1, const ScChangeAction* pAction2 );
ScConflictsListEntry* GetIntersectingEntry( const ScChangeAction* pAction ) const;
ScConflictsListEntry& GetEntry(sal_uLong nSharedAction, const std::vector<sal_uLong>& rOwnActions);
public:
ScConflictsFinder( ScChangeTrack* pTrack, sal_uLong nStartShared, sal_uLong nEndShared,
sal_uLong nStartOwn, sal_uLong nEndOwn, ScConflictsList& rConflictsList );
~ScConflictsFinder();
bool Find();
};
class ScConflictsResolver final
{
private:
ScChangeTrack* mpTrack;
ScConflictsList& mrConflictsList;
public:
ScConflictsResolver( ScChangeTrack* pTrack, ScConflictsList& rConflictsList );
~ScConflictsResolver();
void HandleAction( ScChangeAction* pAction, bool bIsSharedAction,
bool bHandleContentAction, bool bHandleNonContentAction );
};
class ScConflictsDlg : public weld::GenericDialogController
{
private:
OUString const maStrUnknownUser;
ScViewData* const mpViewData;
ScDocument* mpOwnDoc;
ScChangeTrack* mpOwnTrack;
ScDocument* const mpSharedDoc;
ScChangeTrack* mpSharedTrack;
ScConflictsList& mrConflictsList;
Idle maSelectionIdle;
bool mbInSelectHdl;
std::unique_ptr<weld::Button> m_xBtnKeepMine;
std::unique_ptr<weld::Button> m_xBtnKeepOther;
std::unique_ptr<weld::Button> m_xBtnKeepAllMine;
std::unique_ptr<weld::Button> m_xBtnKeepAllOthers;
std::unique_ptr<SvxRedlinTable> m_xLbConflicts;
OUString GetConflictString( const ScConflictsListEntry& rConflictEntry );
void SetActionString(const ScChangeAction* pAction, ScDocument* pDoc, const weld::TreeIter& rEntry);
void HandleListBoxSelection();
void SetConflictAction(const weld::TreeIter& rRootEntry, ScConflictAction eConflictAction);
void KeepHandler( bool bMine );
void KeepAllHandler( bool bMine );
DECL_LINK( SelectHandle, weld::TreeView&, void );
DECL_LINK( UpdateSelectionHdl, Timer*, void );
DECL_LINK( KeepMineHandle, weld::Button&, void );
DECL_LINK( KeepOtherHandle, weld::Button&, void );
DECL_LINK( KeepAllMineHandle, weld::Button&, void );
DECL_LINK( KeepAllOthersHandle, weld::Button&, void );
public:
ScConflictsDlg(weld::Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList);
virtual ~ScConflictsDlg() override;
void UpdateView();
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
