cppuhelper: convert to gbuild

missing subsequent test qa/propertysetmixin/makefile.mk

24 files changed, 592 insertions, 1519 deletions

diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
new file mode 100644
index 000000000000..2006d98d63ec
--- /dev/null
+++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
@@ -0,0 +1,45 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan@gmail.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.
+
+$(eval $(call gb_CppunitTest_CppunitTest,cppuhelper_cppu_ifcontainer))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_cppu_ifcontainer,\
+    cppuhelper/qa/ifcontainer/cppu_ifcontainer \
+))
+
+$(eval $(call gb_CppunitTest_add_api,cppuhelper_cppu_ifcontainer,\
+	udkapi \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_cppu_ifcontainer,\
+	cppu \
+    cppuhelper \
+	sal \
+    $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
new file mode 100644
index 000000000000..ceaec25f5cce
--- /dev/null
+++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
@@ -0,0 +1,41 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan@gmail.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.
+
+$(eval $(call gb_CppunitTest_CppunitTest,cppuhelper_cppu_unourl))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_cppu_unourl,\
+    cppuhelper/qa/unourl/cppu_unourl \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_cppu_unourl,\
+	cppu \
+    cppuhelper \
+	sal \
+    $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
new file mode 100644
index 000000000000..eaea97b201a4
--- /dev/null
+++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
@@ -0,0 +1,45 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan@gmail.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.
+
+$(eval $(call gb_CppunitTest_CppunitTest,cppuhelper_qa_weak))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_qa_weak,\
+    cppuhelper/qa/weak/test_weak \
+))
+
+$(eval $(call gb_CppunitTest_add_api,cppuhelper_qa_weak,\
+	udkapi \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_qa_weak,\
+	cppu \
+    cppuhelper \
+	sal \
+    $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk
new file mode 100644
index 000000000000..2fa6d1aa9a5b
--- /dev/null
+++ b/cppuhelper/Library_cppuhelper.mk
@@ -0,0 +1,78 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan@gmail.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.
+
+$(eval $(call gb_Library_Library,cppuhelper))
+
+$(eval $(call gb_Library_set_soversion_script,cppuhelper,3,$(SRCDIR)/cppuhelper/source/gcc3.map))
+
+$(eval $(call gb_Library_add_package_headers,cppuhelper,cppuhelper_generated))
+$(eval $(call gb_Library_add_package_headers,cppuhelper,cppuhelper_inc))
+
+$(eval $(call gb_Library_set_include,cppuhelper,\
+	-I$(WORKDIR)/CustomTarget/cppuhelper/unotypes \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_defs,cppuhelper,\
+	-DCPPUHELPER_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,cppuhelper,\
+	cppu \
+	sal \
+	salhelper \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_cobjects,cppuhelper,\
+	cppuhelper/source/findsofficepath \
+))
+
+$(eval $(call gb_Library_add_exception_objects,cppuhelper,\
+	cppuhelper/source/access_control \
+	cppuhelper/source/bootstrap \
+	cppuhelper/source/component_context \
+	cppuhelper/source/component \
+	cppuhelper/source/exc_thrower \
+	cppuhelper/source/factory \
+	cppuhelper/source/implbase \
+	cppuhelper/source/implbase_ex \
+	cppuhelper/source/implementationentry \
+	cppuhelper/source/interfacecontainer \
+	cppuhelper/source/macro_expander \
+	cppuhelper/source/propertysetmixin \
+	cppuhelper/source/propshlp \
+	cppuhelper/source/servicefactory \
+	cppuhelper/source/shlib \
+	cppuhelper/source/stdidlclass \
+	cppuhelper/source/tdmgr \
+	cppuhelper/source/typeprovider \
+	cppuhelper/source/unourl \
+	cppuhelper/source/weak \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/inc/makefile.mk b/cppuhelper/Makefile
index 5b85c1fb7332..2289c8303bf8 100644
--- a/cppuhelper/inc/makefile.mk
+++ b/cppuhelper/Makefile
@@ -1,8 +1,9 @@
+# -*- Mode: makefile; 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.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -24,16 +25,17 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
 
-PRJNAME=cppuhelper
-TARGET=inc
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else
 
-# --- Settings -----------------------------------------------------
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk
 
-.INCLUDE :  settings.mk
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
+endif
 
-.INCLUDE :  target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk
new file mode 100644
index 000000000000..f2472d5cfd73
--- /dev/null
+++ b/cppuhelper/Module_cppuhelper.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan@gmail.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.
+
+$(eval $(call gb_Module_Module,cppuhelper))
+
+$(eval $(call gb_Module_add_targets,cppuhelper,\
+	Library_cppuhelper \
+	Package_findsofficepath \
+	Package_inc \
+	Package_unorc \
+	Package_unotypes \
+))
+
+$(eval $(call gb_Module_add_check_targets,cppuhelper,\
+	CppunitTest_cppuhelper_cppu_ifcontainer \
+	CppunitTest_cppuhelper_cppu_unourl \
+	CppunitTest_cppuhelper_qa_weak \
+))
+
+# TODO ? (I don't think OOO_SUBSEQUENT_TESTS != "" can be true..
+# someone would have to do it on command line)
+#	qa/propertysetmixin/makefile.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/Package_findsofficepath.mk b/cppuhelper/Package_findsofficepath.mk
new file mode 100644
index 000000000000..b3b0e90264bd
--- /dev/null
+++ b/cppuhelper/Package_findsofficepath.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan@gmail.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.
+
+# UGLY HACK for odk/source/unoapploader/ where we need findsofficepath.o
+$(eval $(call gb_Package_Package,cppuhelper_findsofficepath,$(WORKDIR)/CObject/cppuhelper/source))
+
+$(eval $(call gb_Package_add_file,cppuhelper_findsofficepath,lib/findsofficepath.o,findsofficepath.o))
+$(eval $(call gb_Package_add_file,cppuhelper_findsofficepath,lib/findsofficepath.obj,findsofficepath.o))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/Package_inc.mk b/cppuhelper/Package_inc.mk
new file mode 100644
index 000000000000..60f93642f42b
--- /dev/null
+++ b/cppuhelper/Package_inc.mk
@@ -0,0 +1,86 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan@gmail.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.
+
+$(eval $(call gb_Package_Package,cppuhelper_inc,$(SRCDIR)/cppuhelper/inc))
+
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/cppuhelperdllapi.h,cppuhelper/cppuhelperdllapi.h))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/access_control.hxx,cppuhelper/access_control.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/basemutex.hxx,cppuhelper/basemutex.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/bootstrap.hxx,cppuhelper/bootstrap.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase10.hxx,cppuhelper/compbase10.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase11.hxx,cppuhelper/compbase11.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase12.hxx,cppuhelper/compbase12.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase1.hxx,cppuhelper/compbase1.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase2.hxx,cppuhelper/compbase2.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase3.hxx,cppuhelper/compbase3.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase4.hxx,cppuhelper/compbase4.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase5.hxx,cppuhelper/compbase5.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase6.hxx,cppuhelper/compbase6.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase7.hxx,cppuhelper/compbase7.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase8.hxx,cppuhelper/compbase8.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase9.hxx,cppuhelper/compbase9.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase_ex.hxx,cppuhelper/compbase_ex.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase.hxx,cppuhelper/compbase.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/component_context.hxx,cppuhelper/component_context.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/component.hxx,cppuhelper/component.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/exc_hlp.hxx,cppuhelper/exc_hlp.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/factory.hxx,cppuhelper/factory.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/findsofficepath.h,cppuhelper/findsofficepath.h))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase10.hxx,cppuhelper/implbase10.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase11.hxx,cppuhelper/implbase11.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase12.hxx,cppuhelper/implbase12.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase1.hxx,cppuhelper/implbase1.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase2.hxx,cppuhelper/implbase2.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase3.hxx,cppuhelper/implbase3.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase4.hxx,cppuhelper/implbase4.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase5.hxx,cppuhelper/implbase5.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase6.hxx,cppuhelper/implbase6.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase7.hxx,cppuhelper/implbase7.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase8.hxx,cppuhelper/implbase8.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase9.hxx,cppuhelper/implbase9.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase_ex.hxx,cppuhelper/implbase_ex.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase_ex_post.hxx,cppuhelper/implbase_ex_post.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase_ex_pre.hxx,cppuhelper/implbase_ex_pre.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase.hxx,cppuhelper/implbase.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implementationentry.hxx,cppuhelper/implementationentry.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/interfacecontainer.h,cppuhelper/interfacecontainer.h))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/interfacecontainer.hxx,cppuhelper/interfacecontainer.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/propertysetmixin.hxx,cppuhelper/propertysetmixin.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/propshlp.hxx,cppuhelper/propshlp.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/proptypehlp.h,cppuhelper/proptypehlp.h))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/proptypehlp.hxx,cppuhelper/proptypehlp.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/queryinterface.hxx,cppuhelper/queryinterface.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/servicefactory.hxx,cppuhelper/servicefactory.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/shlib.hxx,cppuhelper/shlib.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/stdidlclass.hxx,cppuhelper/stdidlclass.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/typeprovider.hxx,cppuhelper/typeprovider.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/unourl.hxx,cppuhelper/unourl.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/weakagg.hxx,cppuhelper/weakagg.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/weak.hxx,cppuhelper/weak.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/weakref.hxx,cppuhelper/weakref.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/Package_unorc.mk b/cppuhelper/Package_unorc.mk
new file mode 100644
index 000000000000..11884940eeeb
--- /dev/null
+++ b/cppuhelper/Package_unorc.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan@gmail.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.
+
+$(eval $(call gb_Package_Package,cppuhelper_unorc,$(SRCDIR)/cppuhelper/source))
+
+$(eval $(call gb_Package_add_file,cppuhelper_unorc,bin/uno.ini,unorc))
+$(eval $(call gb_Package_add_file,cppuhelper_unorc,lib/unorc,unorc))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/Package_unotypes.mk b/cppuhelper/Package_unotypes.mk
new file mode 100644
index 000000000000..4e17584b6d24
--- /dev/null
+++ b/cppuhelper/Package_unotypes.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan@gmail.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.
+
+$(eval $(call gb_Package_Package,cppuhelper_generated))
+
+$(eval $(call gb_Package_add_customtarget,cppuhelper_generated,cppuhelper/unotypes))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,cppuhelper/unotypes,\
+	$(gb_UnoApiTarget_CPPUMAKERTARGET) \
+	$(gb_UnoApiTarget_IDLCTARGET) \
+	$(gb_UnoApiTarget_REGMERGETARGET) \
+	$(OUTDIR_FOR_BUILD)/bin/types.rdb \
+	$(OUTDIR_FOR_BUILD)/bin/udkapi.rdb \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/prj/build.lst b/cppuhelper/prj/build.lst
index 570a34560a1c..6e10408c92a8 100644
--- a/cppuhelper/prj/build.lst
+++ b/cppuhelper/prj/build.lst
@@ -1,8 +1,3 @@
 ch	cppuhelper	:	BOOST:boost LIBXSLT:libxslt DESKTOP:codemaker cppu offapi NULL
