Re: Han Zhu license statement
Thanks for your license statement. I have added you to our wiki: https://wiki.documentfoundation.org/Development/Developers If you want help to get started or have any questions, then please contact me. I am here to help you (and others) in getting their first patch submitted. LibreOffice is a very big program and getting it built, setting up gerrit, and getting the first patch right can be a bit challenging, therefore do not hesitate to email me if you want help. We have made a step by step guide to help you get started: https://wiki.documentfoundation.org/Development/GetInvolved rgds Jan Iversen. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Andreas Säger license statement
Thanks for your license statement. I have added you to our wiki: https://wiki.documentfoundation.org/Development/Developers If you want help to get started or have any questions, then please contact me. I am here to help you (and others) in getting their first patch submitted. LibreOffice is a very big program and getting it built, setting up gerrit, and getting the first patch right can be a bit challenging, therefore do not hesitate to email me if you want help. We have made a step by step guide to help you get started: https://wiki.documentfoundation.org/Development/GetInvolved rgds Jan Iversen. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: José Peixoto license statement
Thanks for your license statement. I have added you to our wiki: https://wiki.documentfoundation.org/Development/Developers If you want help to get started or have any questions, then please contact me. I am here to help you (and others) in getting their first patch submitted. LibreOffice is a very big program and getting it built, setting up gerrit, and getting the first patch right can be a bit challenging, therefore do not hesitate to email me if you want help. We have made a step by step guide to help you get started: https://wiki.documentfoundation.org/Development/GetInvolved rgds Jan Iversen. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 106714] In Mailmerge Filter
https://bugs.documentfoundation.org/show_bug.cgi?id=106714 --- Comment #2 from Hans--- I'm running 5.3.1.2. But the problem was already since 5.0 or even longer. It also happens with OpenOffice. But only that dialog, what filters the data for mailmerge. -- 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: ios/experimental
dev/null |binary ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |8 ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift | 10 - ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json | 91 +++-- ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/pdf.imageset/Contents.json | 23 -- ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/print.imageset/Contents.json | 23 -- ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/properties.imageset/Contents.json | 23 -- ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/save.imageset/Contents.json | 23 -- ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/saveas.imageset/Contents.json | 23 -- ios/experimental/LibreOfficeLight/LibreOfficeLight/DocumentController.swift | 48 ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist |4 ios/experimental/LibreOfficeLight/LibreOfficeLight/LO.swift | 40 ios/experimental/LibreOfficeLight/LibreOfficeLight/SideMenu.swift | 30 +-- ios/experimental/LibreOfficeLight/LibreOfficeLight/ViewController.swift | 99 -- ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard | 67 +++--- 15 files changed, 178 insertions(+), 334 deletions(-) New commits: commit 595e3971b130addbc6e5b749f53fc681fa6bc031 Author: jan IversenDate: Sun Mar 19 19:22:30 2017 +0100 iOS LibreOfficeLight reactivate sidemenu Reactivate side menu in DocumentController removed unused png files Change-Id: Ib7da718f53370d6a8a3c82d6850817ea7bc12abc Reviewed-on: https://gerrit.libreoffice.org/35675 Tested-by: Jenkins Reviewed-by: jan iversen diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj index 6fe0b9801a43..cf301c36063e 100644 --- a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj +++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj @@ -16,12 +16,10 @@ 397E09081E597BD8001374E0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 397E09071E597BD8001374E0 /* Assets.xcassets */; }; 397E09161E597BD8001374E0 /* LibreOfficeLightTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397E09151E597BD8001374E0 /* LibreOfficeLightTests.swift */; }; 397E09211E597BD8001374E0 /* LibreOfficeLightUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397E09201E597BD8001374E0 /* LibreOfficeLightUITests.swift */; }; - 3992D8581E5B761700BEA987 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3992D8571E5B761700BEA987 /* ViewController.swift */; }; 3992D85A1E5B762A00BEA987 /* DocumentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3992D8591E5B762A00BEA987 /* DocumentController.swift */; }; 3992D85D1E5B764A00BEA987 /* SideMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3992D85B1E5B764A00BEA987 /* SideMenu.swift */; }; 3992D85E1E5B764A00BEA987 /* FileManagerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3992D85C1E5B764A00BEA987 /* FileManagerController.swift */; }; 399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 399648461E5B87DC00E73E83 /* ViewProperties.swift */; }; - 399648491E5C4E5500E73E83 /* LO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 399648481E5C4E5500E73E83 /* LO.swift */; }; 39A83A8F1E5F471D00D0C683 /* lokit.c in Sources */ = {isa = PBXBuildFile; fileRef = 39A83A8E1E5F471D00D0C683 /* lokit.c */; }; 39B084E31E5F0A9600682A59 /* lo.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 39B084E21E5F0A9600682A59 /* lo.xcconfig */; }; 39B08B9D1E5F0BB600682A59 /* fundamentalrc in Resources */ = {isa = PBXBuildFile; fileRef = 39B084E51E5F0BB400682A59 /* fundamentalrc */; }; @@ -69,12 +67,10 @@ 397E091C1E597BD8001374E0 /* LibreOfficeLightUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LibreOfficeLightUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 397E09201E597BD8001374E0 /* LibreOfficeLightUITests.swift */ = {isa =
[Libreoffice-ux-advise] [Bug 106616] Formatting column width indicator for entire sheet
https://bugs.documentfoundation.org/show_bug.cgi?id=106616 Buovjagachanged: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |WONTFIX --- Comment #5 from Buovjaga --- Yes, I think this is a better fit for an extension or maybe a macro with some other approach. Let's close. -- 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 106616] Formatting column width indicator for entire sheet
https://bugs.documentfoundation.org/show_bug.cgi?id=106616 Buovjagachanged: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |WONTFIX --- Comment #5 from Buovjaga --- Yes, I think this is a better fit for an extension or maybe a macro with some other approach. Let's close. -- 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 106672] Calc: Cut Paste Worksheet with Chart has no option to set datasheet
https://bugs.documentfoundation.org/show_bug.cgi?id=106672 --- Comment #5 from Buovjaga--- If you go into edit mode in the new sheet (double-click the chart), is Data Ranges in the right-click context menu greyed out? I think you should attach your document here. Maybe there is something special. And/or try to create a simple one from scratch, just 1,2,3,4 -> chart and try it out. -- 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 106529] LibO 5.3.1.x breaks extensions for changes in BASIC parser ( error message: "Basic Syntax error. Expected: ).")
https://bugs.documentfoundation.org/show_bug.cgi?id=106529 --- Comment #47 from Commit Notification--- Andreas Säger committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=ad4857211bcc39ccd4c84c670bfab1b937f65089 tdf#106529: fix closing parentheses of bundled macros It will be available in 5.4.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 106529] LibO 5.3.1.x breaks extensions for changes in BASIC parser ( error message: "Basic Syntax error. Expected: ).")
https://bugs.documentfoundation.org/show_bug.cgi?id=106529 Commit Notificationchanged: What|Removed |Added Whiteboard|target:5.3.3|target:5.3.3 target:5.4.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: wizards/source
wizards/source/depot/Currency.xba|4 ++-- wizards/source/depot/Internet.xba|4 ++-- wizards/source/formwizard/DBMeta.xba |6 +++--- wizards/source/formwizard/FormWizard.xba |6 +++--- wizards/source/formwizard/Language.xba | 14 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) New commits: commit ad4857211bcc39ccd4c84c670bfab1b937f65089 Author: Andreas SägerDate: Sun Mar 26 23:34:35 2017 +0300 tdf#106529: fix closing parentheses of bundled macros Change-Id: I43b6d4f97cb3b1cd1426e6aa7e13550d94cb7c51 Signed-off-by: Mike Kaganski Reviewed-on: https://gerrit.libreoffice.org/35726 Tested-by: Jenkins diff --git a/wizards/source/depot/Currency.xba b/wizards/source/depot/Currency.xba index 5a428d757246..d728424d3214 100644 --- a/wizards/source/depot/Currency.xba +++ b/wizards/source/depot/Currency.xba @@ -89,7 +89,7 @@ Dim bIsDocCountry as Boolean End If sCurStockIDLabel = sMarket(Index,5) sCurExtension = sMarket(Index,8) - iValueCol = Val(sMarket(Index,10) + iValueCol = Val(sMarket(Index,10)) If Instr(sCurExtension,;) 0 Then Take the german extension as the stock place is Frankfurt sCurExtension = 407 @@ -192,4 +192,4 @@ Function CheckFormatType(oStyle as Object) Dim oFormatofObject as Object oFormatofObject = oDocFormats.getByKey(oStyle.NumberFormat) CheckFormatType = INT(oFormatOfObject.Type) AND com.sun.star.util.NumberFormat.CURRENCY -End Function \ No newline at end of file +End Function diff --git a/wizards/source/depot/Internet.xba b/wizards/source/depot/Internet.xba index b4bcf579b808..333bcf98af89 100644 --- a/wizards/source/depot/Internet.xba +++ b/wizards/source/depot/Internet.xba @@ -223,7 +223,7 @@ Dim iCellValue as Long If iCellValue 0 Then oCell.SetValue(oLinkSheet.GetCellByPosition(0,i).Value) Else - oCell.SetValue(StringToDate(oLinkSheet.GetCellByPosition(0,i).String) + oCell.SetValue(StringToDate(oLinkSheet.GetCellByPosition(0,i).String)) End If oCell = oSheet.GetCellbyPosition(SBVALUECOLUMN,iCurRow) oCell.SetValue(oLinkSheet.GetCellByPosition(4,i).Value) @@ -353,4 +353,4 @@ Dim bLeaveLoop as Boolean oDateCell.Annotation.SetString(NoteText) End If End Sub - \ No newline at end of file + diff --git a/wizards/source/formwizard/DBMeta.xba b/wizards/source/formwizard/DBMeta.xba index 68759966daf9..b0fa20b7a901 100644 --- a/wizards/source/formwizard/DBMeta.xba +++ b/wizards/source/formwizard/DBMeta.xba @@ -305,8 +305,8 @@ Dim MaxQueryIndex as Integer Dim MaxIndex as Integer Dim i as Integer Dim a as Integer - MaxTableIndex = Ubound(TableNames() - MaxQueryIndex = Ubound(QueryNames() + MaxTableIndex = Ubound(TableNames()) + MaxQueryIndex = Ubound(QueryNames()) MaxIndex = MaxTableIndex + MaxQueryIndex + 1 If MaxIndex -1 Then Dim LocCommandTypes(MaxIndex) as Integer @@ -344,4 +344,4 @@ Function AssignFieldLength(FieldLength as Long) as Integer AssignFieldLength() = FieldLength End If End Function - \ No newline at end of file + diff --git a/wizards/source/formwizard/FormWizard.xba b/wizards/source/formwizard/FormWizard.xba index aa2dc15bbd35..f32bba10edcd 100644 --- a/wizards/source/formwizard/FormWizard.xba +++ b/wizards/source/formwizard/FormWizard.xba @@ -151,11 +151,11 @@ Dim LocList() as String DlgFormDB.GetControl(lstTables).SelectItem(sContent, True) Else If CommandType = com.sun.star.sdb.CommandType.QUERY Then - SelIndex = IndexInArray(sContent, QueryNames() + SelIndex = IndexInArray(sContent, QueryNames()) DlgFormDB.GetControl(lstTables).SelectItemPos(SelIndex, True) ElseIf CommandType = com.sun.star.sdb.CommandType.TABLE Then - SelIndex = IndexInArray(sContent, TableNames() - DlgFormDB.GetControl(lstTables).SelectItemPos(Ubound(QueryNames()+1 + SelIndex, True) + SelIndex = IndexInArray(sContent, TableNames()) + DlgFormDB.GetControl(lstTables).SelectItemPos(Ubound(QueryNames()+1 + SelIndex, True)) End If End If
[Libreoffice-bugs] [Bug 78049] IDE: Printing basic code on Linux does not work
https://bugs.documentfoundation.org/show_bug.cgi?id=78049 --- Comment #8 from Doug Hutcheson--- This bug (feature?) still exists in LO 5.3.1.2-2 Fedora 25 fully updated, acer Core i7, 8Gb I only have Linux so cannot comment on its relevance to 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-commits] online.git: net/Socket.hpp wsd/DocumentBroker.cpp
net/Socket.hpp |6 ++ wsd/DocumentBroker.cpp |4 2 files changed, 10 insertions(+) New commits: commit 6d7f39356c26aed41aef5042b13e52aa63e9d812 Author: Ashod NakashianDate: Sun Mar 26 23:10:24 2017 -0400 wsd: flush sockets before exiting DocBroker poll thread Change-Id: Id5384c113bd761b5b8c25286f1bd5a28051c63d3 Reviewed-on: https://gerrit.libreoffice.org/35740 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/net/Socket.hpp b/net/Socket.hpp index 9ff5a85a..95384397 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -435,6 +435,12 @@ public: " leaving " << _pollSockets.size()); } +size_t getSocketCount() const +{ +assert(isCorrectThread()); +return _pollSockets.size(); +} + const std::string& name() const { return _name; } /// Start the polling thread (if desired) diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 26452a9b..97b81fdd 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -247,6 +247,10 @@ void DocumentBroker::pollThread() } } +// Flush socket data. +for (int i = 0; i < 7 && _poll->getSocketCount() > 0; ++i) +_poll->poll(POLL_TIMEOUT_MS / 5); + // Terminate properly while we can. auto lock = getLock(); terminateChild(lock, "", false); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp
wsd/DocumentBroker.cpp |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit fddb86744e72ef6d2a0427126d56c154217d4df3 Author: Ashod NakashianDate: Sun Mar 26 23:09:59 2017 -0400 wsd: stop DocBroker poll thread when poll is flagged to stop Change-Id: I1bfc3a4e0a0cc7753d330a009bb295c0fce9efca Reviewed-on: https://gerrit.libreoffice.org/35739 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 47e86ecb..26452a9b 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -209,7 +209,7 @@ void DocumentBroker::pollThread() auto last30SecCheckTime = std::chrono::steady_clock::now(); // Main polling loop goodness. -while (!_stop && !TerminationFlag && !ShutdownRequestFlag) +while (!_stop && _poll->continuePolling() && !TerminationFlag && !ShutdownRequestFlag) { // First, load new sessions. for (const auto& pair : _sessions) @@ -1290,6 +1290,7 @@ void DocumentBroker::terminateChild(std::unique_lock& lock, const st // Stop the polling thread. _poll->stop(); +_stop = true; } void DocumentBroker::closeDocument(const std::string& reason) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: net/Socket.hpp wsd/LOOLWSD.cpp
net/Socket.hpp |2 +- wsd/LOOLWSD.cpp |1 + 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit f2f00402755e765019c9a38a84500f243156a1bd Author: Ashod NakashianDate: Sun Mar 26 23:08:10 2017 -0400 wsd: use isCorrectThread Change-Id: Id63c30b19489d590b995e0ea66ef2f44e8cddfb7 Reviewed-on: https://gerrit.libreoffice.org/35738 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/net/Socket.hpp b/net/Socket.hpp index 6a511744..9ff5a85a 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -288,7 +288,7 @@ public: } /// Are we running in either shutdown, or the polling thread. -bool isCorrectThread() +bool isCorrectThread() const { return _stop || std::this_thread::get_id() == _owner; } diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 05abba1d..ad1f4ece 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -1416,6 +1416,7 @@ private: if (docBroker) { auto lock = docBroker->getLock(); +assert(docBroker->isCorrectThread()); docBroker->terminateChild(lock, "Service unavailable", false); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: net/Socket.hpp net/WebSocketHandler.hpp wsd/LOOLWSD.cpp
net/Socket.hpp |2 +- net/WebSocketHandler.hpp |9 - wsd/LOOLWSD.cpp | 20 +++- 3 files changed, 24 insertions(+), 7 deletions(-) New commits: commit 5ae94cc7ecc023122dfa4b67fa22bb2cf75fb088 Author: Ashod NakashianDate: Sun Mar 26 23:06:44 2017 -0400 wsd: onConnect takes shared_ptr and better logging Change-Id: I175dfa1f28444b9bb1f612242ee44b6d0507272c Reviewed-on: https://gerrit.libreoffice.org/35737 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/net/Socket.hpp b/net/Socket.hpp index 56a33de6..6a511744 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -516,7 +516,7 @@ public: /// Called when the socket is newly created to /// set the socket associated with this ResponseClient. /// Will be called exactly once. -virtual void onConnect(const std::weak_ptr& socket) = 0; +virtual void onConnect(const std::shared_ptr& socket) = 0; enum class SocketOwnership { diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp index 6983fbae..ce0d13e9 100644 --- a/net/WebSocketHandler.hpp +++ b/net/WebSocketHandler.hpp @@ -62,9 +62,10 @@ public: } /// Implementation of the SocketHandlerInterface. -void onConnect(const std::weak_ptr& socket) override +void onConnect(const std::shared_ptr& socket) override { _socket = socket; +LOG_TRC("#" << socket->getFD() << " Connected to WS Handler 0x" << std::hex << this << std::dec); } enum WSOpCode { @@ -105,7 +106,10 @@ public: { auto socket = _socket.lock(); if (socket == nullptr) +{ +LOG_ERR("No socket associated with WebSocketHandler 0x" << std::hex << this << std::dec); return; +} LOG_TRC("#" << socket->getFD() << ": Shutdown websocket, code: " << static_cast(statusCode) << ", message: " << statusMessage); @@ -128,7 +132,10 @@ public: { auto socket = _socket.lock(); if (socket == nullptr) +{ +LOG_ERR("No socket associated with WebSocketHandler 0x" << std::hex << this << std::dec); return false; +} // websocket fun ! const size_t len = socket->_inBuffer.size(); diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index d9b1db56..05abba1d 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -1396,15 +1396,19 @@ public: private: /// Keep our socket around ... -void onConnect(const std::weak_ptr& socket) override +void onConnect(const std::shared_ptr& socket) override { -LOG_TRC("Prisoner - new socket"); _socket = socket; +LOG_TRC("#" << socket->getFD() << " Prisoner connected."); } void onDisconnect() override { -LOG_TRC("Prisoner connection disconnected"); +auto socket = _socket.lock(); +if (socket) +LOG_TRC("#" << socket->getFD() << " Prisoner connection disconnected."); +else +LOG_WRN("Prisoner connection disconnected but without valid socket."); // Notify the broker that we're done. auto child = _childProcess.lock(); @@ -1525,7 +1529,11 @@ private: if (UnitWSD::get().filterChildMessage(data)) return; -LOG_TRC("Prisoner message [" << getAbbreviatedMessage([0], data.size()) << "]."); +auto socket = _socket.lock(); +if (socket) +LOG_TRC("#" << socket->getFD() << " Prisoner message [" << getAbbreviatedMessage([0], data.size()) << "]."); +else +LOG_WRN("Message handler called but without valid socket."); auto child = _childProcess.lock(); auto docBroker = child ? child->getDocumentBroker() : nullptr; @@ -1567,10 +1575,11 @@ public: private: /// Set the socket associated with this ResponseClient. -void onConnect(const std::weak_ptr& socket) override +void onConnect(const std::shared_ptr& socket) override { _id = LOOLWSD::GenSessionId(); _socket = socket; +LOG_TRC("#" << socket->getFD() << " Connected to ClientRequestDispatcher."); } /// Called after successful socket reads. @@ -2108,6 +2117,7 @@ private: { // Set the ClientSession to handle Socket events. socket->setHandler(clientSession); +LOG_DBG("Socket #" << socket->getFD() << " handler is " << clientSession->getName()); // Move the socket into DocBroker. docBroker->addSocketToPoll(socket); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp | 46 -- 1 file changed, 46 deletions(-) New commits: commit 2a049cf60f6ca29dc6af570e7a1da2e012faa404 Author: Ashod NakashianDate: Sun Mar 26 23:05:08 2017 -0400 wsd: kill unused code Change-Id: I09fb52f0455e45e7217b290d5355019e14b9dbc1 Reviewed-on: https://gerrit.libreoffice.org/35736 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index df3382a0..d9b1db56 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -1556,52 +1556,6 @@ private: } }; -/// Handles dispatching socket traffic to the ClientSession. -class ConvertToHandler : public SocketHandlerInterface -{ -public: -ConvertToHandler(const std::shared_ptr& clientSession) : -_clientSession(clientSession) -{ -} - -private: - -/// Set the socket associated with this ResponseClient. -void onConnect(const std::weak_ptr& socket) override -{ -LOG_ERR("onConnect"); -_socket = socket; -} - -void onDisconnect() override -{ -LOG_ERR("onDisconnect"); -} - -SocketHandlerInterface::SocketOwnership handleIncomingMessage() override -{ -LOG_ERR("handleIncomingMessage"); -return SocketHandlerInterface::SocketOwnership::UNCHANGED; -} - -int getPollEvents(std::chrono::steady_clock::time_point /* now */, - int & /* timeoutMaxMs */) override -{ -return POLLIN; -} - -void performWrites() override -{ -LOG_ERR("performWrites"); -} - -private: -// The socket that owns us (we can't own it). -std::weak_ptr _socket; -std::shared_ptr _clientSession; -}; - /// Handles incoming connections and dispatches to the appropriate handler. class ClientRequestDispatcher : public SocketHandlerInterface { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: common/Session.hpp wsd/ClientSession.hpp wsd/DocumentBroker.cpp
common/Session.hpp |7 --- wsd/ClientSession.hpp | 13 ++--- wsd/DocumentBroker.cpp |8 +--- 3 files changed, 3 insertions(+), 25 deletions(-) New commits: commit f1c371555a686611ba0b6bd324c57e7c6e7cd353 Author: Ashod NakashianDate: Sun Mar 26 23:04:27 2017 -0400 wsd: kill unused headless stuff Change-Id: Ic4ee7603ecd7acd10e4499457de181342f2d7483 Reviewed-on: https://gerrit.libreoffice.org/35735 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/common/Session.hpp b/common/Session.hpp index c8f2e63b..7c337fe2 100644 --- a/common/Session.hpp +++ b/common/Session.hpp @@ -68,13 +68,6 @@ public: void closeFrame() { _isCloseFrame = true; }; bool isCloseFrame() const { return _isCloseFrame; } -bool isHeadless() const -{ -// TODO loolnb here we should return true when there is no -// client socket (i.e. when converting documents). -return false; -} - protected: Session(const std::string& name, const std::string& id); virtual ~Session(); diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp index c027f4b3..5c505a43 100644 --- a/wsd/ClientSession.hpp +++ b/wsd/ClientSession.hpp @@ -70,17 +70,8 @@ public: // If in the correct thread - no need for wakeups. assert (!docBroker || docBroker->isCorrectThread()); -if (isHeadless()) -{ -// Fail silently and return as there is no actual websocket -// connection in this case. -LOG_INF(getName() << ": Headless peer, not forwarding message [" << data->abbr() << "]."); -} -else -{ -LOG_TRC(getName() << " enqueueing client message " << data->id()); -_senderQueue.enqueue(data); -} +LOG_TRC(getName() << " enqueueing client message " << data->id()); +_senderQueue.enqueue(data); } bool stopping() const { return _stop || _senderQueue.stopping(); } diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index ba3a7595..47e86ecb 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -1200,13 +1200,7 @@ bool DocumentBroker::forwardToClient(const std::shared_ptr& payload) // Broadcast to all. for (const auto& pair : _sessions) { -#if 0 // loolnb -if (!pair.second->isHeadless() && !pair.second->isCloseFrame()) -#endif -if (!pair.second->isHeadless()) -{ -pair.second->handleKitToClientMessage(data, size); -} +pair.second->handleKitToClientMessage(data, size); } } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: common/Message.hpp
common/Message.hpp |4 1 file changed, 4 insertions(+) New commits: commit b69d5683c3f1718a796bd71f35b350df7e040f30 Author: Ashod NakashianDate: Sun Mar 26 23:03:15 2017 -0400 wsd: log messages upon construction Change-Id: Id8f2eeaa1fabf538af0c327a971d35cc17cb3596 Reviewed-on: https://gerrit.libreoffice.org/35734 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/common/Message.hpp b/common/Message.hpp index d75b1e9e..99ccd77a 100644 --- a/common/Message.hpp +++ b/common/Message.hpp @@ -15,6 +15,7 @@ #include #include "Protocol.hpp" +#include "Log.hpp" /// The payload type used to send/receive data. class Message @@ -36,6 +37,7 @@ public: _abbr(_id + ' ' + LOOLProtocol::getAbbreviatedMessage(_data.data(), _data.size())), _type(detectType()) { +LOG_TRC("Message " << _abbr); } /// Construct a message from a string with type and @@ -55,6 +57,7 @@ public: _data.resize(message.size()); const auto offset = skipWhitespace(message.data() + _forwardToken.size()); std::memcpy(_data.data(), offset, message.size() - (offset - message.data())); +LOG_TRC("Message " << _abbr); } /// Construct a message from a character array with type. @@ -70,6 +73,7 @@ public: _abbr(_id + ' ' + LOOLProtocol::getAbbreviatedMessage(_data.data(), _data.size())), _type(detectType()) { +LOG_TRC("Message " << _abbr); } size_t size() const { return _data.size(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 104594] Wrong text joining behavior in fontwork
https://bugs.documentfoundation.org/show_bug.cgi?id=104594 --- Comment #6 from Volga--- W3C has a good example of adding text border to such text: https://w3c.github.io/alreq/#h_joining_and_text_border -- 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 106758] Weird display of combining diacritical acute accent mark
https://bugs.documentfoundation.org/show_bug.cgi?id=106758 --- Comment #3 from Andy--- You are right, 5.3.1 indeed shows accents correctly. I tried to update LO before submitting a bug but it only offered 5.2.6 and I did not see 5.3.1, I should have waited a bit longer. Thanks for checking this, Andy -- 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 106763] EDITING
https://bugs.documentfoundation.org/show_bug.cgi?id=106763 David Lochrinchanged: What|Removed |Added Status|NEEDINFO|UNCONFIRMED Ever confirmed|1 |0 --- Comment #5 from David Lochrin --- (In reply to m.a.riosv from comment #4) > Please review the option: > Menu/Tools/Options/LibreOffice calc/General - Expand references when new > columns/rows are inserted. You're absolutely correct Miguel, and I apologise for wasting everyone's time. I thought it was a bit too simple for a bug! However I do think this option is rather dangerous because it can obviously lead to incorrect results when a spreadsheet designer is unaware of it and a function argument then operates on unintended cells. I imagine most would not be aware of it; I wasn't and I count myself as a knowledgable user. Should it be set "off" by default, and has the default changed in recent versions? Though I realise changing defaults is tricky. In my case the effect arose quite indirectly. I have written macros for adding & deleting multiple rows and sorting up to two columns of commonly formatted sheets (with header row(s), a data area, and an end row), and I've been using them for years. But recently a calculation located below the data area (i.e. outside the nominal scope of the macros) generated incorrect results when rows were added anywhere in the data such that the last row of the new data area extended at least to the row ("x") immediately before a SUM(x:y) function. The SUM() function then summed the range (x:y+n) where "n" is the number of rows added. Thanks for your response. Regards, David Lochrin -- 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 106788] Libreoffice 'Export to PDF' save dialog allows newline characters in file name
https://bugs.documentfoundation.org/show_bug.cgi?id=106788 --- Comment #3 from Alan--- Created attachment 132163 --> https://bugs.documentfoundation.org/attachment.cgi?id=132163=edit Example of a file with a newline character -- 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 106788] Libreoffice 'Export to PDF' save dialog allows newline characters in file name
https://bugs.documentfoundation.org/show_bug.cgi?id=106788 --- Comment #2 from Alan--- Created attachment 132162 --> https://bugs.documentfoundation.org/attachment.cgi?id=132162=edit A sample of where I get the file from -- 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 106788] Libreoffice 'Export to PDF' save dialog allows newline characters in file name
https://bugs.documentfoundation.org/show_bug.cgi?id=106788 --- Comment #1 from Alan--- Created attachment 132161 --> https://bugs.documentfoundation.org/attachment.cgi?id=132161=edit Example of file name using the ls command -- 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 'libreoffice-5-3' - wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp | 26 +- 1 file changed, 17 insertions(+), 9 deletions(-) New commits: commit d32178652df26b9607101319eae0d9d9bf5e7b9e Author: Ashod NakashianDate: Sun Jan 1 15:42:22 2017 -0500 wsd: flag for shutdown when we fail to create forkit And say 'forkit' in the logs where we recognize it instead of the generic 'child'. Change-Id: I7628b064bb6330db145a948640e48b727def3270 Reviewed-on: https://gerrit.libreoffice.org/35578 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 9ea9d497..866ad79f 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -431,7 +431,7 @@ static std::shared_ptr getNewChild() } } -LOG_DBG("getNewChild: No live child, forking more."); +LOG_WRN("getNewChild: No available child. Sending spawn request to forkit and failing."); } while (chrono::duration_cast(chrono::steady_clock::now() - startTime).count() < CHILD_TIMEOUT_MS * 4); @@ -2038,12 +2038,12 @@ int LOOLWSD::main(const std::vector& /*args*/) { if (WIFEXITED(status)) { -LOG_INF("Child process [" << pid << "] exited with code: " << +LOG_INF("Forkit process [" << pid << "] exited with code: " << WEXITSTATUS(status) << "."); } else { -LOG_ERR("Child process [" << pid << "] " << +LOG_ERR("Forkit process [" << pid << "] " << (WCOREDUMP(status) ? "core-dumped" : "died") << " with " << SigUtil::signalName(WTERMSIG(status))); } @@ -2054,17 +2054,18 @@ int LOOLWSD::main(const std::vector& /*args*/) if (forKitPid < 0) { LOG_FTL("Failed to spawn forkit instance. Shutting down."); +SigUtil::requestShutdown(); break; } } else if (WIFSTOPPED(status) == true) { -LOG_INF("Child process [" << pid << "] stopped with " << +LOG_INF("Forkit process [" << pid << "] stopped with " << SigUtil::signalName(WSTOPSIG(status))); } else if (WIFCONTINUED(status) == true) { -LOG_INF("Child process [" << pid << "] resumed with SIGCONT."); +LOG_INF("Forkit process [" << pid << "] resumed with SIGCONT."); } else { @@ -2073,17 +2074,24 @@ int LOOLWSD::main(const std::vector& /*args*/) } else { -LOG_ERR("An unknown child process died, pid: " << pid); +LOG_ERR("An unknown child process [" << pid << "] died."); } } else if (pid < 0) { -LOG_SYS("waitpid failed."); +LOG_SYS("Forkit waitpid failed."); if (errno == ECHILD) { // No child processes. -LOG_FTL("No Forkit instance. Terminating."); -break; +// Spawn a new forkit and try to dust it off and resume. +close(ForKitWritePipe); +forKitPid = createForKit(); +if (forKitPid < 0) +{ +LOG_FTL("Failed to spawn forkit instance. Shutting down."); +SigUtil::requestShutdown(); +break; +} } } else // pid == 0, no children have died ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 082678adb24003dc1128923a470cec1f9203c713 Author: Ashod NakashianDate: Mon Jan 2 15:40:20 2017 -0500 wsd: correctly count outstanding spawned children Change-Id: I6e2d5c7d8fdfbcd268ef97cb1272bce76e8b69de Reviewed-on: https://gerrit.libreoffice.org/35577 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 39538828..9ea9d497 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -296,7 +296,7 @@ static void forkChildren(const int number) const std::string aMessage = "spawn " + std::to_string(number) + "\n"; LOG_DBG("MasterToForKit: " << aMessage.substr(0, aMessage.length() - 1)); -++OutstandingForks; +OutstandingForks += number; IoUtil::writeToPipe(LOOLWSD::ForKitWritePipe, aMessage); LastForkRequestTime = std::chrono::steady_clock::now(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0783eb343a035d3ddd5c76f853e4a286e8534288 Author: Ashod NakashianDate: Fri Feb 24 21:27:13 2017 -0500 wsd: allow more time for initial kit instance Change-Id: I141d30e0d1089521593c614be29ef5c33fd3428a Reviewed-on: https://gerrit.libreoffice.org/35576 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index a696d8fb..39538828 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -335,7 +335,7 @@ static void preForkChildren() forkChildren(numPreSpawn); // Wait until we have at least one child. -const auto timeout = std::chrono::milliseconds(CHILD_TIMEOUT_MS); +const auto timeout = std::chrono::milliseconds(CHILD_TIMEOUT_MS * 3); NewChildrenCV.wait_for(lock, timeout, []() { return !NewChildren.empty(); }); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/src
loleaflet/src/core/Socket.js |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 75c17fdb3c173d9cd16fbe9744ffcaaabb232052 Author: Ashod NakashianDate: Sun Feb 12 22:59:48 2017 -0500 loleaflet: reconnect silently when disconnected Change-Id: I7761dcfd283e9b24fd70d255899d438209103a22 Reviewed-on: https://gerrit.libreoffice.org/35575 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js index a7c18ebc..cc962d30 100644 --- a/loleaflet/src/core/Socket.js +++ b/loleaflet/src/core/Socket.js @@ -413,7 +413,7 @@ L.Socket = L.Class.extend({ this._map.fire('doclayerinit'); } else if (textMsg.startsWith('status:') && this._reconnecting) { // we are reconnecting ... - this._reconecting = false; + this._reconnecting = false; this._map._docLayer._onMessage('invalidatetiles: EMPTY', null); this._map.fire('statusindicator', {statusType: 'reconnected'}); this._map.setPermission(this._map.options.permission); @@ -460,6 +460,11 @@ L.Socket = L.Class.extend({ // Reset wopi's app loaded so that reconnecting again informs outerframe about initialization again this._map['wopi'].resetAppLoaded(); + + if (!this._reconnecting) { + this._reconnecting = true; + this._map._activate(); + } }, parseServerCmd: function (msg) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/src
loleaflet/src/map/Map.js |5 ++- loleaflet/src/map/handler/Map.Keyboard.js | 47 -- 2 files changed, 43 insertions(+), 9 deletions(-) New commits: commit bc1cd6bbce159a6707311a7e5404ad73dd892629 Author: Tomaž VajngerlDate: Sun Jan 15 23:53:00 2017 +0100 fix Chrome Android and Firefox Android text input - Change from textarea to input (type="text") to prevent Firefox to auto-capitalize. - Clean the text input content after each word so that the soft keyboard spellcheck suggestions are correct and that backspace doesn't delete long IME suggestions before it has effect. - Workaround on Chrome Android 'space' and applying spell-check corrections. Change-Id: I635789bc8f3b47069b7ad8b8e88bc36feb90b2b1 Reviewed-on: https://gerrit.libreoffice.org/35571 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js index cadd3d52..fb395694 100644 --- a/loleaflet/src/map/Map.js +++ b/loleaflet/src/map/Map.js @@ -594,7 +594,10 @@ L.Map = L.Evented.extend({ } var textAreaContainer = L.DomUtil.create('div', 'clipboard-container', container.parentElement); - this._textArea = L.DomUtil.create('textarea', 'clipboard', textAreaContainer); + this._textArea = L.DomUtil.create('input', 'clipboard', textAreaContainer); + this._textArea.setAttribute('type', 'text'); + this._textArea.setAttribute('autocorrect', 'off'); + this._textArea.setAttribute('autocapitalize', 'off'); this._resizeDetector = L.DomUtil.create('iframe', 'resize-detector', container); this._fileDownloader = L.DomUtil.create('iframe', '', container); L.DomUtil.setStyle(this._fileDownloader, 'display', 'none'); diff --git a/loleaflet/src/map/handler/Map.Keyboard.js b/loleaflet/src/map/handler/Map.Keyboard.js index 8aff7550..752e74b0 100644 --- a/loleaflet/src/map/handler/Map.Keyboard.js +++ b/loleaflet/src/map/handler/Map.Keyboard.js @@ -284,12 +284,28 @@ L.Map.Keyboard = L.Handler.extend({ var charCode = e.originalEvent.charCode; var keyCode = e.originalEvent.keyCode; + if (e.type === 'compositionstart' || e.type === 'compositionupdate') { + this._isComposing = true; // we are starting composing with IME + } + if (e.type === 'compositionend') { + this._isComposing = false; // stop of composing with IME + // get the composited char codes var compCharCodes = []; for (var i = 0; i < e.originalEvent.data.length; i++) { compCharCodes.push(e.originalEvent.data[i].charCodeAt()); } + // clear the input now - best to do this ASAP so the input + // is clear for the next word + this._map._textArea.value = ''; + } + + if (!this._isComposing && e.type === 'keyup') { + // not compositing and keyup, clear the input so it is ready + // for next word (or char only) + this._map._textArea.value = ''; } + var unoKeyCode = this._toUNOKeyCode(keyCode); if (this.modifier) { @@ -338,15 +354,30 @@ L.Map.Keyboard = L.Handler.extend({ this._bufferedTextInputEvent = e; } else if (e.type === 'keyup') { - // Hack for making space work in chrome when IME is enabled - // Chrome doesn't fire compositionend event or keypress when - // IME is enabled *and* user presses . - // However, it sends 'textInput' event in such a case. - // Use the buffered textInput event if its the space key and has not been - // handled already by 'keypress' or 'compositionend' events above - if (!this._keyHandled && this._bufferedTextInputEvent && e.originalEvent.key === this._bufferedTextInputEvent.originalEvent.data) { + // Hack for making space and spell-check text insert work + // in Chrome (on Andorid) or Chrome with IME. + // + // Chrome (Android) IME triggers keyup/keydown input with + // code 229 when hitting space (as with all composiiton events) + // with
[Libreoffice-bugs] [Bug 106788] New: Libreoffice 'Export to PDF' save dialog allows newline characters in file name
https://bugs.documentfoundation.org/show_bug.cgi?id=106788 Bug ID: 106788 Summary: Libreoffice 'Export to PDF' save dialog allows newline characters in file name Product: LibreOffice Version: 5.2.2.2 release Hardware: x86-64 (AMD64) OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: LibreOffice Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: gro...@ajinfosearch.com Description: As part of my work I need to generate pdf documents where I copy and paste the data into a Writer document then export as a pdf. Part of the name I need to save the file as comes from cells in tables or a spreadsheet. It appears that every cell has a newline character (hex 0A) at the end of the text. The newline character is included when copying the text (which I assume is intended). The newline character is transparently included when pasting the copied text in the Name field of the Export dialog. This causes problems when the file is further processed in my workflow. Please filter out the newline character in the file save dialog or give an option to do so. Steps to Reproduce: 1.Copy the cell Name in the attached sample.ods 2.Export as PDF 3.Paste the copied name in the save file dialog and type something after it 4.File name is saved with the newline (hex 0A) character Actual Results: A new line character is included in the file name. Expected Results: The Export dialog should filter out all newline characters before saving the file. Reproducible: Always User Profile Reset: No Additional Info: Running Kubuntu 16.10 Plasma 5.8.5 KDE Frameworks 5.6.1 kernel 4.8.0-37-generic, 64 bit Okular version 0.25.0 LibreOffice 5.2.2.2 Build ID: 1:5.2.2-0ubuntu2 CPU Threads: 8; OS Version: Linux 4.8; UI Render: default See ls-1.txt for bash file listing See sample.ods for a sample of where I get the file names from See 'Person, One NewYork.pdf' as an example of what happens to the file name. More information upon request User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; 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-commits] online.git: Branch 'libreoffice-5-3' - kit/Kit.cpp
kit/Kit.cpp | 17 ++--- 1 file changed, 14 insertions(+), 3 deletions(-) New commits: commit 164ce37afd1ee329fc0d60ac89389e9dcf5d3ba3 Author: Ashod NakashianDate: Sun Jan 15 23:54:08 2017 -0500 wsd: copy jail files when symlinking fails Change-Id: I1f56d1489820a0689495e09151101d41a2322b82 Reviewed-on: https://gerrit.libreoffice.org/35570 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/kit/Kit.cpp b/kit/Kit.cpp index 15fd559d..a9f7417e 100644 --- a/kit/Kit.cpp +++ b/kit/Kit.cpp @@ -148,9 +148,18 @@ namespace File(newPath.parent()).createDirectories(); if (link(fpath, newPath.toString().c_str()) == -1) { -LOG_SYS("link(\"" << std::string(fpath) << "\",\"" << -newPath.toString() << "\") failed. Exiting."); -std::_Exit(Application::EXIT_SOFTWARE); +LOG_SYS("link(\"" << fpath << "\", \"" << +newPath.toString() << "\") failed. Will copy."); +try +{ +File(fpath).copyTo(newPath.toString()); +} +catch (const std::exception& exc) +{ +LOG_ERR("Copying of '" << fpath << "' to " << newPath.toString() << +" failed: " << exc.what() << ". Exiting."); +std::_Exit(Application::EXIT_SOFTWARE); +} } break; case FTW_D: @@ -201,7 +210,9 @@ namespace sourceForLinkOrCopy.pop_back(); destinationForLinkOrCopy = destination; if (nftw(source.c_str(), linkOrCopyFunction, 10, FTW_ACTIONRETVAL) == -1) +{ LOG_ERR("linkOrCopy: nftw() failed for '" << source << "'"); +} } void dropCapability(cap_value_t capability) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 003e1ee5204e4191b2404ca674bf223797c1d2e0 Author: Pranav KantDate: Tue Dec 20 15:56:42 2016 +0530 loleaflet: Disable bullet/numbering in calc Change-Id: I7509fbf8cfb593fc23ace3ca02c71342d1112def Reviewed-on: https://gerrit.libreoffice.org/35567 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index b2ac4432..e4b7a0f3 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -848,8 +848,8 @@ map.on('doclayerinit', function () { switch (docType) { case 'spreadsheet': - toolbarUp.remove('inserttable', 'styles', 'alignblock', 'bullet', 'numbering', 'break-numbering'); - toolbarUpMore.remove('inserttable', 'styles', 'alignblock', 'bullet', 'numbering', 'break-numbering'); + toolbarUp.remove('inserttable', 'styles', 'alignblock', 'defaultbullet', 'defaultnumbering', 'break-numbering'); + toolbarUpMore.remove('inserttable', 'styles', 'alignblock', 'defaultbullet', 'defaultnumbering', 'break-numbering'); statusbar.disable('zoomreset', 'zoomout', 'zoomin', 'zoomlevel'); statusbar.insert('left', [ {type: 'break', id:'break1'}, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 103642] Page refresh causes unwanted error message
https://bugs.documentfoundation.org/show_bug.cgi?id=103642 Commit Notificationchanged: What|Removed |Added Whiteboard|target:5.4.0|target:5.4.0 target:5.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-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 27c2163e6d1a58be1fcf39b63c696d85a6a125c6 Author: Pranav KantDate: Thu Jan 12 16:44:36 2017 +0530 loleaflet: Move this logic to updateCommandValues() Change-Id: I64e96f87e56c1b14dd2085d552eebd40977cd7e9 Reviewed-on: https://gerrit.libreoffice.org/35565 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 5ffa88b9..b2ac4432 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -498,10 +498,6 @@ $(function () { } updateCommandValues(); - if (fontsSelectValue){ - $('.fontsizes-select').val(fontsizesSelectValue); - updateFontSizeList(fontsSelectValue); - } insertTable(); } @@ -1236,6 +1232,10 @@ function updateCommandValues() { }); $('.fontsizes-select').on('select2:select', onFontSizeSelect); + if (fontsSelectValue) { + updateFontSizeList(fontsSelectValue); + } + $('.fontsizes-select').val(fontsizesSelectValue).trigger('change'); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 103642] Page refresh causes unwanted error message
https://bugs.documentfoundation.org/show_bug.cgi?id=103642 --- Comment #2 from Commit Notification--- Henry Castro committed a patch related to this issue. It has been pushed to "libreoffice-5-3": http://cgit.freedesktop.org/libreoffice/online/commit/?id=674ba96da0351f3a216d7974e35358d3a7c0b72e=libreoffice-5-3 tdf#103642 Page refresh causes unwanted error message -- 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 'libreoffice-5-3' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js | 55 +- 1 file changed, 42 insertions(+), 13 deletions(-) New commits: commit 07065bbb16a2e525f1a509725ef99362f175b76c Author: Pranav KantDate: Thu Jan 12 16:33:35 2017 +0530 loleaflet: Update dropdowns on refresh everytime Change-Id: I39071f1c6249e6ecf71684d3b93cc88f1f859510 Reviewed-on: https://gerrit.libreoffice.org/35564 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index cc1c0786..5ffa88b9 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -332,6 +332,10 @@ function onColorPick(e, color) { // edit/view mode, state from this object is read and then applied on corresponding buttons var formatButtons = {}; +var stylesSelectValue; +var fontsSelectValue; +var fontsizesSelectValue; + $(function () { $('#toolbar-up-more').w2toolbar({ name: 'toolbar-up-more', @@ -493,6 +497,12 @@ $(function () { } } + updateCommandValues(); + if (fontsSelectValue){ + $('.fontsizes-select').val(fontsizesSelectValue); + updateFontSizeList(fontsSelectValue); + } + insertTable(); } }); @@ -952,6 +962,8 @@ map.on('commandstatechanged', function (e) { .append($('') .text(state)); } + + stylesSelectValue = state; $('.styles-select').val(state).trigger('change'); } else if (commandName === '.uno:CharFontName') { @@ -969,6 +981,7 @@ map.on('commandstatechanged', function (e) { .append($('') .text(state)); } + fontsSelectValue = state; $('.fonts-select').val(state).trigger('change'); } else if (commandName === '.uno:FontHeight') { @@ -987,6 +1000,7 @@ map.on('commandstatechanged', function (e) { .append($('') .text(state).val(state)); } + fontsizesSelectValue = state; $('.fontsizes-select').val(state).trigger('change'); sortFontSizes(); } @@ -1129,13 +1143,17 @@ map.on('search', function (e) { } }); -map.on('updatetoolbarcommandvalues', function (e) { - // we need an empty option for the place holder to work +function updateCommandValues() { var data = []; - var styles = []; - var topStyles = []; - if (e.commandName === '.uno:StyleApply') { - var commands = e.commandValues.Commands; + // 1) For .uno:StyleApply + // we need an empty option for the place holder to work + if ($('.styles-select option').length === 0) { + var styles = []; + var topStyles = []; + var commandValues = map.getToolbarCommandValues('.uno:StyleApply'); + if (typeof commandValues === 'undefined') + return; + var commands = commandValues.Commands; if (commands && commands.length > 0) { // Inserts a separator element data = data.concat({text: '\u2500\u2500\u2500\u2500\u2500\u2500', disabled: true}); @@ -1146,11 +1164,11 @@ map.on('updatetoolbarcommandvalues', function (e) { } if (map.getDocType() === 'text') { - styles = e.commandValues.ParagraphStyles.slice(7, 19); - topStyles = e.commandValues.ParagraphStyles.slice(0, 7); + styles = commandValues.ParagraphStyles.slice(7, 19); + topStyles = commandValues.ParagraphStyles.slice(0, 7); } else if (map.getDocType() === 'spreadsheet') { - styles = e.commandValues.CellStyles; + styles = commandValues.CellStyles; } else if (map.getDocType() === 'presentation') { // styles are not applied for presentation @@ -1188,27 +1206,38 @@ map.on('updatetoolbarcommandvalues', function (e) { data: data, placeholder: _('Style') }); + $('.styles-select').val(stylesSelectValue).trigger('change'); $('.styles-select').on('select2:select', onStyleSelect); } - else if (e.commandName === '.uno:CharFontName') { + + if ($('.fonts-select option').length === 0) { + // 2) For .uno:CharFontName +
[Libreoffice-bugs] [Bug 103776] Hide/Deactivate "Document repair" button
https://bugs.documentfoundation.org/show_bug.cgi?id=103776 Commit Notificationchanged: What|Removed |Added Whiteboard|target:5.4.0|target:5.4.0 target:5.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 103775] Font color/Highlighting button issue
https://bugs.documentfoundation.org/show_bug.cgi?id=103775 --- Comment #3 from Commit Notification--- Henry Castro committed a patch related to this issue. It has been pushed to "libreoffice-5-3": http://cgit.freedesktop.org/libreoffice/online/commit/?id=c29369231cdda89e008881690f20cdb2940b0908=libreoffice-5-3 tdf#103775: Font color/Highlighting button issue -- 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 'libreoffice-5-3' - discovery.xml
discovery.xml |6 ++ 1 file changed, 6 insertions(+) New commits: commit acd766a5638494c3a94e434e91fde484292a7249 Author: Andras TimarDate: Sat Jan 7 21:26:00 2017 +0100 add text/rtf and text/plain as supported MIME types Change-Id: Ic46e8ccaeecc24ef2c6b6fce6b342c976c3ddc60 Reviewed-on: https://gerrit.libreoffice.org/35562 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/discovery.xml b/discovery.xml index 0edd631c..c8b87c5b 100644 --- a/discovery.xml +++ b/discovery.xml @@ -254,6 +254,12 @@ + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 103776] Hide/Deactivate "Document repair" button
https://bugs.documentfoundation.org/show_bug.cgi?id=103776 --- Comment #3 from Commit Notification--- Henry Castro committed a patch related to this issue. It has been pushed to "libreoffice-5-3": http://cgit.freedesktop.org/libreoffice/online/commit/?id=9a9b6e05c115a8bc766f6330080f5c30db00736c=libreoffice-5-3 tdf#103776: Hide/Deactivate "Document repair" button -- 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 103775] Font color/Highlighting button issue
https://bugs.documentfoundation.org/show_bug.cgi?id=103775 Commit Notificationchanged: What|Removed |Added Whiteboard|target:5.4.0|target:5.4.0 target:5.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-commits] online.git: Branch 'libreoffice-5-3' - 2 commits - loleaflet/dist loleaflet/src
loleaflet/dist/toolbar/toolbar.js | 44 ++ loleaflet/src/control/Toolbar.js |9 +++ 2 files changed, 53 insertions(+) New commits: commit 2371a82381ef1e6ab6826dd81e26afc5f39e8b0d Author: Henry CastroDate: Thu Dec 22 13:41:26 2016 -0400 tdf#103779: Help menu accessibility (cherry picked from commit 1bede62b132e61fa847aaf066447c2670d14dbab) Change-Id: Ib2b7dc3222c064d7a3f3d90d2182daf970b5e6a5 Reviewed-on: https://gerrit.libreoffice.org/35480 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js index 2e87ff65..f95b7b7b 100644 --- a/loleaflet/src/control/Toolbar.js +++ b/loleaflet/src/control/Toolbar.js @@ -212,6 +212,8 @@ L.Map.include({ translatableContent[i].firstChild.nodeValue = translatableContent[i].firstChild.nodeValue.toLocaleString(); } + $('.vex-content').attr('tabindex', -1); + $('.vex-content').focus(); // workaround for https://github.com/HubSpot/vex/issues/43 $('.vex-overlay').css({ 'pointer-events': 'none'}); $('.vex').click(function() { @@ -220,6 +222,9 @@ L.Map.include({ $('.vex-content').click(function(e) { e.stopPropagation(); }); + }, + beforeClose: function () { + map.focus(); } }); }); @@ -242,6 +247,7 @@ L.Map.include({ contentCSS: { width: w + 'px'}, buttons: {}, afterOpen: function($vexContent) { + map.enable(false); // workaround for https://github.com/HubSpot/vex/issues/43 $('.vex-overlay').css({ 'pointer-events': 'none'}); $('.vex').click(function() { @@ -250,6 +256,9 @@ L.Map.include({ $('.vex-content').click(function(e) { e.stopPropagation(); }); + }, + beforeClose: function () { + map.enable(true); } }); } commit c29369231cdda89e008881690f20cdb2940b0908 Author: Henry Castro Date: Wed Dec 21 19:50:04 2016 -0400 tdf#103775: Font color/Highlighting button issue (cherry picked from commit 65bfc63ace567501912e4b6399ff8f81cc62516e) Change-Id: Ie52972574cc07ac5826da261aab6671e9fd0272c Reviewed-on: https://gerrit.libreoffice.org/35479 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 819404f5..cc1c0786 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -408,6 +408,28 @@ $(function () { if (!L.DomUtil.get('fontcolorindicator')) { var fontColorIndicator = L.DomUtil.create('div', 'font-color-indicator', L.DomUtil.get('tb_toolbar-up_item_fontcolor')); fontColorIndicator.id = 'fontcolorindicator'; + L.DomEvent.on(fontColorIndicator, 'mouseover', function () { + var button = fontColorIndicator.parentNode.firstChild; + $(button).addClass('over'); + }); + L.DomEvent.on(fontColorIndicator, 'mouseout', function () { + var button = fontColorIndicator.parentNode.firstChild; + $(button).removeClass('over'); + }); + L.DomEvent.on(fontColorIndicator, 'mousedown', function () { + var button = fontColorIndicator.parentNode.firstChild; + $(button).addClass('down'); + }); + L.DomEvent.on(fontColorIndicator, 'mouseup', function () { + var button = fontColorIndicator.parentNode.firstChild; +
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/main.js
loleaflet/main.js |5 + 1 file changed, 5 insertions(+) New commits: commit 674ba96da0351f3a216d7974e35358d3a7c0b72e Author: Henry CastroDate: Wed Dec 28 13:44:49 2016 -0400 tdf#103642 Page refresh causes unwanted error message (cherry picked from commit 9c64db3ad1d60c4de659d779a4fba17a298ed648) Change-Id: Ia276b00a4a1638cdb878c052886c01a9dc47db58 Reviewed-on: https://gerrit.libreoffice.org/35481 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/main.js b/loleaflet/main.js index 93e85115..29399a92 100644 --- a/loleaflet/main.js +++ b/loleaflet/main.js @@ -114,4 +114,9 @@ map.addControl(L.control.rowHeader()); map.addControl(L.control.contextMenu()); map.addControl(L.control.menubar()); +window.addEventListener('beforeunload', function () { + if (global.map && global.map._socket) { + global.map._socket.close(); + } +}); //require('./dist/toolbar/toolbar'); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - 2 commits - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js | 24 +++- 1 file changed, 19 insertions(+), 5 deletions(-) New commits: commit 9a9b6e05c115a8bc766f6330080f5c30db00736c Author: Henry CastroDate: Tue Dec 20 14:41:37 2016 -0400 tdf#103776: Hide/Deactivate "Document repair" button (cherry picked from commit 9450f3938c16a35a7d261c31d830781782697797) Change-Id: I1a4077534327aea8032fe9d48d951a824cb81113 Reviewed-on: https://gerrit.libreoffice.org/35478 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 1cefc8ae..819404f5 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -1060,6 +1060,14 @@ map.on('commandstatechanged', function (e) { } } } + + if (id === 'undo' || id === 'redo') { + if (toolbar.get('undo').disabled && toolbar.get('redo').disabled) { + toolbar.disable('repair'); + } else { + toolbar.enable('repair'); + } + } }); map.on('search', function (e) { commit 2c32ca0ecc361e1b38a91f5c855ca6594cad4057 Author: Pranav Kant Date: Fri Jan 6 14:42:27 2017 +0530 loleaflet: Make id of these toolbar items consistent with others We assume that id of the toolbar item is lowercase(unocommand), so lets keep it consistent too for alignment buttons. This also makes alignment buttons toggle except for spreadsheet where alignment of cell text happens via a different uno command, HorizontalAlignment. Change-Id: Ibacf06bd99435cd24b27c7870173a2519b167af1 Reviewed-on: https://gerrit.libreoffice.org/35477 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 23c62410..1cefc8ae 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -368,10 +368,10 @@ $(function () { {type: 'html', id: 'backcolor-html', html: ''}, {type: 'button', id: 'backcolor', img: 'backcolor', hint: _('Highlighting')}, {type: 'break'}, - {type: 'button', id: 'alignleft', img: 'alignleft', hint: _('Align left'), uno: 'LeftPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"1"}}'}, - {type: 'button', id: 'alignhorizontal', img: 'alignhorizontal', hint: _('Center horizontally'), uno: 'CenterPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"2"}}'}, - {type: 'button', id: 'alignright', img: 'alignright', hint: _('Align right'), uno: 'RightPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"3"}}'}, - {type: 'button', id: 'alignblock', img: 'alignblock', hint: _('Justified'), uno: 'JustifyPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"4"}}'}, + {type: 'button', id: 'leftpara', img: 'alignleft', hint: _('Align left'), uno: 'LeftPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"1"}}'}, + {type: 'button', id: 'centerpara', img: 'alignhorizontal', hint: _('Center horizontally'), uno: 'CenterPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"2"}}'}, + {type: 'button', id: 'rightpara', img: 'alignright', hint: _('Align right'), uno: 'RightPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"3"}}'}, + {type: 'button', id: 'justifypara', img: 'alignblock', hint: _('Justified'), uno: 'JustifyPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"4"}}'}, {type: 'break', id: 'wraptextseparator'}, {type: 'button', id: 'wraptext', img: 'wraptext', hint: _('Wrap Text'), uno: 'WrapText'}, {type: 'button', id: 'togglemergecells', img: 'togglemergecells', hint: _('Merge and Center Cells'), uno: 'ToggleMergeCells'}, @@ -588,6 +588,11 @@ function toLocalePattern (pattern, regex, text, sub1, sub2) { return text; } +function unoCmdToToolbarId(commandname) +{ + return commandname.toLowerCase().substr(5); +} + function selectItem(item, func) { var index = -1; @@ -873,6 +878,7 @@ map.on('commandstatechanged', function (e) { var found = false; var value, color, div;
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) New commits: commit 4d13636ab7ffa5437acf64c47b3ff64bec0afe0a Author: Pranav KantDate: Tue Dec 20 15:53:20 2016 +0530 loleaflet: Separator before 'wrap text' in calc Change-Id: If1f4536dec24238ff1476e9e7d9ab58207d86495 Reviewed-on: https://gerrit.libreoffice.org/35476 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 85a987f9..23c62410 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -372,6 +372,7 @@ $(function () { {type: 'button', id: 'alignhorizontal', img: 'alignhorizontal', hint: _('Center horizontally'), uno: 'CenterPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"2"}}'}, {type: 'button', id: 'alignright', img: 'alignright', hint: _('Align right'), uno: 'RightPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"3"}}'}, {type: 'button', id: 'alignblock', img: 'alignblock', hint: _('Justified'), uno: 'JustifyPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"4"}}'}, + {type: 'break', id: 'wraptextseparator'}, {type: 'button', id: 'wraptext', img: 'wraptext', hint: _('Wrap Text'), uno: 'WrapText'}, {type: 'button', id: 'togglemergecells', img: 'togglemergecells', hint: _('Merge and Center Cells'), uno: 'ToggleMergeCells'}, {type: 'break', id: 'break-toggle'}, @@ -824,8 +825,8 @@ map.on('doclayerinit', function () { ]); break; case 'text': - toolbarUp.remove('wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); - toolbarUpMore.remove('wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); + toolbarUp.remove('wraptextseparator', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); + toolbarUpMore.remove('wraptextseparator', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); statusbar.insert('left', [ {type: 'break', id:'break1'}, {type: 'html', id: 'StatePageNumber', @@ -844,8 +845,8 @@ map.on('doclayerinit', function () { case 'presentation': var presentationToolbar = w2ui['presentation-toolbar']; presentationToolbar.show('presentation', 'presentationbreak', 'insertpage', 'duplicatepage', 'deletepage'); - toolbarUp.remove('insertannotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); - toolbarUpMore.remove('insertannotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); + toolbarUp.remove('insertannotation', 'wraptextseparator', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); + toolbarUpMore.remove('insertannotation', 'wraptextseparator', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); statusbar.insert('left', [ {type: 'break', id:'break1'}, {type: 'html', id:
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 8d3815c32aa55a9ab5b17f98c08ce8c2359257bd Author: Ashod NakashianDate: Thu Dec 22 19:33:46 2016 -0500 wsd: log failure in else and not unconditionally Change-Id: I24f1ac57f350aa67cc14682d695e1e4a07453c8d Reviewed-on: https://gerrit.libreoffice.org/35475 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index b069fcb6..a696d8fb 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -834,9 +834,12 @@ private: } } } +else +{ +LOG_DBG("No DocumentBroker with docKey [" << docKey << "] found. New Child and Document."); +} Util::assertIsLocked(docBrokersLock); -LOG_DBG("No DocumentBroker with docKey [" << docKey << "] found. New Child and Document."); if (TerminationFlag) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106655] Cursor sometimes dissappearing during document load
https://bugs.documentfoundation.org/show_bug.cgi?id=106655 Commit Notificationchanged: What|Removed |Added Whiteboard||target:5.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 106655] Cursor sometimes dissappearing during document load
https://bugs.documentfoundation.org/show_bug.cgi?id=106655 --- Comment #1 from Commit Notification--- Pranav Kant committed a patch related to this issue. It has been pushed to "libreoffice-5-3": http://cgit.freedesktop.org/libreoffice/online/commit/?id=e2383db17942ba7324dc4e1a397362bddbf25be4=libreoffice-5-3 tdf#106655 loleaflet: Fix cursor dissappearing during document load -- 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 'libreoffice-5-3' - wsd/DocumentBroker.hpp wsd/LOOLWSD.cpp
wsd/DocumentBroker.hpp |6 ++ wsd/LOOLWSD.cpp| 18 -- 2 files changed, 18 insertions(+), 6 deletions(-) New commits: commit a9a21eb232411a00afe350ebc61f20d75253b7ff Author: Ashod NakashianDate: Tue Dec 20 23:06:59 2016 -0500 wsd: don't poll WS for write to check child alive The WS could be chocked on write, but we shouldn't assume the child is dead because of that. We are only trying to test if the child process is alive in that helper. Also, log DocBroker activity better. Change-Id: I108a297e43f923cab0dfa30204837dc4df15d3a1 Reviewed-on: https://gerrit.libreoffice.org/35474 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp index f31471aa..feb96979 100644 --- a/wsd/DocumentBroker.hpp +++ b/wsd/DocumentBroker.hpp @@ -140,17 +140,15 @@ public: return false; } -/// Check whether this child is alive and able to respond. +/// Check whether this child is alive and socket not in error. /// Note: zombies will show as alive, and sockets have waiting /// time after the other end-point closes. So this isn't accurate. bool isAlive() const { try { -using namespace Poco::Net; return (_pid > 1 && _ws && kill(_pid, 0) == 0 && -_ws->poll(Poco::Timespan(0), Socket::SelectMode::SELECT_WRITE) && -!_ws->poll(Poco::Timespan(0), Socket::SelectMode::SELECT_ERROR)); +!_ws->poll(Poco::Timespan(0), Poco::Net::Socket::SelectMode::SELECT_ERROR)); } catch (const std::exception& exc) { diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 11b37694..b069fcb6 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -265,7 +265,18 @@ bool cleanupDocBrokers() } } -return (count != DocBrokers.size()); +if (count != DocBrokers.size()) +{ +LOG_TRC("Have " << DocBrokers.size() << " DocBrokers after cleanup."); +for (auto& pair : DocBrokers) +{ +LOG_TRC("DocumentBroker [" << pair.first << "]."); +} + +return true; +} + +return false; } static void forkChildren(const int number) @@ -596,6 +607,7 @@ private: LOG_DBG("Removing DocumentBroker for docKey [" << docKey << "]."); DocBrokers.erase(docKey); docBroker->terminateChild(docLock); +LOG_TRC("Have " << DocBrokers.size() << " DocBrokers after removing."); } else { @@ -760,7 +772,7 @@ private: if (it != DocBrokers.end() && it->first == docKey) { // Get the DocumentBroker from the Cache. -LOG_DBG("Found DocumentBroker for docKey [" << docKey << "]."); +LOG_DBG("Found DocumentBroker with docKey [" << docKey << "]."); docBroker = it->second; assert(docBroker); @@ -824,6 +836,7 @@ private: } Util::assertIsLocked(docBrokersLock); +LOG_DBG("No DocumentBroker with docKey [" << docKey << "] found. New Child and Document."); if (TerminationFlag) { @@ -976,6 +989,7 @@ private: LOG_INF("Removing DocumentBroker for docKey [" << docKey << "]."); DocBrokers.erase(docKey); docBroker->terminateChild(lock); +LOG_TRC("Have " << DocBrokers.size() << " DocBrokers after removing."); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106654] Shortcut for 'Insert footnote" also displays search bar
https://bugs.documentfoundation.org/show_bug.cgi?id=106654 Commit Notificationchanged: What|Removed |Added Whiteboard||target:5.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-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 22ab7a3ad37ef347b5d164453b8d66bacfc03adb Author: Pranav KantDate: Sun Dec 18 09:56:03 2016 +0530 loleaflet: Fix remaining incorrect key name, insertannotation Fallback from e2151b30b270ef47faf403a412ee6e858febdeee Change-Id: I26130bd75e26f2ae4f8fba864115d2b50f938f30 Reviewed-on: https://gerrit.libreoffice.org/35473 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 87b0bc4f..85a987f9 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -844,8 +844,8 @@ map.on('doclayerinit', function () { case 'presentation': var presentationToolbar = w2ui['presentation-toolbar']; presentationToolbar.show('presentation', 'presentationbreak', 'insertpage', 'duplicatepage', 'deletepage'); - toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); - toolbarUpMore.remove('annotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); + toolbarUp.remove('insertannotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); + toolbarUpMore.remove('insertannotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); statusbar.insert('left', [ {type: 'break', id:'break1'}, {type: 'html', id: 'PageStatus', @@ -853,8 +853,8 @@ map.on('doclayerinit', function () { ]); break; case 'drawing': - toolbarUp.remove('annotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); - toolbarUpMore.remove('annotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); + toolbarUp.remove('insertannotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); + toolbarUpMore.remove('insertannotation', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); break; } toolbarUp.refresh(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js | 33 - 1 file changed, 16 insertions(+), 17 deletions(-) New commits: commit e4c0e3706712e188e520d0e06fc0bbc87bf74bf7 Author: Pranav KantDate: Fri Dec 16 22:08:17 2016 +0530 loleaflet: Cleanup & fix default numbering/bullet state Automatically initialize formatButtons internal object to preclude the possibility of one forgetting to enter the id of the button in formatButtons object. Fix 'id' of default numbering/bullet button after which it is correctly showing the state now. Change-Id: I57247e1b0e6d462153a47d31a883ceb04ecff74b Reviewed-on: https://gerrit.libreoffice.org/35471 Reviewed-by: pranavk Tested-by: pranavk Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 7d5ab254..87b0bc4f 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -327,6 +327,11 @@ function onColorPick(e, color) { map.focus(); } +// This object is used to store enabled/disabled state of each and every eligible item +// (i.e the one having UNO command) of toolbar-up. When the permission is changed to/from +// edit/view mode, state from this object is read and then applied on corresponding buttons +var formatButtons = {}; + $(function () { $('#toolbar-up-more').w2toolbar({ name: 'toolbar-up-more', @@ -380,8 +385,8 @@ $(function () { {type: 'button', id: 'sortascending', img: 'sortascending', hint: _('Sort Ascending'), uno: 'SortAscending'}, {type: 'button', id: 'sortdescending', img: 'sortdescending', hint: _('Sort Descending'), uno: 'SortDescending'}, {type: 'break', id: 'break-align'}, - {type: 'button', id: 'bullet', img: 'bullet', hint: _('Bullets on/off'), uno: 'DefaultBullet'}, - {type: 'button', id: 'numbering', img: 'numbering', hint: _('Numbering on/off'), uno: 'DefaultNumbering'}, + {type: 'button', id: 'defaultbullet', img: 'bullet', hint: _('Bullets on/off'), uno: 'DefaultBullet'}, + {type: 'button', id: 'defaultnumbering', img: 'numbering', hint: _('Numbering on/off'), uno: 'DefaultNumbering'}, {type: 'break', id: 'break-numbering'}, {type: 'button', id: 'incrementindent', img: 'incrementindent', hint: _('Increase indent'), uno: 'IncrementIndent'}, {type: 'button', id: 'decrementindent', img: 'decrementindent', hint: _('Decrease indent'), uno: 'DecrementIndent'}, @@ -434,6 +439,15 @@ $(function () { } } + // Intialize the formatButtons object + if (Object.keys(formatButtons).length === 0) { + for (var itemIdx in w2ui['toolbar-up'].items) { + if (w2ui['toolbar-up'].items[itemIdx].uno) { + formatButtons[w2ui['toolbar-up'].items[itemIdx].id] = true; + } + } + } + insertTable(); } }); @@ -520,21 +534,6 @@ $(function () { }); }); -// This object is used to track enabled/disabled state when one is in view mode -var formatButtons = { - 'undo': true, 'redo': true, 'save': true, - 'bold': true, 'italic': true, 'underline': true, 'strikeout': true, - 'insertannotation': true, 'inserttable': true, - 'fontcolor': true, 'backcolor': true, 'bullet': true, 'numbering': true, - 'alignleft': true, 'alignhorizontal': true, 'alignright': true, 'alignblock': true, - 'incrementindent': true, 'decrementindent': true, 'insertgraphic': true, - 'insertfootnote': true, 'repair': true, 'specialcharacter': true, - 'wraptext': true, 'togglemergecells': true, 'numberformatcurrency': true, - 'numberformatpercent': true, 'numberformatdecimal': true, 'numberformatdate': true, - 'numberformatincdecimals': true, 'numberformatdecdecimals': true, - 'sortascending': true, 'sortdescending': true -}; - var userJoinedPopupMessage = '' + _('%user has joined') + ''; var userLeftPopupMessage = '' + _('%user has left') + ''; var userPopupTimeout = null; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/src
loleaflet/src/map/Map.js |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit e2383db17942ba7324dc4e1a397362bddbf25be4 Author: Pranav KantDate: Fri Dec 16 23:08:44 2016 +0530 tdf#106655 loleaflet: Fix cursor dissappearing during document load Change-Id: I9e301d7d2b6e7d2626de91c242b7617fbc823572 Reviewed-on: https://gerrit.libreoffice.org/35465 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js index bc1b2790..cadd3d52 100644 --- a/loleaflet/src/map/Map.js +++ b/loleaflet/src/map/Map.js @@ -823,6 +823,7 @@ L.Map = L.Evented.extend({ _onLostFocus: function () { if (!this._loaded) { return; } + console.debug('_onLostFocus: '); var doclayer = this._docLayer; if (!doclayer) { return; } @@ -843,7 +844,9 @@ L.Map = L.Evented.extend({ if (!this._loaded) { return; } var doclayer = this._docLayer; - if (doclayer) { + if (doclayer && + typeof doclayer._isCursorOverlayVisibleOnLostFocus !== 'undefined' && + typeof doclayer._isCursorVisibleOnLostFocus !== 'undefined') { // we restore the old cursor position by a small delay, so that if the user clicks // inside the document we skip to restore it, so that the user does not see the cursor // jumping from the old position to the new one ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/src
loleaflet/src/control/Control.CharacterMap.js |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 62b02cac63c00d06563ae3f323914fa3d2371514 Author: Andras TimarDate: Mon Dec 12 16:20:25 2016 +0100 loleaflet: typos Change-Id: I53c3ed3ce21c29fb13917bf92a8512a2aec5a90c Reviewed-on: https://gerrit.libreoffice.org/35461 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/src/control/Control.CharacterMap.js b/loleaflet/src/control/Control.CharacterMap.js index c6885a39..60703b52 100644 --- a/loleaflet/src/control/Control.CharacterMap.js +++ b/loleaflet/src/control/Control.CharacterMap.js @@ -73,7 +73,7 @@ L.Control.CharacterMap = L.Control.extend({ { name: _('Hiragana'), start: 0x3040, end: 0x309F }, /*UBLOCK_HIRAGANA=62*/ { name: _('Katakana'), start: 0x30A0, end: 0x30FF }, /*UBLOCK_KATAKANA=63*/ { name: _('Bopomofo'), start: 0x3100, end: 0x312F }, /*UBLOCK_BOPOMOFO=64*/ - { name: _('Hangul Compatability Jamo'), start: 0x3130, end: 0x318F }, /*UBLOCK_HANGUL_COMPATIBILITY_JAMO=65*/ + { name: _('Hangul Compatibility Jamo'), start: 0x3130, end: 0x318F }, /*UBLOCK_HANGUL_COMPATIBILITY_JAMO=65*/ { name: _('Kanbun'),start: 0x3190, end: 0x319F }, /*UBLOCK_KANBUN=66*/ { name: _('Bopomofo Extended'), start: 0x31A0, end: 0x31BF }, /*UBLOCK_BOPOMOFO_EXTENDED=67*/ { name: _('Enclosed CJK Letters and Months'), start: 0x3200, end: 0x32FF }, /*UBLOCK_ENCLOSED_CJK_LETTERS_AND_MONTHS=68*/ @@ -147,7 +147,7 @@ L.Control.CharacterMap = L.Control.extend({ { name: _('Glagolitic'),start: 0x2C00, end: 0x2C5F }, /*UBLOCK_GLAGOLITIC=136*/ { name: _('Kharoshthi'),start: 0x10A00, end: 0x10A5F }, /*UBLOCK_KHAROSHTHI=137*/ { name: _('Modifier Tone Letters'), start: 0xA700, end: 0xA71F }, /*UBLOCK_MODIFIER_TONE_LETTERS=138*/ - { name: _('"New Tai Lue'), start: 0x1980, end: 0x19DF }, /*UBLOCK_NEW_TAI_LUE=139*/ + { name: _('New Tai Lue'), start: 0x1980, end: 0x19DF }, /*UBLOCK_NEW_TAI_LUE=139*/ { name: _('Old Persian'), start: 0x103A0, end: 0x103DF }, /*UBLOCK_OLD_PERSIAN=140*/ { name: _('Phonetic Extensions Supplement'),start: 0x1D80, end: 0x1DBF }, /*UBLOCK_PHONETIC_EXTENSIONS_SUPPLEMENT=141*/ { name: _('Supplemental Punctuation'), start: 0x2E00, end: 0x2E7F }, /*UBLOCK_SUPPLEMENTAL_PUNCTUATION=142*/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106600] Showing incorrect tiles when slides are inserted/ removed from a doc.
https://bugs.documentfoundation.org/show_bug.cgi?id=106600 --- Comment #1 from Commit Notification--- Ashod Nakashian committed a patch related to this issue. It has been pushed to "libreoffice-5-3": http://cgit.freedesktop.org/libreoffice/online/commit/?id=d559fce02bba5f2b96bb95778e99de1b396c8bce=libreoffice-5-3 tdf#106600 loolwsd: invalidate all parts when document size changes -- 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 106600] Showing incorrect tiles when slides are inserted/ removed from a doc.
https://bugs.documentfoundation.org/show_bug.cgi?id=106600 Commit Notificationchanged: What|Removed |Added Whiteboard||target:5.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 106601] Improve Readonly mode
https://bugs.documentfoundation.org/show_bug.cgi?id=106601 --- Comment #4 from Commit Notification--- Pranav Kant committed a patch related to this issue. It has been pushed to "libreoffice-5-3": http://cgit.freedesktop.org/libreoffice/online/commit/?id=eedf7a8e004ce4bb08328fc782891e88bf49b185=libreoffice-5-3 tdf#106601 loleaflet: Disable calc toolbar items in readonly/view mode -- 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 106654] Shortcut for 'Insert footnote" also displays search bar
https://bugs.documentfoundation.org/show_bug.cgi?id=106654 --- Comment #1 from Commit Notification--- László Németh committed a patch related to this issue. It has been pushed to "libreoffice-5-3": http://cgit.freedesktop.org/libreoffice/online/commit/?id=9a1544041a000c5c8169db77581638b52cba2784=libreoffice-5-3 tdf#106654 loleaflet: fix footnote insertion -- 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 'libreoffice-5-3' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9a1544041a000c5c8169db77581638b52cba2784 Author: László NémethDate: Thu Dec 8 23:21:22 2016 +0100 tdf#106654 loleaflet: fix footnote insertion Ctrl-Alt-F (insert footnote) activated the Search bar (Ctrl-F), too. Change-Id: I681156f703bc044417c9b47aad8b3ebce5f259f6 Reviewed-on: https://gerrit.libreoffice.org/35457 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 7df233c0..7d5ab254 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -1320,7 +1320,7 @@ map.on('updatepermission', function (e) { }); map.on('keydown', function (e) { - if (e.originalEvent.ctrlKey && + if (e.originalEvent.ctrlKey && !e.originalEvent.altKey && (e.originalEvent.key === 'f' || e.originalEvent.key === 'F')) { L.DomUtil.get('search-input').focus(); e.originalEvent.preventDefault(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js | 20 +--- 1 file changed, 5 insertions(+), 15 deletions(-) New commits: commit eedf7a8e004ce4bb08328fc782891e88bf49b185 Author: Pranav KantDate: Mon Dec 5 22:04:06 2016 +0530 tdf#106601 loleaflet: Disable calc toolbar items in readonly/view mode Change-Id: I2989de5f201eb7f52f5f47d98f9172c640e38fad Reviewed-on: https://gerrit.libreoffice.org/35361 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 159bcf58..7df233c0 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -528,7 +528,11 @@ var formatButtons = { 'fontcolor': true, 'backcolor': true, 'bullet': true, 'numbering': true, 'alignleft': true, 'alignhorizontal': true, 'alignright': true, 'alignblock': true, 'incrementindent': true, 'decrementindent': true, 'insertgraphic': true, - 'insertfootnote': true, 'repair': true, 'specialcharacter': true + 'insertfootnote': true, 'repair': true, 'specialcharacter': true, + 'wraptext': true, 'togglemergecells': true, 'numberformatcurrency': true, + 'numberformatpercent': true, 'numberformatdecimal': true, 'numberformatdate': true, + 'numberformatincdecimals': true, 'numberformatdecdecimals': true, + 'sortascending': true, 'sortdescending': true }; var userJoinedPopupMessage = '' + _('%user has joined') + ''; @@ -1011,20 +1015,6 @@ map.on('commandstatechanged', function (e) { state = toLocalePattern('Slide %1 of %2', 'Slide (\\d+) of (\\d+)', state, '%1', '%2'); $('#PageStatus').html(state ? state : ''); } - else if (commandName === '.uno:WrapText' || -commandName === '.uno:ToggleMergeCells' || -commandName === '.uno:NumberFormatCurrency' || -commandName === '.uno:NumberFormatDecimal' || -commandName === '.uno:NumberFormatPercent' || -commandName === '.uno:NumberFormatDate') { - toggleButton(toolbar, state, commandName); - toggleButton(toolbarUpMore, state, commandName); - } - else if (commandName === '.uno:SortAscending' || -commandName === '.uno:SortDescending') { - disableButton(toolbar, state, commandName); - disableButton(toolbarUpMore, state, commandName); - } var id = commandName.toLowerCase().substr(5); if (typeof formatButtons[id] !== 'undefined') { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/src
loleaflet/src/layer/Popup.js | 10 +++--- loleaflet/src/layer/tile/TileLayer.js | 12 ++-- 2 files changed, 13 insertions(+), 9 deletions(-) New commits: commit 058836c16cbadeb818e8178dc3f735b4d4ff90d3 Author: László NémethDate: Thu Dec 8 00:34:17 2016 +0100 loleaflet: better user tooltip layout in Calc and Impress Now it is similar to Writer user tooltip coloring. Change-Id: I68ae24145a199957c506491d38ff50472abcf1bb Reviewed-on: https://gerrit.libreoffice.org/35366 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/src/layer/Popup.js b/loleaflet/src/layer/Popup.js index 9e8f0cf7..5acc2962 100644 --- a/loleaflet/src/layer/Popup.js +++ b/loleaflet/src/layer/Popup.js @@ -168,10 +168,14 @@ L.Popup = L.Layer.extend({ this._tipContainer = L.DomUtil.create('div', prefix + '-tip-container', container); this._tip = L.DomUtil.create('div', prefix + '-tip', this._tipContainer); - if (this.options.borderColor) { - this._tip.style['border'] = this._wrapper.style['border'] = '2px solid ' + this.options.borderColor; - this._closeButton.style['color'] = this.options.borderColor; + if (this.options.backgroundColor) { + this._tip.style['background-color'] = this._wrapper.style['background-color'] = this.options.backgroundColor; } + + if (this.options.color) { + this._wrapper.style['color'] = this.options.color; + } + }, _updateContent: function () { diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js index c4618fb5..13d00342 100644 --- a/loleaflet/src/layer/tile/TileLayer.js +++ b/loleaflet/src/layer/tile/TileLayer.js @@ -718,10 +718,10 @@ L.TileLayer = L.GridLayer.extend({ if (!this._isEmptyRectangle(this._cellViewCursors[viewId].bounds) && this._selectedPart === viewPart) { if (!cellViewCursorMarker) { - var borderColor = L.LOUtil.rgbToHex(this._map.getViewColor(viewId)); - cellViewCursorMarker = L.rectangle(this._cellViewCursors[viewId].bounds, {fill: false, color: borderColor, weight: 2}); + var backgroundColor = L.LOUtil.rgbToHex(this._map.getViewColor(viewId)); + cellViewCursorMarker = L.rectangle(this._cellViewCursors[viewId].bounds, {fill: false, color: backgroundColor, weight: 2}); this._cellViewCursors[viewId].marker = cellViewCursorMarker; - cellViewCursorMarker.bindPopup(this._map.getViewName(viewId), {autoClose: false, autoPan: false, borderColor: borderColor}); + cellViewCursorMarker.bindPopup(this._map.getViewName(viewId), {autoClose: false, autoPan: false, backgroundColor: backgroundColor, color: 'white', closeButton: false}); } else { cellViewCursorMarker.setBounds(this._cellViewCursors[viewId].bounds); @@ -765,8 +765,8 @@ L.TileLayer = L.GridLayer.extend({ } } - var borderColor = L.LOUtil.rgbToHex(this._map.getViewColor(viewId)); - this._cellViewCursors[viewId].marker.bindPopup(this._map.getViewName(viewId), {autoClose: false, autoPan: false, borderColor: borderColor}); + var backgroundColor = L.LOUtil.rgbToHex(this._map.getViewColor(viewId)); + this._cellViewCursors[viewId].marker.bindPopup(this._map.getViewName(viewId), {autoClose: false, autoPan: false, backgroundColor: backgroundColor, color: 'white', closeButton: false}); } }, @@ -1430,7 +1430,7 @@ L.TileLayer = L.GridLayer.extend({ color: color }); // Disable autoPan, so the graphic view selection doesn't make the view jump to the popup. - viewMarker.bindPopup(this._map.getViewName(viewId), {autoClose: false, autoPan: false, borderColor: color}); + viewMarker.bindPopup(this._map.getViewName(viewId), {autoClose: false, autoPan: false, backgroundColor: color, color: 'white', closeButton: false}); this._graphicViewMarkers[viewId].marker = viewMarker; } else { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106595] Don't scroll to the cursor position when changing windows
https://bugs.documentfoundation.org/show_bug.cgi?id=106595 Commit Notificationchanged: What|Removed |Added Whiteboard||target:5.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 106598] Rows/Columns don't have correct highlight always
https://bugs.documentfoundation.org/show_bug.cgi?id=106598 Commit Notificationchanged: What|Removed |Added Whiteboard||target:5.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 106598] Rows/Columns don't have correct highlight always
https://bugs.documentfoundation.org/show_bug.cgi?id=106598 --- Comment #1 from Commit Notification--- Marco Cecchetti committed a patch related to this issue. It has been pushed to "libreoffice-5-3": http://cgit.freedesktop.org/libreoffice/online/commit/?id=a7a2578d4535e8d39dd0beac8a466f9d7f81f864=libreoffice-5-3 tdf#106598 loleaflet - calc: row/col header unproperly highlighted -- 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 'libreoffice-5-3' - kit/ChildSession.cpp
kit/ChildSession.cpp | 22 -- 1 file changed, 20 insertions(+), 2 deletions(-) New commits: commit d559fce02bba5f2b96bb95778e99de1b396c8bce Author: Ashod NakashianDate: Sun Dec 4 23:45:26 2016 -0500 tdf#106600 loolwsd: invalidate all parts when document size changes This is a stop-gap until Core sends these invalidations with more precision. Otherwise, we may be wasting valuable cache data here. This fixes showing incorrect tiles when slides are inserted/removed from a doc. Change-Id: I7a02c6fb96ff27223afe71d891db639ab5b2cfae Reviewed-on: https://gerrit.libreoffice.org/35358 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp index 56a63b3e..c34bead8 100644 --- a/kit/ChildSession.cpp +++ b/kit/ChildSession.cpp @@ -1084,8 +1084,26 @@ void ChildSession::loKitCallback(const int nType, const std::string& rPayload) sendTextFrame("searchresultselection: " + rPayload); break; case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED: -getStatus("", 0); -getPartPageRectangles("", 0); +{ +//TODO: clenaup and merge. + +std::unique_lock lock(_docManager.getDocumentMutex()); +const int parts = getLOKitDocument()->getParts(); +for (int i = 0; i < parts; ++i) +{ +sendTextFrame("invalidatetiles:" + " part=" + std::to_string(i) + + " x=0" + + " y=0" + + " width=" + std::to_string(INT_MAX) + + " height=" + std::to_string(INT_MAX)); +} + +lock.unlock(); + +getStatus("", 0); +getPartPageRectangles("", 0); +} break; case LOK_CALLBACK_SET_PART: sendTextFrame("setpart: " + rPayload); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106595] Don't scroll to the cursor position when changing windows
https://bugs.documentfoundation.org/show_bug.cgi?id=106595 --- Comment #1 from Commit Notification--- Tomaž Vajngerl committed a patch related to this issue. It has been pushed to "libreoffice-5-3": http://cgit.freedesktop.org/libreoffice/online/commit/?id=dd3b68e0f6c66d3091ec13546274fbb72f9c5bce=libreoffice-5-3 tdf#106595 don't scroll to the cursor position after focus lose/get -- 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 'libreoffice-5-3' - common/IoUtil.cpp
common/IoUtil.cpp |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 412c505430e9f61cfba11d4e4129198fccd13801 Author: Tor LillqvistDate: Fri Dec 2 16:51:11 2016 +0200 Handle return value -1 from our LOOLWebSocket::receiveFrame() It doesn't mean anything is wrong or that the connection would be in some invalid or closed state, but just that we didn't actually receive any "interesting" frame that could be handled in the caller. Change-Id: Iba98f054390ad8e04cdf72a342cf3d8ac08f78b7 Reviewed-on: https://gerrit.libreoffice.org/35352 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/common/IoUtil.cpp b/common/IoUtil.cpp index 1250066f..04eca76a 100644 --- a/common/IoUtil.cpp +++ b/common/IoUtil.cpp @@ -90,7 +90,12 @@ void SocketProcessor(const std::shared_ptr& ws, continue; } -if (n <= 0 || ((flags & WebSocket::FRAME_OP_BITMASK) == WebSocket::FRAME_OP_CLOSE)) +if (n == -1) +{ +LOG_DBG("SocketProcessor [" << name << "]: was not an interesting frame, nothing to do here"); +continue; +} +else if (n == 0 || ((flags & WebSocket::FRAME_OP_BITMASK) == WebSocket::FRAME_OP_CLOSE)) { LOG_WRN("SocketProcessor [" << name << "]: Connection closed."); closeFrame(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - 2 commits - loleaflet/src
loleaflet/src/control/Control.Header.js | 23 +++-- loleaflet/src/layer/tile/TileLayer.js | 35 +--- loleaflet/src/map/Map.js| 22 ++-- 3 files changed, 57 insertions(+), 23 deletions(-) New commits: commit dd3b68e0f6c66d3091ec13546274fbb72f9c5bce Author: Tomaž VajngerlDate: Mon Dec 5 21:58:07 2016 +0100 tdf#106595 don't scroll to the cursor position after focus lose/get Change-Id: Id017c5ea8c162a71a8b4d8ec47a6d9deb7357fca Reviewed-on: https://gerrit.libreoffice.org/35354 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js index d196f046..c4618fb5 100644 --- a/loleaflet/src/layer/tile/TileLayer.js +++ b/loleaflet/src/layer/tile/TileLayer.js @@ -1289,11 +1289,31 @@ L.TileLayer = L.GridLayer.extend({ } } - if (this._map._permission === 'edit' && this._isCursorVisible && this._isCursorOverlayVisible - && !this._isEmptyRectangle(this._visibleCursor)) { + this._updateCursorAndOverlay(); + + this.eachView(this._viewCursors, function (item) { + var viewCursorMarker = item.marker; + if (viewCursorMarker) { + viewCursorMarker.setOpacity(this._map.hasLayer(this._cursorMarker) && this._cursorMarker.getLatLng().equals(viewCursorMarker.getLatLng()) ? 0 : 1); + } + }, this, true); + }, + + // enable or disable blinking cursor and the cursor overlay depending on + // the state of the document (if the falgs are set) + _updateCursorAndOverlay: function (update) { + if (this._map._permission === 'edit' + && this._isCursorVisible + && this._isCursorOverlayVisible + && !this._isEmptyRectangle(this._visibleCursor)) { + + var pixBounds = L.bounds(this._map.latLngToLayerPoint(this._visibleCursor.getSouthWest()), + this._map.latLngToLayerPoint(this._visibleCursor.getNorthEast())); + + var cursorPos = this._visibleCursor.getNorthWest(); + if (!this._cursorMarker) { - this._cursorMarker = L.cursor(cursorPos, pixBounds.getSize().multiplyBy(this._map.getZoomScale(this._map.getZoom())), - {blink: true}); + this._cursorMarker = L.cursor(cursorPos, pixBounds.getSize().multiplyBy(this._map.getZoomScale(this._map.getZoom())), {blink: true}); } else { this._cursorMarker.setLatLng(cursorPos, pixBounds.getSize().multiplyBy(this._map.getZoomScale(this._map.getZoom(; @@ -1304,13 +1324,6 @@ L.TileLayer = L.GridLayer.extend({ this._map.removeLayer(this._cursorMarker); this._isCursorOverlayVisible = false; } - - this.eachView(this._viewCursors, function (item) { - var viewCursorMarker = item.marker; - if (viewCursorMarker) { - viewCursorMarker.setOpacity(this._map.hasLayer(this._cursorMarker) && this._cursorMarker.getLatLng().equals(viewCursorMarker.getLatLng()) ? 0 : 1); - } - }, this, true); }, // Update colored non-blinking view cursor diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js index 7e103244..bc1b2790 100644 --- a/loleaflet/src/map/Map.js +++ b/loleaflet/src/map/Map.js @@ -824,14 +824,16 @@ L.Map = L.Evented.extend({ if (!this._loaded) { return; } var doclayer = this._docLayer; - if (!doclayer) { - return; - } - doclayer._isCursorVisibleOnLostFocus = doclayer._isCursorOverlayVisible; + if (!doclayer) { return; } + + // save state of cursor (blinking marker) and the cursor overlay + doclayer._isCursorVisibleOnLostFocus = doclayer._isCursorVisible; doclayer._isCursorOverlayVisibleOnLostFocus = doclayer._isCursorOverlayVisible; + + // if the blinking cursor is visible, disable the overlay when we go out of focus if (doclayer._isCursorVisible && doclayer._isCursorOverlayVisible) { doclayer._isCursorOverlayVisible = false; - doclayer._onUpdateCursor(); + doclayer._updateCursorAndOverlay(); } this._deactivate(); @@
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d5807b5536f94e8f367cf5671f90bc91cfd6a9c4 Author: Pranav KantDate: Mon Dec 5 15:07:27 2016 +0530 loleaflet: Disable zoom controls in spreadsheets, don't remove Due to a bug in w2ui library, w2overlay doesn't popup when it is near the edge of the screen (reproduceable only when no. of users are greater than 3). Lets disable zoom controls in case of spreadsheets so that userlist is not near the edge of the screen, and hence pops up. Change-Id: I6f2647d124484235afe6c92da18be38ed8e2b9ce Reviewed-on: https://gerrit.libreoffice.org/35351 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 19b33ff6..159bcf58 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -791,7 +791,7 @@ map.on('doclayerinit', function () { case 'spreadsheet': toolbarUp.remove('inserttable', 'styles', 'alignblock', 'bullet', 'numbering', 'break-numbering'); toolbarUpMore.remove('inserttable', 'styles', 'alignblock', 'bullet', 'numbering', 'break-numbering'); - statusbar.remove('zoomreset', 'zoomout', 'zoomin', 'zoomlevel'); + statusbar.disable('zoomreset', 'zoomout', 'zoomin', 'zoomlevel'); statusbar.insert('left', [ {type: 'break', id:'break1'}, {type: 'html', id: 'StatusDocPos', ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106592] Remove invalid fonts from font dropdown
https://bugs.documentfoundation.org/show_bug.cgi?id=106592 --- Comment #1 from Commit Notification--- Henry Castro committed a patch related to this issue. It has been pushed to "libreoffice-5-3": http://cgit.freedesktop.org/libreoffice/online/commit/?id=a949769c2e4cc3062ffd254e9548bdcbcc0444e6=libreoffice-5-3 tdf#106592 loleaflet: remove invalid 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-bugs] [Bug 106594] Cursor in wrong cell when switching window focus
https://bugs.documentfoundation.org/show_bug.cgi?id=106594 --- Comment #1 from Commit Notification--- Marco Cecchetti committed a patch related to this issue. It has been pushed to "libreoffice-5-3": http://cgit.freedesktop.org/libreoffice/online/commit/?id=4b5c4a8f292cc2e6aee7bffd8848575daf2b3497=libreoffice-5-3 tdf#106594 loleaflet - calc: bad handling of text cursor on lost/got focus -- 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 106594] Cursor in wrong cell when switching window focus
https://bugs.documentfoundation.org/show_bug.cgi?id=106594 Commit Notificationchanged: What|Removed |Added Whiteboard||target:5.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 106593] LO Online not working in Chrome 39
https://bugs.documentfoundation.org/show_bug.cgi?id=106593 --- Comment #1 from Commit Notification--- László Németh committed a patch related to this issue. It has been pushed to "libreoffice-5-3": http://cgit.freedesktop.org/libreoffice/online/commit/?id=5bc5fedb20909bcdfed1fe44904fc392404b3bdb=libreoffice-5-3 tdf#106593 loleaflet: patch l10n-for-node for older Chrome versions -- 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 'libreoffice-5-3' - loleaflet/dist
loleaflet/dist/toolbar/toolbar.js | 87 -- 1 file changed, 38 insertions(+), 49 deletions(-) New commits: commit 215944457da123b55a386032b27e017783017147 Author: Andras TimarDate: Sun Dec 4 22:40:44 2016 +0100 fix mangled calc toolbar Change-Id: I59826d82d1096ad5b9383611421cd4fd81416a85 Reviewed-on: https://gerrit.libreoffice.org/35350 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index 7d76b8d7..19b33ff6 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -367,6 +367,18 @@ $(function () { {type: 'button', id: 'alignhorizontal', img: 'alignhorizontal', hint: _('Center horizontally'), uno: 'CenterPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"2"}}'}, {type: 'button', id: 'alignright', img: 'alignright', hint: _('Align right'), uno: 'RightPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"3"}}'}, {type: 'button', id: 'alignblock', img: 'alignblock', hint: _('Justified'), uno: 'JustifyPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"4"}}'}, + {type: 'button', id: 'wraptext', img: 'wraptext', hint: _('Wrap Text'), uno: 'WrapText'}, + {type: 'button', id: 'togglemergecells', img: 'togglemergecells', hint: _('Merge and Center Cells'), uno: 'ToggleMergeCells'}, + {type: 'break', id: 'break-toggle'}, + {type: 'button', id: 'numberformatcurrency', img: 'numberformatcurrency', hint: _('Format as Currency'), uno: 'NumberFormatCurrency'}, + {type: 'button', id: 'numberformatpercent', img: 'numberformatpercent', hint: _('Format as Percent'), uno: 'NumberFormatPercent'}, + {type: 'button', id: 'numberformatdecimal', img: 'numberformatdecimal', hint: _('Format as Number'), uno: 'NumberFormatDecimal'}, + {type: 'button', id: 'numberformatdate', img: 'numberformatdate', hint: _('Format as Date'), uno: 'NumberFormatDate'}, + {type: 'button', id: 'numberformatincdecimals', img: 'numberformatincdecimals', hint: _('Add Decimal Place'), uno: 'NumberFormatIncDecimals'}, + {type: 'button', id: 'numberformatdecdecimals', img: 'numberformatdecdecimals', hint: _('Delete Decimal Place'), uno: 'NumberFormatDecDecimals'}, + {type: 'break', id: 'break-number'}, + {type: 'button', id: 'sortascending', img: 'sortascending', hint: _('Sort Ascending'), uno: 'SortAscending'}, + {type: 'button', id: 'sortdescending', img: 'sortdescending', hint: _('Sort Descending'), uno: 'SortDescending'}, {type: 'break', id: 'break-align'}, {type: 'button', id: 'bullet', img: 'bullet', hint: _('Bullets on/off'), uno: 'DefaultBullet'}, {type: 'button', id: 'numbering', img: 'numbering', hint: _('Numbering on/off'), uno: 'DefaultNumbering'}, @@ -526,7 +538,7 @@ var userPopupTimeout = null; function toggleButton(toolbar, state, command) { var checked; - command = command.replace('.uno:', ''); + command = command.replace('.uno:', '').toLowerCase(); var item = toolbar.get(command); if (!item) { return; @@ -550,7 +562,7 @@ function toggleButton(toolbar, state, command) function disableButton(toolbar, state, command) { var disabled; - command = command.replace('.uno:', ''); + command = command.replace('.uno:', '').toLowerCase(); var item = toolbar.get(command); if (!item) { return; @@ -770,37 +782,16 @@ map.on('wopiprops', function(e) { }); map.on('doclayerinit', function () { - var toolbar = w2ui['toolbar-up']; + var toolbarUp = w2ui['toolbar-up']; + var toolbarUpMore = w2ui['toolbar-up-more']; + var statusbar = w2ui['toolbar-down']; var docType = map.getDocType(); - if (docType !== 'text') { - if (docType === 'presentation') { - toolbar.hide('annotation'); - - var presentationToolbar = w2ui['presentation-toolbar']; - presentationToolbar.show('presentation'); - presentationToolbar.show('presentationbreak'); - presentationToolbar.show('insertpage'); - presentationToolbar.show('duplicatepage'); - presentationToolbar.show('deletepage'); - } - else if
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/src
loleaflet/src/map/Map.js |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit 4b5c4a8f292cc2e6aee7bffd8848575daf2b3497 Author: Marco CecchettiDate: Wed Nov 30 16:40:01 2016 +0100 tdf#106594 loleaflet - calc: bad handling of text cursor on lost/got focus This patch fixes the following bug: Create blank sheet: enter "." ie. just a period into A1 enter a "." into A2 now switch virtual desktop away and back again. hit enter in A2 now switch virtual desktop away and back again. You should have a blinking edit cursor in A2 - but the focus in A3. Change-Id: Icda0123f35ecda04559fec859b6bbe6ff3ac33e8 Reviewed-on: https://gerrit.libreoffice.org/35349 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js index 7ef14af7..7e103244 100644 --- a/loleaflet/src/map/Map.js +++ b/loleaflet/src/map/Map.js @@ -824,9 +824,12 @@ L.Map = L.Evented.extend({ if (!this._loaded) { return; } var doclayer = this._docLayer; - if (doclayer && doclayer._isCursorVisible && doclayer._isCursorOverlayVisible) { - doclayer._visibleCursorOnLostFocus = doclayer._visibleCursor; - doclayer._isCursorOverlayVisibleOnLostFocus = doclayer._isCursorVisibleOnLostFocus = true; + if (!doclayer) { + return; + } + doclayer._isCursorVisibleOnLostFocus = doclayer._isCursorOverlayVisible; + doclayer._isCursorOverlayVisibleOnLostFocus = doclayer._isCursorOverlayVisible; + if (doclayer._isCursorVisible && doclayer._isCursorOverlayVisible) { doclayer._isCursorOverlayVisible = false; doclayer._onUpdateCursor(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106597] Horizontal scrollbar not updated on doc width change
https://bugs.documentfoundation.org/show_bug.cgi?id=106597 Commit Notificationchanged: What|Removed |Added Whiteboard||target:5.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 106597] Horizontal scrollbar not updated on doc width change
https://bugs.documentfoundation.org/show_bug.cgi?id=106597 --- Comment #1 from Commit Notification--- Marco Cecchetti committed a patch related to this issue. It has been pushed to "libreoffice-5-3": http://cgit.freedesktop.org/libreoffice/online/commit/?id=458045bb43a31b02443459e053c18ed95d134d7a=libreoffice-5-3 tdf#106597 loleaflet - calc: horizontal scrollbar not updated on doc width change -- 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 106593] LO Online not working in Chrome 39
https://bugs.documentfoundation.org/show_bug.cgi?id=106593 Commit Notificationchanged: What|Removed |Added Whiteboard||target:5.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-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/src
loleaflet/src/core/Util.js |9 + loleaflet/src/map/Map.js |8 +++- 2 files changed, 16 insertions(+), 1 deletion(-) New commits: commit bbff6b0045e05507e73d8d3566fa0ff95e04a0cb Author: Marco CecchettiDate: Wed Nov 30 23:04:48 2016 +0100 loleaflet - calc: fixed one pixel horizontal auto-scrolling issue This patch fixes two problems for spreadsheets: - one pixel alignment offset btw grid and column header - a one pixel horizontal auto-scrolling issue Change-Id: Ifd6a3b47863d345656d0dcf3fba2d253c43ba9b1 Reviewed-on: https://gerrit.libreoffice.org/35348 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/src/core/Util.js b/loleaflet/src/core/Util.js index 3637688a..5cb3ade1 100644 --- a/loleaflet/src/core/Util.js +++ b/loleaflet/src/core/Util.js @@ -126,6 +126,14 @@ L.Util = { return ((!existingUrl || existingUrl.indexOf('?') === -1) ? '?' : '&') + params.join('&'); }, + round: function(x, e) { + if (!e) { + return Math.round(x); + } + var f = 1.0/e; + return Math.round(x * f) * e; + }, + // super-simple templating facility, used for TileLayer URLs template: function (str, data) { return str.replace(L.Util.templateRe, function (str, key) { @@ -194,3 +202,4 @@ L.extend = L.Util.extend; L.bind = L.Util.bind; L.stamp = L.Util.stamp; L.setOptions = L.Util.setOptions; +L.round = L.Util.round; diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js index 28455165..7ef14af7 100644 --- a/loleaflet/src/map/Map.js +++ b/loleaflet/src/map/Map.js @@ -507,7 +507,8 @@ L.Map = L.Evented.extend({ project: function (latlng, zoom) { // (LatLng[, Number]) -> Point zoom = zoom === undefined ? this._zoom : zoom; - return this.options.crs.latLngToPoint(L.latLng(latlng), zoom); + var projectedPoint = this.options.crs.latLngToPoint(L.latLng(latlng), zoom); + return new L.Point(L.round(projectedPoint.x, 1e-6), L.round(projectedPoint.y, 1e-6)); }, unproject: function (point, zoom) { // (Point[, Number]) -> LatLng @@ -1054,6 +1055,11 @@ L.Map = L.Evented.extend({ return left + right > 0 ? Math.round(left - right) / 2 : Math.max(0, Math.ceil(left)) - Math.max(0, Math.floor(right)); + // TODO: do we really need ceil and floor ? + // for spreadsheets it can cause one pixel alignment offset btw grid and row/column header + // and a one pixel horizontal auto-scrolling issue; + // both issues have been fixed by rounding the projection: see Map.project above; + // anyway in case of similar problems, this code needs to be checked }, _limitZoom: function (zoom) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106592] Remove invalid fonts from font dropdown
https://bugs.documentfoundation.org/show_bug.cgi?id=106592 Commit Notificationchanged: What|Removed |Added Whiteboard||target:5.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-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/src
loleaflet/src/control/Control.Scroll.js | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) New commits: commit 458045bb43a31b02443459e053c18ed95d134d7a Author: Marco CecchettiDate: Thu Dec 1 21:00:37 2016 +0100 tdf#106597 loleaflet - calc: horizontal scrollbar not updated on doc width change Change-Id: I268ab65d0bf7a6794028e23e51012c11534d6f2f Reviewed-on: https://gerrit.libreoffice.org/35347 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/src/control/Control.Scroll.js b/loleaflet/src/control/Control.Scroll.js index 31314408..40089a99 100644 --- a/loleaflet/src/control/Control.Scroll.js +++ b/loleaflet/src/control/Control.Scroll.js @@ -118,14 +118,25 @@ L.Control.Scroll = L.Control.extend({ }, _onUpdateSize: function (e) { + // we need to avoid precision issues in comparison (in the end values are pixels) + var prevDocWidth = Math.ceil(parseFloat(L.DomUtil.getStyle(this._mockDoc, 'width'))); + var prevDocHeight = Math.ceil(parseFloat(L.DomUtil.getStyle(this._mockDoc, 'height'))); + var newDocWidth = Math.ceil(e.x); + var newDocHeight = Math.ceil(e.y); // for writer documents, ignore scroll while document size is being reduced - var prevDocY = parseFloat(L.DomUtil.getStyle(this._mockDoc, 'height')); - if (this._map.getDocType() === 'text' && e.y < prevDocY) { + if (this._map.getDocType() === 'text' && newDocHeight < prevDocHeight) { this._ignoreScroll = true; } L.DomUtil.setStyle(this._mockDoc, 'width', e.x + 'px'); L.DomUtil.setStyle(this._mockDoc, 'height', e.y + 'px'); + + // custom scrollbar plugin checks automatically for content height changes but not for content width changes + // so we need to update scrollbars explicitly; moreover we want to avoid to have 'update' invoked twice + // in case prevDocHeight !== newDocHeight + if (prevDocWidth !== newDocWidth && prevDocHeight === newDocHeight) { + $('.scroll-container').mCustomScrollbar('update'); + } }, _onUpdateScrollOffset: function (e) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106274] Encoding problems
https://bugs.documentfoundation.org/show_bug.cgi?id=106274 --- Comment #1 from Commit Notification--- Henry Castro committed a patch related to this issue. It has been pushed to "libreoffice-5-3": http://cgit.freedesktop.org/libreoffice/online/commit/?id=994fbbfc9669973015b1e0409df982b86a54cd8c=libreoffice-5-3 tdf#106274 wsd: fix sending wrong UTF-8 string to the client -- 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 'libreoffice-5-3' - loleaflet/node_shrinkwrap
loleaflet/node_shrinkwrap/l10n-for-node-0.0.1.tgz |binary 1 file changed New commits: commit 5bc5fedb20909bcdfed1fe44904fc392404b3bdb Author: László NémethDate: Fri Dec 2 09:17:36 2016 +0100 tdf#106593 loleaflet: patch l10n-for-node for older Chrome versions Online didn't work in Chrome 39 (2014-11). Fixed in the l10n-for-node shrinkwrap archive (see the patch file in it). Change-Id: Ia801a8e3decca760cfcabb46aeb3b117f4005337 Reviewed-on: https://gerrit.libreoffice.org/35346 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/node_shrinkwrap/l10n-for-node-0.0.1.tgz b/loleaflet/node_shrinkwrap/l10n-for-node-0.0.1.tgz index 6834ccbc..476f6044 100644 Binary files a/loleaflet/node_shrinkwrap/l10n-for-node-0.0.1.tgz and b/loleaflet/node_shrinkwrap/l10n-for-node-0.0.1.tgz differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) New commits: commit 94f0663a4513f74421d87a16edd783f9ac9f55c1 Author: Ashod NakashianDate: Thu Dec 1 22:04:43 2016 -0500 loolwsd: guarantee DocBrokersMutex locked when alerting We now guarantee that forkChildren will be invoked under DocBrokersMutex lock. This eliminates the case when alertAllUsersInternal is invoked when this mutex isn't locked. Change-Id: Ibb259bbb4f380300a90ad2fc7affe6013dd71fef Reviewed-on: https://gerrit.libreoffice.org/35345 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 673758cc..11b37694 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -270,6 +270,7 @@ bool cleanupDocBrokers() static void forkChildren(const int number) { +Util::assertIsLocked(DocBrokersMutex); Util::assertIsLocked(NewChildrenMutex); if (number > 0) @@ -332,12 +333,8 @@ static void preForkChildren() static void prespawnChildren() { // First remove dead DocBrokers, if possible. -std::unique_lock docBrokersLock(DocBrokersMutex, std::defer_lock); -if (docBrokersLock.try_lock()) -{ -cleanupDocBrokers(); -docBrokersLock.unlock(); -} +std::unique_lock docBrokersLock(DocBrokersMutex); +cleanupDocBrokers(); std::unique_lock lock(NewChildrenMutex, std::defer_lock); if (!lock.try_lock()) @@ -384,6 +381,7 @@ static size_t addNewChild(const std::shared_ptr& child) static std::shared_ptr getNewChild() { +Util::assertIsLocked(DocBrokersMutex); std::unique_lock lock(NewChildrenMutex); namespace chrono = std::chrono; @@ -518,6 +516,13 @@ private: { LOG_INF("Conversion request for URI [" << fromPath << "]."); +auto uriPublic = DocumentBroker::sanitizeURI(fromPath); +const auto docKey = DocumentBroker::getDocKey(uriPublic); + +// This lock could become a bottleneck. +// In that case, we can use a pool and index by publicPath. +std::unique_lock docBrokersLock(DocBrokersMutex); + // Request a kit process for this doc. auto child = getNewChild(); if (!child) @@ -526,16 +531,10 @@ private: throw std::runtime_error("Failed to spawn lokit child."); } -auto uriPublic = DocumentBroker::sanitizeURI(fromPath); -const auto docKey = DocumentBroker::getDocKey(uriPublic); LOG_DBG("New DocumentBroker for docKey [" << docKey << "]."); auto docBroker = std::make_shared(uriPublic, docKey, LOOLWSD::ChildRoot, child); child->setDocumentBroker(docBroker); -// This lock could become a bottleneck. -// In that case, we can use a pool and index by publicPath. -std::unique_lock docBrokersLock(DocBrokersMutex); - cleanupDocBrokers(); // FIXME: What if the same document is already open? Need a fake dockey here? ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106274] Encoding problems
https://bugs.documentfoundation.org/show_bug.cgi?id=106274 Commit Notificationchanged: What|Removed |Added Whiteboard||target:5.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-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/src
loleaflet/src/control/Control.CharacterMap.js |3 +++ 1 file changed, 3 insertions(+) New commits: commit a949769c2e4cc3062ffd254e9548bdcbcc0444e6 Author: Henry CastroDate: Thu Dec 1 14:29:58 2016 -0400 tdf#106592 loleaflet: remove invalid fonts Change-Id: Ie0383d01f6040d00c630c0aab6b9a6d079d3 Reviewed-on: https://gerrit.libreoffice.org/35344 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/loleaflet/src/control/Control.CharacterMap.js b/loleaflet/src/control/Control.CharacterMap.js index 550fff64..c6885a39 100644 --- a/loleaflet/src/control/Control.CharacterMap.js +++ b/loleaflet/src/control/Control.CharacterMap.js @@ -422,6 +422,9 @@ L.Control.CharacterMap = L.Control.extend({ option.innerHTML = this.unicodeBlocks[list[iterator]].name; }, this); this._onUnicodeSubsetChange(); + } else { + L.DomUtil.remove(this._fontNames.options[this._fontNames.selectedIndex]); + this._onFontNamesChange(); } }, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - wsd/PrisonerSession.cpp
wsd/PrisonerSession.cpp |2 ++ 1 file changed, 2 insertions(+) New commits: commit 994fbbfc9669973015b1e0409df982b86a54cd8c Author: Henry CastroDate: Sun Nov 27 22:39:50 2016 -0400 tdf#106274 wsd: fix sending wrong UTF-8 string to the client Client side console error "ws stopped cannot read utf8 string", the cause it is sending special character '{', '}', Conflicts: wsd/PrisonerSession.cpp Change-Id: Ide757ed5206a7674b0004f80d1f28847d770209a Reviewed-on: https://gerrit.libreoffice.org/34789 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/wsd/PrisonerSession.cpp b/wsd/PrisonerSession.cpp index faf8232b..93611f7e 100644 --- a/wsd/PrisonerSession.cpp +++ b/wsd/PrisonerSession.cpp @@ -243,6 +243,8 @@ bool PrisonerSession::_handleInput(const char *buffer, int length) Poco::URI::encode(text, "", encodedChar); assert(firstLine.size() < static_cast(length)); _docBroker->tileCache().saveRendering(font+encodedChar, "font", buffer + firstLine.size() + 1, length - firstLine.size() - 1); +forwardToPeer(_peer, buffer, length, true); +return true; } } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/autofilter/autofilter.py | 22 ++ 1 file changed, 22 insertions(+) New commits: commit 23282b476f094c735ecfae4f82798e36ac9cbbc9 Author: Markus MohrhardDate: Sun Mar 26 23:10:45 2017 +0200 add test for multiple row filtering Change-Id: I55c898a7bf6796802ee6d04071801fec3fcf218d Reviewed-on: https://gerrit.libreoffice.org/35732 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/qa/uitest/autofilter/autofilter.py b/sc/qa/uitest/autofilter/autofilter.py index ece49657d0c9..57504e66e8e9 100644 --- a/sc/qa/uitest/autofilter/autofilter.py +++ b/sc/qa/uitest/autofilter/autofilter.py @@ -48,4 +48,26 @@ class AutofilterTest(UITestCase): self.ui_test.close_doc() +def test_filter_multiple_rows(self): +doc = self.ui_test.load_file(get_url_for_data_file("autofilter.ods")) + +xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window") +xGridWin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "", "COL": "2", "ROW": "0"})) +xFloatWindow = self.xUITest.getFloatWindow() +xCheckListMenu = xFloatWindow.getChild("check_list_menu") + +xTreeList = xCheckListMenu.getChild("check_list_box") +xFirstEntry = xTreeList.getChild("1") + +xFirstEntry.executeAction("CLICK", tuple()) + +xOkBtn = xFloatWindow.getChild("ok") +xOkBtn.executeAction("CLICK", tuple()) + +self.assertFalse(is_row_hidden(doc, 0)) +self.assertFalse(is_row_hidden(doc, 1)) +self.assertTrue(is_row_hidden(doc, 2)) +self.assertTrue(is_row_hidden(doc, 3)) +self.assertFalse(is_row_hidden(doc, 4)) + # vim: set shiftwidth=4 softtabstop=4 expandtab: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/Module_sc.mk sc/qa sc/source sc/UITest_autofilter.mk
sc/Module_sc.mk |1 sc/UITest_autofilter.mk | 15 sc/qa/uitest/autofilter/autofilter.py | 51 sc/qa/uitest/autofilter/data/autofilter.ods |binary sc/source/ui/cctrl/checklistmenu.cxx| 10 +++-- sc/source/ui/inc/checklistmenu.hxx | 13 ++- sc/source/ui/view/gridwin.cxx | 24 + sc/source/ui/view/gridwin2.cxx | 14 +++ 8 files changed, 102 insertions(+), 26 deletions(-) New commits: commit 5d420856d432ff178560b2be37d33c6ddc439397 Author: Markus MohrhardDate: Sun Mar 26 23:00:24 2017 +0200 add test for tdf#106214 Change-Id: I9998aa40c3831a6033d4d61a6eab90d639ec5aa9 Reviewed-on: https://gerrit.libreoffice.org/35731 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 31c1a58b7d81..4659f55ebfeb 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -141,6 +141,7 @@ $(eval $(call gb_Module_add_uicheck_targets,sc,\ UITest_conditional_format \ UITest_range_name \ UITest_hide_cols \ + UITest_autofilter \ )) # vim: set noet sw=4 ts=4: diff --git a/sc/UITest_autofilter.mk b/sc/UITest_autofilter.mk new file mode 100644 index ..93bf17200bb1 --- /dev/null +++ b/sc/UITest_autofilter.mk @@ -0,0 +1,15 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# + +$(eval $(call gb_UITest_UITest,autofilter)) + +$(eval $(call gb_UITest_add_modules,autofilter,$(SRCDIR)/sc/qa/uitest,\ + autofilter/ \ +)) +# vim: set noet sw=4 ts=4: diff --git a/sc/qa/uitest/autofilter/autofilter.py b/sc/qa/uitest/autofilter/autofilter.py new file mode 100644 index ..ece49657d0c9 --- /dev/null +++ b/sc/qa/uitest/autofilter/autofilter.py @@ -0,0 +1,51 @@ +# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*- +# +# 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/. +# + +from uitest.framework import UITestCase +from uitest.path import get_srcdir_url + +from libreoffice.uno.propertyvalue import mkPropertyValues +from libreoffice.calc.document import get_row + +import time + +def get_url_for_data_file(file_name): +return get_srcdir_url() + "/sc/qa/uitest/autofilter/data/" + file_name + +def is_row_hidden(doc, index): +row = get_row(doc, index) +val = row.getPropertyValue("IsVisible") +return not val + +class AutofilterTest(UITestCase): + +def test_tdf106214(self): +doc = self.ui_test.load_file(get_url_for_data_file("autofilter.ods")) + +xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window") +xGridWin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "", "COL": "0", "ROW": "0"})) + +xFloatWindow = self.xUITest.getFloatWindow() +xCheckListMenu = xFloatWindow.getChild("check_list_menu") + +xTreeList = xCheckListMenu.getChild("check_list_box") +xFirstEntry = xTreeList.getChild("0") + +xFirstEntry.executeAction("CLICK", tuple()) + +xOkBtn = xFloatWindow.getChild("ok") +xOkBtn.executeAction("CLICK", tuple()) + +self.assertFalse(is_row_hidden(doc, 0)) +self.assertFalse(is_row_hidden(doc, 1)) +self.assertFalse(is_row_hidden(doc, 2)) +self.assertTrue(is_row_hidden(doc, 3)) +self.assertFalse(is_row_hidden(doc, 4)) + +self.ui_test.close_doc() + +# vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sc/qa/uitest/autofilter/data/autofilter.ods b/sc/qa/uitest/autofilter/data/autofilter.ods new file mode 100644 index ..49285933cec3 Binary files /dev/null and b/sc/qa/uitest/autofilter/data/autofilter.ods differ commit b3d498755238cb0d9a7a3e33b6070c1e4c0e3482 Author: Markus Mohrhard Date: Sun Mar 26 22:50:18 2017 +0200 handle date autofilter entries correctly, tdf#106214 Change-Id: I8fd2896c8998e79794a0ccaae1c2442caf8b89ac Reviewed-on: https://gerrit.libreoffice.org/35730 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index ce637818191c..dba72366b4aa 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1916,12 +1916,14 @@ void ScCheckListMenuWindow::getResult(ResultType& rResult) if
[Libreoffice-commits] core.git: uitest/libreoffice
uitest/libreoffice/calc/document.py | 11 +++ 1 file changed, 11 insertions(+) New commits: commit d6861b8f38db9dc465f344474943b9477dd22a0c Author: Markus MohrhardDate: Sun Mar 26 22:48:26 2017 +0200 uitest: add method to get the row object from a calc document Change-Id: If24a995fe1e174d3ffc531021b290a455ae28512 Reviewed-on: https://gerrit.libreoffice.org/35729 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/uitest/libreoffice/calc/document.py b/uitest/libreoffice/calc/document.py index a251f29b2490..9f722839d43e 100644 --- a/uitest/libreoffice/calc/document.py +++ b/uitest/libreoffice/calc/document.py @@ -37,4 +37,15 @@ def get_column(document, column, tab = 0): sheet = get_sheet_from_doc(document, tab) return sheet.getColumns().getByIndex(column) +def get_row(document, row, tab = 0): +""" Get the row object through the row index + +Keyword arguments: +document -- The document that should be used +tab -- The 0-based sheet number +column -- The 0-based row number +""" +sheet = get_sheet_from_doc(document, tab) +return sheet.getRows().getByIndex(row) + # vim: set shiftwidth=4 softtabstop=4 expandtab: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106787] New: Double click on RTF document in Windows Explorer results in incorrect formatting - File Open from Writer is OK
https://bugs.documentfoundation.org/show_bug.cgi?id=106787 Bug ID: 106787 Summary: Double click on RTF document in Windows Explorer results in incorrect formatting - File Open from Writer is OK Product: LibreOffice Version: 5.1.2.2 release Hardware: x86-64 (AMD64) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: larry.fin...@lwfinger.net When opening an RTF document by double clicking on the name in a Windows Explorer file display with Windows 10 Pro (64 bit) results in incorrect formatting. On the other hand, launching Writer from the Program Menu and using File => Open gives the correct result. The same file works either way with the Linux 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
Andreas Säger license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 106529] LibO 5.3.1.x breaks extensions for changes in BASIC parser ( error message: "Basic Syntax error. Expected: ).")
https://bugs.documentfoundation.org/show_bug.cgi?id=106529 --- Comment #46 from Andreas Säger--- (In reply to Mike Kaganski from comment #45) > (In reply to Andreas Säger from comment #43) > > access2base is fixed in bug 106710. Gimmicks fixed by commit > 6bb6ca1fb30f786385c2357e5435077066a49f82. > > The other fixes are submitted to gerrit in > https://gerrit.libreoffice.org/35726. Andreas, could you please send your > license statement (as described on > https://wiki.documentfoundation.org/Development/Developers), that is > required to merge your contribution? Thank you! Done -- 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
Re: [Libreoffice-qa] Pre-released 5.3.2.1, no Win x64 available.
We have Win_x64 daily builds since 2017-03-23 Miguel Ángel -- View this message in context: http://nabble.documentfoundation.org/Pre-released-5-3-2-1-no-Win-x64-available-tp4210807p4211143.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 33223] Sidebar: as container for toolbars, ability to add functions missing from Sidebar
https://bugs.documentfoundation.org/show_bug.cgi?id=33223 V Stuart Footechanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||6781 -- 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 33223] Sidebar: as container for toolbars, ability to add functions missing from Sidebar
https://bugs.documentfoundation.org/show_bug.cgi?id=33223 V Stuart Footechanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||6781 -- 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 106781] Addition of a style-focused formatting toolbar
https://bugs.documentfoundation.org/show_bug.cgi?id=106781 V Stuart Footechanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=33 ||223 --- Comment #4 from V Stuart Foote --- (In reply to Yousuf Philips (jay) from comment #3) > MUFFIN doesnt customize the sidebar or notebookbar, it simply provides > preset arrangements of toolbars, sidebar and notebookbar. Wheels turn slowly > with the sidebar and notebookbar, but much faster with toolbars, and if the > concept works fine with the toolbars, it could possibly be adopted into the > notebookbar, but highly unlikely with the sidebar. > Sorry, going to continue to insist that as with Notebook Bar, the Sidebar content panels and decks remains fertile ground for customization--and in fact is MUFFIN https://bugs.documentfoundation.org/show_bug.cgi?id=33223#c11 The "provides preset arrangements" is exactly the customization that the majority of users would employ--providing that as Extension would be another way of delivering the customization, available to load as prefered, but not disrupting the UX otherwise. -- 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 106781] Addition of a style-focused formatting toolbar
https://bugs.documentfoundation.org/show_bug.cgi?id=106781 V Stuart Footechanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=33 ||223 --- Comment #4 from V Stuart Foote --- (In reply to Yousuf Philips (jay) from comment #3) > MUFFIN doesnt customize the sidebar or notebookbar, it simply provides > preset arrangements of toolbars, sidebar and notebookbar. Wheels turn slowly > with the sidebar and notebookbar, but much faster with toolbars, and if the > concept works fine with the toolbars, it could possibly be adopted into the > notebookbar, but highly unlikely with the sidebar. > Sorry, going to continue to insist that as with Notebook Bar, the Sidebar content panels and decks remains fertile ground for customization--and in fact is MUFFIN https://bugs.documentfoundation.org/show_bug.cgi?id=33223#c11 The "provides preset arrangements" is exactly the customization that the majority of users would employ--providing that as Extension would be another way of delivering the customization, available to load as prefered, but not disrupting the UX otherwise. -- 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-ux-advise] [Bug 106781] Addition of a style-focused formatting toolbar
https://bugs.documentfoundation.org/show_bug.cgi?id=106781 V Stuart Footechanged: 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