[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/bmpacc2.cxx | 36 1 file changed, 24 insertions(+), 12 deletions(-) New commits: commit b8261a99ae537078e0bc1c62154fc6c66c7556b4 Author: Jochen NitschkeDate: Sun Mar 12 15:22:18 2017 +0100 improve readability and make it easier to debug. top crasher in 5.3.0.3 is around this area: https://cgit.freedesktop.org/libreoffice/core/tree/vcl/source/gdi/ bmpacc2.cxx?h=libreoffice-5.3.0.3#n235 http://crashreport.libreoffice.org/stats/signature/ BitmapReadAccess::GetPixelForN32BitTcRgba( unsigned%20char%20const%20*,long,ColorMask%20const%20&)#summary in case someone wonders suffix increment '++' precedes dereference '*' Change-Id: I15876711db569d55739da3514f61ef1b981269ab Reviewed-on: https://gerrit.libreoffice.org/35099 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/vcl/source/gdi/bmpacc2.cxx b/vcl/source/gdi/bmpacc2.cxx index 83391d1..ab67ddd 100644 --- a/vcl/source/gdi/bmpacc2.cxx +++ b/vcl/source/gdi/bmpacc2.cxx @@ -127,7 +127,8 @@ BitmapColor BitmapReadAccess::GetPixelForN24BitTcBgr(ConstScanline pScanline, lo { BitmapColor aBitmapColor; -aBitmapColor.SetBlue( *( pScanline = pScanline + nX * 3 )++ ); +pScanline = pScanline + nX * 3; +aBitmapColor.SetBlue( *pScanline++ ); aBitmapColor.SetGreen( *pScanline++ ); aBitmapColor.SetRed( *pScanline ); @@ -136,7 +137,8 @@ BitmapColor BitmapReadAccess::GetPixelForN24BitTcBgr(ConstScanline pScanline, lo void BitmapReadAccess::SetPixelForN24BitTcBgr(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&) { -*( pScanline = pScanline + nX * 3 )++ = rBitmapColor.GetBlue(); +pScanline = pScanline + nX * 3; +*pScanline++ = rBitmapColor.GetBlue(); *pScanline++ = rBitmapColor.GetGreen(); *pScanline = rBitmapColor.GetRed(); } @@ -145,7 +147,8 @@ BitmapColor BitmapReadAccess::GetPixelForN24BitTcRgb(ConstScanline pScanline, lo { BitmapColor aBitmapColor; -aBitmapColor.SetRed( *( pScanline = pScanline + nX * 3 )++ ); +pScanline = pScanline + nX * 3; +aBitmapColor.SetRed( *pScanline++ ); aBitmapColor.SetGreen( *pScanline++ ); aBitmapColor.SetBlue( *pScanline ); @@ -154,7 +157,8 @@ BitmapColor BitmapReadAccess::GetPixelForN24BitTcRgb(ConstScanline pScanline, lo void BitmapReadAccess::SetPixelForN24BitTcRgb(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&) { -*( pScanline = pScanline + nX * 3 )++ = rBitmapColor.GetRed(); +pScanline = pScanline + nX * 3; +*pScanline++ = rBitmapColor.GetRed(); *pScanline++ = rBitmapColor.GetGreen(); *pScanline = rBitmapColor.GetBlue(); } @@ -163,7 +167,8 @@ BitmapColor BitmapReadAccess::GetPixelForN32BitTcAbgr(ConstScanline pScanline, l { BitmapColor aBitmapColor; -aBitmapColor.SetBlue( *( pScanline = pScanline + ( nX << 2 ) + 1 )++ ); +pScanline = pScanline + ( nX << 2 ) + 1; +aBitmapColor.SetBlue( *pScanline++ ); aBitmapColor.SetGreen( *pScanline++ ); aBitmapColor.SetRed( *pScanline ); @@ -172,7 +177,8 @@ BitmapColor BitmapReadAccess::GetPixelForN32BitTcAbgr(ConstScanline pScanline, l void BitmapReadAccess::SetPixelForN32BitTcAbgr(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&) { -*( pScanline = pScanline + ( nX << 2 ) )++ = 0xFF; +pScanline = pScanline + ( nX << 2 ); +*pScanline++ = 0xFF; *pScanline++ = rBitmapColor.GetBlue(); *pScanline++ = rBitmapColor.GetGreen(); *pScanline = rBitmapColor.GetRed(); @@ -182,7 +188,8 @@ BitmapColor BitmapReadAccess::GetPixelForN32BitTcArgb(ConstScanline pScanline, l { BitmapColor aBitmapColor; -aBitmapColor.SetRed( *( pScanline = pScanline + ( nX << 2 ) + 1 )++ ); +pScanline = pScanline + ( nX << 2 ) + 1; +aBitmapColor.SetRed( *pScanline++ ); aBitmapColor.SetGreen( *pScanline++ ); aBitmapColor.SetBlue( *pScanline ); @@ -191,7 +198,8 @@ BitmapColor BitmapReadAccess::GetPixelForN32BitTcArgb(ConstScanline pScanline, l void BitmapReadAccess::SetPixelForN32BitTcArgb(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask&) { -*( pScanline = pScanline + ( nX << 2 ) )++ = 0xFF; +pScanline = pScanline + ( nX << 2 ); +*pScanline++ = 0xFF; *pScanline++ = rBitmapColor.GetRed(); *pScanline++ = rBitmapColor.GetGreen(); *pScanline = rBitmapColor.GetBlue(); @@ -201,7 +209,8 @@ BitmapColor BitmapReadAccess::GetPixelForN32BitTcBgra(ConstScanline pScanline, l { BitmapColor aBitmapColor; -aBitmapColor.SetBlue( *( pScanline = pScanline + ( nX << 2 ) )++ ); +pScanline = pScanline + ( nX << 2 ); +aBitmapColor.SetBlue( *pScanline++ ); aBitmapColor.SetGreen( *pScanline++ ); aBitmapColor.SetRed( *pScanline ); @@
[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp wsd/LOOLWSD.cpp
wsd/DocumentBroker.cpp |3 ++ wsd/LOOLWSD.cpp| 54 + 2 files changed, 35 insertions(+), 22 deletions(-) New commits: commit 3d78e5f2a1a6c1369e6cdeddd39cb00a6e33d1bd Author: Ashod NakashianDate: Sun Mar 12 22:31:50 2017 -0400 wsd: improved logging of extant DocBrokers after cleanup Change-Id: I4de8fde607e9e94cbadd8e100d39e0e21f2f2bdc Reviewed-on: https://gerrit.libreoffice.org/35126 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 25686bf..a53a7c1 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -1274,6 +1274,9 @@ void DocumentBroker::terminateChild(std::unique_lock& lock, const st _childProcess->close(false); } + +// Stop the polling thread. +_poll->stop(); } void DocumentBroker::closeDocument(const std::string& reason) diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 310d576..97cf845 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -261,38 +261,48 @@ bool cleanupDocBrokers() for (auto it = DocBrokers.begin(); it != DocBrokers.end(); ) { auto docBroker = it->second; + +// If document busy at the moment, cleanup later. auto lock = docBroker->getDeferredLock(); -if (!lock.try_lock()) +if (lock.try_lock()) { -// Document busy at the moment, cleanup later. -++it; -continue; -} +// Remove idle documents after 1 hour. +const bool idle = (docBroker->getIdleTimeSecs() >= 3600); -// Remove idle documents after 1 hour. -const bool idle = (docBroker->getIdleTimeSecs() >= 3600); +// Cleanup used and dead entries. +if ((docBroker->isLoaded() || docBroker->isMarkedToDestroy()) && +(docBroker->getSessionsCount() == 0 || !docBroker->isAlive() || idle)) +{ +LOG_INF("Terminating " << (idle ? "idle" : "dead") << +" DocumentBroker for docKey [" << it->first << "]."); +docBroker->terminateChild(lock, idle ? "idle" : ""); -// Cleanup used and dead entries. -if (docBroker->isLoaded() && -(docBroker->getSessionsCount() == 0 || !docBroker->isAlive() || idle)) -{ -LOG_INF("Removing " << (idle ? "idle" : "dead") << -" DocumentBroker for docKey [" << it->first << "]."); -it = DocBrokers.erase(it); -docBroker->terminateChild(lock, idle ? "idle" : ""); -} -else -{ -++it; +// Remove only when not alive. +if (!docBroker->isAlive()) +{ +LOG_INF("Removing " << (idle ? "idle" : "dead") << +" DocumentBroker for docKey [" << it->first << "]."); +it = DocBrokers.erase(it); +continue; +} +} } + +++it; } if (count != DocBrokers.size()) { -LOG_TRC("Have " << DocBrokers.size() << " DocBrokers after cleanup."); -for (auto& pair : DocBrokers) +auto logger = Log::trace(); +if (logger.enabled()) { -LOG_TRC("DocumentBroker [" << pair.first << "]."); +logger << "Have " << DocBrokers.size() << " DocBrokers after cleanup.\n"; +for (auto& pair : DocBrokers) +{ +logger << "DocumentBroker [" << pair.first << "].\n"; +} + +LOG_END(logger); } return true; ___ 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/Socket.hpp |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 94051f21b5ebbbc5c410842df8a302f2e2ff0832 Author: Ashod NakashianDate: Sun Mar 12 22:30:30 2017 -0400 wsd: SocketPoll::startThread can be protected Change-Id: Idd17f7314ac181e9a412e05a1287e15edf5047d2 Reviewed-on: https://gerrit.libreoffice.org/35125 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/net/Socket.hpp b/net/Socket.hpp index 01f985c..5cced5f 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -252,9 +252,6 @@ public: /// Default poll time - useful to increase for debugging. static int DefaultPollTimeoutMs; -/// Start the polling thread (if desired) -void startThread(); - /// Stop the polling thread. void stop() { @@ -438,8 +435,11 @@ public: const std::string& name() const { return _name; } -private: +protected: +/// Start the polling thread (if desired) +void startThread(); +private: /// Initialize the poll fds array with the right events void setupPollFds(Poco::Timestamp ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: net/Socket.cpp
net/Socket.cpp |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit c4d27fd060d93c61e9f475c63c34c828e84a55d6 Author: Ashod NakashianDate: Sun Mar 12 22:29:58 2017 -0400 wsd: prevent and warn when joining own thread Change-Id: I8405a1aacb1281e52bbd07d32cdcf35bdc484d8b Reviewed-on: https://gerrit.libreoffice.org/35124 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/net/Socket.cpp b/net/Socket.cpp index de41e34..96734d0 100644 --- a/net/Socket.cpp +++ b/net/Socket.cpp @@ -56,7 +56,12 @@ SocketPoll::~SocketPoll() { stop(); if (_threadStarted && _thread.joinable()) -_thread.join(); +{ +if (_thread.get_id() == std::this_thread::get_id()) +LOG_ERR("DEADLOCK PREVENTED: joining own thread!"); +else +_thread.join(); +} ::close(_wakeup[0]); ::close(_wakeup[1]); ___ 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/Socket.hpp | 39 --- 1 file changed, 24 insertions(+), 15 deletions(-) New commits: commit 862d7a07342f1caad5a9474c480b06585c813bea Author: Ashod NakashianDate: Sun Mar 12 22:29:30 2017 -0400 wsd: write as many messages to socket as possible Change-Id: Ie2702ea68dd1ae6200fcc304224dea34fc94544f Reviewed-on: https://gerrit.libreoffice.org/35123 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/net/Socket.hpp b/net/Socket.hpp index 4fe334b..01f985c 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -682,26 +682,35 @@ protected: _socketHandler->handleIncomingMessage(); } -// If we have space for writing and that was requested -if ((events & POLLOUT) && _outBuffer.empty()) -_socketHandler->performWrites(); +do +{ +// If we have space for writing and that was requested +if ((events & POLLOUT) && _outBuffer.empty()) +_socketHandler->performWrites(); -// perform the shutdown if we have sent everything. -if (_shutdownSignalled && _outBuffer.empty()) -closeConnection(); +// perform the shutdown if we have sent everything. +if (_shutdownSignalled && _outBuffer.empty()) +{ +closeConnection(); +closed = true; +break; +} -// SSL might want to do handshake, -// even if we have no data to write. -if ((events & POLLOUT) || !_outBuffer.empty()) -{ -std::unique_lock lock(_writeMutex, std::defer_lock); +oldSize = _outBuffer.size(); -// The buffer could have been flushed while we waited for the lock. -if (lock.try_lock() && !_outBuffer.empty()) -writeOutgoingData(); +// Write if we can and have data to write. +if ((events & POLLOUT) || !_outBuffer.empty()) +{ +std::unique_lock lock(_writeMutex, std::defer_lock); -closed = closed || (errno == EPIPE); +// The buffer could have been flushed while we waited for the lock. +if (lock.try_lock() && !_outBuffer.empty()) +writeOutgoingData(); + +closed = closed || (errno == EPIPE); +} } +while (oldSize != _outBuffer.size()); if (closed) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: net/Socket.cpp net/Socket.hpp wsd/DocumentBroker.cpp
net/Socket.cpp |3 ++- net/Socket.hpp |5 + wsd/DocumentBroker.cpp | 12 +--- 3 files changed, 12 insertions(+), 8 deletions(-) New commits: commit 9248107702745f37d321b5b31a22e9dc7a1963ec Author: Ashod NakashianDate: Sun Mar 12 22:11:25 2017 -0400 wsd: SocketPoll reports thread isAlive and use in DocBroker Now that DocumentBroker has SocketPoll thread, it's isAlive() must be defined by the lifetime of both the SocketPoll thread and the ChildProcess, which it previously did. Change-Id: I093f8774cf4374d01729a383f6c535de4143fec6 Reviewed-on: https://gerrit.libreoffice.org/35122 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/net/Socket.cpp b/net/Socket.cpp index 48bc696..de41e34 100644 --- a/net/Socket.cpp +++ b/net/Socket.cpp @@ -35,7 +35,8 @@ namespace { SocketPoll::SocketPoll(const std::string& threadName) : _name(threadName), _stop(false), - _threadStarted(false) + _threadStarted(false), + _threadFinished(false) { // Create the wakeup fd. if (::pipe2(_wakeup, O_CLOEXEC | O_NONBLOCK) == -1) diff --git a/net/Socket.hpp b/net/Socket.hpp index c4badea..4fe334b 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -262,6 +262,8 @@ public: wakeup(); } +bool isAlive() const { return _threadStarted && !_threadFinished; } + /// Check if we should continue polling virtual bool continuePolling() { @@ -280,6 +282,8 @@ public: { poll(DefaultPollTimeoutMs); } + +_threadFinished = true; } /// Are we running in either shutdown, or the polling thread. @@ -478,6 +482,7 @@ protected: /// The polling thread. std::thread _thread; std::atomic _threadStarted; +std::atomic _threadFinished; std::thread::id _owner; }; diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 9e2087f..25686bf 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -152,6 +152,7 @@ DocumentBroker::DocumentBroker(const std::string& uri, _cursorWidth(0), _cursorHeight(0), _poll(new DocumentBrokerPoll("docbrk_poll", *this)), +_stop(false), _tileVersion(0), _debugRenderedTileCount(0) { @@ -159,8 +160,6 @@ DocumentBroker::DocumentBroker(const std::string& uri, assert(!_childRoot.empty()); LOG_INF("DocumentBroker [" << _uriPublic.toString() << "] created. DocKey: [" << _docKey << "]"); - -_stop = false; } // The inner heart of the DocumentBroker - our poll loop. @@ -248,12 +247,11 @@ void DocumentBroker::pollThread() bool DocumentBroker::isAlive() const { -if (!_childProcess) -return true; // waiting to get a child. -if (_stop) // we're dead. -return false; +if (_poll->isAlive()) +return true; // Polling thread still running. -return _childProcess->isAlive(); +// Shouldn't have live child process outside of the polling thread. +return _childProcess && _childProcess->isAlive(); } DocumentBroker::~DocumentBroker() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/DocumentBroker.hpp wsd/LOOLWSD.cpp
wsd/DocumentBroker.hpp |6 ++ wsd/LOOLWSD.cpp|6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) New commits: commit 8901fcf074da289bfc7063eff0e21175f439ae3a Author: Ashod NakashianDate: Sun Mar 12 19:18:12 2017 -0400 wsd: ChildProcess doesn't need friends Change-Id: I1911920c9b49adecac4ea4d8fc4b0830687b80c7 Reviewed-on: https://gerrit.libreoffice.org/35121 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp index 9836872..8d7eb2a 100644 --- a/wsd/DocumentBroker.hpp +++ b/wsd/DocumentBroker.hpp @@ -60,8 +60,6 @@ public: /// to host a document. class ChildProcess { -// FIXME: urk ... -friend class PrisonerRequestDispatcher; public: /// @param pid is the process ID of the child. /// @param socket is the underlying Sockeet to the child. @@ -92,11 +90,11 @@ public: } void setDocumentBroker(const std::shared_ptr& docBroker); +std::shared_ptr getDocumentBroker() const { return _docBroker.lock(); } void stop() { -// FIXME: stop !? -LOG_ERR("What do we do for stop?"); +// Request the child to exit. try { if (isAlive()) diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index b8a2b9d..310d576 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -1454,7 +1454,7 @@ public: { // Notify the broker that we're done. auto child = _childProcess.lock(); -auto docBroker = child ? child->_docBroker.lock() : nullptr; +auto docBroker = child ? child->getDocumentBroker() : nullptr; if (docBroker) { // FIXME: No need to notify if asked to stop. @@ -1587,7 +1587,7 @@ private: LOG_TRC("Prisoner message [" << getAbbreviatedMessage([0], data.size()) << "]."); auto child = _childProcess.lock(); -auto docBroker = child ? child->_docBroker.lock() : nullptr; +auto docBroker = child ? child->getDocumentBroker() : nullptr; if (docBroker) { // We should never destroy the broker, since @@ -1598,7 +1598,7 @@ private: return; } -LOG_WRN("Child " << child->_pid << +LOG_WRN("Child " << child->getPid() << " has no DocumentBroker to handle message: [" << LOOLProtocol::getAbbreviatedMessage(data) << "]."); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 91070] opposite result in conditioned format in Libreoff CALC
https://bugs.documentfoundation.org/show_bug.cgi?id=91070 Aron Budeachanged: What|Removed |Added Status|NEW |UNCONFIRMED CC||ba...@caesar.elte.hu Hardware|Other |All Blocks||87351 Ever confirmed|1 |0 --- Comment #23 from Aron Budea --- (In reply to gmarco from comment #22) > (In reply to Julien Nabet from comment #21) > > Because you did it at 2015-05-07 17:56:58 UTC (see > > https://bugs.documentfoundation.org/show_activity.cgi?id=91070) > > Of course you can just unassign yourself if you want to > > OK, thanks, but I do not know how and why this happened. > I can not fix the bug, so I think corrected unassign myself. This happens if on the attachment adding screen you check "take bug and set the bug status to" and set a status there. It's confusing, because it's possible to update the bug status there, but with this step you also assign the bug to yourself. Additionally, this bug was never confirmed independently, returning status to UNCONFIRMED. Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=87351 [Bug 87351] [META] Conditional formatting bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 87351] [META] Conditional formatting bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=87351 Aron Budeachanged: What|Removed |Added Depends on||91070 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=91070 [Bug 91070] opposite result in conditioned format in Libreoff CALC -- 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 net/WebSocketHandler.hpp
net/Socket.hpp |1 + net/WebSocketHandler.hpp |2 ++ 2 files changed, 3 insertions(+) New commits: commit c9a07a3087cced9c0ea8973a039b284bcb01a0e7 Author: Ashod NakashianDate: Sun Mar 12 19:04:52 2017 -0400 wsd: assert socket is in correct thread Change-Id: I22c3f62bdf45188641326774dd86b7cacfce9198 Reviewed-on: https://gerrit.libreoffice.org/35120 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/net/Socket.hpp b/net/Socket.hpp index 6929938..c4badea 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -555,6 +555,7 @@ public: int getPollEvents() override { +assert(isCorrectThread()); if (!_outBuffer.empty() || _socketHandler->hasQueuedWrites() || _shutdownSignalled) return POLLIN | POLLOUT; else diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp index 7416586..d89f49b 100644 --- a/net/WebSocketHandler.hpp +++ b/net/WebSocketHandler.hpp @@ -255,6 +255,7 @@ public: if (socket == nullptr) return -1; // no socket == error. +assert(socket->isCorrectThread()); auto lock = socket->getWriteLock(); std::vector& out = socket->_outBuffer; @@ -287,6 +288,7 @@ protected: if (!socket || data == nullptr || len == 0) return -1; +assert(socket->isCorrectThread()); std::vector& out = socket->_outBuffer; out.push_back(flags); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: net/ServerSocket.hpp net/Socket.cpp net/Socket.hpp wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp wsd/LOOLWSD.cpp
net/ServerSocket.hpp |2 +- net/Socket.cpp | 23 --- net/Socket.hpp |6 +++--- wsd/DocumentBroker.cpp | 36 ++-- wsd/DocumentBroker.hpp |2 +- wsd/LOOLWSD.cpp| 33 +++-- 6 files changed, 54 insertions(+), 48 deletions(-) New commits: commit 04bbb75200e5097429b119f2773f115a542cf823 Author: Ashod NakashianDate: Sun Mar 12 19:03:45 2017 -0400 wsd: dump state to generic ostream for flexiblity and to log Change-Id: I4670ee2e90b7809ebc66a2b324a44334b3dbba2b Reviewed-on: https://gerrit.libreoffice.org/35119 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/net/ServerSocket.hpp b/net/ServerSocket.hpp index 8f98dc6..29381c1 100644 --- a/net/ServerSocket.hpp +++ b/net/ServerSocket.hpp @@ -83,7 +83,7 @@ public: return POLLIN; } -void dumpState() override; +void dumpState(std::ostream& os) override; HandleResult handlePoll(const Poco::Timestamp &/* now */, int events) override { diff --git a/net/Socket.cpp b/net/Socket.cpp index b64f904..48bc696 100644 --- a/net/Socket.cpp +++ b/net/Socket.cpp @@ -85,9 +85,9 @@ void SocketPoll::wakeupWorld() wakeup(fd); } -void ServerSocket::dumpState() +void ServerSocket::dumpState(std::ostream& os) { -std::cerr << "\t" << getFD() << "\t\n"; +os << "\t" << getFD() << "\t\n"; } namespace { @@ -121,24 +121,25 @@ void dump_hex (const char *legend, const char *prefix, std::vector buffer) } // namespace -void StreamSocket::dumpState() +void StreamSocket::dumpState(std::ostream& os) { -std::cerr << "\t" << getFD() << "\t" << getPollEvents() << "\t" - << _inBuffer.size() << "\t" << _outBuffer.size() << "\t" - << "\n"; +os << "\t" << getFD() << "\t" << getPollEvents() << "\t" + << _inBuffer.size() << "\t" << _outBuffer.size() << "\t" + << "\n"; if (_inBuffer.size() > 0) dump_hex("\t\tinBuffer:\n", "\t\t", _inBuffer); if (_outBuffer.size() > 0) dump_hex("\t\toutBuffer:\n", "\t\t", _inBuffer); } -void SocketPoll::dumpState() +void SocketPoll::dumpState(std::ostream& os) { -std::cerr << " Poll [" << _pollSockets.size() << "] - wakeup r: " - << _wakeup[0] << " w: " << _wakeup[1] << "\n"; -std::cerr << "\tfd\tevents\trsize\twsize\n"; +// FIXME: NOT thread-safe! _pollSockets is modified from the polling thread! +os << " Poll [" << _pollSockets.size() << "] - wakeup r: " + << _wakeup[0] << " w: " << _wakeup[1] << "\n"; +os << "\tfd\tevents\trsize\twsize\n"; for (auto : _pollSockets) -i->dumpState(); +i->dumpState(os); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/net/Socket.hpp b/net/Socket.hpp index 7071acd..6929938 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -175,7 +175,7 @@ public: return rc; } -virtual void dumpState() {} +virtual void dumpState(std::ostream&) {} /// Set the thread-id we're bound to void setThreadOwner(const std::thread::id ) @@ -414,7 +414,7 @@ public: wakeup(); } -void dumpState(); +void dumpState(std::ostream& os); /// Removes a socket from this poller. /// NB. this must be called from the socket poll that @@ -762,7 +762,7 @@ protected: return ::write(getFD(), buf, len); } -void dumpState() override; +void dumpState(std::ostream& os) override; /// Get the Write Lock. std::unique_lock getWriteLock() { return std::unique_lock(_writeMutex); } diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index aacdfae..9e2087f 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -1292,31 +1292,31 @@ void DocumentBroker::updateLastActivityTime() Admin::instance().updateLastActivityTime(_docKey); } -void DocumentBroker::dumpState() +void DocumentBroker::dumpState(std::ostream& os) { std::unique_lock lock(_mutex); -std::cerr << " Broker: " << _filename; +os << " Broker: " << _filename; if (_markToDestroy) -std::cerr << " *** Marked to destroy ***\n"; +os << " *** Marked to destroy ***"; else -std::cerr << " has live sessions\n"; +os << " has live sessions"; if (_isLoaded) -std::cerr << " loaded in: " << _loadDuration.count() << "ms\n"; +os << "\n loaded in: " << _loadDuration.count() << "ms"; else -std::cerr << " still loading...\n"; -std::cerr << " modified?: " << _isModified << "\n"; -std::cerr << " jail id: " << _jailId << "\n"; -std::cerr << " public uri: " << _uriPublic.toString() << "\n"; -std::cerr << " jailed uri: " << _uriJailed.toString() << "\n"; -std::cerr << " doc key: " << _docKey << "\n"; -std::cerr << " num sessions: " <<
[Libreoffice-bugs] [Bug 106516] Start of week does not come from locale in conditional formatting
https://bugs.documentfoundation.org/show_bug.cgi?id=106516 --- Comment #3 from Aron Budea--- Hey Cor! How certain are you about these two bugs being the same? I was a bit surprised to find that WEEKS() is an add-in function (not sure what that means), and not part of the standard date/time functions. -- 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: kit/Kit.cpp net/loolnb.cpp net/Socket.hpp wsd/LOOLWSD.cpp
kit/Kit.cpp |1 + net/Socket.hpp |4 ++-- net/loolnb.cpp |2 +- wsd/LOOLWSD.cpp | 12 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) New commits: commit 2e2f62eddeeb92761df1e1316aaa59687e2aac69 Author: Ashod NakashianDate: Sun Mar 12 18:34:06 2017 -0400 wsd: improved logging Change-Id: I6c4a5bcd54c0748cc413afbfcfb34c365b347669 Reviewed-on: https://gerrit.libreoffice.org/35118 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/kit/Kit.cpp b/kit/Kit.cpp index c14007a..9886a8c 100644 --- a/kit/Kit.cpp +++ b/kit/Kit.cpp @@ -1754,6 +1754,7 @@ void lokit_main(const std::string& childRoot, // Open websocket connection between the child process and WSD. HTTPClientSession cs("127.0.0.1", MasterPortNumber); cs.setTimeout(Poco::Timespan(10, 0)); // 10 second +LOG_DBG("Connecting to Master " << cs.getHost() << ':' << cs.getPort()); HTTPRequest request(HTTPRequest::HTTP_GET, requestUrl); HTTPResponse response; auto ws = std::make_shared(cs, request, response); diff --git a/net/Socket.hpp b/net/Socket.hpp index 88ef163..7071acd 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -427,9 +427,9 @@ public: auto it = std::find(_pollSockets.begin(), _pollSockets.end(), socket); assert(it != _pollSockets.end()); -LOG_TRC("Release socket #" << socket->getFD() << " from " << _name); - _pollSockets.erase(it); +LOG_TRC("Release socket #" << socket->getFD() << " from " << _name << +" leaving " << _pollSockets.size()); } const std::string& name() const { return _name; } diff --git a/net/loolnb.cpp b/net/loolnb.cpp index 041397a..566ab1e 100644 --- a/net/loolnb.cpp +++ b/net/loolnb.cpp @@ -86,7 +86,7 @@ public: << "Connection: Closed\r\n" << "\r\n" << numberString; -; + std::string str = oss.str(); socket->_outBuffer.insert(socket->_outBuffer.end(), str.begin(), str.end()); return; diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 98250b4..8444f07 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -1466,13 +1466,13 @@ private: /// Keep our socket around ... void onConnect(const std::weak_ptr& socket) override { -LOG_TRC("Prisoner - new socket\n"); +LOG_TRC("Prisoner - new socket"); _socket = socket; } void onDisconnect() override { -LOG_TRC("Prisoner connection disconnected\n"); +LOG_TRC("Prisoner connection disconnected"); } /// Called after successful socket reads. @@ -1510,7 +1510,7 @@ private: auto logger = Log::info(); if (logger.enabled()) { -logger << "Prisoner HTTP Request: " +logger << "Prisoner HTTP Request from #" << socket->getFD() << ": " << request.getMethod() << ' ' << request.getURI() << ' ' << request.getVersion(); @@ -1641,8 +1641,8 @@ private: disposeSession(); const size_t curConnections = --LOOLWSD::NumConnections; -LOG_TRC("Disconnected connection #" << _connectionNum << " of " << -(curConnections + 1) << " existing as session [" << _id << "]."); +LOG_TRC("Disconnected connection #" << _connectionNum << " (of " << +(curConnections + 1) << ") as session [" << _id << "]."); } /// Called after successful socket reads. @@ -1683,7 +1683,7 @@ private: auto logger = Log::info(); if (logger.enabled()) { -logger << "Client HTTP Request: " +logger << "Client HTTP Request: #" << socket->getFD() << ": " << request.getMethod() << ' ' << request.getURI() << ' ' << request.getVersion(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: test/httpwstest.cpp
test/httpwstest.cpp |5 + 1 file changed, 5 insertions(+) New commits: commit 851195215addd668fedb7cf476825689b80820b7 Author: Ashod NakashianDate: Sun Mar 12 18:32:31 2017 -0400 wsd: log testHandshake traffic Change-Id: Iee79dfe2e7987838a528d5705cbb0d476f73dce7 Reviewed-on: https://gerrit.libreoffice.org/35117 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp index 9e9df3e..1e7c4f8 100644 --- a/test/httpwstest.cpp +++ b/test/httpwstest.cpp @@ -267,14 +267,17 @@ void HTTPWSTest::testHandshake() int flags = 0; char buffer[1024] = {0}; int bytes = socket.receiveFrame(buffer, sizeof(buffer), flags); +std::cerr << testname << "Got " << LOOLProtocol::getAbbreviatedFrameDump(buffer, bytes, flags) << std::endl; CPPUNIT_ASSERT_EQUAL(std::string("statusindicator: find"), std::string(buffer, bytes)); bytes = socket.receiveFrame(buffer, sizeof(buffer), flags); +std::cerr << testname << "Got " << LOOLProtocol::getAbbreviatedFrameDump(buffer, bytes, flags) << std::endl; if (bytes > 0 && !std::strstr(buffer, "error:")) { CPPUNIT_ASSERT_EQUAL(std::string("statusindicator: connect"), std::string(buffer, bytes)); bytes = socket.receiveFrame(buffer, sizeof(buffer), flags); +std::cerr << testname << "Got " << LOOLProtocol::getAbbreviatedFrameDump(buffer, bytes, flags) << std::endl; if (!std::strstr(buffer, "error:")) { CPPUNIT_ASSERT_EQUAL(std::string("statusindicator: ready"), std::string(buffer, bytes)); @@ -286,6 +289,7 @@ void HTTPWSTest::testHandshake() // close frame message bytes = socket.receiveFrame(buffer, sizeof(buffer), flags); +std::cerr << testname << "Got " << LOOLProtocol::getAbbreviatedFrameDump(buffer, bytes, flags) << std::endl; CPPUNIT_ASSERT((flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) == Poco::Net::WebSocket::FRAME_OP_CLOSE); } } @@ -296,6 +300,7 @@ void HTTPWSTest::testHandshake() // close frame message bytes = socket.receiveFrame(buffer, sizeof(buffer), flags); +std::cerr << testname << "Got " << LOOLProtocol::getAbbreviatedFrameDump(buffer, bytes, flags) << std::endl; CPPUNIT_ASSERT((flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) == Poco::Net::WebSocket::FRAME_OP_CLOSE); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: net/SslSocket.hpp
net/SslSocket.hpp | 28 ++-- 1 file changed, 26 insertions(+), 2 deletions(-) New commits: commit 6f1191866133e85921ffa24efab9c2fed7abdebf Author: Ashod NakashianDate: Sun Mar 12 14:33:16 2017 -0400 wsd: more informative SSL error logging Change-Id: I32baadf995f6fc4c9b112d1a62fee2d618fc9e95 Reviewed-on: https://gerrit.libreoffice.org/35116 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/net/SslSocket.hpp b/net/SslSocket.hpp index 1253b9f..6cf95b5 100644 --- a/net/SslSocket.hpp +++ b/net/SslSocket.hpp @@ -186,24 +186,33 @@ private: // Last operation failed. Find out if SSL was trying // to do something different that failed, or not. const int sslError = SSL_get_error(_ssl, rc); -LOG_TRC("Socket #" << getFD() << " SSL error: " << sslError); switch (sslError) { case SSL_ERROR_ZERO_RETURN: // Shutdown complete, we're disconnected. +LOG_TRC("Socket #" << getFD() << " SSL error: ZERO_RETURN (" << sslError << ")."); return 0; case SSL_ERROR_WANT_READ: +LOG_TRC("Socket #" << getFD() << " SSL error: WANT_READ (" << sslError << ")."); _sslWantsTo = SslWantsTo::Read; return rc; case SSL_ERROR_WANT_WRITE: +LOG_TRC("Socket #" << getFD() << " SSL error: WANT_WRITE (" << sslError << ")."); _sslWantsTo = SslWantsTo::Write; return rc; case SSL_ERROR_WANT_CONNECT: +LOG_TRC("Socket #" << getFD() << " SSL error: WANT_CONNECT (" << sslError << ")."); +return rc; + case SSL_ERROR_WANT_ACCEPT: +LOG_TRC("Socket #" << getFD() << " SSL error: WANT_ACCEPT (" << sslError << ")."); +return rc; + case SSL_ERROR_WANT_X509_LOOKUP: +LOG_TRC("Socket #" << getFD() << " SSL error: WANT_X509_LOOKUP (" << sslError << ")."); // Unexpected. return rc; @@ -211,12 +220,24 @@ private: if (errno != 0) { // Posix API error, let the caller handle. +LOG_SYS("Socket #" << getFD() << " SSL error: SYSCALL (" << sslError << ")."); return rc; } // Fallthrough... default: { +if (sslError == SSL_ERROR_SSL) +LOG_TRC("Socket #" << getFD() << " SSL error: SSL (" << sslError << ")."); +#if 0 // Recent OpenSSL only +else if (sslError == SSL_ERROR_WANT_ASYNC) +LOG_TRC("Socket #" << getFD() << " SSL error: WANT_ASYNC (" << sslError << ")."); +else if (sslError == SSL_ERROR_WANT_ASYNC_JOB) +LOG_TRC("Socket #" << getFD() << " SSL error: WANT_ASYNC_JOB (" << sslError << ")."); +#endif +else +LOG_TRC("Socket #" << getFD() << " SSL error: UKNOWN (" << sslError << ")."); + // The error is comming from BIO. Find out what happened. const long bioError = ERR_get_error(); if (bioError == 0) @@ -224,14 +245,17 @@ private: if (rc == 0) { // Socket closed. +LOG_ERR("Socket #" << getFD() << " SSL BIO error: closed (0)."); return 0; } else if (rc == -1) { +LOG_SYS("Socket #" << getFD() << " SSL BIO error: closed unexpectedly (-1)."); throw std::runtime_error("SSL Socket closed unexpectedly."); } else { +LOG_SYS("Socket #" << getFD() << " SSL BIO error: unknown (" << rc << ")."); throw std::runtime_error("SSL BIO reported error [" + std::to_string(rc) + "]."); } } @@ -239,7 +263,7 @@ private: { char buf[512]; ERR_error_string_n(bioError, buf, sizeof(buf)); -LOG_ERR("Socket #" << getFD() << " BIO error: " << buf); +LOG_SYS("Socket #" << getFD() << " SSL BIO error: " << buf); throw std::runtime_error(buf); } } ___ 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 |9 - 1 file changed, 4 insertions(+), 5 deletions(-) New commits: commit c939eeab6837dd4151815da597acea6e6b36dd99 Author: Ashod NakashianDate: Sun Mar 12 14:13:48 2017 -0400 wsd: remove the last session immediately if no saving needed Change-Id: I509c7a83f16caf0d55fcb6af9c7ce707b7a0e389 Reviewed-on: https://gerrit.libreoffice.org/35115 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index fa8ba94..aacdfae 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -601,7 +601,7 @@ bool DocumentBroker::autoSave(const bool force) { // Nothing to do. LOG_TRC("Nothing to autosave [" << _docKey << "]."); -return true; +return false; } // Remember the last save time, since this is the predicate. @@ -779,9 +779,7 @@ size_t DocumentBroker::removeSession(const std::string& id, bool destroyIfLast) LOG_INF("Removing session [" << id << "] on docKey [" << _docKey << "]. Have " << _sessions.size() << " sessions."); -if (_lastEditableSession) -autoSave(true); -else +if (!_lastEditableSession || !autoSave(true)) return removeSessionInternal(id); } catch (const std::exception& ex) @@ -797,7 +795,8 @@ size_t DocumentBroker::removeSessionInternal(const std::string& id) try { // remove also from the _newSessions -_newSessions.erase(std::remove_if(_newSessions.begin(), _newSessions.end(), [](NewSession& newSession) { return newSession._session->getId() == id; }), +_newSessions.erase(std::remove_if(_newSessions.begin(), _newSessions.end(), + [](NewSession& newSession) { return newSession._session->getId() == id; }), _newSessions.end()); Admin::instance().rmDoc(_docKey, id); ___ 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.hpp wsd/LOOLWSD.cpp
wsd/DocumentBroker.cpp |5 - wsd/DocumentBroker.hpp |8 wsd/LOOLWSD.cpp|6 +- 3 files changed, 5 insertions(+), 14 deletions(-) New commits: commit 388d7b1dbf1a5c2d155c0149247b3a319114f8b0 Author: Ashod NakashianDate: Sun Mar 12 14:12:36 2017 -0400 wsd: TerminatingPoll always starts its own thread Since all TerminatingPoll instances need to fire a thread, no reason to do it manually and risk races. Now TerminatingPoll does it in the ctor. Change-Id: I59850ad48b3789f3a23d01abb05a7f28e5717031 Reviewed-on: https://gerrit.libreoffice.org/35114 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 1b47d68..fa8ba94 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -163,11 +163,6 @@ DocumentBroker::DocumentBroker(const std::string& uri, _stop = false; } -void DocumentBroker::startThread() -{ -_poll->startThread(); -} - // The inner heart of the DocumentBroker - our poll loop. void DocumentBroker::pollThread() { diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp index 2d30802..2a9c152 100644 --- a/wsd/DocumentBroker.hpp +++ b/wsd/DocumentBroker.hpp @@ -44,7 +44,10 @@ class TerminatingPoll : public SocketPoll { public: TerminatingPoll(const std::string ) : -SocketPoll(threadName) {} +SocketPoll(threadName) +{ +startThread(); +} bool continuePolling() override { @@ -220,9 +223,6 @@ public: ~DocumentBroker(); -/// Start processing events -void startThread(); - /// Loads a document from the public URI into the jail. bool load(std::shared_ptr& session, const std::string& jailId); bool isLoaded() const { return _isLoaded; } diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index a459bf4..98250b4 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -2167,7 +2167,6 @@ private: void handleClientWsUpgrade(const Poco::Net::HTTPRequest& request, const std::string& url) { -// requestHandler = new ClientRequestHandler(); LOG_INF("Client WS request" << request.getURI() << ", url: " << url); // First Upgrade. @@ -2221,9 +2220,9 @@ private: _clientSession->onConnect(socket); docBroker->addSocketToPoll(socket); } -docBroker->startThread(); } } + if (!docBroker || !_clientSession) LOG_WRN("Failed to connect DocBroker and Client Session."); } @@ -2349,14 +2348,11 @@ public: void startPrisoners(const int port) { PrisonerPoll.insertNewSocket(findPrisonerServerPort(port)); -PrisonerPoll.startThread(); } void start(const int port) { _acceptPoll.insertNewSocket(findServerPort(port)); -_acceptPoll.startThread(); -WebServerPoll.startThread(); } void stop() ___ 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.hpp wsd/LOOLWSD.cpp
wsd/DocumentBroker.cpp | 34 ++ wsd/DocumentBroker.hpp | 10 +- wsd/LOOLWSD.cpp|4 ++-- 3 files changed, 13 insertions(+), 35 deletions(-) New commits: commit cbd00bf7c8600afb0f7ec09a8ad90f1b5ed2f298 Author: Ashod NakashianDate: Sun Mar 12 13:56:42 2017 -0400 wsd: simplify DocumentBroker construction DocumentBrokerPoll is always owned by a single DocumentBroker instance, so we can hold a reference to it. This eliminates the need to hold a shared_ptr to the owner which, in turn, eliminates the need for a create wrapper. Change-Id: I954c9dddcc3b2cfdd5dfcc8248ab3d47a897f684 Reviewed-on: https://gerrit.libreoffice.org/35113 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index c4c3307..1b47d68 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -114,23 +114,22 @@ std::string DocumentBroker::getDocKey(const Poco::URI& uri) } /// The Document Broker Poll - one of these in a thread per document -class DocumentBroker::DocumentBrokerPoll : public TerminatingPoll +class DocumentBroker::DocumentBrokerPoll final : public TerminatingPoll { -std::shared_ptr _docBroker; +/// The DocumentBroker owning us. +DocumentBroker& _docBroker; + public: -DocumentBrokerPoll(const std::string ) -: TerminatingPoll(threadName) -{ -} -void setDocumentBroker(const std::shared_ptr ) +DocumentBrokerPoll(const std::string , DocumentBroker& docBroker) : +TerminatingPoll(threadName), +_docBroker(docBroker) { -_docBroker = docBroker; } virtual void pollingThread() { -assert (_docBroker); -_docBroker->pollThread(); +// Delegate to the docBroker. +_docBroker.pollThread(); } }; @@ -152,7 +151,7 @@ DocumentBroker::DocumentBroker(const std::string& uri, _cursorPosY(0), _cursorWidth(0), _cursorHeight(0), -_poll(new DocumentBrokerPoll("docbrk_poll")), +_poll(new DocumentBrokerPoll("docbrk_poll", *this)), _tileVersion(0), _debugRenderedTileCount(0) { @@ -164,19 +163,6 @@ DocumentBroker::DocumentBroker(const std::string& uri, _stop = false; } -std::shared_ptr DocumentBroker::create( -const std::string& uri, -const Poco::URI& uriPublic, -const std::string& docKey, -const std::string& childRoot) -{ -std::shared_ptr docBroker = std::make_shared(uri, uriPublic, docKey, childRoot); - -docBroker->_poll->setDocumentBroker(docBroker); - -return docBroker; -} - void DocumentBroker::startThread() { _poll->startThread(); diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp index 0ca4ab7..2d30802 100644 --- a/wsd/DocumentBroker.hpp +++ b/wsd/DocumentBroker.hpp @@ -212,19 +212,11 @@ public: /// Dummy document broker that is marked to destroy. DocumentBroker(); -/// Use create - not this constructor ... -/// FIXME: friend with make_shared etc. +/// Construct DocumentBroker with URI, docKey, and root path. DocumentBroker(const std::string& uri, const Poco::URI& uriPublic, const std::string& docKey, const std::string& childRoot); -public: -static std::shared_ptr create( - const std::string& uri, - const Poco::URI& uriPublic, - const std::string& docKey, - const std::string& childRoot); - ~DocumentBroker(); diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index eb06f5f..a459bf4 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -1296,7 +1296,7 @@ static std::shared_ptr createDocBroker(WebSocketHandler& ws, // Set the one we just created. LOG_DBG("New DocumentBroker for docKey [" << docKey << "]."); -auto docBroker = DocumentBroker::create(uri, uriPublic, docKey, LOOLWSD::ChildRoot); +auto docBroker = std::make_shared(uri, uriPublic, docKey, LOOLWSD::ChildRoot); DocBrokers.emplace(docKey, docBroker); LOG_TRC("Have " << DocBrokers.size() << " DocBrokers after inserting [" << docKey << "]."); @@ -1958,7 +1958,7 @@ private: std::unique_lock docBrokersLock(DocBrokersMutex); LOG_DBG("New DocumentBroker for docKey [" << docKey << "]."); -auto docBroker = DocumentBroker::create(fromPath, uriPublic, docKey, LOOLWSD::ChildRoot); +auto docBroker = std::make_shared(fromPath, uriPublic, docKey, LOOLWSD::ChildRoot); cleanupDocBrokers(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: test/integration-http-server.cpp
test/integration-http-server.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d1f201c63ce8697ee9328c05f49deccbe51fbd00 Author: Ashod NakashianDate: Sun Mar 12 13:53:32 2017 -0400 wsd: testHandshake test doc filename includes test name Change-Id: Id741daca14a7590ae66ee2206be99c35fe10fc33 Reviewed-on: https://gerrit.libreoffice.org/35112 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/test/integration-http-server.cpp b/test/integration-http-server.cpp index 0882b39..3530ed5 100644 --- a/test/integration-http-server.cpp +++ b/test/integration-http-server.cpp @@ -229,7 +229,7 @@ void HTTPServerTest::testScriptsAndLinksPost() void HTTPServerTest::testConvertTo() { -const auto srcPath = FileUtil::getTempFilePath(TDOC, "hello.odt"); +const auto srcPath = FileUtil::getTempFilePath(TDOC, "hello.odt", "convertTo_"); std::unique_ptr session(helpers::createSession(_uri)); session->setTimeout(Poco::Timespan(2, 0)); // 2 seconds. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106368] Android: restrict zoom to page width
https://bugs.documentfoundation.org/show_bug.cgi?id=106368 Ximeng Zuchanged: What|Removed |Added Assignee|libreoffice-b...@lists.free |uzno...@yahoo.com |desktop.org | -- 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 106517] New: Program frozen in screen. Cant close unless i shut and wont open completely
https://bugs.documentfoundation.org/show_bug.cgi?id=106517 Bug ID: 106517 Summary: Program frozen in screen. Cant close unless i shut and wont open completely Product: LibreOffice Online Version: unspecified Hardware: All OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: spot...@seasidehc.com Created attachment 131841 --> https://bugs.documentfoundation.org/attachment.cgi?id=131841=edit screenshot of Libre Office calc problem The screen has frozen on my computer. I cannot get it off of the screen unless i restart my computer. When i try to use it again from the website i use for work, ClaimTrak, it freezes again to the screen in the attachment. I have tried it over and over and i get the same result. All other screens and tabs on my laptop are functional while this is frozen on my computer. -- 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 106148] Tooltip is incorrect on some buttons. It shows " □□□".
https://bugs.documentfoundation.org/show_bug.cgi?id=106148 --- Comment #7 from Kamei--- Created attachment 131840 --> https://bugs.documentfoundation.org/attachment.cgi?id=131840=edit I confirm this issue is occurred on Korean too. -- 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 106148] Tooltip is incorrect on some buttons. It shows " □□□".
https://bugs.documentfoundation.org/show_bug.cgi?id=106148 --- Comment #6 from Kamei--- Created attachment 131839 --> https://bugs.documentfoundation.org/attachment.cgi?id=131839=edit I confirm this issue is occurred on Chinese too. Can anybody confirm this? -- 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 80400] FILEOPEN: LO do not respect formatting of empty cells while importing from Excel 2003 XML
https://bugs.documentfoundation.org/show_bug.cgi?id=80400 Dennis Roczekchanged: What|Removed |Added CC||gan...@poczta.onet.pl --- Comment #9 from Dennis Roczek --- still can confirm with Version: 5.3.0.3 (x64) Build-ID: 7074905676c47b82bbcfbea1aeefc84afe1c50e1 CPU-Threads: 4; BS-Version: Windows 6.19; UI-Render: Standard; Layout-Engine: neu; Gebietsschema: de-DE (de_DE); Calc: group @Bartosz: is that something for you? -- 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: Makefile.fetch
Makefile.fetch |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 48670533998f078525f7dad94b89bc371a5b3947 Author: Khaled HosnyDate: Sat Mar 11 04:09:21 2017 +0200 Ignore the checksum embedded in the file name That is always MD5 sum, but we expect SHA256 now. Change-Id: I8edf61b9a663f6f1ecc5cf23c93211e0b3201631 Reviewed-on: https://gerrit.libreoffice.org/35067 Tested-by: Jenkins Reviewed-by: Khaled Hosny diff --git a/Makefile.fetch b/Makefile.fetch index 3091c5e..de929d8 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -59,10 +59,7 @@ endef define fetch_Download_item $(if $(strip $($(2))),,$(error fetch__Download_item: $(2) is empty)) $(if $(filter undefined,$(origin $(call fetch_Download__subst_var,$(2,\ - $(if $(call fetch_Download__is_checksum,$(firstword $(subst -, ,$($(2),\ - $(call fetch__Download_item,$1,$($2),$(firstword $(subst -, ,$($(2),\ - $(error "fetch_Download_item: no checksum found for $($(2)). Please define $(call fetch_Download__subst_var,$(2)) in download.lst.") \ - ),\ + $(error "fetch_Download_item: no checksum found for $($(2)). Please define $(call fetch_Download__subst_var,$(2)) in download.lst."),\ $(call fetch__Download_item,$(1),$($2),$($(call fetch_Download__subst_var,$(2 \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 95612] Page header numbering wrong in print preview using calc
https://bugs.documentfoundation.org/show_bug.cgi?id=95612 --- Comment #12 from Commit Notification--- Katarina Behrens committed a patch related to this issue. It has been pushed to "libreoffice-5-2": http://cgit.freedesktop.org/libreoffice/core/commit/?id=b95ac4bac7ae43f3f3d60738f739a75f8f8e9b6e=libreoffice-5-2 tdf#95612: Print preview: page numbering starts with 1 (not 0) It will be available in 5.2.7. 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 95612] Page header numbering wrong in print preview using calc
https://bugs.documentfoundation.org/show_bug.cgi?id=95612 Commit Notificationchanged: What|Removed |Added Whiteboard|target:5.4.0 target:5.3.2 |target:5.4.0 target:5.3.2 ||target:5.2.7 -- 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: Branch 'libreoffice-5-2' - sc/source
sc/source/ui/view/preview.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit b95ac4bac7ae43f3f3d60738f739a75f8f8e9b6e Author: Katarina BehrensDate: Wed Mar 1 17:45:16 2017 +0100 tdf#95612: Print preview: page numbering starts with 1 (not 0) unless otherwise specified. It was okay for 1st page & broken everywhere else. Possibly resolves tdf#95206 as well ... Change-Id: Ie69f770a28dd69f90d4f04ad4fa9e701fa2d56e2 Reviewed-on: https://gerrit.libreoffice.org/34759 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit c07ac0d92ad830762906586164bab466a0f05531) Reviewed-on: https://gerrit.libreoffice.org/35047 diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index a8dc240..f1ad586 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -243,18 +243,18 @@ void ScPreview::CalcPages() while (nStart > static_cast(nPages.size())) nPages.push_back(0); while (nStart > static_cast(nFirstAttr.size())) -nFirstAttr.push_back(0); +nFirstAttr.push_back(1); for (SCTAB i=nStart; i
[Libreoffice-bugs] [Bug 105320] Dragging (reordering) slides on the Slides pane deletes slides instead (gtk3?)
https://bugs.documentfoundation.org/show_bug.cgi?id=105320 --- Comment #7 from Aron Budea--- Created attachment 131838 --> https://bugs.documentfoundation.org/attachment.cgi?id=131838=edit Screencast with a bunch of attempts I had to try 7 or so times... the last attempt was successful. -- 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 106348] LibreOffice hangs opening multiple docx
https://bugs.documentfoundation.org/show_bug.cgi?id=106348 --- Comment #4 from sc...@health.qld.gov.au --- Please note that I am managing an application which incorporates "ApexOfficePrint", which calls your product to render reports. I am relaying messages only. They're feedback on your question/remark is that the method described worked best for them with earlier releases of LibreOffice as the "socket stuff" was not stable enough (apparently). They have also stated that they are reviewing this again with respect to LibreOffice 5.3. -- 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: android/source
android/source/res/menu/view_menu.xml | 25 +- android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 121 +- 2 files changed, 83 insertions(+), 63 deletions(-) New commits: commit 243476399e76fb5ad2ce8c7fbef9e224b330c706 Author: aleksandar-stefanovicDate: Sat Feb 25 11:09:22 2017 +0100 Made sort menu use radio buttons This makes it MUCH easier to see what sort option is currently selected. Removed the mechanism of switching between labels when the option is toggled, and instead put all the options into a menu. Change-Id: I44142dc842d983d5438faeb06b67046bad235308 Reviewed-on: https://gerrit.libreoffice.org/34640 Tested-by: Jenkins Reviewed-by: Aleksandar StefanoviÄ diff --git a/android/source/res/menu/view_menu.xml b/android/source/res/menu/view_menu.xml index 2b99ad1..67f0596 100644 --- a/android/source/res/menu/view_menu.xml +++ b/android/source/res/menu/view_menu.xml @@ -35,12 +35,25 @@ android:icon="@drawable/ic_sort_black_24dp" app:showAsAction="ifRoom"> - - - + + + + + + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/Module_chart2.mk
chart2/Module_chart2.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 7f09093b8bbc119f50763e1b629424cc2669628a Author: Markus MohrhardDate: Sun Mar 12 22:46:49 2017 +0100 the test seems to depend on the fonts Fixes "Random Config" tb run #289 Change-Id: Ib1d672ac0a68e977f8d32f87c730ff1b0822f32c Reviewed-on: https://gerrit.libreoffice.org/35109 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk index 0061c0a..f39140d 100644 --- a/chart2/Module_chart2.mk +++ b/chart2/Module_chart2.mk @@ -37,10 +37,11 @@ $(eval $(call gb_Module_add_slowcheck_targets,chart2,\ )) ifeq ($(ENABLE_CHART_TESTS),TRUE) +ifeq ($(WITH_FONTS), TRUE) $(eval $(call gb_Module_add_slowcheck_targets,chart2,\ CppunitTest_chart2_xshape \ )) - +endif endif $(eval $(call gb_Module_add_subsequentcheck_targets,chart2,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106504] Unable to edit this spreadsheet
https://bugs.documentfoundation.org/show_bug.cgi?id=106504 m.a.riosvchanged: What|Removed |Added Status|NEEDINFO|RESOLVED CC||miguelangelrv@libreoffice.o ||rg Resolution|--- |DUPLICATE --- Comment #3 from m.a.riosv --- Looks like a dup, please if you are not agree, reopen it. *** This bug has been marked as a duplicate of bug 75889 *** -- 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 75889] Hyperlinks in formula cells cannot be edited
https://bugs.documentfoundation.org/show_bug.cgi?id=75889 m.a.riosvchanged: What|Removed |Added CC||jonathan.camilleri@outlook. ||com --- Comment #9 from m.a.riosv --- *** Bug 106504 has been marked as a duplicate of this bug. *** -- 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 106514] =SUMMAJOSJOUKKO(Area for sum; comparing area; <=Cell)
https://bugs.documentfoundation.org/show_bug.cgi?id=106514 m.a.riosvchanged: What|Removed |Added Status|UNCONFIRMED |RESOLVED CC||miguelangelrv@libreoffice.o ||rg Resolution|--- |NOTABUG --- Comment #2 from m.a.riosv --- You can't put directly the comparison operator how you are doing, but: ;F38:F187;"<=") putting it between quotes and concatenated with the search expression. -- 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: Branch 'aoo/trunk' - solenv/bin
solenv/bin/modules/installer/patch/InstallationSet.pm | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 2bf0ec1ac35dec10af8b0beb52d9daac96e453f1 Author: Matthias SeidelDate: Sun Mar 12 20:37:33 2017 + Fixed typos diff --git a/solenv/bin/modules/installer/patch/InstallationSet.pm b/solenv/bin/modules/installer/patch/InstallationSet.pm index fecb94c..13b1f72 100644 --- a/solenv/bin/modules/installer/patch/InstallationSet.pm +++ b/solenv/bin/modules/installer/patch/InstallationSet.pm @@ -216,7 +216,7 @@ sub UnpackCab ($$$) ++$count; } -# Cleanup. Remove the temporary directory. It should be empty by now. +# Cleanup. Remove the temporary directory. It should be empty by now. rmdir($temporary_destination_path); } @@ -227,9 +227,9 @@ sub UnpackCab ($$$) Unpack the flat file structure of the $cab_filename to $destination_path. -In order to detect and handle an incomplete (arborted) previous -extraction, the cab file is unpacked to a temprorary directory -that after successful extraction is renamed to $destination_path. +In order to detect and handle an incomplete (aborted) previous +extraction, the cab file is unpacked to a temporary directory +that, after successful extraction, is renamed to $destination_path. =cut sub UnpackCabFlat ($$$) @@ -237,7 +237,7 @@ sub UnpackCabFlat ($$$) my ($cab_filename, $destination_path, $file_table) = @_; # Unpack the .cab file to a temporary path (note that -# $destination_path may alreay bee a temporary path). Using a +# $destination_path may already be a temporary path). Using a # second one prevents the lengthy flat unpacking to be repeated # when another step fails. @@ -388,7 +388,7 @@ sub Download ($$$) my $digest = undef; if ( ! defined $checksum_value) { -# No checksum available. Skip test. +# No checksum available. Skip test. } elsif ($checksum_type eq "sha256") { @@ -592,7 +592,7 @@ sub ProvideUnpackedExe ($) if ($exe_is_unpacked) { -# Yes, exe has already been unpacked. There is nothing more to do. +# Yes, exe has already been unpacked. There is nothing more to do. $installer::logger::Info->printf("downloadable installation set has already been unpacked to\n"); $installer::logger::Info->printf("%s\n", $unpacked_exe_path); return 1; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106512] Filesave - Saving a Calc file takes more than 5-15 minutes
https://bugs.documentfoundation.org/show_bug.cgi?id=106512 m.a.riosvchanged: What|Removed |Added Status|NEW |NEEDINFO CC||miguelangelrv@libreoffice.o ||rg --- Comment #3 from m.a.riosv --- I can't reproduce, only a few seconds. Version: 5.3.1.2 (x64) Build ID: e80a0e0fd1875e1696614d24c32df0f95f03deb2 CPU Threads: 4; OS Version: Windows 6.19; UI Render: default; Layout Engine: new; Locale: es-ES (es_ES); Calc: group Please try resetting the user profile, sometimes solves strange issues. https://wiki.documentfoundation.org/UserProfile Usually it's enough renaming/deleting the file "user/registrymodifications.xcu", it affects all the options in Menu/Tools/Options, and the files "user/basic/dialog.xlc" and "scrip.xlc" are overwritten, additionally custom colors in "user/config/standard.soc" are lost. -- 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 97187] Metadata fields are not being refreshed correctly when moving slider in the «Properties» dialogue of Impress
https://bugs.documentfoundation.org/show_bug.cgi?id=97187 Jean-Baptiste Faurechanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME --- Comment #4 from Jean-Baptiste Faure --- Not reproducible anymore with LO 5.2.7.0.0+ and LO 5.3.2.0.0+ both under Ubuntu 16.04 x86-64. Closing as WorksForMe. Please feel free to reopen if you still encounter this bug with a current version. Best regards. JBF -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 105933] Means to create new or modify existing table styles missing
https://bugs.documentfoundation.org/show_bug.cgi?id=105933 --- Comment #3 from Thomas Lendo--- IMHO this bug should have a higher importance because table styles without the possibility to create or modify styles are useless in a large part. Also the table style feature was prominently promoted in the release notes. -- 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 105933] Means to create new or modify existing table styles missing
https://bugs.documentfoundation.org/show_bug.cgi?id=105933 --- Comment #3 from Thomas Lendo--- IMHO this bug should have a higher importance because table styles without the possibility to create or modify styles are useless in a large part. Also the table style feature was prominently promoted in the release notes. -- 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 46928] EDITING Insert Field Filename inserts Path+Filename instead of Filename
https://bugs.documentfoundation.org/show_bug.cgi?id=46928 --- Comment #9 from Joachim Wilder--- bug is still present LO 5.3.0.3 Windows 10 -- 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: filter/source
filter/source/graphicfilter/ipict/ipict.cxx | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) New commits: commit 4cde204c297ab122b1496444aa2e31c388f621d7 Author: Caolán McNamaraDate: Sun Mar 12 21:16:57 2017 + ofz: pct oom, avoid allocation bitmap until after size checks are done Change-Id: I12817adc50d45e2f08b3b5d4cb43daa527d274e9 diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 96fc7d8..749bfaf 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -703,8 +703,9 @@ sal_uLong PictReader::ReadAndDrawText() namespace { -BitmapWriteAccess* initBitmap(Bitmap , const BitmapPalette ) +BitmapWriteAccess* initBitmap(Bitmap , sal_uInt16 nWidth, sal_uInt16 nHeight, sal_uInt16 nDstBitCount, const BitmapPalette ) { +rBitmap = Bitmap(Size(nWidth, nHeight), nDstBitCount); BitmapWriteAccess* pAcc = rBitmap.AcquireWriteAccess(); if (!pAcc) return nullptr; @@ -757,7 +758,6 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap , bool bBaseAddr, bool bColo nDstBitCount = 24; else if ( nDstBitCount == 2 ) nDstBitCount = 4; -aBitmap = Bitmap( Size( nWidth, nHeight ), nDstBitCount ); if ( bColorTable ) { @@ -788,7 +788,6 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap , bool bBaseAddr, bool bColo nRowBytes &= 0x3fff; nPixelSize = nCmpCount = nCmpSize = 1; nDataSize += 10; -aBitmap = Bitmap(Size(nWidth, nHeight), nDstBitCount); aPalette = BitmapPalette(2); aPalette[0] = BitmapColor(0xff, 0xff, 0xff); aPalette[1] = BitmapColor(0, 0, 0); @@ -857,7 +856,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap , bool bBaseAddr, bool bColo return 0x; } -if ( ( pAcc = initBitmap(aBitmap, aPalette) ) == nullptr ) +if ( ( pAcc = initBitmap(aBitmap, nWidth, nHeight, nDstBitCount, aPalette) ) == nullptr ) return 0x; for (sal_uInt16 ny = 0; ny < nHeight; ++ny) @@ -940,7 +939,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap , bool bBaseAddr, bool bColo return 0x; } -if ( ( pAcc = initBitmap(aBitmap, aPalette) ) == nullptr ) +if ( ( pAcc = initBitmap(aBitmap, nWidth, nHeight, nDstBitCount, aPalette) ) == nullptr ) return 0x; for (sal_uInt16 ny = 0; ny < nHeight; ++ny) @@ -1037,7 +1036,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap , bool bBaseAddr, bool bColo if (nWidth > nMaxCols) return 0x; -if ( ( pAcc = initBitmap(aBitmap, aPalette) ) == nullptr ) +if ( ( pAcc = initBitmap(aBitmap, nWidth, nHeight, nDstBitCount, aPalette) ) == nullptr ) return 0x; for (sal_uInt16 ny = 0; ny < nHeight; ++ny) @@ -1061,7 +1060,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap , bool bBaseAddr, bool bColo if (nWidth > nMaxCols) return 0x; -if ( ( pAcc = initBitmap(aBitmap, aPalette) ) == nullptr ) +if ( ( pAcc = initBitmap(aBitmap, nWidth, nHeight, nDstBitCount, aPalette) ) == nullptr ) return 0x; for (sal_uInt16 ny = 0; ny < nHeight; ++ny) @@ -1084,7 +1083,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap , bool bBaseAddr, bool bColo if (nHeight > pPict->remainingSize() / nByteCountSize) return 0x; -if ( ( pAcc = initBitmap(aBitmap, aPalette) ) == nullptr ) +if ( ( pAcc = initBitmap(aBitmap, nWidth, nHeight, nDstBitCount, aPalette) ) == nullptr ) return 0x; std::unique_ptr pScanline(new sal_uInt8[static_cast(nWidth) * nCmpCount]); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106516] Start of week does not come from locale in conditional formatting
https://bugs.documentfoundation.org/show_bug.cgi?id=106516 Cor Nouwschanged: What|Removed |Added Status|UNCONFIRMED |RESOLVED CC||c...@nouenoff.nl Resolution|--- |DUPLICATE --- Comment #2 from Cor Nouws --- Hey Aron, Looks as bug 70551. *** This bug has been marked as a duplicate of bug 70551 *** -- 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 106510] WIDEVEC not working when OpenGL enabled
https://bugs.documentfoundation.org/show_bug.cgi?id=106510 Johnny_Mchanged: What|Removed |Added Resolution|FIXED |WORKSFORME --- Comment #2 from Johnny_M --- The more appropriate status would be "worksforme", since nothing was fixed on this specific bug report. :) -- 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 70551] WEEKS() function uses ISO weeknum and is not locale-dependent, which is not explained in the Help
https://bugs.documentfoundation.org/show_bug.cgi?id=70551 Cor Nouwschanged: What|Removed |Added CC||ba...@caesar.elte.hu --- Comment #9 from Cor Nouws --- *** Bug 106516 has been marked as a duplicate of this bug. *** -- 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 87351] [META] Conditional formatting bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=87351 Bug 87351 depends on bug 106516, which changed state. Bug 106516 Summary: Start of week does not come from locale in conditional formatting https://bugs.documentfoundation.org/show_bug.cgi?id=106516 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106511] RSUB doesn't work with OpenGL enabled
https://bugs.documentfoundation.org/show_bug.cgi?id=106511 Johnny_Mchanged: What|Removed |Added Resolution|FIXED |WORKSFORME --- Comment #2 from Johnny_M --- The more appropriate status would be "worksforme", since nothing was fixed on this specific bug report. :) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/ixpm/xpmread.cxx |4 1 file changed, 4 insertions(+) New commits: commit 2a118816d90e8daa36a447db7cf4718830450099 Author: Caolán McNamaraDate: Sun Mar 12 21:06:23 2017 + ofz#827 avoid oom in xpms Change-Id: I323be5e042e0ccb21956def70a8c481833f43998 diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx index 6d348eb..19b3fd4 100644 --- a/vcl/source/filter/ixpm/xpmread.cxx +++ b/vcl/source/filter/ixpm/xpmread.cxx @@ -160,6 +160,10 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic ) mbStatus = false; if ( ( mnWidth * mnCpp ) >= XPMSTRINGBUF ) mbStatus = false; +//xpms are a minimum of one character (one byte) per pixel, so if the file isn't +//even that long, its not all there +if (mrIStm.remainingSize() < static_cast(mnWidth) * mnHeight) +mbStatus = false; if ( mbStatus && mnWidth && mnHeight && mnColors && mnCpp ) { mnIdentifier = XPMCOLORS; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 71098] PAGE-BREAK: sub-documents force a page-break when inserted in the master document
https://bugs.documentfoundation.org/show_bug.cgi?id=71098 --- Comment #9 from Thomas Lendo--- Created attachment 131837 --> https://bugs.documentfoundation.org/attachment.cgi?id=131837=edit ZIP archive with master document and sub-document Created with LibO version: 5.3.0.3 Build ID: 1:5.3.0~rc3-0ubuntu1~trusty1.1 CPU Threads: 2; OS Version: Linux 3.13; UI Render: default; VCL: gtk2; Layout Engine: new; Locale: de-AT (de_DE.UTF-8); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71098] PAGE-BREAK: sub-documents force a page-break when inserted in the master document
https://bugs.documentfoundation.org/show_bug.cgi?id=71098 Thomas Lendochanged: What|Removed |Added CC||thomas.le...@gmail.com Hardware|x86-64 (AMD64) |All Version|5.0.0.5 release |4.1.2.3 release OS|Linux (All) |All --- Comment #8 from Thomas Lendo --- I tested this bug with LibO 5.3.0.3. The files in the attachment from 2013-10-31 behave as described from the bug reporter: a page break is automatically inserted before the sub-document is shown. But I created a new file and there is no page break. Therefore I would suggest to close this bug as RESOLVED WORKSFORME. Can someone else conform this? -- 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 87351] [META] Conditional formatting bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=87351 Aron Budeachanged: What|Removed |Added Depends on||86941 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=86941 [Bug 86941] add more conditional formatting unit tests -- 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 86941] add more conditional formatting unit tests
https://bugs.documentfoundation.org/show_bug.cgi?id=86941 Aron Budeachanged: What|Removed |Added Blocks||87351 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=87351 [Bug 87351] [META] Conditional formatting bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106516] Start of week does not come from locale in conditional formatting
https://bugs.documentfoundation.org/show_bug.cgi?id=106516 Aron Budeachanged: What|Removed |Added Keywords||implementationError Version|Inherited From OOo |4.0.0.3 release Blocks||87351 --- Comment #1 from Aron Budea --- First version "Date is" option is available from is 4.0.0.3. Also tested with 5.3.1.2. Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=87351 [Bug 87351] [META] Conditional formatting bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 87351] [META] Conditional formatting bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=87351 Aron Budeachanged: What|Removed |Added Depends on||106516 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=106516 [Bug 106516] Start of week does not come from locale in conditional formatting -- 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 106516] New: Start of week does not come from locale in conditional formatting
https://bugs.documentfoundation.org/show_bug.cgi?id=106516 Bug ID: 106516 Summary: Start of week does not come from locale in conditional formatting Product: LibreOffice Version: Inherited From OOo Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: ba...@caesar.elte.hu Created attachment 131836 --> https://bugs.documentfoundation.org/attachment.cgi?id=131836=edit Screenshot In an empty spreadsheet I set A1-A20 to 2017-03-01 to 03-20, and set conditional formatting with condition: Date is / This week / Apply Style: Warning. This colors text in the relevant cells red. Today is a beautiful Sunday (2017-03-12), and my locale is set to Hungarian (relevant detail: start of the week is Monday). Bug: Calc considers week from Sunday to Saturday instead of Monday to Sunday (based on locale). See cells A12-A18 in attached screenshot. Markus' comment from IRC: <@moggi> bearon: good point with sunday vs monday, can you open a bug report? it is hard coded in the code -- 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 41063] Saving/Autosaving (Save/Autosave) while in table causes view to jump to cursor position
https://bugs.documentfoundation.org/show_bug.cgi?id=41063 Heiko Tietzechanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||6374 -- 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 106374] VIEWING: Document canvas view jumps to beginning of index after updating
https://bugs.documentfoundation.org/show_bug.cgi?id=106374 Heiko Tietzechanged: What|Removed |Added Keywords|needsUXEval | See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=41 ||063 --- Comment #4 from Heiko Tietze --- The issue is similar to bug 41063 (and maybe to bug 95797 where kendy solved a regression). I don't see any reason to change the cursor position on save. At least from the user POV it must stick to the current place. Stuart added some more situations, i.e. auto save and restore edit view as well as reopen that has to be considered. PS: Haven't tested the issue myself, so keep UNCONFIRMED. -- 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 106374] VIEWING: Document canvas view jumps to beginning of index after updating
https://bugs.documentfoundation.org/show_bug.cgi?id=106374 Heiko Tietzechanged: What|Removed |Added Keywords|needsUXEval | See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=41 ||063 --- Comment #4 from Heiko Tietze --- The issue is similar to bug 41063 (and maybe to bug 95797 where kendy solved a regression). I don't see any reason to change the cursor position on save. At least from the user POV it must stick to the current place. Stuart added some more situations, i.e. auto save and restore edit view as well as reopen that has to be considered. PS: Haven't tested the issue myself, so keep UNCONFIRMED. -- 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 41063] Saving/Autosaving (Save/Autosave) while in table causes view to jump to cursor position
https://bugs.documentfoundation.org/show_bug.cgi?id=41063 Heiko Tietzechanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||6374 -- 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 106507] Small enhancement to bullet formatting toolbar: Add 4 more default bullet types
https://bugs.documentfoundation.org/show_bug.cgi?id=106507 Heiko Tietzechanged: What|Removed |Added Status|UNCONFIRMED |NEW CC|tietze.he...@gmail.com | Ever confirmed|0 |1 --- Comment #7 from Heiko Tietze --- (In reply to V Stuart Foote from comment #4) > With the Format -> Bullets and Numbering dialog the Bullet tab (along with > Numbering, Outline) currently holds 8 sample tiles at a "page" layout ratio > showing 3 bulleted samples. Different characters for bullets can be entered at the customization tab. But the default, better called "quick selection", remains as it is. That's awkward since we do not want to predetermine a certain look and feel. So my suggestion would be to rework this dialog and have a selection/modification approach similar to what we did at the area fill style. (Would bet there is a ticket for this idea.) Anyway, I like the “Halbgeviertstrich” since it contributes to the typographical standardization. -- 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 106507] Small enhancement to bullet formatting toolbar: Add 4 more default bullet types
https://bugs.documentfoundation.org/show_bug.cgi?id=106507 Heiko Tietzechanged: What|Removed |Added Status|UNCONFIRMED |NEW CC|tietze.he...@gmail.com | Ever confirmed|0 |1 --- Comment #7 from Heiko Tietze --- (In reply to V Stuart Foote from comment #4) > With the Format -> Bullets and Numbering dialog the Bullet tab (along with > Numbering, Outline) currently holds 8 sample tiles at a "page" layout ratio > showing 3 bulleted samples. Different characters for bullets can be entered at the customization tab. But the default, better called "quick selection", remains as it is. That's awkward since we do not want to predetermine a certain look and feel. So my suggestion would be to rework this dialog and have a selection/modification approach similar to what we did at the area fill style. (Would bet there is a ticket for this idea.) Anyway, I like the “Halbgeviertstrich” since it contributes to the typographical standardization. -- 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
Ximeng Zu 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 106513] [Feature request] Optical margin alignment
https://bugs.documentfoundation.org/show_bug.cgi?id=106513 Regina Henschelchanged: What|Removed |Added Status|UNCONFIRMED |NEW CC||rb.hensc...@t-online.de Ever confirmed|0 |1 Severity|normal |enhancement --- Comment #1 from Regina Henschel --- In German "Optischer Randausgleich", sometimes to be find by term "character protrusion". The feature is available in InDesign, Scribus and PdfTeX. It is a valid request. -- 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: include/filter lotuswordpro/source odk/examples offapi/com officecfg/registry qadevOOo/tests shell/source
include/filter/msfilter/svdfppt.hxx |2 - lotuswordpro/source/filter/xfilter/xfdrawobj.hxx |2 - lotuswordpro/source/filter/xfilter/xfparastyle.hxx | 14 +- odk/examples/DevelopersGuide/Database/CodeSamples.java |2 - odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java |2 - odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java |4 +- odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java |2 - odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml |2 - odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml |2 - offapi/com/sun/star/accessibility/AccessibleEventId.idl |2 - offapi/com/sun/star/chart/Diagram.idl |2 - offapi/com/sun/star/util/PathSubstitution.idl |2 - officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 - qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java |6 ++-- shell/source/win32/spsupp/COMOpenDocuments.cxx |2 - 15 files changed, 24 insertions(+), 24 deletions(-) New commits: commit 127b2e59995f3abcf1593138cd27af9f375d7b1b Author: Andrea GelminiDate: Sun Mar 12 17:03:26 2017 +0100 Fix typos Change-Id: I63da858b3f264cd099e60192633b44d362b6fad7 Reviewed-on: https://gerrit.libreoffice.org/35055 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index d83be89..f6f1c49 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -238,7 +238,7 @@ struct PptSlidePersistAtom sal_uInt32 nFlags; sal_uInt32 nNumberTexts; sal_uInt32 nSlideId; -sal_uInt32 nReserved; // we will use nReserved temporarly to set the offset to SSSlideInfoAtom ( if possible ) +sal_uInt32 nReserved; // we will use nReserved temporarily to set the offset to SSSlideInfoAtom ( if possible ) public: PptSlidePersistAtom() { Clear(); } diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx index 3c4292a..3d0760b 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx @@ -74,7 +74,7 @@ * Base class for all drawing object(ellipse,rect,circle,...). * I can set Positions,anchor,rotate,text style name here. * - * Drawing objects can be rotated,scaled and skewed, drawing objects must have positions setted, + * Drawing objects can be rotated, scaled and skewed, drawing objects must have positions set, * you can use SetPosition(...). */ class XFDrawObject : public XFFrame diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx index 07f4c70..c73e346 100644 --- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx @@ -102,7 +102,7 @@ public: public: /** - * @descr Set layout for the paragraph.When such property was setted, this paragraph will + * @descr Set layout for the paragraph. When such property was set, this paragraph will * start at an new page. */ voidSetMasterPage(const OUString& master); @@ -111,7 +111,7 @@ public: /** * @descr set the paragraph default font. - * @param font font object to be setted.Font object are deleted by font-factory,so + * @param font object to be set. Font object is deleted by font-factory, so * don't delete it in the destructure function of para style. */ voidSetFont(rtl::Reference const & font); @@ -122,14 +122,14 @@ public: const rtl::Reference& GetFont(){ return m_pFont; } /** - * @descr Set the indent of the paragraph.This is the indent for + * @descr Set the indent of the paragraph. This is the indent for the first line. * @param indent value of the first-line indent. */ voidSetIndent(double indent ); /** - * @descr Set the padding of the paragraph.This is the distance + * @descr Set the padding of the paragraph. This is the distance between the border and the top of the text. * @param indent value of the padding. */ @@ -149,7 +149,7 @@
[Libreoffice-bugs] [Bug 106507] Small enhancement to bullet formatting toolbar: Add 4 more default bullet types
https://bugs.documentfoundation.org/show_bug.cgi?id=106507 --- Comment #6 from V Stuart Foote--- (In reply to Gerry from comment #5) > (In reply to V Stuart Foote from comment #4) > Do I understand correctly that you wouldn't see a technical problem with the > addition of the four more default bullet types to the bullet split button of > the formatting toolbar? > > But, as you describe, the problem you describe appears in the Format -> > Bullets and Numbering dialog. Wouldn't it be possible to add a vertical > scrollbar to the bullet tab in that dialog to cater for the four new bullet > types? You find such a vertical scrollbar in the Format -> Bullets and > Numbering -> Image tab. Would that be a solution? Sure, we could refactor from a fixed list of 8 styles, and change the dimensions of the tiles for Bullet, and add a scroll bar if there were more than one additional row. But we'd have to deal with providing tooltips. The Image selection simply links to path for the SVG/GIF/PNG extracted from the LO share\Gallery As is, tool tips for the existing are a mess, current check Mark bullets shows the "✗" Ballot X (U+2717), while Tick mark bullets shows the "✔" Heavy Check Mark (U+2714). I'm just not sure that we gain anything, some simple corrections here (even add your preferred U+2013 EN DASH to the Tick mark default) rather that complete refactoring just to add another row. =-ref-= http://opengrok.libreoffice.org/xref/core/svx/source/dialog/svxbmpnumvalueset.src#22 -- 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 106507] Small enhancement to bullet formatting toolbar: Add 4 more default bullet types
https://bugs.documentfoundation.org/show_bug.cgi?id=106507 --- Comment #6 from V Stuart Foote--- (In reply to Gerry from comment #5) > (In reply to V Stuart Foote from comment #4) > Do I understand correctly that you wouldn't see a technical problem with the > addition of the four more default bullet types to the bullet split button of > the formatting toolbar? > > But, as you describe, the problem you describe appears in the Format -> > Bullets and Numbering dialog. Wouldn't it be possible to add a vertical > scrollbar to the bullet tab in that dialog to cater for the four new bullet > types? You find such a vertical scrollbar in the Format -> Bullets and > Numbering -> Image tab. Would that be a solution? Sure, we could refactor from a fixed list of 8 styles, and change the dimensions of the tiles for Bullet, and add a scroll bar if there were more than one additional row. But we'd have to deal with providing tooltips. The Image selection simply links to path for the SVG/GIF/PNG extracted from the LO share\Gallery As is, tool tips for the existing are a mess, current check Mark bullets shows the "✗" Ballot X (U+2717), while Tick mark bullets shows the "✔" Heavy Check Mark (U+2714). I'm just not sure that we gain anything, some simple corrections here (even add your preferred U+2013 EN DASH to the Tick mark default) rather that complete refactoring just to add another row. =-ref-= http://opengrok.libreoffice.org/xref/core/svx/source/dialog/svxbmpnumvalueset.src#22 -- 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 102930] [LOCALHELP] Review and complete the mail merge help pages
https://bugs.documentfoundation.org/show_bug.cgi?id=102930 Gabor Kelemenchanged: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |kelem...@ubuntu.com |desktop.org | -- 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 106347] BASIC: word Null is recognized in string
https://bugs.documentfoundation.org/show_bug.cgi?id=106347 raalchanged: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |WORKSFORME --- Comment #4 from raal --- I can reproduce only sometimes, so closing for now. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 91178] FILEOPEN: docx table export loses table spacing
https://bugs.documentfoundation.org/show_bug.cgi?id=91178 Xisco Faulíchanged: What|Removed |Added CC||xiscofa...@libreoffice.org Version|4.4.2.2 release |Inherited From OOo --- Comment #3 from Xisco Faulí --- Reproduced in LibreOffice 3.3.0 OOO330m19 (Build:6) tag libreoffice-3.3.0.4 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106350] FORMATTING: literal tab \0x09 in text in cell lost after FILESAVE/FILEOPEN
https://bugs.documentfoundation.org/show_bug.cgi?id=106350 raalchanged: What|Removed |Added CC||r...@post.cz --- Comment #3 from raal --- (In reply to James D Howard from comment #2) > This is distinctly UN-like Excel, which preserves Please attach excel test file for easy reproduce. Thanks. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106507] Small enhancement to bullet formatting toolbar: Add 4 more default bullet types
https://bugs.documentfoundation.org/show_bug.cgi?id=106507 --- Comment #5 from Gerry--- (In reply to V Stuart Foote from comment #4) Thanks a lot Stuart for looking into the bug and for the technical description. Do I understand correctly that you wouldn't see a technical problem with the addition of the four more default bullet types to the bullet split button of the formatting toolbar? But, as you describe, the problem you describe appears in the Format -> Bullets and Numbering dialog. Wouldn't it be possible to add a vertical scrollbar to the bullet tab in that dialog to cater for the four new bullet types? You find such a vertical scrollbar in the Format -> Bullets and Numbering -> Image tab. Would that be a solution? -- 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 106507] Small enhancement to bullet formatting toolbar: Add 4 more default bullet types
https://bugs.documentfoundation.org/show_bug.cgi?id=106507 --- Comment #5 from Gerry--- (In reply to V Stuart Foote from comment #4) Thanks a lot Stuart for looking into the bug and for the technical description. Do I understand correctly that you wouldn't see a technical problem with the addition of the four more default bullet types to the bullet split button of the formatting toolbar? But, as you describe, the problem you describe appears in the Format -> Bullets and Numbering dialog. Wouldn't it be possible to add a vertical scrollbar to the bullet tab in that dialog to cater for the four new bullet types? You find such a vertical scrollbar in the Format -> Bullets and Numbering -> Image tab. Would that be a solution? -- 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 93681] FILEOPEN: PPTX Import reverse order of columns in a right-to-left table
https://bugs.documentfoundation.org/show_bug.cgi?id=93681 Xisco Faulíchanged: What|Removed |Added Hardware|Other |All Version|5.0.0.5 release |Inherited From OOo --- Comment #5 from Xisco Faulí --- Reproduced in LibreOffice 3.3.0 OOO330m19 (Build:6) tag libreoffice-3.3.0.4 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106514] =SUMMAJOSJOUKKO(Area for sum; comparing area; <=Cell)
https://bugs.documentfoundation.org/show_bug.cgi?id=106514 raalchanged: What|Removed |Added CC||r...@post.cz --- Comment #1 from raal --- Please attach test file. Thank you -- 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 98876] FILEOPEN:image color is degraded when open pptx file
https://bugs.documentfoundation.org/show_bug.cgi?id=98876 Xisco Faulíchanged: What|Removed |Added CC||xiscofa...@libreoffice.org Version|5.1.1.3 release |Inherited From OOo --- Comment #2 from Xisco Faulí --- Reproduced in LibreOffice 3.3.0 OOO330m19 (Build:6) tag libreoffice-3.3.0.4 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 104848] [META] DOC file opening issues
https://bugs.documentfoundation.org/show_bug.cgi?id=104848 Bug 104848 depends on bug 105570, which changed state. Bug 105570 Summary: FILEOPEN DOC Table duplicated (tripled) https://bugs.documentfoundation.org/show_bug.cgi?id=105570 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106515] lcl_GetDefaultBulletFont font set to legacy "StarSymbol" so unexpected system font fallback occurs
https://bugs.documentfoundation.org/show_bug.cgi?id=106515 --- Comment #1 from V Stuart Foote--- (In reply to V Stuart Foote from comment #0) > lcl_GetDefaultBulletFont [2] s/[2]/[1]/ -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 105318] Behavior of Special Character dialog on launch when font at edit cursor is not installed and fallback occurs
https://bugs.documentfoundation.org/show_bug.cgi?id=105318 V Stuart Footechanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||6515 -- 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 105318] Behavior of Special Character dialog on launch when font at edit cursor is not installed and fallback occurs
https://bugs.documentfoundation.org/show_bug.cgi?id=105318 V Stuart Footechanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||6515 -- 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 92657] Questionable Default for Bullet Sizing
https://bugs.documentfoundation.org/show_bug.cgi?id=92657 V Stuart Footechanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||6515 -- 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 106515] lcl_GetDefaultBulletFont font set to legacy "StarSymbol" so unexpected system font fallback occurs
https://bugs.documentfoundation.org/show_bug.cgi?id=106515 V Stuart Footechanged: What|Removed |Added CC||caol...@redhat.com, ||khaledho...@eglug.org, ||vstuart.fo...@utsa.edu See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=92 ||657, ||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||5318 -- 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 106507] Small enhancement to bullet formatting toolbar: Add 4 more default bullet types
https://bugs.documentfoundation.org/show_bug.cgi?id=106507 V Stuart Footechanged: What|Removed |Added CC||vstuart.fo...@utsa.edu See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||6515 --- Comment #4 from V Stuart Foote --- Not a fan as presented. With the Format -> Bullets and Numbering dialog the Bullet tab (along with Numbering, Outline) currently holds 8 sample tiles at a "page" layout ratio showing 3 bulleted samples. Because we would not change the dimensions of the Dialog, the layout for the Bullets tab would have to be adjusted to fit more than 8 samples in the same frame. This is how the Image/Linked graphic tab is configured. So the Bullets tab of the dialog could be changed to add an extra rows of 4 as in the Image tab, perhaps also including a button action for selecting and sizing a glyph via the Special Character dialog. But, as the dialog functions now, any one sample tile and corresponding style can be adjusted from the Customize dialog (either bullets, numbering, outline or Image/linked graphic). So this is strictly a request to change the default 8 tiles to having more bullet styles show--it is not a functional requirement as you can already customize the bullet style once applied to use any glyph(s) from any font. As an aside, the glyphs for the currently displayed bullets are all draw from OpenSymbol font not Cantarell. And when customizing bullets the Special Character dialog should be opening to OpenSymbol--but is incorrectly opening to a system font (Segoe UI in my case on Windows 10). Just opened see also bug 106515 =-ref-= http://opengrok.libreoffice.org/xref/core/svx/source/dialog/svxbmpnumvalueset.cxx#379 -- 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 106515] lcl_GetDefaultBulletFont font set to legacy "StarSymbol" so unexpected system font fallback occurs
https://bugs.documentfoundation.org/show_bug.cgi?id=106515 V Stuart Footechanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||6507 -- 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 106507] Small enhancement to bullet formatting toolbar: Add 4 more default bullet types
https://bugs.documentfoundation.org/show_bug.cgi?id=106507 V Stuart Footechanged: What|Removed |Added CC||vstuart.fo...@utsa.edu See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||6515 --- Comment #4 from V Stuart Foote --- Not a fan as presented. With the Format -> Bullets and Numbering dialog the Bullet tab (along with Numbering, Outline) currently holds 8 sample tiles at a "page" layout ratio showing 3 bulleted samples. Because we would not change the dimensions of the Dialog, the layout for the Bullets tab would have to be adjusted to fit more than 8 samples in the same frame. This is how the Image/Linked graphic tab is configured. So the Bullets tab of the dialog could be changed to add an extra rows of 4 as in the Image tab, perhaps also including a button action for selecting and sizing a glyph via the Special Character dialog. But, as the dialog functions now, any one sample tile and corresponding style can be adjusted from the Customize dialog (either bullets, numbering, outline or Image/linked graphic). So this is strictly a request to change the default 8 tiles to having more bullet styles show--it is not a functional requirement as you can already customize the bullet style once applied to use any glyph(s) from any font. As an aside, the glyphs for the currently displayed bullets are all draw from OpenSymbol font not Cantarell. And when customizing bullets the Special Character dialog should be opening to OpenSymbol--but is incorrectly opening to a system font (Segoe UI in my case on Windows 10). Just opened see also bug 106515 =-ref-= http://opengrok.libreoffice.org/xref/core/svx/source/dialog/svxbmpnumvalueset.cxx#379 -- 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 105320] Dragging (reordering) slides on the Slides pane deletes slides instead (gtk3?)
https://bugs.documentfoundation.org/show_bug.cgi?id=105320 Aron Budeachanged: What|Removed |Added Status|UNCONFIRMED |NEW CC||ba...@caesar.elte.hu Ever confirmed|0 |1 --- Comment #6 from Aron Budea --- I could reproduce this with a recent master build / Ubuntu 16.10. Not sure what are the exact requirements, because sometimes it worked, other times it didn't. What seemed to yield the best chances is to move the slide until it shows the little box in its new place, then move the cursor up a bit. I'll try to create a screencast later. Version: 5.4.0.0.alpha0+ Build ID: 98a03d9b0d13b8f811ccf8fc1a9b7f9469ed079c CPU threads: 4; OS: Linux 4.8; UI render: default; VCL: gtk3; Locale: en-US (en_US.UTF-8); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106515] New: lcl_GetDefaultBulletFont font set to legacy "StarSymbol" so unexpected system font fallback occurs
https://bugs.documentfoundation.org/show_bug.cgi?id=106515 Bug ID: 106515 Summary: lcl_GetDefaultBulletFont font set to legacy "StarSymbol" so unexpected system font fallback occurs Product: LibreOffice Version: 3.3.0 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: graphics stack Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: vstuart.fo...@utsa.edu Description: lcl_GetDefaultBulletFont [2] sets Bullet font to StarSymbol which of course was dropped from OOo before LO. The OpenSymbol glyphs are picked up in UI, but with non-existent StarSymbol font called while setting Options/Customization a font fallback occurs and System selected font is substituted and displayed for use in the Special Character dialog. On Windows 8, 8.1 and 10 that is Segoe UI -- so Unicode page displayed in LO Special Character dialog is very disjointed. Believe this should probably have been changed in OOo era, when other adjustments were made to the bullet list [2], but it remains. At this point seems we should change the font from defunct StarSymbol to OpenSymbol [1]. The remaining PUA glyph assignment for BLACK DIAMOND SUIT U+e00c and BLACK SQUARE U+e00a to their OpenSymbol Unicode value of U+2666 and U+25a0 respective [3] Steps to Reproduce: n/a Actual Results: n/a Expected Results: n/a Reproducible: Always User Profile Reset: Yes Additional Info: =-refs-= [1] http://opengrok.libreoffice.org/xref/core/svx/source/dialog/svxbmpnumvalueset.cxx#81 http://opengrok.libreoffice.org/xref/core/svx/source/sidebar/nbdtmg.cxx#66 http://opengrok.libreoffice.org/xref/core/cui/source/tabpages/numpages.cxx#160 [2] https://bugs.documentfoundation.org/show_bug.cgi?id=92657#c14 [3] http://opengrok.libreoffice.org/xref/core/svx/source/dialog/svxbmpnumvalueset.cxx#69 http://opengrok.libreoffice.org/xref/core/cui/source/tabpages/numpages.cxx#134 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:51.0) Gecko/20100101 Firefox/51.0 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106421] Help article 02010000.xhp -- notation of "Apply Style" should read "Set Paragraph Style"
https://bugs.documentfoundation.org/show_bug.cgi?id=106421 Buovjagachanged: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106511] RSUB doesn't work with OpenGL enabled
https://bugs.documentfoundation.org/show_bug.cgi?id=106511 Pierre Cchanged: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED --- Comment #1 from Pierre C --- All works fine with latest LO 5.3.2.0+ I close the bug -- 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 106510] WIDEVEC not working when OpenGL enabled
https://bugs.documentfoundation.org/show_bug.cgi?id=106510 Pierre Cchanged: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED --- Comment #1 from Pierre C --- All works fine with latest LO 5.3.2.0+ I close the bug -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.1-22'
Tag 'cp-5.1-22' created by Andras Timarat 2017-03-12 17:42 + cp-5.1-22 Changes since cp-5.1-21-35: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.1-22'
Tag 'cp-5.1-22' created by Andras Timarat 2017-03-12 17:42 + cp-5.1-22 Changes since cp-5.1-9-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.1-22'
Tag 'cp-5.1-22' created by Andras Timarat 2017-03-12 17:42 + cp-5.1-22 Changes since libreoffice-5-1-branch-point-11: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.1-22'
Tag 'cp-5.1-22' created by Andras Timarat 2017-03-12 17:42 + cp-5.1-22 Changes since cp-5.1-17: Andras Timar (1): tdf#105396 update German dictionaries --- de/README_extension_owner.txt | 11 de/README_hyph_de.txt |5 de/README_thesaurus.txt |4 de/de_AT_frami.aff|4 de/de_AT_frami.dic|12602 - de/de_CH_frami.aff|4 de/de_CH_frami.dic|12460 - de/de_DE_frami.aff|4 de/de_DE_frami.dic|12574 - de/description.xml|2 de/hyph_de_AT.dic |74431 +++- de/hyph_de_CH.dic |74429 +++- de/hyph_de_DE.dic |74427 +++- de/th_de_CH_v2.dat|95202 ++--- de/th_de_DE_v2.dat|95282 ++ 15 files changed, 360559 insertions(+), 90882 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 081188442b1f5ed22df150e620cc81f1cf43f7ff Author: Andras TimarDate: Sun Mar 12 18:41:58 2017 +0100 Bump version to 5.1-22 Change-Id: Ib9fb351996cd63280cc138f43c900b97b9beaf40 diff --git a/configure.ac b/configure.ac index cc7599f..acfa086 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.21],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.22],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106514] New: =SUMMAJOSJOUKKO(Area for sum; comparing area; <=Cell)
https://bugs.documentfoundation.org/show_bug.cgi?id=106514 Bug ID: 106514 Summary: =SUMMAJOSJOUKKO(Area for sum;comparing area;<=Cell) Product: LibreOffice Version: 5.3.0.3 release Hardware: x86-64 (AMD64) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: m1k4.nikk...@gmail.com Created attachment 131835 --> https://bugs.documentfoundation.org/attachment.cgi?id=131835=edit Picture from function help tool Hello Support No empty cell what to sum but there is 0 in cell value area and gives error message 510. in my meaning i want to count sum from specific huge area what includes datasheet values 0-1, from given cell sum areavalue 0-25 area text is in finnish but i link picture from it Comparing area is from 1 to 150 So sum count area is only from less and equal from value i search Yours, Mika Nikkari -- 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 105538] Download destination folder should be default to Download folder on Windows
https://bugs.documentfoundation.org/show_bug.cgi?id=105538 Volgachanged: What|Removed |Added Blocks||60251 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=60251 [Bug 60251] [META] ACCESSIBILITY: Tracking Windows OS accessibility and AT issues -- 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 60251] [META] ACCESSIBILITY: Tracking Windows OS accessibility and AT issues
https://bugs.documentfoundation.org/show_bug.cgi?id=60251 Volgachanged: What|Removed |Added Depends on||105538 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=105538 [Bug 105538] Download destination folder should be default to Download folder on 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-ux-advise] [Bug 105538] Download destination folder should be default to Download folder on Windows
https://bugs.documentfoundation.org/show_bug.cgi?id=105538 Volgachanged: What|Removed |Added Blocks||60251 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=60251 [Bug 60251] [META] ACCESSIBILITY: Tracking Windows OS accessibility and AT issues -- 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-commits] core.git: Branch 'distro/collabora/cp-5.1' - desktop/CppunitTest_desktop_app.mk desktop/source
desktop/CppunitTest_desktop_app.mk |1 desktop/source/app/cmdlineargs.cxx | 90 - 2 files changed, 90 insertions(+), 1 deletion(-) New commits: commit 731f073f1ff469e446da68c2c75f0ad8ff86c299 Author: Mike KaganskiDate: Mon Mar 6 16:09:54 2017 +0300 tdf#106359: Open Web Query (.iqy) files As per http://support.microsoft.com/kb/157482, the files are plain-text files with an URL and optional GET and POST parameters (static and dynamic). This commit introduces basic support to open these files (without support for POST and dynamic parameters). Reviewed-on: https://gerrit.libreoffice.org/34928 Tested-by: Jenkins Reviewed-by: Mike Kaganski (cherry picked from commit 099f9406b6657a03a37fbe5cedf7cb7da765d4aa) Change-Id: Ib733c97780d363243644247196402f402c495cd1 Reviewed-on: https://gerrit.libreoffice.org/35011 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/desktop/CppunitTest_desktop_app.mk b/desktop/CppunitTest_desktop_app.mk index 1275b6e..af036f8 100644 --- a/desktop/CppunitTest_desktop_app.mk +++ b/desktop/CppunitTest_desktop_app.mk @@ -18,6 +18,7 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_app, \ cppu \ cppuhelper \ sal \ +ucbhelper \ sofficeapp \ )) diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 81704e7..dc7873c 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -36,7 +36,9 @@ #include -#include +#include +#include +#include using namespace com::sun::star::lang; using namespace com::sun::star::uri; @@ -165,6 +167,89 @@ CommandLineEvent CheckOfficeURI(/* in,out */ OUString& arg, CommandLineEvent cur return curEvt; } +// Skip single newline (be it *NIX LF, MacOS CR, of Win CRLF) +// Changes the offset, and returns true if moved +bool SkipNewline(const char* pStr, sal_Int32& rOffset) +{ +if ((pStr[rOffset] != '\r') && (pStr[rOffset] != '\n')) +return false; +if (pStr[rOffset] == '\r') +++rOffset; +if (pStr[rOffset] == '\n') +++rOffset; +return true; +} + +// Web query: http://support.microsoft.com/kb/157482 +CommandLineEvent CheckWebQuery(/* in,out */ OUString& arg, CommandLineEvent curEvt) +{ +// Only handle files with extension .iqy +if (!arg.endsWithIgnoreAsciiCase(".iqy")) +return curEvt; + +static osl::Mutex aMutex; +osl::MutexGuard aGuard(aMutex); + +try +{ +OUString sFileURL; +if (osl::FileBase::getFileURLFromSystemPath(arg, sFileURL) != osl::FileBase::RC::E_None) +return curEvt; +css::uno::Reference < css::ucb::XCommandEnvironment > xEnv; +ucbhelper::Content aSourceContent(sFileURL, xEnv, comphelper::getProcessComponentContext()); + +// the file can be opened readonly, no locking will be done +css::uno::Reference< css::io::XInputStream > xInput = aSourceContent.openStream(); +if (!xInput.is()) +return curEvt; + +const sal_Int32 nBufLen = 32000; +css::uno::Sequence< sal_Int8 > aBuffer(nBufLen); +sal_Int32 nRead = xInput->readBytes(aBuffer, nBufLen); +if (nRead < 8) // WEB\n1\n... +return curEvt; + +const char* sBuf = reinterpret_cast(aBuffer.getConstArray()); +sal_Int32 nOffset = 0; +if (strncmp(sBuf+nOffset, "WEB", 3) != 0) +return curEvt; +nOffset += 3; +if (!SkipNewline(sBuf, nOffset)) +return curEvt; +if (sBuf[nOffset] != '1') +return curEvt; +++nOffset; +if (!SkipNewline(sBuf, nOffset)) +return curEvt; + +rtl::OStringBuffer aResult(nRead); +do +{ +// xInput->readBytes() can relocate buffer +sBuf = reinterpret_cast(aBuffer.getConstArray()); +const char* sPos = sBuf + nOffset; +const char* sPos1 = sPos; +const char* sEnd = sBuf + nRead; +while ((sPos1 < sEnd) && (*sPos1 != '\r') && (*sPos1 != '\n')) +++sPos1; +aResult.append(sPos, sPos1 - sPos); +if (sPos1 < sEnd) // newline +break; +nOffset = 0; +} while ((nRead = xInput->readBytes(aBuffer, nBufLen)) > 0); + +xInput->closeInput(); + +arg = OUString::createFromAscii(aResult.getStr()); +} +catch (...) +{ +SAL_WARN("desktop.app", "An error processing Web Query file: " << arg); +} + +return curEvt; +} + } // namespace CommandLineArgs::Supplier::Exception::Exception() {} @@ -525,6 +610,9 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) // and put real URI to aArg
[Libreoffice-bugs] [Bug 38159] Better full text justification with auto character scaling and paragraph level adjustment
https://bugs.documentfoundation.org/show_bug.cgi?id=38159 Johnny_Mchanged: What|Removed |Added Blocks||71732 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=71732 [Bug 71732] [META] Bugs related to text rendering, typography and font features in LO -- 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