[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/dist

Aron Budea aron.budea at collabora.com
Wed Oct 4 10:10:28 UTC 2017


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

New commits:
commit a391adcd813ff31a420a82d3bf8c8258171c6d92
Author: Aron Budea <aron.budea at collabora.com>
Date:   Wed Oct 4 03:48:31 2017 +0200

    Status bar function: first make it work properly
    
    The way the parameter was interpreted changed with this
    core commit: 7bc97db5b972f27693161beb9182f8a5850f5551
    
    For now let's make single function work again.
    
    Change-Id: I6e8ebb4cc7a272c53aa3e44066df7a62ab89d8ab
    Reviewed-on: https://gerrit.libreoffice.org/43126
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 09c81ccc..33867ca9 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -984,15 +984,15 @@ map.on('doclayerinit', function () {
 			{type: 'break', id:'break8'},
 			{type: 'html',  id: 'StateTableCell',
 				html: '<div id="StateTableCell" class="loleaflet-font" title="'+_('Choice of functions')+ '" style="padding: 5px 5px;">    &nbsp</div>' },
-		        {type: 'menu', id: 'StateTableCellMenu', caption: '', current: 7, items: [
-				{ func: '1', text: _('Average'), icon: ''},
-				{ func: '3', text: _('CountA'), icon: ''},
-				{ func: '2', text: _('Count'), icon: ''},
-				{ func: '4', text: _('Maximum'), icon: ''},
-				{ func: '5', text: _('Minimum'), icon: ''},
-				{ func: '9', text: _('Sum'), icon: ''},
-				{ func: '12', text: _('Selection count'), icon: ''},
-				{ func: '16', text: _('None'), icon: 'selected'},
+		        {type: 'menu', id: 'StateTableCellMenu', caption: '', current: 5, items: [
+				{ func: '2', text: _('Average'), icon: ''},
+				{ func: '8', text: _('CountA'), icon: ''},
+				{ func: '4', text: _('Count'), icon: ''},
+				{ func: '16', text: _('Maximum'), icon: ''},
+				{ func: '32', text: _('Minimum'), icon: ''},
+				{ func: '512', text: _('Sum'), icon: 'selected'},
+				{ func: '8192', text: _('Selection count'), icon: ''},
+				{ func: '1', text: _('None'), icon: ''},
 		]},
 		]);
 


More information about the Libreoffice-commits mailing list