[Libreoffice-commits] online.git: kit/Watermark.hpp loleaflet/src

[Andras Timar (via logerrit)]

 kit/Watermark.hpp                                   |    2 +-
 loleaflet/src/control/Control.NotebookbarCalc.js    |    4 ++--
 loleaflet/src/control/Control.NotebookbarImpress.js |    4 ++--
 loleaflet/src/control/Control.NotebookbarWriter.js  |    4 ++--
 loleaflet/src/control/Control.TopToolbar.js         |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit d6216e4335da0e2b6b06caabd5b378bd3798d922
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Sep 21 11:59:28 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Sep 21 16:27:12 2020 +0200

    default to Carlito in font selector
    
    Change-Id: Ib568253adc48376cf57335934c3471b46d08fdbc
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103092
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at 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.NotebookbarCalc.js b/loleaflet/src/control/Control.NotebookbarCalc.js
index 6fe096450..02a3c6907 100644
--- a/loleaflet/src/control/Control.NotebookbarCalc.js
+++ b/loleaflet/src/control/Control.NotebookbarCalc.js
@@ -554,7 +554,7 @@ L.Control.NotebookbarCalc = L.Control.NotebookbarWriter.extend({
 																														{
 																															'id': 'fontnamecombobox',
 																															'type': 'combobox',
-																															'text': 'Liberation Sans',
+																															'text': 'Carlito',
 																															'enabled': 'true',
 																															'children': [
 																																{
@@ -566,7 +566,7 @@ L.Control.NotebookbarCalc = L.Control.NotebookbarWriter.extend({
 																																{
 																																	'id': '',
 																																	'type': 'edit',
-																																	'text': 'Liberation Sans',
+																																	'text': 'Carlito',
 																																	'enabled': 'true'
 																																}
 																															],
diff --git a/loleaflet/src/control/Control.NotebookbarImpress.js b/loleaflet/src/control/Control.NotebookbarImpress.js
index dddc7b4ef..80f4cb186 100644
--- a/loleaflet/src/control/Control.NotebookbarImpress.js
+++ b/loleaflet/src/control/Control.NotebookbarImpress.js
@@ -740,7 +740,7 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
 																												{
 																													'id': 'fontnamecombobox',
 																													'type': 'combobox',
-																													'text': 'Liberation Sans',
+																													'text': 'Carlito',
 																													'enabled': 'true',
 																													'children': [
 																														{
@@ -752,7 +752,7 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
 																														{
 																															'id': '',
 																															'type': 'edit',
-																															'text': 'Liberation Sans',
+																															'text': 'Carlito',
 																															'enabled': 'true'
 																														}
 																													],
diff --git a/loleaflet/src/control/Control.NotebookbarWriter.js b/loleaflet/src/control/Control.NotebookbarWriter.js
index 6b0fd5237..295b6c294 100644
--- a/loleaflet/src/control/Control.NotebookbarWriter.js
+++ b/loleaflet/src/control/Control.NotebookbarWriter.js
@@ -783,7 +783,7 @@ L.Control.NotebookbarWriter = L.Control.Notebookbar.extend({
 																												{
 																													'id': 'fontnamecombobox',
 																													'type': 'combobox',
-																													'text': 'Liberation Serif',
+																													'text': 'Carlito',
 																													'enabled': 'true',
 																													'children': [
 																														{
@@ -795,7 +795,7 @@ L.Control.NotebookbarWriter = L.Control.Notebookbar.extend({
 																														{
 																															'id': '',
 																															'type': 'edit',
-																															'text': 'Liberation Serif',
+																															'text': 'Carlito',
 																															'enabled': 'true'
 																														}
 																													],
diff --git a/loleaflet/src/control/Control.TopToolbar.js b/loleaflet/src/control/Control.TopToolbar.js
index 29cf538d4..8b4cc14b7 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;