android/Makefile.am | 7 ++++++- android/lib/build.gradle | 5 ++++- loolkitconfig-mobile.xcu | 27 +++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-)
New commits: commit 373128a5b393ef0d22606ce2e70d6d230e350ab3 Author: Michael Meeks <[email protected]> AuthorDate: Sat Feb 15 20:27:26 2020 +0000 Commit: Michael Meeks <[email protected]> CommitDate: Tue Feb 18 12:08:19 2020 +0100 Install a Kit config that disables complex text options. These should be re-enabled if your locale looks like it needs them. Change-Id: I94759349538a7d024797f2b98c35861ccfb71c56 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88767 Tested-by: Michael Meeks <[email protected]> Reviewed-by: Michael Meeks <[email protected]> diff --git a/android/Makefile.am b/android/Makefile.am index ffa317c8a..d717a8b6a 100644 --- a/android/Makefile.am +++ b/android/Makefile.am @@ -4,8 +4,13 @@ clean-local: all-local: lib/src/main/assets/templates/untitled.odp \ lib/src/main/assets/templates/untitled.ods \ - lib/src/main/assets/templates/untitled.odt + lib/src/main/assets/templates/untitled.odt \ + lib/src/main/assets/etc/loolwsd/loolkitconfig.xcu lib/src/main/assets/templates/untitled.%: templates/untitled.% @mkdir -p $(dir $@) @cp -a $< $@ + +lib/src/main/assets/etc/loolwsd/loolkitconfig.xcu: $(top_srcdir)/loolkitconfig-mobile.xcu + @mkdir -p $(dir $@) + @cp -a $< $@ diff --git a/android/lib/build.gradle b/android/lib/build.gradle index 480c4dcd7..e2758100d 100644 --- a/android/lib/build.gradle +++ b/android/lib/build.gradle @@ -87,6 +87,10 @@ task copyUnpackAssets(type: Copy) { includes = ['**'] } } + into('etc/loolwsd') { + from('/android/loolkitconfig.xcu') + includes = [ 'loolkitconfig.xcu' ] + } into('user/fonts') { from "${liboInstdir}/share/fonts/truetype" // Note: restrict list of fonts due to size considerations - no technical reason anymore @@ -198,7 +202,6 @@ OSL_SOCKET_PATH=$APP_DATA_DIR/cache LO_LIB_DIR=file://$APP_DATA_DIR/lib/ BRAND_BASE_DIR=file:///assets BRAND_SHARE_SUBDIR=share -CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry res:${BRAND_BASE_DIR}/share/registry bundledext:${${BRAND_BASE_DIR}/program/lounorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/program/lounorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:${${BRAND_BASE_DIR}/program/lounorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini URE_BIN_DIR=file:///assets/ure/bin/dir/nothing-here/we-can/exec-anyway BAK_EXTENSIONS=${$ORIGIN/lounorc:TMP_EXTENSIONS} BUNDLED_EXTENSIONS=${$ORIGIN/lounorc:BUNDLED_EXTENSIONS} diff --git a/loolkitconfig-mobile.xcu b/loolkitconfig-mobile.xcu new file mode 100644 index 000000000..5f46a712e --- /dev/null +++ b/loolkitconfig-mobile.xcu @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<oor:items xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + +<!-- tdf#106488 - reverse hostname lookup can go badly wrong --> +<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="UseLocking" oor:op="fuse"><value>false</value></prop></item> + +<!-- Disable two capitals at start autocorrect --> +<item oor:path="/org.openoffice.Office.Common/AutoCorrect"><prop oor:name="TwoCapitalsAtStart" oor:op="fuse"><value>false</value></prop></item> + +<!-- Enable spell-checking by default --> +<item oor:path="/org.openoffice.Office.Linguistic/SpellChecking"><prop oor:name="IsSpellAuto" oor:op="fuse"><value>true</value></prop></item> + +<!-- Save memory by avoiding collecting autocompletion words --> +<item oor:path="/org.openoffice.Office.Writer/AutoFunction/Completion"><prop oor:name="Enable" oor:op="fuse"><value>false</value></prop></item> + +<!-- Disable complex text options - unless your locale needs them --> +<item oor:path="/org.openoffice.Office.Common/I18N/CJK"><prop oor:name="AsianTypography" oor:op="fuse"><value>false</value></prop></item> +<item oor:path="/org.openoffice.Office.Common/I18N/CJK"><prop oor:name="CJKFont" oor:op="fuse"><value>false</value></prop></item> +<item oor:path="/org.openoffice.Office.Common/I18N/CJK"><prop oor:name="ChangeCaseMap" oor:op="fuse"><value>false</value></prop></item> +<item oor:path="/org.openoffice.Office.Common/I18N/CJK"><prop oor:name="DoubleLines" oor:op="fuse"><value>false</value></prop></item> +<item oor:path="/org.openoffice.Office.Common/I18N/CJK"><prop oor:name="EmphasisMarks" oor:op="fuse"><value>false</value></prop></item> +<item oor:path="/org.openoffice.Office.Common/I18N/CJK"><prop oor:name="JapaneseFind" oor:op="fuse"><value>false</value></prop></item> +<item oor:path="/org.openoffice.Office.Common/I18N/CJK"><prop oor:name="Ruby" oor:op="fuse"><value>false</value></prop></item> +<item oor:path="/org.openoffice.Office.Common/I18N/CJK"><prop oor:name="VerticalCallOut" oor:op="fuse"><value>false</value></prop></item> +<item oor:path="/org.openoffice.Office.Common/I18N/CJK"><prop oor:name="VerticalText" oor:op="fuse"><value>false</value></prop></item> +<item oor:path="/org.openoffice.Office.Common/I18N/CTL"><prop oor:name="CTLFont" oor:op="fuse"><value>false</value></prop></item> + _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
