[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/src
loleaflet/src/control/Control.Menubar.js | 20 +--- 1 file changed, 9 insertions(+), 11 deletions(-) New commits: commit 1dd9fc7cdb5bdb56fc0fb72a7d242b5aea15da4e Author: Jan HolesovskyDate: Wed Oct 4 06:36:29 2017 +0200 Move the language menus one level up. Change-Id: I01f5d985ac3ebd9265200ecc161b861dc582ad69 Reviewed-on: https://gerrit.libreoffice.org/43113 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index 501d678c..1ab60a1d 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -173,15 +173,13 @@ L.Control.Menubar = L.Control.extend({ {name: _('Merge cells'), type: 'unocommand', uno: '.uno:MergeCells'}] }, {name: _('Tools'), id: 'tools', type: 'menu', menu: [ - {name: _('Automatic Spell Checking'), type: 'unocommand', uno: '.uno:SpellOnline'}, - {name: _('Language'), type: 'menu', menu: [ - {name: _('For Selection'), type: 'menu', menu: [ - {name: _('Reset to Default Language'), id: 'resetselection', type: 'unocommand', uno: '.uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES'}]}, - {name: _('For Paragraph'), type: 'menu', menu: [ - {name: _('Reset to Default Language'), id: 'resetparagraph', type: 'unocommand', uno: '.uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES'}]}, - {name: _('For all Text'), type: 'menu', menu: [ - {name: _('Reset to Default Language'), id: 'resetlanguage', type: 'unocommand', uno:'.uno:LanguageStatus?Language:string=Default_RESET_LANGUAGES'}]} - ]} + {name: _('Automatic spell checking'), type: 'unocommand', uno: '.uno:SpellOnline'}, + {name: _('Language for selection'), type: 'menu', menu: [ + {name: _('Reset to Default Language'), id: 'resetselection', type: 'unocommand', uno: '.uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES'}]}, + {name: _('Language for paragraph'), type: 'menu', menu: [ + {name: _('Reset to Default Language'), id: 'resetparagraph', type: 'unocommand', uno: '.uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES'}]}, + {name: _('Language for entire document'), type: 'menu', menu: [ + {name: _('Reset to Default Language'), id: 'resetlanguage', type: 'unocommand', uno:'.uno:LanguageStatus?Language:string=Default_RESET_LANGUAGES'}]} ]}, {name: _('Help'), id: 'help', type: 'menu', menu: [ {name: _('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'}, @@ -246,7 +244,7 @@ L.Control.Menubar = L.Control.extend({ {name: _('Fullscreen presentation'), id: 'fullscreen-presentation', type: 'action'}] }, {name: _('Tools'), id: 'tools', type: 'menu', menu: [ - {name: _('Automatic Spell Checking'), type: 'unocommand', uno: '.uno:SpellOnline'} + {name: _('Automatic spell checking'), type: 'unocommand', uno: '.uno:SpellOnline'} ]}, {name: _('Help'), id: 'help', type: 'menu', menu: [ {name: _('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'}, @@ -298,7 +296,7 @@ L.Control.Menubar = L.Control.extend({ {name: _('Delete column'), type: 'unocommand', uno: '.uno:DeleteColumns'}] }, {name: _('Tools'), id: 'tools', type: 'menu', menu: [ - {name: _('Automatic Spell Checking'), type: 'unocommand', uno: '.uno:SpellOnline'} + {name: _('Automatic spell checking'), type: 'unocommand', uno: '.uno:SpellOnline'} ]}, {name: _('Help'), id: 'help', type: 'menu', menu: [ {name: _('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'}, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - wsd/DocumentBroker.cpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp
wsd/DocumentBroker.cpp |5 + wsd/LOOLWSD.cpp|5 + wsd/LOOLWSD.hpp|1 + 3 files changed, 11 insertions(+) New commits: commit 4b0894cbd2a554df9dc690d985421bf66aa99e83 Author: Jan HolesovskyDate: Wed Oct 4 05:54:05 2017 +0200 More information about the support key state. Change-Id: I0fb7792df3c0ba97497b7d9f5281640c40eb49a4 Reviewed-on: https://gerrit.libreoffice.org/43112 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 85042585..fe6bbc61 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -483,6 +483,11 @@ bool DocumentBroker::load(const std::shared_ptr& session, const s } } +#if ENABLE_SUPPORT_KEY +if (!LOOLWSD::OverrideWatermark.empty()) +watermarkText = LOOLWSD::OverrideWatermark; +#endif + LOG_DBG("Setting username [" << username << "] and userId [" << userid << "] for session [" << sessionId << "]"); session->setUserId(userid); session->setUserName(username); diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 2c3c5486..7b134862 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -556,6 +556,7 @@ Util::RuntimeConstant LOOLWSD::SSLTermination; std::set LOOLWSD::EditFileExtensions; unsigned LOOLWSD::MaxConnections; unsigned LOOLWSD::MaxDocuments; +std::string LOOLWSD::OverrideWatermark; static std::string UnitTestLibrary; @@ -783,6 +784,7 @@ void LOOLWSD::initialize(Application& self) { LOG_WRN("Support key not set, please use 'loolconfig set-support-key'."); std::cerr << "Support key not set, please use 'loolconfig set-support-key'." << std::endl; +LOOLWSD::OverrideWatermark = "Unsupported, the support key is missing."; } else { @@ -792,6 +794,7 @@ void LOOLWSD::initialize(Application& self) { LOG_WRN("Invalid support key, please use 'loolconfig set-support-key'."); std::cerr << "Invalid support key, please use 'loolconfig set-support-key'." << std::endl; +LOOLWSD::OverrideWatermark = "Unsupported, the support key is invalid."; } else { @@ -800,12 +803,14 @@ void LOOLWSD::initialize(Application& self) { LOG_WRN("Your support key has expired, please ask for a new one, and use 'loolconfig set-support-key'."); std::cerr << "Your support key has expired, please ask for a new one, and use 'loolconfig set-support-key'." << std::endl; +LOOLWSD::OverrideWatermark = "Unsupported, the support key has expired."; } else { LOG_INF("Your support key is valid for " << validDays << " days"); LOOLWSD::MaxConnections = 1000; LOOLWSD::MaxDocuments = 200; +LOOLWSD::OverrideWatermark = ""; } } } diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp index 88318c5e..80d2d9e2 100644 --- a/wsd/LOOLWSD.hpp +++ b/wsd/LOOLWSD.hpp @@ -58,6 +58,7 @@ public: static std::set EditFileExtensions; static unsigned MaxConnections; static unsigned MaxDocuments; +static std::string OverrideWatermark; /// Flag to shutdown the server. std::atomic ShutdownFlag; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 112231] Slow GUI
https://bugs.documentfoundation.org/show_bug.cgi?id=112231 Thomas Bertelschanged: What|Removed |Added CC||tbertels+bugzi...@gmail.com --- Comment #6 from Thomas Bertels --- The slow about dialog is bug 95622. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 105863] Flicker when hovering over main menu with default rendering
https://bugs.documentfoundation.org/show_bug.cgi?id=105863 V Stuart Footechanged: What|Removed |Added Status|RESOLVED|NEW Resolution|FIXED |--- --- Comment #56 from V Stuart Foote --- Sorry, but only corrected for a final 5.3 release of 5.3.7; that patch as is will not be implemented as is in 5.4 or 6.0. But it points out the location in the code that needs to be reworked, stay tuned... -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112486] [META] Bugs caused/worsened by more use of DirectWrite
https://bugs.documentfoundation.org/show_bug.cgi?id=112486 Bug 112486 depends on bug 105863, which changed state. Bug 105863 Summary: Flicker when hovering over main menu with default rendering https://bugs.documentfoundation.org/show_bug.cgi?id=105863 What|Removed |Added Status|RESOLVED|NEW Resolution|FIXED |--- -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85811] [META] Main menu bar bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=85811 Bug 85811 depends on bug 105863, which changed state. Bug 105863 Summary: Flicker when hovering over main menu with default rendering https://bugs.documentfoundation.org/show_bug.cgi?id=105863 What|Removed |Added Status|RESOLVED|NEW Resolution|FIXED |--- -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 91488] [META] RenderContext related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=91488 Bug 91488 depends on bug 105863, which changed state. Bug 105863 Summary: Flicker when hovering over main menu with default rendering https://bugs.documentfoundation.org/show_bug.cgi?id=105863 What|Removed |Added Status|RESOLVED|NEW Resolution|FIXED |--- -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 109158] slower loading of a huge AutoCorrect replacement table
https://bugs.documentfoundation.org/show_bug.cgi?id=109158 --- Comment #11 from tommy27--- performance drop unchanged with latest LibO 6.0.0.0.alpha0+ daily build downloaded tonight. I confirm the perfomance regression (test done on a Win8.1 x64 machine, but affects Win7 x74 as well) > > LibO 4.4.0 --> 42 seconds > > LibO 5.1.2 --> 10 seconds to load > > LibO 5.3.4 --> 8 seconds to load > > LibO 6.0.0 --> 8 seconds to load (the day before bug 99071 fix) > > LibO 6.0.0 --> 21 seconds to load (the day after bug 99071 fix) > as said before I have strong suspects that the regression was caused by bug 99071 fix. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112866] New: viewing, full screen
https://bugs.documentfoundation.org/show_bug.cgi?id=112866 Bug ID: 112866 Summary: viewing, full screen Product: LibreOffice Version: 5.4.2.2 release Hardware: x86 (IA32) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: perherng...@gmail.com As a professional writer, I would be more creative with something like "full screen" view (ctr+shift+J). But in windows which I can move and resize on the screen. I didn't find a solution for this when I did a search, but sorry for bothering you if it is already implemented. Thank you for your excellent work! -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75209] FILEOPEN: Impress grouped pictures not displayed in slideshow (see comment 21)
https://bugs.documentfoundation.org/show_bug.cgi?id=75209 --- Comment #28 from Luke--- The fix for Bug 105620 https://cgit.freedesktop.org/libreoffice/core/commit/?id=b220bc6d82841b5b53b856d94a1eb99bb3a9f2d7 Resolved this issue on Linux, but not Windows. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 105620] Cairo pattern to be filled into path is placed incorrectly
https://bugs.documentfoundation.org/show_bug.cgi?id=105620 --- Comment #11 from Luke--- Xisco Faulí, No it is not full fixed. The Bugdoc is still broken under Windows, but now renders correctly under Linux. As Tor said, this is probably a dupe of Bug 75209 as that is working now under Linux. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112558] Single line spacing of Calibri and Times New Roman no longer calculated correctly in Calc compared to Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=112558 --- Comment #17 from V Stuart Foote--- (In reply to Yousuf Philips (jay) from comment #16) > Xisco: Khaled's patch was to fix fonts that had broken line spacing, which > Calibri and Times New Roman dont, so that patch wont solve this issue. There > is something wrong with Calc's code to generate line spacing as Writer > generates the line spacing correctly for these fonts. Does setting "Use printer metrics" in Calc affect the spacing? If so, a difference between line height scaling for WYSIWYG with Use printer metrics enabled or disabled in Calc, but otherwise line scaling on canvas is always enabled with Writer? See bug 108638 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 91488] [META] RenderContext related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=91488 Bug 91488 depends on bug 105863, which changed state. Bug 105863 Summary: Flicker when hovering over main menu with default rendering https://bugs.documentfoundation.org/show_bug.cgi?id=105863 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85811] [META] Main menu bar bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=85811 Bug 85811 depends on bug 105863, which changed state. Bug 105863 Summary: Flicker when hovering over main menu with default rendering https://bugs.documentfoundation.org/show_bug.cgi?id=105863 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112486] [META] Bugs caused/worsened by more use of DirectWrite
https://bugs.documentfoundation.org/show_bug.cgi?id=112486 Bug 112486 depends on bug 105863, which changed state. Bug 105863 Summary: Flicker when hovering over main menu with default rendering https://bugs.documentfoundation.org/show_bug.cgi?id=105863 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 105863] Flicker when hovering over main menu with default rendering
https://bugs.documentfoundation.org/show_bug.cgi?id=105863 tommy27changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #55 from tommy27 --- I confirm flickering is gone with default rendering using LibO 6.0.0.0.alpha0+ Build ID: b087e451527f2e497ccab83b63b4f10099bfb8b8 CPU threads: 4; OS: Windows 6.3; UI render: default; TinderBox: Win-x86@42, Branch:master, Time: 2017-10-03_23:43:39 Locale: it-IT (it_IT); Calc: group tested under Win8.1 x64 LibO 5.4.1.2 is still affected; I'm confident the next 5.4.2 release will be fixed as well. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93941] Invisible table borders show up in pdf through non-white cell background
https://bugs.documentfoundation.org/show_bug.cgi?id=93941 --- Comment #6 from Jean-Baptiste Faure--- Still reproducible with Version: 6.0.0.0.alpha0+ Build ID: c985ad5f7b479706935459630c5a59ccae6fa8b7 Threads CPU : 4; OS : Linux 4.4; UI Render : par défaut; VCL: gtk3; Ubuntu_16.04_x86-64 Locale : fr-FR (fr_FR.UTF-8); Calc: single Best regards. JBF -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92888] LO filepicker does not record its size
https://bugs.documentfoundation.org/show_bug.cgi?id=92888 --- Comment #6 from Jean-Baptiste Faure--- Still reproducible in Version: 6.0.0.0.alpha0+ Build ID: c985ad5f7b479706935459630c5a59ccae6fa8b7 Threads CPU : 4; OS : Linux 4.4; UI Render : par défaut; VCL: gtk3; Ubuntu_16.04_x86-64 Locale : fr-FR (fr_FR.UTF-8); Calc: single Best regards. JBF -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92190] PRINTs landscape despite configured as portrait (Mac OS)
https://bugs.documentfoundation.org/show_bug.cgi?id=92190 --- Comment #52 from Ovid S--- Created attachment 136748 --> https://bugs.documentfoundation.org/attachment.cgi?id=136748=edit Screenshot of LO print dialog LO 5.3.6.1 on macOS High Sierra 10.13 (17A365) Checking and the unchecking the "Brochure" option causes the orientation to revert back to the [proper] portrait mode. Once the preview shows the document in portrait mode, it will also print correctly. This behavior is repeatable, and provides a relatively painless crutch. Hopefully, this observation is of some help to the LO team. Warm regards, -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93433] incomplete display of long autocorrect list in the replacement table and possible data loss when saving
https://bugs.documentfoundation.org/show_bug.cgi?id=93433 --- Comment #27 from tommy27--- @Abenk what was that? that attachement looks suspect... -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112847] RTL: Arabic label text in various places appearing along with squares
https://bugs.documentfoundation.org/show_bug.cgi?id=112847 --- Comment #6 from Yousuf Philips (jay)--- Created attachment 136747 --> https://bugs.documentfoundation.org/attachment.cgi?id=136747=edit squares showing in styles combobox on windows as previously mentioned, this also happens on windows. إصدارة: 5.4.1.2 معرّف البناء: ea7cb86e6eeb2bf3a5af73a8fac570321527 خيوط المعالج: 4; نظام التَّشغيل: Windows 6.2 (Windows 8.1); مصيّر الواجهة: المبدئيّ; المحليّة: en-US (en_US); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112847] RTL: Arabic label text in various places appearing along with squares
https://bugs.documentfoundation.org/show_bug.cgi?id=112847 Yousuf Philips (jay)changed: What|Removed |Added CC||khaledho...@eglug.org --- Comment #5 from Yousuf Philips (jay) --- @Khaled: Can you have a look at this. thanks. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112839] [META] Regressions from the cross-platform consistent line spacing in 5.3+
https://bugs.documentfoundation.org/show_bug.cgi?id=112839 Yousuf Philips (jay)changed: What|Removed |Added Depends on||107605 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=107605 [Bug 107605] Formatting fonts with bad metrics causes line height problems, e.g. Cardo -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112558] Single line spacing of Calibri and Times New Roman no longer calculated correctly in Calc compared to Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=112558 --- Comment #16 from Yousuf Philips (jay)--- Xisco: Khaled's patch was to fix fonts that had broken line spacing, which Calibri and Times New Roman dont, so that patch wont solve this issue. There is something wrong with Calc's code to generate line spacing as Writer generates the line spacing correctly for these fonts. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - 2 commits - loleaflet/dist loleaflet/src
loleaflet/dist/toolbar/toolbar.js|6 ++--- loleaflet/src/control/Control.Menubar.js | 32 ++- 2 files changed, 26 insertions(+), 12 deletions(-) New commits: commit 20bfde7bb27e7c77013135f565c366e7fad56ba0 Author: Henry CastroDate: Tue Oct 3 20:09:54 2017 -0400 loleaflet: add more menus for the Writer spell checking Change-Id: I3ef19021f0cb44aa2c34c84af08f2af2d11b25a2 diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index 8744585d..501d678c 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -175,7 +175,13 @@ L.Control.Menubar = L.Control.extend({ {name: _('Tools'), id: 'tools', type: 'menu', menu: [ {name: _('Automatic Spell Checking'), type: 'unocommand', uno: '.uno:SpellOnline'}, {name: _('Language'), type: 'menu', menu: [ - {name: _('Reset to Default Language'), id: 'resetlanguage', type: 'unocommand', uno:'.uno:LanguageStatus?Language:string=Default_RESET_LANGUAGES'}]} + {name: _('For Selection'), type: 'menu', menu: [ + {name: _('Reset to Default Language'), id: 'resetselection', type: 'unocommand', uno: '.uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES'}]}, + {name: _('For Paragraph'), type: 'menu', menu: [ + {name: _('Reset to Default Language'), id: 'resetparagraph', type: 'unocommand', uno: '.uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES'}]}, + {name: _('For all Text'), type: 'menu', menu: [ + {name: _('Reset to Default Language'), id: 'resetlanguage', type: 'unocommand', uno:'.uno:LanguageStatus?Language:string=Default_RESET_LANGUAGES'}]} + ]} ]}, {name: _('Help'), id: 'help', type: 'menu', menu: [ {name: _('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'}, @@ -343,17 +349,25 @@ L.Control.Menubar = L.Control.extend({ this._menubarCont.insertBefore(liItem, this._menubarCont.firstChild); }, + _createLangMenuItem: function (lang, command) { + var liItem, aItem; + liItem = L.DomUtil.create('li', ''); + aItem = L.DomUtil.create('a', '', liItem); + $(aItem).text(lang); + $(aItem).data('type', 'unocommand'); + $(aItem).data('uno', '.uno:LanguageStatus?Language:string=' + command); + return liItem; + }, + _onInitMenu: function (e) { if (e.commandName === '.uno:LanguageStatus') { - var liItem, aItem; - $menuParent = $('#menu-resetlanguage').parent(); + $menuSelection = $('#menu-resetselection').parent(); + $menuParagraph = $('#menu-resetparagraph').parent(); + $menuDefault = $('#menu-resetlanguage').parent(); for (var lang in e.commandValues) { - liItem = L.DomUtil.create('li', ''); - aItem = L.DomUtil.create('a', '', liItem); - $(aItem).text(e.commandValues[lang]); - $(aItem).data('type', 'unocommand'); - $(aItem).data('uno', '.uno:LanguageStatus?Language:string=' + encodeURIComponent('Default_' + e.commandValues[lang])); - $menuParent.append(liItem); + $menuSelection.append(this._createLangMenuItem(e.commandValues[lang], encodeURIComponent('Current_' + e.commandValues[lang]))); + $menuParagraph.append(this._createLangMenuItem(e.commandValues[lang], encodeURIComponent('Paragraph_' + e.commandValues[lang]))); + $menuDefault.append(this._createLangMenuItem(e.commandValues[lang], encodeURIComponent('Default_' + e.commandValues[lang]))); } } }, commit 83889ab84c82b9d457d045433645e4040f8447e1 Author: Henry Castro Date: Tue Oct 3 19:54:16 2017 -0400 loleaflet: change position of the language status bar item Change-Id: If5f7ad59e3ef4694313c086ad473af0cc377ea9c diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 0cd61a09..09c81ccc 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -660,9 +660,6 @@ $(function () { {type: 'button', id:
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - 2 commits - loleaflet/reference.html loleaflet/src wsd/DocumentBroker.cpp wsd/Storage.cpp wsd/Storage.hpp
loleaflet/reference.html | 22 +- loleaflet/src/control/Control.Menubar.js |8 loleaflet/src/core/Socket.js |9 + loleaflet/src/map/handler/Map.WOPI.js| 15 +-- wsd/DocumentBroker.cpp |1 + wsd/Storage.cpp |4 +++- wsd/Storage.hpp |4 7 files changed, 59 insertions(+), 4 deletions(-) New commits: commit 36670bcffa1113f1839fdd5e0dbca253171a95ed Author: Pranav KantDate: Tue Oct 3 20:36:02 2017 +0530 Show save-as option based on CheckFileInfo params If UserCanNotWriteRelative is mentioned in the CheckFileInfo response. Change-Id: I33d2e21159b3e18ae88fd72f404f2d1d1d9b64e5 (cherry picked from commit df034096c1033137a0b5de4267585b8d5e20ad65) diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index 1a9abc2e..8744585d 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -187,6 +187,7 @@ L.Control.Menubar = L.Control.extend({ presentation: [ {name: _('File'), id: 'file', type: 'menu', menu: [ {name: _('Save'), id: 'save', type: 'action'}, + {name: _('Save As'), id: 'saveas', type: 'action'}, {name: _('Print'), id: 'print', type: 'action'}, {name: _('See revision history'), id: 'rev-history', type: 'action'}, {name: _('Download as'), id: 'downloadas', type: 'menu', menu: [ @@ -251,6 +252,7 @@ L.Control.Menubar = L.Control.extend({ spreadsheet: [ {name: _('File'), id: 'file', type: 'menu', menu: [ {name: _('Save'), id: 'save', type: 'action'}, + {name: _('Save As'), id: 'saveas', type: 'action'}, {name: _('Print'), id: 'print', type: 'action'}, {name: _('See revision history'), id: 'rev-history', type: 'action'}, {name: _('Download as'), id:'downloadas', type: 'menu', menu: [ @@ -771,6 +773,9 @@ L.Control.Menubar = L.Control.extend({ if (menu[i].id === 'save' && this._map['wopi'].HideSaveOption) continue; + if (menu[i].id === 'saveas' && this._map['wopi'].UserCanNotWriteRelative) + continue; + if (menu[i].id && menu[i].id.startsWith('fullscreen-presentation') && this._map['wopi'].HideExportOption) continue; diff --git a/loleaflet/src/map/handler/Map.WOPI.js b/loleaflet/src/map/handler/Map.WOPI.js index a7bbcb8c..8aa364c1 100644 --- a/loleaflet/src/map/handler/Map.WOPI.js +++ b/loleaflet/src/map/handler/Map.WOPI.js @@ -16,6 +16,7 @@ L.Map.WOPI = L.Handler.extend({ DisableExport: false, DisableCopy: false, DisableInactiveMessages: false, + UserCanNotWriteRelative: true, _appLoadedConditions: { doclayerinit: false, @@ -67,6 +68,7 @@ L.Map.WOPI = L.Handler.extend({ this.DisableExport = !!wopiInfo['DisableExport']; this.DisableCopy = !!wopiInfo['DisableCopy']; this.DisableInactiveMessages = !!wopiInfo['DisableInactiveMessages']; + this.UserCanNotWriteRelative = !!wopiInfo['UserCanNotWriteRelative']; this._map.fire('postMessage', {msgId: 'App_LoadingStatus', args: {Status: 'Frame_Ready'}}); }, diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 945e9f89..85042585 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -445,6 +445,7 @@ bool DocumentBroker::load(const std::shared_ptr& session, const s wopiInfo->set("DisableExport", wopifileinfo->_disableExport); wopiInfo->set("DisableCopy", wopifileinfo->_disableCopy); wopiInfo->set("DisableInactiveMessages", wopifileinfo->_disableInactiveMessages); +wopiInfo->set("UserCanNotWriteRelative", wopifileinfo->_userCanNotWriteRelative); std::ostringstream ossWopiInfo; wopiInfo->stringify(ossWopiInfo); diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp index 4d2ce0c5..14482b0c 100644 --- a/wsd/Storage.cpp +++ b/wsd/Storage.cpp @@ -552,6 +552,7 @@ std::unique_ptr WopiStorage::getWOPIFileInfo(const Au bool disableCopy = false; bool disableInactiveMessages = false; std::string lastModifiedTime; +bool userCanNotWriteRelative = true; LOG_DBG("WOPI::CheckFileInfo returned: " << resMsg << ". Call duration: " << callDuration.count() << "s"); Poco::JSON::Object::Ptr object; @@ -575,6 +576,7 @@ std::unique_ptr
[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg
icon-themes/sifr/links.txt |1 + icon-themes/sifr_dark/links.txt |1 + icon-themes/sifr_svg/links.txt |1 + 3 files changed, 3 insertions(+) New commits: commit 81fee9ab4c4630da4a3346958fba4df63ce5ef27 Author: Matthias FreundDate: Tue Oct 3 21:58:30 2017 +0200 tdf#98315 Function Wizard showing Breeze icons when in Sifr theme Adding the missing link X Change-Id: I5bffa19beaf1e8d4bc06c351e6f32c509c375609 Reviewed-on: https://gerrit.libreoffice.org/43100 Tested-by: Jenkins Reviewed-by: Yousuf Philips diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index f8dcd1649f45..d21db839ad47 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -153,6 +153,7 @@ cmd/sc_datafilterautofilter.png cmd/sc_autofilter.png # calc function dialog cmd/lc_functiondialog.png cmd/lc_insertformula.png cmd/sc_functiondialog.png cmd/sc_insertformula.png +formula/res/fx.png cmd/sc_dbviewfunctions.png # text background colour Impress/Draw cmd/sc_charbackcolor.png cmd/sc_backcolor.png diff --git a/icon-themes/sifr_dark/links.txt b/icon-themes/sifr_dark/links.txt index f8dcd1649f45..d21db839ad47 100644 --- a/icon-themes/sifr_dark/links.txt +++ b/icon-themes/sifr_dark/links.txt @@ -153,6 +153,7 @@ cmd/sc_datafilterautofilter.png cmd/sc_autofilter.png # calc function dialog cmd/lc_functiondialog.png cmd/lc_insertformula.png cmd/sc_functiondialog.png cmd/sc_insertformula.png +formula/res/fx.png cmd/sc_dbviewfunctions.png # text background colour Impress/Draw cmd/sc_charbackcolor.png cmd/sc_backcolor.png diff --git a/icon-themes/sifr_svg/links.txt b/icon-themes/sifr_svg/links.txt index 70ad8afae1c6..62bed1e06243 100644 --- a/icon-themes/sifr_svg/links.txt +++ b/icon-themes/sifr_svg/links.txt @@ -153,6 +153,7 @@ cmd/sc_datafilterautofilter.png cmd/sc_autofilter.png # calc function dialog cmd/lc_functiondialog.png cmd/lc_insertformula.png cmd/sc_functiondialog.png cmd/sc_insertformula.png +formula/res/fx.png cmd/sc_dbviewfunctions.png # text background colour Impress/Draw cmd/sc_charbackcolor.png cmd/sc_backcolor.png ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 109235] [META] Paragraph line spacing bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=109235 Yousuf Philips (jay)changed: What|Removed |Added Depends on||107605 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=107605 [Bug 107605] Formatting fonts with bad metrics causes line height problems, e.g. Cardo -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/reference.html
loleaflet/reference.html | 83 --- 1 file changed, 72 insertions(+), 11 deletions(-) New commits: commit c8160260c0f22e9baddd2c38b93f3ebb20480eeb Author: Pranav KantDate: Tue Jun 20 18:51:05 2017 +0530 Document custom button API Change-Id: I67b29052ed9f140d82b8f93289fc9704892517c5 (cherry picked from commit b36e79f173e128a985270aa58ad25533208f2fc5) Reviewed-on: https://gerrit.libreoffice.org/43088 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/reference.html b/loleaflet/reference.html index fa08a3d6..ddb9a47a 100644 --- a/loleaflet/reference.html +++ b/loleaflet/reference.html @@ -73,6 +73,7 @@ Query API Session Management Actions + Miscellaneous UI Layers @@ -2721,13 +2722,7 @@ The id property of ErrorEvent can have the following values: This API is mostly based on https://wopi.readthedocs.io/en/latest/scenarios/postmessage.html;>WOPI specification with few extensions/modifications. All messages sent are - in this form - -It is to be noted that as mentioned in WOPI specs, loleaflet frame will - ignore all post messages coming from the host frame - if Host_PostMessageReady has not been received. Further, no post - messages will be emitted if 'PostMessageOrigin' property is missing from - server response. + in this form : { @@ -2738,11 +2733,18 @@ The id property of ErrorEvent can have the following values: } } +SendTime is the timestamp returned by browsers' Date.now(). The post messages +sent from the WOPI host should also be in same form. + -SendTime is the timestamp returned by browsers' Date.now() - - -Similarly, message received should be in same form. +It is to be noted that as mentioned in WOPI specs, loleaflet frame will + ignore all post messages coming from the host frame + if Host_PostmessageReady has not been received. Further, since + for embedding LibreOffice Online as an iframe WOPI implementation is a must, + it is required that 'PostMessageOrigin' property is present in + WOPI host's CheckFileInfo response. Otherwise, no post messages will be + emitted. + Initialization Editor to WOPI host @@ -2976,6 +2978,65 @@ Actions response +Miscellaneous +WOPI host to editor + + + MessageId + Values + Description + + + Insert_Button + + id: string + imgurl: string + hint: string + mobile: boolean + label: string + + + Inserts the button to the left of the top toolbar. Only thing + that it does is response to click events based on which hosts + can act accordingly. It responds + with Clicked_Button post message event. + id parameter is a unique id of the toolbar + button. It is recommended to prefix such ids given here with + some host namespace so that it doesn't conflict with existing + toolbar IDs. In case of conflict, button is not added. + imgurl parameter is the link to the image that + will be set as button image in the toolbar. The ideal size of + the image is 24x24px. The image must be hosted on the host URL + to not violate Content-Security-Policy. + hint This is used as a tooltip of the + button. + mobile Whether the button should be shown when + the interface switches to mobile mode. + label When a readonly document is opened, we + don't have the toolbar at all. In this case, this newly added + button is present in file menubar. The text against this label + is used as text of the menubar item. + + + +Editor to WOPI host + + + MessageId + Values + Description + + + Clicked_Button + + id: string + + + This event is emitted when the custom button added + via Insert_Button API above is clicked. + + + Marker ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 66058] FILEOPEN: .docx elbow connector routing in diagrams import bug
https://bugs.documentfoundation.org/show_bug.cgi?id=66058 Lukechanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=11 ||2861 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112861] FILEOPEN: connector's rotation not imported
https://bugs.documentfoundation.org/show_bug.cgi?id=112861 Lukechanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=66 ||058 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112858] Not localized icons in the Navigator window (Spanish)
https://bugs.documentfoundation.org/show_bug.cgi?id=112858 Adolfo Jaymechanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED Assignee|libreoffice-b...@lists.free |f...@libreoffice.org |desktop.org | Whiteboard||target:6.0.0 target:5.4.3 ||target:5.3.7 --- Comment #2 from Adolfo Jayme --- Fixed now; mea culpa. I had forgotten to copy these strings over when I uniformized those translations. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92190] PRINTs landscape despite configured as portrait (Mac OS)
https://bugs.documentfoundation.org/show_bug.cgi?id=92190 --- Comment #51 from haim kilov--- It affects Mac 10.9.5 Mavericks as well (LO 5.4.1.2). Changing the pagesize (even a little bit) helps, but this is hardly a good bugfix. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92190] PRINTs landscape despite configured as portrait (Mac OS)
https://bugs.documentfoundation.org/show_bug.cgi?id=92190 Rally de Leonchanged: What|Removed |Added Version|4.4.2.2 release |4.4.1.2 release --- Comment #50 from Rally de Leon --- For LO 5.4.1.2 on my macOS 10.12.6 and osx10.10, I've experienced the same bug with "Letter size (8.5"x11") on Portrait Mode". Did not have that issue using Long Bond (8.5"x13") on Portrait mode. For LO 5.3.4.2 on macOS 10.12.6, osx10.10 and Windows10, no issue with 'letter size on portrait mode but printed on landscape.' It seems that said bug affects only "Letter size" on LO 5.4.x on macOS Sierra & Yosemite (as tested). Windows' LibreOffice versions seems ok. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Menubar.js | 32 ++- 1 file changed, 23 insertions(+), 9 deletions(-) New commits: commit 9edf7f0712261e4298b5c4742262b82bb736ddc9 Author: Henry CastroDate: Tue Oct 3 20:09:54 2017 -0400 loleaflet: add more menus for the Writer spell checking Change-Id: I3ef19021f0cb44aa2c34c84af08f2af2d11b25a2 diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index 14f62e3b..0948db0e 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -175,7 +175,13 @@ L.Control.Menubar = L.Control.extend({ {name: _('Tools'), id: 'tools', type: 'menu', menu: [ {name: _('Automatic Spell Checking'), type: 'unocommand', uno: '.uno:SpellOnline'}, {name: _('Language'), type: 'menu', menu: [ - {name: _('Reset to Default Language'), id: 'resetlanguage', type: 'unocommand', uno:'.uno:LanguageStatus?Language:string=Default_RESET_LANGUAGES'}]} + {name: _('For Selection'), type: 'menu', menu: [ + {name: _('Reset to Default Language'), id: 'resetselection', type: 'unocommand', uno: '.uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES'}]}, + {name: _('For Paragraph'), type: 'menu', menu: [ + {name: _('Reset to Default Language'), id: 'resetparagraph', type: 'unocommand', uno: '.uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES'}]}, + {name: _('For all Text'), type: 'menu', menu: [ + {name: _('Reset to Default Language'), id: 'resetlanguage', type: 'unocommand', uno:'.uno:LanguageStatus?Language:string=Default_RESET_LANGUAGES'}]} + ]} ]}, {name: _('Help'), id: 'help', type: 'menu', menu: [ {name: _('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'}, @@ -343,17 +349,25 @@ L.Control.Menubar = L.Control.extend({ this._menubarCont.insertBefore(liItem, this._menubarCont.firstChild); }, + _createLangMenuItem: function (lang, command) { + var liItem, aItem; + liItem = L.DomUtil.create('li', ''); + aItem = L.DomUtil.create('a', '', liItem); + $(aItem).text(lang); + $(aItem).data('type', 'unocommand'); + $(aItem).data('uno', '.uno:LanguageStatus?Language:string=' + command); + return liItem; + }, + _onInitMenu: function (e) { if (e.commandName === '.uno:LanguageStatus') { - var liItem, aItem; - $menuParent = $('#menu-resetlanguage').parent(); + $menuSelection = $('#menu-resetselection').parent(); + $menuParagraph = $('#menu-resetparagraph').parent(); + $menuDefault = $('#menu-resetlanguage').parent(); for (var lang in e.commandValues) { - liItem = L.DomUtil.create('li', ''); - aItem = L.DomUtil.create('a', '', liItem); - $(aItem).text(e.commandValues[lang]); - $(aItem).data('type', 'unocommand'); - $(aItem).data('uno', '.uno:LanguageStatus?Language:string=' + encodeURIComponent('Default_' + e.commandValues[lang])); - $menuParent.append(liItem); + $menuSelection.append(this._createLangMenuItem(e.commandValues[lang], encodeURIComponent('Current_' + e.commandValues[lang]))); + $menuParagraph.append(this._createLangMenuItem(e.commandValues[lang], encodeURIComponent('Paragraph_' + e.commandValues[lang]))); + $menuDefault.append(this._createLangMenuItem(e.commandValues[lang], encodeURIComponent('Default_' + e.commandValues[lang]))); } } }, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 9677b1eae0dc643164f14326c1c0b240c1f442c5 Author: Henry CastroDate: Tue Oct 3 19:54:16 2017 -0400 loleaflet: change position of the language status bar item Change-Id: If5f7ad59e3ef4694313c086ad473af0cc377ea9c diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 1c7b86e5..71646f5f 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -676,9 +676,6 @@ $(function () { {type: 'button', id: 'cancelsearch', img: 'cancel', hint: _('Cancel the search'), hidden: true}, {type: 'html', id: 'left'}, {type: 'html', id: 'right'}, - {type: 'html', id: 'LanguageStatus', -html: '' }, - {type: 'break', id: 'languagestatusbreak'}, {type: 'html',id: 'modifiedstatuslabel', html: ''}, {type: 'break', id: 'modifiedstatuslabelbreak'}, {type: 'drop', id: 'userlist', text: _('No users'), html: '' + @@ -1056,6 +1053,9 @@ map.on('doclayerinit', function () { {type: 'break', id:'break6'}, {type: 'html', id: 'SelectionMode', html: '' }, + {type: 'break', id:'break7'}, + {type: 'html', id: 'LanguageStatus', + html: '' } ]); // Remove irrelevant toolbars ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 95656] FORMATTING: Orientation of Bopomofo tonal marks is incorrect in vertical layout
https://bugs.documentfoundation.org/show_bug.cgi?id=95656 --- Comment #9 from Commit Notification--- Mark Hung committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=b087e451527f2e497ccab83b63b4f10099bfb8b8 tdf#95656 fix orientation for Bopomofo tonal marks It will be available in 6.0.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 95656] FORMATTING: Orientation of Bopomofo tonal marks is incorrect in vertical layout
https://bugs.documentfoundation.org/show_bug.cgi?id=95656 Commit Notificationchanged: What|Removed |Added Whiteboard||target:6.0.0 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: i18npool/source vcl/source
i18npool/source/breakiterator/breakiteratorImpl.cxx |3 +++ vcl/source/gdi/CommonSalLayout.cxx |7 +-- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit b087e451527f2e497ccab83b63b4f10099bfb8b8 Author: Mark HungDate: Sun Oct 1 21:16:06 2017 +0800 tdf#95656 fix orientation for Bopomofo tonal marks A few Spacing Modifier Letters ( 0x2ca, 0x2c7, 0x2cb, 0x2d9 ) are used as Bopomofo tonal marks. This patch force their vertical orientation property to be transformed upright. This patch also set the script type of them to WEAK to keep them with nearby Bopomofo symbols in the same portion. Change-Id: Ib226ebbcaf140124dee806dd6b2859150eb53f67 Reviewed-on: https://gerrit.libreoffice.org/43001 Tested-by: Jenkins Reviewed-by: Khaled Hosny diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 57da598c76e1..fba56fcec7ae 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -481,6 +481,9 @@ bool getCompatibilityScriptClassByBlock(sal_uInt32 currentChar, sal_Int16 // 0x20 & 0xA0 - Bug 102975, declare western space and non-break space as WEAK char. if( 0x01 == currentChar || 0x02 == currentChar || 0x20 == currentChar || 0xA0 == currentChar) rScriptType = ScriptType::WEAK; +// Few Spacing Modifier Letters that can be Bopomofo tonal marks. +else if ( 0x2CA == currentChar || 0x2CB == currentChar || 0x2C7 == currentChar || 0x2D9 == currentChar ) +rScriptType = ScriptType::WEAK; // workaround for Coptic else if ( 0x2C80 <= currentChar && 0x2CE3 >= currentChar) rScriptType = ScriptType::LATIN; diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx index 8e8565717932..5055c74c58b8 100644 --- a/vcl/source/gdi/CommonSalLayout.cxx +++ b/vcl/source/gdi/CommonSalLayout.cxx @@ -309,8 +309,11 @@ namespace { VerticalOrientation GetVerticalOrientation(sal_UCS4 cCh, const LanguageTag& rTag) { -// Override fullwidth colon and semi-colon orientation. Tu is preferred. -if ((cCh == 0xff1a || cCh == 0xff1b) && rTag.getLanguage() == "zh") +// Override orientation of fullwidth colon , semi-colon, +// and Bopomofo tonal marks. +if ((cCh == 0xff1a || cCh == 0xff1b + || cCh == 0x2ca || cCh == 0x2cb || cCh == 0x2c7 || cCh == 0x2d9) +&& rTag.getLanguage() == "zh") return VerticalOrientation::TransformedUpright; uint8_t nRet = 1; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 112486] [META] Bugs caused/worsened by more use of DirectWrite
https://bugs.documentfoundation.org/show_bug.cgi?id=112486 --- Comment #9 from Commit Notification--- Xisco Fauli committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=01f674a95ddec76dc4c8ecfccdca1773657e47cb tdf#112486 Do not force GDI in no OpenGL It will be available in 6.0.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112486] [META] Bugs caused/worsened by more use of DirectWrite
https://bugs.documentfoundation.org/show_bug.cgi?id=112486 Commit Notificationchanged: What|Removed |Added Whiteboard|target:5.3.7|target:5.3.7 target:6.0.0 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: vcl/win
vcl/win/gdi/winlayout.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 01f674a95ddec76dc4c8ecfccdca1773657e47cb Author: Xisco FauliDate: Thu Sep 28 12:05:13 2017 +0200 tdf#112486 Do not force GDI in no OpenGL See: http://nabble.documentfoundation.org/Re-Minutes-of-ESC-call-2017-09-21-tt4223238.html Change-Id: I19bb4b58d2260fd23c32a687a9f504540c229985 Reviewed-on: https://gerrit.libreoffice.org/42897 Reviewed-by: Khaled Hosny Tested-by: Khaled Hosny diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 3521bea0796d..f7161301d72a 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -406,7 +406,7 @@ void WinSalGraphics::DrawTextLayout(const CommonSalLayout& rLayout) if (!bUseOpenGL) { // no OpenGL, just classic rendering -DrawTextLayout(rLayout, hDC, !bForceGDI); +DrawTextLayout(rLayout, hDC, false); } else if (!bForceGDI && CacheGlyphs(rLayout) && DrawCachedGlyphs(rLayout)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 112370] Make index search in helponline case insensitive
https://bugs.documentfoundation.org/show_bug.cgi?id=112370 Gabriel Chiquinichanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 97629] [META] Help Content Modernization
https://bugs.documentfoundation.org/show_bug.cgi?id=97629 Bug 97629 depends on bug 112370, which changed state. Bug 112370 Summary: Make index search in helponline case insensitive https://bugs.documentfoundation.org/show_bug.cgi?id=112370 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 107304] FILEOPEN OTT: Slow file-opening
https://bugs.documentfoundation.org/show_bug.cgi?id=107304 --- Comment #4 from David--- The sample file seemed to hang in 5.4.1 under Linux, but after leaving it sit for about 30 minutes it opened. I'm also having problems with other files that are taking far longer to open than they did previously. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 111846] Find & Replace: Rename diacritics and kashida search options
https://bugs.documentfoundation.org/show_bug.cgi?id=111846 --- Comment #14 from Jim Raykowski--- link to commit https://gerrit.libreoffice.org/#/c/43103/ Is there an easier way to change the commit message than to amend and commit again? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-ux-advise] [Bug 112852] Should unapplying Bold remove the attribute or force text to Regular?
https://bugs.documentfoundation.org/show_bug.cgi?id=112852 Heiko Tietzechanged: What|Removed |Added CC||libreoffice-ux-advise@lists ||.freedesktop.org -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-bugs] [Bug 112801] Improve LO SQL parser to allow GUI Query editor usage with more SQL connection varieties
https://bugs.documentfoundation.org/show_bug.cgi?id=112801 --- Comment #6 from Howard Johnson--- MYSQL Workaround for AND OR and NOT added to https://ask.libreoffice.org/en/question/133467/base-andor-syntax-w-mysql/?answer=133676#post-id-133676 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 107888] Same document with fonts Neutra-Text-Alt looks different with LibreOffice >= 5.3.x
https://bugs.documentfoundation.org/show_bug.cgi?id=107888 V Stuart Footechanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||7605 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112846] RTL: Color widget control overlaps the button and many group buttons dont open (gtk2)
https://bugs.documentfoundation.org/show_bug.cgi?id=112846 Maxim Monastirskychanged: What|Removed |Added CC||momonas...@gmail.com --- Comment #2 from Maxim Monastirsky --- (In reply to Xisco Faulí from comment #1) > Locally applied https://gerrit.libreoffice.org/#/c/43057/ and it's resolved. I tested with my own build of master which contains this fix (Build ID: 13a27860ae79ee8ac9c96b8beb6d3d7aa56a9d94), and unfortunately the bug is still there. I didn't test with an Arabic UI, just with exporting SAL_RTL_ENABLED=1 (no idea if that makes any difference). -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112817] Assertion failure in Itempool.cxx lin 617 after pressing underline
https://bugs.documentfoundation.org/show_bug.cgi?id=112817 Xisco Faulíchanged: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #2 from Xisco Faulí --- Reproduced in Version: 6.0.0.0.alpha0+ Build ID: a9588baca8137f51e2ca72e40b1f448b0e1885d1 CPU threads: 4; OS: Linux 4.10; UI render: default; VCL: gtk2; TinderBox: Linux-rpm_deb-x86_64@70-TDF-dbg, Branch:master, Time: 2017-07-21_03:03:50 Locale: ca-ES (ca_ES.UTF-8); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 58323] [META] OLE objects interoperability issues
https://bugs.documentfoundation.org/show_bug.cgi?id=58323 Bug 58323 depends on bug 112823, which changed state. Bug 112823 Summary: Not Possible Insert Formula into shapes in Write https://bugs.documentfoundation.org/show_bug.cgi?id=112823 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112823] Not Possible Insert Formula into shapes in Write
https://bugs.documentfoundation.org/show_bug.cgi?id=112823 V Stuart Footechanged: What|Removed |Added Status|NEW |RESOLVED CC||rb.hensc...@t-online.de, ||vstuart.fo...@utsa.edu See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||4327 Blocks|85811 |58323 Resolution|--- |INVALID Severity|normal |enhancement --- Comment #6 from V Stuart Foote --- Clearly NAB, if you need a Math formula object overlaid on a Draw object on Writer canvas, just place the object with Insert -> Object -> Formula and anchor both to Page or Paragraph as needed. However, they can not be linked or grouped (other than sharing an anchor point). Or you can work within a Frame, dropping Draw objects and Math OLE formulas into a Frame on Writer canvas--anchor the objects to Frame and adjust the layering. The Frame will then move. Either way Draw objects and Math Formula OLE objects are simply handled differently between the Draw canvas or when added to the Writer canvas directly or into a Frame object. Suppose a Writer enhancement to do so, but not clear there is much of a requirement for Draw canvas handling in Writer context, see also bug 104327 was one such. A lot would depend on limitations of ODF Text Document to hold the OLE Math formula and Draw shapes consistently. Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=58323 [Bug 58323] [META] OLE objects interoperability issues https://bugs.documentfoundation.org/show_bug.cgi?id=85811 [Bug 85811] [META] Main menu bar bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85811] [META] Main menu bar bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=85811 V Stuart Footechanged: What|Removed |Added Depends on|112823 | Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=112823 [Bug 112823] Not Possible Insert Formula into shapes in Write -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112558] Single line spacing of Calibri and Times New Roman no longer calculated correctly in Calc compared to Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=112558 --- Comment #15 from Xisco Faulí--- Hello Yousuf, This commit just landed in master -> https://cgit.freedesktop.org/libreoffice/core/commit/?id=9bc39be417a4c436cbe18391fc87e5e835551b07 we should try we a build having this commit -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 58323] [META] OLE objects interoperability issues
https://bugs.documentfoundation.org/show_bug.cgi?id=58323 V Stuart Footechanged: What|Removed |Added Depends on||112823 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=112823 [Bug 112823] Not Possible Insert Formula into shapes in Write -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 104327] [Feature Request] Drawing canvas in Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=104327 V Stuart Footechanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=11 ||2823 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sc/source
sc/source/core/inc/interpre.hxx | 1498 1 file changed, 749 insertions(+), 749 deletions(-) New commits: commit 6e3e4cd38b56d432c48cd7217885974e3f0519fd Author: Tor LillqvistDate: Wed Oct 4 00:21:59 2017 +0300 Indent part of ScInterpreter that for some reason was not indented at all Change-Id: Ib514d8422a1a881f24fe7a10e8ce538ea997dc6b diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 299104fbb8e8..fa257e8c6f04 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -231,761 +231,761 @@ private: /// Merge global and document specific settings. void MergeCalcConfig(); -// nMust <= nAct <= nMax ? ok : PushError -inline bool MustHaveParamCount( short nAct, short nMust ); -inline bool MustHaveParamCount( short nAct, short nMust, short nMax ); -inline bool MustHaveParamCountMin( short nAct, short nMin ); -void PushParameterExpected(); -void PushIllegalParameter(); -void PushIllegalArgument(); -void PushNoValue(); -void PushNA(); - -// Functions for accessing a document - -void ReplaceCell( ScAddress& ); // for TableOp -bool IsTableOpInRange( const ScRange& ); -sal_uLong GetCellNumberFormat( const ScAddress& rPos, ScRefCellValue& rCell ); -double ConvertStringToValue( const OUString& ); -public: -static double ScGetGCD(double fx, double fy); -/** For matrix back calls into the current interpreter. -Uses rError instead of nGlobalError and rCurFmtType instead of nCurFmtType. */ -double ConvertStringToValue( const OUString&, FormulaError& rError, short& rCurFmtType ); -private: -double GetCellValue( const ScAddress&, ScRefCellValue& rCell ); -double GetCellValueOrZero( const ScAddress&, ScRefCellValue& rCell ); -double GetValueCellValue( const ScAddress&, double fOrig ); -void GetCellString( svl::SharedString& rStr, ScRefCellValue& rCell ); -static FormulaError GetCellErrCode( const ScRefCellValue& rCell ); - -bool CreateDoubleArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, - SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt8* pCellArr); -bool CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, - SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt8* pCellArr); -bool CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, - SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt8* pCellArr); - -// Stack operations - -/** Does substitute with formula::FormulaErrorToken in case nGlobalError is set and the token -passed is not formula::FormulaErrorToken. -Increments RefCount of the original token if not substituted. */ -void Push( const formula::FormulaToken& r ); - -/** Does not substitute with formula::FormulaErrorToken in case nGlobalError is set. -Used to push RPN tokens or from within Push() or tokens that are already -explicit formula::FormulaErrorToken. Increments RefCount. */ -void PushWithoutError( const formula::FormulaToken& r ); - -/** Does substitute with formula::FormulaErrorToken in case nGlobalError is set and the token -passed is not formula::FormulaErrorToken. -Increments RefCount of the original token if not substituted. -ATTENTION! The token had to be allocated with `new' and must not be used -after this call if no RefCount was set because possibly it gets immediately -deleted in case of an FormulaError::StackOverflow or if substituted with formula::FormulaErrorToken! */ -void PushTempToken( formula::FormulaToken* ); - -/** Pushes the token or substitutes with formula::FormulaErrorToken in case -nGlobalError is set and the token passed is not formula::FormulaErrorToken. -Increments RefCount of the original token if not substituted. */ -void PushTokenRef( const formula::FormulaConstTokenRef& ); - -/** Does not substitute with formula::FormulaErrorToken in case nGlobalError is set. -Used to push tokens from within PushTempToken() or tokens that are already -explicit formula::FormulaErrorToken. Increments RefCount. -ATTENTION! The token had to be allocated with `new' and must not be used -after this call if no RefCount was set because possibly it gets immediately -decremented again and thus deleted in case of an FormulaError::StackOverflow! */ -void PushTempTokenWithoutError( const formula::FormulaToken* ); - -/** If nGlobalError is set push formula::FormulaErrorToken. -If nGlobalError is not set do nothing. -Used in PushTempToken() and alike to simplify handling. -@return: if nGlobalError. */ -bool IfErrorPushError() -{ -if (nGlobalError != FormulaError::NONE) +// nMust <= nAct <= nMax ? ok : PushError +inline bool MustHaveParamCount( short nAct, short nMust ); +inline bool MustHaveParamCount( short nAct, short nMust, short nMax ); +inline bool MustHaveParamCountMin( short nAct, short nMin ); +void PushParameterExpected(); +void PushIllegalParameter(); +void PushIllegalArgument(); +
[Libreoffice-bugs] [Bug 112844] FORMATTING Decimal places should be reset when value is
https://bugs.documentfoundation.org/show_bug.cgi?id=112844 Xisco Faulíchanged: What|Removed |Added Status|UNCONFIRMED |NEW CC||xiscofa...@libreoffice.org Version|5.4.1.2 release |5.3.0.0.alpha0+ Summary|FORMATTING Decimal places |FORMATTING Decimal places |empty when changing General |should be reset when value |Number Format after Text or |is 0 |Boolean | Ever confirmed|0 |1 OS|Windows (All) |All --- Comment #1 from Xisco Faulí --- it only happens when the value is set to 0 and then changed to General. Version: 6.0.0.0.alpha0+ Build ID: fe301bbbfce1d11ab992c4ec2a3cb866629e5c04 CPU threads: 4; OS: Linux 4.10; UI render: default; VCL: gtk2; Locale: ca-ES (ca_ES.UTF-8); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112560] [META] Cell line spacing bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=112560 Bug 112560 depends on bug 112824, which changed state. Bug 112824 Summary: Line spacing problem of Futura-Book https://bugs.documentfoundation.org/show_bug.cgi?id=112824 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 109235] [META] Paragraph line spacing bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=109235 Bug 109235 depends on bug 112824, which changed state. Bug 112824 Summary: Line spacing problem of Futura-Book https://bugs.documentfoundation.org/show_bug.cgi?id=112824 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71732] [META] Bugs related to text rendering, typography and font features in LO
https://bugs.documentfoundation.org/show_bug.cgi?id=71732 Bug 71732 depends on bug 112824, which changed state. Bug 112824 Summary: Line spacing problem of Futura-Book https://bugs.documentfoundation.org/show_bug.cgi?id=112824 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112840] Can't replace all the underlined text with nothing
https://bugs.documentfoundation.org/show_bug.cgi?id=112840 Xisco Faulíchanged: What|Removed |Added Status|UNCONFIRMED |NEW CC||xiscofa...@libreoffice.org Version|unspecified |Inherited From OOo Ever confirmed|0 |1 --- Comment #2 from Xisco Faulí --- Reproduced in Version: 6.0.0.0.alpha0+ Build ID: 34e8fd7e99489e9f50a512b07c6f3923b358b4d3 CPU threads: 4; OS: Linux 4.10; UI render: default; VCL: gtk3; Locale: ca-ES (ca_ES.UTF-8); Calc: group and LibreOffice 3.3.0 OOO330m19 (Build:6) tag libreoffice-3.3.0.4 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112824] Line spacing problem of Futura-Book
https://bugs.documentfoundation.org/show_bug.cgi?id=112824 Khaled Hosnychanged: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #9 from Khaled Hosny --- Should be fixed with the same fix for bug 107605. *** This bug has been marked as a duplicate of bug 107605 *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112864] Impress does not loop videos any more
https://bugs.documentfoundation.org/show_bug.cgi?id=112864 Xisco Faulíchanged: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||xiscofa...@libreoffice.org Ever confirmed|0 |1 --- Comment #1 from Xisco Faulí --- Thank you for reporting the bug. it seems you're using an old version of LibreOffice. Could you please try to reproduce it with the latest version of LibreOffice from https://www.libreoffice.org/download/libreoffice-fresh/ ? I have set the bug's status to 'NEEDINFO'. Please change it back to 'UNCONFIRMED' if the bug is still present in the latest version. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112847] RTL: Arabic label text in various places appearing along with squares
https://bugs.documentfoundation.org/show_bug.cgi?id=112847 --- Comment #4 from Xisco Faulí--- I can't reproduce it in Version: 6.0.0.0.alpha0+ Build ID: fe301bbbfce1d11ab992c4ec2a3cb866629e5c04 CPU threads: 4; OS: Linux 4.10; UI render: default; VCL: gtk2; Locale: ca-ES (ca_ES.UTF-8); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112863] [NEWHELP] Convert New Help bash script builder to python.
https://bugs.documentfoundation.org/show_bug.cgi?id=112863 Xisco Faulíchanged: What|Removed |Added Keywords||easyHack, skillPython, ||topicCleanup Status|UNCONFIRMED |NEW CC||xiscofa...@libreoffice.org Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112824] Line spacing problem of Futura-Book
https://bugs.documentfoundation.org/show_bug.cgi?id=112824 --- Comment #8 from Xisco Faulí--- (In reply to Thomas Lendo from comment #7) > Created attachment 136746 [details] > fonttools output for Futura-Book.ttf > > Thanks, Khaled and Xisco. Attached you'll find the output file. @Khaled, could you please take a look ? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85811] [META] Main menu bar bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=85811 Dieter Praaschanged: What|Removed |Added Depends on||112823 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=112823 [Bug 112823] Not Possible Insert Formula into shapes in Write -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112823] Not Possible Insert Formula into shapes in Write
https://bugs.documentfoundation.org/show_bug.cgi?id=112823 Dieter Praaschanged: What|Removed |Added Status|UNCONFIRMED |NEW Blocks||85811 Ever confirmed|0 |1 --- Comment #5 from Dieter Praas --- Reproducible with LO 6.0.0.0 Version: 6.0.0.0.alpha0+ (x64) Build ID: 465092047d5fa6ec6dd369372e712d76554570ff CPU threads: 4; OS: Windows 6.19; UI render: GL; TinderBox: Win-x86_64@42, Branch:master, Time: 2017-09-26_23:16:01 Locale: de-DE (de_DE); Calc: group Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=85811 [Bug 85811] [META] Main menu bar bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sc/source
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx |4 sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx |1 + 2 files changed, 5 insertions(+) New commits: commit 13a27860ae79ee8ac9c96b8beb6d3d7aa56a9d94 Author: Xisco FauliDate: Tue Oct 3 00:38:26 2017 +0200 tdf#112842: UI enable/disable leadingzeroeslabel Change-Id: I73c617c1416628d094b8ee5794f43e16b77681d3 Reviewed-on: https://gerrit.libreoffice.org/43058 Tested-by: Jenkins Reviewed-by: Katarina Behrens diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index 89210a7a53a3..859f58d72f7f 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -53,6 +53,7 @@ NumberFormatPropertyPanel::NumberFormatPropertyPanel( get(mpEdDecimals, "decimalplaces"); get(mpFtDenominator, "denominatorplaceslabel"); get(mpEdDenominator, "denominatorplaces"); +get(mpFtLeadZeroes, "leadingzeroeslabel"); get(mpEdLeadZeroes, "leadingzeroes"); get(mpBtnNegRed, "negativenumbersred"); get(mpBtnThousand,"thousandseparator"); @@ -74,6 +75,7 @@ void NumberFormatPropertyPanel::dispose() mpEdDecimals.clear(); mpFtDenominator.clear(); mpEdDenominator.clear(); +mpFtLeadZeroes.clear(); mpEdLeadZeroes.clear(); mpBtnNegRed.clear(); mpBtnThousand.clear(); @@ -220,6 +222,7 @@ void NumberFormatPropertyPanel::NotifyItemUpdate( mpEdDecimals->Show(!bIsFraction); mpFtDecimals->Enable(!bIsFraction); mpEdDecimals->Enable(!bIsFraction); +mpFtLeadZeroes->Enable(); mpEdLeadZeroes->Enable(); } else @@ -294,6 +297,7 @@ void NumberFormatPropertyPanel::DisableControls() mpEdDecimals->Show(); mpFtDecimals->Disable(); mpEdDecimals->Disable(); +mpFtLeadZeroes->Disable(); mpEdLeadZeroes->Disable(); } diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index e250634cd4fb..ce4a7203e91c 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -71,6 +71,7 @@ private: VclPtr mpEdDecimals; VclPtr mpFtDenominator; VclPtr mpEdDenominator; +VclPtr mpFtLeadZeroes; VclPtr mpEdLeadZeroes; VclPtr mpBtnNegRed; VclPtr mpBtnThousand; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/sidebar/SlideBackground.cxx | 63 --- 1 file changed, 34 insertions(+), 29 deletions(-) New commits: commit 6f581504b77cf780898ffb568a66d4aa86df1c73 Author: Katarina BehrensDate: Mon Oct 2 22:02:55 2017 +0200 tdf#109100: Hide margine control in Impress Change-Id: I6f3453ce309d70f444063f17b3109cc91a50823f Reviewed-on: https://gerrit.libreoffice.org/43056 Tested-by: Jenkins Reviewed-by: Katarina Behrens diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index fcd11edcb44e..f98e5bed6894 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -228,36 +228,41 @@ void SlideBackground::HandleContextChange( return; maContext = rContext; -if ( maContext == maImpressMasterContext ) +if ( IsImpress() ) { -mpCloseMaster->Show(); -mpEditMaster->Hide(); -mpMasterSlide->Disable(); -mpDspMasterBackground->Disable(); -mpDspMasterObjects->Disable(); -mpFillStyle->Show(); -mpBackgroundLabel->Show(); -mpInsertImage->Show(); -} -else if ( maContext == maImpressHandoutContext ) -{ -mpFillStyle->Hide(); -mpFillLB->Hide(); -mpFillAttr->Hide(); -mpFillGrad->Hide(); -mpBackgroundLabel->Hide(); -mpInsertImage->Hide(); -} -else if (maContext == maImpressOtherContext ) -{ -mpCloseMaster->Hide(); -mpEditMaster->Show(); -mpMasterSlide->Enable(); -mpDspMasterBackground->Enable(); -mpDspMasterObjects->Enable(); -mpFillStyle->Show(); -mpBackgroundLabel->Show(); -mpInsertImage->Show(); +mpMarginSelectBox->Hide(); + +if ( maContext == maImpressMasterContext ) +{ +mpCloseMaster->Show(); +mpEditMaster->Hide(); +mpMasterSlide->Disable(); +mpDspMasterBackground->Disable(); +mpDspMasterObjects->Disable(); +mpFillStyle->Show(); +mpBackgroundLabel->Show(); +mpInsertImage->Show(); +} +else if ( maContext == maImpressHandoutContext ) +{ +mpFillStyle->Hide(); +mpFillLB->Hide(); +mpFillAttr->Hide(); +mpFillGrad->Hide(); +mpBackgroundLabel->Hide(); +mpInsertImage->Hide(); +} +else if (maContext == maImpressOtherContext ) +{ +mpCloseMaster->Hide(); +mpEditMaster->Show(); +mpMasterSlide->Enable(); +mpDspMasterBackground->Enable(); +mpDspMasterObjects->Enable(); +mpFillStyle->Show(); +mpBackgroundLabel->Show(); +mpInsertImage->Show(); +} } // else Draw or something else, do nothing } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 105863] Flicker when hovering over main menu with default rendering
https://bugs.documentfoundation.org/show_bug.cgi?id=105863 --- Comment #54 from kompilainenn <79045_79...@mail.ru> --- i can confirm fixing of this bug in LibreOffice Version: 5.3.7.0.0+ Build ID: 8580472270972733cda7fa6ecf23db73359d30bb CPU Threads: 4; OS Version: Windows 6.1; UI Render: default; Layout Engine: new; TinderBox: Win-x86@62-TDF, Branch:libreoffice-5-3, Time: 2017-10-02_13:08:01 Locale: ru-RU (ru_RU); Calc: CL videocard AMD 6450 with latest driver -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - common/Unit.hpp test/UnitWOPI.cpp wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp wsd/reference.txt wsd/Storage.cpp wsd
common/Unit.hpp|6 ++ test/UnitWOPI.cpp | 16 wsd/DocumentBroker.cpp |5 +++-- wsd/DocumentBroker.hpp |2 +- wsd/Storage.cpp|1 + wsd/Storage.hpp|9 - wsd/reference.txt |8 7 files changed, 43 insertions(+), 4 deletions(-) New commits: commit eec17f2189922c163a118f88935c870568b2f7e8 Author: Jan HolesovskyDate: Tue Oct 3 11:59:39 2017 +0200 PutFile ext: X-LOOL-WOPI-IsAutosave header to indicate autosave + unit test. Change-Id: I65ed711dae5100467fe6ed9902bd7bad8c7f8d68 Reviewed-on: https://gerrit.libreoffice.org/43073 Reviewed-by: pranavk Tested-by: pranavk diff --git a/common/Unit.hpp b/common/Unit.hpp index 335a3c81..85139f8c 100644 --- a/common/Unit.hpp +++ b/common/Unit.hpp @@ -208,6 +208,12 @@ public: return false; } +/// To force the save operation being handled as auto-save from a unit test. +virtual bool isAutosave() +{ +return false; +} + // WSD events virtual void onChildConnected(const int /* pid */, const std::string& /* sessionId */) {} /// When admin notify message is sent diff --git a/test/UnitWOPI.cpp b/test/UnitWOPI.cpp index 59f6282e..a8808d20 100644 --- a/test/UnitWOPI.cpp +++ b/test/UnitWOPI.cpp @@ -44,6 +44,12 @@ public: { } +bool isAutosave() override +{ +// we fake autosave when saving the modified document +return _savingPhase == SavingPhase::Modified; +} + void assertCheckFileInfoRequest(const Poco::Net::HTTPRequest& /*request*/) override { // nothing to assert in CheckFileInfo @@ -58,12 +64,22 @@ public: { if (_savingPhase == SavingPhase::Unmodified) { +// the document is not modified CPPUNIT_ASSERT_EQUAL(std::string("false"), request.get("X-LOOL-WOPI-IsModifiedByUser")); + +// but the save action is an explicit user's request +CPPUNIT_ASSERT_EQUAL(std::string("false"), request.get("X-LOOL-WOPI-IsAutosave")); + _finishedSaveUnmodified = true; } else if (_savingPhase == SavingPhase::Modified) { +// the document is modified CPPUNIT_ASSERT_EQUAL(std::string("true"), request.get("X-LOOL-WOPI-IsModifiedByUser")); + +// and this test fakes that it's an autosave +CPPUNIT_ASSERT_EQUAL(std::string("true"), request.get("X-LOOL-WOPI-IsAutosave")); + _finishedSaveModified = true; } diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index e8cc862d..945e9f89 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -760,14 +760,14 @@ bool DocumentBroker::autoSave(const bool force) timeSinceLastSaveMs >= autoSaveDurationMs) { LOG_TRC("Sending timed save command for [" << _docKey << "]."); -sent = sendUnoSave(savingSessionId); +sent = sendUnoSave(savingSessionId, /*dontTerminateEdit=*/ true, /*dontSaveIfUnmodified=*/ true, /*isAutosave=*/ true); } } return sent; } -bool DocumentBroker::sendUnoSave(const std::string& sessionId, bool dontTerminateEdit, bool dontSaveIfUnmodified) +bool DocumentBroker::sendUnoSave(const std::string& sessionId, bool dontTerminateEdit, bool dontSaveIfUnmodified, bool isAutosave) { assertCorrectThread(); @@ -810,6 +810,7 @@ bool DocumentBroker::sendUnoSave(const std::string& sessionId, bool dontTerminat assert(_storage); _storage->setUserModified(_isModified); +_storage->setIsAutosave(isAutosave || UnitWSD::get().isAutosave()); const auto saveArgs = oss.str(); LOG_TRC(".uno:Save arguments: " << saveArgs); diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp index 1030237b..0bc29996 100644 --- a/wsd/DocumentBroker.hpp +++ b/wsd/DocumentBroker.hpp @@ -337,7 +337,7 @@ public: } /// Sends the .uno:Save command to LoKit. -bool sendUnoSave(const std::string& sessionId, bool dontTerminateEdit = true, bool dontSaveIfUnmodified = true); +bool sendUnoSave(const std::string& sessionId, bool dontTerminateEdit = true, bool dontSaveIfUnmodified = true, bool isAutosave = false); /// Sends a message to all sessions void broadcastMessage(const std::string& message); diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp index dc2e6ac5..4d2ce0c5 100644 --- a/wsd/Storage.cpp +++ b/wsd/Storage.cpp @@ -685,6 +685,7 @@ StorageBase::SaveResult WopiStorage::saveLocalFileToStorage(const Authorization& Poco::DateTimeFormat::ISO8601_FRAC_FORMAT)); } request.set("X-LOOL-WOPI-IsModifiedByUser", _isUserModified? "true": "false"); +request.set("X-LOOL-WOPI-IsAutosave", _isAutosave? "true":
[Libreoffice-bugs] [Bug 112865] FILEOPEN ODT: File opening is slower previously
https://bugs.documentfoundation.org/show_bug.cgi?id=112865 Telestochanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||8361 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 110794] Slower LO redraw speed with big Writer table since 5.3
https://bugs.documentfoundation.org/show_bug.cgi?id=110794 Telestochanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||8361 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108361] Scrolling a complex table structure seems to be slower as before
https://bugs.documentfoundation.org/show_bug.cgi?id=108361 Telestochanged: What|Removed |Added Keywords|bibisectRequest |bibisected, bisected See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=11 ||0794, ||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=11 ||2865 Blocks||112486 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=112486 [Bug 112486] [META] Bugs caused/worsened by more use of DirectWrite -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112486] [META] Bugs caused/worsened by more use of DirectWrite
https://bugs.documentfoundation.org/show_bug.cgi?id=112486 Telestochanged: What|Removed |Added Depends on||108361 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=108361 [Bug 108361] Scrolling a complex table structure seems to be slower as before -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108361] Scrolling a complex table structure seems to be slower as before
https://bugs.documentfoundation.org/show_bug.cgi?id=108361 --- Comment #6 from Telesto--- ~/bibisect-win32-5.4 $ git bisect good 19490574e42c3180a38d55ccbbf1e3a00802150d is the first bad commit commit 19490574e42c3180a38d55ccbbf1e3a00802150d Author: Norbert Thiebaud Date: Tue Mar 7 03:23:53 2017 -0800 source sha:a51b7a1c3a7e7cf7b0c733e1dec40288278c1884 source sha:a51b7a1c3a7e7cf7b0c733e1dec40288278c1884 :04 04 fa9847e60273bbf053160ac074280d57781619b5 7b3b4adbbdd5fd93323c745d4f3ac70108e31c5d M instdir https://cgit.freedesktop.org/libreoffice/core/commit/?id=a51b7a1c3a7e7cf7b0c733e1dec40288278c1884 author Khaled Hosny 2017-03-03 03:15:14 (GMT) committer Khaled Hosny 2017-03-03 13:22:53 (GMT) commit a51b7a1c3a7e7cf7b0c733e1dec40288278c1884 (patch) tree6452088195b6c0ad617e7a6b9f97ecc8672d321e parent 5742868ccf030b2c0f03538d030bd18bd5666bdb (diff) tdf#103831, tdf#100986: Force using GDI when needed Our DirectWrite renderer is incomplete and can’t handle rotated text or text with horizontal scaling, so route these two through GDI for now. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: 2 commits - configure.ac ios/CustomTarget_iOS.mk ios/LibreOfficeKit ios/loApp.xcconfig.in ios/loKit.xcconfig.in
configure.ac|4 +- ios/CustomTarget_iOS.mk |2 - ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj | 22 ++-- ios/loApp.xcconfig.in |1 ios/loKit.xcconfig.in |1 5 files changed, 14 insertions(+), 16 deletions(-) New commits: commit 20db1be102731059e43ec5b3c2ae80039621f887 Author: jan IversenDate: Tue Oct 3 22:13:18 2017 +0200 iOS, bump SDK version to 10.3 10.3 is needed (anyhow 11.0 is on the street) Change-Id: Ic9afed3ecbb76e71eb0ee0fc74f4b64dc38af716 diff --git a/configure.ac b/configure.ac index 3b02041874b4..8c12f1301046 100644 --- a/configure.ac +++ b/configure.ac @@ -2871,12 +2871,12 @@ if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator -versionmin=-mios-simulator-version-min=9.3 +versionmin=-mios-simulator-version-min=10.3 IOS_ARCH=x86_64 BITNESS=-fembed-bitcode else platform=iPhoneOS -versionmin=-miphoneos-version-min=9.3 +versionmin=-miphoneos-version-min=10.3 IOS_ARCH=arm64 BITNESS=-fembed-bitcode fi commit eb957c16904717201536f289063de63f1653dbf9 Author: jan Iversen Date: Tue Oct 3 22:06:34 2017 +0200 iOS, get rid of OSX - iOS link conflict. Prelinking uses special flags, adjusted. Change-Id: Ie9537df3a158818128ee0c4e08b3ad0a782009fb diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk index a05194b7d318..d765ca2426f6 100644 --- a/ios/CustomTarget_iOS.mk +++ b/ios/CustomTarget_iOS.mk @@ -36,7 +36,6 @@ $(IOSKITXC) $(IOSAPPXC): $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i -e "s'@WORKDIR@'$(WORKDIR)'g" \ -e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \ -e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \ - -e "s'@LDFLAGS@'-Wl,-lz,-liconv,-map,$(WORKDIR)/ios/iosKit.map 'g" \ -e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \ -e "s'@PRELINK@'`$(SRCDIR)/bin/lo-all-static-libs`'g" \ $(SRCDIR)/ios/loKit.xcconfig.in > $(WORKDIR)/ios/loKit.xcconfig @@ -46,7 +45,6 @@ $(IOSKITXC) $(IOSAPPXC): $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i -e "s'@WORKDIR@'$(WORKDIR)'g" \ -e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \ -e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \ - -e "s'@LDFLAGS@'-Wl,-lz,-liconv,-map,$(WORKDIR)/ios/iosKit.map 'g" \ -e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \ $(SRCDIR)/ios/loApp.xcconfig.in > $(WORKDIR)/ios/loApp.xcconfig diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj index 918920baeee5..407b57cb37d5 100644 --- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj +++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj @@ -198,12 +198,11 @@ "$(LO_SRCDIR)/ios/generated", ); IPHONEOS_DEPLOYMENT_TARGET = 10.3; + LD_GENERATE_MAP_FILE = YES; + LD_MAP_FILE_PATH = ./iosKit.map; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ( - "$(LINK_LDFLAGS)", - "-lstdc++", - ); + PRELINK_FLAGS = "-Wl -ios_version_min 10.3 -lz -liconv"; SDKROOT = iphoneos; VALID_ARCHS = "x86_64 arm64"; }; @@ -261,12 +260,11 @@ "$(LO_SRCDIR)/ios/generated", ); IPHONEOS_DEPLOYMENT_TARGET = 10.3; + LD_GENERATE_MAP_FILE = YES; + LD_MAP_FILE_PATH = ./iosKit.map; MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ( - "$(LINK_LDFLAGS)", - "-lstdc++", - ); + PRELINK_FLAGS = "-Wl -ios_version_min 10.3 -lz -liconv"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; VALID_ARCHS = "x86_64 arm64"; @@ -276,7 +274,9 @@ 39B5D21F1F78130F008FB162 /* Debug */ = { isa = XCBuildConfiguration;
[Libreoffice-bugs] [Bug 112865] FILEOPEN ODT: File opening is slower previously
https://bugs.documentfoundation.org/show_bug.cgi?id=112865 --- Comment #1 from Telesto--- Created attachment 136745 --> https://bugs.documentfoundation.org/attachment.cgi?id=136745=edit Bibisect log ~/bibisect-win32-5.4 $ git bisect good d90fb57128cdedb3b9535221cbf2e5f0a947e8a0 is the first bad commit commit d90fb57128cdedb3b9535221cbf2e5f0a947e8a0 Author: Norbert Thiebaud Date: Thu Feb 23 12:05:52 2017 -0800 source sha:0b08eacd79a2133a07410dfb99bcc04bb9dd2199 source sha:0b08eacd79a2133a07410dfb99bcc04bb9dd2199 :04 04 d804a0ac69976ac999162a8083836ec0e433135d 64e8d2a6f62f8e2fa26a46c24f852e681ea106e5 M instdir https://cgit.freedesktop.org/libreoffice/core/commit/?id=0b08eacd79a2133a07410dfb99bcc04bb9dd2199 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112865] New: FILEOPEN ODT: File opening is slower previously
https://bugs.documentfoundation.org/show_bug.cgi?id=112865 Bug ID: 112865 Summary: FILEOPEN ODT: File opening is slower previously Product: LibreOffice Version: 5.4.0.3 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: tele...@surfxs.nl Description: FILEOPEN ODT: File opening is slower previously Steps to Reproduce: 1. Open the attachment 133874 (bug 108361) 2. Take notice of the time required for opening (11 seconds or so with flickery loading bar) 3. Compare it with LibO5.3 Actual Results: Slow loading Expected Results: Fast loading Reproducible: Always User Profile Reset: No Additional Info: Found in Version: 6.0.0.0.alpha0+ Build ID: f50bf3c5225b49b3c6f77f882e35305e5dc5ccd3 CPU threads: 4; OS: Windows 6.3; UI render: GL; TinderBox: Win-x86@42, Branch:master, Time: 2017-10-03_03:54:36 Locale: nl-NL (nl_NL); Calc: CL but not in Versie: 5.3.0.2 Build ID: 5ad7b2889021c491af62f7930a4b1cb631392f16 CPU Threads: 4; Versie besturingssysteem:Windows 6.2; UI Render: standaard; Layout-Engine: nieuw; Locale: nl-NL (nl_NL); Calc: CL User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:52.0) Gecko/20100101 Firefox/52.0 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93891] Add compare documents to command line interface
https://bugs.documentfoundation.org/show_bug.cgi?id=93891 --- Comment #4 from Daniel Himmelstein--- +1 to command line access to comparing two documents using LibreOffice writer. This feature is available in the GUI (https://help.libreoffice.org/Common/Comparing_Versions_of_a_Document). However, for my application, we're interested in diffing documents automatically (https://github.com/greenelab/manubot-rootstock/issues/54). This would be a hugely valuable feature. Perhaps a syntax such as: libreoffice --writer --compare document_new.docx document_old.docx --output=document_diff.docx -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - common/Crypto.cpp configure.ac Makefile.am tools/Config.cpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp
Makefile.am |4 ++- common/Crypto.cpp | 16 +--- configure.ac | 13 ++--- tools/Config.cpp | 61 ++ wsd/LOOLWSD.cpp | 71 +- wsd/LOOLWSD.hpp |2 + 6 files changed, 130 insertions(+), 37 deletions(-) New commits: commit d545ae8f46fb93273ac4089765600752c470c35f Author: Jan HolesovskyDate: Tue Oct 3 21:48:28 2017 +0200 Support key logic in loolws + improvements in loolconfig. To be able to set the support key directly from the command line, and to show the option, etc. Change-Id: Iac93bc47a6f4b9d5a5ad0ac8b06bda978e01b760 Reviewed-on: https://gerrit.libreoffice.org/43098 Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/Makefile.am b/Makefile.am index 311fefd0..ec73f8f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,7 +64,8 @@ if ENABLE_SSL shared_sources += net/Ssl.cpp endif -loolwsd_sources = wsd/Admin.cpp \ +loolwsd_sources = common/Crypto.cpp \ + wsd/Admin.cpp \ wsd/AdminModel.cpp \ wsd/Auth.cpp \ wsd/DocumentBroker.cpp \ @@ -147,6 +148,7 @@ wsd_headers = wsd/Admin.hpp \ wsd/UserMessages.hpp shared_headers = common/Common.hpp \ + common/Crypto.hpp \ common/IoUtil.hpp \ common/FileUtil.hpp \ common/Log.hpp \ diff --git a/common/Crypto.cpp b/common/Crypto.cpp index aa268ae3..a8e84c2d 100644 --- a/common/Crypto.cpp +++ b/common/Crypto.cpp @@ -54,7 +54,7 @@ struct SupportKeyImpl _signature = key.substr(lastColon + 1, key.length() - lastColon); _data = key.substr(0, lastColon); -std::cout << "signature '" << _signature << "' data '" << _data << "'\n"; +LOG_INF("Support key signature '" << _signature << "' data '" << _data << "'"); _invalid = false; } @@ -83,15 +83,23 @@ bool SupportKey::verify() } std::ifstream pubStream; +std::string supportKeyFilename = +#if ENABLE_DEBUG +SUPPORT_KEY_FILE +#else +LOOLWSD_CONFIGDIR "/" SUPPORT_KEY_FILE +#endif +; + try { -pubStream.open ("pubKey.pub", std::ifstream::in); +pubStream.open(supportKeyFilename, std::ifstream::in); if (pubStream.fail()) { -LOG_ERR("Failed to open support public key."); +LOG_ERR("Failed to open support public key '" << supportKeyFilename << "'."); return false; } } catch (...) { -LOG_ERR("Exception opening public key"); +LOG_ERR("Exception opening public key '" << supportKeyFilename << "'."); return false; } try { diff --git a/configure.ac b/configure.ac index ecd86ead..19348d73 100644 --- a/configure.ac +++ b/configure.ac @@ -96,9 +96,9 @@ AC_ARG_ENABLE([ssl], AS_HELP_STRING([--disable-ssl], [Compile without SSL support])) -AC_ARG_ENABLE([support-key], -AS_HELP_STRING([--enable-support-key], -[Implements signed key with expiration required for support. Almost certainly you don't want to enable this.])) +AC_ARG_WITH([support-key], +AS_HELP_STRING([--with-support-key=], +[Implements signed key with expiration required for support. Almost certainly you don not want to use this.])) AC_ARG_WITH([max-connections], AS_HELP_STRING([--max-connections], @@ -294,10 +294,13 @@ fi AC_SUBST(ENABLE_SSL) -AS_IF([test "$enable_support_key" == "yes"], - [AC_DEFINE([ENABLE_SUPPORT_KEY],1,[Whether to enable support key])], +SUPPORT_KEY_FILE= +AS_IF([test "x$with_support_key" != "x"], + [AC_DEFINE([ENABLE_SUPPORT_KEY],1,[Whether to enable support key]) + AC_DEFINE_UNQUOTED([SUPPORT_KEY_FILE],[["$with_support_key"]],[LibreOffice Online WebSocket server version])], [AC_DEFINE([ENABLE_SUPPORT_KEY],0,[Whether to enable support key])]) AC_SUBST(ENABLE_SUPPORT_KEY) +AC_SUBST(SUPPORT_KEY_FILE) LIBS="$LIBS -lPocoNet${POCO_DEBUG_SUFFIX} -lPocoUtil${POCO_DEBUG_SUFFIX} -lPocoJSON${POCO_DEBUG_SUFFIX} -lPocoFoundation${POCO_DEBUG_SUFFIX} -lPocoXML${POCO_DEBUG_SUFFIX} -lPocoNetSSL${POCO_DEBUG_SUFFIX} -lPocoCrypto${POCO_DEBUG_SUFFIX}" diff --git a/tools/Config.cpp b/tools/Config.cpp index 468bea66..d6a9d666 100644 --- a/tools/Config.cpp +++ b/tools/Config.cpp @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -26,6 +27,7 @@ #include "Crypto.hpp" using Poco::Util::Application; +using Poco::Util::HelpFormatter; using Poco::Util::Option; using Poco::Util::OptionSet; using Poco::Util::XMLConfiguration; @@ -61,6 +63,8
[Libreoffice-bugs] [Bug 107569] Missing tango icon
https://bugs.documentfoundation.org/show_bug.cgi?id=107569 Maxim Monastirskychanged: What|Removed |Added CC||momonas...@gmail.com --- Comment #8 from Maxim Monastirsky --- (In reply to Yousuf Philips (jay) from comment #6) > > cmd/sc_insertframemenu.png > > cmd/sc_formatimagemenu.png > > cmd/sc_formatframemenu.png > > menu submenus like these dont have icons in any theme so not sure about this This "Failed to load image" warning is caused by the "Properties" section of these commands in GenericCommands.xcu. They all have there the value "1", which indicates that they should have an icon, see [1]. If these commands aren't supposed to have any icons, then just removing this "Properties" section should silence the warning IIRC. > > cmd/sc_helpmenu.png > > icons cant appear in the menu bar so not sure why this is in the list. This caused by the presence of .uno:HelpMenu in the available commands list of the customization dialog, although it's useless, as it isn't a command that can do anything other than show the "Help" label. This is caused by the backing SID_HELPMENU definition in [2], which have MenuConfig = TRUE. So what we need here is: 1) Same as above wrt. the "Properties" section in GenericCommands.xcu. 2) Find any occurrence of SID_HELPMENU in the codebase and simply remove it. [1] https://opengrok.libreoffice.org/xref/core/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs#59 [2] https://opengrok.libreoffice.org/xref/core/sfx2/sdi/sfx.sdi#1837 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] online.git: common/Crypto.cpp common/Crypto.hpp configure.ac Makefile.am tools/Config.cpp
Makefile.am |5 + common/Crypto.cpp | 141 ++ common/Crypto.hpp | 37 ++ configure.ac |9 +++ tools/Config.cpp | 61 +++ 5 files changed, 242 insertions(+), 11 deletions(-) New commits: commit 79053911fc51bd0144144c34db944c24b42d3756 Author: Michael MeeksDate: Fri Jul 21 15:33:19 2017 +0100 Support key logic and verification. Change-Id: Ie55150b99df3e80239236571af185502196ad3e9 Reviewed-on: https://gerrit.libreoffice.org/43097 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky (cherry picked from commit 56385cb8ac2a57af4eb70bc8bc7313a9299533c3) Reviewed-on: https://gerrit.libreoffice.org/43099 diff --git a/Makefile.am b/Makefile.am index 5e0d64b2..0d2d4884 100644 --- a/Makefile.am +++ b/Makefile.am @@ -130,7 +130,10 @@ loolstress_SOURCES = tools/Stress.cpp \ common/Log.cpp \ common/Util.cpp -loolconfig_SOURCES = tools/Config.cpp +loolconfig_SOURCES = tools/Config.cpp \ +common/Crypto.cpp \ +common/Log.cpp \ +common/Util.cpp wsd_headers = wsd/Admin.hpp \ wsd/AdminModel.hpp \ diff --git a/common/Crypto.cpp b/common/Crypto.cpp new file mode 100644 index ..aa268ae3 --- /dev/null +++ b/common/Crypto.cpp @@ -0,0 +1,141 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "config.h" + +#if ENABLE_SUPPORT_KEY + +#include +#include +#include +#include + +#include +#include +#include + +#include "Log.hpp" +#include "Crypto.hpp" + +using namespace Poco; +using namespace Poco::Crypto; + +struct SupportKeyImpl +{ +bool _invalid; +std::string _key; +std::string _data; +std::string _signature; +DateTime _expiry; +// Key format: iso-expiry-date:field1:field2:field:...: +SupportKeyImpl(const std::string ) +: _invalid(true), _key(key) +{ +LOG_INF("Support key '" << key << "' provided"); +size_t firstColon = key.find(':'); +if (firstColon != std::string::npos) +{ +std::string expiry(key.substr(0, firstColon)); +LOG_INF("Support key with expiry '" << expiry << "'"); + +try { +int timeZoneDifferential = 0; +Poco::DateTimeParser::parse(expiry, _expiry, timeZoneDifferential); + +size_t lastColon = key.rfind(":"); +if (lastColon != std::string::npos) +{ +_signature = key.substr(lastColon + 1, +key.length() - lastColon); +_data = key.substr(0, lastColon); +std::cout << "signature '" << _signature << "' data '" << _data << "'\n"; + +_invalid = false; +} +} catch (SyntaxException ) { +LOG_ERR("Invalid support key expiry '" << expiry << "'"); +} +} +} +}; + +SupportKey::SupportKey(const std::string ) : +_impl(new SupportKeyImpl(key)) +{ +} + +SupportKey::~SupportKey() +{ +} + +bool SupportKey::verify() +{ +if (_impl->_invalid) +{ +LOG_ERR("Basic key structure is invalid."); +return false; +} + +std::ifstream pubStream; +try { +pubStream.open ("pubKey.pub", std::ifstream::in); +if (pubStream.fail()) +{ +LOG_ERR("Failed to open support public key."); +return false; +} +} catch (...) { +LOG_ERR("Exception opening public key"); +return false; +} +try { +RSAKey keyPub(); +RSADigestEngine rsaEngine(keyPub, RSADigestEngine::DigestType::DIGEST_SHA1); +rsaEngine.update(_impl->_data); + +std::istringstream sigStream(_impl->_signature); +Poco::Base64Decoder rawStream(sigStream); + +std::istreambuf_iterator eos; +std::vector rawSignature(std::istreambuf_iterator(rawStream), eos); +LOG_INF("Signature of length " << rawSignature.size() +<< " data size: " << _impl->_data.length()); +if (!rsaEngine.verify(rawSignature)) +{ +LOG_ERR("Support key is not correctly signed."); +return false; +} +} catch (...) { +LOG_ERR("Exception validating support key."); +return false; +} +LOG_INF("Support key correctly signed."); +return true; +} + +int SupportKey::validDaysRemaining() +{ +if (!verify()) +{ +
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - common/Crypto.cpp common/Crypto.hpp configure.ac Makefile.am tools/Config.cpp
Makefile.am |5 + common/Crypto.cpp | 141 ++ common/Crypto.hpp | 37 ++ configure.ac |9 +++ tools/Config.cpp | 61 +++ 5 files changed, 242 insertions(+), 11 deletions(-) New commits: commit 56385cb8ac2a57af4eb70bc8bc7313a9299533c3 Author: Michael MeeksDate: Fri Jul 21 15:33:19 2017 +0100 Support key logic and verification. Change-Id: Ie55150b99df3e80239236571af185502196ad3e9 Reviewed-on: https://gerrit.libreoffice.org/43097 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/Makefile.am b/Makefile.am index 42298d78..311fefd0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -125,7 +125,10 @@ loolstress_SOURCES = tools/Stress.cpp \ common/Log.cpp \ common/Util.cpp -loolconfig_SOURCES = tools/Config.cpp +loolconfig_SOURCES = tools/Config.cpp \ +common/Crypto.cpp \ +common/Log.cpp \ +common/Util.cpp wsd_headers = wsd/Admin.hpp \ wsd/AdminModel.hpp \ diff --git a/common/Crypto.cpp b/common/Crypto.cpp new file mode 100644 index ..aa268ae3 --- /dev/null +++ b/common/Crypto.cpp @@ -0,0 +1,141 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "config.h" + +#if ENABLE_SUPPORT_KEY + +#include +#include +#include +#include + +#include +#include +#include + +#include "Log.hpp" +#include "Crypto.hpp" + +using namespace Poco; +using namespace Poco::Crypto; + +struct SupportKeyImpl +{ +bool _invalid; +std::string _key; +std::string _data; +std::string _signature; +DateTime _expiry; +// Key format: iso-expiry-date:field1:field2:field:...: +SupportKeyImpl(const std::string ) +: _invalid(true), _key(key) +{ +LOG_INF("Support key '" << key << "' provided"); +size_t firstColon = key.find(':'); +if (firstColon != std::string::npos) +{ +std::string expiry(key.substr(0, firstColon)); +LOG_INF("Support key with expiry '" << expiry << "'"); + +try { +int timeZoneDifferential = 0; +Poco::DateTimeParser::parse(expiry, _expiry, timeZoneDifferential); + +size_t lastColon = key.rfind(":"); +if (lastColon != std::string::npos) +{ +_signature = key.substr(lastColon + 1, +key.length() - lastColon); +_data = key.substr(0, lastColon); +std::cout << "signature '" << _signature << "' data '" << _data << "'\n"; + +_invalid = false; +} +} catch (SyntaxException ) { +LOG_ERR("Invalid support key expiry '" << expiry << "'"); +} +} +} +}; + +SupportKey::SupportKey(const std::string ) : +_impl(new SupportKeyImpl(key)) +{ +} + +SupportKey::~SupportKey() +{ +} + +bool SupportKey::verify() +{ +if (_impl->_invalid) +{ +LOG_ERR("Basic key structure is invalid."); +return false; +} + +std::ifstream pubStream; +try { +pubStream.open ("pubKey.pub", std::ifstream::in); +if (pubStream.fail()) +{ +LOG_ERR("Failed to open support public key."); +return false; +} +} catch (...) { +LOG_ERR("Exception opening public key"); +return false; +} +try { +RSAKey keyPub(); +RSADigestEngine rsaEngine(keyPub, RSADigestEngine::DigestType::DIGEST_SHA1); +rsaEngine.update(_impl->_data); + +std::istringstream sigStream(_impl->_signature); +Poco::Base64Decoder rawStream(sigStream); + +std::istreambuf_iterator eos; +std::vector rawSignature(std::istreambuf_iterator(rawStream), eos); +LOG_INF("Signature of length " << rawSignature.size() +<< " data size: " << _impl->_data.length()); +if (!rsaEngine.verify(rawSignature)) +{ +LOG_ERR("Support key is not correctly signed."); +return false; +} +} catch (...) { +LOG_ERR("Exception validating support key."); +return false; +} +LOG_INF("Support key correctly signed."); +return true; +} + +int SupportKey::validDaysRemaining() +{ +if (!verify()) +{ +LOG_ERR("Support key signature is invalid."); +return 0; +} +Timespan remaining = _impl->_expiry - DateTime(); +
[Libreoffice-bugs] [Bug 71732] [META] Bugs related to text rendering, typography and font features in LO
https://bugs.documentfoundation.org/show_bug.cgi?id=71732 Bug 71732 depends on bug 107605, which changed state. Bug 107605 Summary: Formatting with Cardo font causes line height problem https://bugs.documentfoundation.org/show_bug.cgi?id=107605 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112590] Base forms open maximum size each time with GTK3 VCL backend
https://bugs.documentfoundation.org/show_bug.cgi?id=112590 --- Comment #26 from t...@tim-passingham.co.uk --- And now I know why I installed the gtk3 component. See #105857 - multi-select list boxes don't work on ubuntu without it. I was running gtk2 at the time, and am now on gen (x11). I'm rather caught between a rock and hard-place. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112864] New: Impress does not loop videos any more
https://bugs.documentfoundation.org/show_bug.cgi?id=112864 Bug ID: 112864 Summary: Impress does not loop videos any more Product: LibreOffice Version: 5.2.7.2 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Impress Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: postbote2009-p...@yahoo.com Hello, embedded mpg-videos play only once and do not loop any more. Checking/unchecking the repeat button does not change behaviour. Error seems OS independent - occurs both in debian linux and windows 10. Error tested - debian (Libreoffice 5.2.7.2) - win10 (Libreoffice 5.3.6). With Libreoffice 4.4.7.2 (win10 + ubuntu) videos in the same presentation are looping. Mike -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: vcl/source
vcl/source/font/fontmetric.cxx | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) New commits: commit 9bc39be417a4c436cbe18391fc87e5e835551b07 Author: Khaled HosnyDate: Tue Oct 3 19:59:58 2017 +0200 tdf#107605: Fix line height cslculation for broken fonts Change-Id: I06368dd15d7898dda61bc07b0f96bf82b00733b9 Reviewed-on: https://gerrit.libreoffice.org/43095 Tested-by: Jenkins Reviewed-by: Khaled Hosny diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx index 23954b3c67d9..8dfb4cfbb1ad 100644 --- a/vcl/source/font/fontmetric.cxx +++ b/vcl/source/font/fontmetric.cxx @@ -419,15 +419,18 @@ void ImplFontMetricData::ImplCalcLineSpacing(const std::vector& rHheaDa GetTTFontMetrics(rHheaData, rOS2Data, ); // Try hhea table first. -if (rInfo.ascender || rInfo.descender) +// tdf#107605: Some fonts have weird values here, so check that ascender is +// +ve and descender is -ve as they normally should. +if (rInfo.ascender >= 0 && rInfo.descender <= 0) { -fAscent = rInfo.ascender * fScale; +fAscent = rInfo.ascender * fScale; fDescent= -rInfo.descender * fScale; -fExtLeading = rInfo.linegap * fScale; +fExtLeading = rInfo.linegap * fScale; } // But if OS/2 is present, prefer it. -if (rInfo.winAscent || rInfo.winDescent || rInfo.typoAscender || rInfo.typoDescender) +if (rInfo.winAscent || rInfo.winDescent || +rInfo.typoAscender || rInfo.typoDescender) { if (fAscent == 0 && fDescent == 0) { @@ -437,7 +440,8 @@ void ImplFontMetricData::ImplCalcLineSpacing(const std::vector& rHheaDa } const uint16_t kUseTypoMetricsMask = 1 << 7; -if (rInfo.fsSelection & kUseTypoMetricsMask) +if (rInfo.fsSelection & kUseTypoMetricsMask && +rInfo.typoAscender >= 0 && rInfo.typoDescender <= 0) { fAscent = rInfo.typoAscender * fScale; fDescent= -rInfo.typoDescender * fScale; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 103571] macOS 100% CPU usage when minimizing screen if multiple documents are opened
https://bugs.documentfoundation.org/show_bug.cgi?id=103571 Telestochanged: What|Removed |Added See Also|https://bugs.documentfounda | |tion.org/show_bug.cgi?id=10 | |4589| -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 104589] In certain cases ( for for each new symbol insert into a document with the Insert Character dialog ) 900kb gets written (configmgr_component_getFactory) (see comment 8)
https://bugs.documentfoundation.org/show_bug.cgi?id=104589 Telestochanged: What|Removed |Added See Also|https://bugs.documentfounda | |tion.org/show_bug.cgi?id=10 | |3571| -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112801] Improve LO SQL parser to allow GUI Query editor usage with more SQL connection varieties
https://bugs.documentfoundation.org/show_bug.cgi?id=112801 --- Comment #5 from Howard Johnson--- Hi Robert, >> Query-editor should first allow all the SQL-conditions for internal >> databases. These are at this moment HSQLDB 1.8 and Firebird 3.0. I don't expect to change your mind, but some of the things you say seem more a matter of taste rather than based on facts. So can we start with some facts. I think any comparative discussion of databases should start here, with what the world is actually using: https://db-engines.com/en/ranking https://blog.jooq.org/2013/10/03/the-10-most-popular-db-engines-sql-and-nosql/ Of note is that MySQL is #2 with a huge market saturation, way behind is Firebird at #30, and HSQLDB (not sure which version) at #49. To put this in some perspective, for every person using HyperSQL there are 200 others using MySQL. I have used MySQL for large application in a production environment and found it very good. I also think HSQLDB 1.8 and Firebird are good and fun toys, but only for students or hobbyists. They are easy to get going in LO, but they are also not very capable. And furthermore Firebird was buggy when I last tried it. This is not to say that everyone should use the same thing. My personal preference these days is open source. linux is that leader but only has 3% share of usage. see: https://www.netmarketshare.com/operating-system-market-share.aspx?qprid=10=0 But the good thing about going with a leader like Linux or MySQL is that when I have a question there are lots of other folks who have answers. MySQL, and now it's binary open source twin MariaDB, are production databases with a long history behind them and far more features available. Also of note is that MariaDB is now shipped as the default open source database with Debian and it's derivatives like for example the open source leader: Ubuntu. See: https://mariadb.org/debian-9-released-mariadb-mysql-variant/ >> If there is anybody who will use special code for his database he should >> switch to SQL. With so many databases out there I understand your confusion, but MariaDB is MySQL which is SQL. See: https://en.wikipedia.org/wiki/MariaDB >>I have read the thread in ask.libreoffice.org and must say: I haven't >>understand where the code of this bug should be used for. AND and OR are the two most fundamental boolean operators from which all other boolean logic is derived. In this case they are used to join two conditional expressions inside an IF statement and produce a result as follows: If(x AND y) --- true when both x and y are true. If(x OR y) --- true when either x or y is true. Imagine if the + (plus) or - (minus) operator didn't exist? Well, AND and OR are the boolean equivalents to + and -. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 104589] In certain cases ( for for each new symbol insert into a document with the Insert Character dialog ) 900kb gets written (configmgr_component_getFactory) (see comment 8)
https://bugs.documentfoundation.org/show_bug.cgi?id=104589 Telestochanged: What|Removed |Added Keywords|needsDevAdvice | Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTABUG -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108636] [META] Extensive file accesses
https://bugs.documentfoundation.org/show_bug.cgi?id=108636 Bug 108636 depends on bug 104589, which changed state. Bug 104589 Summary: In certain cases (for for each new symbol insert into a document with the Insert Character dialog) 900kb gets written (configmgr_component_getFactory) (see comment 8) https://bugs.documentfoundation.org/show_bug.cgi?id=104589 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTABUG -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.3-28'
Tag 'cp-5.3-28' created by Andras Timarat 2017-10-03 19:22 + cp-5.3-28 Changes since cp-5.3-27-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.3-28'
Tag 'cp-5.3-28' created by Andras Timarat 2017-10-03 19:22 + cp-5.3-28 Changes since cp-5.3-10: Olivier R (1): tdf#107558 French spelling dictionary (6.0.3) and thesaurus --- fr_FR/README_fr.txt |4 fr_FR/description.xml |2 fr_FR/fr.aff |17751 ++-- fr_FR/fr.dic |155369 +- fr_FR/package-description.txt |2 fr_FR/thes_fr.dat | 206 6 files changed, 88495 insertions(+), 84839 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.3-28'
Tag 'cp-5.3-28' created by Andras Timarat 2017-10-03 19:22 + cp-5.3-28 Changes since cp-5.3-10: Christian Lohmaier (1): update translations for 5.3.3 rc2 --- source/am/cui/source/options.po|8 source/am/cui/source/tabpages.po |8 source/am/cui/uiconfig/ui.po |8 source/am/fpicker/source/office.po | 10 source/am/officecfg/registry/data/org/openoffice/Office.po |6 source/am/sc/source/ui/src.po |8 source/am/sfx2/source/dialog.po| 12 source/am/svtools/source/dialogs.po|8 source/am/svtools/source/misc.po |8 source/am/svx/source/stbctrls.po |8 source/am/svx/uiconfig/ui.po | 10 source/bg/sc/uiconfig/scalc/ui.po | 20 source/bg/sfx2/source/dialog.po| 12 source/bg/svx/source/dialog.po | 30 source/bg/svx/source/form.po | 10 source/bg/svx/source/stbctrls.po |8 source/bg/svx/source/tbxctrls.po |6 source/bg/svx/uiconfig/ui.po | 289 source/bg/sw/source/ui/utlui.po| 21 source/bg/sw/source/uibase/utlui.po|6 source/bg/sw/uiconfig/swriter/ui.po|5 source/br/cui/uiconfig/ui.po | 70 - source/br/extensions/source/bibliography.po| 12 source/br/extensions/source/propctrlr.po | 152 ++-- source/br/sc/source/ui/src.po | 12 source/ca/helpcontent2/source/text/scalc/00.po | 20 source/ca/helpcontent2/source/text/scalc/01.po |8 source/ca/helpcontent2/source/text/scalc/guide.po | 10 source/ca/helpcontent2/source/text/shared/01.po|6 source/ca/helpcontent2/source/text/shared/guide.po |5 source/ca/helpcontent2/source/text/shared/optionen.po |8 source/ca/helpcontent2/source/text/simpress/guide.po | 10 source/ca/helpcontent2/source/text/swriter/01.po | 13 source/ca/helpcontent2/source/text/swriter/guide.po| 25 source/ca/officecfg/registry/data/org/openoffice/Office/UI.po |8 source/ca/sc/uiconfig/scalc/ui.po |6 source/ca/svx/uiconfig/ui.po | 12 source/cy/cui/uiconfig/ui.po |8 source/cy/sfx2/source/dialog.po| 12 source/cy/sfx2/uiconfig/ui.po | 15 source/cy/svtools/source/dialogs.po|8 source/cy/svtools/source/misc.po |8 source/cy/svx/source/stbctrls.po | 10 source/cy/svx/uiconfig/ui.po | 10 source/da/cui/uiconfig/ui.po |8 source/da/helpcontent2/source/text/scalc/01.po | 12 source/da/sfx2/source/dialog.po| 14 source/da/sfx2/uiconfig/ui.po | 17 source/da/svtools/source/dialogs.po| 10 source/da/svtools/source/java.po | 12 source/da/svtools/source/misc.po | 10 source/da/svx/source/stbctrls.po |8 source/da/svx/uiconfig/ui.po | 12 source/de/editeng/source/items.po | 10 source/de/formula/source/core/resource.po |8 source/de/helpcontent2/source/auxiliary.po |6 source/de/helpcontent2/source/text/sbasic/shared/01.po | 10 source/de/helpcontent2/source/text/scalc.po|6 source/de/helpcontent2/source/text/scalc/00.po |6 source/de/helpcontent2/source/text/scalc/01.po | 100 +- source/de/helpcontent2/source/text/scalc/guide.po | 34 source/de/helpcontent2/source/text/schart/01.po|6 source/de/helpcontent2/source/text/shared/00.po| 10 source/de/helpcontent2/source/text/shared/01.po| 12 source/de/helpcontent2/source/text/shared/explorer/database.po |8 source/de/helpcontent2/source/text/shared/guide.po | 16
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.3-28'
Tag 'cp-5.3-28' created by Andras Timarat 2017-10-03 19:22 + cp-5.3-28 Changes since libreoffice-5-3-branch-point-28: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits