summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-12-19 08:48:56 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-12-19 08:48:56 +0100
commitae3a0c8da50b36db395984637f5ad74d3b4887bc (patch)
treec4936b9fba1f24d412d41474ebef44a5f094dbc8 /android
parent80d977b896904a0261d32857469c1b3e7516ca1e (diff)
Add .component <implementation constructor="..." feature
...to directly call constructor functions of ComponentContext-based C++ implementations of (non-single-instance) UNO services. The case where these calls would need to be bridged across different environments (e.g., from gcc3 to gcc3:affine) is not yet implemented. bootstrap.component and expwrap.component are adapted accordingly as a proof-of- concept (which had previously been adapted to use the prefix="direct" feature, which may become unnecessary again in the end, depending on how to handle single-instance services/singletons). More to follow. Change-Id: I18682d75bcd29d3d427e31331b4ce8161dbb846d
Diffstat (limited to 'android')
-rw-r--r--android/experimental/DocumentLoader/native-code.cxx16
-rw-r--r--android/experimental/LibreOffice4Android/native-code.cxx16
-rw-r--r--android/experimental/desktop/native-code.cxx16
3 files changed, 24 insertions, 24 deletions
diff --git a/android/experimental/DocumentLoader/native-code.cxx b/android/experimental/DocumentLoader/native-code.cxx
index 43949ef26dce..2eb7cce569fc 100644
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ b/android/experimental/DocumentLoader/native-code.cxx
@@ -11,11 +11,11 @@
extern "C"
__attribute__ ((visibility("default")))
-const lib_to_component_mapping *
-lo_get_library_map(void)
+const lib_to_factory_mapping *
+lo_get_factory_map(void)
{
- static lib_to_component_mapping map[] = {
- NON_APP_SPECIFIC_COMPONENT_MAP
+ static lib_to_factory_mapping map[] = {
+ NON_APP_SPECIFIC_FACTORY_MAP
{ "libanimcorelo.a", animcore_component_getFactory },
{ "libavmedialo.a", avmedia_component_getFactory },
{ "libdbalo.a", dba_component_getFactory },
@@ -62,11 +62,11 @@ lo_get_library_map(void)
extern "C"
__attribute__ ((visibility("default")))
-const lib_to_component_mapping *
-lo_get_implementation_map(void)
+const lib_to_constructor_mapping *
+lo_get_constructor_map(void)
{
- static lib_to_component_mapping map[] = {
- NON_APP_SPECIFIC_DIRECT_COMPONENT_MAP
+ static lib_to_constructor_mapping map[] = {
+ NON_APP_SPECIFIC_CONSTRUCTOR_MAP
{ NULL, NULL }
};
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx b/android/experimental/LibreOffice4Android/native-code.cxx
index 2ec81496af3d..747e81669ff9 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -11,11 +11,11 @@
extern "C"
__attribute__ ((visibility("default")))
-const lib_to_component_mapping *
-lo_get_library_map(void)
+const lib_to_factory_mapping *
+lo_get_factory_map(void)
{
- static lib_to_component_mapping map[] = {
- NON_APP_SPECIFIC_COMPONENT_MAP
+ static lib_to_factory_mapping map[] = {
+ NON_APP_SPECIFIC_FACTORY_MAP
{ "libanimcorelo.a", animcore_component_getFactory },
{ "libavmedialo.a", avmedia_component_getFactory },
{ "libbasprov.uno.a", basprov_component_getFactory },
@@ -80,11 +80,11 @@ lo_get_library_map(void)
extern "C"
__attribute__ ((visibility("default")))
-const lib_to_component_mapping *
-lo_get_implementation_map(void)
+const lib_to_constructor_mapping *
+lo_get_constructor_map(void)
{
- static lib_to_component_mapping map[] = {
- NON_APP_SPECIFIC_DIRECT_COMPONENT_MAP
+ static lib_to_constructor_mapping map[] = {
+ NON_APP_SPECIFIC_CONSTRUCTOR_MAP
{ NULL, NULL }
};
diff --git a/android/experimental/desktop/native-code.cxx b/android/experimental/desktop/native-code.cxx
index b4f15aacae4f..3e44f522e258 100644
--- a/android/experimental/desktop/native-code.cxx
+++ b/android/experimental/desktop/native-code.cxx
@@ -11,11 +11,11 @@
extern "C"
__attribute__ ((visibility("default")))
-const lib_to_component_mapping *
-lo_get_library_map(void)
+const lib_to_factory_mapping *
+lo_get_factory_map(void)
{
- static lib_to_component_mapping map[] = {
- NON_APP_SPECIFIC_COMPONENT_MAP
+ static lib_to_factory_mapping map[] = {
+ NON_APP_SPECIFIC_FACTORY_MAP
{ "libanimcorelo.a", animcore_component_getFactory },
{ "libavmedialo.a", avmedia_component_getFactory },
{ "libbasprovlo.a", basprov_component_getFactory },
@@ -92,11 +92,11 @@ lo_get_library_map(void)
extern "C"
__attribute__ ((visibility("default")))
-const lib_to_component_mapping *
-lo_get_implementation_map(void)
+const lib_to_constructor_mapping *
+lo_get_constructor_map(void)
{
- static lib_to_component_mapping map[] = {
- NON_APP_SPECIFIC_DIRECT_COMPONENT_MAP
+ static lib_to_constructor_mapping map[] = {
+ NON_APP_SPECIFIC_CONSTRUCTOR_MAP
{ NULL, NULL }
};