common/Log.cpp | 3 -
configure.ac | 2
etc/ca-chain.cert.pem | 89 ++++++------------------------
etc/cert.pem | 51 ++++++-----------
etc/key.pem | 50 ++++++++--------
loleaflet/dist/admin/admin.html | 2
loleaflet/dist/admin/adminAnalytics.html | 2
loleaflet/dist/admin/adminHistory.html | 2
loleaflet/dist/admin/adminSettings.html | 2
loleaflet/dist/images/savemodified.svg | 10 +++
loleaflet/dist/toolbar.css | 1
loleaflet/dist/toolbar/toolbar.js | 2
loleaflet/src/layer/tile/TileLayer.js | 38 ++++++++++++
loleaflet/src/map/handler/Map.Keyboard.js | 3 -
loolwsd.xml.in | 4 -
15 files changed, 124 insertions(+), 137 deletions(-)
New commits:
commit e6b7459c25e29bec742a76476ef4cf6339f829f6
Author: Andras Timar <andras.ti...@collabora.com>
Date: Wed May 9 09:37:01 2018 +0200
Bump version to 6.0.4.2
Change-Id: I9604540408a23e56f57c13a52758287f1c88e7a3
diff --git a/configure.ac b/configure.ac
index cec19ee41..42c4f08ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([libreoffice-online], [6.0.3.2], [libreoffice@lists.freedesktop.org])
+AC_INIT([libreoffice-online], [6.0.4.2], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
commit 5664d902904282fa6a087b916ff20959cf7008b0
Author: Andras Timar <andras.ti...@collabora.com>
Date: Tue May 8 13:03:41 2018 +0200
trace should not be enabled by default in config file
This setting defaults to false in code, when the setting is not present
in the config file.
Also world-readable /tmp is not a good default path of trace file.
Change-Id: Iab6da18cf6f97f75bbcdaf444042cd7039c462f8
Reviewed-on: https://gerrit.libreoffice.org/53966
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Michael Meeks <michael.me...@collabora.com>
(cherry picked from commit ad7c8ea8b390749c93024fd5db68b1804d593fcc)
Signed-off-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 754aa6c30..bccee0015 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -50,8 +50,8 @@
<loleaflet_logging desc="Logging in the browser console"
default="@LOLEAFLET_LOGGING@">@LOLEAFLET_LOGGING@</loleaflet_logging>
- <trace desc="Dump commands and notifications for replay. When 'snapshot'
is true, the source file is copied to the path first." enable="true">
- <path desc="Output path to hold trace file and docs. Use '%' for
timestamp to avoid overwriting." compress="true"
snapshot="false">/tmp/looltrace-%.gz</path>
+ <trace desc="Dump commands and notifications for replay. When 'snapshot'
is true, the source file is copied to the path first." enable="false">
+ <path desc="Output path to hold trace file and docs. Use '%' for
timestamp to avoid overwriting. For example: /some/path/to/looltrace-%.gz"
compress="true" snapshot="false"></path>
<filter>
<message desc="Regex pattern of messages to exclude"></message>
</filter>
commit 91bae92f1c1b1c4cd850de4c64cc6a6f9ea50750
Author: ozturkemre <ozturke...@gmail.com>
Date: Fri Apr 27 15:42:49 2018 +0300
tdf#115310 "Save button" changes while there is unsaved changes
Change-Id: Ied761fe86e774371daf4e2d80328f756c0fc628f
Reviewed-on: https://gerrit.libreoffice.org/53558
Reviewed-by: pranavk <pran...@collabora.co.uk>
Tested-by: pranavk <pran...@collabora.co.uk>
(cherry picked from commit c879049f1f77484317b68082fefad9b452866f20)
Signed-off-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/loleaflet/dist/images/savemodified.svg
b/loleaflet/dist/images/savemodified.svg
new file mode 100644
index 000000000..559f944ef
--- /dev/null
+++ b/loleaflet/dist/images/savemodified.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path
+ style="fill:#4d4d4d"
+ d="M 4 3.9980469 L 4 4 L 4 5 L 4 20 L 5 20 L 14 20 L 14 19 L 8 19 L 8 13
L 16 13 L 17 13 L 17 12 L 16 12 L 8 12 L 7 12 L 7 19 L 5 19 L 5 5 L 8 5 L 8 9 L
8 10 L 16 10 L 16 9 L 16 5 L 16.292969 5 L 19 7.7070312 L 19 8 L 19 13 L 20 13
L 20 8 L 20 7.3007812 L 19.992188 7.3007812 L 20 7.2910156 L 16.707031
3.9980469 L 16.699219 4.0078125 L 16.699219 3.9980469 L 16 3.9980469 L 4
3.9980469 z M 9 5 L 12.900391 5 L 12.900391 9 L 9 9 L 9 5 z "
+ />
+ <path
+ style="fill:#da4453"
+ d="M 17 14 L 16.425781 15.613281 L 14.878906 14.878906 L 15.613281
16.425781 L 14 17 L 15.613281 17.574219 L 14.878906 19.121094 L 16.425781
18.386719 L 17 20 L 17.574219 18.386719 L 19.121094 19.121094 L 18.386719
17.574219 L 20 17 L 18.386719 16.425781 L 19.121094 14.878906 L 17.574219
15.613281 L 17 14 z "
+ />
+ </svg>
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 6564ae95e..ba0918ac9 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -284,6 +284,7 @@ button.leaflet-control-search-next
.w2ui-icon.redo{ background: url('../images/lc_redo.svg') no-repeat center
!important; }
.w2ui-icon.save{ background: url('../images/lc_save.svg') no-repeat center
!important; }
.w2ui-icon.saveas{ background: url('../images/lc_saveas.svg') no-repeat center
!important; }
+.w2ui-icon.savemodified{ background: url('../images/savemodified.svg')
no-repeat center !important; }
.w2ui-icon.strikeout{ background: url('../images/lc_strikeout.svg') no-repeat
center !important; }
.w2ui-icon.underline{ background: url('../images/lc_underline.svg') no-repeat
center !important; }
.w2ui-icon.undo{ background: url('../images/lc_undo.svg') no-repeat center
!important; }
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index f0d140241..ba5aac56a 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1271,9 +1271,11 @@ map.on('commandstatechanged', function (e) {
var html;
if (modifiedStatus) {
html =
$('#modifiedstatuslabel').html('').parent().html();
+ w2ui['toolbar-up'].set('save', {img:'savemodified'});
}
else {
html = $('#modifiedstatuslabel').html(_('Document
saved')).parent().html();
+ w2ui['toolbar-up'].set('save', {img:'save'});
}
updateToolbarItem(statusbar, 'modifiedstatuslabel', html);
}
commit d8e2a83772b96f0babb15aedfaba41be2226ac82
Author: Henry Castro <hcas...@collabora.com>
Date: Wed Apr 25 15:53:38 2018 -0400
loleaflet: fix console log uncaught reference error
Change-Id: Ic3813cd7857a646949183ba9b54fca8377069ea3
(cherry picked from commit 11f00f3c1f1aaf9f37edb884c63ccf4331286596)
Signed-off-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/loleaflet/dist/admin/admin.html b/loleaflet/dist/admin/admin.html
index 306da27f7..0439ac16f 100644
--- a/loleaflet/dist/admin/admin.html
+++ b/loleaflet/dist/admin/admin.html
@@ -20,7 +20,7 @@
<body>
<script src="/loleaflet/dist/admin-bundle.js"></script>
<script src="/loleaflet/dist/branding.js"></script>
- <script>if (brandProductName) {l10nstrings.strProductName =
brandProductName}</script>
+ <script>if (typeof brandProductName !== 'undefined')
{l10nstrings.strProductName = brandProductName}</script>
<script>document.title = l10nstrings.strProductName + ' - ' +
l10nstrings.strAdminConsole</script>
<script>
if (window.location.protocol == "https:") {
diff --git a/loleaflet/dist/admin/adminAnalytics.html
b/loleaflet/dist/admin/adminAnalytics.html
index 34b78c30a..722629435 100644
--- a/loleaflet/dist/admin/adminAnalytics.html
+++ b/loleaflet/dist/admin/adminAnalytics.html
@@ -20,7 +20,7 @@
<body>
<script src="/loleaflet/dist/admin-bundle.js"></script>
<script src="/loleaflet/dist/branding.js"></script>
- <script>if (brandProductName) {l10nstrings.strProductName =
brandProductName}</script>
+ <script>if (typeof brandProductName !== 'undefined')
{l10nstrings.strProductName = brandProductName}</script>
<script>document.title = l10nstrings.strProductName + ' - ' +
l10nstrings.strAdminConsole</script>
<script>
if (window.location.protocol == "https:") {
diff --git a/loleaflet/dist/admin/adminHistory.html
b/loleaflet/dist/admin/adminHistory.html
index 76dec2c9b..17184045a 100644
--- a/loleaflet/dist/admin/adminHistory.html
+++ b/loleaflet/dist/admin/adminHistory.html
@@ -21,7 +21,7 @@
<body>
<script src="/loleaflet/dist/admin-bundle.js"></script>
<script src="/loleaflet/dist/branding.js"></script>
- <script>if (brandProductName) {l10nstrings.strProductName =
brandProductName}</script>
+ <script>if (typeof brandProductName !== 'undefined')
{l10nstrings.strProductName = brandProductName}</script>
<script>document.title = l10nstrings.strProductName + ' - ' +
l10nstrings.strAdminConsole</script>
<script>
if (window.location.protocol == "https:") {
diff --git a/loleaflet/dist/admin/adminSettings.html
b/loleaflet/dist/admin/adminSettings.html
index 7ca0061a4..9238354f5 100644
--- a/loleaflet/dist/admin/adminSettings.html
+++ b/loleaflet/dist/admin/adminSettings.html
@@ -20,7 +20,7 @@
<body>
<script src="/loleaflet/dist/admin-bundle.js"></script>
<script src="/loleaflet/dist/branding.js"></script>
- <script>if (brandProductName) {l10nstrings.strProductName =
brandProductName}</script>
+ <script>if (typeof brandProductName !== 'undefined')
{l10nstrings.strProductName = brandProductName}</script>
<script>document.title = l10nstrings.strProductName + ' - ' +
l10nstrings.strAdminConsole</script>
<script>
if (window.location.protocol == "https:") {
commit bd1242290abee619140eb89024c902b40ec9d3c7
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Thu Apr 19 08:35:23 2018 -0400
wsd: log proper ISO date in YYYY-MM-DD format
Change-Id: I8851c044bad43a03a99f7471be97ea77c58f7be8
Reviewed-on: https://gerrit.libreoffice.org/53266
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/53316
(cherry picked from commit d50850337b1cad5ce93678079085a97316f1f48e)
Reviewed-on: https://gerrit.libreoffice.org/53318
(cherry picked from commit b59f5c2c65939bd7c6781deb335b186f44f14e84)
Signed-off-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/common/Log.cpp b/common/Log.cpp
index 0b19d88f5..eefefe526 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -112,9 +112,10 @@ namespace Log
}
Poco::DateTime time;
- snprintf(buffer, 1023, "%s-%.05lu %.2u:%.2u:%.2u.%.6u [ %s ] %s ",
+ snprintf(buffer, 1023, "%s-%.05lu %.4u-%.2u-%.2u %.2u:%.2u:%.2u.%.6u [
%s ] %s ",
(Source.inited ? Source.id.c_str() : "<shutdown>"),
osTid,
+ time.year(), time.month(), time.day(),
time.hour(), time.minute(), time.second(),
time.millisecond() * 1000 + time.microsecond(),
threadName, level);
commit 9d12f0d3a19d51b39e8c4a07e45c736cc2f59cd1
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sat Apr 14 17:50:46 2018 +0200
new dummy ssl key and cert for testing
Change-Id: Ia2586c4201696e0d80d2be3f284564e65fac71c0
Reviewed-on: https://gerrit.libreoffice.org/52874
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
(cherry picked from commit 558e20f98142ae85786ec9a5214bf5ef734f25b4)
Signed-off-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/etc/ca-chain.cert.pem b/etc/ca-chain.cert.pem
index 5793ad42b..7ed7f4bc0 100644
--- a/etc/ca-chain.cert.pem
+++ b/etc/ca-chain.cert.pem
@@ -1,71 +1,22 @@
-----BEGIN CERTIFICATE-----
-MIIGLDCCBBSgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwgaoxCzAJBgNVBAYTAkdC
-MRAwDgYDVQQIDAdFbmdsYW5kMRIwEAYDVQQHDAlDYW1icmlkZ2UxIzAhBgNVBAoM
-GkNvbGxhYm9yYSBQcm9kdWN0aXZpdHkgTHRkMSUwIwYDVQQDDBxDb2xsYWJvcmEg
-Q2xvdWRTdWl0ZSBSb290IENBMSkwJwYJKoZIhvcNAQkBFhphbmRyYXMudGltYXJA
-Y29sbGFib3JhLmNvbTAeFw0xNjAzMjMxMzU3NTdaFw0yNjAzMjExMzU3NTdaMIGe
-MQswCQYDVQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEjMCEGA1UECgwaQ29sbGFi
-b3JhIFByb2R1Y3Rpdml0eSBMdGQxLTArBgNVBAMMJENvbGxhYm9yYSBDbG91ZFN1
-aXRlIEludGVybWVkaWF0ZSBDQTEpMCcGCSqGSIb3DQEJARYaYW5kcmFzLnRpbWFy
-QGNvbGxhYm9yYS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDT
-aaiae2bkWpLrvuBRTNQeaiTbdHmpKbfk8avlCFUxZPI3AaJKNCCISghriDgmftCf
-jO65/K0vPLuMjhKm1MT4NfcIz5szfwq1ikNptQKw7w88JgkKQJLoCZ3IHpd7um15
-0QtseNaUX3VfidJDML/DnaZlrkSb54xCKakV8C3gtEpU9P8+BQX5LUJNhyAsA3Iv
-SuP8kDmBluf2DnYuPfbLqwyS9YU8Ch3yWee2CH0yzWD+I3qft540DsbIMnv4ncuG
-PHxNsSTPEEo2B4kylrQO0CJbGaYm2Y42O79sv/W//HZmAY9UjfnY99DwX0MmZgqg
-/AZu1uBg//MZHQT6ZZ3PYZnRvEztrL1+Fs1EHI83H2c4DhLCO8iNVhFycWxHkwj6
-lnh0ZNu4HPC0V3E5gQFFzNHX6gxPBC2EuwMyNok0GbBm2DFXz7kMKCB/X4OYZKKH
-YEoi3bQEQ9TwwgcG5RIehpN8qoCOUMxe6SfgFAPpNDtKbwXqfvKBKwVHaW0K6cHQ
-66vrZvo9/2GhfYS/dNYdX7WHebopbhJ34PFk5jalm6bD/kvJqjJ2zGd57gZtdppi
-A1ZX4J9MHTO68y4TbBPfCPt6KpMK/fnp53LA0oFZ9XntFLrLV4hFOGndwtil321s
-BOoQkZQr/BlzPP5RKVhO31r5d7lbCRkQKRPLBLTcqwIDAQABo2YwZDAdBgNVHQ4E
-FgQUaTO589awe53N6Hi013vEvniVrmwwHwYDVR0jBBgwFoAUrPe5NOpqgYZPbA+w
-JhGqEBdxgrkwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwDQYJ
-KoZIhvcNAQELBQADggIBAHYUXHYASO3PqA9KnjaGn01qJcFOp7GWK8nKg6EN1ws4
-cQ7GQEwJFxR1bjaaaDA1jnmOuByJCGKX6wGCgg1zAnptyN9lnAcHnxsXZgRq5sLT
-qFwtrS0iG1IGNwGADLZMtKPmFKxKKd8BdeuIcSOxzJIL31sCtizVu6+WwXUxiHI+
-ujTcKEaFWCKotiHrLXRdhj4+NXf6SGfzs9Iz57+mozebcL2eCIWRkM2Q+BDWXd/G
-4j8tBHt0ZmTG0tE1sS7/IgfWtTrAzP8cNA//zrxbYCi0rUIx2E07iCvf3EQ4ANl8
-U1hA5vKbFOFkkzg57H9usThHiFwBdQcDpHgj3sQs/NhT1UYoc/+uU9TBgSPZg35U
-L/tLtqqshwYs27WlFndEtQimwopAXUPjgaQXOM+erdwh8k7vJyrw4ySqWz6BfZCw
-ohzgRWnQZL5RMic6y5UZuAAudc9t3YylYbz6bNmp/8nyisHtFMMFSm9OEFrE+NE7
-AL1idFrFqtIDrG6ehdBXK+O1a0dli13G59JLguN2sDODCA1B7EKGmXIwfkNGqnyt
-zRQ1PTqu3kG5ywjWtlGbURuk9+NwgEUDH8jQOoO3wvtNlM6Tik/jO8d5EKheohDf
-WaNXolDqXz+rYBjlqyEA8VJN5nkpwl3d2vR3Kdathtq9SFefe0zwn2wRxAGHSnbM
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIGPDCCBCSgAwIBAgIJANfAzfWho/TpMA0GCSqGSIb3DQEBCwUAMIGqMQswCQYD
-VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDESMBAGA1UEBwwJQ2FtYnJpZGdlMSMw
-IQYDVQQKDBpDb2xsYWJvcmEgUHJvZHVjdGl2aXR5IEx0ZDElMCMGA1UEAwwcQ29s
-bGFib3JhIENsb3VkU3VpdGUgUm9vdCBDQTEpMCcGCSqGSIb3DQEJARYaYW5kcmFz
-LnRpbWFyQGNvbGxhYm9yYS5jb20wHhcNMTYwMzIzMTM0MzI3WhcNMzYwMzE4MTM0
-MzI3WjCBqjELMAkGA1UEBhMCR0IxEDAOBgNVBAgMB0VuZ2xhbmQxEjAQBgNVBAcM
-CUNhbWJyaWRnZTEjMCEGA1UECgwaQ29sbGFib3JhIFByb2R1Y3Rpdml0eSBMdGQx
-JTAjBgNVBAMMHENvbGxhYm9yYSBDbG91ZFN1aXRlIFJvb3QgQ0ExKTAnBgkqhkiG
-9w0BCQEWGmFuZHJhcy50aW1hckBjb2xsYWJvcmEuY29tMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAwbDk+4wViZt5KRtbKxt385++bifvNh4snODlN/Oq
-+BlY07KgK3XkltrSvrrXrVI44f/qvLLdzD/KKjR4tFUntD638Hfre9mrs6grbkC7
-OniecOkrE06maSgOzGEJjbH3IkBPJkLt3Lehp0aWLO/4lweHsO2FXWfX8F0Tzi+B
-TyqDOpO1Utb2y9gjfJFj0cx0hBdokzjmlEuP9nb1rwh3aTNQqVG5UXDj+eNZP93k
-5Bjh39RnYYQvNnJkdUjacBVjxWSFVqeZYIsVpKh8qLiUUPp2h4jZ2l6uL/Kub9Xz
-iVRUS67e12J/u6HSzOsN38UW7a2S5IK32sIv0p/mMPzpXAnAe7V4PBsvagN/RtTV
-M9R2S4w8/XMzjcBzK16AZ+0FAYo1+6ZXNTfLp5JXkez6FUSAaGIVo2n1PJb3/ovs
-1rorkNv+5S9tZ1nj27i/WNo6ACajePX+v2HnG7EWk6B7HKBqKtPMzMwIJbN5PfcZ
-iWACSMrjkBLhHbWLUwpy32Xe3zz3tPxdiAjLF2voCoSZuRscti2QEzrWqhAX0CXF
-bVeGBjBKgvS3oLIYnvwnVO2h20l1jHpD4HyCyK+RhJro625xxuDZsnv5l89+35oN
-hrGNC5LamicfpTJIQUatKT03E/XpPlhBsbxejXQbSiw169Q+7YDhZl1/aBbtysD1
-PSkCAwEAAaNjMGEwHQYDVR0OBBYEFKz3uTTqaoGGT2wPsCYRqhAXcYK5MB8GA1Ud
-IwQYMBaAFKz3uTTqaoGGT2wPsCYRqhAXcYK5MA8GA1UdEwEB/wQFMAMBAf8wDgYD
-VR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQAktNkfAEQGeFqXXfStyrPP
-X55v9BeWQn/X/w2pDOOp7It6LBuhntThp1oYrdK09ZSfGHY1H6QaAq5lY1GsABz4
-+pYnMmnymfE6k9Vy57y/rp/nFTneH9RDLygHDvYF5/LJpnxfsXYxmQiRJBulPQQl
-C3oI+USQZppl2LBPRkwZLw9dRQL9Bz49MWuu1I6Y4K+LcegEpiINKJrVU1zRWIpj
-k0LDjyasZIXp4jfBK4kjo3GeGDgpDjcMIVf4nTtkYZ8wdj78f6kP9JKdph+/VtEw
-k4PYsfccpDycHCZ5wY8VqrQ62qJbBOpwmfVqb53KvmffbZxXhZxv9jxGk9gTsZnm
-w/jXWpDLXpsDXZ4CA7CHv2YfWj/JkE51wzP/hNoHhWYi44Ky6tKi0a81U8Ve3zws
-WRolq9g07K24HAHTgo/3COP/Ql1t4KCfG4bHfu/13ExUScub7xivUZxsdrbcVPkj
-spUKJV0L25KTSKCfRITbVVx/mTjK0PFQvQNJFHBDy+7Sp9KZUcaNgsXUw4hyQf/5
-LWiKW9DPSJVU+7dHuFgBCBbfmsQxQjU4iDfSg05+mF8KqSWgn5VtDdKNro3C1+q0
-jICh3QCYFvFw671jGV8mnGMquVTkC5Dke/jq3PAHxgC7tWasIHeOt9C0lH5o6b96
-NfVWnTHVF4DnJBsp3jyyMQ==
+MIIDlzCCAn+gAwIBAgIJAIJMyest2ZhqMA0GCSqGSIb3DQEBCwUAMGIxCzAJBgNV
+BAYTAkRFMQswCQYDVQQIDAJCVzESMBAGA1UEBwwJU3R1dHRnYXJ0MRgwFgYDVQQK
+DA9EdW1teSBBdXRob3JpdHkxGDAWBgNVBAMMD0R1bW15IEF1dGhvcml0eTAeFw0x
+ODA0MTQxNTQ4MzlaFw00MzA0MTQxNTQ4MzlaMGIxCzAJBgNVBAYTAkRFMQswCQYD
+VQQIDAJCVzESMBAGA1UEBwwJU3R1dHRnYXJ0MRgwFgYDVQQKDA9EdW1teSBBdXRo
+b3JpdHkxGDAWBgNVBAMMD0R1bW15IEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALaJtw2zK+ai+LTCoIODetMspVZzutrA6KYDGnGO203B
+kcR8jLgXyCduFlvYKyd3RFx/UcaI5DqW4MvVMefi/2WHpNc1Lde6nnNUMqaz+VPD
+GyRkbXM/op2IJGZy6BqqoyeAuzak60cE7lCba4mGJC/hW8TUIDjFS58s9yNWL1IF
+YsZWOENTS744Fd8TYFCoAEmSCrqfvpwp+fXd6azWLgHKoTeEWccSkxR9JPWg6nqr
+7TgL+tLjfin1Nim1bDe2xJf3FsbjAUhIIKXQAGWjv6zzd6OT0/4iPvIhSnaqPyJ0
+XAGtTmjr2o+tkwTVhRVsQADx8hglvNoa73J0kKtGZzUCAwEAAaNQME4wHQYDVR0O
+BBYEFIb7HhPssW73+DCkHQPjUNiisANgMB8GA1UdIwQYMBaAFIb7HhPssW73+DCk
+HQPjUNiisANgMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAB3dd5kE
+LwZjcp4O38ep7APiS0MZD67UnZ47zqSkVrhzph2/ZYn+cN3cDcOgFGUy4hx9MkKh
+mD6LcoCLNWjneF7R3deK46KsKfZl2a0sHMtVPn/Mlh4tqWax1FaKkDPfvRD009qZ
+5B3Vt4wHJiZY+WqKWmuTKtJRE9ob5Ovrl9PQr2xZKoT2kOSrQviQbsf/ui/hRmti
+iGQEJXCt4BVjVfLz7CwKENE8UPi2ngowb5uSNtglfbTXG8TyNtefD0veuidG7dc/
+0FzqvXbYhcMXlFtOr9SeGVz/i6O1yHQJLdvXq+VUi3pJQrcXjOFJbjWxUvdqknET
+pSWB94W8g3Tfx+s=
-----END CERTIFICATE-----
diff --git a/etc/cert.pem b/etc/cert.pem
index a0a2a2960..f53a1ba55 100644
--- a/etc/cert.pem
+++ b/etc/cert.pem
@@ -1,35 +1,20 @@
-----BEGIN CERTIFICATE-----
-MIIGKzCCBBOgAwIBAgICEAswDQYJKoZIhvcNAQELBQAwgZ4xCzAJBgNVBAYTAkdC
-MRAwDgYDVQQIDAdFbmdsYW5kMSMwIQYDVQQKDBpDb2xsYWJvcmEgUHJvZHVjdGl2
-aXR5IEx0ZDEtMCsGA1UEAwwkQ29sbGFib3JhIENsb3VkU3VpdGUgSW50ZXJtZWRp
-YXRlIENBMSkwJwYJKoZIhvcNAQkBFhphbmRyYXMudGltYXJAY29sbGFib3JhLmNv
-bTAeFw0xNzA0MDMxMjEzNTVaFw0xODA0MTMxMjEzNTVaMIGXMQswCQYDVQQGEwJH
-QjEQMA4GA1UECAwHRW5nbGFuZDESMBAGA1UEBwwJQ2FtYnJpZGdlMSMwIQYDVQQK
-DBpDb2xsYWJvcmEgUHJvZHVjdGl2aXR5IEx0ZDESMBAGA1UEAwwJbG9jYWxob3N0
-MSkwJwYJKoZIhvcNAQkBFhphbmRyYXMudGltYXJAY29sbGFib3JhLmNvbTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAKVQT9gmeBxYf/9eHexQ481jKq
-+rd7V+W9E4YPGHLmc6VJjojRFqE7VuXsQ1jvsEuB0XMyfkwm5VNMXfb9JFuRjZAT
-JdRlnf80+gBfXdme6GqjeBH/+Dm+6CEiV70UVRtspY+bMzdmkfwc6QFhbb1sTKyt
-FlhUg6OYdb3FKXk0o9ew1AcFyOsZIpW7UyCGEo3NC1I5SY4iwk4hwDYOY+opj2QC
-k1cQQ8CWpoonEvnwmUUbQ81W8diS7fMFqMouC8CFFKdqS1YafVlUUI8gDZOqvHC5
-ubBBMGL8IQi/YpaCzA0T9DLeF4lb/+9X6yeV8LCnFuh5UIabjMWj0OgNFLcCAwEA
-AaOCAXYwggFyMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZAMDMGCWCGSAGG
-+EIBDQQmFiRPcGVuU1NMIEdlbmVyYXRlZCBTZXJ2ZXIgQ2VydGlmaWNhdGUwHQYD
-VR0OBBYEFG4G7H4ECGBDbPK+0t8dmQpYWl9oMIHYBgNVHSMEgdAwgc2AFGkzufPW
-sHudzeh4tNd7xL54la5soYGwpIGtMIGqMQswCQYDVQQGEwJHQjEQMA4GA1UECAwH
-RW5nbGFuZDESMBAGA1UEBwwJQ2FtYnJpZGdlMSMwIQYDVQQKDBpDb2xsYWJvcmEg
-UHJvZHVjdGl2aXR5IEx0ZDElMCMGA1UEAwwcQ29sbGFib3JhIENsb3VkU3VpdGUg
-Um9vdCBDQTEpMCcGCSqGSIb3DQEJARYaYW5kcmFzLnRpbWFyQGNvbGxhYm9yYS5j
-b22CAhAAMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATANBgkq
-hkiG9w0BAQsFAAOCAgEAiv0KpnjXckgOwhceNrhUqfjaw5neolwyGEZ4gypn8E/g
-rKFOCstiL/sqw7nWcvK/guLvRwGj596KdTdX9yvIb3F/Q7PYy1VVHKKNcfyM4mgi
-QEKjGG98thTuGdtEluW+0gxRG3Piko6M9A4GXmRmeq8lq0fxSAvosDrSGO3iqRdZ
-f6/Oc3a1tBC+TwTxxOYOKN6EMKcEZpusPv/0+vaMbMvoMA7EJQq+AnuT6/jjXmmh
-89RGi9PxUohXwinY3VBTfY7qmWRJe2DUFpmSBdpk7cgttsmInff7bhM80ADGXTDQ
-AoPUgAh+vNpDBbjKsZbk71G+xVfJBmqdI+siM977TjbYbVuhVHvq9c/nmW0NXngL
-9TW8Q4kzDZvFpEAtnIaloqT5sHDfr8w4yyOi5miHl1wCkbw9h0TSMunItJ6NwXNO
-O0iq45qQw9Wks9Z0g/jRM3dbRZNsRPgYqOtRxNvZ9owdr75CUscMOA21sG8YCXAI
-8iOqu85YDPVsjhS0u3Mi2YTiVIX6I4noytTuYuzO4Popm1JdLBukVsNTvgRlOD03
-SbmrMCDFtw6+CEKsApjavrBA0iCIxuzUYnVjMtd6KitxoCZ/9zmm20rNIt+OPcLg
-XsiVguECIdSGyFIoEhjWEhgqPpOpSw/kx8s51zHEF9MvheImkHM4Cwd+M1n33a4=
+MIIDOjCCAiICCQCHrN8IV7MoFjANBgkqhkiG9w0BAQsFADBiMQswCQYDVQQGEwJE
+RTELMAkGA1UECAwCQlcxEjAQBgNVBAcMCVN0dXR0Z2FydDEYMBYGA1UECgwPRHVt
+bXkgQXV0aG9yaXR5MRgwFgYDVQQDDA9EdW1teSBBdXRob3JpdHkwHhcNMTgwNDE0
+MTU0ODM5WhcNNDMwNDE0MTU0ODM5WjBcMQswCQYDVQQGEwJERTELMAkGA1UECAwC
+QlcxEjAQBgNVBAcMCVN0dXR0Z2FydDEYMBYGA1UECgwPRHVtbXkgQXV0aG9yaXR5
+MRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDVwrYlPGoBd7WbyJPukNkMPdUjZiHLQtOyKZNTiMC9kFpbIowJ/pVzqQdN
+Qqa/z6UpkspMV1sXlYxZAs6fGfqaaN/GNxGdS+P81O8x3KpwOmxQ/LgJKPn+Y2pt
+9n4tdC7WbVQbUJBLQ8nhd5NventHe0TXJ4Dsg1a3EzVxvJdkYTLzKikKeCrZ4+7R
+vEbZEEpxNJNCcrVrzifdiehG9BAuzp1AZ2/85RU8kRUckhXMQd0l4LRhdf3XxJmU
+15BRsqauvDEIOJhWBoil8aDy0k2qYxxixoB2z6VVsWnd5tY4Snieb74Y+aomXcAG
+2BZX1UH5Jnbvb9WTfnZixJWwuefBAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAH5U
+07/DACeINcFcZBFhT1oo1mI5X3pSwiRjkedp/h3vMUhI8FuaufvWFJlrimnlwfcI
+kptRFOUW+m0ZM6IqhbKkY/DSKYA0fZo8BiHkjPkryIjlZ03GYsAA3KE4gobj5FAu
+QF94sxAVInagWyTY2yuR5jwhVJWXYCgs8sg5YEcfIm9ZkgFzinjPnVO6TIc4nLWQ
+Eb+FSD5xi6OA4N8D5kcvk6AGISks6rCSeO4HiGuVbxTeDY8KDddCZBiiiVoWF8iN
+Q9Hlxc5leShDSeGt0onB2Ntuvys2obDAFOQB94I1UiaKRqy5+o5oS4yevrmd4RVi
++VFRenC3csgVJ6XmUq4=
-----END CERTIFICATE-----
diff --git a/etc/key.pem b/etc/key.pem
index 93452dffd..294546c3b 100644
--- a/etc/key.pem
+++ b/etc/key.pem
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
commit 76a81b878f59d93d8bd6c0d87445044b26fab370
Author: Marco Cecchetti <marco.cecche...@collabora.com>
Date: Tue Apr 3 12:36:24 2018 +0100
calc: when expanding selection with shift-<cursor>, view never scrolls
Change-Id: Iaea7b53a84210bcdfc180014a7d530b1455949c9
Reviewed-on: https://gerrit.libreoffice.org/52639
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
(cherry picked from commit 0a2b5c19c18cf5b5d6f1117d0b8c6bcd1ccf46d2)
Signed-off-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index ca9fbffd1..12f86c195 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1149,15 +1149,49 @@ L.TileLayer = L.GridLayer.extend({
this._selectionTextContent = textMsg.substr(22);
},
+ _updateScrollOnCellSelection: function (oldSelection, newSelection) {
+ if (this._map._docLayer._docType === 'spreadsheet' &&
oldSelection) {
+ var mapBounds = this._map.getBounds();
+ if (!mapBounds.contains(newSelection) &&
!newSelection.equals(oldSelection)) {
+ var spacingX =
Math.abs(this._cellCursor.getEast() - this._cellCursor.getWest()) / 4.0;
+ var spacingY =
Math.abs((this._cellCursor.getSouth() - this._cellCursor.getNorth())) / 2.0;
+
+ var scrollX = 0, scrollY = 0;
+ if (newSelection.getEast() >
mapBounds.getEast() && newSelection.getEast() > oldSelection.getEast())
+ scrollX = newSelection.getEast() -
mapBounds.getEast() + spacingX;
+ else if (newSelection.getWest() <
mapBounds.getWest() && newSelection.getWest() < oldSelection.getWest())
+ scrollX = newSelection.getWest() -
mapBounds.getWest() - spacingX;
+ if (newSelection.getNorth() >
mapBounds.getNorth() && newSelection.getNorth() > oldSelection.getNorth())
+ scrollY = newSelection.getNorth() -
mapBounds.getNorth() + spacingY;
+ else if (newSelection.getSouth() <
mapBounds.getSouth() && newSelection.getSouth() < oldSelection.getSouth())
+ scrollY = newSelection.getSouth() -
mapBounds.getSouth() - spacingY;
+ if (scrollX !== 0 || scrollY !== 0) {
+ var newCenter = mapBounds.getCenter();
+ newCenter.lng += scrollX;
+ newCenter.lat += scrollY;
+ var center =
this._map.project(newCenter);
+ center =
center.subtract(this._map.getSize().divideBy(2));
+ center.x = Math.round(center.x < 0 ? 0
: center.x);
+ center.y = Math.round(center.y < 0 ? 0
: center.y);
+ this._map.fire('scrollto', {x:
center.x, y: center.y});
+ }
+ }
+ }
+ },
+
_onTextSelectionEndMsg: function (textMsg) {
var strTwips = textMsg.match(/\d+/g);
if (strTwips != null && this._map._permission === 'edit') {
var topLeftTwips = new L.Point(parseInt(strTwips[0]),
parseInt(strTwips[1]));
var offset = new L.Point(parseInt(strTwips[2]),
parseInt(strTwips[3]));
var bottomRightTwips = topLeftTwips.add(offset);
+
+ var oldSelection = this._textSelectionEnd;
this._textSelectionEnd = new L.LatLngBounds(
this._twipsToLatLng(topLeftTwips, this._map.getZoom()),
this._twipsToLatLng(bottomRightTwips, this._map.getZoom()));
+
+ this._updateScrollOnCellSelection(oldSelection,
this._textSelectionEnd);
}
else {
this._textSelectionEnd = null;
@@ -1170,14 +1204,16 @@ L.TileLayer = L.GridLayer.extend({
var topLeftTwips = new L.Point(parseInt(strTwips[0]),
parseInt(strTwips[1]));
var offset = new L.Point(parseInt(strTwips[2]),
parseInt(strTwips[3]));
var bottomRightTwips = topLeftTwips.add(offset);
+ var oldSelection = this._textSelectionStart;
this._textSelectionStart = new L.LatLngBounds(
this._twipsToLatLng(topLeftTwips, this._map.getZoom()),
this._twipsToLatLng(bottomRightTwips, this._map.getZoom()));
+
+ this._updateScrollOnCellSelection(oldSelection,
this._textSelectionStart);
}
else {
this._textSelectionStart = null;
}
-
},
_onTileMsg: function (textMsg, img) {
commit 3011bf644e67e33dfe53d6b395a40254b0af8dd8
Author: Marco Cecchetti <marco.cecche...@collabora.com>
Date: Fri Apr 6 18:24:43 2018 +0200
loleaflet: calc: F2 doesn't trigger cell edit mode in Chrome
Function keys need to be handled on keydown in order for them to work
in chrome.
Change-Id: Ifb7ae22a77df116ffe4809390e7151342c4170a7
Reviewed-on: https://gerrit.libreoffice.org/52518
Reviewed-by: Marco Cecchetti <mrcek...@gmail.com>
Tested-by: Marco Cecchetti <mrcek...@gmail.com>
(cherry picked from commit 4693b5a7d926d67f853908d85d99b75cfc65d283)
Signed-off-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js
b/loleaflet/src/map/handler/Map.Keyboard.js
index 1109b35f4..47b657dc1 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -136,7 +136,8 @@ L.Map.Keyboard = L.Handler.extend({
39 : true, // right arrow
40 : true, // down arrow
45 : true, // insert
- 46 : true // delete
+ 46 : true, // delete
+ 113 : true // f2
},
keyCodes: {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
