summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRelease Engineering <releng@openoffice.org>2011-02-18 11:14:19 +0100
committerRelease Engineering <releng@openoffice.org>2011-02-18 11:14:19 +0100
commitaf67f29984bd8c83fac33e0ceca8eefdd7f652e6 (patch)
tree5b62c8d274b92c90847f53efbfe98711ac251f20
parent2f9518709be117b62a1a5b9fbc1002340f71a2b5 (diff)
parent2ab331d669bd7a391068f552909a38f837590a43 (diff)
merged DEV300ooo/DEV300_m101
-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 23d2fbaa..77ab1a6b 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 aa0f10ed..deb4e6d6 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -188,7 +188,6 @@ INCLUDETOPDIRLIST= \
$(INCOUT)/uno \
$(INCOUT)/cppu \
$(INCOUT)/cppuhelper \
- $(INCOUT)/bridges \
$(INCOUT)/registry \
$(INCOUT)/stl