Merge branch 'master' into feature/gnumake4

Conflicts:
xmlreader/prj/d.lst

1 files changed, 46 insertions, 0 deletions

diff --git a/offapi/com/sun/star/text/ColumnSeparatorStyle.idl b/offapi/com/sun/star/text/ColumnSeparatorStyle.idl
new file mode 100644
index 000000000000..5aa40af89f57
--- /dev/null
+++ b/offapi/com/sun/star/text/ColumnSeparatorStyle.idl
@@ -0,0 +1,46 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (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.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       [ Novell Inc. ]
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Cedric Bosdonnat <cbosdonnat@novell.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#ifndef __com_sun_star_text_ColumnSeparatorStyle_idl__
+#define __com_sun_star_text_ColumnSeparatorStyle_idl__
+
+module com {  module sun {  module star {  module text {
+
+published constants ColumnSeparatorStyle
+{
+    const short NONE = 0;
+
+    const short SOLID = 1;
+
+    const short DOTTED = 2;
+
+    const short DASHED = 3;
+};
+
+}; }; }; };
+
+
+#endif