postprocess/Rdb_services.mk | 3 +++
solenv/bin/native-code.py | 4 +++-
vcl/source/components/dtranscomp.cxx | 2 ++
vcl/vcl.android.component | 3 +++
4 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 6891ab0dae58fe482e89eec5186ad7aeff909cac
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date: Tue Apr 25 11:40:54 2017 +0200
enable clipboard service for android
- register the VCLGenericClipboard as the SystemClipboard
- enable vcl.android component in Rdb services as this wasn't done
- choose VclGenericClipboard as the android implementation
Change-Id: I067dcf4d9cdfc4b7d7a941a1c86f545263d1abad
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 93f47433703d..ce8649ed7f7e 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -149,6 +149,9 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(ENABLE_HEADLESS), \
vcl/vcl.headless \
) \
+ $(if $(filter ANDROID,$(OS)), \
+ vcl/vcl.android \
+ ) \
$(if $(filter-out WNT,$(OS)), \
embeddedobj/source/msole/emboleobj \
) \
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index fd24f4a47e35..0d13b67fd6ac 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -59,6 +59,8 @@ core_factory_list = [
("libxmlfalo.a", "xmlfa_component_getFactory"),
("libodfflatxmllo.a", "odfflatxml_component_getFactory"),
("libxmlscriptlo.a", "xmlscript_component_getFactory"),
+ ("libmcnttype.a", "mcnttype_component_getFactory"),
+ ("libvcllo.a", "vcl_component_getFactory")
]
core_constructor_list = [
@@ -323,7 +325,7 @@ writer_factory_list = [
writer_constructor_list = [
# basic/util/sb.component
("com_sun_star_comp_sfx2_ScriptLibraryContainer_get_implementation", "#if
HAVE_FEATURE_SCRIPTING"),
-# filter/source/textfilterdetect/textfd.component
+# filter/source/textfilterdetect/textfd.component
"com_sun_star_comp_filters_PlainTextFilterDetect_get_implementation",
# sw/util/sw.component
"com_sun_star_comp_Writer_XMLOasisContentImporter_get_implementation",
diff --git a/vcl/source/components/dtranscomp.cxx
b/vcl/source/components/dtranscomp.cxx
index 91c8d4b3f929..0946b0e34fa5 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -221,6 +221,8 @@ OUString SAL_CALL Clipboard_getImplementationName()
return OUString(
#if defined MACOSX
"com.sun.star.datatransfer.clipboard.AquaClipboard"
+ #elif defined ANDROID
+ "com.sun.star.datatransfer.VCLGenericClipboard"
#elif defined UNX
"com.sun.star.datatransfer.X11ClipboardSupport"
#else
diff --git a/vcl/vcl.android.component b/vcl/vcl.android.component
index f2adfaa457cd..2c4c4a5909bf 100644
--- a/vcl/vcl.android.component
+++ b/vcl/vcl.android.component
@@ -19,6 +19,9 @@
<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
prefix="vcl" xmlns="http://openoffice.org/2010/uno-components";>
+ <implementation name="com.sun.star.datatransfer.VCLGenericClipboard">
+ <service name="com.sun.star.datatransfer.clipboard.SystemClipboard"/>
+ </implementation>
<implementation name="com.sun.star.frame.VCLSessionManagerClient">
<service name="com.sun.star.frame.SessionManagerClient"/>
</implementation>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
