INTEGRATION: CWS calcshare_DEV300 (1.1.2); FILE ADDED

2008/02/26 19:10:30 tbe 1.1.2.3: #i8811# Allow multiple users to edit the same spreadsheet through workbook sharing
2008/02/07 18:38:49 tbe 1.1.2.2: #i8811# Allow multiple users to edit the same spreadsheet through workbook sharing
2008/01/30 12:52:57 tbe 1.1.2.1: #i8811# Allow multiple users to edit the same spreadsheet through workbook sharing

1 files changed, 51 insertions, 0 deletions

diff --git a/sc/source/ui/inc/conflictsdlg.hrc b/sc/source/ui/inc/conflictsdlg.hrc
new file mode 100644
index 000000000000..115fa70a4305
--- /dev/null
+++ b/sc/source/ui/inc/conflictsdlg.hrc
@@ -0,0 +1,51 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: conflictsdlg.hrc,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: kz $ $Date: 2008-03-07 12:21:09 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#include <sc.hrc>
+
+#define FT_CONFLICTS            1
+#define LB_CONFLICTS            2
+#define BTN_KEEPMINE            3
+#define BTN_KEEPOTHER           4
+#define FL_CONFLICTS            5
+#define BTN_KEEPALLMINE         6
+#define BTN_KEEPALLOTHERS       7
+#define BTN_CANCEL              8
+#define BTN_HELP                9
+
+#define STR_TITLE_CONFLICT      1
+#define STR_TITLE_AUTHOR        2
+#define STR_TITLE_DATE          3
+#define STR_UNKNOWN_USER        4