merged DEV300

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",

odk/util/makefile.pmk

@@ -188,7 +188,6 @@ INCLUDETOPDIRLIST= \
     $(INCOUT)/uno \
     $(INCOUT)/cppu \
     $(INCOUT)/cppuhelper \
-    $(INCOUT)/bridges \
     $(INCOUT)/registry \
     $(INCOUT)/stl