summaryrefslogtreecommitdiff
path: root/odk/util
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-03-08 22:34:23 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-03-08 22:34:23 -0600
commite3ceb1d3d814eb586fa7c899d0fcb54280f3d30b (patch)
treeb4a3c9139c6102f95412f611c3cd1d584de3a74f /odk/util
parent3b2efb2043dd6871d5025b41936b6069a8dfda13 (diff)
parent1ae1f64e641d67a553eac4bcc91566efbe6a5d48 (diff)
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': sb138: #i116038# fresh implementation of binary URP bridge dba34b: #i106807# use mysql instead of adabas now sb126: #i112627# adapted SDK/DevGuide to configmgr re-write Conflicts: odk/util/makefile.pmk
Diffstat (limited to 'odk/util')
-rw-r--r--odk/util/check.pl12
-rw-r--r--odk/util/makefile.pmk1
2 files changed, 6 insertions, 7 deletions
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 0ba7f05a6ed2..6bf3fdd62b2f 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -265,17 +265,17 @@ if (-d "$StartDir") {
"_typelib_InterfaceMethodTypeDescription","store","RegistryKey",
"_typelib_Union_Init","_sal_Sequence","_typelib_Parameter_Init",
"_typelib_TypeDescription","_uno_Environment",
- "_typelib_InterfaceAttributeTypeDescription","uno_Context",
+ "_typelib_InterfaceAttributeTypeDescription",
"_rtl_ModuleCount","_uno_ExtEnvironment",
- "_typelib_IndirectTypeDescription","remote_DisposingListener",
- "remote_Interface","Registry_Api","_oslFileStatus",
+ "_typelib_IndirectTypeDescription",
+ "Registry_Api","_oslFileStatus",
"_typelib_InterfaceMemberTypeDescription","RegistryValueList",
"RegistryTypeWriter_Api","_rtl_TextEncodingInfo",
- "namespace_anonymous_1","remote_Connection",
+ "namespace_anonymous_1",
"_oslVolumeInfo","_uno_Interface",
"_typelib_InterfaceTypeDescription","_uno_Mapping","Registry",
- "RegistryTypeReader_Api","remote_Context","_typelib_Uik",
- "remote_InstanceProvider","_typelib_ArrayTypeDescription",
+ "RegistryTypeReader_Api","_typelib_Uik",
+ "_typelib_ArrayTypeDescription",
"RegistryKeyArray","RegistryTypeReader","RegistryKeyNames",
"RTConstValueUnion","_typelib_UnionTypeDescription","_uno_Any",
"RegistryTypeWriter","_rtl_Locale","_typelib_CompoundMember_Init",
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index db4a85f9cd91..d198d31ea6a2 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -160,7 +160,6 @@ INCLUDETOPDIRLIST= \
$(INCOUT)/uno \
$(INCOUT)/cppu \
$(INCOUT)/cppuhelper \
- $(INCOUT)/bridges \
$(INCOUT)/registry
.IF "$(GUI)"=="WNT"