loleaflet/js/toolbar.js |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 01969666e689c9cdb061ed2b6b484e518cdc6146
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Aug 6 17:43:59 2018 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Aug 6 17:47:24 2018 +0200

    loleaflet: fix Calc status bar functions
    
    Change-Id: I11eced357e000bafa6f49f605d0766cc4df49720
    (cherry picked from commit f94e49cc8da501b8d58a79d4a5db27499d2196b7)
    Reviewed-on: https://gerrit.libreoffice.org/58654
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>
    Tested-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index e6803b220..151d29ae7 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -111,16 +111,6 @@ function onClick(e, id, item, subItem) {
                toolbar = w2ui['presentation-toolbar'];
                item = toolbar.get(id);
        }
-       else if (item && subItem)
-       {
-               var command = {
-                       'StatusBarFunc': {
-                               type: 'unsigned short',
-                               value: subItem.func
-                       }
-               };
-               map.sendUnoCommand('.uno:StatusBarFunc', command);
-       }
        else {
                throw new Error('unknown id: ' + id);
        }
@@ -246,6 +236,15 @@ function onClick(e, id, item, subItem) {
                w2ui['formulabar'].hide('acceptformula', 'cancelformula');
                w2ui['formulabar'].show('sum', 'function');
        }
+       else if (id.startsWith('StateTableCellMenu') && subItem) {
+               var command = {
+                       'StatusBarFunc': {
+                               type: 'unsigned short',
+                               value: subItem.func
+                       }
+               };
+               map.sendUnoCommand('.uno:StatusBarFunc', command);
+       }
 }
 
 function setBorders(left, right, bottom, top, horiz, vert) {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to