-ch	cppuhelper								usr1	-	all	ch_mkout NULL
-ch	cppuhelper\inc							nmake	-	all	ch_include NULL
-ch	cppuhelper\source						nmake	-	all	ch_source ch_unotypes ch_include NULL
-ch	cppuhelper\unotypes						nmake	-	all	ch_unotypes NULL
-ch cppuhelper\qa\propertysetmixin nmake - all ch_qa_propertysetmixin ch_source NULL
-ch  cppuhelper\qa\ifcontainer               nmake   -   all ch_qa_ifcontainer ch_source NULL
-ch  cppuhelper\qa\unourl                    nmake   -   all ch_qa_unourl ch_source NULL
+ch	cppuhelper\prj							nmake	-	all	ch_prj NULL
+ch  cppuhelper\qa\propertysetmixin nmake - all ch_qa_propertysetmixin ch_prj NULL
diff --git a/cppuhelper/prj/d.lst b/cppuhelper/prj/d.lst
index a27212ce02bb..e69de29bb2d1 100644
--- a/cppuhelper/prj/d.lst
+++ b/cppuhelper/prj/d.lst
@@ -1,74 +0,0 @@
-mkdir: %_DEST%\inc\cppuhelper
-
-..\inc\cppuhelper\implbase.hxx %_DEST%\inc\cppuhelper\implbase.hxx
-..\inc\cppuhelper\implbase_ex.hxx %_DEST%\inc\cppuhelper\implbase_ex.hxx
-..\inc\cppuhelper\implbase_ex_pre.hxx %_DEST%\inc\cppuhelper\implbase_ex_pre.hxx
-..\inc\cppuhelper\implbase_ex_post.hxx %_DEST%\inc\cppuhelper\implbase_ex_post.hxx
-..\inc\cppuhelper\implbase1.hxx %_DEST%\inc\cppuhelper\implbase1.hxx
-..\inc\cppuhelper\implbase2.hxx %_DEST%\inc\cppuhelper\implbase2.hxx
-..\inc\cppuhelper\implbase3.hxx %_DEST%\inc\cppuhelper\implbase3.hxx
-..\inc\cppuhelper\implbase4.hxx %_DEST%\inc\cppuhelper\implbase4.hxx
-..\inc\cppuhelper\implbase5.hxx %_DEST%\inc\cppuhelper\implbase5.hxx
-..\inc\cppuhelper\implbase6.hxx %_DEST%\inc\cppuhelper\implbase6.hxx
-..\inc\cppuhelper\implbase7.hxx %_DEST%\inc\cppuhelper\implbase7.hxx
-..\inc\cppuhelper\implbase8.hxx %_DEST%\inc\cppuhelper\implbase8.hxx
-..\inc\cppuhelper\implbase9.hxx %_DEST%\inc\cppuhelper\implbase9.hxx
-..\inc\cppuhelper\implbase10.hxx %_DEST%\inc\cppuhelper\implbase10.hxx
-..\inc\cppuhelper\implbase11.hxx %_DEST%\inc\cppuhelper\implbase11.hxx
-..\inc\cppuhelper\implbase12.hxx %_DEST%\inc\cppuhelper\implbase12.hxx
-
-..\inc\cppuhelper\compbase.hxx %_DEST%\inc\cppuhelper\compbase.hxx
-..\inc\cppuhelper\compbase_ex.hxx %_DEST%\inc\cppuhelper\compbase_ex.hxx
-..\inc\cppuhelper\compbase1.hxx %_DEST%\inc\cppuhelper\compbase1.hxx
-..\inc\cppuhelper\compbase2.hxx %_DEST%\inc\cppuhelper\compbase2.hxx
-..\inc\cppuhelper\compbase3.hxx %_DEST%\inc\cppuhelper\compbase3.hxx
-..\inc\cppuhelper\compbase4.hxx %_DEST%\inc\cppuhelper\compbase4.hxx
-..\inc\cppuhelper\compbase5.hxx %_DEST%\inc\cppuhelper\compbase5.hxx
-..\inc\cppuhelper\compbase6.hxx %_DEST%\inc\cppuhelper\compbase6.hxx
-..\inc\cppuhelper\compbase7.hxx %_DEST%\inc\cppuhelper\compbase7.hxx
-..\inc\cppuhelper\compbase8.hxx %_DEST%\inc\cppuhelper\compbase8.hxx
-..\inc\cppuhelper\compbase9.hxx %_DEST%\inc\cppuhelper\compbase9.hxx
-..\inc\cppuhelper\compbase10.hxx %_DEST%\inc\cppuhelper\compbase10.hxx
-..\inc\cppuhelper\compbase11.hxx %_DEST%\inc\cppuhelper\compbase11.hxx
-..\inc\cppuhelper\compbase12.hxx %_DEST%\inc\cppuhelper\compbase12.hxx
-
-..\inc\cppuhelper\shlib.hxx %_DEST%\inc\cppuhelper\shlib.hxx
-..\inc\cppuhelper\basemutex.hxx %_DEST%\inc\cppuhelper\basemutex.hxx
-..\inc\cppuhelper\bootstrap.hxx %_DEST%\inc\cppuhelper\bootstrap.hxx
-..\inc\cppuhelper\exc_hlp.hxx %_DEST%\inc\cppuhelper\exc_hlp.hxx
-..\inc\cppuhelper\typeprovider.hxx %_DEST%\inc\cppuhelper\typeprovider.hxx
-..\inc\cppuhelper\factory.hxx %_DEST%\inc\cppuhelper\factory.hxx
-..\inc\cppuhelper\component_context.hxx %_DEST%\inc\cppuhelper\component_context.hxx
-..\inc\cppuhelper\interfacecontainer.hxx %_DEST%\inc\cppuhelper\interfacecontainer.hxx
-..\inc\cppuhelper\interfacecontainer.h %_DEST%\inc\cppuhelper\interfacecontainer.h
-..\inc\cppuhelper\component.hxx %_DEST%\inc\cppuhelper\component.hxx
-..\inc\cppuhelper\propshlp.hxx %_DEST%\inc\cppuhelper\propshlp.hxx
-..\inc\cppuhelper\proptypehlp.hxx %_DEST%\inc\cppuhelper\proptypehlp.hxx
-..\inc\cppuhelper\propertysetmixin.hxx %_DEST%\inc\cppuhelper\propertysetmixin.hxx
-..\inc\cppuhelper\proptypehlp.h %_DEST%\inc\cppuhelper\proptypehlp.h
-..\inc\cppuhelper\stdidlclass.hxx %_DEST%\inc\cppuhelper\stdidlclass.hxx
-..\inc\cppuhelper\weak.hxx %_DEST%\inc\cppuhelper\weak.hxx
-..\inc\cppuhelper\weakagg.hxx %_DEST%\inc\cppuhelper\weakagg.hxx
-..\inc\cppuhelper\queryinterface.hxx %_DEST%\inc\cppuhelper\queryinterface.hxx
-..\inc\cppuhelper\weakref.hxx %_DEST%\inc\cppuhelper\weakref.hxx
-..\inc\cppuhelper\servicefactory.hxx %_DEST%\inc\cppuhelper\servicefactory.hxx
-..\inc\cppuhelper\implementationentry.hxx %_DEST%\inc\cppuhelper\implementationentry.hxx
-..\inc\cppuhelper\access_control.hxx %_DEST%\inc\cppuhelper\access_control.hxx
-..\inc\cppuhelper\unourl.hxx %_DEST%\inc\cppuhelper\unourl.hxx
-
-..\%__SRC%\bin\cppuh*.dll %_DEST%\bin\cppuh*.dll
-..\%__SRC%\bin\uno_cppuh*.dll %_DEST%\bin\uno_cppuh*.dll
-..\%__SRC%\lib\*cppuhelper*.lib %_DEST%\lib\*
-..\%__SRC%\lib\libuno_cppuhelper*.* %_DEST%\lib\*
-
-..\%__SRC%\lib\libcppuhelper*.a %_DEST%\lib\*
-..\%__SRC%\lib\cppuhelper*.lib %_DEST%\lib\*
-
-..\source\unorc %_DEST%\bin\uno.ini
-..\source\unorc %_DEST%\lib\unorc
-
-..\inc\cppuhelper\findsofficepath.h %_DEST%\inc\cppuhelper\findsofficepath.h
-..\%__SRC%\obj\findsofficepath.o %_DEST%\lib\findsofficepath.o
-..\%__SRC%\obj\findsofficepath.obj %_DEST%\lib\findsofficepath.obj
-
-linklib: libuno_cppuhelper*.*.*
diff --git a/cppuhelper/prj/makefile.mk b/cppuhelper/prj/makefile.mk
new file mode 100644
index 000000000000..0997622e00f6
--- /dev/null
+++ b/cppuhelper/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/cppuhelper/qa/ifcontainer/makefile.mk b/cppuhelper/qa/ifcontainer/makefile.mk
deleted file mode 100644
index 7d01f53e8e14..000000000000
--- a/cppuhelper/qa/ifcontainer/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=cppuhelper
-TARGET=cppu_ifcontainer
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-.IF "$(OS)" == "IOS"
-CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
-.ENDIF
-
-SHL1OBJS=  \
-    $(SLO)$/cppu_ifcontainer.obj
-SHL1TARGET= cppu_ifcontainer
-SHL1STDLIBS=\
-    $(CPPUHELPERLIB) \
-    $(SALLIB) \
-    $(CPPULIB) \
-    $(CPPUNITLIB)
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME    =$(SHL1TARGET)
-SHL1USE_EXPORTS = name
-
-SLOFILES = $(SHL1OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
diff --git a/cppuhelper/qa/unourl/makefile.mk b/cppuhelper/qa/unourl/makefile.mk
deleted file mode 100644
index 1db7e1190929..000000000000
--- a/cppuhelper/qa/unourl/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=cppuhelper
-TARGET=cppu_unourl
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-.IF "$(OS)" == "IOS"
-CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
-.ENDIF
-
-SHL1OBJS=  \
-    $(SLO)$/cppu_unourl.obj
-SHL1TARGET= cppu_unourl
-SHL1STDLIBS=\
-    $(CPPUHELPERLIB) \
-    $(SALLIB) \
-    $(CPPULIB) \
-    $(CPPUNITLIB)
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME    =$(SHL1TARGET)
-SHL1USE_EXPORTS = name
-
-SLOFILES = $(SHL1OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
diff --git a/cppuhelper/qa/weak/makefile.mk b/cppuhelper/qa/weak/makefile.mk
deleted file mode 100644
index 5116886b671c..000000000000
--- a/cppuhelper/qa/weak/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ := ..$/..
-PRJNAME := cppuhelper
-TARGET := qa_weak
-
-ENABLE_EXCEPTIONS := TRUE
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-DLLPRE = # no leading "lib" on .so files
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_weak.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE: target.mk
-
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
-    $(TESTSHL2) $(SHL1TARGETN)
diff --git a/cppuhelper/qa/weak/version.map b/cppuhelper/qa/weak/version.map
deleted file mode 100644
index 3308588ef6f8..000000000000
--- a/cppuhelper/qa/weak/version.map
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        cppunitTestPlugIn;
-
-    local:
-        *;
-};
diff --git a/cppuhelper/source/cc5_solaris_sparc.map b/cppuhelper/source/cc5_solaris_sparc.map
deleted file mode 100755
index 5dd703cf9fc9..000000000000
--- a/cppuhelper/source/cc5_solaris_sparc.map
+++ /dev/null
@@ -1,395 +0,0 @@
-UDK_3_0_0 {
-    global:
-GetVersionInfo;
-_DYNAMIC;
-_GLOBAL_OFFSET_TABLE_;
-_PROCEDURE_LINKAGE_TABLE_;
-__1cDcomDsunEstarDunoTWeakReferenceHelper2G6Mrk4_r4_;
-__1cDcomDsunEstarDunoTWeakReferenceHelper2T5B6M_v_;
-__1cDcomDsunEstarDunoTWeakReferenceHelper2T6M_v_;
-__1cDcomDsunEstarDunoTWeakReferenceHelper2t5B6Mrk4_v_;
-__1cDcomDsunEstarDunoTWeakReferenceHelper2t5B6Mrkn0DJReference4n0DKXInterface____v_;
-__1cDcomDsunEstarDunoTWeakReferenceHelper2t6Mrk4_v_;
-__1cDcomDsunEstarDunoTWeakReferenceHelper2t6Mrkn0DJReference4n0DKXInterface____v_;
-__1cDcomDsunEstarDunoTWeakReferenceHelperDget6kM_n0DJReference4n0DKXInterface____;
-__1cEcppuJClassDataFquery6MrknDcomDsunEstarDunoEType_pn0EElangNXTypeProvider__n0FDAny__;
-__1cEcppuJClassDataIgetTypes6M_nDcomDsunEstarDunoISequence4n0FEType____;
-__1cEcppuJClassDataPwriteTypeOffset6MrknDcomDsunEstarDunoEType_l_v_; #S-ILP32
-__1cEcppuJClassDataPwriteTypeOffset6MrknDcomDsunEstarDunoEType_i_v_; #S-LP64
-__1cEcppuJClassDataQinitTypeProvider6M_v_;
-__1cEcppuJClassDataTgetImplementationId6M_nDcomDsunEstarDunoISequence4CW___;
-__1cEcppuLOWeakObject2T5B6M_v_;
-__1cEcppuLOWeakObject2T6M_v_;
-__1cEcppuLOWeakObjectG__vtbl_;
-__1cEcppuLOWeakObjectHacquire6M_v_;
-__1cEcppuLOWeakObjectHrelease6M_v_;
-__1cEcppuLOWeakObjectMqueryAdapter6M_nDcomDsunEstarDunoJReference4n0FIXAdapter____;
-__1cEcppuLOWeakObjectOqueryInterface6MrknDcomDsunEstarDunoEType__n0FDAny__;
-__1cEcppuNClassDataBase2T5B6M_v_;
-__1cEcppuNClassDataBase2T6M_v_;
-__1cEcppuNClassDataBase2t5B6M_v_;
-__1cEcppuNClassDataBase2t5B6Ml_v_; #S-ILP32
-__1cEcppuNClassDataBase2t5B6Mi_v_; #S-LP64
-__1cEcppuNClassDataBase2t6M_v_;
-__1cEcppuNClassDataBase2t6Ml_v_; #S-ILP32
-__1cEcppuNClassDataBase2t6Mi_v_; #S-LP64
-__1cEcppuOOWeakAggObject2T5B6M_v_;
-__1cEcppuOOWeakAggObject2T6M_v_;
-__1cEcppuOOWeakAggObjectG__vtbl_;
-__1cEcppuOOWeakAggObjectHacquire6M_v_;
-__1cEcppuOOWeakAggObjectHrelease6M_v_;
-__1cEcppuOOWeakAggObjectMsetDelegator6MrknDcomDsunEstarDunoJReference4n0FKXInterface____v_;
-__1cEcppuOOWeakAggObjectOqueryInterface6MrknDcomDsunEstarDunoEType__n0FDAny__;
-__1cEcppuOOWeakAggObjectQqueryAggregation6MrknDcomDsunEstarDunoEType__n0FDAny__;
-__1cEcppuOthrowException6FrknDcomDsunEstarDunoDAny__v_;
-__1cEcppuPOTypeCollection2t5B6MrknDcomDsunEstarDunoEType_88888888888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t5B6MrknDcomDsunEstarDunoEType_8888888888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t5B6MrknDcomDsunEstarDunoEType_888888888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t5B6MrknDcomDsunEstarDunoEType_88888888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t5B6MrknDcomDsunEstarDunoEType_8888888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t5B6MrknDcomDsunEstarDunoEType_888888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t5B6MrknDcomDsunEstarDunoEType_88888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t5B6MrknDcomDsunEstarDunoEType_8888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t5B6MrknDcomDsunEstarDunoEType_888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t5B6MrknDcomDsunEstarDunoEType_88rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t5B6MrknDcomDsunEstarDunoEType_8rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t5B6MrknDcomDsunEstarDunoEType_rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t6MrknDcomDsunEstarDunoEType_88888888888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t6MrknDcomDsunEstarDunoEType_8888888888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t6MrknDcomDsunEstarDunoEType_888888888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t6MrknDcomDsunEstarDunoEType_88888888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t6MrknDcomDsunEstarDunoEType_8888888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t6MrknDcomDsunEstarDunoEType_888888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t6MrknDcomDsunEstarDunoEType_88888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t6MrknDcomDsunEstarDunoEType_8888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t6MrknDcomDsunEstarDunoEType_888rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t6MrknDcomDsunEstarDunoEType_88rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t6MrknDcomDsunEstarDunoEType_8rkn0FISequence4n0G____v_;
-__1cEcppuPOTypeCollection2t6MrknDcomDsunEstarDunoEType_rkn0FISequence4n0G____v_;
-__1cEcppuQOComponentHelper2T5B6M_v_;
-__1cEcppuQOComponentHelper2T6M_v_;
-__1cEcppuQOComponentHelper2t5B6MrnDoslFMutex__v_;
-__1cEcppuQOComponentHelper2t6MrnDoslFMutex__v_;
-__1cEcppuQOComponentHelperG__vtbl_;
-__1cEcppuQOComponentHelperHacquire6M_v_;
-__1cEcppuQOComponentHelperHdispose6M_v_;
-__1cEcppuQOComponentHelperHrelease6M_v_;
-__1cEcppuQOComponentHelperIgetTypes6M_nDcomDsunEstarDunoISequence4n0FEType____;
-__1cEcppuQOComponentHelperJdisposing6M_v_;
-__1cEcppuQOComponentHelperOqueryInterface6MrknDcomDsunEstarDunoEType__n0FDAny__;
-__1cEcppuQOComponentHelperQaddEventListener6MrknDcomDsunEstarDunoJReference4n0EElangOXEventListener____v_;
-__1cEcppuQOComponentHelperQqueryAggregation6MrknDcomDsunEstarDunoEType__n0FDAny__;
-__1cEcppuQOComponentHelperTremoveEventListener6MrknDcomDsunEstarDunoJReference4n0EElangOXEventListener____v_;
-__1cEcppuROImplementationId2T5B6M_v_;
-__1cEcppuROImplementationId2T6M_v_;
-__1cEcppuROImplementationIdTgetImplementationId6kM_nDcomDsunEstarDunoISequence4CW___;
-__1cEcppuSOPropertySetHelper2T5B6M_v_;
-__1cEcppuSOPropertySetHelper2T6M_v_;
-__1cEcppuSOPropertySetHelper2t5B6Mrn0ATOBroadcastHelperVar4n0AbIOMultiTypeInterfaceContainerHelper_nDcomDsunEstarDunoEType____v_;
-__1cEcppuSOPropertySetHelper2t6Mrn0ATOBroadcastHelperVar4n0AbIOMultiTypeInterfaceContainerHelper_nDcomDsunEstarDunoEType____v_;
-__1cEcppuSOPropertySetHelperEfire6MplpknDcomDsunEstarDunoDAny_9AlC_v_; #S-ILP32
-__1cEcppuSOPropertySetHelperEfire6MpipknDcomDsunEstarDunoDAny_9AiC_v_; #S-LP64
-__1cEcppuSOPropertySetHelperG__vtbl_;
-__1cEcppuSOPropertySetHelperJdisposing6M_v_;
-__1cEcppuSOPropertySetHelperOqueryInterface6MrknDcomDsunEstarDunoEType__n0FDAny__;
-__1cEcppuSOPropertySetHelperQgetPropertyValue6MrknDrtlIOUString__nDcomDsunEstarDunoDAny__;
-__1cEcppuSOPropertySetHelperQsetPropertyValue6MrknDrtlIOUString_rknDcomDsunEstarDunoDAny__v_;
-__1cEcppuSOPropertySetHelperRgetPropertyValues6MrknDcomDsunEstarDunoISequence4nDrtlIOUString____n0FISequence4n0FDAny____;
-__1cEcppuSOPropertySetHelperRsetPropertyValues6MrknDcomDsunEstarDunoISequence4nDrtlIOUString___rkn0FISequence4n0FDAny____v_;
-__1cEcppuSOPropertySetHelperUgetFastPropertyValue6Ml_nDcomDsunEstarDunoDAny__; #S-ILP32
-__1cEcppuSOPropertySetHelperUgetFastPropertyValue6Mi_nDcomDsunEstarDunoDAny__; #S-LP64
-__1cEcppuSOPropertySetHelperUsetFastPropertyValue6MlrknDcomDsunEstarDunoDAny__v_; #S-ILP32
-__1cEcppuSOPropertySetHelperUsetFastPropertyValue6MirknDcomDsunEstarDunoDAny__v_; #S-LP64
-__1cEcppuSOPropertySetHelperVcreatePropertySetInfo6Frn0AUIPropertyArrayHelper__nDcomDsunEstarDunoJReference4n0FFbeansQXPropertySetInfo____;
-__1cEcppuSOPropertySetHelperVsetFastPropertyValues6MlplpknDcomDsunEstarDunoDAny_l_v_; #S-ILP32
-__1cEcppuSOPropertySetHelperVsetFastPropertyValues6MipipknDcomDsunEstarDunoDAny_i_v_; #S-LP64
-__1cEcppuSOPropertySetHelperZaddPropertyChangeListener6MrknDrtlIOUString_rknDcomDsunEstarDunoJReference4n0GFbeansXXPropertyChangeListener____v_;
-__1cEcppuSOPropertySetHelperZaddVetoableChangeListener6MrknDrtlIOUString_rknDcomDsunEstarDunoJReference4n0GFbeansXXVetoableChangeListener____v_;
-__1cEcppuSOPropertySetHelperZfirePropertiesChangeEvent6MrknDcomDsunEstarDunoISequence4nDrtlIOUString___rkn0FJReference4n0EFbeansZXPropertiesChangeListener____v_;
-__1cEcppuSOPropertySetHelperbBaddPropertiesChangeListener6MrknDcomDsunEstarDunoISequence4nDrtlIOUString___rkn0FJReference4n0EFbeansZXPropertiesChangeListener____v_;
-__1cEcppuSOPropertySetHelperbCremovePropertyChangeListener6MrknDrtlIOUString_rknDcomDsunEstarDunoJReference4n0GFbeansXXPropertyChangeListener____v_;
-__1cEcppuSOPropertySetHelperbCremoveVetoableChangeListener6MrknDrtlIOUString_rknDcomDsunEstarDunoJReference4n0GFbeansXXVetoableChangeListener____v_;
-__1cEcppuSOPropertySetHelperbEremovePropertiesChangeListener6MrknDcomDsunEstarDunoJReference4n0EFbeansZXPropertiesChangeListener____v_;
-__1cEcppuScreateFactoryProxy6FrknDcomDsunEstarDunoJReference4n0DElangUXMultiServiceFactory___rkn0EJReference4n0FVXSingleServiceFactory____9A_;
-__1cEcppuTcreateSingleFactory6FrknDcomDsunEstarDunoJReference4n0DElangUXMultiServiceFactory___rknDrtlIOUString_pF8_n0EJReference4n0EKXInterface___rkn0EISequence4n0J___pnQ_rtl_ModuleCount__n0EJReference4n0FVXSingleServiceFactory____;
-__1cEcppuUIPropertyArrayHelper2T5B6M_v_;
-__1cEcppuUIPropertyArrayHelper2T6M_v_;
-__1cEcppuUIPropertyArrayHelperG__vtbl_;
-__1cEcppuUOPropertyArrayHelper2t5B6MpnDcomDsunEstarFbeansIProperty_lC_v_; #S-ILP32
-__1cEcppuUOPropertyArrayHelper2t5B6MpnDcomDsunEstarFbeansIProperty_iC_v_; #S-LP64
-__1cEcppuUOPropertyArrayHelper2t5B6MrknDcomDsunEstarDunoISequence4n0EFbeansIProperty___C_v_;
-__1cEcppuUOPropertyArrayHelper2t6MpnDcomDsunEstarFbeansIProperty_lC_v_; #S-ILP32
-__1cEcppuUOPropertyArrayHelper2t6MpnDcomDsunEstarFbeansIProperty_iC_v_; #S-LP64
-__1cEcppuUOPropertyArrayHelper2t6MrknDcomDsunEstarDunoISequence4n0EFbeansIProperty___C_v_;
-__1cEcppuUOPropertyArrayHelperEinit6MC_v_;
-__1cEcppuUOPropertyArrayHelperG__vtbl_;
-__1cEcppuUOPropertyArrayHelperIgetCount6kM_l_; #S-ILP32
-__1cEcppuUOPropertyArrayHelperIgetCount6kM_i_; #S-LP64
-__1cEcppuUOPropertyArrayHelperLfillHandles6MplrknDcomDsunEstarDunoISequence4nDrtlIOUString____l_; #S-ILP32
-__1cEcppuUOPropertyArrayHelperLfillHandles6MpirknDcomDsunEstarDunoISequence4nDrtlIOUString____i_; #S-LP64
-__1cEcppuUOPropertyArrayHelperNgetProperties6M_nDcomDsunEstarDunoISequence4n0EFbeansIProperty____;
-__1cEcppuUOPropertyArrayHelperPgetHandleByName6MrknDrtlIOUString__l_; #S-ILP32
-__1cEcppuUOPropertyArrayHelperPgetHandleByName6MrknDrtlIOUString__i_; #S-LP64
-__1cEcppuUOPropertyArrayHelperRgetPropertyByName6MrknDrtlIOUString__nDcomDsunEstarFbeansIProperty__;
-__1cEcppuUOPropertyArrayHelperRhasPropertyByName6MrknDrtlIOUString__C_;
-__1cEcppuUOPropertyArrayHelperbBfillPropertyMembersByHandle6MpnDrtlIOUString_phl_C_; #S-ILP32
-__1cEcppuUOPropertyArrayHelperbBfillPropertyMembersByHandle6MpnDrtlIOUString_phi_C_; #S-LP64
-__1cEcppuUcreateNestedRegistry6FrknDrtlIOUString__nDcomDsunEstarDunoJReference4n0FIregistryPXSimpleRegistry____;
-__1cEcppuUcreateSimpleRegistry6FrknDrtlIOUString__nDcomDsunEstarDunoJReference4n0FIregistryPXSimpleRegistry____;
-__1cEcppuWcreateComponentContext6Fpkn0ARContextEntry_Init_lrknDcomDsunEstarDunoJReference4n0FRXComponentContext____8_; #S-ILP32
-__1cEcppuWcreateComponentContext6Fpkn0ARContextEntry_Init_irknDcomDsunEstarDunoJReference4n0FRXComponentContext____8_; #S-LP64
-__1cEcppuWgetImplHelperInitMutex6F_rnDoslFMutex__;
-__1cEcppuYOInterfaceIteratorHelper2T5B6M_v_;
-__1cEcppuYOInterfaceIteratorHelper2T6M_v_;
-__1cEcppuYOInterfaceIteratorHelper2t5B6Mrn0AZOInterfaceContainerHelper__v_;
-__1cEcppuYOInterfaceIteratorHelper2t6Mrn0AZOInterfaceContainerHelper__v_;
-__1cEcppuYOInterfaceIteratorHelperEnext6M_pnDcomDsunEstarDunoKXInterface__;
-__1cEcppuYOInterfaceIteratorHelperGremove6M_v_;
-__1cEcppuYcreateOneInstanceFactory6FrknDcomDsunEstarDunoJReference4n0DElangUXMultiServiceFactory___rknDrtlIOUString_pF8_n0EJReference4n0EKXInterface___rkn0EISequence4n0J___pnQ_rtl_ModuleCount__n0EJReference4n0FVXSingleServiceFactory____;
-__1cEcppuZOInterfaceContainerHelper2T5B6M_v_;
-__1cEcppuZOInterfaceContainerHelper2T6M_v_;
-__1cEcppuZOInterfaceContainerHelper2t5B6MrnDoslFMutex__v_;
-__1cEcppuZOInterfaceContainerHelper2t6MrnDoslFMutex__v_;
-__1cEcppuZOInterfaceContainerHelperFclear6M_v_;
-__1cEcppuZOInterfaceContainerHelperJgetLength6kM_l_; #S-ILP32
-__1cEcppuZOInterfaceContainerHelperJgetLength6kM_i_; #S-LP64
-__1cEcppuZOInterfaceContainerHelperLgetElements6kM_nDcomDsunEstarDunoISequence4n0FJReference4n0FKXInterface______;
-__1cEcppuZOInterfaceContainerHelperMaddInterface6MrknDcomDsunEstarDunoJReference4n0FKXInterface____l_; #S-ILP32
-__1cEcppuZOInterfaceContainerHelperMaddInterface6MrknDcomDsunEstarDunoJReference4n0FKXInterface____i_; #S-LP64
-__1cEcppuZOInterfaceContainerHelperPdisposeAndClear6MrknDcomDsunEstarElangLEventObject__v_;
-__1cEcppuZOInterfaceContainerHelperPremoveInterface6MrknDcomDsunEstarDunoJReference4n0FKXInterface____l_; #S-ILP32
-__1cEcppuZOInterfaceContainerHelperPremoveInterface6MrknDcomDsunEstarDunoJReference4n0FKXInterface____i_; #S-LP64
-__1cEcppuZOInterfaceContainerHelperRcopyAndResetInUse6M_v_;
-__1cEcppubBWeakComponentImplHelperBase2T5B6M_v_;
-__1cEcppubBWeakComponentImplHelperBase2T6M_v_;
-__1cEcppubBWeakComponentImplHelperBase2t5B6MrnDoslFMutex__v_;
-__1cEcppubBWeakComponentImplHelperBase2t6MrnDoslFMutex__v_;
-__1cEcppubBWeakComponentImplHelperBaseG__vtbl_;
-__1cEcppubBWeakComponentImplHelperBaseHacquire6M_v_;
-__1cEcppubBWeakComponentImplHelperBaseHdispose6M_v_;
-__1cEcppubBWeakComponentImplHelperBaseHrelease6M_v_;
-__1cEcppubBWeakComponentImplHelperBaseJdisposing6M_v_;
-__1cEcppubBWeakComponentImplHelperBaseOqueryInterface6MrknDcomDsunEstarDunoEType__n0FDAny__;
-__1cEcppubBWeakComponentImplHelperBaseQaddEventListener6MrknDcomDsunEstarDunoJReference4n0EElangOXEventListener____v_;
-__1cEcppubBWeakComponentImplHelperBaseTremoveEventListener6MrknDcomDsunEstarDunoJReference4n0EElangOXEventListener____v_;
-__1cEcppubBcreateSingleRegistryFactory6FrknDcomDsunEstarDunoJReference4n0DElangUXMultiServiceFactory___rknDrtlIOUString_rkn0EJReference4n0DIregistryMXRegistryKey____n0EJReference4n0FVXSingleServiceFactory____;
-__1cEcppubBwriteSharedLibComponentInfo6FrknDrtlIOUString_4rknDcomDsunEstarDunoJReference4n0FElangUXMultiServiceFactory___rkn0GJReference4n0FIregistryMXRegistryKey____v_;
-__1cEcppubCcreateRegistryServiceFactory6FrknDrtlIOUString_4C4_nDcomDsunEstarDunoJReference4n0FElangUXMultiServiceFactory____;
-__1cEcppubCcreateSingleComponentFactory6FpFrknDcomDsunEstarDunoJReference4n0ERXComponentContext____n0EJReference4n0EKXInterface___rknDrtlIOUString_rkn0EISequence4n0K___pnQ_rtl_ModuleCount__n0EJReference4n0DElangXXSingleComponentFactory____;
-__1cEcppubDinstallTypeDescriptionManager6FrknDcomDsunEstarDunoJReference4n0DJcontainerXXHierarchicalNameAccess____C_;
-__1cEcppubDloadSharedLibComponentFactory6FrknDrtlIOUString_44rknDcomDsunEstarDunoJReference4n0FElangUXMultiServiceFactory___rkn0GJReference4n0FIregistryMXRegistryKey____n0GJReference4n0GKXInterface____;
-__1cEcppubEWeakAggComponentImplHelperBase2T5B6M_v_;
-__1cEcppubEWeakAggComponentImplHelperBase2T6M_v_;
-__1cEcppubEWeakAggComponentImplHelperBase2t5B6MrnDoslFMutex__v_;
-__1cEcppubEWeakAggComponentImplHelperBase2t6MrnDoslFMutex__v_;
-__1cEcppubEWeakAggComponentImplHelperBaseG__vtbl_;
-__1cEcppubEWeakAggComponentImplHelperBaseHacquire6M_v_;
-__1cEcppubEWeakAggComponentImplHelperBaseHdispose6M_v_;
-__1cEcppubEWeakAggComponentImplHelperBaseHrelease6M_v_;
-__1cEcppubEWeakAggComponentImplHelperBaseJdisposing6M_v_;
-__1cEcppubEWeakAggComponentImplHelperBaseOqueryInterface6MrknDcomDsunEstarDunoEType__n0FDAny__;
-__1cEcppubEWeakAggComponentImplHelperBaseQaddEventListener6MrknDcomDsunEstarDunoJReference4n0EElangOXEventListener____v_;
-__1cEcppubEWeakAggComponentImplHelperBaseQqueryAggregation6MrknDcomDsunEstarDunoEType__n0FDAny__;
-__1cEcppubEWeakAggComponentImplHelperBaseTremoveEventListener6MrknDcomDsunEstarDunoJReference4n0EElangOXEventListener____v_;
-__1cEcppubE__RTTI__1CpnEcppuLOWeakObject__;
-__1cEcppubF__RTTI__1CpknEcppuLOWeakObject__;
-__1cEcppubFcreateStandardClassWithSequence6FrknDcomDsunEstarDunoJReference4n0DElangUXMultiServiceFactory___rknDrtlIOUString_rkn0EJReference4n0DKreflectionJXIdlClass___rkn0EISequence4n0J____pn0L__;
-__1cEcppubGcreateOneInstanceRegistryFactory6FrknDcomDsunEstarDunoJReference4n0DElangUXMultiServiceFactory___rknDrtlIOUString_rkn0EJReference4n0DIregistryMXRegistryKey____n0EJReference4n0FVXSingleServiceFactory____;
-__1cEcppubH__RTTI__1CpnEcppuOOWeakAggObject__;
-__1cEcppubHbootstrap_InitialComponentContext6FrknDcomDsunEstarDunoJReference4n0DIregistryPXSimpleRegistry___rknDrtlIOUString__n0EJReference4n0ERXComponentContext____;
-__1cEcppubIOMultiTypeInterfaceContainerHelper2T5B6M_v_;
-__1cEcppubIOMultiTypeInterfaceContainerHelper2T6M_v_;
-__1cEcppubIOMultiTypeInterfaceContainerHelper2t5B6MrnDoslFMutex__v_;
-__1cEcppubIOMultiTypeInterfaceContainerHelper2t6MrnDoslFMutex__v_;
-__1cEcppubIOMultiTypeInterfaceContainerHelperFclear6M_v_;
-__1cEcppubIOMultiTypeInterfaceContainerHelperMaddInterface6MrknDcomDsunEstarDunoEType_rkn0FJReference4n0FKXInterface____l_; #S-ILP32
-__1cEcppubIOMultiTypeInterfaceContainerHelperMaddInterface6MrknDcomDsunEstarDunoEType_rkn0FJReference4n0FKXInterface____i_; #S-LP64
-__1cEcppubIOMultiTypeInterfaceContainerHelperMgetContainer6kMrknDcomDsunEstarDunoEType__pn0AZOInterfaceContainerHelper__;
-__1cEcppubIOMultiTypeInterfaceContainerHelperPdisposeAndClear6MrknDcomDsunEstarElangLEventObject__v_;
-__1cEcppubIOMultiTypeInterfaceContainerHelperPremoveInterface6MrknDcomDsunEstarDunoEType_rkn0FJReference4n0FKXInterface____l_; #S-ILP32
-__1cEcppubIOMultiTypeInterfaceContainerHelperPremoveInterface6MrknDcomDsunEstarDunoEType_rkn0FJReference4n0FKXInterface____i_; #S-LP64
-__1cEcppubIOMultiTypeInterfaceContainerHelperRgetContainedTypes6kM_nDcomDsunEstarDunoISequence4n0FEType____;
-__1cEcppubI__RTTI__1CpknEcppuOOWeakAggObject__;
-__1cEcppubJ__RTTI__1CpnEcppuQdDOComponentHelper__;
-__1cEcppubK__RTTI__1CpknEcppuQdDOComponentHelper__;
-__1cEcppubL__RTTI__1CpnEcppuSOPropertySetHelper__;
-__1cEcppubM__RTTI__1CpknEcppuSOPropertySetHelper__;
-__1cEcppubNOMultiTypeInterfaceContainerHelperInt322T5B6M_v_;
-__1cEcppubNOMultiTypeInterfaceContainerHelperInt322T6M_v_;
-__1cEcppubNOMultiTypeInterfaceContainerHelperInt322t5B6MrnDoslFMutex__v_;
-__1cEcppubNOMultiTypeInterfaceContainerHelperInt322t6MrnDoslFMutex__v_;
-__1cEcppubNOMultiTypeInterfaceContainerHelperInt32Fclear6M_v_;
-__1cEcppubNOMultiTypeInterfaceContainerHelperInt32MaddInterface6MrklrknDcomDsunEstarDunoJReference4n0FKXInterface____l_; #S-ILP32
-__1cEcppubNOMultiTypeInterfaceContainerHelperInt32MaddInterface6MrkirknDcomDsunEstarDunoJReference4n0FKXInterface____i_; #S-LP64
-__1cEcppubNOMultiTypeInterfaceContainerHelperInt32MgetContainer6kMrkl_pn0AZOInterfaceContainerHelper__; #S-ILP32
-__1cEcppubNOMultiTypeInterfaceContainerHelperInt32MgetContainer6kMrki_pn0AZOInterfaceContainerHelper__; #S-LP64
-__1cEcppubNOMultiTypeInterfaceContainerHelperInt32PdisposeAndClear6MrknDcomDsunEstarElangLEventObject__v_;
-__1cEcppubNOMultiTypeInterfaceContainerHelperInt32PremoveInterface6MrklrknDcomDsunEstarDunoJReference4n0FKXInterface____l_; #S-ILP32
-__1cEcppubNOMultiTypeInterfaceContainerHelperInt32PremoveInterface6MrkirknDcomDsunEstarDunoJReference4n0FKXInterface____i_; #S-LP64
-__1cEcppubNOMultiTypeInterfaceContainerHelperInt32RgetContainedTypes6kM_nDcomDsunEstarDunoISequence4Cl___; #S-ILP32
-__1cEcppubNOMultiTypeInterfaceContainerHelperInt32RgetContainedTypes6kM_nDcomDsunEstarDunoISequence4Ci___; #S-LP64
-__1cEcppubN__RTTI__1CpnEcppuUIPropertyArrayHelper__;
-__1cEcppubN__RTTI__1CpnEcppuUOPropertyArrayHelper__;
-__1cEcppubO__RTTI__1CpknEcppuUIPropertyArrayHelper__;
-__1cEcppubO__RTTI__1CpknEcppuUOPropertyArrayHelper__;
-__1cEcppubOdefaultBootstrap_InitialComponentContext6F_nDcomDsunEstarDunoJReference4n0ERXComponentContext____;
-__1cEcppubV__RTTI__1CpnEcppubBWeakComponentImplHelperBase__;
-__1cEcppubW__RTTI__1CpknEcppubBWeakComponentImplHelperBase__;
-__1cEcppubY__RTTI__1CpnEcppubEWeakAggComponentImplHelperBase__;
-__1cEcppubZ__RTTI__1CpknEcppubEWeakAggComponentImplHelperBase__;
-_edata;
-_end;
-_etext;
-_fini;
-_init;
-__1cDcomDsunEstarDunobM__RTTI__1nDcomDsunEstarDunoJException__;
-__1cDcomDsunEstarDunobT__RTTI__1nDcomDsunEstarDunoQdDRuntimeException__;
-__1cDcomDsunEstarElangcA__RTTI__1nDcomDsunEstarElangWWrappedTargetException__;
-__1cDcomDsunEstarElangcC__RTTI__1nDcomDsunEstarElangYIllegalArgumentException__;
-__1cDcomDsunEstarFbeanscA__RTTI__1nDcomDsunEstarFbeansVPropertyVetoException__;
-__1cDcomDsunEstarFbeanscD__RTTI__1nDcomDsunEstarFbeansYUnknownPropertyException__;
-__1cDcomDsunEstarGloadercL__RTTI__1nDcomDsunEstarGloaderbECannotActivateFactoryException__;
-__1cDcomDsunEstarIregistrycG__RTTI__1nDcomDsunEstarIregistryYInvalidRegistryException__;
-__1cDcomDsunEstarIregistrycU__RTTI__1nDcomDsunEstarIregistrybLCannotRegisterImplementationException__;
-__1cEcppuZcomponent_writeInfoHelper6Fpv1pkn0ATImplementationEntry__C_;
-__1cEcppubAcomponent_getFactoryHelper6Fpkcpv3pkn0ATImplementationEntry__3_;
-__1cEcppuQImplHelper_query6FrknDcomDsunEstarDunoEType_pn0AKclass_data_pv_n0EDAny__;
-__1cEcppuUWeakImplHelper_query6FrknDcomDsunEstarDunoEType_pn0AKclass_data_pvpn0ALOWeakObject__n0EDAny__;
-__1cEcppubAWeakAggImplHelper_queryAgg6FrknDcomDsunEstarDunoEType_pn0AKclass_data_pvpn0AOOWeakAggObject__n0EDAny__;
-__1cEcppubCImplHelper_queryNoXInterface6FrknDcomDsunEstarDunoEType_pn0AKclass_data_pv_n0EDAny__;
-__1cEcppubDWeakComponentImplHelper_query6FrknDcomDsunEstarDunoEType_pn0AKclass_data_pvpn0AbBWeakComponentImplHelperBase__n0EDAny__;
-__1cEcppubJWeakAggComponentImplHelper_queryAgg6FrknDcomDsunEstarDunoEType_pn0AKclass_data_pvpn0AbEWeakAggComponentImplHelperBase__n0EDAny__;
-__1cEcppuTImplHelper_getTypes6Fpn0AKclass_data__nDcomDsunEstarDunoISequence4n0FEType____;
-__1cEcppuWImplInhHelper_getTypes6Fpn0AKclass_data_rknDcomDsunEstarDunoISequence4n0FEType____7_;
-__1cEcppuXWeakImplHelper_getTypes6Fpn0AKclass_data__nDcomDsunEstarDunoISequence4n0FEType____;
-__1cEcppubAWeakAggImplHelper_getTypes6Fpn0AKclass_data__nDcomDsunEstarDunoISequence4n0FEType____;
-__1cEcppubGWeakComponentImplHelper_getTypes6Fpn0AKclass_data__nDcomDsunEstarDunoISequence4n0FEType____;
-__1cEcppubJWeakAggComponentImplHelper_getTypes6Fpn0AKclass_data__nDcomDsunEstarDunoISequence4n0FEType____;
-__1cEcppubEImplHelper_getImplementationId6Fpn0AKclass_data__nDcomDsunEstarDunoISequence4CW___;
-__1cEcppubOdefaultBootstrap_InitialComponentContext6FrknDrtlIOUString__nDcomDsunEstarDunoJReference4n0GRXComponentContext____;
-
-__1cEcppuNAccessControl2t5B6MrknDcomDsunEstarDunoJReference4n0EIsecurityRXAccessController____v_;
-__1cEcppuNAccessControl2t5B6MrknDcomDsunEstarDunoJReference4n0FRXComponentContext____v_;
-__1cEcppuNAccessControl2t5B6Mrk1_v_;
-__1cEcppuNAccessControl2t6Mrk1_v_;
-__1cEcppuNAccessControl2t6MrknDcomDsunEstarDunoJReference4n0EIsecurityRXAccessController____v_;
-__1cEcppuNAccessControl2t6MrknDcomDsunEstarDunoJReference4n0FRXComponentContext____v_;
-__1cEcppuNAccessControlTcheckFilePermission6MrknDrtlIOUString_5_v_;
-__1cEcppuNAccessControlVcheckSocketPermission6MrknDrtlIOUString_5_v_;
-__1cEcppuNAccessControlWcheckRuntimePermission6MrknDrtlIOUString__v_;
-
-__1cEcppuQUnoUrlDescriptor2t5B6MrknDrtlIOUString__v_;
-__1cEcppuQUnoUrlDescriptor2t6MrknDrtlIOUString__v_;
-__1cEcppuQUnoUrlDescriptor2t5B6Mrk1_v_;
-__1cEcppuQUnoUrlDescriptor2t6Mrk1_v_;
-__1cEcppuQUnoUrlDescriptor2T5B6M_v_;
-__1cEcppuQUnoUrlDescriptor2T6M_v_;
-__1cEcppuGUnoUrl2t5B6MrknDrtlIOUString__v_;
-__1cEcppuGUnoUrl2t6MrknDrtlIOUString__v_;
-__1cEcppuGUnoUrl2t5B6Mrk1_v_;
-__1cEcppuGUnoUrl2t6Mrk1_v_;
-__1cEcppuGUnoUrl2T5B6M_v_;
-__1cEcppuGUnoUrl2T6M_v_;
-__1cEcppuQUnoUrlDescriptor2G6Mrk1_r1_;
-__1cEcppuQUnoUrlDescriptorNgetDescriptor6kM_rknDrtlIOUString__;
-__1cEcppuQUnoUrlDescriptorHgetName6kM_rknDrtlIOUString__;
-__1cEcppuQUnoUrlDescriptorMhasParameter6kMrknDrtlIOUString__b_;
-__1cEcppuQUnoUrlDescriptorMgetParameter6kMrknDrtlIOUString__3_;
-__1cEcppuGUnoUrl2G6Mrk1_r1_;
-__1cEcppuGUnoUrlNgetConnection6kM_rkn0AQUnoUrlDescriptor__;
-__1cEcppuGUnoUrlLgetProtocol6kM_rkn0AQUnoUrlDescriptor__;
-__1cEcppuGUnoUrlNgetObjectName6kM_rknDrtlIOUString__;
-
-    local:
-        *;
-};
-
-UDK_3.1 {
-    global:
-        __1cEcppuSgetCaughtException6F_nDcomDsunEstarDunoDAny__;
-
-        __1cEcppuSOPropertySetHelper2t6Mrn0ATOBroadcastHelperVar4n0AbIOMultiTypeInterfaceContainerHelper_nDcomDsunEstarDunoEType___b_v_;
-        __1cEcppuSOPropertySetHelper2t5B6Mrn0ATOBroadcastHelperVar4n0AbIOMultiTypeInterfaceContainerHelper_nDcomDsunEstarDunoEType___b_v_;
-
-        __1cEcppuJbootstrap6F_nDcomDsunEstarDunoJReference4n0ERXComponentContext____;
-        __1cEcppuSBootstrapException2t6M_v_;
-        __1cEcppuSBootstrapException2t5B6M_v_;
-        __1cEcppuSBootstrapException2t6MrknDrtlIOUString__v_;
-        __1cEcppuSBootstrapException2t5B6MrknDrtlIOUString__v_;
-        __1cEcppuSBootstrapException2t6Mrk1_v_;
-        __1cEcppuSBootstrapException2t5B6Mrk1_v_;
-        __1cEcppuSBootstrapException2T6M_v_;
-        __1cEcppuSBootstrapException2T5B6M_v_;
-        __1cEcppuSBootstrapException2G6Mrk1_r1_;
-        __1cEcppuSBootstrapExceptionKgetMessage6kM_rknDrtlIOUString__;
-        __1cEcppubJ__RTTI__1nEcppuSBootstrapException__;
-        __1cEcppubL__RTTI__1CpnEcppuSBootstrapException__;
-        __1cEcppubM__RTTI__1CpknEcppuSBootstrapException__;
-} UDK_3_0_0;
-
-UDK_3.2 {
-    global:
-    __1cEcppubL__RTTI__1nEcppuUPropertySetMixinImpl__;
-    __1cEcppubN__RTTI__1CpnEcppuUPropertySetMixinImpl__;
-    __1cEcppubO__RTTI__1CpknEcppuUPropertySetMixinImpl__;
-        __1cEcppuUPropertySetMixinImpl2t5B6MrknDcomDsunEstarDunoJReference4n0FRXComponentContext___n0BKImplements_rkn0FISequence4nDrtlIOUString___rkn0FEType__v_;
-        __1cEcppuUPropertySetMixinImpl2T5B6M_v_;
-        __1cEcppuUPropertySetMixinImpl2t6MrknDcomDsunEstarDunoJReference4n0FRXComponentContext___n0BKImplements_rkn0FISequence4nDrtlIOUString___rkn0FEType__v_;
-        __1cEcppuUPropertySetMixinImpl2T6M_v_;
-        __1cEcppuUPropertySetMixinImplbCremovePropertyChangeListener6MrknDrtlIOUString_rknDcomDsunEstarDunoJReference4n0GFbeansXXPropertyChangeListener____v_;
-        __1cEcppuUPropertySetMixinImplbCremoveVetoableChangeListener6MrknDrtlIOUString_rknDcomDsunEstarDunoJReference4n0GFbeansXXVetoableChangeListener____v_;
-        __1cEcppuUPropertySetMixinImplHdispose6M_v_;
-        __1cEcppuUPropertySetMixinImplKprepareSet6MrknDrtlIOUString_rknDcomDsunEstarDunoDAny_9Dpn0BOBoundListeners__v_;
-        __1cEcppuUPropertySetMixinImplOBoundListeners2T5B6M_v_;
-        __1cEcppuUPropertySetMixinImplOBoundListeners2t5B6M_v_;
-        __1cEcppuUPropertySetMixinImplOBoundListeners2T6M_v_;
-        __1cEcppuUPropertySetMixinImplOBoundListeners2t6M_v_;
-        __1cEcppuUPropertySetMixinImplOBoundListenersGnotify6kM_v_;
-        __1cEcppuUPropertySetMixinImplOqueryInterface6MrknDcomDsunEstarDunoEType__n0FDAny__;
-        __1cEcppuUPropertySetMixinImplQgetPropertyValue6MrknDrtlIOUString__nDcomDsunEstarDunoDAny__;
-        __1cEcppuUPropertySetMixinImplQsetPropertyValue6MrknDrtlIOUString_rknDcomDsunEstarDunoDAny__v_;
-        __1cEcppuUPropertySetMixinImplRgetPropertyValues6M_nDcomDsunEstarDunoISequence4n0EFbeansNPropertyValue____;
-        __1cEcppuUPropertySetMixinImplRsetPropertyValues6MrknDcomDsunEstarDunoISequence4n0EFbeansNPropertyValue____v_;
-        __1cEcppuUPropertySetMixinImplSgetPropertySetInfo6M_nDcomDsunEstarDunoJReference4n0EFbeansQXPropertySetInfo____;
-        __1cEcppuUPropertySetMixinImplUgetFastPropertyValue6Ml_nDcomDsunEstarDunoDAny__; #S-ILP32
-        __1cEcppuUPropertySetMixinImplUgetFastPropertyValue6Mi_nDcomDsunEstarDunoDAny__; #S-LP64
-        __1cEcppuUPropertySetMixinImplUsetFastPropertyValue6MlrknDcomDsunEstarDunoDAny__v_; #S-ILP32
-        __1cEcppuUPropertySetMixinImplUsetFastPropertyValue6MirknDcomDsunEstarDunoDAny__v_; #S-LP64
-        __1cEcppuUPropertySetMixinImplZaddPropertyChangeListener6MrknDrtlIOUString_rknDcomDsunEstarDunoJReference4n0GFbeansXXPropertyChangeListener____v_;
-        __1cEcppuUPropertySetMixinImplZaddVetoableChangeListener6MrknDrtlIOUString_rknDcomDsunEstarDunoJReference4n0GFbeansXXVetoableChangeListener____v_;
-} UDK_3.1;
-
-UDK_3.3 { # OOo 2.0.4
-    global:
-        __1cEcppubC__RTTI__1nEcppuLOWeakObject__;
-} UDK_3.2;
-
-UDK_3.4 { # OOo 2.3
-    global:
-        __1cEcppuSOPropertySetHelperIgetTypes6M_nDcomDsunEstarDunoISequence4n0FEType____;
-} UDK_3.3;
-
-UDK_3.5 { # OOo 2.4
-    global:
-        __1cEcppuTbootstrap_expandUri6FrknDrtlIOUString__2_; # rtl::OUString cppu::bootstrap_expandUri(rtl::OUString const &)
-} UDK_3.4;
-
-UDK_3.6 { # OOo 3.0
-    global:
-        __1cEcppuSOPropertySetHelper2t5B6Mrn0ATOBroadcastHelperVar4n0AbIOMultiTypeInterfaceContainerHelper_nDcomDsunEstarDunoEType___pn0AWIEventNotificationHook_b_v_;
-        __1cEcppuSOPropertySetHelper2t6Mrn0ATOBroadcastHelperVar4n0AbIOMultiTypeInterfaceContainerHelper_nDcomDsunEstarDunoEType___pn0AWIEventNotificationHook_b_v_;
-} UDK_3.5;
-
-UDK_3.7 { # OOo 3.3
-    global:
-        __1cEcppuLOWeakObjectbAdisposeWeakConnectionPoint6M_v_;
-        __1cDcomDsunEstarDunoTWeakReferenceHelper2G6Mrkn0DJReference4n0DKXInterface____r4_;
-        __1cDcomDsunEstarDunoTWeakReferenceHelperFclear6M_v_;
-        __1cEcppubHcreateOneInstanceComponentFactory6FpFrknDcomDsunEstarDunoJReference4n0ERXComponentContext____n0EJReference4n0EKXInterface___rknDrtlIOUString_rkn0EISequence4n0K___pnQ_rtl_ModuleCount__n0EJReference4n0DElangXXSingleComponentFactory____;
-} UDK_3.6;
-
-UDK_3.8 { # OOo 3.4
-    global:
-        __1cEcppuSOPropertySetHelperbDsetDependentFastPropertyValue6MlrknDcomDsunEstarDunoDAny__v_;
-} UDK_3.7;
-
diff --git a/cppuhelper/source/gcc3.map b/cppuhelper/source/gcc3.map
index 7903d44b027f..6ce6cf17a044 100644
--- a/cppuhelper/source/gcc3.map
+++ b/cppuhelper/source/gcc3.map
@@ -1,6 +1,7 @@
 UDK_3_0_0 {
     global:
-GetVersionInfo;
+    _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
+
 _ZN3com3sun4star3uno19WeakReferenceHelperC1ERKNS2_9ReferenceINS2_10XInterfaceEEE;
 _ZN3com3sun4star3uno19WeakReferenceHelperC1ERKS3_;
 _ZN3com3sun4star3uno19WeakReferenceHelperC2ERKNS2_9ReferenceINS2_10XInterfaceEEE;
@@ -406,3 +407,9 @@ global:
         _ZN4cppu19OPropertySetHelper232enableChangeListenerNotificationEh;
         _ZThn*_N4cppu19OPropertySetHelper232enableChangeListenerNotificationEh;
 } UDK_3.7;
+
+# Unique libstdc++ symbols:
+GLIBCXX_3.4 {
+    global:
+    _ZGVNSt7num_put*; _ZNSt7num_put*;
+};
diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk
deleted file mode 100755
index 0cbed3d2b39f..000000000000
--- a/cppuhelper/source/makefile.mk
+++ /dev/null
@@ -1,193 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=cppuhelper
-TARGET=cppuhelper
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-# not strictly a bootstrap service but containing
-# bootstrap code that may require generated files
-# without "-L" (light) switch
-BOOTSTRAP_SERVICE=TRUE
-
-.IF "$(COM)" != "MSC"
-UNIXVERSIONNAMES=UDK
-.ENDIF
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCRDEP=$(UNOUCRRDB)
-UNOUCROUT=$(OUT)$/inc$/$(TARGET)
-INCPRE+=$(OUT)$/inc$/$(TARGET) $(OUT)$/inc$/private
-
-CPPUMAKERFLAGS= -C
-
-UNOTYPES= \
-        com.sun.star.beans.PropertyAttribute \
-        com.sun.star.beans.PropertyValue \
-        com.sun.star.beans.XFastPropertySet \
-        com.sun.star.beans.XMultiPropertySet \
-        com.sun.star.beans.XPropertyAccess \
-        com.sun.star.beans.XPropertySet \
-        com.sun.star.beans.XPropertySetOption \
-        com.sun.star.bridge.UnoUrlResolver \
-        com.sun.star.bridge.XUnoUrlResolver \
-        com.sun.star.connection.SocketPermission \
-        com.sun.star.container.XElementAccess \
-        com.sun.star.container.XEnumerationAccess \
-        com.sun.star.container.XHierarchicalNameAccess \
-        com.sun.star.container.XNameAccess \
-        com.sun.star.container.XNameContainer \
-        com.sun.star.container.XSet \
-        com.sun.star.io.FilePermission \
-        com.sun.star.io.IOException \
-        com.sun.star.lang.DisposedException \
-        com.sun.star.lang.WrappedTargetRuntimeException \
-        com.sun.star.lang.XComponent \
-        com.sun.star.lang.XEventListener \
-        com.sun.star.lang.XInitialization \
-        com.sun.star.lang.XMultiComponentFactory \
-        com.sun.star.lang.XMultiServiceFactory \
-        com.sun.star.lang.XServiceInfo \
-        com.sun.star.lang.XSingleComponentFactory \
-        com.sun.star.lang.XSingleServiceFactory \
-        com.sun.star.lang.XTypeProvider \
-        com.sun.star.loader.XImplementationLoader \
-        com.sun.star.reflection.XArrayTypeDescription \
-        com.sun.star.reflection.XCompoundTypeDescription \
-        com.sun.star.reflection.XEnumTypeDescription \
-        com.sun.star.reflection.XIdlClass \
-        com.sun.star.reflection.XIdlField2 \
-        com.sun.star.reflection.XIdlReflection \
-        com.sun.star.reflection.XIndirectTypeDescription \
-        com.sun.star.reflection.XInterfaceAttributeTypeDescription \
-        com.sun.star.reflection.XInterfaceAttributeTypeDescription2 \
-        com.sun.star.reflection.XInterfaceMemberTypeDescription \
-        com.sun.star.reflection.XInterfaceMethodTypeDescription \
-        com.sun.star.reflection.XInterfaceTypeDescription2 \
-        com.sun.star.reflection.XMethodParameter \
-        com.sun.star.reflection.XStructTypeDescription \
-        com.sun.star.reflection.XTypeDescription \
-        com.sun.star.reflection.XUnionTypeDescription \
-        com.sun.star.registry.XImplementationRegistration \
-        com.sun.star.registry.XRegistryKey \
-        com.sun.star.registry.XSimpleRegistry \
-        com.sun.star.security.RuntimePermission \
-        com.sun.star.security.XAccessController \
-        com.sun.star.uno.DeploymentException \
-        com.sun.star.uno.RuntimeException \
-        com.sun.star.uno.XAggregation \
-        com.sun.star.uno.XComponentContext \
-        com.sun.star.uno.XCurrentContext \
-        com.sun.star.uno.XUnloadingPreference \
-        com.sun.star.uno.XWeak \
-        com.sun.star.util.XMacroExpander
-
-.IF "$(debug)" != ""
-# msvc++: no inlining for debugging
-.IF "$(COM)" == "MSC"
-CFLAGS += -Ob0
-.ENDIF
-.ENDIF
-
-SLOFILES= \
-        $(SLO)$/typeprovider.obj 	\
-        $(SLO)$/exc_thrower.obj 	\
-        $(SLO)$/servicefactory.obj 	\
-        $(SLO)$/bootstrap.obj 		\
-        $(SLO)$/implbase.obj 		\
-        $(SLO)$/implbase_ex.obj 	\
-        $(SLO)$/propshlp.obj 		\
-        $(SLO)$/weak.obj		\
-        $(SLO)$/interfacecontainer.obj	\
-        $(SLO)$/stdidlclass.obj 	\
-        $(SLO)$/factory.obj		\
-        $(SLO)$/component_context.obj	\
-        $(SLO)$/component.obj		\
-        $(SLO)$/shlib.obj		\
-        $(SLO)$/tdmgr.obj		\
-        $(SLO)$/implementationentry.obj	\
-        $(SLO)$/access_control.obj	\
-        $(SLO)$/macro_expander.obj \
-            $(SLO)$/unourl.obj \
-        $(SLO)$/propertysetmixin.obj \
-        $(SLO)$/findsofficepath.obj
-
-OBJFILES = $(OBJ)$/findsofficepath.obj
-
-.IF "$(COM)" == "MSC"
-SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID)
-.ELSE
-SHL1TARGET=uno_$(TARGET)$(COMID)
-.ENDIF
-
-SHL1STDLIBS= \
-        $(SALLIB)		\
-        $(SALHELPERLIB)	\
-        $(CPPULIB)
-.IF "$(OS)" == "WNT"
-SHL1STDLIBS += $(ADVAPI32LIB)
-.ENDIF
-
-SHL1DEPN=
-.IF "$(COM)" == "MSC"
-SHL1IMPLIB=i$(TARGET)
-.ELSE
-SHL1IMPLIB=uno_$(TARGET)$(COMID)
-.ENDIF
-SHL1OBJS = $(SLOFILES)
-SHL1RPATH=URELIB
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-
-.IF "$(COMNAME)"=="msci"
-SHL1VERSIONMAP=msvc_win32_intel.map
-.ELIF "$(COMNAME)"=="mscx"
-SHL1VERSIONMAP=msvc_win32_x86_64.map
-.ELIF "$(COMNAME)"=="sunpro5"
-SHL1VERSIONMAP=cc5_solaris_sparc.map
-.ELIF "$(COMNAME)"=="gcc3"
-SHL1VERSIONMAP=gcc3.map
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(diag)"!=""
-CFLAGS += -DDIAG=$(diag)
-.ENDIF
-
-.INCLUDE :	target.mk
diff --git a/cppuhelper/source/msvc_win32_intel.map b/cppuhelper/source/msvc_win32_intel.map
deleted file mode 100644
index 1808e30f8a55..000000000000
--- a/cppuhelper/source/msvc_win32_intel.map
+++ /dev/null
@@ -1,294 +0,0 @@
-UDK_3_0_0 {
-    global:
-GetVersionInfo;
-??0OComponentHelper@cppu@@QAE@AAVMutex@osl@@@Z;
-??1OComponentHelper@cppu@@UAE@XZ;
-??BOWeakObject@cppu@@QAA?AV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-??BWeakReferenceHelper@uno@star@sun@com@@QBA?AV?$Reference@VXInterface@uno@star@sun@com@@@1234@XZ;
-??_7OComponentHelper@cppu@@6BOWeakObject@1@@;
-??_7OComponentHelper@cppu@@6BXAggregation@uno@star@sun@com@@@;
-??_7OComponentHelper@cppu@@6BXComponent@lang@star@sun@com@@@;
-??_7OComponentHelper@cppu@@6BXTypeProvider@lang@star@sun@com@@@;
-??_7OWeakAggObject@cppu@@6BOWeakObject@1@@;
-??_7OWeakAggObject@cppu@@6BXAggregation@uno@star@sun@com@@@;
-??_7OWeakObject@cppu@@6B@;
-??_GOComponentHelper@cppu@@UAEPAXI@Z;
-??_GOWeakAggObject@cppu@@MAEPAXI@Z;
-??_GOWeakObject@cppu@@MAEPAXI@Z;
-?addEventListener@OComponentHelper@cppu@@UAAXABV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
-?dispose@OComponentHelper@cppu@@UAAXXZ;
-?disposing@OComponentHelper@cppu@@MAAXXZ;
-?release@OComponentHelper@cppu@@UAAXXZ;
-?removeEventListener@OComponentHelper@cppu@@UAAXABV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
-??1OTypeCollection@cppu@@QAE@XZ;
-?createFactoryProxy@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@ABV23456@@Z;
-?createOneInstanceRegistryFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@ABVOUString@rtl@@ABV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z;
-?createSingleRegistryFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@ABVOUString@rtl@@ABV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z;
-?getTypes@OTypeCollection@cppu@@QAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-?createStandardClassWithSequence@cppu@@YAPAVXIdlClass@reflection@star@sun@com@@ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@456@ABVOUString@rtl@@ABV?$Reference@VXIdlClass@reflection@star@sun@com@@@8456@ABV?$Sequence@VOUString@rtl@@@8456@@Z;
-??0OInterfaceContainerHelper@cppu@@QAE@AAVMutex@osl@@@Z;
-??0OInterfaceIteratorHelper@cppu@@QAE@AAVOInterfaceContainerHelper@1@@Z;
-??1OInterfaceContainerHelper@cppu@@QAE@XZ;
-??1OInterfaceIteratorHelper@cppu@@QAE@XZ;
-?addInterface@OInterfaceContainerHelper@cppu@@QAAJABV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
-?clear@OInterfaceContainerHelper@cppu@@QAAXXZ;
-?copyAndResetInUse@OInterfaceContainerHelper@cppu@@AAEXXZ;
-?disposeAndClear@OInterfaceContainerHelper@cppu@@QAAXABUEventObject@lang@star@sun@com@@@Z;
-?getElements@OInterfaceContainerHelper@cppu@@QBA?AV?$Sequence@V?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-?getLength@OInterfaceContainerHelper@cppu@@QBAJXZ;
-?next@OInterfaceIteratorHelper@cppu@@QAAPAVXInterface@uno@star@sun@com@@XZ;
-?removeInterface@OInterfaceContainerHelper@cppu@@QAAJABV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
-??0WeakReferenceHelper@uno@star@sun@com@@QAE@ABV01234@@Z;
-??0WeakReferenceHelper@uno@star@sun@com@@QAE@ABV?$Reference@VXInterface@uno@star@sun@com@@@1234@@Z;
-??1OWeakAggObject@cppu@@MAE@XZ;
-??1OWeakObject@cppu@@MAE@XZ;
-??1WeakReferenceHelper@uno@star@sun@com@@QAE@XZ;
-??4WeakReferenceHelper@uno@star@sun@com@@QAAAAV01234@ABV01234@@Z;
-??4WeakReferenceHelper@uno@star@sun@com@@QAAAAV01234@ABV?$Reference@VXInterface@uno@star@sun@com@@@1234@@Z;
-?acquire@OWeakAggObject@cppu@@UAAXXZ;
-?acquire@OWeakObject@cppu@@UAAXXZ;
-?get@WeakReferenceHelper@uno@star@sun@com@@QBA?AV?$Reference@VXInterface@uno@star@sun@com@@@2345@XZ;
-?queryAdapter@OWeakObject@cppu@@UAA?AV?$Reference@VXAdapter@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-?queryAggregation@OWeakAggObject@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
-?queryInterface@OWeakAggObject@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
-?queryInterface@OWeakObject@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
-?release@OWeakAggObject@cppu@@UAAXXZ;
-?release@OWeakObject@cppu@@UAAXXZ;
-?setDelegator@OWeakAggObject@cppu@@UAAXABV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
-??0OPropertyArrayHelper@cppu@@QAE@ABV?$Sequence@UProperty@beans@star@sun@com@@@uno@star@sun@com@@E@Z;
-??0OPropertyArrayHelper@cppu@@QAE@PAUProperty@beans@star@sun@com@@JE@Z;
-??1IPropertyArrayHelper@cppu@@UAE@XZ;
-??1OPropertyArrayHelper@cppu@@UAE@XZ;
-??1OPropertySetHelper@cppu@@QAE@XZ;
-??_7IPropertyArrayHelper@cppu@@6B@;
-??_7OPropertyArrayHelper@cppu@@6B@;
-??_7OPropertySetHelper@cppu@@6BXFastPropertySet@beans@star@sun@com@@@;
-??_7OPropertySetHelper@cppu@@6BXMultiPropertySet@beans@star@sun@com@@@;
-??_7OPropertySetHelper@cppu@@6BXPropertySet@beans@star@sun@com@@@;
-??_GIPropertyArrayHelper@cppu@@UAEPAXI@Z;
-??_GOPropertyArrayHelper@cppu@@UAEPAXI@Z;
-?addPropertiesChangeListener@OPropertySetHelper@cppu@@UAAXABV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@ABV?$Reference@VXPropertiesChangeListener@beans@star@sun@com@@@4567@@Z;
-?addPropertyChangeListener@OPropertySetHelper@cppu@@UAAXABVOUString@rtl@@ABV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-?addVetoableChangeListener@OPropertySetHelper@cppu@@UAAXABVOUString@rtl@@ABV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-?createPropertySetInfo@OPropertySetHelper@cppu@@SA?AV?$Reference@VXPropertySetInfo@beans@star@sun@com@@@uno@star@sun@com@@AAVIPropertyArrayHelper@2@@Z;
-?disposing@OPropertySetHelper@cppu@@QAAXXZ;
-?fillHandles@OPropertyArrayHelper@cppu@@UAAJPAJABV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@@Z;
-?fillPropertyMembersByHandle@OPropertyArrayHelper@cppu@@UAAEPAVOUString@rtl@@PAFJ@Z;
-?fire@OPropertySetHelper@cppu@@IAAXPAJPBVAny@uno@star@sun@com@@1JE@Z;
-?firePropertiesChangeEvent@OPropertySetHelper@cppu@@UAAXABV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@ABV?$Reference@VXPropertiesChangeListener@beans@star@sun@com@@@4567@@Z;
-?getCount@OPropertyArrayHelper@cppu@@QBAJXZ;
-?getFastPropertyValue@OPropertySetHelper@cppu@@UAA?AVAny@uno@star@sun@com@@J@Z;
-?getHandleByName@OPropertyArrayHelper@cppu@@UAAJABVOUString@rtl@@@Z;
-?getProperties@OPropertyArrayHelper@cppu@@UAA?AV?$Sequence@UProperty@beans@star@sun@com@@@uno@star@sun@com@@XZ;
-?getPropertyByName@OPropertyArrayHelper@cppu@@UAA?AUProperty@beans@star@sun@com@@ABVOUString@rtl@@@Z;
-?getPropertyValue@OPropertySetHelper@cppu@@UAA?AVAny@uno@star@sun@com@@ABVOUString@rtl@@@Z;
-?getPropertyValues@OPropertySetHelper@cppu@@UAA?AV?$Sequence@VAny@uno@star@sun@com@@@uno@star@sun@com@@ABV?$Sequence@VOUString@rtl@@@4567@@Z;
-?hasPropertyByName@OPropertyArrayHelper@cppu@@UAAEABVOUString@rtl@@@Z;
-?init@OPropertyArrayHelper@cppu@@AAEXE@Z;
-?queryInterface@OPropertySetHelper@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
-?queryInterface@OPropertySetHelper@cppu@@W3AA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
-?queryInterface@OPropertySetHelper@cppu@@W7AA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
-?removePropertiesChangeListener@OPropertySetHelper@cppu@@UAAXABV?$Reference@VXPropertiesChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-?removePropertyChangeListener@OPropertySetHelper@cppu@@UAAXABVOUString@rtl@@ABV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-?removeVetoableChangeListener@OPropertySetHelper@cppu@@UAAXABVOUString@rtl@@ABV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-?setFastPropertyValue@OPropertySetHelper@cppu@@UAAXJABVAny@uno@star@sun@com@@@Z;
-?setFastPropertyValues@OPropertySetHelper@cppu@@IAAXJPAJPBVAny@uno@star@sun@com@@J@Z;
-?setPropertyValue@OPropertySetHelper@cppu@@UAAXABVOUString@rtl@@ABVAny@uno@star@sun@com@@@Z;
-?setPropertyValues@OPropertySetHelper@cppu@@UAAXABV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@ABV?$Sequence@VAny@uno@star@sun@com@@@4567@@Z;
-??0ClassDataBase@cppu@@QAE@J@Z;
-??0ClassDataBase@cppu@@QAE@XZ;
-??1ClassDataBase@cppu@@QAE@XZ;
-?getImplHelperInitMutex@cppu@@YAAAVMutex@osl@@XZ;
-?getImplementationId@ClassData@cppu@@QAA?AV?$Sequence@C@uno@star@sun@com@@XZ;
-?getTypes@ClassData@cppu@@QAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-?initTypeProvider@ClassData@cppu@@QAAXXZ;
-?query@ClassData@cppu@@QAA?AVAny@uno@star@sun@com@@ABVType@4567@PAVXTypeProvider@lang@567@@Z;
-?writeTypeOffset@ClassData@cppu@@QAAXABVType@uno@star@sun@com@@J@Z;
-?createRegistryServiceFactory@cppu@@YA?AV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@0E0@Z;
-?throwException@cppu@@YAXABVAny@uno@star@sun@com@@@Z;
-??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@00000000000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@0000000000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@000000000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@00000000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@0000000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@000000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@00000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@0000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@00ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@0ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??1OImplementationId@cppu@@QAE@XZ;
-?getImplementationId@OImplementationId@cppu@@QBA?AV?$Sequence@C@uno@star@sun@com@@XZ;
-?writeSharedLibComponentInfo@cppu@@YAXABVOUString@rtl@@0ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@ABV?$Reference@VXRegistryKey@registry@star@sun@com@@@5678@@Z;
-?remove@OInterfaceIteratorHelper@cppu@@QAAXXZ;
-??0OWeakObject@cppu@@QAE@XZ;
-?installTypeDescriptionManager@cppu@@YAEABV?$Reference@VXHierarchicalNameAccess@container@star@sun@com@@@uno@star@sun@com@@@Z;
-?loadSharedLibComponentFactory@cppu@@YA?AV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@00ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@ABV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z;
-?loadSharedLibComponentFactory@cppu@@YA?AV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@00ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@ABV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@0@Z;
-?createComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PBUContextEntry_Init@1@JABV23456@@Z;
-?bootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@ABV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@3456@ABVOUString@rtl@@@Z;
-?createNestedRegistry@cppu@@YA?AV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@@Z;
-?createSimpleRegistry@cppu@@YA?AV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@@Z;
-??0WeakAggComponentImplHelperBase@cppu@@IAE@AAVMutex@osl@@@Z;
-??0WeakComponentImplHelperBase@cppu@@IAE@AAVMutex@osl@@@Z;
-?acquire@WeakAggComponentImplHelperBase@cppu@@UAAXXZ;
-?acquire@WeakComponentImplHelperBase@cppu@@UAAXXZ;
-?addEventListener@WeakAggComponentImplHelperBase@cppu@@UAAXABV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
-?addEventListener@WeakComponentImplHelperBase@cppu@@UAAXABV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
-?dispose@WeakAggComponentImplHelperBase@cppu@@UAAXXZ;
-?dispose@WeakComponentImplHelperBase@cppu@@UAAXXZ;
-?queryAggregation@WeakAggComponentImplHelperBase@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
-?queryInterface@WeakAggComponentImplHelperBase@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
-?queryInterface@WeakComponentImplHelperBase@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
-?release@WeakAggComponentImplHelperBase@cppu@@UAAXXZ;
-?release@WeakComponentImplHelperBase@cppu@@UAAXXZ;
-?removeEventListener@WeakAggComponentImplHelperBase@cppu@@UAAXABV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
-?removeEventListener@WeakComponentImplHelperBase@cppu@@UAAXABV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
-??1WeakAggComponentImplHelperBase@cppu@@UAE@XZ;
-??1WeakComponentImplHelperBase@cppu@@UAE@XZ;
-?disposing@WeakAggComponentImplHelperBase@cppu@@MAAXXZ;
-?disposing@WeakComponentImplHelperBase@cppu@@MAAXXZ;
-?createOneInstanceFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@ABVOUString@rtl@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@0@ZABV?$Sequence@VOUString@rtl@@@3456@PAU_rtl_ModuleCount@@@Z;
-?createSingleComponentFactory@cppu@@YA?AV?$Reference@VXSingleComponentFactory@lang@star@sun@com@@@uno@star@sun@com@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@ABV?$Reference@VXComponentContext@uno@star@sun@com@@@3456@@ZABVOUString@rtl@@ABV?$Sequence@VOUString@rtl@@@3456@PAU_rtl_ModuleCount@@@Z;
-?createSingleFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@ABVOUString@rtl@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@0@ZABV?$Sequence@VOUString@rtl@@@3456@PAU_rtl_ModuleCount@@@Z;
-?defaultBootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-?acquire@OComponentHelper@cppu@@UAAXXZ;
-?getTypes@OComponentHelper@cppu@@UAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-?queryAggregation@OComponentHelper@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
-?queryInterface@OComponentHelper@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
-?removeListener@?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@cppu@@QAEXABVType@uno@star@sun@com@@ABV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z;
-??0OMultiTypeInterfaceContainerHelper@cppu@@QAE@AAVMutex@osl@@@Z;
-??0OMultiTypeInterfaceContainerHelperInt32@cppu@@QAE@AAVMutex@osl@@@Z;
-??1OMultiTypeInterfaceContainerHelper@cppu@@QAE@XZ;
-??1OMultiTypeInterfaceContainerHelperInt32@cppu@@QAE@XZ;
-?addInterface@OMultiTypeInterfaceContainerHelper@cppu@@QAAJABVType@uno@star@sun@com@@ABV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z;
-?addInterface@OMultiTypeInterfaceContainerHelperInt32@cppu@@QAAJABJABV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
-?clear@OMultiTypeInterfaceContainerHelper@cppu@@QAAXXZ;
-?clear@OMultiTypeInterfaceContainerHelperInt32@cppu@@QAAXXZ;
-?disposeAndClear@OMultiTypeInterfaceContainerHelper@cppu@@QAAXABUEventObject@lang@star@sun@com@@@Z;
-?disposeAndClear@OMultiTypeInterfaceContainerHelperInt32@cppu@@QAAXABUEventObject@lang@star@sun@com@@@Z;
-?getContainedTypes@OMultiTypeInterfaceContainerHelper@cppu@@QBA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-?getContainedTypes@OMultiTypeInterfaceContainerHelperInt32@cppu@@QBA?AV?$Sequence@J@uno@star@sun@com@@XZ;
-?getContainer@OMultiTypeInterfaceContainerHelper@cppu@@QBAPAVOInterfaceContainerHelper@2@ABVType@uno@star@sun@com@@@Z;
-?getContainer@OMultiTypeInterfaceContainerHelperInt32@cppu@@QBAPAVOInterfaceContainerHelper@2@ABJ@Z;
-?removeInterface@OMultiTypeInterfaceContainerHelper@cppu@@QAAJABVType@uno@star@sun@com@@ABV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z;
-?removeInterface@OMultiTypeInterfaceContainerHelperInt32@cppu@@QAAJABJABV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
-??0OPropertySetHelper@cppu@@QAE@AAU?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@1@@Z;
-?addListener@?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@cppu@@QAEXABVType@uno@star@sun@com@@ABV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z;
-?component_writeInfoHelper@cppu@@YAEPAX0QBUImplementationEntry@1@@Z;
-?component_getFactoryHelper@cppu@@YAPAXPBDPAX1QBUImplementationEntry@1@@Z;
-?ImplHelper_query@cppu@@YA?AVAny@uno@star@sun@com@@ABVType@3456@PAUclass_data@1@PAX@Z;
-?ImplHelper_queryNoXInterface@cppu@@YA?AVAny@uno@star@sun@com@@ABVType@3456@PAUclass_data@1@PAX@Z;
-?ImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PAUclass_data@1@@Z;
-?ImplInhHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PAUclass_data@1@ABV23456@@Z;
-?ImplHelper_getImplementationId@cppu@@YA?AV?$Sequence@C@uno@star@sun@com@@PAUclass_data@1@@Z;
-?WeakImplHelper_query@cppu@@YA?AVAny@uno@star@sun@com@@ABVType@3456@PAUclass_data@1@PAXPAVOWeakObject@1@@Z;
-?WeakImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PAUclass_data@1@@Z;
-?WeakAggImplHelper_queryAgg@cppu@@YA?AVAny@uno@star@sun@com@@ABVType@3456@PAUclass_data@1@PAXPAVOWeakAggObject@1@@Z;
-?WeakAggComponentImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PAUclass_data@1@@Z;
-?WeakComponentImplHelper_query@cppu@@YA?AVAny@uno@star@sun@com@@ABVType@3456@PAUclass_data@1@PAXPAVWeakComponentImplHelperBase@1@@Z;
-?WeakAggImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PAUclass_data@1@@Z;
-?WeakAggComponentImplHelper_queryAgg@cppu@@YA?AVAny@uno@star@sun@com@@ABVType@3456@PAUclass_data@1@PAXPAVWeakAggComponentImplHelperBase@1@@Z;
-?WeakComponentImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PAUclass_data@1@@Z;
-?defaultBootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@@Z;
-
-??0AccessControl@cppu@@QAE@ABV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@@Z;
-??0AccessControl@cppu@@QAE@ABV?$Reference@VXAccessController@security@star@sun@com@@@uno@star@sun@com@@@Z;
-??0AccessControl@cppu@@QAE@ABV01@@Z;
-?checkRuntimePermission@AccessControl@cppu@@QAAXABVOUString@rtl@@@Z;
-?checkFilePermission@AccessControl@cppu@@QAAXABVOUString@rtl@@0@Z;
-?checkSocketPermission@AccessControl@cppu@@QAAXABVOUString@rtl@@0@Z;
-
-??0UnoUrl@cppu@@QAE@ABV01@@Z;
-??0UnoUrl@cppu@@QAE@ABVOUString@rtl@@@Z;
-??0UnoUrlDescriptor@cppu@@QAE@ABV01@@Z;
-??0UnoUrlDescriptor@cppu@@QAE@ABVOUString@rtl@@@Z;
-??1UnoUrl@cppu@@QAE@XZ;
-??1UnoUrlDescriptor@cppu@@QAE@XZ;
-??4UnoUrl@cppu@@QAEAAV01@ABV01@@Z;
-??4UnoUrlDescriptor@cppu@@QAEAAV01@ABV01@@Z;
-?getConnection@UnoUrl@cppu@@QBEABVUnoUrlDescriptor@2@XZ;
-?getDescriptor@UnoUrlDescriptor@cppu@@QBEABVOUString@rtl@@XZ;
-?getName@UnoUrlDescriptor@cppu@@QBEABVOUString@rtl@@XZ;
-?getObjectName@UnoUrl@cppu@@QBEABVOUString@rtl@@XZ;
-?getParameter@UnoUrlDescriptor@cppu@@QBE?AVOUString@rtl@@ABV34@@Z;
-?getProtocol@UnoUrl@cppu@@QBEABVUnoUrlDescriptor@2@XZ;
-?hasParameter@UnoUrlDescriptor@cppu@@QBE_NABVOUString@rtl@@@Z;
-
-    local:
-        *;
-};
-
-UDK_3.1 {
-    global:
-        ?getCaughtException@cppu@@YA?AVAny@uno@star@sun@com@@XZ;
-
-        ??0OPropertySetHelper@cppu@@QAE@AAU?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@1@_N@Z;
-
-        ?bootstrap@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-        ??0BootstrapException@cppu@@QAE@XZ;
-        ??0BootstrapException@cppu@@QAE@ABVOUString@rtl@@@Z;
-        ??0BootstrapException@cppu@@QAE@ABV01@@Z;
-        ??1BootstrapException@cppu@@UAE@XZ;
-        ??4BootstrapException@cppu@@QAEAAV01@ABV01@@Z;
-        ?getMessage@BootstrapException@cppu@@QBEABVOUString@rtl@@XZ;
-} UDK_3_0_0;
-
-UDK_3.2 {
-    global:
-        ??1PropertySetMixinImpl@cppu@@AAE@XZ;
-        ?queryInterface@PropertySetMixinImpl@cppu@@MAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
-        ?getPropertySetInfo@PropertySetMixinImpl@cppu@@MAA?AV?$Reference@VXPropertySetInfo@beans@star@sun@com@@@uno@star@sun@com@@XZ;
-        ?notify@BoundListeners@PropertySetMixinImpl@cppu@@QBEXXZ;
-        ?setPropertyValue@PropertySetMixinImpl@cppu@@MAAXABVOUString@rtl@@ABVAny@uno@star@sun@com@@@Z;
-        ?getPropertyValue@PropertySetMixinImpl@cppu@@MAA?AVAny@uno@star@sun@com@@ABVOUString@rtl@@@Z;
-        ?removePropertyChangeListener@PropertySetMixinImpl@cppu@@MAAXABVOUString@rtl@@ABV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-        ?removeVetoableChangeListener@PropertySetMixinImpl@cppu@@MAAXABVOUString@rtl@@ABV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-        ?setFastPropertyValue@PropertySetMixinImpl@cppu@@MAAXJABVAny@uno@star@sun@com@@@Z;
-        ?getFastPropertyValue@PropertySetMixinImpl@cppu@@MAA?AVAny@uno@star@sun@com@@J@Z;
-        ?getPropertyValues@PropertySetMixinImpl@cppu@@MAA?AV?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@XZ;
-        ?setPropertyValues@PropertySetMixinImpl@cppu@@MAAXABV?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-        ?prepareSet@PropertySetMixinImpl@cppu@@IAEXABVOUString@rtl@@ABVAny@uno@star@sun@com@@1PAVBoundListeners@12@@Z;
-        ??0BoundListeners@PropertySetMixinImpl@cppu@@QAE@XZ;
-        ??1BoundListeners@PropertySetMixinImpl@cppu@@QAE@XZ;
-        ??0PropertySetMixinImpl@cppu@@AAE@ABV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@W4Implements@01@ABV?$Sequence@VOUString@rtl@@@3456@ABVType@3456@@Z;
-        ?dispose@PropertySetMixinImpl@cppu@@IAEXXZ;
-        ?addPropertyChangeListener@PropertySetMixinImpl@cppu@@MAAXABVOUString@rtl@@ABV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-        ?addVetoableChangeListener@PropertySetMixinImpl@cppu@@MAAXABVOUString@rtl@@ABV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-} UDK_3.1;
-
-UDK_3.3 {
-    global:
-        ?getTypes@OPropertySetHelper@cppu@@QAE?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-} UDK_3.2;
-
-UDK_3.4 { # OOo 2.4
-    global:
-        ?bootstrap_expandUri@cppu@@YA?AVOUString@rtl@@ABV23@@Z; # rtl::OUString cppu::bootstrap_expandUri(rtl::OUString const &)
-} UDK_3.3;
-
-UDK_3.5 { # OOo 3.0
-    global:
-        ??0OPropertySetHelper@cppu@@QAE@AAU?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@1@PAVIEventNotificationHook@1@_N@Z;
-} UDK_3.4;
-
-UDK_3.6 { # OOo 3.3
-    global:
-        ?disposeWeakConnectionPoint@OWeakObject@cppu@@IAEXXZ;
-        ?clear@WeakReferenceHelper@uno@star@sun@com@@QAAXXZ;
-        ?createOneInstanceComponentFactory@cppu@@YA?AV?$Reference@VXSingleComponentFactory@lang@star@sun@com@@@uno@star@sun@com@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@ABV?$Reference@VXComponentContext@uno@star@sun@com@@@3456@@ZABVOUString@rtl@@ABV?$Sequence@VOUString@rtl@@@3456@PAU_rtl_ModuleCount@@@Z;
-} UDK_3.5;
-
-UDK_3.7 { # OOo 3.4
-    global:
-        ?setDependentFastPropertyValue@OPropertySetHelper@cppu@@IAEXJABVAny@uno@star@sun@com@@@Z;
-} UDK_3.6;
-
-UDK_3.8 { # LibO 3.5
-    global:
-	??1OPropertySetHelper2@cppu@@UAE@XZ;
-	??0OPropertySetHelper2@cppu@@QAE@AAU?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@1@PAVIEventNotificationHook@1@_N@Z;
-	?queryInterface@OPropertySetHelper2@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
-        ?enableChangeListenerNotification@OPropertySetHelper2@cppu@@UAAXE@Z;
-} UDK_3.7;
diff --git a/cppuhelper/source/msvc_win32_x86_64.map b/cppuhelper/source/msvc_win32_x86_64.map
deleted file mode 100644
index 40a6c0d314f8..000000000000
--- a/cppuhelper/source/msvc_win32_x86_64.map
+++ /dev/null
@@ -1,280 +0,0 @@
-UDK_3_0_0 {
-    global:
-GetVersionInfo;
-??0OComponentHelper@cppu@@QEAA@AEAVMutex@osl@@@Z;
-??1OComponentHelper@cppu@@UEAA@XZ;
-??BOWeakObject@cppu@@QEAA?AV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-??BWeakReferenceHelper@uno@star@sun@com@@QEBA?AV?$Reference@VXInterface@uno@star@sun@com@@@1234@XZ;
-??_7OComponentHelper@cppu@@6BOWeakObject@1@@;
-??_7OComponentHelper@cppu@@6BXAggregation@uno@star@sun@com@@@;
-??_7OComponentHelper@cppu@@6BXComponent@lang@star@sun@com@@@;
-??_7OComponentHelper@cppu@@6BXTypeProvider@lang@star@sun@com@@@;
-??_7OWeakAggObject@cppu@@6BOWeakObject@1@@;
-??_7OWeakAggObject@cppu@@6BXAggregation@uno@star@sun@com@@@;
-??_7OWeakObject@cppu@@6B@;
-??_GOComponentHelper@cppu@@UEAAPEAXI@Z;
-??_GOWeakAggObject@cppu@@MEAAPEAXI@Z;
-??_GOWeakObject@cppu@@MEAAPEAXI@Z;
-?addEventListener@OComponentHelper@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
-?dispose@OComponentHelper@cppu@@UEAAXXZ;
-?disposing@OComponentHelper@cppu@@MEAAXXZ;
-?release@OComponentHelper@cppu@@UEAAXXZ;
-?removeEventListener@OComponentHelper@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
-??1OTypeCollection@cppu@@QEAA@XZ;
-?createFactoryProxy@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBV23456@@Z;
-?createOneInstanceRegistryFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBVOUString@rtl@@AEBV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z;
-?createSingleRegistryFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBVOUString@rtl@@AEBV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z;
-?getTypes@OTypeCollection@cppu@@QEAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-?createStandardClassWithSequence@cppu@@YAPEAVXIdlClass@reflection@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@456@AEBVOUString@rtl@@AEBV?$Reference@VXIdlClass@reflection@star@sun@com@@@8456@AEBV?$Sequence@VOUString@rtl@@@8456@@Z;
-??0OInterfaceContainerHelper@cppu@@QEAA@AEAVMutex@osl@@@Z;
-??0OInterfaceIteratorHelper@cppu@@QEAA@AEAVOInterfaceContainerHelper@1@@Z;
-??1OInterfaceContainerHelper@cppu@@QEAA@XZ;
-??1OInterfaceIteratorHelper@cppu@@QEAA@XZ;
-?addInterface@OInterfaceContainerHelper@cppu@@QEAAJAEBV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
-?clear@OInterfaceContainerHelper@cppu@@QEAAXXZ;
-?copyAndResetInUse@OInterfaceContainerHelper@cppu@@AEAAXXZ;
-?disposeAndClear@OInterfaceContainerHelper@cppu@@QEAAXAEBUEventObject@lang@star@sun@com@@@Z;
-?getElements@OInterfaceContainerHelper@cppu@@QEBA?AV?$Sequence@V?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-?getLength@OInterfaceContainerHelper@cppu@@QEBAJXZ;
-?next@OInterfaceIteratorHelper@cppu@@QEAAPEAVXInterface@uno@star@sun@com@@XZ;
-?removeInterface@OInterfaceContainerHelper@cppu@@QEAAJAEBV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
-??0WeakReferenceHelper@uno@star@sun@com@@QEAA@AEBV01234@@Z;
-??0WeakReferenceHelper@uno@star@sun@com@@QEAA@AEBV?$Reference@VXInterface@uno@star@sun@com@@@1234@@Z;
-??1OWeakAggObject@cppu@@MEAA@XZ;
-??1OWeakObject@cppu@@MEAA@XZ;
-??1WeakReferenceHelper@uno@star@sun@com@@QEAA@XZ;
-??4WeakReferenceHelper@uno@star@sun@com@@QEAAAEAV01234@AEBV01234@@Z;
-??4WeakReferenceHelper@uno@star@sun@com@@QEAAAEAV01234@AEBV?$Reference@VXInterface@uno@star@sun@com@@@1234@@Z;
-?acquire@OWeakAggObject@cppu@@UEAAXXZ;
-?acquire@OWeakObject@cppu@@UEAAXXZ;
-?get@WeakReferenceHelper@uno@star@sun@com@@QEBA?AV?$Reference@VXInterface@uno@star@sun@com@@@2345@XZ;
-?queryAdapter@OWeakObject@cppu@@UEAA?AV?$Reference@VXAdapter@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-?queryAggregation@OWeakAggObject@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
-?queryInterface@OWeakAggObject@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
-?queryInterface@OWeakObject@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
-?release@OWeakAggObject@cppu@@UEAAXXZ;
-?release@OWeakObject@cppu@@UEAAXXZ;
-?setDelegator@OWeakAggObject@cppu@@UEAAXAEBV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
-??0OPropertyArrayHelper@cppu@@QEAA@AEBV?$Sequence@UProperty@beans@star@sun@com@@@uno@star@sun@com@@E@Z;
-??0OPropertyArrayHelper@cppu@@QEAA@PEAUProperty@beans@star@sun@com@@JE@Z;
-??1IPropertyArrayHelper@cppu@@UEAA@XZ;
-??1OPropertyArrayHelper@cppu@@UEAA@XZ;
-??1OPropertySetHelper@cppu@@QEAA@XZ;
-??_7IPropertyArrayHelper@cppu@@6B@;
-??_7OPropertyArrayHelper@cppu@@6B@;
-??_7OPropertySetHelper@cppu@@6BXFastPropertySet@beans@star@sun@com@@@;
-??_7OPropertySetHelper@cppu@@6BXMultiPropertySet@beans@star@sun@com@@@;
-??_7OPropertySetHelper@cppu@@6BXPropertySet@beans@star@sun@com@@@;
-??_GIPropertyArrayHelper@cppu@@UEAAPEAXI@Z;
-??_GOPropertyArrayHelper@cppu@@UEAAPEAXI@Z;
-?addPropertiesChangeListener@OPropertySetHelper@cppu@@UEAAXAEBV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@AEBV?$Reference@VXPropertiesChangeListener@beans@star@sun@com@@@4567@@Z;
-?addPropertyChangeListener@OPropertySetHelper@cppu@@UEAAXAEBVOUString@rtl@@AEBV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-?addVetoableChangeListener@OPropertySetHelper@cppu@@UEAAXAEBVOUString@rtl@@AEBV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-?createPropertySetInfo@OPropertySetHelper@cppu@@SA?AV?$Reference@VXPropertySetInfo@beans@star@sun@com@@@uno@star@sun@com@@AEAVIPropertyArrayHelper@2@@Z;
-?disposing@OPropertySetHelper@cppu@@QEAAXXZ;
-?fillHandles@OPropertyArrayHelper@cppu@@UEAAJPEAJAEBV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@@Z;
-?fillPropertyMembersByHandle@OPropertyArrayHelper@cppu@@UEAAEPEAVOUString@rtl@@PEAFJ@Z;
-?fire@OPropertySetHelper@cppu@@IEAAXPEAJPEBVAny@uno@star@sun@com@@1JE@Z;
-?firePropertiesChangeEvent@OPropertySetHelper@cppu@@UEAAXAEBV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@AEBV?$Reference@VXPropertiesChangeListener@beans@star@sun@com@@@4567@@Z;
-?getCount@OPropertyArrayHelper@cppu@@QEBAJXZ;
-?getFastPropertyValue@OPropertySetHelper@cppu@@UEAA?AVAny@uno@star@sun@com@@J@Z;
-?getHandleByName@OPropertyArrayHelper@cppu@@UEAAJAEBVOUString@rtl@@@Z;
-?getProperties@OPropertyArrayHelper@cppu@@UEAA?AV?$Sequence@UProperty@beans@star@sun@com@@@uno@star@sun@com@@XZ;
-?getPropertyByName@OPropertyArrayHelper@cppu@@UEAA?AUProperty@beans@star@sun@com@@AEBVOUString@rtl@@@Z;
-?getPropertyValue@OPropertySetHelper@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVOUString@rtl@@@Z;
-?getPropertyValues@OPropertySetHelper@cppu@@UEAA?AV?$Sequence@VAny@uno@star@sun@com@@@uno@star@sun@com@@AEBV?$Sequence@VOUString@rtl@@@4567@@Z;
-?hasPropertyByName@OPropertyArrayHelper@cppu@@UEAAEAEBVOUString@rtl@@@Z;
-?init@OPropertyArrayHelper@cppu@@AEAAXE@Z;
-?queryInterface@OPropertySetHelper@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
-?queryInterface@OPropertySetHelper@cppu@@W7EAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
-?queryInterface@OPropertySetHelper@cppu@@WBA@EAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
-?removePropertiesChangeListener@OPropertySetHelper@cppu@@UEAAXAEBV?$Reference@VXPropertiesChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-?removePropertyChangeListener@OPropertySetHelper@cppu@@UEAAXAEBVOUString@rtl@@AEBV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-?removeVetoableChangeListener@OPropertySetHelper@cppu@@UEAAXAEBVOUString@rtl@@AEBV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-?setFastPropertyValue@OPropertySetHelper@cppu@@UEAAXJAEBVAny@uno@star@sun@com@@@Z;
-?setFastPropertyValues@OPropertySetHelper@cppu@@IEAAXJPEAJPEBVAny@uno@star@sun@com@@J@Z;
-?setPropertyValue@OPropertySetHelper@cppu@@UEAAXAEBVOUString@rtl@@AEBVAny@uno@star@sun@com@@@Z;
-?setPropertyValues@OPropertySetHelper@cppu@@UEAAXAEBV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@AEBV?$Sequence@VAny@uno@star@sun@com@@@4567@@Z;
-??0ClassDataBase@cppu@@QEAA@J@Z;
-??0ClassDataBase@cppu@@QEAA@XZ;
-??1ClassDataBase@cppu@@QEAA@XZ;
-?getImplHelperInitMutex@cppu@@YAAEAVMutex@osl@@XZ;
-?getImplementationId@ClassData@cppu@@QEAA?AV?$Sequence@C@uno@star@sun@com@@XZ;
-?getTypes@ClassData@cppu@@QEAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-?initTypeProvider@ClassData@cppu@@QEAAXXZ;
-?query@ClassData@cppu@@QEAA?AVAny@uno@star@sun@com@@AEBVType@4567@PEAVXTypeProvider@lang@567@@Z;
-?writeTypeOffset@ClassData@cppu@@QEAAXAEBVType@uno@star@sun@com@@J@Z;
-?createRegistryServiceFactory@cppu@@YA?AV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBVOUString@rtl@@0E0@Z;
-?throwException@cppu@@YAXAEBVAny@uno@star@sun@com@@@Z;
-??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@00000000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@0000000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@000000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@00000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@0000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@00000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@0000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@00AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@0AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
-??1OImplementationId@cppu@@QEAA@XZ;
-?getImplementationId@OImplementationId@cppu@@QEBA?AV?$Sequence@C@uno@star@sun@com@@XZ;
-?writeSharedLibComponentInfo@cppu@@YAXAEBVOUString@rtl@@0AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXRegistryKey@registry@star@sun@com@@@5678@@Z;
-?remove@OInterfaceIteratorHelper@cppu@@QEAAXXZ;
-??0OWeakObject@cppu@@QEAA@XZ;
-?installTypeDescriptionManager@cppu@@YAEAEBV?$Reference@VXHierarchicalNameAccess@container@star@sun@com@@@uno@star@sun@com@@@Z;
-?loadSharedLibComponentFactory@cppu@@YA?AV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@AEBVOUString@rtl@@00AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z;
-?createComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PEBUContextEntry_Init@1@JAEBV23456@@Z;
-?bootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@3456@AEBVOUString@rtl@@@Z;
-?createNestedRegistry@cppu@@YA?AV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@uno@star@sun@com@@AEBVOUString@rtl@@@Z;
-?createSimpleRegistry@cppu@@YA?AV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@uno@star@sun@com@@AEBVOUString@rtl@@@Z;
-??0WeakAggComponentImplHelperBase@cppu@@IEAA@AEAVMutex@osl@@@Z;
-??0WeakComponentImplHelperBase@cppu@@IEAA@AEAVMutex@osl@@@Z;
-?acquire@WeakAggComponentImplHelperBase@cppu@@UEAAXXZ;
-?acquire@WeakComponentImplHelperBase@cppu@@UEAAXXZ;
-?addEventListener@WeakAggComponentImplHelperBase@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
-?addEventListener@WeakComponentImplHelperBase@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
-?dispose@WeakAggComponentImplHelperBase@cppu@@UEAAXXZ;
-?dispose@WeakComponentImplHelperBase@cppu@@UEAAXXZ;
-?queryAggregation@WeakAggComponentImplHelperBase@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
-?queryInterface@WeakAggComponentImplHelperBase@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
-?queryInterface@WeakComponentImplHelperBase@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
-?release@WeakAggComponentImplHelperBase@cppu@@UEAAXXZ;
-?release@WeakComponentImplHelperBase@cppu@@UEAAXXZ;
-?removeEventListener@WeakAggComponentImplHelperBase@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
-?removeEventListener@WeakComponentImplHelperBase@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
-??1WeakAggComponentImplHelperBase@cppu@@UEAA@XZ;
-??1WeakComponentImplHelperBase@cppu@@UEAA@XZ;
-?disposing@WeakAggComponentImplHelperBase@cppu@@MEAAXXZ;
-?disposing@WeakComponentImplHelperBase@cppu@@MEAAXXZ;
-?createOneInstanceFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBVOUString@rtl@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@0@ZAEBV?$Sequence@VOUString@rtl@@@3456@PEAU_rtl_ModuleCount@@@Z;
-?createSingleComponentFactory@cppu@@YA?AV?$Reference@VXSingleComponentFactory@lang@star@sun@com@@@uno@star@sun@com@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@AEBV?$Reference@VXComponentContext@uno@star@sun@com@@@3456@@ZAEBVOUString@rtl@@AEBV?$Sequence@VOUString@rtl@@@3456@PEAU_rtl_ModuleCount@@@Z;
-?createSingleFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBVOUString@rtl@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@0@ZAEBV?$Sequence@VOUString@rtl@@@3456@PEAU_rtl_ModuleCount@@@Z;
-?defaultBootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-?acquire@OComponentHelper@cppu@@UEAAXXZ;
-?getTypes@OComponentHelper@cppu@@UEAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-?queryAggregation@OComponentHelper@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
-?queryInterface@OComponentHelper@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
-?removeListener@?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@cppu@@QEAAXAEBVType@uno@star@sun@com@@AEBV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z;
-??0OMultiTypeInterfaceContainerHelper@cppu@@QEAA@AEAVMutex@osl@@@Z;
-??0OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAA@AEAVMutex@osl@@@Z;
-??1OMultiTypeInterfaceContainerHelper@cppu@@QEAA@XZ;
-??1OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAA@XZ;
-?addInterface@OMultiTypeInterfaceContainerHelper@cppu@@QEAAJAEBVType@uno@star@sun@com@@AEBV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z;
-?addInterface@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAAJAEBJAEBV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
-?clear@OMultiTypeInterfaceContainerHelper@cppu@@QEAAXXZ;
-?clear@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAAXXZ;
-?disposeAndClear@OMultiTypeInterfaceContainerHelper@cppu@@QEAAXAEBUEventObject@lang@star@sun@com@@@Z;
-?disposeAndClear@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAAXAEBUEventObject@lang@star@sun@com@@@Z;
-?getContainedTypes@OMultiTypeInterfaceContainerHelper@cppu@@QEBA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-?getContainedTypes@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEBA?AV?$Sequence@J@uno@star@sun@com@@XZ;
-?getContainer@OMultiTypeInterfaceContainerHelper@cppu@@QEBAPEAVOInterfaceContainerHelper@2@AEBVType@uno@star@sun@com@@@Z;
-?getContainer@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEBAPEAVOInterfaceContainerHelper@2@AEBJ@Z;
-?removeInterface@OMultiTypeInterfaceContainerHelper@cppu@@QEAAJAEBVType@uno@star@sun@com@@AEBV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z;
-?removeInterface@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAAJAEBJAEBV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
-??0OPropertySetHelper@cppu@@QEAA@AEAU?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@1@@Z;
-?addListener@?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@cppu@@QEAAXAEBVType@uno@star@sun@com@@AEBV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z;
-?component_writeInfoHelper@cppu@@YAEPEAX0QEBUImplementationEntry@1@@Z;
-?component_getFactoryHelper@cppu@@YAPEAXPEBDPEAX1QEBUImplementationEntry@1@@Z;
-?ImplHelper_query@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAX@Z;
-?ImplHelper_queryNoXInterface@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAX@Z;
-?ImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@@Z;
-?ImplInhHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@AEBV23456@@Z;
-?ImplHelper_getImplementationId@cppu@@YA?AV?$Sequence@C@uno@star@sun@com@@PEAUclass_data@1@@Z;
-?WeakImplHelper_query@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAXPEAVOWeakObject@1@@Z;
-?WeakImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@@Z;
-?WeakAggImplHelper_queryAgg@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAXPEAVOWeakAggObject@1@@Z;
-?WeakAggComponentImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@@Z;
-?WeakComponentImplHelper_query@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAXPEAVWeakComponentImplHelperBase@1@@Z;
-?WeakAggImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@@Z;
-?WeakAggComponentImplHelper_queryAgg@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAXPEAVWeakAggComponentImplHelperBase@1@@Z;
-?WeakComponentImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@@Z;
-?defaultBootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@AEBVOUString@rtl@@@Z;
-
-??0AccessControl@cppu@@QEAA@AEBV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@@Z;
-??0AccessControl@cppu@@QEAA@AEBV?$Reference@VXAccessController@security@star@sun@com@@@uno@star@sun@com@@@Z;
-??0AccessControl@cppu@@QEAA@AEBV01@@Z;
-?checkRuntimePermission@AccessControl@cppu@@QEAAXAEBVOUString@rtl@@@Z;
-?checkFilePermission@AccessControl@cppu@@QEAAXAEBVOUString@rtl@@0@Z;
-?checkSocketPermission@AccessControl@cppu@@QEAAXAEBVOUString@rtl@@0@Z;
-
-??0UnoUrl@cppu@@QEAA@AEBV01@@Z;
-??0UnoUrl@cppu@@QEAA@AEBVOUString@rtl@@@Z;
-??0UnoUrlDescriptor@cppu@@QEAA@AEBV01@@Z;
-??0UnoUrlDescriptor@cppu@@QEAA@AEBVOUString@rtl@@@Z;
-??1UnoUrl@cppu@@QEAA@XZ;
-??1UnoUrlDescriptor@cppu@@QEAA@XZ;
-??4UnoUrl@cppu@@QEAAAEAV01@AEBV01@@Z;
-??4UnoUrlDescriptor@cppu@@QEAAAEAV01@AEBV01@@Z;
-?getConnection@UnoUrl@cppu@@QEBAAEBVUnoUrlDescriptor@2@XZ;
-?getDescriptor@UnoUrlDescriptor@cppu@@QEBAAEBVOUString@rtl@@XZ;
-?getName@UnoUrlDescriptor@cppu@@QEBAAEBVOUString@rtl@@XZ;
-?getObjectName@UnoUrl@cppu@@QEBAAEBVOUString@rtl@@XZ;
-?getParameter@UnoUrlDescriptor@cppu@@QEBA?AVOUString@rtl@@AEBV34@@Z;
-?getProtocol@UnoUrl@cppu@@QEBAAEBVUnoUrlDescriptor@2@XZ;
-?hasParameter@UnoUrlDescriptor@cppu@@QEBA_NAEBVOUString@rtl@@@Z;
-
-    local:
-        *;
-};
-
-UDK_3.1 {
-    global:
-        ?getCaughtException@cppu@@YA?AVAny@uno@star@sun@com@@XZ;
-
-        ??0OPropertySetHelper@cppu@@QEAA@AEAU?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@1@_N@Z;
-
-        ?bootstrap@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-        ??0BootstrapException@cppu@@QEAA@XZ;
-        ??0BootstrapException@cppu@@QEAA@AEBVOUString@rtl@@@Z;
-        ??0BootstrapException@cppu@@QEAA@AEBV01@@Z;
-        ??1BootstrapException@cppu@@UEAA@XZ;
-        ??4BootstrapException@cppu@@QEAAAEAV01@AEBV01@@Z;
-        ?getMessage@BootstrapException@cppu@@QEBAAEBVOUString@rtl@@XZ;
-} UDK_3_0_0;
-
-UDK_3.2 {
-    global:
-        ??1PropertySetMixinImpl@cppu@@AEAA@XZ;
-        ?queryInterface@PropertySetMixinImpl@cppu@@MEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z;
-        ?getPropertySetInfo@PropertySetMixinImpl@cppu@@MEAA?AV?$Reference@VXPropertySetInfo@beans@star@sun@com@@@uno@star@sun@com@@XZ;
-        ?notify@BoundListeners@PropertySetMixinImpl@cppu@@QEBAXXZ;
-        ?setPropertyValue@PropertySetMixinImpl@cppu@@MEAAXAEBVOUString@rtl@@AEBVAny@uno@star@sun@com@@@Z;
-        ?getPropertyValue@PropertySetMixinImpl@cppu@@MEAA?AVAny@uno@star@sun@com@@AEBVOUString@rtl@@@Z;
-        ?removePropertyChangeListener@PropertySetMixinImpl@cppu@@MEAAXAEBVOUString@rtl@@AEBV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-        ?removeVetoableChangeListener@PropertySetMixinImpl@cppu@@MEAAXAEBVOUString@rtl@@AEBV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-        ?setFastPropertyValue@PropertySetMixinImpl@cppu@@MEAAXJAEBVAny@uno@star@sun@com@@@Z;
-        ?getFastPropertyValue@PropertySetMixinImpl@cppu@@MEAA?AVAny@uno@star@sun@com@@J@Z;
-        ?getPropertyValues@PropertySetMixinImpl@cppu@@MEAA?AV?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@XZ;
-        ?setPropertyValues@PropertySetMixinImpl@cppu@@MEAAXAEBV?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-        ?prepareSet@PropertySetMixinImpl@cppu@@IEAAXAEBVOUString@rtl@@AEBVAny@uno@star@sun@com@@1PEAVBoundListeners@12@@Z;
-        ??0BoundListeners@PropertySetMixinImpl@cppu@@QEAA@XZ;
-        ??1BoundListeners@PropertySetMixinImpl@cppu@@QEAA@XZ;
-        ??0PropertySetMixinImpl@cppu@@AEAA@AEBV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@W4Implements@01@AEBV?$Sequence@VOUString@rtl@@@3456@AEBVType@3456@@Z;
-        ?dispose@PropertySetMixinImpl@cppu@@IEAAXXZ;
-        ?addPropertyChangeListener@PropertySetMixinImpl@cppu@@MEAAXAEBVOUString@rtl@@AEBV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-        ?addVetoableChangeListener@PropertySetMixinImpl@cppu@@MEAAXAEBVOUString@rtl@@AEBV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
-} UDK_3.1;
-
-UDK_3.3 {
-    global:
-        ?getTypes@OPropertySetHelper@cppu@@QEAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
-} UDK_3.2;
-
-UDK_3.4 { # OOo 2.4
-    global:
-        ?bootstrap_expandUri@cppu@@YA?AVOUString@rtl@@AEBV23@@Z; # rtl::OUString cppu::bootstrap_expandUri(rtl::OUString const &)
-} UDK_3.3;
-
-UDK_3.5 { # OOo 3.0
-    global:
-        ??0OPropertySetHelper@cppu@@QEAA@AEAU?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@1@PEAVIEventNotificationHook@1@_N@Z;
-} UDK_3.4;
-
-UDK_3.6 { # OOo 3.3
-    global:
-        ?disposeWeakConnectionPoint@OWeakObject@cppu@@IEAAXXZ;
-        ?clear@WeakReferenceHelper@uno@star@sun@com@@QEAAXXZ;
-        ?createOneInstanceComponentFactory@cppu@@YA?AV?$Reference@VXSingleComponentFactory@lang@star@sun@com@@@uno@star@sun@com@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@AEBV?$Reference@VXComponentContext@uno@star@sun@com@@@3456@@ZAEBVOUString@rtl@@AEBV?$Sequence@VOUString@rtl@@@3456@PEAU_rtl_ModuleCount@@@Z;
-} UDK_3.5;
diff --git a/cppuhelper/unotypes/Makefile b/cppuhelper/unotypes/Makefile
new file mode 100644
index 000000000000..fae02aeca501
--- /dev/null
+++ b/cppuhelper/unotypes/Makefile
@@ -0,0 +1,119 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2011 Matúš Kukan <matus.kukan@gmail.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.
+
+gb_PARTIALBUILD:=T
+include $(GBUILDDIR)/gbuild_simple.mk
+
+all: private_types.flag unotypes.flag
+
+# private_types
+private_types.flag: private_types.rdb
+	$(call gb_Helper_abbreviate_dirs_native, \
+	    $(call gb_Helper_execute,cppumaker) -O. -BUCR -C $< \
+			-Tcppuhelper.detail.XExceptionThrower \
+			-X$(OUTDIR_FOR_BUILD)/bin/types.rdb)
+	touch $@
+
+private_types.rdb: XExceptionThrower.urd
+	$(call gb_Helper_abbreviate_dirs_native, \
+	    $(call gb_Helper_execute,regmerge) $@ /UCR $< \
+			$(OUTDIR_FOR_BUILD)/bin/types.rdb)
+
+XExceptionThrower.urd: $(SRCDIR)/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl
+	$(call gb_Helper_abbreviate_dirs_native, \
+		$(call gb_Helper_execute,idlc) -I. -I$(OUTDIR_FOR_BUILD)/idl -O. $<)
+
+# unotypes
+unotypes.flag:
+	$(call gb_Helper_abbreviate_dirs_native, \
+		$(call gb_Helper_execute,cppumaker) -O. -BUCR -C \
+			$(foreach type,$(UNOTYPES),-T$(type)) $(OUTDIR_FOR_BUILD)/bin/udkapi.rdb)
+
+UNOTYPES := \
+	com.sun.star.beans.PropertyAttribute \
+	com.sun.star.beans.PropertyValue \
+	com.sun.star.beans.XFastPropertySet \
+	com.sun.star.beans.XMultiPropertySet \
+	com.sun.star.beans.XPropertyAccess \
+	com.sun.star.beans.XPropertySet \
+	com.sun.star.beans.XPropertySetOption \
+	com.sun.star.bridge.UnoUrlResolver \
+	com.sun.star.bridge.XUnoUrlResolver \
+	com.sun.star.connection.SocketPermission \
+	com.sun.star.container.XElementAccess \
+	com.sun.star.container.XEnumerationAccess \
+	com.sun.star.container.XHierarchicalNameAccess \
+	com.sun.star.container.XNameAccess \
+	com.sun.star.container.XNameContainer \
+	com.sun.star.container.XSet \
+	com.sun.star.io.FilePermission \
+	com.sun.star.io.IOException \
+	com.sun.star.lang.DisposedException \
+	com.sun.star.lang.WrappedTargetRuntimeException \
+	com.sun.star.lang.XComponent \
+	com.sun.star.lang.XEventListener \
+	com.sun.star.lang.XInitialization \
+	com.sun.star.lang.XMultiComponentFactory \
+	com.sun.star.lang.XMultiServiceFactory \
+	com.sun.star.lang.XServiceInfo \
+	com.sun.star.lang.XSingleComponentFactory \
+	com.sun.star.lang.XSingleServiceFactory \
+	com.sun.star.lang.XTypeProvider \
+	com.sun.star.loader.XImplementationLoader \
+	com.sun.star.reflection.XArrayTypeDescription \
+	com.sun.star.reflection.XCompoundTypeDescription \
+	com.sun.star.reflection.XEnumTypeDescription \
+	com.sun.star.reflection.XIdlClass \
+	com.sun.star.reflection.XIdlField2 \
+	com.sun.star.reflection.XIdlReflection \
+	com.sun.star.reflection.XIndirectTypeDescription \
+	com.sun.star.reflection.XInterfaceAttributeTypeDescription \
+	com.sun.star.reflection.XInterfaceAttributeTypeDescription2 \
+	com.sun.star.reflection.XInterfaceMemberTypeDescription \
+	com.sun.star.reflection.XInterfaceMethodTypeDescription \
+	com.sun.star.reflection.XInterfaceTypeDescription2 \
+	com.sun.star.reflection.XMethodParameter \
+	com.sun.star.reflection.XStructTypeDescription \
+	com.sun.star.reflection.XTypeDescription \
+	com.sun.star.reflection.XUnionTypeDescription \
+	com.sun.star.registry.XImplementationRegistration \
+	com.sun.star.registry.XRegistryKey \
+	com.sun.star.registry.XSimpleRegistry \
+	com.sun.star.security.RuntimePermission \
+	com.sun.star.security.XAccessController \
+	com.sun.star.uno.DeploymentException \
+	com.sun.star.uno.RuntimeException \
+	com.sun.star.uno.XAggregation \
+	com.sun.star.uno.XComponentContext \
+	com.sun.star.uno.XCurrentContext \
+	com.sun.star.uno.XUnloadingPreference \
+	com.sun.star.uno.XWeak \
+	com.sun.star.util.XMacroExpander
+
+.DEFAULT_GOAL:=all
+.PHONY: all
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/unotypes/makefile.mk b/cppuhelper/unotypes/makefile.mk
deleted file mode 100644
index f58a7ebf18ad..000000000000
--- a/cppuhelper/unotypes/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ = ..
-
-PRJNAME = cppuhelper
-TARGET = private_types
-
-.INCLUDE :  settings.mk
-
-UNOUCRRDB = $(BIN)$/$(TARGET).rdb
-UNOUCRDEP = $(UNOUCRRDB)
-UNOUCROUT = $(OUT)$/inc$/private
-
-CPPUMAKERFLAGS += -C -X$(SOLARBINDIR)$/types.rdb
-
-UNOTYPES = \
-    cppuhelper.detail.XExceptionThrower
-
-ALLIDLFILES = \
-    .$/cppuhelper$/detail$/XExceptionThrower.idl
-
-.INCLUDE : target.mk
-
-$(UNOUCRRDB) : $(ALLIDLFILES) $(SOLARBINDIR)$/types.rdb
-    $(IDLC) -I. -I$(SOLARIDLDIR) -O$(UCR) $(ALLIDLFILES)
-    $(REGMERGE) $@ /UCR $(UCR)$/{$(?:f:s/.idl/.urd/)}
-    touch $@