merge origin/master

19 files changed, 379 insertions, 70 deletions

diff --git a/offapi/Makefile b/offapi/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/offapi/Makefile
+++ b/offapi/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/offapi/README b/offapi/README
new file mode 100644
index 000000000000..c33424d4a7e5
--- /dev/null
+++ b/offapi/README
@@ -0,0 +1,4 @@
+Contains all of the IDL files except those in [[udkapi]]
+
+i.e. the interfaces that are specific to the OppenOffice.org application.
+An artificial (?) separation.
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 4747164b09e6..989b516c42b7 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2860,6 +2860,9 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/presentation,\
 	XTransition \
 	XTransitionFactory \
 ))
+$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/qa,\
+    	XDumper \
+))
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/rdf,\
 	FileFormat \
 	ParseException \
@@ -3546,6 +3549,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/table,\
 	ShadowFormat \
 	ShadowLocation \
 	TableBorder \
+	TableBorder2 \
 	TableBorderDistances \
 	TableOrientation \
 	TableSortField \
diff --git a/offapi/com/sun/star/chart/XAxisSupplier.idl b/offapi/com/sun/star/chart/XAxisSupplier.idl
index a1aada8f7d3f..8e1f2715c5f8 100644
--- a/offapi/com/sun/star/chart/XAxisSupplier.idl
+++ b/offapi/com/sun/star/chart/XAxisSupplier.idl
@@ -42,7 +42,7 @@ interface XAxisSupplier : ::com::sun::star::uno::XInterface
             the primary axis of the specified dimension. The returned object supports service <type>ChartAxis</type>.
 
         @param nDimensionIndex
-            Parameter nDimensionIndex says wether it is a x, y or z-axis (0 for x).
+            Parameter nDimensionIndex says whether it is a x, y or z-axis (0 for x).
      */
     com::sun::star::chart::XAxis getAxis( [in] long nDimensionIndex );
 
@@ -50,7 +50,7 @@ interface XAxisSupplier : ::com::sun::star::uno::XInterface
             the secondary axis of the specified dimension. The returned object supports service <type>ChartAxis</type>.
 
         @param nDimensionIndex
-            Parameter nDimensionIndex says wether it is a x, y or z-axis (0 for x).
+            Parameter nDimensionIndex says whether it is a x, y or z-axis (0 for x).
      */
     com::sun::star::chart::XAxis getSecondaryAxis( [in] long nDimensionIndex );
 };
diff --git a/offapi/com/sun/star/chart2/ScaleData.idl b/offapi/com/sun/star/chart2/ScaleData.idl
index 0bb2f839ae07..c63096e5a83f 100644
--- a/offapi/com/sun/star/chart2/ScaleData.idl
+++ b/offapi/com/sun/star/chart2/ScaleData.idl
@@ -73,7 +73,7 @@ struct ScaleData
     */
     boolean AutoDateAxis;
 
-    /** describes wether data points on category or date axis are placed between tickmarks or not
+    /** describes whether data points on category or date axis are placed between tickmarks or not
     if true the maximum on the scale will be expanded for one interval
     */
     boolean ShiftedCategoryPosition;
diff --git a/offapi/com/sun/star/media/XPlayer.idl b/offapi/com/sun/star/media/XPlayer.idl
index 059a4c9f4104..121b8004fd0f 100644
--- a/offapi/com/sun/star/media/XPlayer.idl
+++ b/offapi/com/sun/star/media/XPlayer.idl
@@ -77,26 +77,6 @@ interface XPlayer
      */
     double getMediaTime();
 
