kit/Watermark.hpp | 2 +-
loleaflet/src/control/Control.TopToolbar.js | 2 +-
loolkitconfig.xcu | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit f7e921b2cd4cd1e2dbcdff7e2904297b2c5077e2
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Sep 21 10:55:26 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Sep 22 20:31:53 2020 +0200
Prefer Calibri/Carlito font for new documents
Change-Id: I132df2ceac2a20ace380fb09afe0d097207e3bdb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103172
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/kit/Watermark.hpp b/kit/Watermark.hpp
index 303c194d6..deaca1549 100644
--- a/kit/Watermark.hpp
+++ b/kit/Watermark.hpp
@@ -26,7 +26,7 @@ public:
const std::shared_ptr<ChildSession> & session)
: _loKitDoc(loKitDoc)
, _text(session->getWatermarkText())
- , _font("Liberation Sans")
+ , _font("Carlito")
, _width(0)
, _height(0)
, _alphaLevel(session->getWatermarkOpacity())
diff --git a/loleaflet/src/control/Control.TopToolbar.js
b/loleaflet/src/control/Control.TopToolbar.js
index af271b21f..bbc581950 100644
--- a/loleaflet/src/control/Control.TopToolbar.js
+++ b/loleaflet/src/control/Control.TopToolbar.js
@@ -114,7 +114,7 @@ L.Control.TopToolbar = L.Control.extend({
}
}, hidden: true, desktop: true, mobile: false,
tablet: false},
{type: 'html', id: 'fonts',
- html: '<select
class="fonts-select"><option>Liberation Sans</option></select>',
+ html: '<select
class="fonts-select"><option>Carlito</option></select>',
onRefresh: function (edata) {
if (!edata.item.html) {
edata.isCancelled = true;
diff --git a/loolkitconfig.xcu b/loolkitconfig.xcu
index 5ba589b94..1e1fe79a8 100644
--- a/loolkitconfig.xcu
+++ b/loolkitconfig.xcu
@@ -34,10 +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 Noto Sans 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>Noto
Sans;Liberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu
Sans;Helvetica;Lucida;Geneva;Helmet;Arial 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>Noto
Sans;Liberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu
Sans;Helvetica;Lucida;Geneva;Helmet;Arial 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>Noto
Sans;Liberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu
Sans;Helvetica;Lucida;Geneva;Helmet;Arial 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>Noto
Sans;Liberation Sans;Albany AMT;Albany;Arial;Arimo;Nimbus Sans L;DejaVu
Sans;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans
Unicode;Tahoma;SansSerif</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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
