From f1f1cee11db7dcf29a94b7a42cac2e31508e8a15 Mon Sep 17 00:00:00 2001
From: mhoellein <mhoellein@freenet.de>
Date: Mon, 28 Sep 2020 15:27:04 +0200
Subject: [PATCH] committing changes in /etc after apt run

Package changes:
+collaboraoffice6.4 6.4.10.6-6 amd64
+collaboraoffice6.4-ure 6.4.10.6-6 amd64
+collaboraofficebasis6.4-calc 6.4.10.6-6 amd64
+collaboraofficebasis6.4-core 6.4.10.6-6 amd64
+collaboraofficebasis6.4-draw 6.4.10.6-6 amd64
+collaboraofficebasis6.4-en-us 6.4.10.6-6 amd64
+collaboraofficebasis6.4-extension-pdf-import 6.4.10.6-6 amd64
+collaboraofficebasis6.4-graphicfilter 6.4.10.6-6 amd64
+collaboraofficebasis6.4-images 6.4.10.6-6 amd64
+collaboraofficebasis6.4-impress 6.4.10.6-6 amd64
+collaboraofficebasis6.4-ooofonts 6.4.10.6-6 amd64
+collaboraofficebasis6.4-ooolinguistic 6.4.10.6-6 amd64
+collaboraofficebasis6.4-writer 6.4.10.6-6 amd64
-loolwsd 4.2.6-2 amd64
+loolwsd 6.4.0-3 amd64
---
 apt/apt.conf.d/25loolwsd  | 2 +-
 loolwsd/loolkitconfig.xcu | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/apt/apt.conf.d/25loolwsd b/apt/apt.conf.d/25loolwsd
index d17ef9bb..de34164e 100644
--- a/apt/apt.conf.d/25loolwsd
+++ b/apt/apt.conf.d/25loolwsd
@@ -1,2 +1,2 @@
 // Rebuild systemplate of Collabora Online Development Edition
-DPkg::Post-Invoke { "echo Updating loolwsd systemplate;loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice6.2 >/dev/null 2>&1"; };
+DPkg::Post-Invoke { "echo Updating loolwsd systemplate;loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice6.4 >/dev/null 2>&1"; };
diff --git a/loolwsd/loolkitconfig.xcu b/loolwsd/loolkitconfig.xcu
index a2a71171..1e1fe79a 100644
--- a/loolwsd/loolkitconfig.xcu
+++ b/loolwsd/loolkitconfig.xcu
@@ -34,4 +34,10 @@
 <!-- Disable GIO UCP we don't want -->
 <item oor:path="/org.openoffice.ucb.Configuration/ContentProviders/Local/SecondaryKeys/Office/ProviderData/Provider999"><prop oor:name="URLTemplate" oor:op="fuse"><value>NeverMatchAnyUrlSuffix</value></prop></item>
 
+<!-- Default font for new documents. Most of the languages use 'en' settings. For those that do not, it's better not to touch their settings, because it's unlikely that Calibri (or Carlito) is better than current default. -->
+<item oor:path="/org.openoffice.VCL/DefaultFonts/org.openoffice.VCL:LocalizedDefaultFonts['en']"><prop oor:name="LATIN_HEADING" oor:op="fuse" oor:type="xs:string"><value>Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value></prop></item>
+<item oor:path="/org.openoffice.VCL/DefaultFonts/org.openoffice.VCL:LocalizedDefaultFonts['en']"><prop oor:name="LATIN_PRESENTATION" oor:op="fuse" oor:type="xs:string"><value>Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value></prop></item>
+<item oor:path="/org.openoffice.VCL/DefaultFonts/org.openoffice.VCL:LocalizedDefaultFonts['en']"><prop oor:name="LATIN_SPREADSHEET" oor:op="fuse" oor:type="xs:string"><value>Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value></prop></item>
+<item oor:path="/org.openoffice.VCL/DefaultFonts/org.openoffice.VCL:LocalizedDefaultFonts['en']"><prop oor:name="LATIN_TEXT" oor:op="fuse" oor:type="xs:string"><value>Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value></prop></item>
+
 </oor:items>
-- 
2.43.0