-    /** sets the time at which to stop reading the stream.
-
-        @param fTime
-            the time at which to stop reading the stream in seconds
-     */
-    void setStopTime( [in] double fTime );
-
-    /** gets the time at which the stream will stop. The result
-        is not guaranteed if no stop time has been set.
-     */
-    double getStopTime();
-
-    /** sets the speed of the stream reading relatively to the normal
-        speed.
-
-        @param fRate
-            the stream reading rate. <code>1.0</code> means normal speed.
-     */
-    void setRate( [in] double fRate );
-
     /** gets the speed of the stream reading relatively to the normal
         reading.
 
diff --git a/offapi/com/sun/star/modules.idl b/offapi/com/sun/star/modules.idl
index 6ef7dca55d37..421d4c7e9235 100644
--- a/offapi/com/sun/star/modules.idl
+++ b/offapi/com/sun/star/modules.idl
@@ -142,6 +142,9 @@ module rendering {};
 /// Interfaces to access (UI) resource files.
 module resource {};
 
+/// Interfaces for QA and automated tests
+module qa {};
+
 /// Interfaces for scanner control.
 module scanner {};
 
diff --git a/offapi/com/sun/star/qa/XDumper.idl b/offapi/com/sun/star/qa/XDumper.idl
new file mode 100644
index 000000000000..4eebb030b55f
--- /dev/null
+++ b/offapi/com/sun/star/qa/XDumper.idl
@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 or as specified alternatively below. 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.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Markus Mohrhard <markus.mohrhard@googlemail.com> (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * 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_qa_XDumper_idl
+#define com_sun_star_qa_XDumper_idl
+
+#include <com/sun/star/uno/XInterface.idl>
+
+module com
+{
+module sun
+{
+module star
+{
+module qa
+{
+
+/**
+ * Dumps the content into a string.
+ * This is an internal interface and should not be used outside of Libreoffice source code
+ */
+interface XDumper : com::sun::star::uno::XInterface
+{
+    /**
+     * dump the content into a string
+     * @since LibreOffice 3.6
+     */
+
+    string dump();
+};
+
+} ; // chart2
+} ; // com
+} ; // sun
+} ; // star
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
index 4f06bb54f0e0..bf5563088653 100644
--- a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
+++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
@@ -45,17 +45,19 @@
     the form of
     <type scope="com::sun::star::sdbc">XResultSet</type>
     objects.
-    You can use the normal <type scope="com::sun::star::sdbc">XResultSet</type>
+    You can use the normal <type scope="com::sun::star::sdbc">XRow</type>
+    (or <type scope="com::sun::star::sdb">XColumn</type>)
     methods such as
-    <member scope="com::sun::star::sdbc">XResultSet::getString()</member>
+    <member scope="com::sun::star::sdbc">XRow::getString()</member>
     and
-    <member scope="com::sun::star::sdbc">XResultSet::getInt()</member>
+    <member scope="com::sun::star::sdbc">XRow::getInt()</member>
     to retrieve the data from these XResultSets. If a given form of
     metadata is not available, these methods should throw a
     <type scope="com::sun::star::sdbc">SQLException</type>
     .
-    That a value of <type scope="com::sun::star::sdbc">XResultSet</type> is <NULL/>
-    can be checked with the method <member scope="com::sun::star::sdbc">XResultSet::wasNull()</member>.
+    After calling one of the getXXX() methods,
+    one can check whether that value is <NULL/>
+    with the method <member scope="com::sun::star::sdbc">XRow::wasNull()</member>.
     In the text only "(may be <NULL/>)" is mentioned for this case.
     </p>
     <p>Some of these methods take arguments that are String patterns. These
@@ -69,7 +71,7 @@
     A
     <type scope="com::sun::star::sdbc">SQLException</type>
     will be thrown if a driver does not support
-    a meta data method. In the case of methods that return an XResultSet,
+    a metadata method. In the case of methods that return an XResultSet,
     either an XResultSet (which may be empty) is returned or a
     SQLException is thrown.</p>
  */
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/sheet/XCellRangesQuery.idl b/offapi/com/sun/star/sheet/XCellRangesQuery.idl
index f35eec799c5a..35bb83132267 100644
--- a/offapi/com/sun/star/sheet/XCellRangesQuery.idl
+++ b/offapi/com/sun/star/sheet/XCellRangesQuery.idl
@@ -76,7 +76,12 @@ published interface XCellRangesQuery: com::sun::star::uno::XInterface
 
             <p>Attention: Despite the <type>CellFlags</type> flags are
             <atom>long</atom> values, this method expects a <atom>short</atom>
-            parameter.
+            parameter.</p>
+
+            <p>Attention: Empty cells in the range may be skipped depending on
+            the content flag used.  For instance, when querying for STYLES,
+            the returned ranges may not include empty cells even if styles are
+            applied to those cells.</p>
 
         @returns
             all cells of the current cell range(s) with the specified
