added TableBorder2 using BorderLine2, implemented BorderLine2 properly

* added com::sun::star::table::TableBorder2 with
  com::sun::star::table::BorderLine2 members
* added optional com::sun::star::table::BorderLine2 properties to
  com::sun::star::table::CellProperties service
* changes in Calc
  * support TableBorder2, additionally to TableBorder
  * reverted change that made all BorderLine properties operate with
    BorderLine2 structs
  * instead support both, BorderLine and BorderLine2

4 files changed, 83 insertions, 1 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 23c4523c790a..1220adc1734a 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3550,6 +3550,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/table,\
 	ShadowFormat \
 	ShadowLocation \
 	TableBorder \
+	TableBorder2 \
 	TableBorderDistances \
 	TableOrientation \
 	TableSortField \
diff --git a/offapi/com/sun/star/sheet/TableAutoFormatField.idl b/offapi/com/sun/star/sheet/TableAutoFormatField.idl
index 31597271b6f3..b3c88a95f051 100644
--- a/offapi/com/sun/star/sheet/TableAutoFormatField.idl
+++ b/offapi/com/sun/star/sheet/TableAutoFormatField.idl
@@ -38,6 +38,7 @@
 #include <com/sun/star/table/CellVertJustify.idl>
 #include <com/sun/star/table/CellOrientation.idl>
 #include <com/sun/star/table/TableBorder.idl>
+#include <com/sun/star/table/TableBorder2.idl>
 
 //=============================================================================
 
@@ -300,6 +301,16 @@ published service TableAutoFormatField
         @since OOo 1.1.2
      */
     [optional, property] com::sun::star::table::TableBorder TableBorder;
+
+    //-------------------------------------------------------------------------
+
+    /** property containing a description of the cell border.
+        Preferred over <type scope="com::sun::star::table">TableBorder</type> 
+        <member>TableBorder</member>.
+
+        @since LibreOffice 3.6
+     */
+    [optional, property] com::sun::star::table::TableBorder2 TableBorder2;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/table/BorderLine2.idl b/offapi/com/sun/star/table/BorderLine2.idl
index ef5aac755429..a54d3d346be5 100644
--- a/offapi/com/sun/star/table/BorderLine2.idl
+++ b/offapi/com/sun/star/table/BorderLine2.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module table {
 
 //=============================================================================
 
-struct BorderLine2 : BorderLine
+published struct BorderLine2 : BorderLine
 {
     /** Style of the border. @see BorderLineStyle
      */
diff --git a/offapi/com/sun/star/table/CellProperties.idl b/offapi/com/sun/star/table/CellProperties.idl
index 4d4ae413bf1b..1473a67b1571 100644
--- a/offapi/com/sun/star/table/CellProperties.idl
+++ b/offapi/com/sun/star/table/CellProperties.idl
@@ -37,7 +37,9 @@
 #include <com/sun/star/table/CellOrientation.idl>
 #include <com/sun/star/util/CellProtection.idl>
 #include <com/sun/star/table/TableBorder.idl>
+#include <com/sun/star/table/TableBorder2.idl>
 #include <com/sun/star/table/BorderLine.idl>
+#include <com/sun/star/table/BorderLine2.idl>
 #include <com/sun/star/container/XNameContainer.idl>
 
 //=============================================================================
@@ -234,6 +236,74 @@ published service CellProperties
      */
     [optional, property] boolean ShrinkToFit;
 
+
+    //=== BorderLine2 / TableBorder2 optional properties, preferred ===========
+
+    /** contains a description of the cell or cell range border.
+        Preferred over <type>TableBorder>/type> <member>TableBorder</member>.
+
+        <p>If used with a cell range, the top, left, right, and bottom
+        lines are at the edges of the entire range, not at the edges of
+        the individual cell.</p>
+
+        @since LibreOffice 3.6
+     */
+    [optional, property] com::sun::star::table::TableBorder2 TableBorder2;
+
+    //-------------------------------------------------------------------------
+
+    /** contains a description of the top border line of each cell.
+        Preferred over <type>BorderLine</type> <member>TopBorder</member>.
+
+        @since LibreOffice 3.6
+     */
+    [optional, property] com::sun::star::table::BorderLine2 TopBorder2;
+
+    //-------------------------------------------------------------------------
+
+    /** contains a description of the bottom border line of each cell.
+        Preferred over <type>BorderLine</type> <member>BottomBorder</member>.
+
+        @since LibreOffice 3.6
+    */
+    [optional, property] com::sun::star::table::BorderLine2 BottomBorder2;
+
+    //-------------------------------------------------------------------------
+
+    /** contains a description of the left border line of each cell.
+        Preferred over <type>BorderLine</type> <member>LeftBorder</member>.
+
+        @since LibreOffice 3.6
+     */
+    [optional, property] com::sun::star::table::BorderLine2 LeftBorder2;
+
+    //-------------------------------------------------------------------------
+
+    /** contains a description of the right border line of each cell.
+        Preferred over <type>BorderLine</type> <member>RightBorder</member>.
+
+        @since LibreOffice 3.6
+     */
+    [optional, property] com::sun::star::table::BorderLine2 RightBorder2;
+
+    //-------------------------------------------------------------------------
+
+    /** contains a description of the top left to bottom right diagonal line of each cell.
+        Preferred over <type>BorderLine</type> <member>DiagonalTLBR</member>.
+
+        @since LibreOffice 3.6
+     */
+    [optional, property] com::sun::star::table::BorderLine2 DiagonalTLBR2;
+
+    //-------------------------------------------------------------------------
+
+    /** contains a description of the bottom left to top right diagonal line of each cell.
+        Preferred over <type>BorderLine</type> <member>DiagonalBLTR</member>.
+
+        @since LibreOffice 3.6
+     */
+    [optional, property] com::sun::star::table::BorderLine2 DiagonalBLTR2;
+
     //-------------------------------------------------------------------------
 };