[Libreoffice-commits] .: 6 commits - codemaker/source cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk cppuhelper/CppunitTest_cppuhelper_qa_weak.mk cppuhelper/inc cppuhelper/Library_cppuhelper.mk cppuhelper/Makefile cppuhelper/Module_cppuhelper.mk cppuhelper/Package_findsofficepath.mk cppuhelper/Package_inc.mk cppuhelper/Package_unorc.mk cppuhelper/Package_unotypes.mk cppuhelper/prj cppuhelper/qa cppuhelper/source cppuhelper/unotypes forms/source odk/util scp2/source xmlreader/Library_xmlreader.mk
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Mon Jan 2 06:33:59 PST 2012
codemaker/source/cppumaker/cpputype.cxx | 91 +++-
cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk | 45 ++
cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk | 41 +
cppuhelper/CppunitTest_cppuhelper_qa_weak.mk | 45 ++
cppuhelper/Library_cppuhelper.mk | 78 +++
cppuhelper/Makefile | 41 +
cppuhelper/Module_cppuhelper.mk | 48 ++
cppuhelper/Package_findsofficepath.mk | 34 +
cppuhelper/Package_inc.mk | 86 +++
cppuhelper/Package_unorc.mk | 33 +
cppuhelper/Package_unotypes.mk | 40 +
cppuhelper/inc/cppuhelper/access_control.hxx | 3
cppuhelper/inc/cppuhelper/bootstrap.hxx | 19
cppuhelper/inc/cppuhelper/compbase_ex.hxx | 13
cppuhelper/inc/cppuhelper/component.hxx | 3
cppuhelper/inc/cppuhelper/component_context.hxx | 3
cppuhelper/inc/cppuhelper/cppuhelperdllapi.h | 16
cppuhelper/inc/cppuhelper/exc_hlp.hxx | 5
cppuhelper/inc/cppuhelper/factory.hxx | 17
cppuhelper/inc/cppuhelper/implbase.hxx | 7
cppuhelper/inc/cppuhelper/implbase_ex.hxx | 24 -
cppuhelper/inc/cppuhelper/implementationentry.hxx | 5
cppuhelper/inc/cppuhelper/interfacecontainer.h | 7
cppuhelper/inc/cppuhelper/propertysetmixin.hxx | 3
cppuhelper/inc/cppuhelper/propshlp.hxx | 12
cppuhelper/inc/cppuhelper/servicefactory.hxx | 13
cppuhelper/inc/cppuhelper/shlib.hxx | 9
cppuhelper/inc/cppuhelper/stdidlclass.hxx | 3
cppuhelper/inc/cppuhelper/typeprovider.hxx | 5
cppuhelper/inc/cppuhelper/unourl.hxx | 5
cppuhelper/inc/cppuhelper/weak.hxx | 3
cppuhelper/inc/cppuhelper/weakagg.hxx | 3
cppuhelper/inc/cppuhelper/weakref.hxx | 3
cppuhelper/inc/makefile.mk | 39 -
cppuhelper/prj/build.lst | 9
cppuhelper/prj/d.lst | 74 ---
cppuhelper/prj/makefile.mk | 1
cppuhelper/qa/ifcontainer/makefile.mk | 63 --
cppuhelper/qa/unourl/makefile.mk | 63 --
cppuhelper/qa/weak/makefile.mk | 53 --
cppuhelper/qa/weak/version.map | 34 -
cppuhelper/source/cc5_solaris_sparc.map | 395 ------------------
cppuhelper/source/gcc3.map | 9
cppuhelper/source/makefile.mk | 193 --------
cppuhelper/source/msvc_win32_intel.map | 294 -------------
cppuhelper/source/msvc_win32_x86_64.map | 280 ------------
cppuhelper/source/servicefactory.cxx | 2
cppuhelper/unotypes/Makefile | 119 +++++
cppuhelper/unotypes/makefile.mk | 52 --
forms/source/component/Grid.cxx | 2
odk/util/check.pl | 31 -
scp2/source/ooo/ure.scp | 4
xmlreader/Library_xmlreader.mk | 2
53 files changed, 840 insertions(+), 1642 deletions(-)
New commits:
commit eee474c7a4c66626797815751f92807b874132b0
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon Dec 26 14:19:08 2011 +0100
scp2: cppuhelper is now gbuild'ified
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 58d8ec0..aece726 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -191,11 +191,7 @@ End
File gid_File_Dl_Cppuhelper
LIB_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
-#if defined WNT && !defined _MSC // Hack for not gbuild'ified cppuhelper on MinGW:
- Name = "uno_cppuhelpergcc33.dll";
-#else
Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
-#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "D2A191E6-2023-41F5-9032-B98C50C37964";
End
commit dee53a32a9feba2021782db5762b5a9a034efae4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Dec 23 18:41:52 2011 +0100
Temporary hack around cppu_detail_getCppuType variants violating ODR.
Which causes cppuhelper to pick wrong variant from other library, now that its own
symbols are no longer reduced to private on Mac OS X. As a temporary hack, emit
cppu_detail_getCppuType for the relevant types always as fully comprehensive; should
be revisited when improving types.rdb format (routinely generating C++ information
for certain UNO types into a dedicated library?). Requires a fix to xmlreader and
a fix to forms that looks like a Mac OS X GCC bug.
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 3a436ca..9636f61 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -79,6 +79,77 @@ rtl::OString translateSimpleUnoType(rtl::OString const & unoType, bool cppuUnoTy
return trans[sort];
}
+bool isBootstrapType(rtl::OString const & name) {
+ static char const * const names[] = {
+ "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/XNameReplace",
+ "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"
+ }; // cf. cppuhelper/unotypes/Makefile UNOTYPES (plus missing dependencies)
+ for (std::size_t i = 0; i < SAL_N_ELEMENTS(names); ++i) {
+ if (name.equals(names[i])) {
+ return true;
+ }
+ }
+ return false;
+}
+
}
//*************************************************************************
@@ -221,14 +292,18 @@ sal_Bool CppuType::dump(CppuOptions* pOptions)
}
addSpecialDependencies();
- // -CS was used as an undocumented option to generate static getCppuType
- // functions; since the introduction of cppu::UnoType this no longer is
- // meaningful (getCppuType is just a forward to cppu::UnoType::get now), and
- // -CS is handled the same way as -C now:
- if (pOptions->isValid("-L"))
- m_cppuTypeLeak = sal_True;
- if (pOptions->isValid("-C") || pOptions->isValid("-CS"))
- m_cppuTypeDynamic = sal_False;
+ if (isBootstrapType(m_typeName)) {
+ m_cppuTypeDynamic = false;
+ } else {
+ // -CS was used as an undocumented option to generate static getCppuType
+ // functions; since the introduction of cppu::UnoType this no longer is
+ // meaningful (getCppuType is just a forward to cppu::UnoType::get now),
+ // and -CS is handled the same way as -C now:
+ if (pOptions->isValid("-L"))
+ m_cppuTypeLeak = sal_True;
+ if (pOptions->isValid("-C") || pOptions->isValid("-CS"))
+ m_cppuTypeDynamic = sal_False;
+ }
OString outPath;
if (pOptions->isValid("-O"))
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index f268c2c..01e0c0d 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -377,7 +377,7 @@ void OGridControlModel::removeSelectionChangeListener(const Reference< XSelectio
Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const ::rtl::OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
const Sequence< ::rtl::OUString >& rColumnTypes = frm::getColumnTypes();
- return createColumn( detail::findPos( ColumnType, rColumnTypes ) );
+ return createColumn( ::detail::findPos( ColumnType, rColumnTypes ) );
}
//------------------------------------------------------------------------------
diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk
index 24ebbc1..7e5d9b5 100644
--- a/xmlreader/Library_xmlreader.mk
+++ b/xmlreader/Library_xmlreader.mk
@@ -35,9 +35,11 @@ $(eval $(call gb_Library_add_defs,xmlreader,\
))
$(eval $(call gb_Library_add_linked_libs,xmlreader,\
+ cppu \
sal \
$(gb_STDLIBS) \
))
+ # cppu is only needed due to the cppumaker -C hack
$(eval $(call gb_Library_add_exception_objects,xmlreader,\
xmlreader/source/pad \
commit 8907d159378b518a769e9f8c4f67290ec588a77d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Dec 23 18:33:32 2011 +0100
Temporary hack to work around autodoc bug
...where autodoc fails to parse "class CPPUHELPER_DLLPUBLIC xxx" correctly.
Best fixed by replacing autodoc with something mature (that hopefully does
not have such a bug).
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 490210c..6598291 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -189,9 +189,11 @@ if (-d "$StartDir") {
$return++;
}
+ # The commented out types from cppuhelper are missed by autodoc due to
+ # CPPUHELPER_DLLPUBLIC annotations:
my @dir_list = ( "com","com/sun","com/sun/star","com/sun/star/uno",
"com/sun/star/uno/Any","com/sun/star/uno/Type",
- "com/sun/star/uno/Array","com/sun/star/uno/WeakReferenceHelper",
+ "com/sun/star/uno/Array",#"com/sun/star/uno/WeakReferenceHelper",
"com/sun/star/uno/Reference","com/sun/star/uno/WeakReference",
"com/sun/star/uno/Environment","com/sun/star/uno/Sequence",
"com/sun/star/uno/BaseReference","com/sun/star/uno/Mapping",
@@ -212,31 +214,35 @@ if (-d "$StartDir") {
"cppu/WeakAggImplHelper5","cppu/WeakAggImplHelper6",
"cppu/WeakAggImplHelper7","cppu/WeakAggImplHelper8",
"cppu/WeakAggImplHelper9",
- "cppu/OMultiTypeInterfaceContainerHelperInt32","cppu/AccessControl",
- "cppu/OPropertyArrayHelper","cppu/ImplHelper1","cppu/ImplHelper2",
+ #"cppu/OMultiTypeInterfaceContainerHelperInt32","cppu/AccessControl",
+ #"cppu/OPropertyArrayHelper",
+ "cppu/ImplHelper1","cppu/ImplHelper2",
"cppu/ImplHelper3","cppu/ImplHelper4","cppu/ImplHelper5",
"cppu/ImplHelper6","cppu/ImplHelper7","cppu/ImplHelper8",
"cppu/ImplHelper9","cppu/WeakComponentImplHelper10",
"cppu/WeakComponentImplHelper11","cppu/WeakComponentImplHelper12",
- "cppu/UnoUrl","cppu/WeakComponentImplHelper1",
+ #"cppu/UnoUrl",
+ "cppu/WeakComponentImplHelper1",
"cppu/WeakComponentImplHelper2","cppu/WeakComponentImplHelper3",
"cppu/WeakComponentImplHelper4","cppu/WeakComponentImplHelper5",
"cppu/WeakComponentImplHelper6","cppu/WeakComponentImplHelper7",
"cppu/WeakComponentImplHelper8","cppu/WeakComponentImplHelper9",
- "cppu/OInterfaceIteratorHelper",
- "cppu/OMultiTypeInterfaceContainerHelper","cppu/UnoUrlDescriptor",
- "cppu/IPropertyArrayHelper","cppu/OBroadcastHelperVar",
- "cppu/OComponentHelper","cppu/OWeakAggObject",
+ #"cppu/OInterfaceIteratorHelper",
+ #"cppu/OMultiTypeInterfaceContainerHelper","cppu/UnoUrlDescriptor",
+ #"cppu/IPropertyArrayHelper",
+ "cppu/OBroadcastHelperVar",
+ #"cppu/OComponentHelper","cppu/OWeakAggObject",
"cppu/ImplementationEntry","cppu/WeakImplHelper10",
"cppu/WeakImplHelper11","cppu/WeakImplHelper12",
- "cppu/OPropertySetHelper","cppu/ImplHelper10","cppu/ImplHelper11",
+ #"cppu/OPropertySetHelper",
+ "cppu/ImplHelper10","cppu/ImplHelper11",
"cppu/ImplHelper12","cppu/WeakAggImplHelper10",
"cppu/WeakAggImplHelper11","cppu/WeakAggImplHelper12",
"cppu/ImplInheritanceHelper1","cppu/ImplInheritanceHelper2",
"cppu/ImplInheritanceHelper3","cppu/ImplInheritanceHelper4",
"cppu/ImplInheritanceHelper5","cppu/ImplInheritanceHelper6",
"cppu/ImplInheritanceHelper7","cppu/ImplInheritanceHelper8",
- "cppu/ImplInheritanceHelper9","cppu/OTypeCollection",
+ "cppu/ImplInheritanceHelper9",#"cppu/OTypeCollection",
"cppu/WeakAggComponentImplHelper10",
"cppu/WeakAggComponentImplHelper11",
"cppu/WeakAggComponentImplHelper12",
@@ -250,7 +256,7 @@ if (-d "$StartDir") {
"cppu/WeakAggComponentImplHelper8",
"cppu/WeakAggComponentImplHelper9",
"cppu/OMultiTypeInterfaceContainerHelperVar",
- "cppu/OInterfaceContainerHelper","cppu/OImplementationId",
+ #"cppu/OInterfaceContainerHelper","cppu/OImplementationId",
"cppu/AggImplInheritanceHelper1","cppu/AggImplInheritanceHelper2",
"cppu/AggImplInheritanceHelper3","cppu/AggImplInheritanceHelper4",
"cppu/AggImplInheritanceHelper5","cppu/AggImplInheritanceHelper6",
@@ -260,7 +266,8 @@ if (-d "$StartDir") {
"cppu/WeakImplHelper1","cppu/WeakImplHelper2","cppu/WeakImplHelper3",
"cppu/WeakImplHelper4","cppu/WeakImplHelper5","cppu/WeakImplHelper6",
"cppu/WeakImplHelper7","cppu/WeakImplHelper8","cppu/WeakImplHelper9",
- "cppu/OWeakObject","__store_FindData","_rtl_StandardModuleCount",
+ #"cppu/OWeakObject",
+ "__store_FindData","_rtl_StandardModuleCount",
"RTUik","RTConstValue","_typelib_TypeDescriptionReference",
"_typelib_InterfaceMethodTypeDescription","store","RegistryKey",
"_typelib_Union_Init","_sal_Sequence","_typelib_Parameter_Init",
commit a768436252d6c2b5c86f26b0bcc18f143325767c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Dec 23 18:29:49 2011 +0100
CppunitTest_cppuhelper_qa_weak depends on module bridges
...through a call to cppu::getCaughtException.
diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk
index f2472d5..e547e0b 100644
--- a/cppuhelper/Module_cppuhelper.mk
+++ b/cppuhelper/Module_cppuhelper.mk
@@ -38,8 +38,8 @@ $(eval $(call gb_Module_add_targets,cppuhelper,\
$(eval $(call gb_Module_add_check_targets,cppuhelper,\
CppunitTest_cppuhelper_cppu_ifcontainer \
CppunitTest_cppuhelper_cppu_unourl \
- CppunitTest_cppuhelper_qa_weak \
))
+# CppunitTest_cppuhelper_qa_weak depends on module bridges
# TODO ? (I don't think OOO_SUBSEQUENT_TESTS != "" can be true..
# someone would have to do it on command line)
commit b222aa8fff63c803781703e72366ca203f3e6a76
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Aug 23 15:03:09 2011 +0200
cppuhelper: convert to gbuild
missing subsequent test qa/propertysetmixin/makefile.mk
diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
new file mode 100644
index 0000000..2006d98
--- /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 at 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 0000000..ceaec25
--- /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 at 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 0000000..eaea97b
--- /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 at 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 0000000..2fa6d1a
--- /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 at 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/Makefile b/cppuhelper/Makefile
new file mode 100644
index 0000000..2289c83
--- /dev/null
+++ b/cppuhelper/Makefile
@@ -0,0 +1,41 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else
+
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk
new file mode 100644
index 0000000..f2472d5
--- /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 at 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 0000000..b3b0e90
--- /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 at 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 0000000..60f9364
--- /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 at 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 0000000..1188494
--- /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 at 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 0000000..4e17584
--- /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 at 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/inc/makefile.mk b/cppuhelper/inc/makefile.mk
deleted file mode 100644
index 5b85c1f..0000000
--- a/cppuhelper/inc/makefile.mk
+++ /dev/null
@@ -1,39 +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=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/cppuhelper/prj/build.lst b/cppuhelper/prj/build.lst
index 570a345..6e10408 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 a27212c..e69de29 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 0000000..0997622
--- /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 7d01f53..0000000
--- 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 1db7e11..0000000
--- 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 5116886..0000000
--- 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 3308588..0000000
--- 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 5dd703c..0000000
--- 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 7903d44..6ce6cf1 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 0cbed3d..0000000
--- 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 1808e30..0000000
--- a/cppuhelper/source/msvc_win32_intel.map
+++ /dev/null
@@ -1,294 +0,0 @@
-UDK_3_0_0 {
- global:
-GetVersionInfo;
-??0OComponentHelper at cppu@@QAE at AAVMutex@osl@@@Z;
-??1OComponentHelper at cppu@@UAE at XZ;
-??BOWeakObject at cppu@@QAA?AV?$Reference at VXInterface@uno at star@sun at com@@@uno at star@sun at com@@XZ;
-??BWeakReferenceHelper at uno@star at sun@com@@QBA?AV?$Reference at VXInterface@uno at star@sun at com@@@1234 at XZ;
-??_7OComponentHelper at cppu@@6BOWeakObject at 1@@;
-??_7OComponentHelper at cppu@@6BXAggregation at uno@star at sun@com@@@;
-??_7OComponentHelper at cppu@@6BXComponent at lang@star at sun@com@@@;
-??_7OComponentHelper at cppu@@6BXTypeProvider at lang@star at sun@com@@@;
-??_7OWeakAggObject at cppu@@6BOWeakObject at 1@@;
-??_7OWeakAggObject at cppu@@6BXAggregation at uno@star at sun@com@@@;
-??_7OWeakObject at cppu@@6B@;
-??_GOComponentHelper at cppu@@UAEPAXI at Z;
-??_GOWeakAggObject at cppu@@MAEPAXI at Z;
-??_GOWeakObject at cppu@@MAEPAXI at Z;
-?addEventListener at OComponentHelper@cppu@@UAAXABV?$Reference at VXEventListener@lang at star@sun at com@@@uno at star@sun at com@@@Z;
-?dispose at OComponentHelper@cppu@@UAAXXZ;
-?disposing at OComponentHelper@cppu@@MAAXXZ;
-?release at OComponentHelper@cppu@@UAAXXZ;
-?removeEventListener at OComponentHelper@cppu@@UAAXABV?$Reference at VXEventListener@lang at star@sun at com@@@uno at star@sun at com@@@Z;
-??1OTypeCollection at cppu@@QAE at XZ;
-?createFactoryProxy at cppu@@YA?AV?$Reference at VXSingleServiceFactory@lang at star@sun at com@@@uno at star@sun at com@@ABV?$Reference at VXMultiServiceFactory@lang at star@sun at com@@@3456 at ABV23456@@Z;
-?createOneInstanceRegistryFactory at cppu@@YA?AV?$Reference at VXSingleServiceFactory@lang at star@sun at com@@@uno at star@sun at com@@ABV?$Reference at VXMultiServiceFactory@lang at star@sun at com@@@3456 at ABVOUString@rtl@@ABV?$Reference at VXRegistryKey@registry at star@sun at com@@@3456@@Z;
-?createSingleRegistryFactory at cppu@@YA?AV?$Reference at VXSingleServiceFactory@lang at star@sun at com@@@uno at star@sun at com@@ABV?$Reference at VXMultiServiceFactory@lang at star@sun at com@@@3456 at ABVOUString@rtl@@ABV?$Reference at VXRegistryKey@registry at star@sun at com@@@3456@@Z;
-?getTypes at OTypeCollection@cppu@@QAA?AV?$Sequence at VType@uno at star@sun at com@@@uno at star@sun at com@@XZ;
-?createStandardClassWithSequence at cppu@@YAPAVXIdlClass at reflection@star at sun@com@@ABV?$Reference at VXMultiServiceFactory@lang at star@sun at com@@@uno at 456@ABVOUString at rtl@@ABV?$Reference at VXIdlClass@reflection at star@sun at com@@@8456 at ABV?$Sequence at VOUString@rtl@@@8456@@Z;
-??0OInterfaceContainerHelper at cppu@@QAE at AAVMutex@osl@@@Z;
-??0OInterfaceIteratorHelper at cppu@@QAE at AAVOInterfaceContainerHelper@1@@Z;
-??1OInterfaceContainerHelper at cppu@@QAE at XZ;
-??1OInterfaceIteratorHelper at cppu@@QAE at XZ;
-?addInterface at OInterfaceContainerHelper@cppu@@QAAJABV?$Reference at VXInterface@uno at star@sun at com@@@uno at star@sun at com@@@Z;
-?clear at OInterfaceContainerHelper@cppu@@QAAXXZ;
-?copyAndResetInUse at OInterfaceContainerHelper@cppu@@AAEXXZ;
-?disposeAndClear at OInterfaceContainerHelper@cppu@@QAAXABUEventObject at lang@star at sun@com@@@Z;
-?getElements at OInterfaceContainerHelper@cppu@@QBA?AV?$Sequence at V?$Reference at VXInterface@uno at star@sun at com@@@uno at star@sun at com@@@uno at star@sun at com@@XZ;
-?getLength at OInterfaceContainerHelper@cppu@@QBAJXZ;
-?next at OInterfaceIteratorHelper@cppu@@QAAPAVXInterface at uno@star at sun@com@@XZ;
-?removeInterface at OInterfaceContainerHelper@cppu@@QAAJABV?$Reference at VXInterface@uno at star@sun at com@@@uno at star@sun at com@@@Z;
-??0WeakReferenceHelper at uno@star at sun@com@@QAE at ABV01234@@Z;
-??0WeakReferenceHelper at uno@star at sun@com@@QAE at ABV?$Reference at VXInterface@uno at star@sun at com@@@1234@@Z;
-??1OWeakAggObject at cppu@@MAE at XZ;
-??1OWeakObject at cppu@@MAE at XZ;
-??1WeakReferenceHelper at uno@star at sun@com@@QAE at XZ;
-??4WeakReferenceHelper at uno@star at sun@com@@QAAAAV01234 at ABV01234@@Z;
-??4WeakReferenceHelper at uno@star at sun@com@@QAAAAV01234 at ABV?$Reference at VXInterface@uno at star@sun at com@@@1234@@Z;
-?acquire at OWeakAggObject@cppu@@UAAXXZ;
-?acquire at OWeakObject@cppu@@UAAXXZ;
-?get at WeakReferenceHelper@uno at star@sun at com@@QBA?AV?$Reference at VXInterface@uno at star@sun at com@@@2345 at XZ;
-?queryAdapter at OWeakObject@cppu@@UAA?AV?$Reference at VXAdapter@uno at star@sun at com@@@uno at star@sun at com@@XZ;
-?queryAggregation at OWeakAggObject@cppu@@UAA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
-?queryInterface at OWeakAggObject@cppu@@UAA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
-?queryInterface at OWeakObject@cppu@@UAA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
-?release at OWeakAggObject@cppu@@UAAXXZ;
-?release at OWeakObject@cppu@@UAAXXZ;
-?setDelegator at OWeakAggObject@cppu@@UAAXABV?$Reference at VXInterface@uno at star@sun at com@@@uno at star@sun at com@@@Z;
-??0OPropertyArrayHelper at cppu@@QAE at ABV?$Sequence at UProperty@beans at star@sun at com@@@uno at star@sun at com@@E at Z;
-??0OPropertyArrayHelper at cppu@@QAE at PAUProperty@beans at star@sun at com@@JE at Z;
-??1IPropertyArrayHelper at cppu@@UAE at XZ;
-??1OPropertyArrayHelper at cppu@@UAE at XZ;
-??1OPropertySetHelper at cppu@@QAE at XZ;
-??_7IPropertyArrayHelper at cppu@@6B@;
-??_7OPropertyArrayHelper at cppu@@6B@;
-??_7OPropertySetHelper at cppu@@6BXFastPropertySet at beans@star at sun@com@@@;
-??_7OPropertySetHelper at cppu@@6BXMultiPropertySet at beans@star at sun@com@@@;
-??_7OPropertySetHelper at cppu@@6BXPropertySet at beans@star at sun@com@@@;
-??_GIPropertyArrayHelper at cppu@@UAEPAXI at Z;
-??_GOPropertyArrayHelper at cppu@@UAEPAXI at Z;
-?addPropertiesChangeListener at OPropertySetHelper@cppu@@UAAXABV?$Sequence at VOUString@rtl@@@uno at star@sun at com@@ABV?$Reference at VXPropertiesChangeListener@beans at star@sun at com@@@4567@@Z;
-?addPropertyChangeListener at OPropertySetHelper@cppu@@UAAXABVOUString at rtl@@ABV?$Reference at VXPropertyChangeListener@beans at star@sun at com@@@uno at star@sun at com@@@Z;
-?addVetoableChangeListener at OPropertySetHelper@cppu@@UAAXABVOUString at rtl@@ABV?$Reference at VXVetoableChangeListener@beans at star@sun at com@@@uno at star@sun at com@@@Z;
-?createPropertySetInfo at OPropertySetHelper@cppu@@SA?AV?$Reference at VXPropertySetInfo@beans at star@sun at com@@@uno at star@sun at com@@AAVIPropertyArrayHelper at 2@@Z;
-?disposing at OPropertySetHelper@cppu@@QAAXXZ;
-?fillHandles at OPropertyArrayHelper@cppu@@UAAJPAJABV?$Sequence at VOUString@rtl@@@uno at star@sun at com@@@Z;
-?fillPropertyMembersByHandle at OPropertyArrayHelper@cppu@@UAAEPAVOUString at rtl@@PAFJ at Z;
-?fire at OPropertySetHelper@cppu@@IAAXPAJPBVAny at uno@star at sun@com@@1JE at Z;
-?firePropertiesChangeEvent at OPropertySetHelper@cppu@@UAAXABV?$Sequence at VOUString@rtl@@@uno at star@sun at com@@ABV?$Reference at VXPropertiesChangeListener@beans at star@sun at com@@@4567@@Z;
-?getCount at OPropertyArrayHelper@cppu@@QBAJXZ;
-?getFastPropertyValue at OPropertySetHelper@cppu@@UAA?AVAny at uno@star at sun@com@@J at Z;
-?getHandleByName at OPropertyArrayHelper@cppu@@UAAJABVOUString at rtl@@@Z;
-?getProperties at OPropertyArrayHelper@cppu@@UAA?AV?$Sequence at UProperty@beans at star@sun at com@@@uno at star@sun at com@@XZ;
-?getPropertyByName at OPropertyArrayHelper@cppu@@UAA?AUProperty at beans@star at sun@com@@ABVOUString at rtl@@@Z;
-?getPropertyValue at OPropertySetHelper@cppu@@UAA?AVAny at uno@star at sun@com@@ABVOUString at rtl@@@Z;
-?getPropertyValues at OPropertySetHelper@cppu@@UAA?AV?$Sequence at VAny@uno at star@sun at com@@@uno at star@sun at com@@ABV?$Sequence at VOUString@rtl@@@4567@@Z;
-?hasPropertyByName at OPropertyArrayHelper@cppu@@UAAEABVOUString at rtl@@@Z;
-?init at OPropertyArrayHelper@cppu@@AAEXE at Z;
-?queryInterface at OPropertySetHelper@cppu@@UAA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
-?queryInterface at OPropertySetHelper@cppu@@W3AA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
-?queryInterface at OPropertySetHelper@cppu@@W7AA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
-?removePropertiesChangeListener at OPropertySetHelper@cppu@@UAAXABV?$Reference at VXPropertiesChangeListener@beans at star@sun at com@@@uno at star@sun at com@@@Z;
-?removePropertyChangeListener at OPropertySetHelper@cppu@@UAAXABVOUString at rtl@@ABV?$Reference at VXPropertyChangeListener@beans at star@sun at com@@@uno at star@sun at com@@@Z;
-?removeVetoableChangeListener at OPropertySetHelper@cppu@@UAAXABVOUString at rtl@@ABV?$Reference at VXVetoableChangeListener@beans at star@sun at com@@@uno at star@sun at com@@@Z;
-?setFastPropertyValue at OPropertySetHelper@cppu@@UAAXJABVAny at uno@star at sun@com@@@Z;
-?setFastPropertyValues at OPropertySetHelper@cppu@@IAAXJPAJPBVAny at uno@star at sun@com@@J at Z;
-?setPropertyValue at OPropertySetHelper@cppu@@UAAXABVOUString at rtl@@ABVAny at uno@star at sun@com@@@Z;
-?setPropertyValues at OPropertySetHelper@cppu@@UAAXABV?$Sequence at VOUString@rtl@@@uno at star@sun at com@@ABV?$Sequence at VAny@uno at star@sun at com@@@4567@@Z;
-??0ClassDataBase at cppu@@QAE at J@Z;
-??0ClassDataBase at cppu@@QAE at XZ;
-??1ClassDataBase at cppu@@QAE at XZ;
-?getImplHelperInitMutex at cppu@@YAAAVMutex at osl@@XZ;
-?getImplementationId at ClassData@cppu@@QAA?AV?$Sequence at C@uno at star@sun at com@@XZ;
-?getTypes at ClassData@cppu@@QAA?AV?$Sequence at VType@uno at star@sun at com@@@uno at star@sun at com@@XZ;
-?initTypeProvider at ClassData@cppu@@QAAXXZ;
-?query at ClassData@cppu@@QAA?AVAny at uno@star at sun@com@@ABVType at 4567@PAVXTypeProvider at lang@567@@Z;
-?writeTypeOffset at ClassData@cppu@@QAAXABVType at uno@star at sun@com@@J at Z;
-?createRegistryServiceFactory at cppu@@YA?AV?$Reference at VXMultiServiceFactory@lang at star@sun at com@@@uno at star@sun at com@@ABVOUString at rtl@@0E0 at Z;
-?throwException at cppu@@YAXABVAny at uno@star at sun@com@@@Z;
-??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@00000000000ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
-??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@0000000000ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
-??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@000000000ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
-??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@00000000ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
-??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@0000000ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list