7 files changed, 23 insertions, 14 deletions
diff --git a/offapi/README b/offapi/README
index a8f3a9b442f4..90c4ee5290dd 100644
--- a/offapi/README
+++ b/offapi/README
@@ -3,9 +3,12 @@ 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.
 
-The reference offapi/type_reference/types.rdb, used to detect inadvertent
-incompatible changes, is maintained via offapi/type_reference/update-rdb.sh (see
-its usage message for details) for cases where we deliberately /do/ become
-incompatible.  Old such cases are listed in
-offapi/type_reference/typelibrary_history.txt, new such cases are recorded in
-the git log of offapi/type_reference/types.rdb.
+The reference offapi/type_reference/offapi.rdb and
+udkapi/type_reference/udkapi.rdb (formerly combined into a single
+offapi/type_reference/types.rdb), used to detect inadvertent incompatible
+changes, are maintained via offapi/type_reference/update-rdb.sh (see its usage
+message for details) for cases where we deliberately /do/ become incompatible.
+Old such cases are listed in offapi/type_reference/typelibrary_history.txt,
+newer such cases are recorded in the git log of (now removed)
+offapi/type_reference/types.rdb, new such cases are recorded in the git logs of
+offapi/type_reference/offapi.rdb and udkapi/type_reference/udkapi.rdb.
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index cae76f660462..c2deacc1b610 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -4267,4 +4267,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/org/freedesktop/Package
     SyncDbusSessionHelper \
 ))
 
+$(eval $(call gb_UnoApi_set_reference_rdbfile,offapi,offapi/type_reference/offapi))
+
 # vim: set noet sw=4 ts=4:
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/offapi.rdb
index 097590fe8c91..d72a454c845d 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/offapi.rdb
diff --git a/offapi/type_reference/typelibrary_history.txt b/offapi/type_reference/typelibrary_history.txt
index 1103db8c1bbb..7bc723fb2734 100644
--- a/offapi/type_reference/typelibrary_history.txt
+++ b/offapi/type_reference/typelibrary_history.txt
@@ -184,4 +184,4 @@
   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.
+For later changes, see offapi/README.
diff --git a/offapi/type_reference/update-rdb.sh b/offapi/type_reference/update-rdb.sh
index 79fd29cac01d..cbe33b639b6e 100755
--- a/offapi/type_reference/update-rdb.sh
+++ b/offapi/type_reference/update-rdb.sh
@@ -10,28 +10,30 @@
 set -e
 
 # Basic argument checks
-if [ $# -lt 1 ]
+if [ $# -lt 2 ]
 then
   echo "usage:"
-  echo "    make cmd cmd='$0 <idl file list>'"
+  echo "    make cmd cmd='$0 <rdb file> <idl file list>'"
   echo ""
   echo "example:"
   echo "    make cmd cmd='$0"
+  echo "      offapi/type_reference/offapi.rdb"
   echo "      offapi/com/sun/star/auth/SSOManagerFactory.idl"
   echo "      offapi/com/sun/star/auth/SSOPasswordCache.idl'"
   exit 1
 fi
 
+rdb=${1?}
+shift
 mkdir tmp
 for i in "$@"; do
   "${OUTDIR_FOR_BUILD?}"/bin/regmerge -v tmp/out1.rdb /UCR \
     "${WORKDIR_FOR_BUILD?}"/UnoApiPartTarget/"${i%.idl}".urd
 done
-"${OUTDIR_FOR_BUILD?}"/bin/regmerge -v tmp/out2.rdb / \
-  "${SRC_ROOT?}"/offapi/type_reference/types.rdb tmp/out1.rdb
+"${OUTDIR_FOR_BUILD?}"/bin/regmerge -v tmp/out2.rdb / "${SRC_ROOT?}"/"${rdb?}" \
+  tmp/out1.rdb
 echo "sanity check diff:"
-diff <("${OUTDIR_FOR_BUILD?}"/bin/regview \
-  "${SRC_ROOT?}"/offapi/type_reference/types.rdb) \
+diff <("${OUTDIR_FOR_BUILD?}"/bin/regview "${SRC_ROOT?}"/"${rdb?}") \
   <("${OUTDIR_FOR_BUILD?}"/bin/regview tmp/out2.rdb) && $? -le 1
-mv tmp/out2.rdb "${SRC_ROOT?}"/offapi/type_reference/types.rdb
+mv tmp/out2.rdb "${SRC_ROOT?}"/"${rdb?}"
 rm -r tmp
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 0b13cac31eb8..011e4872933f 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -536,4 +536,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/util,\
 	XVeto \
 ))
 
+$(eval $(call gb_UnoApi_set_reference_rdbfile,udkapi,udkapi/type_reference/udkapi))
+
 # vim: set noet sw=4 ts=4:
diff --git a/udkapi/type_reference/udkapi.rdb b/udkapi/type_reference/udkapi.rdb
new file mode 100644
index 000000000000..469512a5700f
--- /dev/null
+++ b/udkapi/type_reference/udkapi.rdb