[Libreoffice-commits] online.git: net/Socket.hpp net/WebSocketHandler.hpp
net/Socket.hpp | 16 ++-- net/WebSocketHandler.hpp |2 +- 2 files changed, 7 insertions(+), 11 deletions(-) New commits: commit 8932a1e92e9dbe61841a92d970751ecc41f32a80 Author: Ashod NakashianDate: Mon Apr 3 01:02:35 2017 -0400 wsd: remove LOOL_CHECK_THREADS isCorrectThread now always checks with ENABLE_DEBUG. Change-Id: I2b5747f3ab18c8ebdbc92e7ffc86a2469b8c7d13 Reviewed-on: https://gerrit.libreoffice.org/36038 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/net/Socket.hpp b/net/Socket.hpp index 7d227732..9cf83c49 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -195,7 +195,7 @@ public: #endif } -virtual bool isCorrectThread(bool hard = false) +virtual bool isCorrectThread() { #if ENABLE_DEBUG const bool sameThread = std::this_thread::get_id() == _owner; @@ -204,12 +204,8 @@ public: _owner << " but called from 0x" << std::this_thread::get_id() << " (" << std::dec << Util::getThreadId() << ")."); -if (hard) -return sameThread; -else -return !getenv("LOOL_CHECK_THREADS") || sameThread; +return sameThread; #else -(void)hard; return true; #endif } @@ -455,7 +451,7 @@ public: { assert(socket); assert(isCorrectThread()); -assert(socket->isCorrectThread(true)); +assert(socket->isCorrectThread()); auto it = std::find(_pollSockets.begin(), _pollSockets.end(), socket); assert(it != _pollSockets.end()); @@ -650,7 +646,7 @@ public: /// Send data to the socket peer. void send(const char* data, const int len, const bool flush = true) { -assert(isCorrectThread(true)); +assert(isCorrectThread()); if (data != nullptr && len > 0) { _outBuffer.insert(_outBuffer.end(), data, data + len); @@ -732,7 +728,7 @@ protected: HandleResult handlePoll(std::chrono::steady_clock::time_point now, const int events) override { -assert(isCorrectThread(true)); +assert(isCorrectThread()); _socketHandler->checkTimeout(now); @@ -800,7 +796,7 @@ protected: /// Override to write data out to socket. virtual void writeOutgoingData() { -assert(isCorrectThread(true)); +assert(isCorrectThread()); assert(!_outBuffer.empty()); do { diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp index 0cf63a36..8d689de3 100644 --- a/net/WebSocketHandler.hpp +++ b/net/WebSocketHandler.hpp @@ -330,7 +330,7 @@ protected: if (!socket || data == nullptr || len == 0) return -1; -assert(socket->isCorrectThread(true)); +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: common/Common.hpp common/IoUtil.cpp common/LOOLWebSocket.hpp kit/Kit.cpp net/WebSocketHandler.hpp test/helpers.hpp wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp
common/Common.hpp|6 -- common/IoUtil.cpp| 21 - common/LOOLWebSocket.hpp | 18 +- kit/Kit.cpp |8 +--- net/WebSocketHandler.hpp | 26 +++--- test/helpers.hpp | 18 +- wsd/DocumentBroker.cpp |4 ++-- wsd/DocumentBroker.hpp |3 --- 8 files changed, 12 insertions(+), 92 deletions(-) New commits: commit 95d51493aa6f480948f07354f079e1b8d556108c Author: Ashod NakashianDate: Mon Apr 3 00:45:40 2017 -0400 wsd: remove nextmessage This was a workaround to Poco's limitation of requiring socket receiveFrame be given preallocated buffer, which couldn't be exceeded by a larger payload. This meant the receiver had to know the maximum payload in advance. Since only the Kit uses Poco sockets, and the Kit never receives large payloads, this preamble is now obsolete. 100% (94/94) of old-style tests PASS. Change-Id: I76776f89497409e5755e335a3e25553e91cf0876 Reviewed-on: https://gerrit.libreoffice.org/36037 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/common/Common.hpp b/common/Common.hpp index ab4e1bdd..09bafad3 100644 --- a/common/Common.hpp +++ b/common/Common.hpp @@ -25,12 +25,6 @@ constexpr int WS_SEND_TIMEOUT_MS = 1000; /// which can be 1500 bytes long. constexpr long READ_BUFFER_SIZE = 64 * 1024; -/// Size beyond which messages will be sent preceded with -/// 'nextmessage' frame to let the receiver know in advance -/// the size of the larger coming message. All messages up to, -/// but not including, this size are considered small messages. -constexpr int LARGE_MESSAGE_SIZE = READ_BUFFER_SIZE - 512; - /// Message larger than this will be dropped as invalid /// or as intentionally flooding the server. constexpr int MAX_MESSAGE_SIZE = 2 * 1024 * READ_BUFFER_SIZE; diff --git a/common/IoUtil.cpp b/common/IoUtil.cpp index f94d0b3c..da9a4242 100644 --- a/common/IoUtil.cpp +++ b/common/IoUtil.cpp @@ -143,27 +143,6 @@ void SocketProcessor(const std::shared_ptr& ws, } } } -else -{ -int size = 0; -Poco::StringTokenizer tokens(firstLine, " ", Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM); -// Check if it is a "nextmessage:" and in that case read the large -// follow-up message separately, and handle that only. -if (tokens.count() == 2 && tokens[0] == "nextmessage:" && -LOOLProtocol::getTokenInteger(tokens[1], "size", size) && size > 0) -{ -LOG_TRC("SocketProcessor [" << name << "]: Getting large message of " << size << " bytes."); -if (size > MAX_MESSAGE_SIZE) -{ -LOG_ERR("SocketProcessor [" << name << "]: Large-message size (" << size << ") over limit or invalid."); -} -else -{ -payload.resize(size); -continue; -} -} -} LOG_CHECK(n > 0); diff --git a/common/LOOLWebSocket.hpp b/common/LOOLWebSocket.hpp index 24bc7a0e..784a0915 100644 --- a/common/LOOLWebSocket.hpp +++ b/common/LOOLWebSocket.hpp @@ -161,23 +161,7 @@ public: static const Poco::Timespan waitZero(0); std::unique_lock lock(_mutexWrite); -if (length >= LARGE_MESSAGE_SIZE) -{ -const std::string nextmessage = "nextmessage: size=" + std::to_string(length); -const int size = nextmessage.size(); - -if (Poco::Net::WebSocket::sendFrame(nextmessage.data(), size) == size) -{ -LOG_TRC("Sent long message preample: " + nextmessage); -} -else -{ -LOG_WRN("Failed to send long message preample."); -return -1; -} -} - -int result = Poco::Net::WebSocket::sendFrame(buffer, length, flags); +const int result = Poco::Net::WebSocket::sendFrame(buffer, length, flags); lock.unlock(); diff --git a/kit/Kit.cpp b/kit/Kit.cpp index 35a48673..40a9a2df 100644 --- a/kit/Kit.cpp +++ b/kit/Kit.cpp @@ -659,7 +659,7 @@ public: return; } -LOG_TRC("Sending render-tile response (" + std::to_string(output.size()) + " bytes) for: " + response); +LOG_TRC("Sending render-tile response (" << output.size() << " bytes) for: " << response); ws->sendFrame(output.data(), output.size(), WebSocket::FRAME_BINARY); } @@ -741,7 +741,8 @@ public: if (hash != 0 && tiles[tileIndex].getOldHash() == hash) {
[Libreoffice-commits] online.git: net/WebSocketHandler.hpp
net/WebSocketHandler.hpp | 31 +-- 1 file changed, 17 insertions(+), 14 deletions(-) New commits: commit b52a8ac6e2806e3ebdc73726040eb70a908a40cc Author: Ashod NakashianDate: Sun Apr 2 23:27:06 2017 -0400 wsd: const correctness and avoid unnecessary shared_ptr promotion Change-Id: I4352d82e7b5c6873837e73ec04d894dce9a716b7 Reviewed-on: https://gerrit.libreoffice.org/36036 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp index a7cae8f4..1c6caf46 100644 --- a/net/WebSocketHandler.hpp +++ b/net/WebSocketHandler.hpp @@ -126,15 +126,9 @@ public: sendFrame(socket, buf.data(), buf.size(), flags); } -/// Implementation of the SocketHandlerInterface. -virtual bool handleOneIncomingMessage() +bool handleOneIncomingMessage(const std::shared_ptr& socket) { -auto socket = _socket.lock(); -if (socket == nullptr) -{ -LOG_ERR("No socket associated with WebSocketHandler 0x" << std::hex << this << std::dec); -return false; -} +assert(socket && "Expected a valid socket instance."); // websocket fun ! const size_t len = socket->_inBuffer.size(); @@ -148,9 +142,9 @@ public: return false; unsigned char *p = reinterpret_cast(>_inBuffer[0]); -bool fin = p[0] & 0x80; -WSOpCode code = static_cast(p[0] & 0x0f); -bool hasMask = p[1] & 0x80; +const bool fin = p[0] & 0x80; +const WSOpCode code = static_cast(p[0] & 0x0f); +const bool hasMask = p[1] & 0x80; size_t payloadLen = p[1] & 0x7f; size_t headerLen = 2; @@ -204,7 +198,8 @@ public: socket->_inBuffer.erase(socket->_inBuffer.begin(), socket->_inBuffer.begin() + headerLen + payloadLen); // FIXME: fin, aggregating payloads into _wsPayload etc. -LOG_TRC("#" << socket->getFD() << ": Incoming WebSocket message code " << code << " fin? " << fin << ", payload length: " << _wsPayload.size()); +LOG_TRC("#" << socket->getFD() << ": Incoming WebSocket message code " << code << +" fin? " << fin << ", mask? " << hasMask << " payload length: " << _wsPayload.size()); switch (code) { @@ -254,8 +249,16 @@ public: /// Implementation of the SocketHandlerInterface. virtual SocketHandlerInterface::SocketOwnership handleIncomingMessage() override { -while (handleOneIncomingMessage()) -; // can have multiple msgs in one recv'd packet. +auto socket = _socket.lock(); +if (socket == nullptr) +{ +LOG_ERR("No socket associated with WebSocketHandler 0x" << std::hex << this << std::dec); +} +else +{ +while (handleOneIncomingMessage(socket)) +; // can have multiple msgs in one recv'd packet. +} return SocketHandlerInterface::SocketOwnership::UNCHANGED; } ___ 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 | 54 ++ 1 file changed, 26 insertions(+), 28 deletions(-) New commits: commit 78d1cc4ac5ec421777085abf2835425954378105 Author: Ashod NakashianDate: Sun Apr 2 21:33:36 2017 -0400 wsd: process callbacks before poll handlers Callbacks are used to initialize handlers, as is the case with addSession on DocumentBroker. If the socket gets data before the callback is invoked, the handler will fail since the expected initialization hasn't happened yet. This race indeed happens (rarely) with addSession. 100% (94/94) of old-style tests PASS. Change-Id: Id9b4f63b45c5564add252e1671b7b0b08aff8150 Reviewed-on: https://gerrit.libreoffice.org/36035 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/net/Socket.hpp b/net/Socket.hpp index e3d9569d..7d227732 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -327,32 +327,7 @@ public: LOG_TRC("Poll completed with " << rc << " live polls max (" << timeoutMaxMs << "ms)" << ((rc==0) ? "(timedout)" : "")); -// Fire the callback and remove dead fds. -std::chrono::steady_clock::time_point newNow = -std::chrono::steady_clock::now(); -for (int i = static_cast(size) - 1; i >= 0; --i) -{ -Socket::HandleResult res = Socket::HandleResult::SOCKET_CLOSED; -try -{ -res = _pollSockets[i]->handlePoll(newNow, _pollFds[i].revents); -} -catch (const std::exception& exc) -{ -LOG_ERR("Error while handling poll for socket #" << -_pollFds[i].fd << " in " << _name << ": " << exc.what()); -} - -if (res == Socket::HandleResult::SOCKET_CLOSED || -res == Socket::HandleResult::MOVED) -{ -LOG_DBG("Removing socket #" << _pollFds[i].fd << " (of " << -_pollSockets.size() << ") from " << _name); -_pollSockets.erase(_pollSockets.begin() + i); -} -} - -// Process the wakeup pipe (always the last entry). +// First process the wakeup pipe (always the last entry). if (_pollFds[size].revents) { std::vector invoke; @@ -399,6 +374,31 @@ public: "] wakeup hook: " << exc.what()); } } + +// Fire the poll callbacks and remove dead fds. +std::chrono::steady_clock::time_point newNow = +std::chrono::steady_clock::now(); +for (int i = static_cast(size) - 1; i >= 0; --i) +{ +Socket::HandleResult res = Socket::HandleResult::SOCKET_CLOSED; +try +{ +res = _pollSockets[i]->handlePoll(newNow, _pollFds[i].revents); +} +catch (const std::exception& exc) +{ +LOG_ERR("Error while handling poll for socket #" << +_pollFds[i].fd << " in " << _name << ": " << exc.what()); +} + +if (res == Socket::HandleResult::SOCKET_CLOSED || +res == Socket::HandleResult::MOVED) +{ +LOG_DBG("Removing socket #" << _pollFds[i].fd << " (of " << +_pollSockets.size() << ") from " << _name); +_pollSockets.erase(_pollSockets.begin() + i); +} +} } /// Write to a wakeup descriptor @@ -430,8 +430,6 @@ public: if (newSocket) { std::lock_guard lock(_mutex); -// Beware - _thread may not be created & started yet. -newSocket->setThreadOwner(_thread.get_id()); LOG_DBG("Inserting socket #" << newSocket->getFD() << " into " << _name); _newSockets.emplace_back(newSocket); wakeup(); ___ 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/LOOLWSD.cpp wsd/LOOLWSD.hpp
wsd/DocumentBroker.cpp |3 +++ wsd/LOOLWSD.cpp| 16 wsd/LOOLWSD.hpp|4 +++- 3 files changed, 14 insertions(+), 9 deletions(-) New commits: commit c81db872352443cb0c3ac0f7c0d68f27fcd34963 Author: Ashod NakashianDate: Sun Apr 2 19:56:42 2017 -0400 wsd: do child housekeeping on finishing DocBroker thread Change-Id: I109737b79759986cb2a1cbfc6d711ee2f19ff59d Reviewed-on: https://gerrit.libreoffice.org/36034 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index ae7f6e71..a89e3862 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -260,6 +260,9 @@ void DocumentBroker::pollThread() _poll->poll(std::min(flushTimeoutMs - elapsedMs, POLL_TIMEOUT_MS / 5)); } +// Cleanup. +LOOLWSD::doHousekeeping(); + LOG_INF("Finished docBroker polling thread for docKey [" << _docKey << "]."); } diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 2cc7bf51..6b2d633b 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -1101,6 +1101,11 @@ bool LOOLWSD::checkAndRestoreForKit() void PrisonerPoll::wakeupHook() { +LOOLWSD::doHousekeeping(); +} + +void LOOLWSD::doHousekeeping() +{ if (!LOOLWSD::checkAndRestoreForKit()) { // No children have died. @@ -1136,11 +1141,6 @@ void PrisonerPoll::wakeupHook() cleanupDocBrokers(); } -void LOOLWSD::triggerChildAndDocHousekeeping() -{ -PrisonerPoll.wakeup(); -} - bool LOOLWSD::createForKit() { #ifdef KIT_IN_PROCESS @@ -2428,9 +2428,9 @@ int LOOLWSD::innerMain() UnitWSD::get().invokeTest(); // This timeout affects the recovery time of prespawned children. -int msWait = UnitWSD::isUnitTesting() ? -UnitWSD::get().getTimeoutMilliSeconds() / 4 : -SocketPoll::DefaultPollTimeoutMs * 4; +const int msWait = UnitWSD::isUnitTesting() ? + UnitWSD::get().getTimeoutMilliSeconds() / 4 : + SocketPoll::DefaultPollTimeoutMs * 4; mainWait.poll(msWait); // Wake the prisoner poll to spawn some children, if necessary. diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp index b86b23ac..072a4a88 100644 --- a/wsd/LOOLWSD.hpp +++ b/wsd/LOOLWSD.hpp @@ -100,7 +100,9 @@ public: /// Return true when successfull. static bool createForKit(); -static void triggerChildAndDocHousekeeping(); +/// Checks forkit (and respawns), rebalances +/// child kit processes and cleans up DocBrokers. +static void doHousekeeping(); protected: void initialize(Poco::Util::Application& self) override; ___ 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 | 22 -- 1 file changed, 20 insertions(+), 2 deletions(-) New commits: commit 6e596d11f3ebe09ad1b50c395f920b591805f4b6 Author: Ashod NakashianDate: Sun Apr 2 19:56:13 2017 -0400 wsd: catch exceptions from callbacks and wakup hook Change-Id: Ib4579a34c91cfe43e5bd7038b175175a9ab0036a Reviewed-on: https://gerrit.libreoffice.org/36033 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/net/Socket.hpp b/net/Socket.hpp index 200c389b..e3d9569d 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -377,9 +377,27 @@ public: } for (size_t i = 0; i < invoke.size(); ++i) -invoke[i](); +{ +try +{ +invoke[i](); +} +catch (const std::exception& exc) +{ +LOG_ERR("Exception while invoking poll [" << _name << +"] callback: " << exc.what()); +} +} -wakeupHook(); +try +{ +wakeupHook(); +} +catch (const std::exception& exc) +{ +LOG_ERR("Exception while invoking poll [" << _name << +"] wakeup hook: " << exc.what()); +} } } ___ 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
net/Socket.cpp | 13 ++--- net/Socket.hpp |6 ++ 2 files changed, 8 insertions(+), 11 deletions(-) New commits: commit d7858b08b90f989b0fe08c1f0309e4cd7f82c409 Author: Ashod NakashianDate: Sun Apr 2 18:43:21 2017 -0400 wsd: fix race in setting SocketPoll owner thread id Change-Id: Idace925ab02425ed66ac07efc22ab933d229d42e Reviewed-on: https://gerrit.libreoffice.org/36032 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/net/Socket.cpp b/net/Socket.cpp index 3a07470c..bac3a741 100644 --- a/net/Socket.cpp +++ b/net/Socket.cpp @@ -52,16 +52,8 @@ SocketPoll::SocketPoll(const std::string& threadName) throw std::runtime_error("Failed to allocate pipe for SocketPoll [" + threadName + "] waking."); } -{ -std::lock_guard lock(getPollWakeupsMutex()); -getWakeupsArray().push_back(_wakeup[1]); -} - -#if ENABLE_DEBUG -_owner = std::this_thread::get_id(); -LOG_DBG("Thread affinity of " << _name << " set to 0x" << -std::hex << _owner << "." << std::dec); -#endif +std::lock_guard lock(getPollWakeupsMutex()); +getWakeupsArray().push_back(_wakeup[1]); } SocketPoll::~SocketPoll() @@ -92,7 +84,6 @@ void SocketPoll::startThread() try { _thread = std::thread(::pollingThreadEntry, this); -_owner = _thread.get_id(); } catch (const std::exception& exc) { diff --git a/net/Socket.hpp b/net/Socket.hpp index 9977f481..200c389b 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -493,6 +493,12 @@ private: Util::setThreadName(_name); LOG_INF("Starting polling thread [" << _name << "]."); +#if ENABLE_DEBUG +_owner = std::this_thread::get_id(); +LOG_DBG("Thread affinity of " << _name << " set to 0x" << +std::hex << _owner << "." << std::dec); +#endif + // Invoke the virtual implementation. pollingThread(); } ___ 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 |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit bd82bf4c4b7ed57d55cd1cf05ea681517b8c1bf3 Author: Ashod NakashianDate: Sun Apr 2 17:50:17 2017 -0400 wsd: set DocBroker poll thread once Change-Id: Ic6397893b2b9b04c6715c393c3f176785b1e2b77 Reviewed-on: https://gerrit.libreoffice.org/36031 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 259ca5aa..ae7f6e71 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -155,7 +155,7 @@ DocumentBroker::DocumentBroker(const std::string& uri, _cursorPosY(0), _cursorWidth(0), _cursorHeight(0), -_poll(new DocumentBrokerPoll("docbrk_poll", *this)), +_poll(new DocumentBrokerPoll("docbroker_" + _docId, *this)), _stop(false), _tileVersion(0), _debugRenderedTileCount(0) @@ -180,8 +180,6 @@ bool DocumentBroker::isCorrectThread() // The inner heart of the DocumentBroker - our poll loop. void DocumentBroker::pollThread() { -Util::setThreadName("docbroker_" + _docId); - LOG_INF("Starting docBroker polling thread for docKey [" << _docKey << "]."); _threadStart = std::chrono::steady_clock::now(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: net/Socket.cpp net/Socket.hpp wsd/LOOLWSD.cpp
net/Socket.cpp |5 - net/Socket.hpp | 15 --- wsd/LOOLWSD.cpp |4 +--- 3 files changed, 13 insertions(+), 11 deletions(-) New commits: commit d6577654bdc45892d9546ecfccdccd549b01921a Author: Ashod NakashianDate: Sun Apr 2 17:49:14 2017 -0400 wsd: initialization and logging Change-Id: Icd82a966b94875a65ddb3817c88a3c4c7bedd4ff Reviewed-on: https://gerrit.libreoffice.org/36030 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/net/Socket.cpp b/net/Socket.cpp index 2b9899f8..3a07470c 100644 --- a/net/Socket.cpp +++ b/net/Socket.cpp @@ -43,7 +43,8 @@ SocketPoll::SocketPoll(const std::string& threadName) : _name(threadName), _stop(false), _threadStarted(false), - _threadFinished(false) + _threadFinished(false), + _owner(std::this_thread::get_id()) { // Create the wakeup fd. if (::pipe2(_wakeup, O_CLOEXEC | O_NONBLOCK) == -1) @@ -56,9 +57,11 @@ SocketPoll::SocketPoll(const std::string& threadName) getWakeupsArray().push_back(_wakeup[1]); } +#if ENABLE_DEBUG _owner = std::this_thread::get_id(); LOG_DBG("Thread affinity of " << _name << " set to 0x" << std::hex << _owner << "." << std::dec); +#endif } SocketPoll::~SocketPoll() diff --git a/net/Socket.hpp b/net/Socket.hpp index 94d4cc34..9977f481 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -47,15 +47,14 @@ public: Socket() : _fd(socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0)), -_sendBufferSize(DefaultSendBufferSize) +_sendBufferSize(DefaultSendBufferSize), +_owner(std::this_thread::get_id()) { init(); } virtual ~Socket() { -// TODO: Should we shutdown here or up to the client? - LOG_TRC("#" << getFD() << " Socket dtor."); // Doesn't block on sockets; no error handling needed. @@ -231,11 +230,13 @@ protected: _sendBufferSize = DefaultSendBufferSize; #if ENABLE_DEBUG _owner = std::this_thread::get_id(); -LOG_DBG("#" << _fd << " Thread affinity set to 0x" << std::hex << _owner << "." << std::dec); +LOG_DBG("#" << _fd << " Thread affinity set to 0x" << std::hex << +_owner << "." << std::dec); const int oldSize = getSocketBufferSize(); setSocketBufferSize(0); -LOG_TRC("#" << _fd << ": Buffer size: " << getSendBufferSize() << " (was " << oldSize << ")"); +LOG_TRC("#" << _fd << ": Buffer size: " << getSendBufferSize() << +" (was " << oldSize << ")"); #endif } @@ -323,8 +324,8 @@ public: rc = ::poll(&_pollFds[0], size + 1, std::max(timeoutMaxMs,0)); } while (rc < 0 && errno == EINTR); -LOG_TRC("Poll completed with " << rc << " live polls max (" << timeoutMaxMs << "ms)" -<< ((rc==0) ? "(timedout)" : "")); +LOG_TRC("Poll completed with " << rc << " live polls max (" << +timeoutMaxMs << "ms)" << ((rc==0) ? "(timedout)" : "")); // Fire the callback and remove dead fds. std::chrono::steady_clock::time_point newNow = diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 05c6e1da..2cc7bf51 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -1322,9 +1322,7 @@ static std::shared_ptr createNewClientSession(const WebSocketHand // In case of WOPI, if this session is not set as readonly, it might be set so // later after making a call to WOPI host which tells us the permission on files // (UserCanWrite param). -auto session = std::make_shared(id, docBroker, uriPublic, isReadOnly); - -return session; +return std::make_shared(id, docBroker, uriPublic, isReadOnly); } catch (const std::exception& exc) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: common/Util.cpp net/Socket.cpp net/Socket.hpp
common/Util.cpp | 12 ++-- net/Socket.cpp |2 ++ net/Socket.hpp | 21 ++--- 3 files changed, 22 insertions(+), 13 deletions(-) New commits: commit e0822f851647b17fca3043c8f17e52ebe8090aa2 Author: Ashod NakashianDate: Sun Apr 2 17:38:05 2017 -0400 wsd: better thread affinity logging Change-Id: I9e4bc3fe864aa409dc4874a9d6fc4ab22bfea592 Reviewed-on: https://gerrit.libreoffice.org/36029 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/common/Util.cpp b/common/Util.cpp index 8e9552b6..3260d130 100644 --- a/common/Util.cpp +++ b/common/Util.cpp @@ -265,13 +265,13 @@ namespace Util strncpy(ThreadName, s.c_str(), 31); ThreadName[31] = '\0'; if (prctl(PR_SET_NAME, reinterpret_cast(s.c_str()), 0, 0, 0) != 0) -{ -LOG_SYS("Cannot set thread name to " << s << "."); -} +LOG_SYS("Cannot set thread name of " << getThreadId() << " (0x" << +std::hex << std::this_thread::get_id() << +std::dec << ") to [" << s << "]."); else -{ -LOG_INF("Thread " << std::hex << std::this_thread::get_id() << std::dec << " is now called " << s); -} +LOG_INF("Thread " << getThreadId() << " (0x" << +std::hex << std::this_thread::get_id() << +std::dec << ") is now called [" << s << "]."); } const char *getThreadName() diff --git a/net/Socket.cpp b/net/Socket.cpp index 39906bf7..2b9899f8 100644 --- a/net/Socket.cpp +++ b/net/Socket.cpp @@ -57,6 +57,8 @@ SocketPoll::SocketPoll(const std::string& threadName) } _owner = std::this_thread::get_id(); +LOG_DBG("Thread affinity of " << _name << " set to 0x" << +std::hex << _owner << "." << std::dec); } SocketPoll::~SocketPoll() diff --git a/net/Socket.hpp b/net/Socket.hpp index 4d723d99..94d4cc34 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -185,7 +185,12 @@ public: void setThreadOwner(const std::thread::id ) { #if ENABLE_DEBUG - _owner = id; +if (id != _owner) +{ +LOG_DBG("#" << _fd << " Thread affinity set to 0x" << std::hex << +id << " (was 0x" << _owner << ")." << std::dec); +_owner = id; +} #else (void)id; #endif @@ -196,8 +201,10 @@ public: #if ENABLE_DEBUG const bool sameThread = std::this_thread::get_id() == _owner; if (!sameThread) -LOG_WRN("#" << _fd << " invoked from foreign thread. Expected: " << -std::hex << _owner << std::dec); +LOG_WRN("#" << _fd << " Invoked from foreign thread. Expected: 0x" << std::hex << +_owner << " but called from 0x" << std::this_thread::get_id() << " (" << +std::dec << Util::getThreadId() << ")."); + if (hard) return sameThread; else @@ -224,12 +231,12 @@ protected: _sendBufferSize = DefaultSendBufferSize; #if ENABLE_DEBUG _owner = std::this_thread::get_id(); +LOG_DBG("#" << _fd << " Thread affinity set to 0x" << std::hex << _owner << "." << std::dec); const int oldSize = getSocketBufferSize(); setSocketBufferSize(0); LOG_TRC("#" << _fd << ": Buffer size: " << getSendBufferSize() << " (was " << oldSize << ")"); #endif - } private: @@ -291,9 +298,9 @@ public: bool isCorrectThread() const { if (std::this_thread::get_id() != _owner) -LOG_WRN("Incorrect thread affinity. Expected: 0x" << std::hex << _owner << -" but called from " << std::this_thread::get_id() << std::dec << -", stop: " << _stop); +LOG_WRN("Incorrect thread affinity for " << _name << ". Expected: 0x" << std::hex << +_owner << " (" << std::dec << Util::getThreadId() << ") but called from 0x" << +std::hex << std::this_thread::get_id() << std::dec << ", stop: " << _stop); return _stop || std::this_thread::get_id() == _owner; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: kit/Kit.cpp wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp
kit/Kit.cpp| 20 +++- wsd/DocumentBroker.cpp |8 +--- wsd/DocumentBroker.hpp |6 ++ 3 files changed, 26 insertions(+), 8 deletions(-) New commits: commit c9365ad67961aee7b4be0b23883c973c38c088e1 Author: Ashod NakashianDate: Sun Apr 2 15:55:56 2017 -0400 wsd: log the DocBroker ID in the Kit as well This matches the document between WSD and kit, making logs much easier to read. Change-Id: If55a9eb84b4a22d2dc4dd53f5f6ab322ebc3646e Reviewed-on: https://gerrit.libreoffice.org/36028 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/kit/Kit.cpp b/kit/Kit.cpp index 6131ba40..35a48673 100644 --- a/kit/Kit.cpp +++ b/kit/Kit.cpp @@ -445,12 +445,14 @@ public: Document(const std::shared_ptr& loKit, const std::string& jailId, const std::string& docKey, + const std::string& docId, const std::string& url, std::shared_ptr tileQueue, const std::shared_ptr& ws) : _loKit(loKit), _jailId(jailId), _docKey(docKey), +_docId(docId), _url(url), _tileQueue(std::move(tileQueue)), _ws(ws), @@ -461,7 +463,9 @@ public: _stop(false), _isLoading(0) { -LOG_INF("Document ctor for url [" << _url << "] on child [" << _jailId << "]."); +LOG_INF("Document ctor for [" << _docKey << +"] url [" << _url << "] on child [" << _jailId << +"] and id [" << _docId << "]."); assert(_loKit); _callbackThread.start(*this); @@ -469,8 +473,10 @@ public: ~Document() { -LOG_INF("~Document dtor for url [" << _url << "] on child [" << _jailId << -"]. There are " << _sessions.size() << " views."); +LOG_INF("~Document dtor for [" << _docKey << +"] url [" << _url << "] on child [" << _jailId << +"] and id [" << _docId << "]. There are " << +_sessions.size() << " views."); // Wait for the callback worker to finish. _stop = true; @@ -1357,7 +1363,7 @@ private: void run() override { -Util::setThreadName("lok_handler"); +Util::setThreadName("lokit_" + _docId); LOG_DBG("Thread started."); @@ -1515,7 +1521,10 @@ private: private: std::shared_ptr _loKit; const std::string _jailId; +/// URL-based key. May be repeated during the lifetime of WSD. const std::string _docKey; +/// Short numerical ID. Unique during the lifetime of WSD. +const std::string _docId; const std::string _url; std::string _jailedUrl; std::string _renderOpts; @@ -1795,6 +1804,7 @@ void lokit_main(const std::string& childRoot, { const std::string& sessionId = tokens[1]; const std::string& docKey = tokens[2]; +const std::string& docId = tokens[3]; std::string url; URI::decode(docKey, url); @@ -1802,7 +1812,7 @@ void lokit_main(const std::string& childRoot, if (!document) { -document = std::make_shared(loKit, jailId, docKey, url, queue, ws); +document = std::make_shared(loKit, jailId, docKey, docId, url, queue, ws); } // Validate and create session. diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 494f21f3..259ca5aa 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -133,6 +133,8 @@ public: } }; +std::atomic DocumentBroker::DocBrokerId(1); + DocumentBroker::DocumentBroker(const std::string& uri, const Poco::URI& uriPublic, const std::string& docKey, @@ -140,6 +142,7 @@ DocumentBroker::DocumentBroker(const std::string& uri, _uriOrig(uri), _uriPublic(uriPublic), _docKey(docKey), +_docId(Util::encodeId(DocBrokerId++, 3)), _childRoot(childRoot), _cacheRoot(getCachePath(uriPublic.toString())), _lastSaveTime(std::chrono::steady_clock::now()), @@ -177,8 +180,7 @@ bool DocumentBroker::isCorrectThread() // The inner heart of the DocumentBroker - our poll loop. void DocumentBroker::pollThread() { -static std::atomic DocBrokerId(1); -Util::setThreadName("docbroker_" + Util::encodeId(DocBrokerId++, 3)); +Util::setThreadName("docbroker_" + _docId); LOG_INF("Starting docBroker polling thread for docKey [" << _docKey << "]."); @@ -770,7 +772,7 @@ size_t DocumentBroker::addSession(const std::shared_ptr& session) const auto count = _sessions.size(); // Request a new session from the child kit. -const std::string aMessage =
[Libreoffice-commits] online.git: test/httpwstest.cpp
test/httpwstest.cpp | 23 +-- 1 file changed, 5 insertions(+), 18 deletions(-) New commits: commit 9936ac18697887ae927830258e4c16e0c4726905 Author: Ashod NakashianDate: Sun Apr 2 14:48:59 2017 -0400 wsd: fix alertAllUsers test Issue the fake disk space error only after fully loading the doc. This prevents handling the error while loading, which terminates the session. Change-Id: I5acd9454b1aa9fb5d1f886fb23a76a2d808d4852 Reviewed-on: https://gerrit.libreoffice.org/36027 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp index 22fce917..55272f45 100644 --- a/test/httpwstest.cpp +++ b/test/httpwstest.cpp @@ -2334,28 +2334,15 @@ void HTTPWSTest::testAlertAllUsers() const auto testname = "alertAllUsers "; try { -std::string docPath[2]; -std::string docURL[2]; - -getDocumentPathAndURL("Example.odt", docPath[0], docURL[0], testname); -getDocumentPathAndURL("hello.odt", docPath[1], docURL[1], testname); - -Poco::Net::HTTPRequest* request[2]; - -for (int i = 0; i < 2; i++) -{ -request[i] = new Poco::Net::HTTPRequest(Poco::Net::HTTPRequest::HTTP_GET, docURL[i]); -} - std::shared_ptr socket[4]; -for (int i = 0; i < 2; i++) -{ -socket[i] = connectLOKit(_uri, *(request[i%2]), _response); -sendTextFrame(socket[i], "load url=" + docURL[i%2], testname); -} +socket[0] = loadDocAndGetSocket("hello.odt", _uri, testname); +socket[1] = loadDocAndGetSocket("Example.odt", _uri, testname); + +// Simulate disk full. sendTextFrame(socket[0], "uno .uno:fakeDiskFull", testname); +// Assert that both clients get the error. for (int i = 0; i < 2; i++) { const std::string response = assertResponseString(socket[i], "error:", testname); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 84385] Object attribute "keep aspect ratio" ignored
https://bugs.documentfoundation.org/show_bug.cgi?id=84385 --- Comment #12 from Luke--- No support for this feature in 5.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-ux-advise] [Bug 84565] Remember "keep ratio" checkbox and Save value in ODF file
https://bugs.documentfoundation.org/show_bug.cgi?id=84565 Lukechanged: What|Removed |Added Summary|Remember "keep ratio" |Remember "keep ratio" |checkbox|checkbox and Save value in ||ODF file -- 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 84565] Remember "keep ratio" checkbox and Save value in ODF file
https://bugs.documentfoundation.org/show_bug.cgi?id=84565 Lukechanged: What|Removed |Added Summary|Remember "keep ratio" |Remember "keep ratio" |checkbox|checkbox and Save value in ||ODF file -- 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 101348] Default calc font makes lowercase i look like capital I at zoom depths above a certain level
https://bugs.documentfoundation.org/show_bug.cgi?id=101348 --- Comment #4 from Adolfo Jayme--- For the record, a possible cause could’ve been the gridfitting (“hinting”), or lack thereof, of the font you were using. This is speculation, of course, since there’s no screenshot attached to this 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 106923] New: Media player "View" disabled, videos too small in Slideshow
https://bugs.documentfoundation.org/show_bug.cgi?id=106923 Bug ID: 106923 Summary: Media player "View" disabled, videos too small in Slideshow Product: LibreOffice Version: 5.3.1.2 release Hardware: x86-64 (AMD64) OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Impress Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: k...@rosemeier.co It used to be possible to adjust video viewing size in Impress, but since version 5 it's not anymore. The "View" dropdown is disabled, resizing the video on the slide has no effect. Tried various types of videos - same issue. Embedding or linking isn't changing anything either. -- 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 105720] Left-aligned currency symbols in currency fields are displayed in the middle of the preceding cell (in some builds)
https://bugs.documentfoundation.org/show_bug.cgi?id=105720 --- Comment #4 from Aron Budea--- Here's my current experience. Reproducible (latest commits): lo-linux-dbgutil-daily lo-linux-dbgutil-daily-till53 lo-linux-dbgutil-daily-till52 lo-linux-dbgutil-daily-till51 bibisect-linux-64-5.3 Not reproducible: TDF release builds bibisect-50max bibisect-linux-64-5.4 (not even with oldest commit) At the moment it's not reproducible with a self-built master dbgutil build from a few days ago (0cb5435dd35674b6e55e22922a0819d2a755fc10), but that still doesn't mean anything, as it is reproducible with the latest daily dbgutil bibisect repo build from yesterday. -- 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 106912] FILESAVE sometimes fails to save as CSV, sometimes manual save silently fails, data is lost
https://bugs.documentfoundation.org/show_bug.cgi?id=106912 --- Comment #2 from a...@meatfreezer.com --- Hi Xisco, Thanks for your message. I'm using the version of LibreOffice that comes with Ubuntu 16.04, I didn't realize it was an old version, but I see that 5.1 was indeed EOL'd as of six months ago. I've stopped using Calc to work on this task, since my need to avoid data loss is more important to me than debugging this issue is. Sorry. :( If this bug report is not helpful as it is, I will close it. Thanks, alex -- 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 106922] On 5.3.1.2 Fr-version: I get a bad printing on headers misleading number and letter
https://bugs.documentfoundation.org/show_bug.cgi?id=106922 proulxmich...@tlb.sympatico.ca changed: What|Removed |Added Status|UNCONFIRMED |NEW Hardware|Other |IA64 (Itanium) Version|5.3.2.1 rc |5.3.1.2 release Ever confirmed|0 |1 Alias||Rakam -- 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 106922] New: On 5.3.1.2 Fr-version: I get a bad printing on headers misleading number and letter
https://bugs.documentfoundation.org/show_bug.cgi?id=106922 Bug ID: 106922 Summary: On 5.3.1.2 Fr-version: I get a bad printing on headers misleading number and letter Product: LibreOffice Version: 5.3.2.1 rc Hardware: Other OS: Mac OS X (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: proulxmich...@tlb.sympatico.ca Description: I just up-to-date to LibreOffice 5.3.1.2 from 5.3.0.3 Ca-Fr version. I'm on MacOS X 10.12.3 Sierra with 3.6 GHz Intel core i5. Printer: Lexmark x5650. When I print a Calc file the header / name of the file here containing date i.e.2016 is printing 2014 and in the title of the Calc file here dépenses is printing déêenses. When I check with Aperçu before printing all is okay. Steps to Reproduce: 1.Open calc file 2.Print it 3. Actual Results: Printing sends wrong date of header /file title i.e. 2016.ods). Printing sends wrong letter of inside title i.e. dépenses --> déênses Expected Results: Print bad number and letter Reproducible: Always User Profile Reset: No Additional Info: Works perfectly on LibreOffice 5.3.0.3 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Firefox/52.0 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106921] Calculation of -$A1^(any even power (0, 2, 4, 6, 8...)) in formula comes out incorrectly positive.
https://bugs.documentfoundation.org/show_bug.cgi?id=106921 Stamatischanged: What|Removed |Added CC||stama...@zirconix.net Summary|Calculation of -$A1 to any |Calculation of -$A1^(any |even power (0,2,4,6,8...) |even power (0,2,4,6,8...)) |in formula comes out|in formula comes out |incorrectly positive. |incorrectly positive. -- 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 106921] New: Calculation of -$A1 to any even power (0, 2, 4, 6, 8...) in formula comes out incorrectly positive.
https://bugs.documentfoundation.org/show_bug.cgi?id=106921 Bug ID: 106921 Summary: Calculation of -$A1 to any even power (0,2,4,6,8...) in formula comes out incorrectly positive. Product: LibreOffice Version: 5.2.6.2 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: stama...@zirconix.net Description: If I assign the value 1 to a cell, e.g. A1 and type in another cell the simple formula: =-$A1^2 the value returned is 1, where it should be -1, as the squaring of the cell should take precedence over the negation. It seems that the minus (-) outside of the cell is moved into the cell before calling the square function. If on the other hand I type the formula as =-($A1^2), then I get the correct -1 value. Steps to Reproduce: 1. Type the number 1 in any cell, C3 for instance 2. Go to a different cell and type the formula: =-$C3^2, or =-$C3^4 or to any even power. 3. The result displayed will be incorrectly 1 (it should be -1) Actual Results: Using any number in any cell, when handled by this formula: =-$Cell^(any even power) will give incorrectly a positive result. As mentioned above, if the formula is instead typed as =-($Cell^2) - note the () around the Cell - the correct result (negative) is returned. Expected Results: The expected result from this formula, given the above conditions, should always be negative, as any number raised to an EVEN power becomes positive, therefore will be turned negative due to the minus sign outside of the cell. Reproducible: Always User Profile Reset: Yes Additional Info: It seems that the minus (-) outside of the cell is moved into the cell before calling the square function. This is not correct mathematically, as raising the cell value to a power should take precedence over the negation of the value in a cell. User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36 -- 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 106586] Android viewer displays garbage when panning / zooming spreadsheets
https://bugs.documentfoundation.org/show_bug.cgi?id=106586 --- Comment #3 from Keith Curtis--- I tried the LibreOffice from Collabora viewer in the Google store and spreadsheet panning/zooming works fine there. Perhaps that helps narrow things down. Thank you Collabora... -- 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 106920] Crash in: mdds::detail::throw_block_position_not_found( char const *, int, unsigned __int64, unsigned __int64, unsigned __int64)
https://bugs.documentfoundation.org/show_bug.cgi?id=106920 --- Comment #1 from Darren K--- Created attachment 132307 --> https://bugs.documentfoundation.org/attachment.cgi?id=132307=edit screenshot of crash in 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-bugs] [Bug 106920] Crash in: mdds::detail::throw_block_position_not_found( char const *, int, unsigned __int64, unsigned __int64, unsigned __int64)
https://bugs.documentfoundation.org/show_bug.cgi?id=106920 --- Comment #2 from Darren K--- More details (all on 5.2.6.2); I am only running into this issue on specific sheets. I am able to add new sheets and delete them. When I try to save the file with deleted sheets, it crashes. Upon restart I can try to recover the file. The crash reporter does not pop up (unable to submit a report.) I have attached a screenshot of the error when Calc crashes in this manner. Per the original crash report, the sheet that will crash Calc on deleting after confirmation (no save attempt required) only has a pivot table on it. I can delete the pivot table and save the document but when I try to delete that tab (minus picot table) Calc crashes. -- 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 106920] New: Crash in: mdds::detail::throw_block_position_not_found( char const *, int, unsigned __int64, unsigned __int64, unsigned __int64)
https://bugs.documentfoundation.org/show_bug.cgi?id=106920 Bug ID: 106920 Summary: Crash in: mdds::detail::throw_block_position_not_found(char const *,int,unsigned __int64,unsigned __int64,unsigned __int64) Product: LibreOffice Version: 5.2.5.1 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: darr...@darrenkruger.net This bug was filed from the crash reporting server and is br-ea8ebae7-022b-4dba-97cf-a991c23e24a8. = Calc crashes when attempting to delete a sheet from specific document I have. It crashes after I verify that I want to delete the sheet. Verified on 5.2.5.1 release and 5.2.6.2 release. -- 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 106919] CALC: moving cell A1 data changes reference of Range Names in chart which doesn 't reference cell A1
https://bugs.documentfoundation.org/show_bug.cgi?id=106919 m.a.riosvchanged: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||miguelangelrv@libreoffice.o ||rg Ever confirmed|0 |1 --- Comment #1 from m.a.riosv --- Please attach a sample file with the steps to reproduce the issue. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106919] New: CALC: moving cell A1 data changes reference of Range Names in chart which doesn 't reference cell A1
https://bugs.documentfoundation.org/show_bug.cgi?id=106919 Bug ID: 106919 Summary: CALC: moving cell A1 data changes reference of Range Names in chart which doesn't reference cell A1 Product: LibreOffice Version: 5.2.6.2 release Hardware: All OS: Mac OS X (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Chart Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: dawncoy...@icloud.com Created attachment 132306 --> https://bugs.documentfoundation.org/attachment.cgi?id=132306=edit screen shots of before/after moving cell A1 I have quoted text as Range Names in a chart. If I select and move cell A1 to another cell (neither referenced by the chart), the Range Names change to references to the destination cell and the text becomes the column names of the charted data. "Undo" moves the data back from the destination cell to A1, but does not undo the change to the chart. -- 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 32506] Find & Replace for Base
https://bugs.documentfoundation.org/show_bug.cgi?id=32506 charanchanged: What|Removed |Added Status|ASSIGNED|NEW CC|harisaicharan111.challa@gma | |il.com | Assignee|harisaicharan111.challa@gma |libreoffice-b...@lists.free |il.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-commits] core.git: 2 commits - sw/inc sw/source vcl/source vcl/workben
sw/inc/shellio.hxx |4 +-- sw/source/filter/ww8/ww8par.cxx | 22 ++ sw/source/filter/ww8/ww8scan.cxx |2 - vcl/source/gdi/gfxlink.cxx |4 +-- vcl/workben/fftester.cxx | 47 --- 5 files changed, 57 insertions(+), 22 deletions(-) New commits: commit 74917d23782413aa0f129bcf9e6bf5a1c496d23b Author: Caolán McNamaraDate: Sun Apr 2 21:05:48 2017 +0100 split up doc testing for three major variants Change-Id: Iac1b5cb1c209ba27d185c8a7ba1e59c663553d77 diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 283422710fc2..298f4c465647 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -177,13 +177,13 @@ protected: #define SW_STREAM_READER1 #define SW_STORAGE_READER 2 -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(const OUString , const OUString ); +extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(SvStream , const OUString ); extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportRTF(SvStream ); class SW_DLLPUBLIC Reader { friend class SwReader; -friend bool TestImportDOC(const OUString , const OUString ); +friend bool TestImportDOC(SvStream , const OUString ); friend bool TestImportRTF(SvStream ); rtl::Reference mxTemplate; OUString aTemplateNm; diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 108bf115eee5..f86a2c263a2d 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -6190,16 +6190,15 @@ extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportDOC() return new WW8Reader; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(const OUString , const OUString ) +bool SAL_CALL TestImportDOC(SvStream , const OUString ) { Reader *pReader = ImportDOC(); -SvFileStream aFileStream(rURL, StreamMode::READ); tools::SvRef xStorage; -pReader->pStrm = +pReader->pStrm = if (rFltName != "WW6") { -xStorage = tools::SvRef(new SotStorage(aFileStream)); +xStorage = tools::SvRef(new SotStorage(rStream)); pReader->pStg = xStorage.get(); } pReader->SetFltName(rFltName); @@ -6223,6 +6222,21 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(const OUString return bRet; } +extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWW8(SvStream ) +{ +return TestImportDOC(rStream, "CWW8"); +} + +extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWW6(SvStream ) +{ +return TestImportDOC(rStream, "CWW6"); +} + +extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportWW2(SvStream ) +{ +return TestImportDOC(rStream, "WW6"); +} + sal_uLong WW8Reader::OpenMainStream( tools::SvRef& rRef, sal_uInt16& rBuffSize ) { sal_uLong nRet = ERR_SWG_READ_ERROR; diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 3364acdf3f58..fc441fdee489 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -87,7 +87,7 @@ namespace const wwSprmSearcher *wwSprmParser::GetWW2SprmSearcher() { //double lock me -// WW7- Sprms +// WW2 Sprms static const SprmInfoRow aSprms[] = { { 0, { 0, L_FIX} }, // "Default-sprm", will be skipped diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx index 63e33e14b735..636970f6ee48 100644 --- a/vcl/workben/fftester.cxx +++ b/vcl/workben/fftester.cxx @@ -323,26 +323,47 @@ try_again: SvFileStream aFileStream(out, StreamMode::READ); ret = (int) (*pfnImport)(aFileStream, aGraphic, nullptr); } -else if ( (strcmp(argv[2], "doc") == 0) || - (strcmp(argv[2], "ww8") == 0) || - (strcmp(argv[2], "ww6") == 0) || - (strcmp(argv[2], "ww2") == 0) ) +else if ((strcmp(argv[2], "doc") == 0) || (strcmp(argv[2], "ww8") == 0)) { -static WFilterCall pfnImport(nullptr); +static FFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; aLibrary.loadRelative(, "libmswordlo.so", SAL_LOADMODULE_LAZY); -pfnImport = reinterpret_cast( -aLibrary.getFunctionSymbol("TestImportDOC")); +pfnImport = reinterpret_cast( +aLibrary.getFunctionSymbol("TestImportWW8")); +aLibrary.release(); +} +SvFileStream aFileStream(out, StreamMode::READ); +ret = (int) (*pfnImport)(aFileStream); +} +else if (strcmp(argv[2], "ww6") == 0) +{ +static FFilterCall pfnImport(nullptr); +if (!pfnImport) +{ +osl::Module aLibrary; +
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/gfxlink.cxx | 28 +--- 1 file changed, 9 insertions(+), 19 deletions(-) New commits: commit edf79cacbeaef0080588f00e90e6c1b35a70d17e Author: Caolán McNamaraDate: Sun Apr 2 19:12:35 2017 +0100 SwapOutData url is always a file url so can just use SvFileStream here and not go through ucb Change-Id: I1d70a4e39977a178afaf7eeadb552f1bd7d9fd1a Reviewed-on: https://gerrit.libreoffice.org/36024 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 60d6493e2c71..8921aaf081f3 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -21,13 +21,10 @@ #include #include #include -#include #include -#include #include #include #include -#include #include #include @@ -269,22 +266,15 @@ std::shared_ptr GfxLink::GetSwapInData() const std::shared_ptr pData; -std::unique_ptr xIStm(::utl::UcbStreamHelper::CreateStream( mpSwapOutData->maURL, StreamMode::READWRITE )); -if( xIStm ) -{ -pData = o3tl::make_shared_array(mnSwapInDataSize); -xIStm->ReadBytes( pData.get(), mnSwapInDataSize ); -bool bError = ( ERRCODE_NONE != xIStm->GetError() ); -sal_uInt64 const nActReadSize = xIStm->Tell(); -if (nActReadSize != mnSwapInDataSize) -{ -bError = true; -} -xIStm.reset(); - -if( bError ) -pData.reset(); -} +SvFileStream aFileStream(mpSwapOutData->maURL, StreamMode::READWRITE); +pData = o3tl::make_shared_array(mnSwapInDataSize); +aFileStream.ReadBytes(pData.get(), mnSwapInDataSize); +bool bError = (ERRCODE_NONE != aFileStream.GetError()); +sal_uInt64 const nActReadSize = aFileStream.Tell(); +if (nActReadSize != mnSwapInDataSize) +bError = true; +if (bError) +pData.reset(); return pData; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 40469] Modifed Frame Style Options Not Preserved, "Keep Ratio" Option Unavailable
https://bugs.documentfoundation.org/show_bug.cgi?id=40469 charanchanged: What|Removed |Added Status|ASSIGNED|NEW -- 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 40469] Modifed Frame Style Options Not Preserved, "Keep Ratio" Option Unavailable
https://bugs.documentfoundation.org/show_bug.cgi?id=40469 charanchanged: What|Removed |Added CC|harisaicharan111.challa@gma | |il.com | Assignee|harisaicharan111.challa@gma |libreoffice-b...@lists.free |il.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-commits] help.git: source/text
source/text/shared/01/password_dlg.xhp | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) New commits: commit 5469ccc6ecc354020edf0b7e7b8c1e4c0f074517 Author: Gabor KelemenDate: Fri Mar 31 00:25:08 2017 +0200 Fix one ahelp to work with multiple bookmarks Change-Id: Ibfe212d879ad7ebc4d275e2818c8779064235634 Reviewed-on: https://gerrit.libreoffice.org/35952 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/shared/01/password_dlg.xhp b/source/text/shared/01/password_dlg.xhp index 6db900501..22d483136 100644 --- a/source/text/shared/01/password_dlg.xhp +++ b/source/text/shared/01/password_dlg.xhp @@ -42,20 +42,16 @@ - -Password - Type a password. A password is case sensitive. +Password + Type a password. A password is case sensitive. + - -Confirm +Confirm Re-enter the password. - Undoing password protection + Undoing password protection To remove a password, open the document, then save without password. Click to show or hide the file sharing password options. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d80b0c4d9452d0f9750c12c34b76b63dee32dfb8 Author: Gabor KelemenDate: Fri Mar 31 00:25:08 2017 +0200 Updated core Project: help 5469ccc6ecc354020edf0b7e7b8c1e4c0f074517 Fix one ahelp to work with multiple bookmarks Change-Id: Ibfe212d879ad7ebc4d275e2818c8779064235634 Reviewed-on: https://gerrit.libreoffice.org/35952 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index cf89d14c283d..5469ccc6ecc3 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit cf89d14c283d391bc3441f9a5e4f0c915af76706 +Subproject commit 5469ccc6ecc354020edf0b7e7b8c1e4c0f074517 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: AllLangHelp_swriter.mk source/text
AllLangHelp_swriter.mk |3 source/text/swriter/01/mailmerge06.xhp | 54 source/text/swriter/01/mailmerge07.xhp | 59 - source/text/swriter/01/mailmerge08.xhp | 111 - 4 files changed, 227 deletions(-) New commits: commit cf89d14c283d391bc3441f9a5e4f0c915af76706 Author: Gabor KelemenDate: Fri Mar 31 00:13:47 2017 +0200 tdf#102930 Mail Merge Wizard: Drop obsolete Wizard help pages The 6th, 7th, 8th pages of the wizard are now gone. Usable content was moved to the new save/print/email dialogs and to the toolbars help pages. Change-Id: I911c86f0ab0e159ed3666e32c8d45582c23b1627 Reviewed-on: https://gerrit.libreoffice.org/35951 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk index 61d27f466..cc37c7366 100644 --- a/AllLangHelp_swriter.mk +++ b/AllLangHelp_swriter.mk @@ -181,9 +181,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\ helpcontent2/source/text/swriter/01/mailmerge03 \ helpcontent2/source/text/swriter/01/mailmerge04 \ helpcontent2/source/text/swriter/01/mailmerge05 \ -helpcontent2/source/text/swriter/01/mailmerge06 \ -helpcontent2/source/text/swriter/01/mailmerge07 \ -helpcontent2/source/text/swriter/01/mailmerge08 \ helpcontent2/source/text/swriter/01/mm_copyto \ helpcontent2/source/text/swriter/01/mm_cusaddlis \ helpcontent2/source/text/swriter/01/mm_cusgrelin \ diff --git a/source/text/swriter/01/mailmerge06.xhp b/source/text/swriter/01/mailmerge06.xhp deleted file mode 100644 index 20a033de6..0 --- a/source/text/swriter/01/mailmerge06.xhp +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - -Mail Merge Wizard - Prepare Merge -/text/swriter/01/mailmerge06.xhp - - -UFI: Mail Merge Wizard page 6 - - - - - -Mail Merge Wizard - Edit Document -Browse through the document previews, exclude single recipients, and edit the main document. - - -Recipient -Enter the address record number of a recipient to preview the mail merge document for the recipient. - - - - -Use the browse buttons to scroll through the address records. - -Exclude this recipient -Excludes the current recipient from this mail merge. - -Edit Document -Minimizes the wizard so that you can edit the main mail merge document for all recipients. To return to the wizard, click the Return to Mail Merge Wizard button. -Mail Merge Wizard - Personalize document - - diff --git a/source/text/swriter/01/mailmerge07.xhp b/source/text/swriter/01/mailmerge07.xhp deleted file mode 100644 index 534a87478..0 --- a/source/text/swriter/01/mailmerge07.xhp +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - -Mail Merge Wizard - Personalize -/text/swriter/01/mailmerge07.xhp - - -UFI: Mail Merge Wizard page 7 - - - - - -Mail Merge Wizard - Personalize Document -Edit documents for each recipient. - -The Mail Merge Wizard creates a single merged document with page breaks between each recipient. When you reach this page of the wizard, the names and the addresses of the recipients are contained in the document. - -Edit individual document -Minimizes the wizard so that you can edit the mail merge document for a single recipient. After you made your changes, click the Return to Mail Merge Wizard button. - -Search for -Enter the text that you want to search for in the merged document, for example, the name of a recipient. - -Find -Click to start the search. - -Whole words only -Searches for whole words only and not parts of larger words. - -Backwards -Searches from the current cursor position to the top of the document. - -Match case -Distinguishes between uppercase and lowercase characters in the search. -Mail Merge Wizard - Save, print or send - - diff --git a/source/text/swriter/01/mailmerge08.xhp b/source/text/swriter/01/mailmerge08.xhp deleted file mode 100644 index d55a7ac71..0 --- a/source/text/swriter/01/mailmerge08.xhp +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - -Mail Merge Wizard - Save, Print Send -/text/swriter/01/mailmerge08.xhp - - -UFI: Mail Merge Wizard page 8 - - - - - -Mail Merge Wizard - Save, Print or Send -Specifies the output options for mail merge documents. - -The appearance of this page depends on the option that you select. After you specify the settings, click Finish to exit the wizard. - -Save starting document -Saves the starting document that contains the database fields. - -Save starting document -Saves the current document. - -Save merged document -Saves the merged document. - -Save as single document -Saves the merged document as a single file. - -Save as individual documents -Saves the merged document as a separate file for each recipient. The file names of the documents are constructed from the name that you enter, followed by an underscore, and the number
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9c5fac2f2e5cc2b49de1bd8a6280267e830d1269 Author: Gabor KelemenDate: Fri Mar 31 00:13:47 2017 +0200 Updated core Project: help cf89d14c283d391bc3441f9a5e4f0c915af76706 tdf#102930 Mail Merge Wizard: Drop obsolete Wizard help pages The 6th, 7th, 8th pages of the wizard are now gone. Usable content was moved to the new save/print/email dialogs and to the toolbars help pages. Change-Id: I911c86f0ab0e159ed3666e32c8d45582c23b1627 Reviewed-on: https://gerrit.libreoffice.org/35951 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 20abdd0a447e..cf89d14c283d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 20abdd0a447ec3a330326ccd84257a0af6ce6f95 +Subproject commit cf89d14c283d391bc3441f9a5e4f0c915af76706 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: 2 commits - AllLangHelp_swriter.mk source/text
AllLangHelp_swriter.mk |1 source/text/shared/02/12090100.xhp | 11 --- source/text/swriter/01/mm_cusaddfie.xhp | 48 3 files changed, 6 insertions(+), 54 deletions(-) New commits: commit 20abdd0a447ec3a330326ccd84257a0af6ce6f95 Author: Gabor KelemenDate: Fri Mar 31 00:11:37 2017 +0200 tdf#102930 Mail Merge Wizard: Drop duplicated page This is the same as the mm_newaddblo.xhp file Change-Id: Iafa9297c54042ba10a7bfff41a5ac4de13ada25d Reviewed-on: https://gerrit.libreoffice.org/35950 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk index a657fbcfb..61d27f466 100644 --- a/AllLangHelp_swriter.mk +++ b/AllLangHelp_swriter.mk @@ -185,7 +185,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\ helpcontent2/source/text/swriter/01/mailmerge07 \ helpcontent2/source/text/swriter/01/mailmerge08 \ helpcontent2/source/text/swriter/01/mm_copyto \ -helpcontent2/source/text/swriter/01/mm_cusaddfie \ helpcontent2/source/text/swriter/01/mm_cusaddlis \ helpcontent2/source/text/swriter/01/mm_cusgrelin \ helpcontent2/source/text/swriter/01/mm_emabod \ diff --git a/source/text/swriter/01/mm_cusaddfie.xhp b/source/text/swriter/01/mm_cusaddfie.xhp deleted file mode 100644 index c14c965f6..0 --- a/source/text/swriter/01/mm_cusaddfie.xhp +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - -New Address Block -/text/swriter/01/mm_cusaddfie.xhp - - -UFI: New Address Block dialog for mail merge - - - -New Address Block -UFI: was Custom Address Field in the mockup, so wrong file name...Specify the placement of address data fields in an address block of a mail merge document. -Address Elements -Select a field and drag the field to the other list. - -Adds the selected field from the Address Elements list to the other list. You can add the same field more than once. - -Removes the selected field from the other list. -Drag address element to the field below -Arrange the fields by drag-and-drop or use the arrow buttons. -Preview -Displays a preview of the first database record with the current address block layout. -(Arrow Buttons) -Select an item in the list and click an arrow button to move the item. - - commit 5bffaa7cecbcb102764ce195be2cb5fd03de4d6b Author: Gabor Kelemen Date: Thu Mar 30 23:57:55 2017 +0200 tdf#102930 Mail Merge Wizard: Standard Filter dialog ahelps Appears from the Select Address List dialog, Filter button. ahelps need to be the literal dot to work with multiple bookmarks Change-Id: Id906881098601f49643e0298949d7bcbbd618d57 Reviewed-on: https://gerrit.libreoffice.org/35949 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/shared/02/12090100.xhp b/source/text/shared/02/12090100.xhp index 9b80d0db9..4e2833962 100644 --- a/source/text/shared/02/12090100.xhp +++ b/source/text/shared/02/12090100.xhp @@ -29,8 +29,9 @@ + Standard Filter - Specifies the logical conditions to filter your table data. This dialog is available for spreadsheet documents, database tables and database forms. The dialog for databases does not contain the More Options button. + Specifies the logical conditions to filter your table data. This dialog is available for spreadsheet documents, database tables and database forms. The dialog for databases does not contain the More Options button. @@ -48,7 +49,7 @@ Operator - For the following arguments, you can choose between the logical operators AND / OR. + For the following arguments, you can choose between the logical operators AND / OR. @@ -56,7 +57,7 @@ Field name - Specifies the field names from the current table to set them in the argument. You will see the column identifiers if no text is available for the field names. + Specifies the field names from the current table to set them in the argument. You will see the column identifiers if no text is available for the field names. @@ -64,7 +65,7 @@ Condition - Specifies the comparative operators through which the entries in the Field name and Value fields can be linked. + Specifies the comparative operators through which the entries in the Field name and Value fields can be linked. @@ -73,7 +74,7 @@ Value - Specifies a value to filter the field. + Specifies a value to filter the field. The Value list box contains all possible values for the specified Field name . Choose the value to be used in the filter. You can also choose the - empty - or -not empty - entries.. If you use the filter function in database tables or forms, then type the value in the Value text box to be
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 02cf765edcb5afaac45ce41b1613bcfbfaafa907 Author: Gabor KelemenDate: Fri Mar 31 00:11:37 2017 +0200 Updated core Project: help 20abdd0a447ec3a330326ccd84257a0af6ce6f95 tdf#102930 Mail Merge Wizard: Drop duplicated page This is the same as the mm_newaddblo.xhp file Change-Id: Iafa9297c54042ba10a7bfff41a5ac4de13ada25d Reviewed-on: https://gerrit.libreoffice.org/35950 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 5bffaa7cecbc..20abdd0a447e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5bffaa7cecbcb102764ce195be2cb5fd03de4d6b +Subproject commit 20abdd0a447ec3a330326ccd84257a0af6ce6f95 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ed92b1633f9b7e04585a167e5d708164be879ade Author: Gabor KelemenDate: Thu Mar 30 23:57:55 2017 +0200 Updated core Project: help 5bffaa7cecbcb102764ce195be2cb5fd03de4d6b tdf#102930 Mail Merge Wizard: Standard Filter dialog ahelps Appears from the Select Address List dialog, Filter button. ahelps need to be the literal dot to work with multiple bookmarks Change-Id: Id906881098601f49643e0298949d7bcbbd618d57 Reviewed-on: https://gerrit.libreoffice.org/35949 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 9edd4f385d69..5bffaa7cecbc 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9edd4f385d6968697cbff1972ee2dc941baddd7c +Subproject commit 5bffaa7cecbcb102764ce195be2cb5fd03de4d6b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e1d05a6dbb5d4b926cb7ca6602af244ef733525b Author: Gabor KelemenDate: Thu Mar 30 23:55:55 2017 +0200 Updated core Project: help 9edd4f385d6968697cbff1972ee2dc941baddd7c tdf#102930 Mail Merge Wizard: Form Letter page A referred template has changed name Change-Id: I750eb370e6c10b682e13d4e5b9fa46c81c6e0a51 Reviewed-on: https://gerrit.libreoffice.org/35948 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index e1e4484d95b5..9edd4f385d69 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e1e4484d95b54d7993342c199fad929fd09f2405 +Subproject commit 9edd4f385d6968697cbff1972ee2dc941baddd7c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/guide/form_letters_main.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9edd4f385d6968697cbff1972ee2dc941baddd7c Author: Gabor KelemenDate: Thu Mar 30 23:55:55 2017 +0200 tdf#102930 Mail Merge Wizard: Form Letter page A referred template has changed name Change-Id: I750eb370e6c10b682e13d4e5b9fa46c81c6e0a51 Reviewed-on: https://gerrit.libreoffice.org/35948 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/guide/form_letters_main.xhp b/source/text/swriter/guide/form_letters_main.xhp index dc633075d..7db1ee66b 100644 --- a/source/text/swriter/guide/form_letters_main.xhp +++ b/source/text/swriter/guide/form_letters_main.xhp @@ -48,7 +48,7 @@ You see the New dialog. -Select Business Correspondence in the left list, and then Modern letter in the right list. Click OK to close the Templates dialog, and click Next in the wizard.removed the next two paras +Select Business Correspondence in the left list, and then "Modern" business letter in the right list. Click OK to close the Templates dialog, and click Next in the wizard. Select Letter and click Next. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/00/0406.xhp |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit e1e4484d95b54d7993342c199fad929fd09f2405 Author: Gabor KelemenDate: Thu Mar 30 22:22:43 2017 +0200 tdf#102930 Mail Merge Wizard: now available from the toolbar Change-Id: I82305033c3ed7c47ea4abfdd0d636f007718ea72 Reviewed-on: https://gerrit.libreoffice.org/35947 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/00/0406.xhp b/source/text/swriter/00/0406.xhp index 79b3e287b..58bf2452d 100644 --- a/source/text/swriter/00/0406.xhp +++ b/source/text/swriter/00/0406.xhp @@ -74,9 +74,9 @@ Choose Tools - Update - All Charts -Choose Tools - Mail Merge Wizard - -Click Mail Merge icon on the Table Data bar: +Choose Tools - Mail Merge Wizard +Click the Mail Merge icon on the Mail Merge bar: +Click the Mail Merge icon on the Table Data bar: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d5af070ebf625ca8d0a01338c822fc1e630e343b Author: Gabor KelemenDate: Thu Mar 30 22:22:43 2017 +0200 Updated core Project: help e1e4484d95b54d7993342c199fad929fd09f2405 tdf#102930 Mail Merge Wizard: now available from the toolbar Change-Id: I82305033c3ed7c47ea4abfdd0d636f007718ea72 Reviewed-on: https://gerrit.libreoffice.org/35947 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 20cb80d65291..e1e4484d95b5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 20cb80d652911121c3c9ad24eaa635a18e3293a0 +Subproject commit e1e4484d95b54d7993342c199fad929fd09f2405 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/main0200.xhp |3 +++ 1 file changed, 3 insertions(+) New commits: commit 20cb80d652911121c3c9ad24eaa635a18e3293a0 Author: Gabor KelemenDate: Thu Mar 30 22:21:23 2017 +0200 tdf#102930 Mail Merge Wizard: Update Toolbars page Add Mail Merge Toolbar to the list of toolbars Change-Id: I1b8ade2800b882ac1a132f78de5a40a10a2a07c1 Reviewed-on: https://gerrit.libreoffice.org/35946 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/main0200.xhp b/source/text/swriter/main0200.xhp index 8c2d7da6f..4ae5d136a 100644 --- a/source/text/swriter/main0200.xhp +++ b/source/text/swriter/main0200.xhp @@ -85,6 +85,9 @@ + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d005d988edd6d9841085ce8b87887377c05a6003 Author: Gabor KelemenDate: Thu Mar 30 22:21:23 2017 +0200 Updated core Project: help 20cb80d652911121c3c9ad24eaa635a18e3293a0 tdf#102930 Mail Merge Wizard: Update Toolbars page Add Mail Merge Toolbar to the list of toolbars Change-Id: I1b8ade2800b882ac1a132f78de5a40a10a2a07c1 Reviewed-on: https://gerrit.libreoffice.org/35946 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index dd10747d1e91..20cb80d65291 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit dd10747d1e916283958261d640758df40be1341f +Subproject commit 20cb80d652911121c3c9ad24eaa635a18e3293a0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/mm_seladdlis.xhp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit dd10747d1e916283958261d640758df40be1341f Author: Gabor KelemenDate: Thu Mar 30 22:19:45 2017 +0200 tdf#102930 Mail Merge Wizard: Select Address List window Add missin ahelp, drop old comment Change-Id: I4451b922ef6e980afed1089023e61300a5fc94ce Reviewed-on: https://gerrit.libreoffice.org/35945 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/01/mm_seladdlis.xhp b/source/text/swriter/01/mm_seladdlis.xhp index 0ebfc27f7..7bf4747cf 100644 --- a/source/text/swriter/01/mm_seladdlis.xhp +++ b/source/text/swriter/01/mm_seladdlis.xhp @@ -30,9 +30,9 @@ -ufi: added help id for the table control, else the Help button does not work + Select Address List -Select the address list that you want to use for mail merge, then click OK. +Select the address list that you want to use for mail merge, then click OK. Add Select the database file that contains the addresses that you want to use as an address list. If the file contains more than one table, the Select Table dialog opens. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a7b916d848c5cb1652a80ecc31b92e046db8dcc0 Author: Gabor KelemenDate: Thu Mar 30 22:19:45 2017 +0200 Updated core Project: help dd10747d1e916283958261d640758df40be1341f tdf#102930 Mail Merge Wizard: Select Address List window Add missin ahelp, drop old comment Change-Id: I4451b922ef6e980afed1089023e61300a5fc94ce Reviewed-on: https://gerrit.libreoffice.org/35945 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 4164e519b7b4..dd10747d1e91 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4164e519b7b4008de321da83e3e30c22576a603b +Subproject commit dd10747d1e916283958261d640758df40be1341f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8f74029f92cd16a5e0b73be71930974801ee4087 Author: Gabor KelemenDate: Thu Mar 30 22:16:28 2017 +0200 Updated core Project: help 4164e519b7b4008de321da83e3e30c22576a603b tdf#102930 Mail Merge Wizard: Select Address Block dialog Sync to current UI, add missing ahelp Change-Id: Icb4b25c0787fc157ed7506597999297e312341a9 Reviewed-on: https://gerrit.libreoffice.org/35944 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 816cf63ac88d..4164e519b7b4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 816cf63ac88d263220b33db62cdd94d044f9cc9d +Subproject commit 4164e519b7b4008de321da83e3e30c22576a603b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/mm_seladdblo.xhp | 17 + 1 file changed, 13 insertions(+), 4 deletions(-) New commits: commit 4164e519b7b4008de321da83e3e30c22576a603b Author: Gabor KelemenDate: Thu Mar 30 22:16:28 2017 +0200 tdf#102930 Mail Merge Wizard: Select Address Block dialog Sync to current UI, add missing ahelp Change-Id: Icb4b25c0787fc157ed7506597999297e312341a9 Reviewed-on: https://gerrit.libreoffice.org/35944 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/01/mm_seladdblo.xhp b/source/text/swriter/01/mm_seladdblo.xhp index a32840138..12b2818d7 100644 --- a/source/text/swriter/01/mm_seladdblo.xhp +++ b/source/text/swriter/01/mm_seladdblo.xhp @@ -32,26 +32,35 @@ Select Address Block -Select, edit, or delete an address block layout for mail merge. -Select the address block which you want to use +Select, edit, or delete an address block layout for mail merge. + + +Select your preferred address block Select the block in the list that you want to use for mail merge addresses, and click OK. - + + Never include country/region Excludes country or regional information from the address block. + Always include country/region Includes country or regional information in the address block. + Only include country/region if it is not: Only includes country or regional information in the address block if the value differs from the value that you enter in the text box. + Enter the country/region string that shall not be printed. + New Opens the New Address Block dialog where you can define a new address block layout. + Edit -Opens the New Address Block dialog where you can edit the selected address block layout. +Opens the Edit Address Block dialog where you can edit the selected address block layout. + Delete Deletes the selected address block layout. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/mm_newaddlis.xhp | 18 +- 1 file changed, 17 insertions(+), 1 deletion(-) New commits: commit 816cf63ac88d263220b33db62cdd94d044f9cc9d Author: Gabor KelemenDate: Thu Mar 30 22:14:41 2017 +0200 tdf#102930 Mail Merge Wizard: New Address List dialog Add missing bookmarks and ahelp Change-Id: I12ba0d1cf080819cb89bcbe668a1034cdb17fb36 Reviewed-on: https://gerrit.libreoffice.org/35943 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/01/mm_newaddlis.xhp b/source/text/swriter/01/mm_newaddlis.xhp index 87b926ff3..7b058c220 100644 --- a/source/text/swriter/01/mm_newaddlis.xhp +++ b/source/text/swriter/01/mm_newaddlis.xhp @@ -32,17 +32,33 @@ New Address List -Enter new addresses or edit the addresses for mail merge documents. When you click OK, a dialog prompts you for the location to save the address list. +Enter new addresses or edit the addresses for mail merge documents. When you click OK, a dialog prompts you for the location to save the address list. + + Address Information Enter or edit the field contents for each mail merge recipient. + + + + + + Show Entry Number Click the buttons to navigate through the records or enter a record number to display a record. + + New Adds a new blank record to the address list. + + Delete Deletes the selected record. + + Find Opens the Find Entry dialog. You can leave the dialog open while you edit the entries. + + Customize Opens the Customize Address List dialog where you can rearrange, rename, add, and delete fields. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 82c97a22a95d5885922607ab1dec0431501068ae Author: Gabor KelemenDate: Thu Mar 30 22:14:41 2017 +0200 Updated core Project: help 816cf63ac88d263220b33db62cdd94d044f9cc9d tdf#102930 Mail Merge Wizard: New Address List dialog Add missing bookmarks and ahelp Change-Id: I12ba0d1cf080819cb89bcbe668a1034cdb17fb36 Reviewed-on: https://gerrit.libreoffice.org/35943 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index c891d9d6469d..816cf63ac88d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c891d9d6469d04a68ebc06a0a772244f1aacecc9 +Subproject commit 816cf63ac88d263220b33db62cdd94d044f9cc9d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 912783cc8440acbfeaef7b5ec40c3d5ce699b298 Author: Gabor KelemenDate: Thu Mar 30 22:08:17 2017 +0200 Updated core Project: help c891d9d6469d04a68ebc06a0a772244f1aacecc9 tdf#102930 Mail Merge Wizard help: Match Field window Sync with current UI, add bookmarks Change-Id: I728668d4d11cf368a7bed46b6c680dc44731ccbd Reviewed-on: https://gerrit.libreoffice.org/35942 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index b52dc2fc13f3..c891d9d6469d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b52dc2fc13f392ee22b81f9ce76001a76a51c2e8 +Subproject commit c891d9d6469d04a68ebc06a0a772244f1aacecc9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: 2 commits - source/text
source/text/swriter/01/mm_emabod.xhp | 18 +- source/text/swriter/01/mm_matfie.xhp | 12 2 files changed, 17 insertions(+), 13 deletions(-) New commits: commit c891d9d6469d04a68ebc06a0a772244f1aacecc9 Author: Gabor KelemenDate: Thu Mar 30 22:08:17 2017 +0200 tdf#102930 Mail Merge Wizard help: Match Field window Sync with current UI, add bookmarks Change-Id: I728668d4d11cf368a7bed46b6c680dc44731ccbd Reviewed-on: https://gerrit.libreoffice.org/35942 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/01/mm_matfie.xhp b/source/text/swriter/01/mm_matfie.xhp index b1f956a41..fdb50a084 100644 --- a/source/text/swriter/01/mm_matfie.xhp +++ b/source/text/swriter/01/mm_matfie.xhp @@ -32,10 +32,14 @@ Match Fields -Matches the logical field names of the layout dialog to the field names in your database when you create new address blocks or salutations. -Matches to: -Select a field name in your database for each logical field element. -Preview +Matches the logical field names of the layout dialog to the field names in your database when you create new address blocks or salutations. + + +Matches to field: +Select a field name in your database for each logical address element. + + +Address block preview Displays a preview of the values of the first data record. commit b52dc2fc13f392ee22b81f9ce76001a76a51c2e8 Author: Gabor Kelemen Date: Thu Mar 30 22:06:39 2017 +0200 tdf#102930 Mail Merge Wizard: fix E-mail Message window page Add missing bookmarks and ahelp Change-Id: I1341200f32e586303b693494c2e45067457e760c Reviewed-on: https://gerrit.libreoffice.org/35941 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/01/mm_emabod.xhp b/source/text/swriter/01/mm_emabod.xhp index 71c76fe15..33562ab33 100644 --- a/source/text/swriter/01/mm_emabod.xhp +++ b/source/text/swriter/01/mm_emabod.xhp @@ -32,32 +32,32 @@ E-Mail Message -Type the message and the salutation for files that you send as e-mail attachments. +Type the message and the salutation for files that you send as e-mail attachments. This e-mail should contain a salutation Adds a salutation to the e-mail. - + Insert personalized salutation Adds a personalized salutation. To use the default salutation, clear this check box. - + Female Select the personalized greeting for a female recipient. - + New Opens the Custom Salutation dialog for a female recipient. - + Male Select the personalized greeting for a male recipient. - + New Opens the Custom Salutation dialog for a male recipient. - + Field name Select the field name of the address database field that contains the gender information. - + Field value Select the field value that indicates the gender of the recipient. - + General salutation Select the default greeting to use if a personalized salutation cannot be created. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6a2472d59d71a483ffd4a61e89033879294f9336 Author: Gabor KelemenDate: Thu Mar 30 22:06:39 2017 +0200 Updated core Project: help b52dc2fc13f392ee22b81f9ce76001a76a51c2e8 tdf#102930 Mail Merge Wizard: fix E-mail Message window page Add missing bookmarks and ahelp Change-Id: I1341200f32e586303b693494c2e45067457e760c Reviewed-on: https://gerrit.libreoffice.org/35941 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index c9e5b786f194..b52dc2fc13f3 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c9e5b786f194af2ba20dc76f2c8d3fb2562aa6dc +Subproject commit b52dc2fc13f392ee22b81f9ce76001a76a51c2e8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/mm_finent.xhp | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) New commits: commit c9e5b786f194af2ba20dc76f2c8d3fb2562aa6dc Author: Gabor KelemenDate: Thu Mar 30 22:05:43 2017 +0200 tdf#102930 Mail Merge Wizard help: Find Entry dialog Add missing bookmarks and ahelps Change-Id: Ib70d18f137060a5f13863c32be3a629509a24808 Reviewed-on: https://gerrit.libreoffice.org/35940 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/01/mm_finent.xhp b/source/text/swriter/01/mm_finent.xhp index 003eb32bb..7e15ce775 100644 --- a/source/text/swriter/01/mm_finent.xhp +++ b/source/text/swriter/01/mm_finent.xhp @@ -30,13 +30,22 @@ + Find Entry -Searches for a record or recipient in the mail merge address list. +Searches for a record or recipient in the mail merge address list. + + Find Enter the search term. + + Find only in Restricts the search to one data field. -Select the data field where you want to search for the text. + + +Select the data field where you want to search for the text. + + Find Displays the next record that contains the search text. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2fa96b5bf5865f38629c6b541a50bb161d68ed46 Author: Gabor KelemenDate: Thu Mar 30 22:05:43 2017 +0200 Updated core Project: help c9e5b786f194af2ba20dc76f2c8d3fb2562aa6dc tdf#102930 Mail Merge Wizard help: Find Entry dialog Add missing bookmarks and ahelps Change-Id: Ib70d18f137060a5f13863c32be3a629509a24808 Reviewed-on: https://gerrit.libreoffice.org/35940 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 05690a67949a..c9e5b786f194 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 05690a67949aafbe69949226a26834a3a55c51df +Subproject commit c9e5b786f194af2ba20dc76f2c8d3fb2562aa6dc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c0e25869f249b2fca27dc690051479e00881bcb3 Author: Gabor KelemenDate: Thu Mar 30 21:12:26 2017 +0200 Updated core Project: help 05690a67949aafbe69949226a26834a3a55c51df tdf#102930 Mail Merge Wizard help: Custom Address List page Add missing bookmarks Change-Id: Id1a0a49bb7fc20a491f12cf344b5c22a45d6bc02 Reviewed-on: https://gerrit.libreoffice.org/35939 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index ca3d69f1840b..05690a67949a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ca3d69f1840b71b899c0ab8b1671f314b799eeae +Subproject commit 05690a67949aafbe69949226a26834a3a55c51df ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/mm_cusaddlis.xhp |9 + 1 file changed, 9 insertions(+) New commits: commit 05690a67949aafbe69949226a26834a3a55c51df Author: Gabor KelemenDate: Thu Mar 30 21:12:26 2017 +0200 tdf#102930 Mail Merge Wizard help: Custom Address List page Add missing bookmarks Change-Id: Id1a0a49bb7fc20a491f12cf344b5c22a45d6bc02 Reviewed-on: https://gerrit.libreoffice.org/35939 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/01/mm_cusaddlis.xhp b/source/text/swriter/01/mm_cusaddlis.xhp index d82a19c5c..fb89f8882 100644 --- a/source/text/swriter/01/mm_cusaddlis.xhp +++ b/source/text/swriter/01/mm_cusaddlis.xhp @@ -30,15 +30,24 @@ + Customize Address List Customizes the address list for mail merge documents. + + Address list elements Select the fields that you want to move, delete, or rename. + + Add Inserts a new text field. + + Delete Deletes the selected field. + + Rename Renames the selected text field. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/mm_copyto.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ca3d69f1840b71b899c0ab8b1671f314b799eeae Author: Gabor KelemenDate: Thu Mar 30 21:05:29 2017 +0200 tdf#102930 Update link on Mail Merge - Copy To window page That functionality is described on a new page now Change-Id: Id0a7b3905f8382f937e244e075d71f6a9bb97fb5 Reviewed-on: https://gerrit.libreoffice.org/35938 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/01/mm_copyto.xhp b/source/text/swriter/01/mm_copyto.xhp index 939c5f1f2..752ab8812 100644 --- a/source/text/swriter/01/mm_copyto.xhp +++ b/source/text/swriter/01/mm_copyto.xhp @@ -32,7 +32,7 @@ Copy To -Specify additional e-mail recipients for the mail merge document. +Specify additional e-mail recipients for the mail merge document. CC Enter the recipients of e-mail copies, separated by a semicolon (;). ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0ce151b16475bea31ce01ab83f1dedf78b5af5f6 Author: Gabor KelemenDate: Thu Mar 30 21:05:29 2017 +0200 Updated core Project: help ca3d69f1840b71b899c0ab8b1671f314b799eeae tdf#102930 Update link on Mail Merge - Copy To window page That functionality is described on a new page now Change-Id: Id0a7b3905f8382f937e244e075d71f6a9bb97fb5 Reviewed-on: https://gerrit.libreoffice.org/35938 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index f819eb227c33..ca3d69f1840b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f819eb227c337fc59416649218be6354d287de37 +Subproject commit ca3d69f1840b71b899c0ab8b1671f314b799eeae ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4494a6318f3f90f2faa854d5e4298f7a65a95c3c Author: Gabor KelemenDate: Thu Mar 30 21:04:01 2017 +0200 Updated core Project: help f819eb227c337fc59416649218be6354d287de37 tdf#102930 Update Mail Merge Wizard Page 5 help Sync to current UI, improve readability Change-Id: Ib756f8998ed88a63b8f2927677638dd6110a86f4 Reviewed-on: https://gerrit.libreoffice.org/35937 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index a5b29c05af7c..f819eb227c33 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a5b29c05af7c8cc038f953bda2995f8d99be5e04 +Subproject commit f819eb227c337fc59416649218be6354d287de37 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dca0372ac1eb5e80961d51a8376fdfb8c6958a57 Author: Gabor KelemenDate: Thu Mar 30 21:02:47 2017 +0200 Updated core Project: help a5b29c05af7c8cc038f953bda2995f8d99be5e04 tdf#102930 Update Mail Merge Wizard Page 4 help Add missing bookmarks, improve readability Change-Id: If8f2afcfb049d01beceb788dc4beb21dbfcb6032 Reviewed-on: https://gerrit.libreoffice.org/35936 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 854375b6e711..a5b29c05af7c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 854375b6e711cd114e537215b55c6bfdd8d654b0 +Subproject commit a5b29c05af7c8cc038f953bda2995f8d99be5e04 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: 2 commits - source/text
source/text/swriter/01/mailmerge04.xhp | 27 --- source/text/swriter/01/mailmerge05.xhp | 33 ++--- 2 files changed, 38 insertions(+), 22 deletions(-) New commits: commit f819eb227c337fc59416649218be6354d287de37 Author: Gabor KelemenDate: Thu Mar 30 21:04:01 2017 +0200 tdf#102930 Update Mail Merge Wizard Page 5 help Sync to current UI, improve readability Change-Id: Ib756f8998ed88a63b8f2927677638dd6110a86f4 Reviewed-on: https://gerrit.libreoffice.org/35937 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/01/mailmerge05.xhp b/source/text/swriter/01/mailmerge05.xhp index 441b7a459..6ea99d0dd 100644 --- a/source/text/swriter/01/mailmerge05.xhp +++ b/source/text/swriter/01/mailmerge05.xhp @@ -22,7 +22,7 @@ -Mail Merge Wizard - Layout +Mail Merge Wizard - Adjust Layout /text/swriter/01/mailmerge05.xhp @@ -32,28 +32,39 @@ -Mail Merge Wizard - Adjust Layout +Mail Merge Wizard - Adjust layout Specify the position of the address blocks and salutations on the documents. +Address Block Position + +From top +Enter the amount of space to leave between the top edge of the page and the top edge of the address block. -Align to text body +Align to text body Aligns the frame that contains the address block to the left page margin. -From left +From left Enter the amount of space to leave between the left edge of the page and the left edge of the address block. - -From top -Enter the amount of space to leave between the top edge of the page and the top edge of the address block. +Salutation Position -Up +Up Moves the salutation up. -Down +Down Moves the salutation down. + + +Preview area +Provides a preview of the salutation positioning on the page. + -Zoom +Zoom Select a magnification for the print preview. Use the commands in the context menu of the preview to move the view up and down. -Mail Merge Wizard - Edit document +Press the Finish button and use the Mail Merge Toolbar to finish the mail merge process. + + +Mail Merge Wizard overview + commit a5b29c05af7c8cc038f953bda2995f8d99be5e04 Author: Gabor Kelemen Date: Thu Mar 30 21:02:47 2017 +0200 tdf#102930 Update Mail Merge Wizard Page 4 help Add missing bookmarks, improve readability Change-Id: If8f2afcfb049d01beceb788dc4beb21dbfcb6032 Reviewed-on: https://gerrit.libreoffice.org/35936 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/01/mailmerge04.xhp b/source/text/swriter/01/mailmerge04.xhp index 7f7e14c94..0803df5a5 100644 --- a/source/text/swriter/01/mailmerge04.xhp +++ b/source/text/swriter/01/mailmerge04.xhp @@ -32,36 +32,37 @@ -Mail Merge Wizard - Create a Salutation -Specify the properties for the salutation. If the mail merge database contains gender information, you can specify different salutations based on the gender of the recipient. +Mail Merge Wizard - Create salutation +Specify the properties for the salutation. If the mail merge database contains gender information, you can specify different salutations based on the gender of the recipient. This document should contain a salutation Adds a salutation. - + Insert personalized salutation Adds a personalized salutation to the mail merge document. To use the default salutation, clear this check box. - + Female Select the personalized greeting for a female recipient. - + New Opens the Custom Salutation (Female recipient) dialog. - + Male Select the personalized greeting for a male recipient. - + New Opens the Custom Salutation (Male recipient) dialog. - + Field name Select the field name of the address database field that contains the gender information. - + Field value Select the field value that indicates the gender of the recipient. - + General salutation Select the default salutation that is used when you do not specify a personalized salutation. + Preview Displays a preview of the salutation. @@ -71,6 +72,10 @@ (Browse buttons) Use the browse buttons to preview the information from the previous or next data record. -Mail Merge Wizard - Adjust layout +Next step: Mail Merge Wizard - Adjust layout +Alternatively you can press the Finish button and use the Mail Merge Toolbar to finish the mail merge process. + +Mail Merge Wizard overview + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: 2 commits - source/text
source/text/swriter/01/mailmerge02.xhp | 11 +++ source/text/swriter/01/mailmerge03.xhp | 17 - 2 files changed, 19 insertions(+), 9 deletions(-) New commits: commit 854375b6e711cd114e537215b55c6bfdd8d654b0 Author: Gabor KelemenDate: Thu Mar 30 21:01:02 2017 +0200 tdf#102930 Update Mail Merge Wizard Page 3 help Sync to current UI, improve readability Change-Id: I03807f06cc2dc99aa4999bad94ebbe3c81c356d3 Reviewed-on: https://gerrit.libreoffice.org/35935 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/01/mailmerge03.xhp b/source/text/swriter/01/mailmerge03.xhp index 36326ffd9..2f408bf28 100644 --- a/source/text/swriter/01/mailmerge03.xhp +++ b/source/text/swriter/01/mailmerge03.xhp @@ -33,17 +33,18 @@ Mail Merge Wizard - Addresses -Specify the recipients for the mail merge document as well as the layout of the address block. +Specify the recipients for the mail merge document as well as the layout of the address block. -The Mail Merge wizard opens to this page if you start the wizard in a text document that already contains address database fields. If the wizard opens directly to this page, the Select address list button is called Select different address list. -The title of this page is Address block for letters and Address list for e-mail messages. +The Mail Merge wizard opens to this page if you start the wizard in a text document that already contains address database fields. If the wizard opens directly to this page, the Select Address List button is called Select Different Address List. +The title of this page is Insert address block for letters and Select address list for e-mail messages. -Select address list +Select Address List Opens the Select Address List dialog, where you can choose a data source for the addresses, add new addresses, or type in a new address list. When you edit some records in a Calc spreadsheet data source that is currently in use for a mail merge, those changes are not visible in the mail merge.ufi: see i9899 This document shall contain an address block Adds an address block to the mail merge document. + Select the address block layout that you want to use. Suppress lines with just empty fields @@ -54,10 +55,16 @@ Match fields Opens the Match Fields dialog. + +Shows a preview of the address block template filled with data. (Browse buttons) Use the browse buttons to preview the information from the previous or next data record. -Mail Merge Wizard - Create a salutation +Next step: Mail Merge Wizard - Create salutation +Alternatively you can press the Finish button and use the Mail Merge Toolbar to finish the mail merge process. + +Mail Merge Wizard overview + commit dd49e9fa8338f442e30fc78afea7cac0e8831540 Author: Gabor Kelemen Date: Thu Mar 30 21:00:02 2017 +0200 tdf#102930 Update Mail Merge Wizard Page 2 help Sync to current UI Change-Id: I390c0676d07b543e7c6ee56c5046e4aa0be55549 Reviewed-on: https://gerrit.libreoffice.org/35934 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/01/mailmerge02.xhp b/source/text/swriter/01/mailmerge02.xhp index 4dfe070ac..bbe2fac26 100644 --- a/source/text/swriter/01/mailmerge02.xhp +++ b/source/text/swriter/01/mailmerge02.xhp @@ -24,20 +24,23 @@ -Mail Merge Wizard - Document Type +Mail Merge Wizard - Select document type /text/swriter/01/mailmerge02.xhp -Mail Merge Wizard - Document Type -Specify the type of mail merge document to create. +Mail Merge Wizard - Select document type +Specify the type of mail merge document to create. Letter Creates a printable mail merge document. E-mail message Creates mail merge documents that you can send as an e-mail message or an e-mail attachment. -Mail Merge Wizard - Addresses +Next step: Mail Merge Wizard - Addresses + +Mail Merge Wizard overview + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 307064696e8330a6dd102b509ef65db31137efca Author: Gabor KelemenDate: Thu Mar 30 21:00:02 2017 +0200 Updated core Project: help dd49e9fa8338f442e30fc78afea7cac0e8831540 tdf#102930 Update Mail Merge Wizard Page 2 help Sync to current UI Change-Id: I390c0676d07b543e7c6ee56c5046e4aa0be55549 Reviewed-on: https://gerrit.libreoffice.org/35934 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 2c3f721d7dd1..dd49e9fa8338 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2c3f721d7dd152efbe6261ea697643c84ce11b12 +Subproject commit dd49e9fa8338f442e30fc78afea7cac0e8831540 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cd4de872c4afc7196b594b30aa7971c0c6527514 Author: Gabor KelemenDate: Thu Mar 30 21:01:02 2017 +0200 Updated core Project: help 854375b6e711cd114e537215b55c6bfdd8d654b0 tdf#102930 Update Mail Merge Wizard Page 3 help Sync to current UI, improve readability Change-Id: I03807f06cc2dc99aa4999bad94ebbe3c81c356d3 Reviewed-on: https://gerrit.libreoffice.org/35935 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index dd49e9fa8338..854375b6e711 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit dd49e9fa8338f442e30fc78afea7cac0e8831540 +Subproject commit 854375b6e711cd114e537215b55c6bfdd8d654b0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 93216a173efa93fe1aaf8d6a570e01d044f8792e Author: Gabor KelemenDate: Thu Mar 30 20:57:18 2017 +0200 Updated core Project: help 2c3f721d7dd152efbe6261ea697643c84ce11b12 tdf#102930 Update Mail Merge Wizard Page 1 help Sync to current UI Change-Id: Id53cae534a152ab68df9bf02ed5bebfe4d26b139 Reviewed-on: https://gerrit.libreoffice.org/35933 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 5ebea3473f90..2c3f721d7dd1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5ebea3473f90837a9e3293f7173497caf8f9a7ee +Subproject commit 2c3f721d7dd152efbe6261ea697643c84ce11b12 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/mailmerge01.xhp | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) New commits: commit 2c3f721d7dd152efbe6261ea697643c84ce11b12 Author: Gabor KelemenDate: Thu Mar 30 20:57:18 2017 +0200 tdf#102930 Update Mail Merge Wizard Page 1 help Sync to current UI Change-Id: Id53cae534a152ab68df9bf02ed5bebfe4d26b139 Reviewed-on: https://gerrit.libreoffice.org/35933 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/01/mailmerge01.xhp b/source/text/swriter/01/mailmerge01.xhp index 28b879ed1..27dc765f2 100644 --- a/source/text/swriter/01/mailmerge01.xhp +++ b/source/text/swriter/01/mailmerge01.xhp @@ -22,7 +22,7 @@ -Mail Merge Wizard - Starting Document +Mail Merge Wizard - Select starting Document /text/swriter/01/mailmerge01.xhp @@ -32,8 +32,8 @@ -Mail Merge Wizard - Starting Document -Specify the document that you want to use as a base for the mail merge document. +Mail Merge Wizard - Select starting document +Specify the document that you want to use as a base for the mail merge document. Use the current document @@ -52,12 +52,15 @@ Select the template that you want to create your mail merge document with. Browse -Opens the Templates and Documents dialog. +Opens a template selector dialog. Start from a recently saved starting document Use an existing mail merge document as the base for a new mail merge document. Select the document. -Mail Merge Wizard - Document type +Next step: Mail Merge Wizard - Select document type + +Mail Merge Wizard overview + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d92c650b5a7b8499cf80386230e626ca64889a88 Author: Gabor KelemenDate: Thu Mar 30 20:18:08 2017 +0200 Updated core Project: help 5ebea3473f90837a9e3293f7173497caf8f9a7ee tdf#102930 Add new pages for Mail Merge rewamp Add new pages for the Mail Merge toolbar, Save merged document, Print merged document, E-Mail merged document windows. Content is mostly salvaged from mailmerge06-07-08 pages. Change-Id: I423df1bb358ce1a2d2ac63c8fd2b6e289f0ae7b8 Reviewed-on: https://gerrit.libreoffice.org/35932 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 7f8eec4aea12..5ebea3473f90 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7f8eec4aea1271f18ba55c771a8d81171ebbba48 +Subproject commit 5ebea3473f90837a9e3293f7173497caf8f9a7ee ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: AllLangHelp_swriter.mk source/text
AllLangHelp_swriter.mk |4 + source/text/swriter/01/mm_emailmergeddoc.xhp | 89 +++ source/text/swriter/01/mm_printmergeddoc.xhp | 71 + source/text/swriter/01/mm_savemergeddoc.xhp | 65 +++ source/text/swriter/mailmergetoolbar.xhp | 68 5 files changed, 297 insertions(+) New commits: commit 5ebea3473f90837a9e3293f7173497caf8f9a7ee Author: Gabor KelemenDate: Thu Mar 30 20:18:08 2017 +0200 tdf#102930 Add new pages for Mail Merge rewamp Add new pages for the Mail Merge toolbar, Save merged document, Print merged document, E-Mail merged document windows. Content is mostly salvaged from mailmerge06-07-08 pages. Change-Id: I423df1bb358ce1a2d2ac63c8fd2b6e289f0ae7b8 Reviewed-on: https://gerrit.libreoffice.org/35932 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk index abdf488e8..a657fbcfb 100644 --- a/AllLangHelp_swriter.mk +++ b/AllLangHelp_swriter.mk @@ -189,10 +189,13 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\ helpcontent2/source/text/swriter/01/mm_cusaddlis \ helpcontent2/source/text/swriter/01/mm_cusgrelin \ helpcontent2/source/text/swriter/01/mm_emabod \ +helpcontent2/source/text/swriter/01/mm_emailmergeddoc \ helpcontent2/source/text/swriter/01/mm_finent \ helpcontent2/source/text/swriter/01/mm_matfie \ helpcontent2/source/text/swriter/01/mm_newaddblo \ helpcontent2/source/text/swriter/01/mm_newaddlis \ +helpcontent2/source/text/swriter/01/mm_printmergeddoc \ +helpcontent2/source/text/swriter/01/mm_savemergeddoc \ helpcontent2/source/text/swriter/01/mm_seladdblo \ helpcontent2/source/text/swriter/01/mm_seladdlis \ helpcontent2/source/text/swriter/01/mm_seltab \ @@ -412,6 +415,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\ helpcontent2/source/text/swriter/menu/insert_header_footer \ helpcontent2/source/text/swriter/menu/insert_footnote_endnote \ helpcontent2/source/text/swriter/menu/insert_frame \ +helpcontent2/source/text/swriter/mailmergetoolbar \ )) # vim: set noet sw=4 ts=4: diff --git a/source/text/swriter/01/mm_emailmergeddoc.xhp b/source/text/swriter/01/mm_emailmergeddoc.xhp new file mode 100644 index 0..387ee4602 --- /dev/null +++ b/source/text/swriter/01/mm_emailmergeddoc.xhp @@ -0,0 +1,89 @@ + + + + + + +Send merged document as e-mail +/text/swriter/01/mm_emailmergeddoc.xhp + + + + + + + + + +Send merged document as e-mail +Sends the mail merge output as e-mail messages to all or some recipients. + + +E-mail options + + +To +Select the database field that contains the e-mail address of the recipient. + + +Copy to +Opens the Copy To dialog where you can specify one or more CC or BCC addresses. + + +Subject +Enter the subject line for the e-mail messages. + + +Send as +Select the mail format for the e-mail messages. +The Plain text and HTML message formats are sent in the body of the message, whereas the *.odt, *.doc, and *.pdf formats are sent as attachments. + + +Properties +Opens the E-Mail Message dialog where you can enter the e-mail message for the mail merge files that are sent as attachments. + + +Name of the attachment +Shows the name of the attachment. + +Send records + + +Send all documents +Select to send e-mails to all recipients. + + + +From +Selects a range of records starting at the record number in the From box and ending at the record number in the To box. + + +From +Enter the number of the first record to include in the mail merge. + + +To +Enter the number of the last record to include in the mail merge. + + +Send Documents +Click to start sending e-mails. + + + diff --git a/source/text/swriter/01/mm_printmergeddoc.xhp b/source/text/swriter/01/mm_printmergeddoc.xhp new file mode 100644 index 0..f22fee7bd --- /dev/null +++ b/source/text/swriter/01/mm_printmergeddoc.xhp @@ -0,0 +1,71 @@ + + + + + + +Print merged document +/text/swriter/01/mm_printmergeddoc.xhp + + + + + + + + + +Print merged document +Prints the mail merge output for all or some recipients. + + +Printer options + +Printer +Select the printer. + + +Properties +Changes the printer properties. + +Print records + +Print all documents +Prints documents for all recipients. + + +From +Selects a range of records starting at the record number in the From box and ending at the record number in the To box. + + +From +Enter the number of the first record to include in the mail merge. + + +To +Enter the number of the last record to include in the mail merge. + + +Print Documents +Prints the mail merge documents. + + + + + diff --git a/source/text/swriter/01/mm_savemergeddoc.xhp b/source/text/swriter/01/mm_savemergeddoc.xhp new file mode 100644 index
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0e8a9efb19cb7b6fa92018e0567bf73139d0f95c Author: Gabor KelemenDate: Thu Mar 9 00:02:16 2017 +0100 Updated core Project: help 7f8eec4aea1271f18ba55c771a8d81171ebbba48 tdf#102930 Update Mail Merge Wizard pages - 00 - Remove embeds for dropped wizard pages. - Drop redundant bookmarks - Improve text a bit for better readability Change-Id: I04b4fd9936719a52368e56c8804328b528a782a4 Reviewed-on: https://gerrit.libreoffice.org/35931 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 0d1048bd6a3a..7f8eec4aea12 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0d1048bd6a3ad7ca6b6827c74c70e4c65ea32c54 +Subproject commit 7f8eec4aea1271f18ba55c771a8d81171ebbba48 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/mailmerge00.xhp | 18 -- 1 file changed, 8 insertions(+), 10 deletions(-) New commits: commit 7f8eec4aea1271f18ba55c771a8d81171ebbba48 Author: Gabor KelemenDate: Thu Mar 9 00:02:16 2017 +0100 tdf#102930 Update Mail Merge Wizard pages - 00 - Remove embeds for dropped wizard pages. - Drop redundant bookmarks - Improve text a bit for better readability Change-Id: I04b4fd9936719a52368e56c8804328b528a782a4 Reviewed-on: https://gerrit.libreoffice.org/35931 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/swriter/01/mailmerge00.xhp b/source/text/swriter/01/mailmerge00.xhp index afbed6074..64e90bfe5 100644 --- a/source/text/swriter/01/mailmerge00.xhp +++ b/source/text/swriter/01/mailmerge00.xhp @@ -30,31 +30,29 @@ - - -UFI: inserted help idsUFI: moved DSBFormLetter ID to shared/main0212Mail Merge Wizard +Mail Merge Wizard Starts the Mail Merge Wizard to create form letters or send e-mail messages to many recipients. +Before starting the Mail Merge Wizard you might want to review the whole process of creating a mail merge: - - - -Mail Merge Wizard - Starting document - - -Configurable Mail Merge dialog +First step: Mail Merge Wizard - Select starting document. + + + +Configurable Mail Merge dialog + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 103581] RTL tables inside RTL two-column sections partly disappear and run over the section
https://bugs.documentfoundation.org/show_bug.cgi?id=103581 --- Comment #4 from ammine007--- Salamu alaikum, As a work around, you can use the navigator, 1-Select the concerned section, 2- Delete the section, 3- Undelete the section, Now you can displcay your pdf correctly, or export it as a PDF. But each time you reopen your file you have to execute the same steps on each two columned section of you document, which is for sure counter-productive at this stage; I really hope that developers will take into consideration this work around and make us happy users. :) -- 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.in Repository.mk vcl/Executable_cgmfuzzer.mk vcl/Module_vcl.mk vcl/workben
Makefile.in |2 - Repository.mk |1 vcl/Executable_cgmfuzzer.mk | 47 vcl/Module_vcl.mk |1 vcl/workben/cgmfuzzer.cxx | 30 5 files changed, 80 insertions(+), 1 deletion(-) New commits: commit 462d1f78845834548a59e843875de215e144e77c Author: Caolán McNamaraDate: Sat Apr 1 20:54:54 2017 +0100 add cgm fuzzer Change-Id: Id3bf2bc3c50421bb46e6fbdf3c492bdd2e3a976c diff --git a/Makefile.in b/Makefile.in index a505d37d9a4c..e19aef53e5c7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -446,7 +446,7 @@ $(foreach ide,\ eclipsecdt,\ $(eval $(call gb_Top_GbuildToIdeIntegrationNS,$(ide -fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi Library_clew Library_gie Library_icg Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer Executable_olefuzzer AllLangResTarget_sd Executable_pptfuzzer Executable_rtffuzzer +fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi Library_clew Library_gie Library_icg Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer Executable_olefuzzer AllLangResTarget_sd Executable_pptfuzzer Executable_rtffuzzer Executable_cgmfuzzer endif # MAKE_RESTARTS diff --git a/Repository.mk b/Repository.mk index e66677b87dc1..7dbaed79adce 100644 --- a/Repository.mk +++ b/Repository.mk @@ -118,6 +118,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ $(call gb_Helper_optional,FUZZERS,olefuzzer) \ $(call gb_Helper_optional,FUZZERS,pptfuzzer) \ $(call gb_Helper_optional,FUZZERS,rtffuzzer) \ + $(call gb_Helper_optional,FUZZERS,cgmfuzzer) \ $(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \ soffice_bin \ $(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \ diff --git a/vcl/Executable_cgmfuzzer.mk b/vcl/Executable_cgmfuzzer.mk new file mode 100644 index ..4b7a5a772bbc --- /dev/null +++ b/vcl/Executable_cgmfuzzer.mk @@ -0,0 +1,47 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +include $(SRCDIR)/vcl/commonfuzzer.mk + +$(eval $(call gb_Executable_Executable,cgmfuzzer)) + +$(eval $(call gb_Executable_use_api,cgmfuzzer,\ +offapi \ +udkapi \ +)) + +$(eval $(call gb_Executable_use_externals,cgmfuzzer,\ + $(fuzzer_externals) \ +)) + +$(eval $(call gb_Executable_set_include,cgmfuzzer,\ +$$(INCLUDE) \ +-I$(SRCDIR)/vcl/inc \ +)) + +$(eval $(call gb_Executable_use_libraries,cgmfuzzer,\ + $(fuzzer_libraries) \ +)) + +$(eval $(call
[Libreoffice-commits] core.git: sc/source
sc/source/filter/starcalc/scflt.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 785ef3623447cb06f8d0987b9abc86960e848a39 Author: Caolán McNamaraDate: Sun Apr 2 17:45:38 2017 +0100 move this work to end of Sc10Import::Import Change-Id: I28413f710642c904fbe7508a14272ab31bf4df3f diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index 2d7128be907b..509d8013eba3 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -938,9 +938,6 @@ Sc10Import::Sc10Import(SvStream& rStr, ScDocument* pDocument ) : Sc10Import::~Sc10Import() { -pDoc->CalcAfterLoad(); -pDoc->UpdateAllCharts(); - delete pFontCollection; delete pNameCollection; delete pPatternCollection; @@ -988,6 +985,9 @@ sal_uLong Sc10Import::Import() pPrgrsBar = nullptr; #endif +pDoc->CalcAfterLoad(); +pDoc->UpdateAllCharts(); + return nError; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106918] New: Sections with two columns have to be deleted then un-deleted to display correctly
https://bugs.documentfoundation.org/show_bug.cgi?id=106918 Bug ID: 106918 Summary: Sections with two columns have to be deleted then un-deleted to display correctly Product: LibreOffice Version: 5.2.5.1 release Hardware: x86-64 (AMD64) OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: ammine...@gmail.com Salamu alaikum, I'm using Libreoffice Writer to write a report. The problem concerns two-columns texts. Each time I'm obliged to delete a two-columned section then un-delete it, to display it and export it as a PDF correctly. Otherwise, It won't display as intended and the exported PDF contains a problematic two -columned section. As a work around, I have to delete each two-columned section and un-delete it, then re-do this operation to all 2cols sections sequentially. Wi a report containing 17 2cols sections, it is counter productive and LibreOffice Writer is just unusable. Thank you all! Version: 5.2.5.1 Build ID: 1:5.2.5-2 CPU Threads: 4; OS Version: Linux 4.9; UI Render: default; VCL: gtk3; Locale: en-US (fr_FR.UTF-8); Calc: group On Debian 64bits -- 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 103859] [META] EMF/WMF (Windows Metafile) bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=103859 Bug 103859 depends on bug 102321, which changed state. Bug 102321 Summary: [FILEOPEN] Rectangle shown instead of EMF+image https://bugs.documentfoundation.org/show_bug.cgi?id=102321 What|Removed |Added Status|NEW |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 102321] [FILEOPEN] Rectangle shown instead of EMF+image
https://bugs.documentfoundation.org/show_bug.cgi?id=102321 Bartoszchanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #4 from Bartosz --- *** This bug has been marked as a duplicate of bug 103639 *** -- 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: editeng/source include/editeng
editeng/source/items/svxitems.src |8 ++ editeng/source/items/textitem.cxx | 119 + include/editeng/charrotateitem.hxx | 56 +++-- include/editeng/editrids.hrc |2 4 files changed, 166 insertions(+), 19 deletions(-) New commits: commit 1e30d2aface12a31687e5a27126e2061efd4b0cd Author: Tamás ZolnaiDate: Sun Apr 2 15:21:14 2017 +0200 Add SvxTextRotateItem inherited from SvxCharRotatItem I will be use it later for text rotation inside a table. Change-Id: I4cbaf05953b0e71331d2f3fdb45b7c4254a2b8cc Reviewed-on: https://gerrit.libreoffice.org/36021 Reviewed-by: Tamás Zolnai Tested-by: Tamás Zolnai diff --git a/editeng/source/items/svxitems.src b/editeng/source/items/svxitems.src index 087ee07bb6cd..47da1c953d5c 100644 --- a/editeng/source/items/svxitems.src +++ b/editeng/source/items/svxitems.src @@ -889,6 +889,14 @@ String RID_SVXITEMS_CHARROTATE_FITLINE { Text [ en-US ] = "Fit to line"; }; +String RID_SVXITEMS_TEXTROTATE_OFF +{ +Text [ en-US ] = "Text is not rotated"; +}; +String RID_SVXITEMS_TEXTROTATE +{ +Text [ en-US ] = "Text is rotated by $(ARG1)°"; +}; String RID_SVXITEMS_CHARSCALE { Text [ en-US ] = "Characters scaled $(ARG1)%"; diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 72fc2c210f66..e1d24094c8a7 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -2833,13 +2833,114 @@ sal_uInt16 SvxTwoLinesItem::GetVersion( sal_uInt16 nFFVer ) const /* +|*class SvxTextRotateItem +*/ + +SvxTextRotateItem::SvxTextRotateItem(sal_uInt16 nValue, const sal_uInt16 nW) +: SfxUInt16Item(nW, nValue) +{ +} + +SfxPoolItem* SvxTextRotateItem::Clone(SfxItemPool*) const +{ +return new SvxTextRotateItem(GetValue(), Which()); +} + +SfxPoolItem* SvxTextRotateItem::Create(SvStream& rStrm, sal_uInt16) const +{ +sal_uInt16 nVal; +rStrm.ReadUInt16(nVal); +return new SvxTextRotateItem(nVal, Which()); +} + +SvStream& SvxTextRotateItem::Store(SvStream & rStrm, sal_uInt16) const +{ +rStrm.WriteUInt16(GetValue()); +return rStrm; +} + +sal_uInt16 SvxTextRotateItem::GetVersion(sal_uInt16 nFFVer) const +{ +return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0; +} + +bool SvxTextRotateItem::GetPresentation( +SfxItemPresentation /*ePres*/, +MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, +OUString , const IntlWrapper*) const +{ +if (!GetValue()) +rText = EditResId::GetString(RID_SVXITEMS_TEXTROTATE_OFF); +else +{ +rText = EditResId::GetString(RID_SVXITEMS_TEXTROTATE); +rText = rText.replaceFirst("$(ARG1)", +OUString::number(GetValue() / 10)); +} +return true; +} + +bool SvxTextRotateItem::QueryValue(css::uno::Any& rVal, +sal_uInt8 nMemberId) const +{ +nMemberId &= ~CONVERT_TWIPS; +bool bRet = true; +switch (nMemberId) +{ +case MID_ROTATE: +rVal <<= (sal_Int16)GetValue(); +break; +default: +bRet = false; +break; +} +return bRet; +} + +bool SvxTextRotateItem::PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) +{ +nMemberId &= ~CONVERT_TWIPS; +bool bRet = true; +switch (nMemberId) +{ +case MID_ROTATE: +{ +sal_Int16 nVal = 0; +if ((rVal >>= nVal) && (0 == nVal || 900 == nVal || 2700 == nVal)) +SetValue((sal_uInt16)nVal); +else +bRet = false; +break; +} +default: +bRet = false; +} +return bRet; +} + +bool SvxTextRotateItem::operator==(const SfxPoolItem& rItem) const +{ +assert(SfxPoolItem::operator==(rItem)); +return SfxUInt16Item::operator==(rItem); +} + +void SvxTextRotateItem::dumpAsXml(xmlTextWriterPtr pWriter) const +{ +xmlTextWriterStartElement(pWriter, BAD_CAST("SvxTextRotateItem")); +xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); +xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::number(GetValue()).getStr())); +xmlTextWriterEndElement(pWriter); +} + + +/* |*class SvxCharRotateItem */ SvxCharRotateItem::SvxCharRotateItem( sal_uInt16 nValue, bool bFitIntoLine, const sal_uInt16 nW ) -: SfxUInt16Item( nW, nValue ), bFitToLine( bFitIntoLine ) +: SvxTextRotateItem(nValue, nW), bFitToLine( bFitIntoLine ) { } @@ -2889,12 +2990,11 @@ bool SvxCharRotateItem::GetPresentation( bool
[Libreoffice-bugs] [Bug 106904] Undo paste broken for html, doesn't work.
https://bugs.documentfoundation.org/show_bug.cgi?id=106904 --- Comment #2 from kie...@gmail.com --- Go to libreoffice home page, ctrl-A ctrl-C Go to blank libreoffice calc, paste, ctrl-Z The images are still there and the row heights are all wrong. Latest version. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81296] Can't open more than one File from the "open files" dialog.
https://bugs.documentfoundation.org/show_bug.cgi?id=81296 birqu...@web.de changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME --- Comment #10 from birqu...@web.de --- Still existing with LO 5.3.1, but I don't use the quickstart anymore. So "works for me" -- 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 97535] MouseWheel management
https://bugs.documentfoundation.org/show_bug.cgi?id=97535 --- Comment #2 from ThierryT--- Does someone works on this new concept actually ? -- 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] libmspub.git: src/lib
src/lib/MSPUBParser.cpp |1 + 1 file changed, 1 insertion(+) New commits: commit c6de50a17e7636c20bef03e7336f9782c8fc3850 Author: David TardonDate: Thu Mar 30 15:21:39 2017 +0200 WaE: this statement may fall through Change-Id: I9530e1d24ee589af1f72728ea9b045e29cacf7c7 diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp index 1af392e..95d3769 100644 --- a/src/lib/MSPUBParser.cpp +++ b/src/lib/MSPUBParser.cpp @@ -2078,6 +2078,7 @@ boost::shared_ptr MSPUBParser::getNewFill(const std::map(new PatternFill(m_escherDelayIndices[*ptr_bgPxId - 1], m_collector, fill, back)); } +return boost::shared_ptr(); } case BACKGROUND: default: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/experimental
ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 17 -- ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift |7 ++-- ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/.xccurrentversion |5 -- ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h |4 +- ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c |4 +- 5 files changed, 9 insertions(+), 28 deletions(-) New commits: commit a52f3310a6d84fcfffcc49016bbec35bfb6ee5e8 Author: jan IversenDate: Wed Mar 22 16:32:02 2017 +0100 iOS LibreOfficeLight Activate LibreOfficeKit Prepare for viewing functionality. Change-Id: I4960938fdc7bf6955096c96cc7f56792c64c6641 diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj index cf301c36063e..69d042885342 100644 --- a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj +++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj @@ -12,7 +12,6 @@ 397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; }; 397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift */; }; 397E09031E597BD8001374E0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 397E09011E597BD8001374E0 /* Main.storyboard */; }; - 397E09061E597BD8001374E0 /* LibreOfficeLight.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 397E09041E597BD8001374E0 /* LibreOfficeLight.xcdatamodeld */; }; 397E09081E597BD8001374E0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 397E09071E597BD8001374E0 /* Assets.xcassets */; }; 397E09161E597BD8001374E0 /* LibreOfficeLightTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397E09151E597BD8001374E0 /* LibreOfficeLightTests.swift */; }; 397E09211E597BD8001374E0 /* LibreOfficeLightUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397E09201E597BD8001374E0 /* LibreOfficeLightUITests.swift */; }; @@ -58,7 +57,6 @@ 397E08FA1E597BD8001374E0 /* LibreOfficeLight.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LibreOfficeLight.app; sourceTree = BUILT_PRODUCTS_DIR; }; 397E08FD1E597BD8001374E0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = LibreOfficeLight/AppDelegate.swift; sourceTree = SOURCE_ROOT; }; 397E09021E597BD8001374E0 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/Main.storyboard; sourceTree = ""; }; - 397E09051E597BD8001374E0 /* LibreOfficeLight.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = LibreOfficeLight.xcdatamodel; sourceTree = ""; }; 397E09071E597BD8001374E0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = LibreOfficeLight/Assets.xcassets; sourceTree = SOURCE_ROOT; }; 397E090C1E597BD8001374E0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = LibreOfficeLight/Info.plist; sourceTree = SOURCE_ROOT; }; 397E09111E597BD8001374E0 /* LibreOfficeLightTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LibreOfficeLightTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -118,7 +116,6 @@ 397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */, 39B084E21E5F0A9600682A59 /* lo.xcconfig */, 397E09071E597BD8001374E0 /* Assets.xcassets */, - 397E09041E597BD8001374E0 /* LibreOfficeLight.xcdatamodeld */, 397E090C1E597BD8001374E0 /* Info.plist */, 396F92F61E7AE62400A28C82 /* Settings.bundle */, ); @@ -362,7 +359,6 @@ buildActionMask = 2147483647; files = ( 392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources */, - 397E09061E597BD8001374E0 /* LibreOfficeLight.xcdatamodeld in Sources */, 3992D85D1E5B764A00BEA987 /* SideMenu.swift in Sources
[Libreoffice-bugs] [Bug 57102] FORMATTING: in a spreadsheet with partial protection: give warning that cell styles cannot be changed
https://bugs.documentfoundation.org/show_bug.cgi?id=57102 --- Comment #2 from andry--- Confirm. It was very difficult to find, why I can't modify style. -- 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: chart2/source editeng/source extensions/source forms/source include/toolkit include/vcl reportdesign/source sc/source svx/source sw/source toolkit/source vcl/source xml
chart2/source/view/main/DummyXShape.cxx |6 editeng/source/items/textitem.cxx| 10 - editeng/source/uno/unofdesc.cxx |8 extensions/source/propctrlr/fontdialog.cxx |9 extensions/source/propctrlr/formcomponenthandler.cxx |4 forms/source/component/Grid.cxx | 10 - include/toolkit/helper/vclunohelper.hxx |7 include/vcl/unohelp.hxx |8 reportdesign/source/ui/misc/UITools.cxx |3 sc/source/filter/excel/xlstyle.cxx |6 sc/source/filter/oox/stylesbuffer.cxx|4 svx/source/fmcomp/fmgridif.cxx | 12 - sw/source/filter/html/htmlform.cxx |4 sw/source/filter/html/htmlforw.cxx |4 sw/source/filter/ww8/ww8par3.cxx |4 toolkit/source/controls/unocontrolmodel.cxx |7 toolkit/source/helper/vclunohelper.cxx | 177 --- vcl/source/app/unohelp.cxx | 167 + xmloff/source/style/postuhdl.cxx |5 19 files changed, 232 insertions(+), 223 deletions(-) New commits: commit 2f33a8cd231d3842a1e5521e3a61d8e73517137b Author: Caolán McNamaraDate: Sun Apr 2 12:35:41 2017 +0100 coverity#1403662 Mixing enum types Change-Id: Ic5e797c65dfc736a9ef0ab14f3ae563216143947 Reviewed-on: https://gerrit.libreoffice.org/36020 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index b066f39a2d2d..322a21ec000e 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -741,13 +741,13 @@ struct FontAttribSetter else if(rPropName == "CharWeight") { float fWeight = rProp.second.get(); -FontWeight eFontWeight = VCLUnoHelper::ConvertFontWeight(fWeight); +FontWeight eFontWeight = vcl::unohelper::ConvertFontWeight(fWeight); mrFont.SetWeight(eFontWeight); } else if(rPropName == "ChartWidth") { float fWidth = rProp.second.get(); -FontWidth eFontWidth = VCLUnoHelper::ConvertFontWidth(fWidth); +FontWidth eFontWidth = vcl::unohelper::ConvertFontWidth(fWidth); mrFont.SetAverageFontWidth(eFontWidth); } } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 597086e3a4d7..72fc2c210f66 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -22,11 +22,11 @@ #include #include #include -#include #include #include #include #include +#include #include #include @@ -512,7 +512,7 @@ bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const rVal <<= (bool)GetBoolValue(); break; case MID_POSTURE: -rVal <<= VCLUnoHelper::ConvertFontSlant(GetValue()); +rVal <<= vcl::unohelper::ConvertFontSlant(GetValue()); break; } return true; @@ -537,7 +537,7 @@ bool SvxPostureItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) eSlant = (awt::FontSlant)nValue; } -SetValue(VCLUnoHelper::ConvertFontSlant(eSlant)); +SetValue(vcl::unohelper::ConvertFontSlant(eSlant)); } } return true; @@ -649,7 +649,7 @@ bool SvxWeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const break; case MID_WEIGHT: { -rVal <<= (float)( VCLUnoHelper::ConvertFontWeight( GetValue() ) ); +rVal <<= (float)( vcl::unohelper::ConvertFontWeight( GetValue() ) ); } break; } @@ -674,7 +674,7 @@ bool SvxWeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return false; fValue = (float)nValue; } -SetValue( VCLUnoHelper::ConvertFontWeight((float)fValue) ); +SetValue( vcl::unohelper::ConvertFontWeight((float)fValue) ); } break; } diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx index 48dbeb4ddcc9..3d0b90ed3d02 100644 --- a/editeng/source/uno/unofdesc.cxx +++ b/editeng/source/uno/unofdesc.cxx @@ -21,7 +21,6 @@ #include #include -#include #include #include #include @@ -31,6 +30,7 @@ #include #include #include +#include #include #include @@ -48,7 +48,7 @@ void SvxUnoFontDescriptor::ConvertToFont( const awt::FontDescriptor& rDesc, vcl: rFont.SetPitch(
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/icgm/class1.cxx |4 1 file changed, 4 insertions(+) New commits: commit fb41ebff32371ee7a7e07f671f7c769a8bb18718 Author: Caolán McNamaraDate: Sun Apr 2 16:50:38 2017 +0100 ofz: more check bounds on read Change-Id: I70018ee2ab282c11547f5bf9d81b2ee74c74aa04 diff --git a/filter/source/graphicfilter/icgm/class1.cxx b/filter/source/graphicfilter/icgm/class1.cxx index 0d297bbe0a10..895dd8247d0b 100644 --- a/filter/source/graphicfilter/icgm/class1.cxx +++ b/filter/source/graphicfilter/icgm/class1.cxx @@ -192,6 +192,10 @@ void CGM::ImplDoClass1() { sal_uInt32 nCharSetType = ImplGetUI16(); sal_uInt32 nSize = ImplGetUI(1); + +if (static_cast(mpEndValidSource - (mpSource + mnParaSize)) < nSize) +throw css::uno::Exception("attempt to read past end of input", nullptr); + pElement->aFontList.InsertCharSet( (CharSetType)nCharSetType, mpSource + mnParaSize, nSize ); mnParaSize += nSize; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 106757] LO Crashes with fatal error if try to edit master page in sidebar
https://bugs.documentfoundation.org/show_bug.cgi?id=106757 Arnaud Versinichanged: What|Removed |Added OS|Linux (All) |All --- Comment #6 from Arnaud Versini --- It seems your wrong :-) -- 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/icgm/class4.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit adb597102e6d8c8688510881f2142a999ada03ce Author: Caolán McNamaraDate: Sun Apr 2 16:46:02 2017 +0100 signed/unsigned comparison warnings Change-Id: I384c5bd3e87b3615fdcd31768f920d6679946ba7 diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx index f1cf2881a4fc..68e63844843b 100644 --- a/filter/source/graphicfilter/icgm/class4.cxx +++ b/filter/source/graphicfilter/icgm/class4.cxx @@ -186,7 +186,7 @@ void CGM::ImplDoClass4() sal_uInt32 nType = ImplGetUI16( 4 ); sal_uInt32 nSize = ImplGetUI( 1 ); -if (mpEndValidSource - (mpSource + mnParaSize) < nSize) +if (static_cast(mpEndValidSource - (mpSource + mnParaSize)) < nSize) throw css::uno::Exception("attempt to read past end of input", nullptr); mpSource[mnParaSize + nSize] = 0; @@ -224,7 +224,7 @@ void CGM::ImplDoClass4() sal_uInt32 nType = ImplGetUI16(4); sal_uInt32 nSize = ImplGetUI(1); -if (mpEndValidSource - (mpSource + mnParaSize) < nSize) +if (static_cast(mpEndValidSource - (mpSource + mnParaSize)) < nSize) throw css::uno::Exception("attempt to read past end of input", nullptr); mpSource[ mnParaSize + nSize ] = 0; @@ -242,7 +242,7 @@ void CGM::ImplDoClass4() sal_uInt32 nType = ImplGetUI16( 4 ); sal_uInt32 nSize = ImplGetUI( 1 ); -if (mpEndValidSource - (mpSource + mnParaSize) < nSize) +if (static_cast(mpEndValidSource - (mpSource + mnParaSize)) < nSize) throw css::uno::Exception("attempt to read past end of input", nullptr); mpSource[ mnParaSize + nSize ] = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 83066] [META] Tracking bug for CJK issues
https://bugs.documentfoundation.org/show_bug.cgi?id=83066 Volgachanged: What|Removed |Added URL|https://www.w3.org/TR/clreq | |/ | |https://www.w3.org/TR/jlreq | |/ | |https://www.w3.org/TR/klreq | |/ | --- Comment #1 from Volga --- The following documents related to CJK text layout can be seen as references: Requirements for Chinese Text Layout https://www.w3.org/TR/clreq/ Requirements for Japanese Text Layout https://www.w3.org/TR/clreq/ Requirements for Hangul Text Layout and Typography https://www.w3.org/TR/klreq/ -- 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 106757] LO Crashes with fatal error if try to edit master page in sidebar
https://bugs.documentfoundation.org/show_bug.cgi?id=106757 Jean-Baptiste Faurechanged: What|Removed |Added CC||jbfa...@libreoffice.org Version|unspecified |5.3.0.3 release OS|Windows (All) |Linux (All) --- Comment #5 from Jean-Baptiste Faure --- Updated version and OS from description and comment #4. 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 100936] Incorrect glyph orientation of Tangut script on vertical layout mode
https://bugs.documentfoundation.org/show_bug.cgi?id=100936 --- Comment #33 from Volga--- LO 5.3.2.2 still failed. Version: 5.3.2.2 (x64) Build ID: 6cd4f1ef626f15116896b1d8e1398b56da0d0ee1 CPU Threads: 4; OS Version: Windows 6.19; UI Render: default; Layout Engine: new; Locale: zh-CN (zh_CN); 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-commits] core.git: 4 commits - filter/source
filter/source/graphicfilter/icgm/actimpr.cxx | 31 --- filter/source/graphicfilter/icgm/cgm.cxx |6 ++--- filter/source/graphicfilter/icgm/class1.cxx |2 - filter/source/graphicfilter/icgm/outact.hxx |5 +--- 4 files changed, 20 insertions(+), 24 deletions(-) New commits: commit 66147965d538bfce810598f34b272a85067d759b Author: Caolán McNamaraDate: Sun Apr 2 15:07:18 2017 +0100 ofz: drop hard-coded limit Change-Id: I175b2db73a29c7e83003ad0638818e7876d552d4 diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index fea8420bf8c8..755f6b8b9afe 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -60,10 +60,7 @@ CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XMod mnCurrentPage = 0; mnGroupActCount = mnGroupLevel = 0; mpGroupLevel = new sal_uInt32[CGM_OUTACT_MAX_GROUP_LEVEL] (); -maPoints.resize(0x2000); -maFlags.resize(0x2000); -mnIndex = 0; mpGradient = nullptr; if ( mpCGM->mbStatus ) @@ -893,16 +890,17 @@ void CGMImpressOutAct::AppendText( char* pString, sal_uInt32 /*nSize*/, FinalFla void CGMImpressOutAct::BeginFigure() { -if ( mnIndex ) +if (!maPoints.empty()) EndFigure(); BeginGroup(); -mnIndex = 0; +maPoints.clear(); +maFlags.clear(); } void CGMImpressOutAct::CloseRegion() { -if ( mnIndex > 2 ) +if (maPoints.size() > 2) { NewRegion(); DrawPolyPolygon( maPolyPolygon ); @@ -912,12 +910,13 @@ void CGMImpressOutAct::CloseRegion() void CGMImpressOutAct::NewRegion() { -if ( mnIndex > 2 ) +if (maPoints.size() > 2) { -tools::Polygon aPolygon(mnIndex, maPoints.data(), maFlags.data()); +tools::Polygon aPolygon(maPoints.size(), maPoints.data(), maFlags.data()); maPolyPolygon.Insert( aPolygon ); } -mnIndex = 0; +maPoints.clear(); +maFlags.clear(); } void CGMImpressOutAct::EndFigure() @@ -926,7 +925,8 @@ void CGMImpressOutAct::EndFigure() DrawPolyPolygon( maPolyPolygon ); maPolyPolygon.Clear(); EndGroup(); -mnIndex = 0; +maPoints.clear(); +maFlags.clear(); } void CGMImpressOutAct::RegPolyLine( tools::Polygon& rPolygon, bool bReverse ) @@ -938,19 +938,18 @@ void CGMImpressOutAct::RegPolyLine( tools::Polygon& rPolygon, bool bReverse ) { for ( sal_uInt16 i = 0; i < nPoints; i++ ) { -maPoints[ mnIndex + i ] = rPolygon.GetPoint( nPoints - i - 1 ); -maFlags[ mnIndex + i ] = rPolygon.GetFlags( nPoints - i - 1 ); +maPoints.push_back(rPolygon.GetPoint(nPoints - i - 1)); +maFlags.push_back(rPolygon.GetFlags(nPoints - i - 1)); } } else { for ( sal_uInt16 i = 0; i < nPoints; i++ ) { -maPoints[ mnIndex + i ] = rPolygon.GetPoint( i ); -maFlags[ mnIndex + i ] = rPolygon.GetFlags( i ); +maPoints.push_back(rPolygon.GetPoint(i)); +maFlags.push_back(rPolygon.GetFlags(i)); } } -mnIndex = mnIndex + nPoints; } } diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx index 8b8b62f61ccc..3a8d7e8b91fa 100644 --- a/filter/source/graphicfilter/icgm/outact.hxx +++ b/filter/source/graphicfilter/icgm/outact.hxx @@ -45,7 +45,6 @@ class CGMImpressOutAct sal_uInt32 mnGroupLevel; sal_uInt32* mpGroupLevel; -sal_uInt16 mnIndex;// figure std::vector maFlags; std::vector maPoints; tools::PolyPolygon maPolyPolygon; commit 4cd4ec2855fd51bb97812e90dc469c55882933f4 Author: Caolán McNamara Date: Sun Apr 2 15:01:10 2017 +0100 convert to std::vector Change-Id: Icd442975cbc084a67bdd3e7f24113f499981db60 diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 66ff8df07ba9..fea8420bf8c8 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -60,8 +60,8 @@ CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XMod mnCurrentPage = 0; mnGroupActCount = mnGroupLevel = 0; mpGroupLevel = new sal_uInt32[CGM_OUTACT_MAX_GROUP_LEVEL] (); -mpPoints = new Point[ 0x2000 ]; -mpFlags = new PolyFlags[ 0x2000 ]; +maPoints.resize(0x2000); +maFlags.resize(0x2000); mnIndex = 0; mpGradient = nullptr; @@ -91,8 +91,6 @@ CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XMod CGMImpressOutAct::~CGMImpressOutAct() { -delete[] mpPoints; -delete[] mpFlags; delete[]
[Libreoffice-bugs] [Bug 106853] LibreOffice convert-to/print-to-file don' t use “scale”
https://bugs.documentfoundation.org/show_bug.cgi?id=106853 --- Comment #9 from Buovjaga--- (In reply to Alexander from comment #8) > When this bug will be fixed ? Nobody knows. You are free to find a developer to fix it. https://wiki.documentfoundation.org/Development/GetInvolved -- 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 106890] Page orientation of User page size is not determined correctly
https://bugs.documentfoundation.org/show_bug.cgi?id=106890 --- Comment #4 from cson...@halmai.hu --- (In reply to Johnny_M from comment #3) > Sorry, I'm not on any LO team, so I shouldn't have closed. Setting the > status back to unconfirmed. Thanks, Johnny. I think the modification I asked in the bug starting message sounds to be simple. (The radiobutton should reflect the dimensions, when H>W then it should be Landscape and Portrait otherwise.) I would categorise it as a low hanging fruit but one who knows the code may disagree with me. :) -- 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 106910] When document is open, parentheses at end of lines of code are stripped off.
https://bugs.documentfoundation.org/show_bug.cgi?id=106910 Johnny_Mchanged: What|Removed |Added Resolution|FIXED |WORKSFORME --- Comment #2 from Johnny_M --- This might have to do with bug 106529. Anyway, setting to "worksforme", since nothing was actually fixed with this specific 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 106757] LO Crashes with fatal error if try to edit master page in sidebar
https://bugs.documentfoundation.org/show_bug.cgi?id=106757 Arnaud Versinichanged: What|Removed |Added Status|NEEDINFO|NEW --- Comment #4 from Arnaud Versini --- Confirmed on openSUSE Tumbleweed with LibreOffice 5.3.1.2. But I can't have a backtrace, a fatal error dialog appears after the trouble. -- 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 84565] Remember "keep ratio" checkbox
https://bugs.documentfoundation.org/show_bug.cgi?id=84565 --- Comment #9 from Tomaz Vajngerl--- (In reply to Heiko Tietze from comment #8) > Agreed with the request to store settings made in dialogs. But I don't get > the point of "and save it as an ODF extension". You need to remember the "keep ratio" setting for each shape / image in the document, so you can only do this if you store this in the file format so ODF needs to be extended with an extra attribute. -- 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