diff --git a/offapi/com/sun/star/style/ParagraphProperties.idl b/offapi/com/sun/star/style/ParagraphProperties.idl
index ce770eee1d79..885f320e6c7b 100644
--- a/offapi/com/sun/star/style/ParagraphProperties.idl
+++ b/offapi/com/sun/star/style/ParagraphProperties.idl
@@ -152,6 +152,15 @@ published service ParagraphProperties
      */
     [property] long ParaBottomMargin;
 
+    /** determines if contextual spacing is used.
+
+        @since LibreOffice 3.6
+
+        <p>If true, the top and bottom margins of the paragraph should not be
+        applied when the previous and next paragraphs have the same style.</p>
+     */
+    [optional, property] boolean ParaContextMargin;
+
     //-------------------------------------------------------------------------
 
     /** determines if the paragraph is included in the
diff --git a/offapi/com/sun/star/system/SystemShellExecuteFlags.idl b/offapi/com/sun/star/system/SystemShellExecuteFlags.idl
index ec33586a026e..be6991f912d6 100644
--- a/offapi/com/sun/star/system/SystemShellExecuteFlags.idl
+++ b/offapi/com/sun/star/system/SystemShellExecuteFlags.idl
@@ -48,6 +48,12 @@ published constants SystemShellExecuteFlags
         method <member scope="com::sun::star::system">XSystemShellExecute::execute()</member> fails.
      */
     const long NO_SYSTEM_ERROR_MESSAGE = 1;
+
+    /** Only allows opening of absolute URI references.
+
+        @since LibreOffice 3.6
+     */
+    const long URIS_ONLY = 2;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/system/XSystemShellExecute.idl b/offapi/com/sun/star/system/XSystemShellExecute.idl
index 0b3e1aadc4ec..14a8326148c2 100644
--- a/offapi/com/sun/star/system/XSystemShellExecute.idl
+++ b/offapi/com/sun/star/system/XSystemShellExecute.idl
@@ -29,7 +29,6 @@
 #ifndef __com_sun_star_system_XSystemShellExecute_idl__
 #define __com_sun_star_system_XSystemShellExecute_idl__
 
-#include <com/sun/star/uno/RuntimeException.idl>
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #include <com/sun/star/system/SystemShellExecuteException.idl>
@@ -65,9 +64,11 @@ published interface XSystemShellExecute: com::sun::star::uno::XInterface
         avoid showing system error messages, in case of failures, etc.
 
         @throws com::sun::star::lang::IllegalArgumentException
-        when the specified flags are wrong or exclude each other.
-.
-        @throws com::sun::star::sys::SystemExecuteException
+        when the specified flags are wrong or exclude each other; also thrown,
+        with an ArgumentPosition of 0, when nFlags contains URIS_ONLY and
+        aCommand is not an absolute URI reference
+
+        @throws com::sun::star::system::SystemShellExecuteException
         in the case of errors when trying to executed the specified command.
 
         @see com::sun::star::system::SystemShellExecuteFlags
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;
+
     //-------------------------------------------------------------------------
 };
 
