[Libreoffice-commits] online.git: loleaflet/src

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Wed Oct 16 12:47:39 UTC 2019


 loleaflet/src/control/Control.Menubar.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 21b587dea261a6654eb84e4c008aa163b36469c7
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Oct 16 15:19:20 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Oct 16 15:46:58 2019 +0300

    tdf#128177: Drop the 'Bibliography Entry...' menu entry in a mobile app
    
    Invoking it would cause a crash thanks to the intentional std::abort()
    call in SalUserEventList::DispatchUserEvents() after the warning
    "Uncaught com.sun.star.uno.DeploymentException component context fails
    to supply service com.sun.star.frame.Bibliography of type
    com.sun.star.container.XNameAccess".
    
    We don't build the library ("bib") and UNO component in question for
    non-desktop platforms, and the customer is fine with just leaving out
    the menu entry.
    
    Change-Id: I2c1b0978a87d169e6cebc9462f79b5b47df4992b
    Reviewed-on: https://gerrit.libreoffice.org/80889
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit 392cd69d5e4232de684dd3c050c8f95bf766b71a)

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 236a60a77..5cddbc6b8 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -111,7 +111,7 @@ L.Control.Menubar = L.Control.extend({
 					{uno: '.uno:InsertRLM'}]},
                                 {name: _UNO('.uno:IndexesMenu', 'text'), type: 'menu', menu: [
 					{uno: '.uno:InsertIndexesEntry'},
-					{uno: '.uno:InsertAuthoritiesEntry'},
+					{uno: '.uno:InsertAuthoritiesEntry', mobileapp: false},
 					{uno: '.uno:InsertMultiIndex'}]},
 			]},
 			{name: _UNO('.uno:FormatMenu', 'text'), id: 'format', type: 'menu', menu: [


More information about the Libreoffice-commits mailing list