loleaflet/dist/toolbar/toolbar.js        |    6 ++----
 loleaflet/src/control/Control.Menubar.js |    1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 20e18d3a6c40adc12394c624cb3cf5b47ca147dd
Author: Henry Castro <hcas...@collabora.com>
Date:   Wed Oct 12 21:51:48 2016 -0400

    loleaflet: fix style names in Layout dropdown
    
    (cherry picked from commit fbfd500a2ec2d3425903c002c63f1a73f20d152a)

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 816bf3d..71a884b 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -822,11 +822,9 @@ map.on('commandstatechanged', function (e) {
                        return;
                }
 
-               // For impress documents, template name is prefixed with style 
name.
-               // Strip the template name until we support it
+               // For impress documents, no styles is supported.
                if (map.getDocType() === 'presentation') {
-                       state = state.split('~LT~')[1];
-                       state = L.Styles.impressMapping[state];
+                       return;
                }
 
                $('.styles-select option').each(function () {
commit a2ac0ce49e63958be7a3a7a96dd502e289495aeb
Author: Andras Timar <andras.ti...@collabora.com>
Date:   Thu Oct 13 12:58:04 2016 +0200

    loleaflet: add Insert - Comment to Calc menu
    
    (cherry picked from commit cb4fb867945e9e3350f0ce0ec931aebc9bf86aaa)

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index dd8b867..9f6e806 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -123,6 +123,7 @@ L.Control.Menubar = L.Control.extend({
                                                                                
                {name: _('Select all'), type: 'unocommand', uno: 
'.uno:SelectAll'}]
                        },
                        {name: _('Insert'), type: 'menu', menu: [{name: 
_('Image'), id: 'insertgraphic', type: 'action'},
+                                                                               
                  {name: _('Comment'), type: 'unocommand', uno: 
'.uno:InsertAnnotation'},
                                                                                
                  {type: 'separator'},
                                                                                
                  {name: _('Row'), type: 'unocommand', uno: '.uno:InsertRows'},
                                                                                
                  {name: _('Column'), type: 'unocommand', uno: 
'.uno:InsertColumns'}]
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to