summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc/conflictsdlg.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/inc/conflictsdlg.hxx')
-rw-r--r--sc/source/ui/inc/conflictsdlg.hxx14
1 files changed, 0 insertions, 14 deletions
diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx
index 7cc7628e3be2..f0e3513523b4 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -32,8 +32,6 @@
class ScViewData;
-
-
enum ScConflictAction
{
SC_CONFLICT_ACTION_NONE,
@@ -43,8 +41,6 @@ enum ScConflictAction
typedef ::std::vector< sal_uLong > ScChangeActionList;
-
-
// struct ScConflictsListEntry
@@ -59,12 +55,8 @@ struct ScConflictsListEntry
};
-
-
typedef ::std::vector< ScConflictsListEntry > ScConflictsList;
-
-
// class ScConflictsListHelper
@@ -83,8 +75,6 @@ public:
ScChangeActionMergeMap* pSharedMap, ScChangeActionMergeMap* pOwnMap );
};
-
-
// class ScConflictsFinder
@@ -110,8 +100,6 @@ public:
bool Find();
};
-
-
// class ScConflictsResolver
@@ -129,8 +117,6 @@ public:
bool bHandleContentAction, bool bHandleNonContentAction );
};
-
-
// class ScConflictsDlg