loleaflet/src/map/Clipboard.js |   22 +++-------------------
 loleaflet/src/map/Map.js       |    2 ++
 2 files changed, 5 insertions(+), 19 deletions(-)

New commits:
commit ca3591c2c335998d40876ca844870f8eaafbfa98
Author:     Michael Meeks <michael.me...@collabora.com>
AuthorDate: Fri Jul 19 12:32:35 2019 +0100
Commit:     Michael Meeks <michael.me...@collabora.com>
CommitDate: Thu Oct 3 20:44:17 2019 +0100

    Switch to new UI_Paste post-message.
    
    Pass the message up the chain, instead of attempting to hit the top
    for happier CSS protection.
    
    Change-Id: Iccefc18d4fa2799e655a9c026e51f47d9e8670f8

diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 05af7afe9..ea80b2469 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -580,26 +580,10 @@ L.Clipboard = L.Class.extend({
                if (operation === 'paste')
                {
                        try {
-                               if (window.top.webkit &&
-                                   window.top.webkit.messageHandlers &&
-                                   
window.top.webkit.messageHandlers.RichDocumentsMobileInterface) {
-                                       console.log('We have richdocuments !');
-                                       
window.top.webkit.messageHandlers.RichDocumentsMobileInterface.postMessage(operation);
-                               } else
-                                       console.log('No webkit 
messageHandlers');
+                               console.warn('Asked parent for a paste event');
+                               this._map.fire('postMessage', {msgId: 
'UI_Paste'});
                        } catch (error) {
-                               console.warn('Cannot access webkit hook: ' + 
error);
-                       }
-
-                       try {
-                               if (window.top.RichDocumentsMobileInterface &&
-                                   
window.top.RichDocumentsMobileInterface.paste) {
-                                       console.log('We have richdocuments !');
-                                       
window.top.RichDocumentsMobileInterface.paste();
-                               } else
-                                       console.log('No 
RichDocumentsMobileInterface');
-                       } catch (error) {
-                               console.warn('Cannot access 
RichDocumentsMobileInterface hook: ' + error);
+                               console.warn('Failed to post-message: ' + 
error);
                        }
                }
 
commit 03f5aab033b9b5e9de6eb2b990968b60c736a244
Author:     Michael Meeks <michael.me...@collabora.com>
AuthorDate: Tue Jun 18 20:47:10 2019 +0100
Commit:     Michael Meeks <michael.me...@collabora.com>
CommitDate: Thu Oct 3 19:26:02 2019 +0100

    calc: forbid keyboard zoom to anything but 100% and 200%
    
    Change-Id: I26c9297727cc6183ff6ad11b54ef9114491389bb

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 04fa1c0f8..8048889d3 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -446,6 +446,8 @@ L.Map = L.Evented.extend({
                        return this;
                }
                if (this._docLayer && this._docLayer._docType === 
'spreadsheet') {
+                       if (zoom != 10 && zoom != 14) // 100% or 200%
+                               return this;
                        // for spreadsheets, when the document is smaller than 
the viewing area
                        // we want it to be glued to the row/column headers 
instead of being centered
                        this._docLayer._checkSpreadSheetBounds(zoom);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to