diff --git a/offapi/com/sun/star/table/TableBorder2.idl b/offapi/com/sun/star/table/TableBorder2.idl
new file mode 100644
index 000000000000..4f826726976b
--- /dev/null
+++ b/offapi/com/sun/star/table/TableBorder2.idl
@@ -0,0 +1,160 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 or as specified alternatively below. 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.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Red Hat, Inc., Eike Rathke <erack@redhat.com>
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * 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_table_TableBorder2_idl__
+#define __com_sun_star_table_TableBorder2_idl__
+
+#include <com/sun/star/table/BorderLine2.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module table {
+
+//=============================================================================
+
+/** contains the style settings of the border lines of all cells in a cell
+    range.
+
+    TableBorder2 is nearly identical to TableBorder, except that it has
+    members of <type>BorderLine2</type> instead of
+    <type>BorderLine</type>.
+
+    <p>In a queried structure, the flags in
+    <member>TableBorder2::Is...LineValid</member> indicate that not all
+    lines of the boxes have the same values.</p>
+
+    <p>In a structure which is used for setting, these flags determine
+    if the corresponding line should be set or if the old value should
+    be kept.</p>
+
+    @since LibreOffice 3.6
+ */
+published struct TableBorder2
+{
+    //-------------------------------------------------------------------------
+
+    /** determines the line style at the top edge.
+     */
+    com::sun::star::table::BorderLine2 TopLine;
+
+    //-------------------------------------------------------------------------
+
+    /** specifies whether the value of
+        <member>TableBorder2::TopLine</member> is used.
+     */
+    boolean IsTopLineValid;
+
+    //-------------------------------------------------------------------------
+
+    /** determines the line style at the bottom edge.
+     */
+    com::sun::star::table::BorderLine2 BottomLine;
+
+    //-------------------------------------------------------------------------
+
+    /** specifies whether the value of
+        <member>TableBorder2::BottomLine</member> is used.
+     */
+    boolean IsBottomLineValid;
+
+    //-------------------------------------------------------------------------
+
+    /** determines the line style at the left edge.
+     */
+    com::sun::star::table::BorderLine2 LeftLine;
+
+    //-------------------------------------------------------------------------
+
+    /** specifies whether the value of
+        <member>TableBorder2::LeftLine</member> is used.
+     */
+    boolean IsLeftLineValid;
+
+    //-------------------------------------------------------------------------
+
+    /** determines the line style at the right edge.
+     */
+    com::sun::star::table::BorderLine2 RightLine;
+
+    //-------------------------------------------------------------------------
+
+    /** specifies whether the value of
+        <member>TableBorder2::RightLine</member> is used.
+     */
+    boolean IsRightLineValid;
+
+    //-------------------------------------------------------------------------
+
+    /** determines the line style of horizontal lines for the inner part
+        of a cell range.
+     */
+    com::sun::star::table::BorderLine2 HorizontalLine;
+
+    //-------------------------------------------------------------------------
+
+    /** specifies whether the value of
+        <member>TableBorder2::HorizontalLine</member> is used.
+     */
+    boolean IsHorizontalLineValid;
+
+    //-------------------------------------------------------------------------
+
+    /** determines the line style of vertical lines for the inner part
+        of a cell range.
+     */
+    com::sun::star::table::BorderLine2 VerticalLine;
+
+    //-------------------------------------------------------------------------
+
+    /** specifies whether the value of
+        <member>TableBorder2::VerticalLine</member> is used.
+     */
+    boolean IsVerticalLineValid;
+
+    //-------------------------------------------------------------------------
+
+    /** contains the distance between the lines and other contents.
+     */
+    short Distance;
+
+    //-------------------------------------------------------------------------
+
+    /** specifies whether the value of
+        <member>TableBorder2::Distance</member> is used.
+     */
+    boolean IsDistanceValid;
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/typelibrary_history.txt b/offapi/type_reference/typelibrary_history.txt
index a678ca7d6a7d..0f7c616777a5 100644
--- a/offapi/type_reference/typelibrary_history.txt
+++ b/offapi/type_reference/typelibrary_history.txt
@@ -1,3 +1,23 @@
+Example of updating an incompatibly-changed type (com.sun.star.script.Converter,
+in this example) in the accompanying types.rdb:
+
+.../core> mkdir tmp
+.../core> LD_LIBRARY_PATH=.../core/solver/unxlngx6/lib \
+ solver/unxlngx6/bin/regmerge tmp/out1.rdb /UCR \
+ workdir/unxlngx6/UnoApiPartTarget/udkapi/com/sun/star/script/Converter.urd
+.../core> LD_LIBRARY_PATH=.../core/solver/unxlngx6/lib \
+ solver/unxlngx6/bin/regmerge tmp/out2.rdb / offapi/type_reference/types.rdb \
+ tmp/out1.rdb
+.../core> diff <(LD_LIBRARY_PATH=.../core/solver/unxlngx6/lib \
+ solver/unxlngx6/bin/regview offapi/type_reference/types.rdb) \
+ <(LD_LIBRARY_PATH=.../core/solver/unxlngx6/lib solver/unxlngx6/bin/regview \
+ tmp/out2.rdb) # sanity check
+.../core> mv tmp/out2.rdb offapi/type_reference/types.rdb
+.../core> rm -rf tmp
+
+
+
+
 07/07/2004 (SB): BugID=i29741
   Reference registries for the OOo 2.0 branch copied from the OOo 1.1 branch:
     OO_20/types.rdb <- OO_11/types.rdb 1.6
@@ -165,3 +185,5 @@
 01/28/11 (JSC): TaskID=116682
   Update css.awt.UnoControlDialog to reflect the supported XDialog2 interface
   additionally to XDialog
+
+For later changes, consult the git log of the accompanying types.rdb file.
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index c12270b17c05..8e35e759b2b4 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb