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

New commits:
commit 22ab7a3ad37ef347b5d164453b8d66bacfc03adb
Author: Pranav Kant <[email protected]>
Date:   Sun Dec 18 09:56:03 2016 +0530

    loleaflet: Fix remaining incorrect key name, insertannotation
    
    Fallback from e2151b30b270ef47faf403a412ee6e858febdeee
    
    Change-Id: I26130bd75e26f2ae4f8fba864115d2b50f938f30
    Reviewed-on: https://gerrit.libreoffice.org/35473
    Reviewed-by: Thorsten Behrens <[email protected]>
    Tested-by: Thorsten Behrens <[email protected]>

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 87b0bc4f..85a987f9 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -844,8 +844,8 @@ map.on('doclayerinit', function () {
        case 'presentation':
                var presentationToolbar = w2ui['presentation-toolbar'];
                presentationToolbar.show('presentation', 'presentationbreak', 
'insertpage', 'duplicatepage', 'deletepage');
-               toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 
'break-toggle', 'numberformatcurrency', 'numberformatpercent', 
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending');
-               toolbarUpMore.remove('annotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending');
+               toolbarUp.remove('insertannotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending');
+               toolbarUpMore.remove('insertannotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending');
                statusbar.insert('left', [
                        {type: 'break', id:'break1'},
                        {type: 'html',  id: 'PageStatus',
@@ -853,8 +853,8 @@ map.on('doclayerinit', function () {
                ]);
                break;
        case 'drawing':
-               toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 
'break-toggle', 'numberformatcurrency', 'numberformatpercent', 
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending');
-               toolbarUpMore.remove('annotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending');
+               toolbarUp.remove('insertannotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending');
+               toolbarUpMore.remove('insertannotation', 'wraptext', 
'togglemergecells', 'break-toggle', 'numberformatcurrency', 
'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 
'sortascending', 'sortdescending');
                break;
        }
        toolbarUp.refresh();
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to