[Libreoffice-commits] core.git: sfx2/source vcl/inc vcl/source vcl/unx
sfx2/source/appl/appserv.cxx |2 -- vcl/inc/salmenu.hxx|2 +- vcl/inc/unx/gtk/gtksalmenu.hxx |1 + vcl/source/window/menu.cxx |3 +++ vcl/unx/gtk/gtksalmenu.cxx | 27 +-- 5 files changed, 22 insertions(+), 13 deletions(-) New commits: commit 72eb18e520ea8165a6a20958a1551f55e5e14cab Author: Maxim MonastirskyDate: Tue Aug 30 21:38:37 2016 +0300 gtk3: Implement menubar hiding Change-Id: Ia772f05daa74453fc3dc8fe0c257fdac358cd5c6 Reviewed-on: https://gerrit.libreoffice.org/28490 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 1afe604..659fbf9 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -1121,8 +1121,6 @@ void SfxApplication::MiscState_Impl(SfxItemSet ) SfxBoolItem aItem( SID_MENUBAR, bState ); rSet.Put( aItem ); } -if ( Application::GetToolkitName().compareTo( "gtk3" ) == 0 ) -rSet.DisableItem( SID_MENUBAR ); break; } diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx index ed7296a..734518d 100644 --- a/vcl/inc/salmenu.hxx +++ b/vcl/inc/salmenu.hxx @@ -63,7 +63,7 @@ public: virtual bool VisibleMenuBar() = 0; // must return true to actually DISPLAY native menu bars // otherwise only menu messages are processed (eg, OLE on Windows) - +virtual void ShowMenuBar( bool ) {} virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) = 0; virtual void RemoveItem( unsigned nPos ) = 0; virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) = 0; diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 7cd93dd..b6c1042 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -109,6 +109,7 @@ public: static void Activate(const gchar* pMenuCommand); static void Deactivate(const gchar* pMenuCommand); voidEnableUnity(bool bEnable); +virtual voidShowMenuBar( bool bVisible ) override; boolPrepUpdate(); virtual voidUpdate() override; // Update this menu only. // Update full menu hierarchy from this menu. diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 59597c5..c82ecf5 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2495,6 +2495,9 @@ void MenuBar::SetDisplayable( bool bDisplayable ) { if( bDisplayable != mbDisplayable ) { +if ( ImplGetSalMenu() ) +ImplGetSalMenu()->ShowMenuBar( bDisplayable ); + mbDisplayable = bDisplayable; MenuBarWindow* pMenuWin = getMenuBarWindow(); if (pMenuWin) diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index 8856410..2934121 100644 --- a/vcl/unx/gtk/gtksalmenu.cxx +++ b/vcl/unx/gtk/gtksalmenu.cxx @@ -485,11 +485,7 @@ GtkSalMenu::~GtkSalMenu() bool GtkSalMenu::VisibleMenuBar() { -#if GTK_CHECK_VERSION(3,0,0) -return mbMenuBar; -#else -return mbMenuBar && bUnityMode; -#endif +return mbMenuBar && (bUnityMode || mpMenuBarContainerWidget); } void GtkSalMenu::InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) @@ -540,7 +536,9 @@ void GtkSalMenu::ShowCloseButton(bool bShow) { #if GTK_CHECK_VERSION(3,0,0) assert(mbMenuBar); -MenuBar *pVclMenuBar = static_cast (mpVCLMenu.get()); +if (!mpMenuBarContainerWidget) +return; + if (!bShow) { if (mpCloseButton) @@ -548,6 +546,7 @@ void GtkSalMenu::ShowCloseButton(bool bShow) return; } +MenuBar *pVclMenuBar = static_cast (mpVCLMenu.get()); mpCloseButton = gtk_button_new(); g_signal_connect(mpCloseButton, "clicked", G_CALLBACK(CloseMenuBar), pVclMenuBar); @@ -703,6 +702,8 @@ void GtkSalMenu::CreateMenuBarWidget() g_signal_connect(G_OBJECT(mpMenuBarWidget), "key-press-event", G_CALLBACK(MenuBarSignalKey), this); gtk_widget_show_all(mpMenuBarContainerWidget); + +ShowCloseButton( static_cast (mpVCLMenu.get())->HasCloseButton() ); #else (void)mpMenuBarContainerWidget; #endif @@ -715,6 +716,7 @@ void GtkSalMenu::DestroyMenuBarWidget() { gtk_widget_destroy(mpMenuBarContainerWidget); mpMenuBarContainerWidget = nullptr; +mpCloseButton = nullptr; } #else (void)mpMenuBarContainerWidget; @@ -1082,14 +1084,19 @@ void GtkSalMenu::EnableUnity(bool bEnable) { if (bUnityMode != bEnable) { -if (!bEnable) -CreateMenuBarWidget(); -else -DestroyMenuBarWidget();
[Libreoffice-ux-advise] [Bug 101772] UI - View source -> XML source raw editing mode, " make Dreamweaver obsolete"
https://bugs.documentfoundation.org/show_bug.cgi?id=101772 --- Comment #11 from Tomaz Vajngerl--- For a DreamWeaver like alternative you want an internal document model that is very similar or matches HTML document model. Without this you will constantly have mismatches. Writer doesn't have the internal document model nearly similar to HTML so I don't think it makes sense to push web capabilities further than they are. Actually most of us would be happy if "Writer web" would be removed from LO. -- 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 101772] UI - View source -> XML source raw editing mode, " make Dreamweaver obsolete"
https://bugs.documentfoundation.org/show_bug.cgi?id=101772 --- Comment #11 from Tomaz Vajngerl--- For a DreamWeaver like alternative you want an internal document model that is very similar or matches HTML document model. Without this you will constantly have mismatches. Writer doesn't have the internal document model nearly similar to HTML so I don't think it makes sense to push web capabilities further than they are. Actually most of us would be happy if "Writer web" would be removed from LO. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82135] Cell references don't resolve in imported Excel sheet, but do after edit
https://bugs.documentfoundation.org/show_bug.cgi?id=82135 Aron Budeachanged: What|Removed |Added Keywords||bisected Status|NEW |NEEDINFO CC||ba...@caesar.elte.hu --- Comment #15 from Aron Budea --- I believe this is not a bug, and "0" is the cached value of the cell. Marcus, can you verify that, and close this as NOTABUG if you agree? (possibly the "0" in the sheet's XML after the formula?) Nevertheless, here is the bibisect result done with 43max repo for reference. c1b101da259e405d30710e6a4c131f5b0c5a4910 is the first bad commit commit c1b101da259e405d30710e6a4c131f5b0c5a4910 Author: Matthew Francis Date: Thu May 28 20:02:49 2015 +0800 source-hash-aa5ad7b8096cd15a55c467b1a23d03849aeb870d commit aa5ad7b8096cd15a55c467b1a23d03849aeb870d Author: Kohei Yoshida AuthorDate: Mon Mar 10 17:03:52 2014 -0400 Commit: Kohei Yoshida CommitDate: Mon Mar 10 17:28:54 2014 -0400 fdo#74747: Make use of cached string formula results. Just like we do with cached numeric formula results. Change-Id: Ib8b311b540caeb47d8c2162a456f7490c5882ad5 # bad: [74b89c3193673ba9897dc4a4541500ef6e8d9bf7] source-hash-8f97326bdd3f42fc82aa5e1989fd03b0af1daf64 # good: [9c392cfdfe6e9a9bce98555ea989283a957aa3ad] source-hash-fc8f44e82de4ebdd50ac5fbb9207cd1a59a927e3 git bisect start 'latest' 'oldest' # good: [e289d9d328719fd70e9a2680fd0e4f586a97b3be] source-hash-3c0a7cf4f67720f2cca2c4eb543f838d5b644e7f git bisect good e289d9d328719fd70e9a2680fd0e4f586a97b3be # bad: [3e807472869ed7d72b026c12cd1e7c3cb990591f] source-hash-6390dd9777ff63ca75a088e56dd444a355439343 git bisect bad 3e807472869ed7d72b026c12cd1e7c3cb990591f # bad: [c57068b5699ab30f5721cd6a43f146c3d08d98e6] source-hash-549c3b81190d64ec23254f448ebf69520dd76da9 git bisect bad c57068b5699ab30f5721cd6a43f146c3d08d98e6 # good: [57c2bb1c65ab1ccf260a4c9778672db67569f5bc] source-hash-41ad6531c75a53262933aecb0685f5c876de7251 git bisect good 57c2bb1c65ab1ccf260a4c9778672db67569f5bc # bad: [9fe110812ebde0d64f2156900e12f2f2d8f75e3f] source-hash-e8f00662a8dbeec61bed08aa6706af54b6d55f14 git bisect bad 9fe110812ebde0d64f2156900e12f2f2d8f75e3f # good: [57397f2c8b5991e3aafca8c9948b82af80755092] source-hash-21ece490ff555606cb773fd904fd01b01e384fb6 git bisect good 57397f2c8b5991e3aafca8c9948b82af80755092 # skip: [bd8d8893e0aa76bd09b61504b4ab92590bf8426e] source-hash-10041dc7c378901d51c6a72afed155528ed79de0 git bisect skip bd8d8893e0aa76bd09b61504b4ab92590bf8426e # good: [c40875e18ae8157729f314468016f84299b819b9] source-hash-bf8441444cb00fe89acbd2c1d6f5abcc0d4e1247 git bisect good c40875e18ae8157729f314468016f84299b819b9 # good: [df44ad42c855447f3ad20016c2b5654bf2b980cf] source-hash-c59b3d6c5c8096486730007d9b9b053793b90b1e git bisect good df44ad42c855447f3ad20016c2b5654bf2b980cf # bad: [fc4e65744f8f3187b460fb5bc1309d903f2afaa0] source-hash-caf8f777e38e75641dcd13461053ba0bfd44500f git bisect bad fc4e65744f8f3187b460fb5bc1309d903f2afaa0 # bad: [9a99a6fd405e10a49c27473a29f7530edd86b181] source-hash-bad51b0613db4a9152ffebe43a74a83af42d532b git bisect bad 9a99a6fd405e10a49c27473a29f7530edd86b181 # bad: [310cb0e449bd066ad10961fd149e6d35573542e1] source-hash-e172825b535da17c1a1d70ee1caebf43c933f39a git bisect bad 310cb0e449bd066ad10961fd149e6d35573542e1 # bad: [9b1d7115da90217cf2f453271281e93d1aff6a96] source-hash-c1dc7576c18cc534e1934459f5fb210091a5b484 git bisect bad 9b1d7115da90217cf2f453271281e93d1aff6a96 # good: [63c2354dae0a4107948fa09f52e70a8573ea8768] source-hash-304e6144c66affd7adcea66f72fb5757eddfb12f git bisect good 63c2354dae0a4107948fa09f52e70a8573ea8768 # bad: [c1b101da259e405d30710e6a4c131f5b0c5a4910] source-hash-aa5ad7b8096cd15a55c467b1a23d03849aeb870d git bisect bad c1b101da259e405d30710e6a4c131f5b0c5a4910 # first bad commit: [c1b101da259e405d30710e6a4c131f5b0c5a4910] source-hash-aa5ad7b8096cd15a55c467b1a23d03849aeb870d -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] online.git: loolwsd/ChildSession.cpp loolwsd/ClientSession.cpp loolwsd/DocumentBroker.cpp loolwsd/DocumentBroker.hpp loolwsd/test loolwsd/TileCache.cpp loolwsd/TileCache.hpp
loolwsd/ChildSession.cpp|6 -- loolwsd/ClientSession.cpp |5 + loolwsd/DocumentBroker.cpp |7 +++ loolwsd/DocumentBroker.hpp |2 ++ loolwsd/TileCache.cpp | 22 ++ loolwsd/TileCache.hpp |3 +++ loolwsd/test/TileCacheTests.cpp | 14 ++ loolwsd/test/helpers.hpp|9 + 8 files changed, 58 insertions(+), 10 deletions(-) New commits: commit 571ff06906960c9840cd65a35914ca0607f72a11 Author: Ashod NakashianDate: Tue Aug 30 23:15:44 2016 -0400 loolwsd: canceltiles re-designed using tilecache instead of queue Change-Id: I4b9ba91ee08bc9dd8d27df275e303f5517d9740c Reviewed-on: https://gerrit.libreoffice.org/28526 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/ChildSession.cpp b/loolwsd/ChildSession.cpp index 93a2312..88ece98 100644 --- a/loolwsd/ChildSession.cpp +++ b/loolwsd/ChildSession.cpp @@ -119,12 +119,6 @@ bool ChildSession::_handleInput(const char *buffer, int length) // Just to update the activity of a view-only client. return true; } -else if (tokens[0] == "canceltiles") -{ -// This command makes sense only on the command queue level. -// Shouldn't get this here. -return true; -} else if (tokens[0] == "commandvalues") { return getCommandValues(buffer, length, tokens); diff --git a/loolwsd/ClientSession.cpp b/loolwsd/ClientSession.cpp index 901d138..71746dd 100644 --- a/loolwsd/ClientSession.cpp +++ b/loolwsd/ClientSession.cpp @@ -147,10 +147,7 @@ bool ClientSession::_handleInput(const char *buffer, int length) } else if (tokens[0] == "canceltiles") { -if (!_peer.expired()) -{ -return forwardToPeer(_peer, buffer, length, false); -} +_docBroker->cancelTileRequests(shared_from_this()); } else if (tokens[0] == "commandvalues") { diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp index d119f9c..e583279 100644 --- a/loolwsd/DocumentBroker.cpp +++ b/loolwsd/DocumentBroker.cpp @@ -613,6 +613,13 @@ void DocumentBroker::handleTileCombinedRequest(TileCombined& tileCombined, } } +void DocumentBroker::cancelTileRequests(const std::shared_ptr& session) +{ +std::unique_lock lock(_mutex); + +tileCache().cancelTiles(session); +} + void DocumentBroker::handleTileResponse(const std::vector& payload) { const std::string firstLine = getFirstLine(payload); diff --git a/loolwsd/DocumentBroker.hpp b/loolwsd/DocumentBroker.hpp index 54ca138..80bf0a3 100644 --- a/loolwsd/DocumentBroker.hpp +++ b/loolwsd/DocumentBroker.hpp @@ -214,6 +214,8 @@ public: void handleTileCombinedRequest(TileCombined& tileCombined, const std::shared_ptr& session); +void cancelTileRequests(const std::shared_ptr& session); + void handleTileResponse(const std::vector& payload); void handleTileCombinedResponse(const std::vector& payload); diff --git a/loolwsd/TileCache.cpp b/loolwsd/TileCache.cpp index 9b76a15..8f05a14 100644 --- a/loolwsd/TileCache.cpp +++ b/loolwsd/TileCache.cpp @@ -461,4 +461,26 @@ int TileCache::subscribeToTileRendering(const TileDesc& tile, const std::shared_ } } +void TileCache::cancelTiles(const std::shared_ptr ) +{ +std::unique_lock lock(_tilesBeingRenderedMutex); + +const auto sub = subscriber.get(); + +Log::trace("Cancelling tiles for " + subscriber->getName()); + +for (auto it = _tilesBeingRendered.begin(); it != _tilesBeingRendered.end(); ) +{ +auto& subscribers = it->second->_subscribers; +Log::trace("Tile " + it->first + " has " + std::to_string(subscribers.size()) + " subscribers."); +subscribers.erase(std::remove_if(subscribers.begin(), subscribers.end(), + [sub](std::weak_ptr& ptr){ return ptr.lock().get() == sub; }), + subscribers.end()); +Log::trace(" Tile " + it->first + " has " + std::to_string(subscribers.size()) + " subscribers."); + +// Remove if there are no more subscribers on this tile. +it = (subscribers.empty() ? _tilesBeingRendered.erase(it) : ++it); +} +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/loolwsd/TileCache.hpp b/loolwsd/TileCache.hpp index bbe5aa0..5703227 100644 --- a/loolwsd/TileCache.hpp +++ b/loolwsd/TileCache.hpp @@ -42,6 +42,9 @@ public: /// Otherwise returns 0 to signify a subscription exists. int subscribeToTileRendering(const TileDesc& tile, const std::shared_ptr ); +/// Cancels all tile requests by the given subscriber. +void cancelTiles(const std::shared_ptr ); + std::unique_ptr lookupTile(const TileDesc& tile); void saveTileAndNotify(const TileDesc& tile, const char *data,
[Libreoffice-commits] online.git: loolwsd/LOOLKit.cpp
loolwsd/LOOLKit.cpp | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) New commits: commit fad6715f7d69b3e551deca566d72cfd1b7302d50 Author: Ashod NakashianDate: Tue Aug 30 19:23:51 2016 -0400 loolwsd: guard against processing commands before fully loading Change-Id: Iac915074728f616d81b05558b886998855326a2e Reviewed-on: https://gerrit.libreoffice.org/28525 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp index a2ff02e..d3c98b7 100644 --- a/loolwsd/LOOLKit.cpp +++ b/loolwsd/LOOLKit.cpp @@ -705,6 +705,12 @@ public: } std::unique_lock lock(_loKitDocument->getLock()); +if (_loKitDocument->getViews() <= 0) +{ +Log::error("Tile rendering requested without views."); +return; +} + Timestamp timestamp; _loKitDocument->paintPartTile(pixmap.data(), tileCombined.getPart(), pixmapWidth, pixmapHeight, @@ -998,14 +1004,15 @@ private: auto session = it->second->getSession(); int viewId = 0; +std::unique_lock lockLokDoc; if (!_loKitDocument) { // This is the first time we are loading the document Log::info("Loading new document from URI: [" + uri + "] for session [" + sessionId + "]."); - auto lock(_loKit->getLock()); + if (LIBREOFFICEKIT_HAS(_loKit->get(), registerCallback)) { _loKit->get()->pClass->registerCallback(_loKit->get(), GlobalCallback, this); @@ -1023,6 +1030,8 @@ private: Log::debug("Calling lokit::documentLoad."); _loKitDocument = _loKit->documentLoad(uri.c_str()); Log::debug("Returned lokit::documentLoad."); +auto l(_loKitDocument->getLock()); +lockLokDoc.swap(l); if (!_loKitDocument || !_loKitDocument->get()) { @@ -1058,6 +1067,9 @@ private: } else { +auto l(_loKitDocument->getLock()); +lockLokDoc.swap(l); + // Check if this document requires password if (_isDocPasswordProtected) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/LOOLKit.cpp loolwsd/LOOLWSD.cpp
loolwsd/LOOLKit.cpp |5 + loolwsd/LOOLWSD.cpp |7 --- 2 files changed, 9 insertions(+), 3 deletions(-) New commits: commit a674fc7e8fda162b7e84c75902d36cb9b9030650 Author: Ashod NakashianDate: Tue Aug 30 18:21:50 2016 -0400 loolwsd: logs and formatting Change-Id: Ic3ec268cdc1962814654c7be676da62375494f66 Reviewed-on: https://gerrit.libreoffice.org/28524 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp index 944a029..a2ff02e 100644 --- a/loolwsd/LOOLKit.cpp +++ b/loolwsd/LOOLKit.cpp @@ -1467,6 +1467,7 @@ void lokit_main(const std::string& childRoot, } else if (document && document->canDiscard()) { +Log::info("Last session discarded. Terminating."); TerminationFlag = true; } else @@ -1480,7 +1481,11 @@ void lokit_main(const std::string& childRoot, []() { if (document && document->canDiscard()) +{ +Log::info("Last session discarded. Terminating."); TerminationFlag = true; +} + return TerminationFlag.load(); }); diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index 5749f9c..0988b4c 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -911,18 +911,18 @@ public: // http://server/hosting/discovery responded = handleGetWOPIDiscovery(request, response); } -// All post requests have url prefix, lool else if (!(request.find("Upgrade") != request.end() && Poco::icompare(request["Upgrade"], "websocket") == 0) && reqPathSegs.size() > 0 && reqPathSegs[0] == "lool") { +// All post requests have url prefix 'lool'. responded = handlePostRequest(request, response, id); } else if (reqPathSegs.size() > 2 && reqPathSegs[0] == "lool" && reqPathSegs[1] == "ws") { auto ws = std::make_shared(request, response); +responded = true; // After upgrading to WS we should not set HTTP response. try { -responded = true; // After upgrading to WS we should not set HTTP response. handleGetRequest(request, ws, id); } catch (const WebSocketErrorMessageException& exc) @@ -1868,9 +1868,10 @@ int LOOLWSD::main(const std::vector& /*args*/) else if (pid < 0) { Log::syserror("waitpid failed."); -// No child processes if (errno == ECHILD) { +// No child processes. +Log::error("No Forkit instance. Terminating."); TerminationFlag = true; continue; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 100620] Wrong result with COUNTA or COUNT in formula
https://bugs.documentfoundation.org/show_bug.cgi?id=100620 --- Comment #7 from andis.lazd...@gmail.com --- Hello! This is manageable, however confusing for those used to Excel or Openoffice.org Scalc. Probably, it is worth to understand, why this "feature" is introduced and may be there is easy way to get rid of it to keep compliance with other spreadsheet applications. Considering limited resources instead of this bug I would definitely vote for increase of performance of Scalc, which is becoming more and more evident problem with every release. > > I think that makes it clear it's intended behavior, and not a bug, since the > circular reference exists because of the definition. What do you think Andis? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] online.git: loolwsd/test
loolwsd/test/TileCacheTests.cpp | 72 +--- 1 file changed, 10 insertions(+), 62 deletions(-) New commits: commit 494feedd8d0e5667f2dd04c309c7c527fd6fa572 Author: Ashod NakashianDate: Tue Aug 30 18:20:57 2016 -0400 loolwsd: unittest cleanup Change-Id: I60b8c783b16f37530d208f1fdad029d97996e4cc Reviewed-on: https://gerrit.libreoffice.org/28523 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/test/TileCacheTests.cpp b/loolwsd/test/TileCacheTests.cpp index 982af03..1b21849 100644 --- a/loolwsd/test/TileCacheTests.cpp +++ b/loolwsd/test/TileCacheTests.cpp @@ -70,7 +70,8 @@ class TileCacheTests : public CPPUNIT_NS::TestFixture void checkBlackTiles(Poco::Net::WebSocket& socket, const int part, const int docWidth, - const int docHeight); + const int docHeight, + const std::string& name = "checkBlackTiles "); void checkBlackTile(std::stringstream& tile); @@ -321,31 +322,24 @@ void TileCacheTests::testLoad12ods() { try { +const auto testName = "load12Ods "; +auto socket = *loadDocAndGetSocket("load12.ods", _uri, testName); + int docSheet = -1; int docSheets = 0; int docHeight = 0; int docWidth = 0; int docViewId = -1; -std::string response; - - // Load a document -std::string documentPath, documentURL; -getDocumentPathAndURL("load12.ods", documentPath, documentURL); - -Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, documentURL); -Poco::Net::WebSocket socket = *connectLOKit(_uri, request, _response); - -sendTextFrame(socket, "load url=" + documentURL); -CPPUNIT_ASSERT_MESSAGE("cannot load the document " + documentURL, isDocumentLoaded(socket)); - // check document size sendTextFrame(socket, "status"); + +std::string response; getResponseMessage(socket, "status:", response, false); CPPUNIT_ASSERT_MESSAGE("did not receive a status: message as expected", !response.empty()); parseDocSize(response, "spreadsheet", docSheet, docSheets, docWidth, docHeight, docViewId); -checkBlackTiles(socket, docSheet, docWidth, docWidth); +checkBlackTiles(socket, docSheet, docWidth, docWidth, testName); } catch (const Poco::Exception& exc) { @@ -385,7 +379,7 @@ void TileCacheTests::checkBlackTile(std::stringstream& tile) CPPUNIT_ASSERT_MESSAGE("The tile is 90% black", (black * 100) / (height * width) < 90); } -void TileCacheTests::checkBlackTiles(Poco::Net::WebSocket& socket, const int /*part*/, const int /*docWidth*/, const int /*docHeight*/) +void TileCacheTests::checkBlackTiles(Poco::Net::WebSocket& socket, const int /*part*/, const int /*docWidth*/, const int /*docHeight*/, const std::string& name) { // Check the last row of tiles to verify that the tiles // render correctly and there are no black tiles. @@ -394,7 +388,7 @@ void TileCacheTests::checkBlackTiles(Poco::Net::WebSocket& socket, const int /*p const auto req = "tile part=0 width=256 height=256 tileposx=0 tileposy=253440 tilewidth=3840 tileheight=3840"; sendTextFrame(socket, req); -const auto tile = getResponseMessage(socket, "tile:", "checkBlackTiles "); +const auto tile = getResponseMessage(socket, "tile:", name); const std::string firstLine = LOOLProtocol::getFirstLine(tile); #if 0 @@ -406,52 +400,6 @@ void TileCacheTests::checkBlackTiles(Poco::Net::WebSocket& socket, const int /*p std::stringstream streamTile; std::copy(tile.begin() + firstLine.size() + 1, tile.end(), std::ostream_iterator(streamTile)); checkBlackTile(streamTile); - -#if 0 -// twips -const int tileSize = 3840; -// pixel -const int pixTileSize = 256; - -int rows; -int cols; -int tileX; -int tileY; -int tileWidth; -int tileHeight; - -std::string text; -std::vector tile; - -rows = docHeight / tileSize; -cols = docWidth / tileSize; - -// This is extremely slow due to an issue in Core. -// For each tile the full tab's cell info iss collected -// and that function is painfully slow. -// Also, this is unnecessary as we check for the last -// row of tiles, which is more than enough. -for (int itRow = 0; itRow < rows; ++itRow) -{ -for (int itCol = 0; itCol < cols; ++itCol) -{ -tileWidth = tileSize; -tileHeight = tileSize; -tileX = tileSize * itCol; -tileY = tileSize * itRow; -text = Poco::format("tile part=%d width=%d height=%d tileposx=%d tileposy=%d tilewidth=%d tileheight=%d", -part, pixTileSize, pixTileSize, tileX,
[Libreoffice-commits] online.git: loolwsd/test
loolwsd/test/TileCacheTests.cpp |2 +- loolwsd/test/helpers.hpp|4 ++-- loolwsd/test/httpwstest.cpp |4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 5158818d82fb1a806f5021dece8712a6b1e1334f Author: Ashod NakashianDate: Tue Aug 30 18:19:05 2016 -0400 loolwsd: getDocSize -> parseDocSize Change-Id: I82ee96d6fde8d8c379547d05d7bbb8213a474a4f Reviewed-on: https://gerrit.libreoffice.org/28522 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/test/TileCacheTests.cpp b/loolwsd/test/TileCacheTests.cpp index c8679c9..982af03 100644 --- a/loolwsd/test/TileCacheTests.cpp +++ b/loolwsd/test/TileCacheTests.cpp @@ -343,7 +343,7 @@ void TileCacheTests::testLoad12ods() sendTextFrame(socket, "status"); getResponseMessage(socket, "status:", response, false); CPPUNIT_ASSERT_MESSAGE("did not receive a status: message as expected", !response.empty()); -getDocSize(response, "spreadsheet", docSheet, docSheets, docWidth, docHeight, docViewId); +parseDocSize(response, "spreadsheet", docSheet, docSheets, docWidth, docHeight, docViewId); checkBlackTiles(socket, docSheet, docWidth, docWidth); } diff --git a/loolwsd/test/helpers.hpp b/loolwsd/test/helpers.hpp index 75bd9d7..0a7d003 100644 --- a/loolwsd/test/helpers.hpp +++ b/loolwsd/test/helpers.hpp @@ -444,8 +444,8 @@ void SocketProcessor(const std::string& name, } inline -void getDocSize(const std::string& message, const std::string& type, -int& part, int& parts, int& width, int& height, int& viewid) +void parseDocSize(const std::string& message, const std::string& type, + int& part, int& parts, int& width, int& height, int& viewid) { Poco::StringTokenizer tokens(message, " ", Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM); CPPUNIT_ASSERT_EQUAL(static_cast(6), tokens.count()); diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp index c167547..1dae4c3 100644 --- a/loolwsd/test/httpwstest.cpp +++ b/loolwsd/test/httpwstest.cpp @@ -1370,7 +1370,7 @@ void HTTPWSTest::testLimitCursor( std::function
[Libreoffice-bugs] [Bug 95377] Numbered paragraphs in DOCX (specific document?) do not show numbering in LibreOffice any more
https://bugs.documentfoundation.org/show_bug.cgi?id=95377 Aron Budeachanged: What|Removed |Added Keywords||bisected CC||vinaya.man...@synerzip.com --- Comment #7 from Aron Budea --- First bad commit verified, adding bisected keyword. Bug still present in v5.2.1.2. Vinaya, can you please take a look? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] online.git: loolwsd/Log.cpp
loolwsd/Log.cpp | 24 1 file changed, 12 insertions(+), 12 deletions(-) New commits: commit 492268913b50c97f4f55199a1b135ae6f9eea920 Author: Ashod NakashianDate: Tue Aug 30 14:42:57 2016 -0400 loolwsd: grep-friendly logs Log entries now prefix the log-level so it is now trivial to filter-in or -out a particular class of logs (for example errors). Change-Id: I8033d1780a49dd8a3244e63f867377f0c64e9d9f Reviewed-on: https://gerrit.libreoffice.org/28520 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/Log.cpp b/loolwsd/Log.cpp index 3471b4b..0c327df 100644 --- a/loolwsd/Log.cpp +++ b/loolwsd/Log.cpp @@ -69,7 +69,7 @@ namespace Log } } -static void getPrefix(char *buffer) +static void getPrefix(char *buffer, const char* level) { Poco::Int64 usec = Poco::Timestamp().epochMicroseconds() - epochStart; @@ -88,23 +88,23 @@ namespace Log const char *appName = (Source.inited ? Source.id.c_str() : ""); assert(strlen(appName) + 32 + 28 < 1024 - 1); -snprintf(buffer, 4095, "%s-%.2d %.2d:%.2d:%.2d.%.6d [ %s ] ", appName, +snprintf(buffer, 4095, "%s-%.2d %d:%.2d:%.2d.%.6d [ %s ] %s ", appName, (Poco::Thread::current() ? Poco::Thread::current()->id() : 0), (int)hours, (int)minutes, (int)seconds, (int)usec, - procName); + procName, level); } -std::string prefix() +std::string prefix(const char* level) { char buffer[1024]; -getPrefix(buffer); +getPrefix(buffer, level); return std::string(buffer); } void signalLogPrefix() { char buffer[1024]; -getPrefix(buffer); +getPrefix(buffer, "SIG"); signalLog(buffer); } @@ -157,32 +157,32 @@ namespace Log void trace(const std::string& msg) { -logger().trace(prefix() + msg); +logger().trace(prefix("TRC") + msg); } void debug(const std::string& msg) { -logger().debug(prefix() + msg); +logger().debug(prefix("DBG") + msg); } void info(const std::string& msg) { -logger().information(prefix() + msg); +logger().information(prefix("INF") + msg); } void warn(const std::string& msg) { -logger().warning(prefix() + msg); +logger().warning(prefix("WRN") + msg); } void error(const std::string& msg) { -logger().error(prefix() + msg); +logger().error(prefix("ERR") + msg); } void syserror(const std::string& msg) { -logger().error(prefix() + msg + " (errno: " + std::string(std::strerror(errno)) + ")"); +logger().error(prefix("SYS") + msg + " (errno: " + std::string(std::strerror(errno)) + ")"); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/UserMessages.hpp
loolwsd/UserMessages.hpp |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 88f3a213b0e0d7ac4827fa3d8fbd9ca9a245abd7 Author: Ashod NakashianDate: Tue Aug 30 18:16:03 2016 -0400 loolwsd: first character of 404 messages are trimmed For some reason Poco trims the first character of 404 and other HTTP error messages. We need to prefix messages with a space to avoid having the first character chopped-off. Change-Id: I8cbda9f4b5df894418f1dedf390b8b43a61e5d11 Reviewed-on: https://gerrit.libreoffice.org/28521 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/UserMessages.hpp b/loolwsd/UserMessages.hpp index 5208b09..2ef4c8b 100644 --- a/loolwsd/UserMessages.hpp +++ b/loolwsd/UserMessages.hpp @@ -12,8 +12,10 @@ #ifndef INCLUDED_USERMESSAGES_HPP #define INCLUDED_USERMESSAGES_HPP -constexpr auto SERVICE_UNAVALABLE_INTERNAL_ERROR = "Service is unavailable. Please try again later and report to your administrator if the issue persists."; -constexpr auto SERVICE_UNAVALABLE_LIMIT_REACHED = "This server has reached the number of connections or documents it supports at a given time."; +//NOTE: For whatever reason Poco seems to trim the first character. + +constexpr auto SERVICE_UNAVALABLE_INTERNAL_ERROR = " Service is unavailable. Please try again later and report to your administrator if the issue persists."; +constexpr auto SERVICE_UNAVALABLE_LIMIT_REACHED = " This server has reached the number of connections or documents it supports at a given time."; #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/LOOLKit.cpp
loolwsd/LOOLKit.cpp |3 +++ 1 file changed, 3 insertions(+) New commits: commit d8a38f58592dd02b5dcfd88a7d266f1fb5239eb0 Author: Ashod NakashianDate: Tue Aug 30 14:30:24 2016 -0400 loolwsd: startup logs Change-Id: I90e7debbe881eafc9d65f4ff6a5d5f39d8277c0e Reviewed-on: https://gerrit.libreoffice.org/28519 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp index f81adae..944a029 100644 --- a/loolwsd/LOOLKit.cpp +++ b/loolwsd/LOOLKit.cpp @@ -1535,6 +1535,7 @@ bool globalPreinit(const std::string ) void *handle; if (File(libMerged).exists()) { +Log::trace("dlopen(" + libMerged + ", RTLD_GLOBAL|RTLD_NOW)"); handle = dlopen(libMerged.c_str(), RTLD_GLOBAL|RTLD_NOW); if (!handle) { @@ -1547,6 +1548,7 @@ bool globalPreinit(const std::string ) { if (File(libSofficeapp).exists()) { +Log::trace("dlopen(" + libSofficeapp + ", RTLD_GLOBAL|RTLD_NOW)"); handle = dlopen(libSofficeapp.c_str(), RTLD_GLOBAL|RTLD_NOW); if (!handle) { @@ -1569,6 +1571,7 @@ bool globalPreinit(const std::string ) return false; } +Log::trace("lok_preinit(" + loTemplate + "/program\", \"file:///user\")"); if (preInit((loTemplate + "/program").c_str(), "file:///user") != 0) { Log::error("lok_preinit() in " + loadedLibrary + " failed"); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/test
loolwsd/test/httpwstest.cpp | 89 +++- 1 file changed, 31 insertions(+), 58 deletions(-) New commits: commit 42624adf1926b96137248ebe835a4b8038de2b74 Author: Ashod NakashianDate: Tue Aug 30 10:59:13 2016 -0400 loolwsd: fixup unittests Change-Id: Icf3dea11654cf43a8aa86fadc1f1276d796719c3 Reviewed-on: https://gerrit.libreoffice.org/28518 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp index 695399f..c167547 100644 --- a/loolwsd/test/httpwstest.cpp +++ b/loolwsd/test/httpwstest.cpp @@ -562,18 +562,15 @@ void HTTPWSTest::testSaveOnDisconnect() void HTTPWSTest::testReloadWhileDisconnecting() { -std::string documentPath, documentURL; -getDocumentPathAndURL("hello.odt", documentPath, documentURL); +const auto testname = "reloadWhileDisconnecting "; -int kitcount = -1; try { -// Load a document and get its status. -Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, documentURL); -Poco::Net::WebSocket socket = *connectLOKit(_uri, request, _response); +std::string documentPath, documentURL; +getDocumentPathAndURL("hello.odt", documentPath, documentURL); -sendTextFrame(socket, "load url=" + documentURL); -CPPUNIT_ASSERT_MESSAGE("cannot load the document " + documentURL, isDocumentLoaded(socket)); +// Load a document and get its status. +auto socket = *loadDocAndGetSocket(_uri, documentURL, testname); sendTextFrame(socket, "uno .uno:SelectAll"); sendTextFrame(socket, "uno .uno:Delete"); @@ -583,28 +580,16 @@ void HTTPWSTest::testReloadWhileDisconnecting() // Often nothing more than the SelectAll reaches the server before // the socket is closed, when the doc is not even modified yet. getResponseMessage(socket, "statechanged"); -std::cerr << "Closing connection after pasting." << std::endl; -kitcount = getLoolKitProcessCount(); +const auto kitcount = getLoolKitProcessCount(); // Shutdown abruptly. +std::cerr << "Closing connection after pasting." << std::endl; socket.shutdown(); -} -catch (const Poco::Exception& exc) -{ -CPPUNIT_FAIL(exc.displayText()); -} -std::cout << "Loading again." << std::endl; -try -{ // Load the same document and check that the last changes (pasted text) is saved. -Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, documentURL); -Poco::Net::WebSocket socket = *connectLOKit(_uri, request, _response); - -sendTextFrame(socket, "load url=" + documentURL); -sendTextFrame(socket, "status"); -CPPUNIT_ASSERT_MESSAGE("cannot load the document " + documentURL, isDocumentLoaded(socket)); +std::cout << "Loading again." << std::endl; +socket = *loadDocAndGetSocket(_uri, documentURL, testname); // Should have no new instances. CPPUNIT_ASSERT_EQUAL(kitcount, countLoolKitProcesses(kitcount)); @@ -612,34 +597,8 @@ void HTTPWSTest::testReloadWhileDisconnecting() // Check if the document contains the pasted text. sendTextFrame(socket, "uno .uno:SelectAll"); sendTextFrame(socket, "gettextselection mimetype=text/plain;charset=utf-8"); -std::string selection; -int flags; -int n; -do -{ -char buffer[READ_BUFFER_SIZE]; -n = socket.receiveFrame(buffer, sizeof(buffer), flags); -std::cout << "Got " << n << " bytes, flags: " << std::hex << flags << std::dec << '\n'; -if (n > 0 && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) != Poco::Net::WebSocket::FRAME_OP_CLOSE) -{ -std::cout << "Received message: " << LOOLProtocol::getAbbreviatedMessage(buffer, n) << '\n'; -const std::string line = LOOLProtocol::getFirstLine(buffer, n); -if (line.find("editlock: ") == 0) -{ -// We must have the editlock, otherwise we aren't alone. -CPPUNIT_ASSERT_EQUAL(std::string("editlock: 1"), line); -} - -const std::string prefix = "textselectioncontent: "; -if (line.find(prefix) == 0) -{ -selection = line.substr(prefix.length()); -break; -} -} -} -while (n > 0 && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) != Poco::Net::WebSocket::FRAME_OP_CLOSE); -CPPUNIT_ASSERT_EQUAL(std::string("aaa bbb ccc"), selection); +const auto selection = assertResponseLine(socket, "textselectioncontent:"); +CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: aaa bbb ccc"),
[Libreoffice-commits] online.git: loolwsd/test
loolwsd/test/TileCacheTests.cpp | 70 +--- 1 file changed, 24 insertions(+), 46 deletions(-) New commits: commit 1e2dd2d61fe3700e9b8e9f0797b6534788bd0c38 Author: Ashod NakashianDate: Sun Aug 28 16:39:09 2016 -0400 loolwsd: TileCacheTests cleanup Change-Id: I6d09ed3216d4e3651f72c0387c8cc6f2a7d5cc90 Reviewed-on: https://gerrit.libreoffice.org/28516 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/test/TileCacheTests.cpp b/loolwsd/test/TileCacheTests.cpp index 360b849..c8679c9 100644 --- a/loolwsd/test/TileCacheTests.cpp +++ b/loolwsd/test/TileCacheTests.cpp @@ -58,12 +58,14 @@ class TileCacheTests : public CPPUNIT_NS::TestFixture void testTileInvalidateCalc(); void checkTiles(Poco::Net::WebSocket& socket, -const std::string& type); +const std::string& type, +const std::string& name = "checkTiles "); void requestTiles(Poco::Net::WebSocket& socket, const int part, const int docWidth, - const int docHeight); + const int docHeight, + const std::string& name = "requestTiles "); void checkBlackTiles(Poco::Net::WebSocket& socket, const int part, @@ -153,11 +155,8 @@ void TileCacheTests::testSimple() void TileCacheTests::testSimpleCombine() { -std::string documentPath, documentURL; -getDocumentPathAndURL("hello.odt", documentPath, documentURL); -Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, documentURL); - -auto socket1 = *loadDocAndGetSocket(_uri, documentURL, "simpleCombine-1 "); +const std::string docFilename = "hello.odt"; +auto socket1 = *loadDocAndGetSocket(docFilename, _uri, "simpleCombine-1 "); sendTextFrame(socket1, "tilecombine part=0 width=256 height=256 tileposx=0,3840 tileposy=0,0 tilewidth=3840 tileheight=3840"); @@ -173,7 +172,7 @@ void TileCacheTests::testSimpleCombine() CPPUNIT_ASSERT_MESSAGE("did not receive a tile: message as expected", !tile1b.empty()); std::cerr << "Connecting second client." << std::endl; -auto socket2 = *loadDocAndGetSocket(_uri, documentURL, "simpleCombine-2 ", true); +auto socket2 = *loadDocAndGetSocket(docFilename, _uri, "simpleCombine-2 ", true); sendTextFrame(socket2, "tilecombine part=0 width=256 height=256 tileposx=0,3840 tileposy=0,0 tilewidth=3840 tileheight=3840"); auto tile2a = getResponseMessage(socket2, "tile:"); @@ -187,11 +186,7 @@ void TileCacheTests::testSimpleCombine() void TileCacheTests::testPerformance() { -std::string documentPath, documentURL; -getDocumentPathAndURL("hello.odt", documentPath, documentURL); -Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, documentURL); - -auto socket = *loadDocAndGetSocket(_uri, documentURL, "tile-performance "); +auto socket = *loadDocAndGetSocket("hello.odt", _uri, "performance "); Poco::Timestamp timestamp; for (auto x = 0; x < 5; ++x) @@ -214,14 +209,12 @@ void TileCacheTests::testPerformance() void TileCacheTests::testUnresponsiveClient() { -std::string documentPath, documentURL; -getDocumentPathAndURL("hello.odt", documentPath, documentURL); -Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, documentURL); - -auto socket1 = *loadDocAndGetSocket(_uri, documentURL, "unresponsiveClient-1 "); +const std::string docFilename = "hello.odt"; +std::cerr << "Connecting first client." << std::endl; +auto socket1 = *loadDocAndGetSocket(docFilename, _uri, "unresponsiveClient-1 "); std::cerr << "Connecting second client." << std::endl; -auto socket2 = *loadDocAndGetSocket(_uri, documentURL, "unresponsiveClient-2 ", true); +auto socket2 = *loadDocAndGetSocket(docFilename, _uri, "unresponsiveClient-2 ", true); // Pathologically request tiles and fail to read (say slow connection). // Meanwhile, verify that others can get all tiles fine. @@ -248,20 +241,12 @@ void TileCacheTests::testClientPartImpress() { try { -// Load a document -std::string documentPath, documentURL; -getDocumentPathAndURL("setclientpart.odp", documentPath, documentURL); +const std::string testName = "clientPartImpress "; +auto socket = *loadDocAndGetSocket("setclientpart.odp", _uri, testName); -Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, documentURL); -Poco::Net::WebSocket socket = *connectLOKit(_uri, request, _response); - -sendTextFrame(socket, "load url=" + documentURL); -CPPUNIT_ASSERT_MESSAGE("cannot load the document " + documentURL, isDocumentLoaded(socket)); - -checkTiles(socket, "presentation"); +checkTiles(socket,
[Libreoffice-commits] online.git: loolwsd/LOOLKit.cpp
loolwsd/LOOLKit.cpp |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 38a84d2c90554acac157d55ea1e7b8f7e490f355 Author: Ashod NakashianDate: Tue Aug 30 10:35:58 2016 -0400 loolwsd: log the tile version after rendering Change-Id: Id0d532bbf2d836a31ba90f1a47664bd7261a1779 Reviewed-on: https://gerrit.libreoffice.org/28517 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp index ac72c4d..f81adae 100644 --- a/loolwsd/LOOLKit.cpp +++ b/loolwsd/LOOLKit.cpp @@ -642,7 +642,7 @@ public: tile.getTilePosX(), tile.getTilePosY(), tile.getTileWidth(), tile.getTileHeight()); Log::trace() << "paintTile at (" << tile.getPart() << ',' << tile.getTilePosX() << ',' << tile.getTilePosY() - << ") rendered in " << (timestamp.elapsed()/1000.) << " ms" << Log::end; + << ") " << "ver: " << tile.getVersion() << " rendered in " << (timestamp.elapsed()/1000.) << " ms" << Log::end; const auto mode = static_cast(_loKitDocument->getTileMode()); if (!png::encodeBufferToPNG(pixmap.data(), tile.getWidth(), tile.getHeight(), output, mode)) @@ -710,9 +710,9 @@ public: pixmapWidth, pixmapHeight, renderArea.getLeft(), renderArea.getTop(), renderArea.getWidth(), renderArea.getHeight()); -Log::debug() << "paintTile (combined) called, tile at [" << renderArea.getLeft() << ", " << renderArea.getTop() << "]" - << " (" << renderArea.getWidth() << ", " << renderArea.getHeight() << ") rendered in " - << double(timestamp.elapsed())/1000 << " ms." << Log::end; +Log::debug() << "paintTile (combined) at (" << renderArea.getLeft() << ", " << renderArea.getTop() << "), (" + << renderArea.getWidth() << ", " << renderArea.getHeight() << ") ver: " << tileCombined.getVersion() + << " rendered in " << (timestamp.elapsed()/1000.) << " ms." << Log::end; const auto mode = static_cast(_loKitDocument->getTileMode()); std::vector output; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/test
loolwsd/test/test.cpp | 74 -- 1 file changed, 54 insertions(+), 20 deletions(-) New commits: commit 5ffcafa736d28ff6184b0711c14136133ea82ce9 Author: Ashod NakashianDate: Sun Aug 28 16:32:34 2016 -0400 loolwsd: CPPUNIT_TEST_NAME can be regex To run selective tests only, CPPUNIT_TEST_NAME envar can be defined to hold the test-name, for example TileCacheTests::testClientPartImpress. Now it's possible to pass a regex value instead, for example TileCacheTests::testC.* to run both TileCacheTests::testClientPartImpress and TileCacheTests::testClientPartCalc. Change-Id: I96aa1ce242fd8afaf07352be50308dce867c Reviewed-on: https://gerrit.libreoffice.org/28515 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/test/test.cpp b/loolwsd/test/test.cpp index bfaa5af..af0ff59 100644 --- a/loolwsd/test/test.cpp +++ b/loolwsd/test/test.cpp @@ -8,45 +8,79 @@ */ #include -#include + +#include +#include #include #include +#include #include -#include #include -#include + +#include class HTTPGetTest; -int main(int /*argc*/, char** /*argv*/) +bool filterTests(CPPUNIT_NS::TestRunner& runner, CPPUNIT_NS::Test* testRegistry) { -CPPUNIT_NS::TestResult controller; -CPPUNIT_NS::TestResultCollector result; -controller.addListener(); -CPPUNIT_NS::BriefTestProgressListener progress; -controller.addListener(); -controller.addListener(new CPPUNIT_NS::TextTestProgressListener()); - -CPPUNIT_NS::TestRunner runner; -const char* testName = getenv("CPPUNIT_TEST_NAME"); -if (testName) +const char* envar = getenv("CPPUNIT_TEST_NAME"); +if (envar) { -// Single test. -CPPUNIT_NS::Test* testRegistry = CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest(); +std::string testName(envar); +if (testName.empty()) +{ +return false; +} + +Poco::RegularExpression re(testName, Poco::RegularExpression::RE_CASELESS); +Poco::RegularExpression::Match reMatch; + +bool haveTests = false; for (int i = 0; i < testRegistry->getChildTestCount(); ++i) { CPPUNIT_NS::Test* testSuite = testRegistry->getChildTestAt(i); for (int j = 0; j < testSuite->getChildTestCount(); ++j) { CPPUNIT_NS::Test* testCase = testSuite->getChildTestAt(j); -if (testCase->getName() == testName) -runner.addTest(testCase); +try +{ +if (re.match(testCase->getName(), reMatch)) +{ +runner.addTest(testCase); +haveTests = true; +} +} +catch (const std::exception& exc) +{ +// Nothing to do; skip. +} } } + +std::cerr << "Failed to match [" << testName << "] to any names in the test-suite. Running all tests." << std::endl; +return haveTests; } -else + +return false; +} + +int main(int /*argc*/, char** /*argv*/) +{ +CPPUNIT_NS::TestResult controller; +CPPUNIT_NS::TestResultCollector result; +controller.addListener(); +CPPUNIT_NS::BriefTestProgressListener progress; +controller.addListener(); +controller.addListener(new CPPUNIT_NS::TextTestProgressListener()); + +CPPUNIT_NS::Test* testRegistry = CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest(); + +CPPUNIT_NS::TestRunner runner; +if (!filterTests(runner, testRegistry)) +{ // All tests. - runner.addTest(CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest()); +runner.addTest(testRegistry); +} runner.run(controller); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 101806] add "search" in the welcome screen
https://bugs.documentfoundation.org/show_bug.cgi?id=101806 --- Comment #2 from j22...@gmail.com --- I think the current display is sorted by date (latest appear first). The "search" would be more useful in my opinion, since it's more likely the user remembers (a part of) the file name instead of the date the file was opened last... -- 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 100620] Wrong result with COUNTA or COUNT in formula
https://bugs.documentfoundation.org/show_bug.cgi?id=100620 Aron Budeachanged: What|Removed |Added Status|REOPENED|NEEDINFO CC||ba...@caesar.elte.hu --- Comment #6 from Aron Budea --- Note this in the help for COUNTA, values matter in the cells: "If an argument is an array or reference, empty cells within the array or reference are ignored." I think that makes it clear it's intended behavior, and not a bug, since the circular reference exists because of the definition. What do you think Andis? The behavior was changed in v4.1.0.4, by the way. -- 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 101792] BUGS, BUGS, BUGS - no end!!!
https://bugs.documentfoundation.org/show_bug.cgi?id=101792 --- Comment #3 from Urmas--- As for crashes, upgrading to more stable Windows platform should solve most of them. -- 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 101809] New: Collabora Online Development Edition docker image DNS fault causes 20 second delay
https://bugs.documentfoundation.org/show_bug.cgi?id=101809 Bug ID: 101809 Summary: Collabora Online Development Edition docker image DNS fault causes 20 second delay Product: LibreOffice Online Version: unspecified Hardware: All OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: LibreOffice Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: d...@wiz.net.au We have been using Collabora Online Development Edition docker image along with Nextcloud and users have been reporting back that there is an annoying 20 second delay every time a document is opened. by running tcpdump on the docker0 interface we can see that the docker image is trying to make DNS lookup requests to 192.168.65.1 (in the first docker image release) and 192.168.100.1 in the most current docker image). upon investigation we found these values to be hard coded into /opt/lool/systemplate/etc/resolv.conf docker automatically updates the /etc/resolv.conf (by way of a mount into the container) but has no knowledge of this other resolv.conf which from what I understand is some sort of chroot style environment for running documents. we have a workaround which has been discussed here: https://help.nextcloud.com/t/collabora-connecting-delay-for-20-seconds/1881/53 essentially what we have done is to symbolically link /opt/lool/systemplate/etc/resolv.conf to /etc/resolv.conf and things work well. new users are finding this a challenge to deal with as they don't have the ability to modify docker images easily. it also detracts from the whole "docker as a container" solution anyhow once post-remediation is required. could someone please address this issue, either by implementing the solution we have come up with, or by integrating something similar so the hardcoded values in /opt/lool/systemplate/etc/resolv.conf are not being used. cheers, wizdude. -- 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: .gitattributes
.gitattributes |1 + 1 file changed, 1 insertion(+) New commits: commit 34dced99c33a97dab86c4538fa267ad4ad4fb41f Author: Thorsten BehrensDate: Tue Aug 30 13:18:18 2016 +0200 Ignore schema files for src tarball generation Change-Id: I1aeafbe35f7badb6c59eddf79de4e96229b66886 Reviewed-on: https://gerrit.libreoffice.org/28494 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/.gitattributes b/.gitattributes index 2801962..f43f23b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,4 @@ *.sdw binary *.svg binary *.jcs binary +schema/*/* export-ignore ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 101302] Deleted files visible as recent documents furthermore
https://bugs.documentfoundation.org/show_bug.cgi?id=101302 --- Comment #5 from Pedro--- (In reply to Maxim Monastirsky from comment #4) > (In reply to Pedro from comment #3) > > isn't it possible to ignore files starting with \\ (or whatever separates > > network folders)? > Right, this will work under Windows (as long as you don't map it to a drive > letter), but what to do under Linux, where network shares are typically > mounted into folders in the file systems? It must be possible to establish some rules (even on Linux) to make this usable. People with local (offline) office will predominantly work on offline files. When people move to online LibreOffice then this won't be a problem (assuming they always have a network connection...) In any case checking the local (system) drives where typically the tmp folders are located should clean up most of the useless thumbnails. -- 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 101808] New: options in setting of cells as TEXT
https://bugs.documentfoundation.org/show_bug.cgi?id=101808 Bug ID: 101808 Summary: options in setting of cells as TEXT Product: LibreOffice Version: 5.2.0.4 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: davide_va...@libero.it CALC: it is not possible in the setting of cells as TEXT make available the setting's options about length of the text cell? For example: abbreviation province text "@!!" (Accepts only 2 letters) example MI (abbreviation province MIlan) @"00!!00" (accepts two numbers, two capital letters, two numbers), Example 25WV02 @"!!00!00!000!" italian tax code -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 101807] New: convert options conflict
https://bugs.documentfoundation.org/show_bug.cgi?id=101807 Bug ID: 101807 Summary: convert options conflict Product: LibreOffice Version: 5.2.1.1 rc Hardware: All OS: All Status: UNCONFIRMED Severity: minor Priority: medium Component: UI Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: plokk...@fastmail.fm In LO 5.2+, goto: Options > Language settings > english sentence checking > others. You can now click on 'convert to metric' and 'convert to non-metric' at the same time. I think these conflict with each other. You either have one or the other, but not both. -- 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 88278] [META] insert SVG image filter (all modules)
https://bugs.documentfoundation.org/show_bug.cgi?id=88278 Bug 88278 depends on bug 97541, which changed state. Bug 97541 Summary: INSERT: Part of SVG shape not rendered https://bugs.documentfoundation.org/show_bug.cgi?id=97541 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 97541] INSERT: Part of SVG shape not rendered
https://bugs.documentfoundation.org/show_bug.cgi?id=97541 Xisco Faulíchanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #5 from Xisco Faulí --- *** This bug has been marked as a duplicate of bug 97581 *** -- 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 97581] INSERT: unknown lines appearing in SVG shape
https://bugs.documentfoundation.org/show_bug.cgi?id=97581 --- Comment #6 from Xisco Faulí--- *** Bug 97541 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 97541] INSERT: Part of SVG shape not rendered
https://bugs.documentfoundation.org/show_bug.cgi?id=97541 Xisco Faulíchanged: What|Removed |Added CC||aniste...@gmail.com --- Comment #4 from Xisco Faulí --- Created attachment 127085 --> https://bugs.documentfoundation.org/attachment.cgi?id=127085=edit unkown lines Issue introduced in range d9ead65397ea4b6d4bcc66cf304653bb71e14c9c..99fa8338fa3c740e610dc120848d353e5d1c9ef4, where b5c9668d34acdbce500609725760d6578debb95a looks to be the trigger of current behaviour. However, even before this commit, some unknown lines are present as it can be observed in the attached file, so I believe this issue is the same as in bug 97581 -- 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: l10ntools/source scp2/source solenv/inc
l10ntools/source/ulfconv/msi-encodinglist.txt |1 + scp2/source/ooo/module_langpack.ulf |6 ++ solenv/inc/langlist.mk|1 + 3 files changed, 8 insertions(+) New commits: commit cc89cb56d51b4f43d999701ff97a89ff9fb5a31a Author: Christian LohmaierDate: Wed Aug 31 00:09:47 2016 +0200 add Venetian (vec) ui language Change-Id: I643eb91691dddf2c4ece2edb27383cb7dd0e3fdc diff --git a/l10ntools/source/ulfconv/msi-encodinglist.txt b/l10ntools/source/ulfconv/msi-encodinglist.txt index bddd659..9c85d9d 100644 --- a/l10ntools/source/ulfconv/msi-encodinglist.txt +++ b/l10ntools/source/ulfconv/msi-encodinglist.txt @@ -166,6 +166,7 @@ ur 0 1056 # Urdu ur-IN0 2080 uz 0 1091 # Uzbek (Latin) ve 0 1075 # Venda +vec 0 1685 # Venetian vi 0 1066 # Vietnamese xh 0 1076 # Xhosa yi 0 1085 # Yiddish diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index 41f6974..de03f39 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -484,6 +484,12 @@ en-US = "Venda" [STR_DESC_MODULE_LANGPACK_VE] en-US = "Installs the Venda user interface" +[STR_NAME_MODULE_LANGPACK_VEC] +en-US = "Venetian" + +[STR_DESC_MODULE_LANGPACK_VEC] +en-US = "Installs the Venetian user interface" + [STR_NAME_MODULE_LANGPACK_KN] en-US = "Kannada" diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk index 26852c2..2a1566e 100644 --- a/solenv/inc/langlist.mk +++ b/solenv/inc/langlist.mk @@ -123,6 +123,7 @@ ug \ uk \ uz \ ve \ +vec \ vi \ xh \ zh-CN \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 100927] Provide keyboard shortcut as hover popup for toolbars
https://bugs.documentfoundation.org/show_bug.cgi?id=100927 --- Comment #4 from Maxim Monastirsky--- We already show keyboard shortcuts in toolbar tooltips, just not when extended tips are enabled (Tools > Options... > LibreOffice > General > Extended tips). -- 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 101302] Deleted files visible as recent documents furthermore
https://bugs.documentfoundation.org/show_bug.cgi?id=101302 --- Comment #4 from Maxim Monastirsky--- (In reply to Pedro from comment #3) > isn't it possible to ignore files starting with \\ (or whatever separates > network folders)? Right, this will work under Windows (as long as you don't map it to a drive letter), but what to do under Linux, where network shares are typically mounted into folders in the file systems? -- 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 101805] bad documentation of function ERF.PRECISE
https://bugs.documentfoundation.org/show_bug.cgi?id=101805 MMchanged: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from MM --- Confirmed. Looks like the lower/upper limit is dynamically, depends on what number is given. -- 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] translations.git: 2 commits - source/am source/bg source/el source/es source/fr source/hu source/id source/it source/lv source/nl source/sv source/ta source/uk source/vec source/
source/am/dbaccess/uiconfig/ui.po |9 source/am/formula/source/core/resource.po |4 source/am/helpcontent2/source/text/sbasic/shared.po | 87 source/am/helpcontent2/source/text/scalc/01.po | 63 source/am/helpcontent2/source/text/scalc/guide.po | 32 source/am/helpcontent2/source/text/schart/01.po |8 source/am/helpcontent2/source/text/shared/00.po |6 source/am/helpcontent2/source/text/shared/01.po | 24 source/am/helpcontent2/source/text/shared/02.po | 118 source/am/helpcontent2/source/text/shared/autopi.po | 36 source/am/helpcontent2/source/text/shared/explorer/database.po | 10 source/am/helpcontent2/source/text/shared/guide.po | 36 source/am/helpcontent2/source/text/shared/optionen.po | 36 source/am/helpcontent2/source/text/simpress/02.po | 10 source/am/helpcontent2/source/text/simpress/guide.po | 72 source/am/helpcontent2/source/text/smath/01.po | 10 source/am/helpcontent2/source/text/smath/guide.po |6 source/am/helpcontent2/source/text/swriter/librelogo.po |6 source/am/scaddins/source/analysis.po | 16 source/am/sw/source/uibase/utlui.po |7 source/bg/helpcontent2/source/text/swriter.po |6 source/bg/officecfg/registry/data/org/openoffice/Office/UI.po |5 source/el/accessibility/source/helper.po | 12 source/es/basic/source/classes.po |8 source/es/helpcontent2/source/text/sbasic/shared.po |6 source/es/helpcontent2/source/text/swriter/guide.po |6 source/es/swext/mediawiki/help.po |6 source/fr/helpcontent2/source/text/scalc/01.po | 513 source/fr/officecfg/registry/data/org/openoffice/Office/UI.po | 16 source/fr/sc/source/ui/src.po | 58 source/fr/sc/uiconfig/scalc/ui.po |6 source/hu/formula/source/core/resource.po | 24 source/hu/helpcontent2/source/text/scalc/01.po |11368 +++ source/hu/helpcontent2/source/text/swriter/guide.po | 757 source/hu/officecfg/registry/data/org/openoffice/Office/UI.po |8 source/hu/sc/uiconfig/scalc/ui.po |8 source/hu/sfx2/source/doc.po |8 source/hu/sfx2/source/view.po |6 source/hu/sw/source/ui/index.po | 12 source/hu/sw/uiconfig/swriter/ui.po |6 source/id/helpcontent2/source/text/shared/02.po | 38 source/it/helpcontent2/source/text/scalc/01.po | 56 source/lv/cui/uiconfig/ui.po |6 source/lv/sw/source/ui/misc.po | 10 source/nl/helpcontent2/source/text/scalc/guide.po |9 source/nl/helpcontent2/source/text/shared/00.po | 10 source/nl/helpcontent2/source/text/shared/01.po | 23 source/nl/helpcontent2/source/text/shared/02.po | 17 source/nl/helpcontent2/source/text/shared/guide.po | 17 source/nl/helpcontent2/source/text/shared/menu.po | 41 source/nl/helpcontent2/source/text/shared/optionen.po | 15 source/nl/helpcontent2/source/text/simpress/00.po | 14 source/nl/helpcontent2/source/text/simpress/01.po | 13 source/nl/helpcontent2/source/text/simpress/guide.po | 17 source/nl/helpcontent2/source/text/swriter.po | 10
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 668655d7abde9099e97e8071fb3617078321a1b0 Author: Christian LohmaierDate: Tue Aug 30 23:49:13 2016 +0200 Updated core Project: translations 4a467ef3a02f7a0903868273eaa3788edd6b73fc add Venetian (vec) translation Change-Id: Iee6f75ba41586355efc4e63a4ef5698e47ffcb01 diff --git a/translations b/translations index cc220e3..4a467ef 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit cc220e305045212ebb6311476ff3999d88fa6def +Subproject commit 4a467ef3a02f7a0903868273eaa3788edd6b73fc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/test
loolwsd/test/httpwstest.cpp | 117 1 file changed, 117 insertions(+) New commits: commit cd40f694ab53ce22726fd20feffc428163677e4d Author: Henry CastroDate: Tue Aug 30 17:45:35 2016 -0400 loolwsd: test: optimal column/row width/height diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp index 423e698..695399f 100644 --- a/loolwsd/test/httpwstest.cpp +++ b/loolwsd/test/httpwstest.cpp @@ -88,6 +88,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture CPPUNIT_TEST(testFontList); CPPUNIT_TEST(testStateUnoCommand); CPPUNIT_TEST(testColumnRowResize); +CPPUNIT_TEST(testOptimalResize); CPPUNIT_TEST_SUITE_END(); @@ -124,6 +125,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture void testFontList(); void testStateUnoCommand(); void testColumnRowResize(); +void testOptimalResize(); void loadDoc(const std::string& documentURL); @@ -146,6 +148,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture std::string getFontList(const std::string& message); void testStateChanged(const std::string& filename, std::vector& vecComands); double getColRowSize(const std::string& property, const std::string& message, int index); +double getColRowSize(const std::shared_ptr& socket, const std::string& item, int index); public: HTTPWSTest() @@ -1943,6 +1946,16 @@ double HTTPWSTest::getColRowSize(const std::string& property, const std::string& return item->getValue("size"); } +double HTTPWSTest::getColRowSize(const std::shared_ptr& socket, const std::string& item, int index) +{ +std::vector response; +response = getResponseMessage(socket, "commandvalues:", "testColumnRowResize "); +CPPUNIT_ASSERT_MESSAGE("did not receive a commandvalues: message as expected", !response.empty()); +std::vector json(response.begin() + std::string("commandvalues:").length(), response.end()); +json.push_back(0); +return getColRowSize(item, json.data(), index); +} + void HTTPWSTest::testColumnRowResize() { try @@ -2030,6 +2043,110 @@ void HTTPWSTest::testColumnRowResize() } } +void HTTPWSTest::testOptimalResize() +{ +try +{ +//std::vector response; +std::string documentPath, documentURL; +double newWidth, newHeight; +Poco::JSON::Object objIndex, objSize, objModifier; + +// row/column index 0 +objIndex.set("type", "unsigned short"); +objIndex.set("value", 1); + +// size in twips +objSize.set("type", "unsigned short"); +objSize.set("value", 3840); + +// keyboard modifier +objModifier.set("type", "unsigned short"); +objModifier.set("value", 0); + +getDocumentPathAndURL("empty.ods", documentPath, documentURL); +Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, documentURL); +auto socket = loadDocAndGetSocket(_uri, documentURL, "testOptimalResize "); + +const std::string commandValues = "commandvalues command=.uno:ViewRowColumnHeaders"; +// send new column width +{ +std::ostringstream oss; +Poco::JSON::Object objJSON; + +objJSON.set("Column", objIndex); +objJSON.set("Width", objSize); + +Poco::JSON::Stringifier::stringify(objJSON, oss); +sendTextFrame(socket, "uno .uno:ColumnWidth " + oss.str()); +sendTextFrame(socket, commandValues); +newWidth = getColRowSize(socket, "columns", 0); +} +// send new row height +{ +std::ostringstream oss; +Poco::JSON::Object objJSON; + +objJSON.set("Row", objIndex); +objJSON.set("Height", objSize); + +Poco::JSON::Stringifier::stringify(objJSON, oss); +sendTextFrame(socket, "uno .uno:RowHeight " + oss.str()); +sendTextFrame(socket, commandValues); +newHeight = getColRowSize(socket, "rows", 0); +} + +objIndex.set("value", 0); + +// send optimal column width +{ +std::ostringstream oss; +Poco::JSON::Object objJSON; +double optimalWidth; + +objJSON.set("Col", objIndex); +objJSON.set("Modifier", objModifier); + +Poco::JSON::Stringifier::stringify(objJSON, oss); +sendTextFrame(socket, "uno .uno:SelectColumn " + oss.str()); +sendTextFrame(socket, "uno .uno:SetOptimalColumnWidthDirect"); +sendTextFrame(socket, commandValues); +optimalWidth = getColRowSize(socket, "columns", 0); +CPPUNIT_ASSERT(optimalWidth < newWidth); +} + +// send optimal row height +{ +std::ostringstream oss; +Poco::JSON::Object objSelect, objOptHeight, objExtra; +double optimalHeight; + +objSelect.set("Row", objIndex);
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/ndtbl.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 9299b4ed1fd6aec795e55cf9a5a67f6111b48f7c Author: Michael StahlDate: Tue Aug 30 22:31:46 2016 +0200 Revert "fftester: empty tabbox protection" This reverts commit da8583e9ae9dd7085e463b289533d2eeeccd761c. This should also be covered by commit dc83b3ae470914dbcb08fe1f0a4a4e1a1d3d8e19. Change-Id: I173eb3e7f51288574e4807553200a9ca59a45fef diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 0abfc39..5310662 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -1330,8 +1330,7 @@ lcl_SetTableBoxWidths2(SwTable & rTable, size_t const nMaxBoxes, for (size_t nTmpLine = 0; nTmpLine < rLines.size(); ++nTmpLine) { SwTableBoxes & rBoxes = rLines[nTmpLine]->GetTabBoxes(); -if (rBoxes.empty()) -continue; +assert(!rBoxes.empty()); // ensured by convertToTable size_t const nMissing = nMaxBoxes - rBoxes.size(); if (nMissing) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 101798] VIEWING: Text boundaries broken when text is entered
https://bugs.documentfoundation.org/show_bug.cgi?id=101798 V Stuart Footechanged: What|Removed |Added CC||vstuart.fo...@utsa.edu --- Comment #2 from V Stuart Foote --- Do not see any glitches on Windows builds on Windows 8.1 Ent 64-bit en-US with nVidia OpenGL drivers. No issues typing in text, and clean on/off toggle +F10 of borders & hidden mark-up. Version: 5.3.0.0.alpha0+ Build ID: 1f46cbf32a668e80f520d27093f56d6b61550852 CPU Threads: 8; OS Version: Windows 6.29; UI Render: GL; TinderBox: Win-x86@42, Branch:master, Time: 2016-08-30_00:41:48 Locale: en-US (en_US); Calc: CL -- 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 101302] Deleted files visible as recent documents furthermore
https://bugs.documentfoundation.org/show_bug.cgi?id=101302 Pedrochanged: What|Removed |Added Keywords||regression --- Comment #3 from Pedro --- As I mentioned in the bug report tagged as Duplicate of this one: how difficult is it to check local drives that are connected and delete thumbnails for files that don't exist? If the problem is network folders isn't it possible to ignore files starting with \\ (or whatever separates network folders)? -- 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 94067] Including a DXF file
https://bugs.documentfoundation.org/show_bug.cgi?id=94067 Mike Kaganskichanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=90 ||148 -- 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 90148] dxf shape circle element gets falsely filled
https://bugs.documentfoundation.org/show_bug.cgi?id=90148 Mike Kaganskichanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=94 ||067 -- 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 101798] VIEWING: Text boundaries broken when text is entered
https://bugs.documentfoundation.org/show_bug.cgi?id=101798 m.a.riosvchanged: What|Removed |Added CC||miguelangelrv@libreoffice.o ||rg --- Comment #1 from m.a.riosv --- Hi Cor, with win10x64 and Version: 5.3.0.0.alpha0+ Build ID: ea9a90d83d92076d41abfd31a1fd3a5d84b6ba92 CPU Threads: 4; OS Version: Windows 6.19; UI Render: GL; TinderBox: Win-x86@39, Branch:master, Time: 2016-08-26_06:19:43 Locale: es-ES (es_ES); Calc: CL I can see it, enabled or not OpenGL. -- 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 101601] [EDITING] Possible regression in context menu of selected text in LO5.2
https://bugs.documentfoundation.org/show_bug.cgi?id=101601 --- Comment #2 from Maxim Monastirsky--- (In reply to Vojtěch Obrdlík from comment #0) > When I select text and use right mouse click on selected text, in LO5.1 in > drop down menu was option for change selected text - lower/upper/mixed... > In LO5.2 this option is missing in drop down menu. Right. This was done on purpose, based on suggestions from https://gerrit.libreoffice.org/20446/ > Also dissapeared options Synonyms It's still there, just hidden when there are no available synonyms. > and Paragraph style Still there, too - that's the last item in your 5.2 screenshoot. Anyway, since 5.2 it's possible to customize context menus, so you can easily add there any commands you want. Look at Tools > Customize > Context Menus. Look there for the "Text" menu. -- 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 98321] FILEOPEN: RTF checkbox size too big
https://bugs.documentfoundation.org/show_bug.cgi?id=98321 m.a.riosvchanged: What|Removed |Added CC||tobias.bur...@physik.fu-ber ||lin.de --- Comment #8 from m.a.riosv --- *** Bug 101799 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 101799] FILEOPEN: Imported RTF: Font size of check box not as in original (too large)
https://bugs.documentfoundation.org/show_bug.cgi?id=101799 m.a.riosvchanged: What|Removed |Added Status|UNCONFIRMED |RESOLVED CC||miguelangelrv@libreoffice.o ||rg Resolution|--- |DUPLICATE --- Comment #1 from m.a.riosv --- *** This bug has been marked as a duplicate of bug 98321 *** -- 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 101792] BUGS, BUGS, BUGS - no end!!!
https://bugs.documentfoundation.org/show_bug.cgi?id=101792 m.a.riosvchanged: What|Removed |Added Status|NEW |NEEDINFO CC||miguelangelrv@libreoffice.o ||rg --- Comment #2 from m.a.riosv --- Please try resetting the user profile, sometimes solves strange issues. https://wiki.documentfoundation.org/UserProfile Usually it's enough renaming/deleting the file "user/registrymodifications.xcu", it affects all the options in Menu/Tools/Options, and the files "user/basic/dialog.xlc" and "scrip.xlc" are overwritten, additionally custom colors in "user/config/standard.soc" are lost. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: 2 commits - include/linguistic linguistic/source
include/linguistic/hyphdta.hxx |8 include/linguistic/misc.hxx|2 +- linguistic/source/hyphdsp.cxx | 14 +++--- linguistic/source/hyphdsp.hxx |4 ++-- linguistic/source/hyphdta.cxx |4 ++-- linguistic/source/misc.cxx |2 +- 6 files changed, 17 insertions(+), 17 deletions(-) New commits: commit e3df93d03c19bc75d1aeb340f056f57db3f4f46c Author: Eike RathkeDate: Tue Aug 30 22:47:36 2016 +0200 return const& Change-Id: Ia36a6c13dab4c6dbdcff45bfa432835296eec868 diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx index 52f7a69..7ba3d2f 100644 --- a/include/linguistic/misc.hxx +++ b/include/linguistic/misc.hxx @@ -80,7 +80,7 @@ enum class CapType LNG_DLLPUBLIC ::osl::Mutex& GetLinguMutex(); -LocaleDataWrapper & GetLocaleDataWrapper( LanguageType nLang ); +const LocaleDataWrapper & GetLocaleDataWrapper( LanguageType nLang ); sal_Int32 LevDistance( const OUString , const OUString ); diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 29a057f..37f20fb 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -68,7 +68,7 @@ osl::Mutex &GetLinguMutex() return LinguMutex::get(); } -LocaleDataWrapper & GetLocaleDataWrapper( LanguageType nLang ) +const LocaleDataWrapper & GetLocaleDataWrapper( LanguageType nLang ) { static LocaleDataWrapper aLclDtaWrp( SvtSysLocale().GetLanguageTag() ); commit d3351ca3c73263fb0151970e7924dff5fa105504 Author: Eike Rathke Date: Tue Aug 30 22:39:44 2016 +0200 LanguageType is unsigned int16 Change-Id: I5745fe2a54936e7a2585fe311522d71f08b97bfc diff --git a/include/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx index 32d1875..2e08f90 100644 --- a/include/linguistic/hyphdta.hxx +++ b/include/linguistic/hyphdta.hxx @@ -35,14 +35,14 @@ class HyphenatedWord : OUString aHyphenatedWord; sal_Int16nHyphPos; sal_Int16nHyphenationPos; -sal_Int16nLanguage; +sal_uInt16 nLanguage; bool bIsAltSpelling; HyphenatedWord(const HyphenatedWord &) = delete; HyphenatedWord & operator = (const HyphenatedWord &) = delete; public: -HyphenatedWord(const OUString , sal_Int16 nLang, sal_Int16 nHyphenationPos, +HyphenatedWord(const OUString , sal_uInt16 nLang, sal_Int16 nHyphenationPos, const OUString , sal_Int16 nHyphenPos ); virtual ~HyphenatedWord(); @@ -81,13 +81,13 @@ class PossibleHyphens : OUString aWord; OUString aWordWithHyphens; css::uno::Sequence< sal_Int16 > aOrigHyphenPos; -sal_Int16 nLanguage; +sal_uInt16 nLanguage; PossibleHyphens(const PossibleHyphens &) = delete; PossibleHyphens & operator = (const PossibleHyphens &) = delete; public: -PossibleHyphens(const OUString , sal_Int16 nLang, +PossibleHyphens(const OUString , sal_uInt16 nLang, const OUString , const css::uno::Sequence< sal_Int16 > ); virtual ~PossibleHyphens(); diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx index 99dfd05..52f7a69 100644 --- a/include/linguistic/misc.hxx +++ b/include/linguistic/misc.hxx @@ -80,7 +80,7 @@ enum class CapType LNG_DLLPUBLIC ::osl::Mutex& GetLinguMutex(); -LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang ); +LocaleDataWrapper & GetLocaleDataWrapper( LanguageType nLang ); sal_Int32 LevDistance( const OUString , const OUString ); diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index 6018af0..1a6db5e 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.cxx @@ -70,7 +70,7 @@ void HyphenatorDispatcher::ClearSvcList() Reference HyphenatorDispatcher::buildHyphWord( const OUString& rOrigWord, const Reference , -sal_Int16 nLang, sal_Int16 nMaxLeading ) +LanguageType nLang, sal_Int16 nMaxLeading ) { MutexGuard aGuard( GetLinguMutex() ); @@ -182,7 +182,7 @@ Reference HyphenatorDispatcher::buildHyphWord( Reference< XPossibleHyphens > HyphenatorDispatcher::buildPossHyphens( -const Reference< XDictionaryEntry > , sal_Int16 nLanguage ) +const Reference< XDictionaryEntry > , LanguageType nLanguage ) { MutexGuard aGuard( GetLinguMutex() ); @@ -281,7 +281,7 @@ Reference< XHyphenatedWord > SAL_CALL Reference< XHyphenatedWord >xRes; sal_Int32 nWordLen = rWord.getLength(); -sal_Int16 nLanguage = LinguLocaleToLanguage( rLocale ); +LanguageType nLanguage = LinguLocaleToLanguage( rLocale ); if (LinguIsUnspecified(nLanguage) || !nWordLen || nMaxLeading == 0 || nMaxLeading == nWordLen) return xRes; @@ -418,7 +418,7 @@ Reference< XHyphenatedWord > SAL_CALL Reference< XHyphenatedWord >xRes; sal_Int32 nWordLen = rWord.getLength(); -
[Libreoffice-bugs] [Bug 61914] [META] Start Center -- implementation UI and UX
https://bugs.documentfoundation.org/show_bug.cgi?id=61914 Heiko Tietzechanged: What|Removed |Added Depends on||101806 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=101806 [Bug 101806] add "search" in the welcome screen -- 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 101806] add "search" in the welcome screen
https://bugs.documentfoundation.org/show_bug.cgi?id=101806 Heiko Tietzechanged: What|Removed |Added Status|UNCONFIRMED |NEW Blocks||61914 Ever confirmed|0 |1 --- Comment #1 from Heiko Tietze --- Wouldn't it help to sort the documents better? Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=61914 [Bug 61914] [META] Start Center -- implementation UI and UX -- 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 101776] place widget navigation aids between status bar and 'document ' view/ sheets/ presentation
https://bugs.documentfoundation.org/show_bug.cgi?id=101776 --- Comment #9 from Heiko Tietze--- (In reply to Zenaan Harkness from comment #8) > > Developers can do everything (I'm not a dev). The question > > is effort and usability. And here we do not agree. > > Can we get concensus that the navigation aids in this feature suggestion (as > simply another navigation aid option) DO make sense in customized > "workspaces" (perhaps for "advanced users", and therefore that this bug > ought be say "low priority + new feature + depends on workspaces"?? Not from my side. You may reopen the ticket and see if someone agrees with you. LibreOffice is F/LOSS meaning my opinion from the UX POV is just two cent worth (unless I argue well enough and convince people). -- 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 101776] place widget navigation aids between status bar and 'document ' view/ sheets/ presentation
https://bugs.documentfoundation.org/show_bug.cgi?id=101776 --- Comment #9 from Heiko Tietze--- (In reply to Zenaan Harkness from comment #8) > > Developers can do everything (I'm not a dev). The question > > is effort and usability. And here we do not agree. > > Can we get concensus that the navigation aids in this feature suggestion (as > simply another navigation aid option) DO make sense in customized > "workspaces" (perhaps for "advanced users", and therefore that this bug > ought be say "low priority + new feature + depends on workspaces"?? Not from my side. You may reopen the ticket and see if someone agrees with you. LibreOffice is F/LOSS meaning my opinion from the UX POV is just two cent worth (unless I argue well enough and convince people). -- 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: svgio/qa svgio/source
svgio/qa/cppunit/SvgImportTest.cxx| 20 svgio/qa/cppunit/data/tdf101237.svg | 11 +++ svgio/source/svgreader/svgstyleattributes.cxx | 24 ++-- 3 files changed, 49 insertions(+), 6 deletions(-) New commits: commit 75003438e4b429ffb3f013afd0e36d70545833cc Author: Xisco FauliDate: Tue Aug 30 16:21:52 2016 +0200 tdf#101237 SVGIO: Use black as default when parents' fill... ...attributes are empty or none and there's a reference to a clip-path present. Change-Id: I4dc4e3bcaac43a007fbdb8a1d006cbd39c737396 Reviewed-on: https://gerrit.libreoffice.org/28500 Tested-by: Jenkins Reviewed-by: Xisco Faulà diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx index 218f9e8..8bded0f 100644 --- a/svgio/qa/cppunit/SvgImportTest.cxx +++ b/svgio/qa/cppunit/SvgImportTest.cxx @@ -61,6 +61,7 @@ class Test : public test::BootstrapFixture, public XmlTestTools void test47446b(); void testMaskText(); void testTdf4(); +void testTdf101237(); Primitive2DSequence parseSvg(const char* aSource); @@ -91,6 +92,7 @@ public: CPPUNIT_TEST(test47446b); CPPUNIT_TEST(testMaskText); CPPUNIT_TEST(testTdf4); +CPPUNIT_TEST(testTdf101237); CPPUNIT_TEST_SUITE_END(); }; @@ -620,6 +622,24 @@ void Test::testTdf4() assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[1]", "familyname", "Sans"); } +void Test::testTdf101237() +{ +//Check that fill color, stroke color and stroke-width are inherited from use element +//when the element is within a clipPath element +Primitive2DSequence aSequenceTdf101237 = parseSvg("/svgio/qa/cppunit/data/tdf101237.svg"); +CPPUNIT_ASSERT_EQUAL(1, (int)aSequenceTdf101237.getLength()); + +Primitive2dXmlDump dumper; +xmlDocPtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer(aSequenceTdf101237)); + +CPPUNIT_ASSERT (pDocument); + +assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color", "#ff"); +assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/line", "color", "#00"); +assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/line", "width", "5"); + +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); } diff --git a/svgio/qa/cppunit/data/tdf101237.svg b/svgio/qa/cppunit/data/tdf101237.svg new file mode 100644 index 000..e5afa37 --- /dev/null +++ b/svgio/qa/cppunit/data/tdf101237.svg @@ -0,0 +1,11 @@ +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; fill="none"> + + + + + + diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index 9fc8b23..cc66af5a 100644 --- a/svgio/source/svgreader/svgstyleattributes.cxx +++ b/svgio/source/svgreader/svgstyleattributes.cxx @@ -2007,14 +2007,26 @@ namespace svgio if(pSvgStyleAttributes) { -return pSvgStyleAttributes->getFill(); +const basegfx::BColor* pFill = pSvgStyleAttributes->getFill(); + +if(mbIsClipPathContent) +{ +if (pFill) +{ +return pFill; +} +else +{ +static basegfx::BColor aBlack(0.0, 0.0, 0.0); +return +} +} +else +{ +return pFill; +} } } -else if(mbIsClipPathContent) -{ -static basegfx::BColor aBlack(0.0, 0.0, 0.0); -return -} return nullptr; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 94677] Calc is slow opening large CSV
https://bugs.documentfoundation.org/show_bug.cgi?id=94677 --- Comment #16 from john cantin--- How about, as part of the open csv dialog, give the user the option to skip the automatic row height calculations. The delay makes it completely impossible to use calc on these files. -- 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 101640] Thumbnails for deleted documents are not removed from Start Center
https://bugs.documentfoundation.org/show_bug.cgi?id=101640 Maxim Monastirskychanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #4 from Maxim Monastirsky --- *** This bug has been marked as a duplicate of bug 101302 *** -- 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 101640] Thumbnails for deleted documents are not removed from Start Center
https://bugs.documentfoundation.org/show_bug.cgi?id=101640 Maxim Monastirskychanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #4 from Maxim Monastirsky --- *** This bug has been marked as a duplicate of bug 101302 *** -- 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 101302] Deleted files visible as recent documents furthermore
https://bugs.documentfoundation.org/show_bug.cgi?id=101302 Maxim Monastirskychanged: What|Removed |Added CC||pedl...@gmail.com --- Comment #2 from Maxim Monastirsky --- *** Bug 101640 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 99050] Images embedded in Writer document disappear
https://bugs.documentfoundation.org/show_bug.cgi?id=99050 --- Comment #12 from Brandon--- (In reply to Buovjaga from comment #10) > (In reply to Brandon from comment #9) > > Version: 5.1.4.2 > > > > I have the same problem. I have done some testing: > > You tested with attachment 124077 [details]? No. My own files. Brandon -- 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 99050] Images embedded in Writer document disappear
https://bugs.documentfoundation.org/show_bug.cgi?id=99050 --- Comment #11 from Brandon--- No. My own files. Brandon -- 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 81765] FILEOPEN: slow loading of .ods and .xlsx
https://bugs.documentfoundation.org/show_bug.cgi?id=81765 Maarten Bosmanschanged: What|Removed |Added Keywords||perf CC||mkbosm...@gmail.com -- 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 85482] FILESAVE/FILEOPEN: very slow loading of .ODS saved from .XLSX
https://bugs.documentfoundation.org/show_bug.cgi?id=85482 Maarten Bosmanschanged: What|Removed |Added Keywords||perf CC||mkbosm...@gmail.com -- 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 95548] FILEOPEN - a document opens slowly
https://bugs.documentfoundation.org/show_bug.cgi?id=95548 Maarten Bosmanschanged: What|Removed |Added Keywords||perf CC||mkbosm...@gmail.com -- 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 98097] COLOR PICKER: No tooltip for colors in "Recent" colors area
https://bugs.documentfoundation.org/show_bug.cgi?id=98097 --- Comment #5 from Caolán McNamara--- The recent colors are only stored as their hex numbers, without names, so the name info isn't there. Presumably we could add RecentColorNames to the config to go alongside it to store and use those names too. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'feature/commonsallayout' - 4 commits - configure.ac external/harfbuzz vcl/inc vcl/quartz vcl/source vcl/unx vcl/win
Rebased ref, commits from common ancestor: commit c6f2b9676e19c1c4a1fb111aabb84445ffa78571 Author: Akash JainDate: Wed Aug 17 21:31:22 2016 +0530 GSoC: Speed up CommonSalLayout by caching hb_face Cache hb_face so it is not created again and again. Switch from GDI to DirectWrite on Windows to obtain SFNT table data. Change-Id: I9c532cd72e1f6b57313f3b7d42a6b9b0633eb0ef diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx index 8fc398a..cd68c93 100755 --- a/vcl/inc/CommonSalLayout.hxx +++ b/vcl/inc/CommonSalLayout.hxx @@ -41,6 +41,7 @@ class CommonSalLayout : public GenericSalLayout #ifdef _WIN32 HDC mhDC; HFONT mhFont; +D2DWriteTextOutRenderer* mpD2DRenderer; #elif defined(MACOSX) || defined(IOS) const CoreTextStyle& mrCoreTextStyle; #else @@ -50,7 +51,7 @@ class CommonSalLayout : public GenericSalLayout hb_font_t* GetHBFont(); public: #if defined(_WIN32) -explicitCommonSalLayout(HDC, WinFontInstance&); +explicitCommonSalLayout(WinSalGraphics*, WinFontInstance&, const WinFontFace&); virtual voidInitFont() const override; #elif defined(MACOSX) || defined(IOS) explicitCommonSalLayout(const CoreTextStyle&); @@ -60,7 +61,6 @@ public: const ServerFont& getFontData() const { return mrServerFont; }; #endif -virtual ~CommonSalLayout(); voidSetNeedFallback(ImplLayoutArgs&, sal_Int32, bool); voidAdjustLayout(ImplLayoutArgs&) override; virtual boolLayoutText(ImplLayoutArgs&) override; diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index afd11e2..15f23ba 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -45,6 +45,7 @@ #include "quartz/salgdicommon.hxx" #include +#include class AquaSalFrame; class FontAttributes; @@ -98,6 +99,8 @@ public: void GetFontMetric( ImplFontMetricDataPtr& ) const; bool GetGlyphBoundRect( sal_GlyphId, Rectangle& ) const; bool GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) const; +hb_face_t* GetHBFace() const { return mpHBFace; } +void SetHBFace(hb_face_t* pHBFace) const { mpHBFace = pHBFace; } const CoreTextFontFace* mpFontData; /// <1.0: font is squeezed, >1.0 font is stretched, else 1.0 @@ -109,6 +112,7 @@ public: private: /// CoreText text style object CFMutableDictionaryRef mpStyleDict; +mutable hb_face_t* mpHBFace; friend class CTLayout; friend class AquaSalGraphics; diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index 04723cb..1c356c5 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -35,6 +35,7 @@ #include #include "fontattributes.hxx" #include "impfontmetricdata.hxx" +#include "hb-ot.h" #include @@ -181,6 +182,8 @@ public: sal_GlyphId FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 ) const; boolGetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolygon& ) const; boolGetAntialiasAdvice() const; +hb_face_t* GetHBFace() { return mpHBFace; } +voidSetHBFace( hb_face_t* pHBFace ) { mpHBFace=pHBFace; } private: friend class GlyphCache; @@ -240,6 +243,7 @@ private: GlyphSubstitution maGlyphSubstitution; ServerFontLayoutEngine* mpLayoutEngine; +hb_face_t* mpHBFace; }; // a class for cache entries for physical font instances that are based on serverfonts diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index bc5165d..961cb47 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -44,6 +44,9 @@ # include "postwin.h" #endif +#include +#include + class FontSelectPattern; class WinFontInstance; class ImplFontAttrCache; @@ -139,10 +142,12 @@ private: mutable std::unordered_set maGsubTable; mutable boolmbGsubRead; +mutable hb_face_t* mpHBFace; public: boolHasGSUBstitutions( HDC ) const; boolIsGSUBstituted( sal_UCS4 ) const; -static int GetTable( const char pTagName[5], const unsigned char*&, HDC ); +hb_face_t* GetHBFace() const { return mpHBFace; } +voidSetHBFace( hb_face_t* pHBFace ) const { mpHBFace = pHBFace; } }; /** Class that creates (and destroys) a compatible Device Context. @@ -354,6 +359,7 @@ private: sal_uLong GetKernPairs(); public: +sal_uLong GetTable( const char pTagName[5], const unsigned char*&, void*&, IDWriteFontFace*& ); // public SalGraphics methods, the interface to the independent vcl part // get device resolution diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index c7b54d3..d315705
[Libreoffice-bugs] [Bug 100925] When overwriting a cell, new content is displayed on top of the old content until finishing the edit
https://bugs.documentfoundation.org/show_bug.cgi?id=100925 --- Comment #33 from Caolán McNamara--- With SAL_SYNCHRONIZE set (for gtk3/x11) we call XSynchronize (https://tronche.com/gui/x/xlib/event-handling/protocol-errors/synchronization.html) which changes from the normal mode where applications don't wait for a response to a request from the X server to do something before moving on the the next request. So e.g. draw line, draw circle, draw line can be fired off without waiting for the X server to actually draw them. With it on, its draw line, wait for response that it drew, draw circle, wait, draw line, wait. Its much slower, so using XSynchonize isn't a fix. Its a pity that XSynchronize affects this, cause its far easier to debug with XSynchronize set to true, and easier to determine where the fault it. Its probably easier to see if this is bibisectable and find out if there is a change on our side that triggered this to start happening. -- 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 63696] EDITING: serious performance problems in ods file, such as typing text, apply style, ...
https://bugs.documentfoundation.org/show_bug.cgi?id=63696 Cor Nouwschanged: What|Removed |Added Status|NEW |NEEDINFO --- Comment #13 from Cor Nouws --- (In reply to marcos from comment #11) > I can give you a new file, if you want. I just tried in Version: 5.3.0.0.alpha0+ Build ID: 139d3b3e8b157c1f365f888126269f0902acbaa2 CPU Threads: 4; OS Version: Linux 4.4; UI Render: default; TinderBox: Linux-rpm_deb-x86_64@70-TDF, Branch:master, Time: 2016-08-26_00:01:39 Locale: nl-NL (nl_NL.UTF-8); Calc: group and it works fine, I think. Can you check it in a recent version, 5.2.1.2 for example or a recent daily http://www.libreoffice.org/download/pre-releases/ http://dev-builds.libreoffice.org/daily/master/ thanks! -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 101806] New: add "search" in the welcome screen
https://bugs.documentfoundation.org/show_bug.cgi?id=101806 Bug ID: 101806 Summary: add "search" in the welcome screen Product: LibreOffice Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: enhancement Priority: medium Component: LibreOffice Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: j22...@gmail.com When I start LO, I see the "welcome screen" with recent documents that are shown as thumbnails and name below. After some time there are many recent documents, and I can't see all at once (eg on my laptop screen) so I have to scroll down until I see it and then I can open it. Would it be possible to add a "search" field so I can type the file name (or a part of it) and find it quicker? Something similar to CTRl+F in a web browser. Thanks for so wonderful program!! -- 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: sw/inc sw/qa sw/source writerfilter/source
sw/inc/IDocumentSettingAccess.hxx |1 + sw/qa/extras/odfimport/data/tdf76349_1columnBreak.odt |binary sw/qa/extras/odfimport/odfimport.cxx | 10 ++ sw/source/core/doc/DocumentSettingManager.cxx |6 ++ sw/source/core/inc/DocumentSettingManager.hxx |1 + sw/source/core/layout/flowfrm.cxx |4 +++- sw/source/uibase/uno/SwXDocumentSettings.cxx | 13 + writerfilter/source/filter/WriterFilter.cxx |1 + 8 files changed, 35 insertions(+), 1 deletion(-) New commits: commit 93d7fc90b57bb08052299c94fa0a28bb8f494a9c Author: Justin LuthDate: Tue Aug 30 17:51:07 2016 +0300 tdf#76349 writer: make 1column-as-page break a compatibility option Unable to find/create a proof .doc document, so only implementing this for .docx Change-Id: I3a0cb2ddf7b3aeecc9200e595f70d8c88af4b122 Reviewed-on: https://gerrit.libreoffice.org/28501 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx index e02cbce..f16ae42 100644 --- a/sw/inc/IDocumentSettingAccess.hxx +++ b/sw/inc/IDocumentSettingAccess.hxx @@ -52,6 +52,7 @@ enum class DocumentSettingId IGNORE_FIRST_LINE_INDENT_IN_NUMBERING, DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK, +TREAT_SINGLE_COLUMN_BREAK_AS_PAGE_BREAK, DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT, OUTLINE_LEVEL_YIELDS_OUTLINE_RULE, diff --git a/sw/qa/extras/odfimport/data/tdf76349_1columnBreak.odt b/sw/qa/extras/odfimport/data/tdf76349_1columnBreak.odt new file mode 100644 index 000..0ec4060 Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf76349_1columnBreak.odt differ diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index ad475a5..02fb8b1 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -637,6 +637,16 @@ DECLARE_ODFIMPORT_TEST(testTdf76322_columnBreakInHeader, "tdf76322_columnBreakIn CPPUNIT_ASSERT_EQUAL( OUString("Test1"), parseDump("/root/page[1]/header/section/column[2]/body/txt/text()") ); } +DECLARE_ODFIMPORT_TEST(testTdf76349_1columnBreak, "tdf76349_1columnBreak.odt") +{ +//single-column breaks should only be treated as page breaks for MS formats - should be only one page here. +uno::Reference xModel(mxComponent, uno::UNO_QUERY); +uno::Reference xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY); +uno::Reference xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY); +xCursor->jumpToLastPage(); +CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor->getPage()); +} + DECLARE_ODFIMPORT_TEST(testTdf96113, "tdf96113.odt") { // Background of the formula frame was white (0xff), not green. diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx index bdcc1ea..5cf29c0 100644 --- a/sw/source/core/doc/DocumentSettingManager.cxx +++ b/sw/source/core/doc/DocumentSettingManager.cxx @@ -81,6 +81,7 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc ) mbClippedPictures(false), mbBackgroundParaOverDrawings(false), mbTabOverMargin(false), +mbTreatSingleColumnBreakAsPageBreak(false), mbSurroundTextWrapSmall(false), mbPropLineSpacingShrinksFirstLine(true), mbSubtractFlys(false), @@ -175,6 +176,7 @@ bool sw::DocumentSettingManager::get(/*[in]*/ DocumentSettingId id) const case DocumentSettingId::CLIPPED_PICTURES: return mbClippedPictures; case DocumentSettingId::BACKGROUND_PARA_OVER_DRAWINGS: return mbBackgroundParaOverDrawings; case DocumentSettingId::TAB_OVER_MARGIN: return mbTabOverMargin; +case DocumentSettingId::TREAT_SINGLE_COLUMN_BREAK_AS_PAGE_BREAK: return mbTreatSingleColumnBreakAsPageBreak; case DocumentSettingId::SURROUND_TEXT_WRAP_SMALL: return mbSurroundTextWrapSmall; case DocumentSettingId::PROP_LINE_SPACING_SHRINKS_FIRST_LINE: return mbPropLineSpacingShrinksFirstLine; case DocumentSettingId::SUBTRACT_FLYS: return mbSubtractFlys; @@ -339,6 +341,10 @@ void sw::DocumentSettingManager::set(/*[in]*/ DocumentSettingId id, /*[in]*/ boo mbTabOverMargin = value; break; +case DocumentSettingId::TREAT_SINGLE_COLUMN_BREAK_AS_PAGE_BREAK: +mbTreatSingleColumnBreakAsPageBreak = value; +break; + case DocumentSettingId::SURROUND_TEXT_WRAP_SMALL: mbSurroundTextWrapSmall = value; break; diff --git a/sw/source/core/inc/DocumentSettingManager.hxx b/sw/source/core/inc/DocumentSettingManager.hxx index eebd1db..b971cc5 100644 --- a/sw/source/core/inc/DocumentSettingManager.hxx +++ b/sw/source/core/inc/DocumentSettingManager.hxx @@ -147,6 +147,7 @@ class DocumentSettingManager :
[Libreoffice-commits] core.git: linguistic/source
linguistic/source/misc.cxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit 1fe51b19829d1393f0e376ec65b889b61d1b1ba1 Author: Eike RathkeDate: Tue Aug 30 21:53:21 2016 +0200 construct only when needed Change-Id: I5729e80bdaf726c64edf3d50f7225b2181f6e2c9 diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 160af548..353d2de 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -72,10 +72,8 @@ LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang ) { static LocaleDataWrapper aLclDtaWrp( SvtSysLocale().GetLanguageTag() ); -const LanguageTag = aLclDtaWrp.getLoadedLanguageTag(); -LanguageTag aLcl( nLang ); -if (aLcl != rLcl) -aLclDtaWrp.setLanguageTag( aLcl ); +if (nLang != aLclDtaWrp.getLoadedLanguageTag().getLanguageType()) +aLclDtaWrp.setLanguageTag( LanguageTag( nLang ) ); return aLclDtaWrp; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
dev/null |binary sw/source/core/docnode/ndtbl.cxx | 14 ++ sw/source/core/unocore/unotext.cxx | 23 +-- 3 files changed, 15 insertions(+), 22 deletions(-) New commits: commit dc83b3ae470914dbcb08fe1f0a4a4e1a1d3d8e19 Author: Michael StahlDate: Tue Aug 30 21:17:32 2016 +0200 Revert "fftester: non-contiguous cells" This reverts commit 9accbfa0a52433cf03fe186fc69334d387981eb9. ... and the code change of "avoid crashing on load of fdo54724-1.rtf" commit 4ee3eabd0f058b26544c84b2b5aaf5478d921817. It's much simpler to detect early in convertToTable that there is a row with no cells in it, which should not be allowed. Change-Id: Iff6d235b29514edd57cc55addeefb24242595d88 diff --git a/sw/qa/core/data/rtf/fail/table-1.rtf b/sw/qa/core/data/rtf/fail/table-1.rtf deleted file mode 100644 index c333a10..000 Binary files a/sw/qa/core/data/rtf/fail/table-1.rtf and /dev/null differ diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 216070e..0abfc39 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -1181,7 +1181,6 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector > ++aRg.aEnd; } -bool bFailure = false; { // TODO: this is not Undo-able - only good enough for file import @@ -1189,17 +1188,11 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector > SwNodeIndex const prev(rTableNodes.begin()->begin()->aStart, -1); SwNodeIndex const* pPrev(); // pPrev could point to non-textnode now -for (auto row = rTableNodes.begin(); row != rTableNodes.end() && !bFailure; ++row) +for (auto row = rTableNodes.begin(); row != rTableNodes.end(); ++row) { for (auto cell = row->begin(); cell != row->end(); ++cell) { -bFailure = (SwNodeIndex(*pPrev, +1) != cell->aStart); -if (bFailure) -{ -SAL_WARN("sw.core", "cell start is not directly after previous cell end"); -break; -} - +assert(SwNodeIndex(*pPrev, +1) == cell->aStart); SwPaM pam(cell->aStart, 0, *pPrev, (pPrev->GetNode().IsContentNode()) ? pPrev->GetNode().GetContentNode()->Len() : 0); @@ -1219,9 +1212,6 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector > GetIDocumentUndoRedo().DoUndo(bUndo); -if (bFailure) -return nullptr; - // Create the Box/Line/Table construct SwTableBoxFormat* pBoxFormat = MakeTableBoxFormat(); SwTableLineFormat* pLineFormat = MakeTableLineFormat(); diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 391fa0c..24d0822 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -2230,20 +2230,23 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) pTableRanges[nRow].getConstArray(); const sal_Int32 nCells(pTableRanges[nRow].getLength()); +if (0 == nCells) // this would lead to no pLastCell below +{// and make it impossible to detect node gaps +bExcept = true; +break; +} + for (sal_Int32 nCell = 0; nCell < nCells; ++nCell) { -SwNodeRange *pLastCell; -if (nCell == 0 && nRow == 0) -{ -pLastCell = nullptr; -} -else -{ -std::vector& rRowOfPrevCell = nCell ? aRowNodes : *aTableNodes.rbegin(); -pLastCell = !rRowOfPrevCell.empty() ? &*rRowOfPrevCell.rbegin() : nullptr; -} +SwNodeRange *const pLastCell( +(nCell == 0) +? ((nRow == 0) +? nullptr +: &*aTableNodes.rbegin()->rbegin()) +: &*aRowNodes.rbegin()); m_pImpl->ConvertCell(pRow[nCell], aRowNodes, pLastCell, bExcept); } +assert(bExcept || !aRowNodes.empty()); aTableNodes.push_back(aRowNodes); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 101508] no possibility to convert as number imported fields into text format
https://bugs.documentfoundation.org/show_bug.cgi?id=101508 Cor Nouwschanged: What|Removed |Added Version|5.1.2.2 release |Inherited From OOo --- Comment #4 from Cor Nouws --- (In reply to Dominik Lenné from comment #3) > OTOH people expect that a format function does what it sais it does. So a > possibility would be to place a remark into the dialog something like "Does > not work for imported data. Format can be defined during import process." Then that would only apply for cells with text formatting.. Would you have a smart suggestion on in what situations how to inform the user? E.g. formatting cell(s) of which one or more has text formatting (although Format > Cells may highlight Number..) and when the user applies different formatting that then he gets a pop-up explaining... -- 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: linguistic/source
linguistic/source/lngsvcmgr.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit 424d48d347c317fa1a542d65e68327aea08cb1ed Author: Eike RathkeDate: Tue Aug 30 21:31:04 2016 +0200 calling set::find() before set::insert() is unwise ... because the insert() fails anyway if the key exists already and adding a find() only is a performance penalty. Change-Id: I38da75754fb23b9db3b59e5a0bd81e5e5bb05ce2 diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 566d6c4..8f45622 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -114,9 +114,8 @@ static uno::Sequence< lang::Locale > GetAvailLocales( const lang::Locale *pLoc = aLoc.getConstArray(); LanguageType nLang = LinguLocaleToLanguage( pLoc[k] ); -// language not already added? -if (aLanguages.find( nLang ) == aLanguages.end()) -aLanguages.insert( nLang ); +// It's a set, so insertion fails if language was already added. +aLanguages.insert( nLang ); } } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: linguistic/source
linguistic/source/lngsvcmgr.cxx | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) New commits: commit 628bb5ce3c9774e9b499aad81bae300ef023b25c Author: Eike RathkeDate: Tue Aug 30 21:23:06 2016 +0200 pass the already available bcp47 string instead of yet another conversion Change-Id: I6ed8428b28300cdd0586d505211e45d76a622115 diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index aefcdde..566d6c4 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -580,20 +580,18 @@ namespace Sequence< OUString > lcl_GetLastFoundSvcs( SvtLinguConfig , const OUString , -const Locale ) +const OUString& rCfgLocaleStr ) { Sequence< OUString > aRes; -OUString aCfgLocaleStr( LanguageTag::convertToBcp47( rAvailLocale ) ); - Sequence< OUString > aNodeNames( rCfg.GetNodeNames(rLastFoundList) ); -bool bFound = lcl_FindEntry( aCfgLocaleStr, aNodeNames); +bool bFound = lcl_FindEntry( rCfgLocaleStr, aNodeNames); if (bFound) { Sequence< OUString > aNames(1); OUString = aNames.getArray()[0]; -rNodeName = rLastFoundList + "/" + aCfgLocaleStr; +rNodeName = rLastFoundList + "/" + rCfgLocaleStr; Sequence< Any > aValues( rCfg.GetProperties( aNames ) ); if (aValues.getLength()) { @@ -741,7 +739,7 @@ void LngSvcMgr::UpdateAll() aLastFoundSvcs[k][ aCfgLocaleStr ] = aAvailSvcs; Sequence< OUString > aLastSvcs( -lcl_GetLastFoundSvcs( aCfg, aLastFoundList , pAvailLocale[i] )); +lcl_GetLastFoundSvcs( aCfg, aLastFoundList , aCfgLocaleStr )); Sequence< OUString > aNewSvcs = lcl_GetNewEntries( aLastSvcs, aAvailSvcs ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 101472] Mouseover highlight does not disappear after moving mouse out of the formula pane
https://bugs.documentfoundation.org/show_bug.cgi?id=101472 --- Comment #2 from OfficeUser--- @Buovjaga: Thanks for your investigation. If you can reproduce issue 2 with build 5.2 but not with build 5.3 it is very likely fixed. So lets concentrate on the remaining issue 1. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 101781] Libre Office crashes on saving XLS files in ODS format
https://bugs.documentfoundation.org/show_bug.cgi?id=101781 Julien Nabetchanged: What|Removed |Added Assignee|hisansh...@gmail.com|libreoffice-b...@lists.free ||desktop.org --- Comment #3 from Julien Nabet --- Except if you want to fix the bug, don't assign yourself the bug. Also, since I'm on cc, you don't have to send me a mail privately. Also, you need to attach the xls file not the ods file so we can try to reproduce this. Indeed, I don't reproduce this with ods file on pc Debian x86-64 with master sources updated today. -- 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: linguistic/source
linguistic/source/convdicxml.cxx |2 +- linguistic/source/dicimp.cxx |2 +- linguistic/source/gciterator.cxx |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 9a2d6e7e77a660560af9d5b1bbe3a5171176f8d6 Author: Eike RathkeDate: Tue Aug 30 20:45:36 2016 +0200 Related: tdf#83376 fallback to known in linguistic context is wrong, always. Change-Id: I2f06818e6569fd7e59b94d11b69808a2b81490d5 diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 039067a..b4ccd20 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -212,7 +212,7 @@ void ConvDicXMLDictionaryContext_Impl::StartElement( OUString aValue = rxAttrList->getValueByIndex(i); if ( nPrefix == XML_NAMESPACE_TCD && aLocalName == "lang" ) -nLanguage = LanguageTag::convertToLanguageTypeWithFallback( aValue ); +nLanguage = LanguageTag::convertToLanguageType( aValue ); else if ( nPrefix == XML_NAMESPACE_TCD && aLocalName == "conversion-type" ) nConversionType = GetConversionTypeFromText( aValue ); } diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index a6d3127..0b9fdce 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -122,7 +122,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr , sal_uInt16 , bool ) if (aTagValue == "") nLng = LANGUAGE_NONE; else -nLng = LanguageTag::convertToLanguageTypeWithFallback( +nLng = LanguageTag::convertToLanguageType( OStringToOUString( aTagValue, RTL_TEXTENCODING_ASCII_US)); } diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index e076fa6..f3553c4 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -1042,7 +1042,7 @@ void GrammarCheckingIterator::GetConfiguredGCSvcs_Impl() { // only the first entry is used, there should be only one grammar checker per language const OUString aImplName( aImplNames[0] ); -const LanguageType nLang = LanguageTag::convertToLanguageTypeWithFallback( pElementNames[i] ); +const LanguageType nLang = LanguageTag::convertToLanguageType( pElementNames[i] ); aTmpGCImplNamesByLang[ nLang ] = aImplName; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 99504] MAILMERGE: Wizard fails on SMTP send
https://bugs.documentfoundation.org/show_bug.cgi?id=99504 Buovjagachanged: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #3 from Buovjaga --- cazeneuve: see Bug 77354 Armands: please test with version 5.2 as well. Set to NEEDINFO. Change back to UNCONFIRMED, if the problem persists. Change to RESOLVED WORKSFORME, if the problem went away. -- 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 99050] Images embedded in Writer document disappear
https://bugs.documentfoundation.org/show_bug.cgi?id=99050 --- Comment #10 from Buovjaga--- (In reply to Brandon from comment #9) > Version: 5.1.4.2 > > I have the same problem. I have done some testing: You tested with attachment 124077? -- 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 101189] Libreoffice Scrolling very slow for even moderately sized documents
https://bugs.documentfoundation.org/show_bug.cgi?id=101189 --- Comment #4 from Buovjaga--- Vince: maybe you could do some tests without touching the libreoffice-gtk3 package. See, if you can reproduce the problem by running libreoffice from the terminal with the command: SAL_USE_VCLPLUGIN=gtk libreoffice If you get slow scrolling with that environment variable, you could next try this bit of sorcery: SAL_USE_VCLPLUGIN=gtk SAL_SYNCHRONIZE=1 libreoffice The results of these experiments might be useful information for developers. -- 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 101472] Mouseover highlight does not disappear after moving mouse out of the formula pane
https://bugs.documentfoundation.org/show_bug.cgi?id=101472 Buovjagachanged: What|Removed |Added Status|UNCONFIRMED |NEW CC||todven...@suomi24.fi Summary|UI glitches in formula |Mouseover highlight does |editor |not disappear after moving ||mouse out of the formula ||pane Ever confirmed|0 |1 Severity|normal |minor --- Comment #1 from Buovjaga --- I can reproduce both of the issues with 5.2. However, I cannot repro issue 2 with a fairly fresh build of 5.3. OfficeUser: could you test with 5.3? For testers: to repro the mouseover issue, you must hover the mouse out of the pane area quite quickly. Arch Linux 64-bit, KDE Plasma 5 Version: 5.2.0.4 Build ID: 5.2.0-1 CPU Threads: 8; OS Version: Linux 4.6; UI Render: default; Locale: fi-FI (fi_FI.UTF-8) -- 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: 9 commits - basctl/source chart2/source connectivity/source cui/source forms/source framework/source idl/inc idl/source include/oox include/sfx2 include/vcl oox/source
basctl/source/basicide/bastype2.cxx|5 basctl/source/inc/bastype2.hxx |1 chart2/source/controller/dialogs/ChartTypeDialogController.cxx |3 chart2/source/controller/dialogs/ChartTypeDialogController.hxx |1 chart2/source/inc/ObjectIdentifier.hxx |2 chart2/source/tools/ObjectIdentifier.cxx | 12 - chart2/source/view/axes/ScaleAutomatism.cxx|3 chart2/source/view/inc/ScaleAutomatism.hxx |1 connectivity/source/drivers/file/fcode.cxx | 10 - connectivity/source/inc/file/fcode.hxx |3 cui/source/dialogs/hyphen.cxx |9 - forms/source/richtext/rtattributes.hxx |6 forms/source/xforms/mip.cxx|6 forms/source/xforms/mip.hxx|1 framework/source/accelerators/acceleratorcache.cxx |6 framework/source/inc/accelerators/acceleratorcache.hxx |3 framework/source/services/autorecovery.cxx | 14 - idl/inc/hash.hxx | 10 - idl/source/cmptools/hash.cxx |2 include/oox/drawingml/color.hxx|3 include/oox/ole/axcontrol.hxx |1 include/sfx2/docmacromode.hxx |1 include/vcl/bitmapex.hxx |1 include/vcl/gfxlink.hxx|1 oox/source/drawingml/color.cxx |4 oox/source/ole/axcontrol.cxx |4 sfx2/source/doc/docmacromode.cxx | 11 - svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx |1 svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx |6 sw/source/ui/misc/outline.cxx |2 sw/source/uibase/config/uinums.cxx | 30 +--- sw/source/uibase/inc/uinums.hxx|5 vcl/inc/toolbox.h |6 vcl/source/gdi/bitmapex.cxx|4 vcl/source/gdi/gfxlink.cxx |4 vcl/source/window/toolbox2.cxx | 72 -- vcl/unx/kde4/KDESalFrame.cxx | 27 ++- 37 files changed, 50 insertions(+), 231 deletions(-) New commits: commit c7fd6532682a12d8981e6b19b4fbb75d6d3c412c Author: Caolán McNamaraDate: Tue Aug 30 17:52:41 2016 +0100 Resolves: tdf#97055 hyphenation claims its already active after closing cancel button works, hyphen all works, but closing it via wm close skips the cancel callback. simplest thing seems to be to call SpellEnd when necessary, flagging that its not necessary by disabling the close button on the RET_OK case Change-Id: Ib0a67c4395e9d20941e735ebb14f6bd7f7ddb66c diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 28cbb0b..8dd3afa 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -268,7 +268,10 @@ void SvxHyphenWordDialog::ContinueHyph_Impl( sal_Int32 nInsPos ) } } else -EndDialog( RET_OK ); +{ +m_pCloseBtn->Disable(); +EndDialog(RET_OK); +} } @@ -399,7 +402,6 @@ IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, CancelHdl_Impl, Button*, void) if( !m_bBusy ) { m_bBusy = true; -m_pHyphWrapper->SpellEnd(); EndDialog(); m_bBusy = false; } @@ -501,6 +503,8 @@ SvxHyphenWordDialog::~SvxHyphenWordDialog() void SvxHyphenWordDialog::dispose() { +if (m_pCloseBtn->IsEnabled()) +m_pHyphWrapper->SpellEnd(); m_pWordEdit.clear(); m_pLeftBtn.clear(); m_pRightBtn.clear(); @@ -512,7 +516,6 @@ void SvxHyphenWordDialog::dispose() SfxModalDialog::dispose(); } - void SvxHyphenWordDialog::SetWindowTitle( LanguageType nLang ) { SetText( m_aLabel + " (" + SvtLanguageTable::GetLanguageString( nLang ) + ")" ); commit 107e5981b45f8ee042f6fbf5e1aa84aa557f8989 Author: Caolán McNamara Date: Tue Aug 30 14:41:11 2016 +0100 default dtors are fine here Change-Id: I503f954a2729aa2737d783ed8c72f62d8a68da4c diff --git a/forms/source/richtext/rtattributes.hxx b/forms/source/richtext/rtattributes.hxx index 5e61f55..a47c5e2 100644 --- a/forms/source/richtext/rtattributes.hxx +++ b/forms/source/richtext/rtattributes.hxx @@ -51,7 +51,6 @@ namespace frm inline AttributeState( ); inline explicit
[Libreoffice-commits] core.git: linguistic/source
linguistic/source/lngsvcmgr.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 04311182b6fadcbdeef7aec15c7eea0240ee628c Author: Eike RathkeDate: Tue Aug 30 20:23:02 2016 +0200 Resolves: tdf#83376 do not let linguistic tools fall back to known languages Falling back to known locales was necessary before the new language tag implementation that can register "unknown" tags on the fly. In fact here we want to handle tags unknown to us and not fall back to worst case en-US even, so that dictionaries, grammar checkers, thesauri et al for any language tag can be used with such tagged document content. Change-Id: I06e54f41e00e69779b4c0cbbc891f250545a17d2 diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 10a1eeb..aefcdde 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -839,7 +839,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > ) LanguageType nLang = LANGUAGE_NONE; if (!aKeyText.isEmpty()) -nLang = LanguageTag::convertToLanguageTypeWithFallback( aKeyText ); +nLang = LanguageTag::convertToLanguageType( aKeyText ); GetSpellCheckerDsp_Impl( false ); // don't set service list, it will be done below pSpellDsp->SetServiceList( LanguageTag::convertToLocale(nLang), aSvcImplNames ); @@ -862,7 +862,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > ) LanguageType nLang = LANGUAGE_NONE; if (!aKeyText.isEmpty()) -nLang = LanguageTag::convertToLanguageTypeWithFallback( aKeyText ); +nLang = LanguageTag::convertToLanguageType( aKeyText ); if (SvtLinguConfig().HasGrammarChecker()) { @@ -888,7 +888,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > ) LanguageType nLang = LANGUAGE_NONE; if (!aKeyText.isEmpty()) -nLang = LanguageTag::convertToLanguageTypeWithFallback( aKeyText ); +nLang = LanguageTag::convertToLanguageType( aKeyText ); GetHyphenatorDsp_Impl( false ); // don't set service list, it will be done below pHyphDsp->SetServiceList( LanguageTag::convertToLocale(nLang), aSvcImplNames ); @@ -911,7 +911,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > ) LanguageType nLang = LANGUAGE_NONE; if (!aKeyText.isEmpty()) -nLang = LanguageTag::convertToLanguageTypeWithFallback( aKeyText ); +nLang = LanguageTag::convertToLanguageType( aKeyText ); GetThesaurusDsp_Impl( false ); // don't set service list, it will be done below pThesDsp->SetServiceList( LanguageTag::convertToLocale(nLang), aSvcImplNames ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-ux-advise] [Bug 92152] Add half arrowheads
https://bugs.documentfoundation.org/show_bug.cgi?id=92152 --- Comment #14 from abhilash300si...@gmail.com --- (In reply to Yan Pas from comment #12) > I've done this quest too: > > > you can test it via > http://www.w3schools.com/svg/tryit.asp?filename=trysvg_path I can't see how it will turn into a half arrow head. Wouldn't that render as full arrow head. -- 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 92152] Add half arrowheads
https://bugs.documentfoundation.org/show_bug.cgi?id=92152 --- Comment #14 from abhilash300si...@gmail.com --- (In reply to Yan Pas from comment #12) > I've done this quest too: > > > you can test it via > http://www.w3schools.com/svg/tryit.asp?filename=trysvg_path I can't see how it will turn into a half arrow head. Wouldn't that render as full arrow head. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'feature/commonsallayout' - 575 commits - accessibility/source android/source avmedia/source basctl/source basegfx/source basic/inc basic/source binaryurp/source
Rebased ref, commits from common ancestor: commit 90cd2ff1b4debb037557da6ee59e4ca1093e7982 Author: Akash JainDate: Wed Aug 17 21:31:22 2016 +0530 GSoC: Speed up CommonSalLayout by caching hb_face Cache hb_face so it is not created again and again. Switch from GDI to DirectWrite on Windows to obtain SFNT table data. Change-Id: I9c532cd72e1f6b57313f3b7d42a6b9b0633eb0ef diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx index 8fc398a..cd68c93 100755 --- a/vcl/inc/CommonSalLayout.hxx +++ b/vcl/inc/CommonSalLayout.hxx @@ -41,6 +41,7 @@ class CommonSalLayout : public GenericSalLayout #ifdef _WIN32 HDC mhDC; HFONT mhFont; +D2DWriteTextOutRenderer* mpD2DRenderer; #elif defined(MACOSX) || defined(IOS) const CoreTextStyle& mrCoreTextStyle; #else @@ -50,7 +51,7 @@ class CommonSalLayout : public GenericSalLayout hb_font_t* GetHBFont(); public: #if defined(_WIN32) -explicitCommonSalLayout(HDC, WinFontInstance&); +explicitCommonSalLayout(WinSalGraphics*, WinFontInstance&, const WinFontFace&); virtual voidInitFont() const override; #elif defined(MACOSX) || defined(IOS) explicitCommonSalLayout(const CoreTextStyle&); @@ -60,7 +61,6 @@ public: const ServerFont& getFontData() const { return mrServerFont; }; #endif -virtual ~CommonSalLayout(); voidSetNeedFallback(ImplLayoutArgs&, sal_Int32, bool); voidAdjustLayout(ImplLayoutArgs&) override; virtual boolLayoutText(ImplLayoutArgs&) override; diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index afd11e2..15f23ba 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -45,6 +45,7 @@ #include "quartz/salgdicommon.hxx" #include +#include class AquaSalFrame; class FontAttributes; @@ -98,6 +99,8 @@ public: void GetFontMetric( ImplFontMetricDataPtr& ) const; bool GetGlyphBoundRect( sal_GlyphId, Rectangle& ) const; bool GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) const; +hb_face_t* GetHBFace() const { return mpHBFace; } +void SetHBFace(hb_face_t* pHBFace) const { mpHBFace = pHBFace; } const CoreTextFontFace* mpFontData; /// <1.0: font is squeezed, >1.0 font is stretched, else 1.0 @@ -109,6 +112,7 @@ public: private: /// CoreText text style object CFMutableDictionaryRef mpStyleDict; +mutable hb_face_t* mpHBFace; friend class CTLayout; friend class AquaSalGraphics; diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index 04723cb..1c356c5 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -35,6 +35,7 @@ #include #include "fontattributes.hxx" #include "impfontmetricdata.hxx" +#include "hb-ot.h" #include @@ -181,6 +182,8 @@ public: sal_GlyphId FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 ) const; boolGetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolygon& ) const; boolGetAntialiasAdvice() const; +hb_face_t* GetHBFace() { return mpHBFace; } +voidSetHBFace( hb_face_t* pHBFace ) { mpHBFace=pHBFace; } private: friend class GlyphCache; @@ -240,6 +243,7 @@ private: GlyphSubstitution maGlyphSubstitution; ServerFontLayoutEngine* mpLayoutEngine; +hb_face_t* mpHBFace; }; // a class for cache entries for physical font instances that are based on serverfonts diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index bc5165d..961cb47 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -44,6 +44,9 @@ # include "postwin.h" #endif +#include +#include + class FontSelectPattern; class WinFontInstance; class ImplFontAttrCache; @@ -139,10 +142,12 @@ private: mutable std::unordered_set maGsubTable; mutable boolmbGsubRead; +mutable hb_face_t* mpHBFace; public: boolHasGSUBstitutions( HDC ) const; boolIsGSUBstituted( sal_UCS4 ) const; -static int GetTable( const char pTagName[5], const unsigned char*&, HDC ); +hb_face_t* GetHBFace() const { return mpHBFace; } +voidSetHBFace( hb_face_t* pHBFace ) const { mpHBFace = pHBFace; } }; /** Class that creates (and destroys) a compatible Device Context. @@ -354,6 +359,7 @@ private: sal_uLong GetKernPairs(); public: +sal_uLong GetTable( const char pTagName[5], const unsigned char*&, void*&, IDWriteFontFace*& ); // public SalGraphics methods, the interface to the independent vcl part // get device resolution diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index c7b54d3..d315705
[Libreoffice-bugs] [Bug 83376] Dictionaries for custom languages are not activated
https://bugs.documentfoundation.org/show_bug.cgi?id=83376 Eike Rathkechanged: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |er...@redhat.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-ux-advise] [Bug 101772] UI - View source -> XML source raw editing mode, " make Dreamweaver obsolete"
https://bugs.documentfoundation.org/show_bug.cgi?id=101772 Buovjagachanged: What|Removed |Added CC||todven...@suomi24.fi --- Comment #10 from Buovjaga --- Zenaan: you are doing good work in the bug tracker, but I'm afraid I must disagree with this particular proposal. Aiming to be a WYSIWYG web editor would be too much sprawl for LibreOffice. Above all: WYSIWYG simply is not a good way to do web design. It is obsolete and we should not invest in it. Maybe some day a revolution will make WYSIWYG relevant again, but that revolution cannot happen on the platform that is LibreOffice (due to the baggage of the codebase). The most reliable and easy way to design for the web these days is to: - use your favorite code editor - view the results of your editing in actual web browsers - use the dev tools of the browsers Instead of adding more, all web editing capability should be removed from LibreOffice. As open source web editors, I would recommend checking out http://brackets.io/ (web-focused code editor from Adobe) https://www.kdevelop.org/ (general code editor from KDE) If still unwilling to let go of the idea of a dedicated WYSIWYG editor: http://bluegriffon.org/ (see "what's inside" for a comparison between free and commercial editions) http://bluefish.openoffice.nl/index.html -- 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 101772] UI - View source -> XML source raw editing mode, " make Dreamweaver obsolete"
https://bugs.documentfoundation.org/show_bug.cgi?id=101772 Buovjagachanged: What|Removed |Added CC||todven...@suomi24.fi --- Comment #10 from Buovjaga --- Zenaan: you are doing good work in the bug tracker, but I'm afraid I must disagree with this particular proposal. Aiming to be a WYSIWYG web editor would be too much sprawl for LibreOffice. Above all: WYSIWYG simply is not a good way to do web design. It is obsolete and we should not invest in it. Maybe some day a revolution will make WYSIWYG relevant again, but that revolution cannot happen on the platform that is LibreOffice (due to the baggage of the codebase). The most reliable and easy way to design for the web these days is to: - use your favorite code editor - view the results of your editing in actual web browsers - use the dev tools of the browsers Instead of adding more, all web editing capability should be removed from LibreOffice. As open source web editors, I would recommend checking out http://brackets.io/ (web-focused code editor from Adobe) https://www.kdevelop.org/ (general code editor from KDE) If still unwilling to let go of the idea of a dedicated WYSIWYG editor: http://bluegriffon.org/ (see "what's inside" for a comparison between free and commercial editions) http://bluefish.openoffice.nl/index.html -- 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 31915] Modal dialogs aren' t on OS X and multiple copies can be opened simultaneously or menu entries activated
https://bugs.documentfoundation.org/show_bug.cgi?id=31915 --- Comment #12 from Christopher Chavez--- (In reply to tommy27 from comment #11) Reproduced using 5.2.1.2 on OS X 10.11.6. This seems to be a common issue with many programs, but I don't know if someone's already described a workaround for this. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 43808] [META] Most Annoying RTL related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=43808 Bug 43808 depends on bug 56403, which changed state. Bug 56403 Summary: RTL UI: with RTL locales presentations appear with text align to the right instead of to the left https://bugs.documentfoundation.org/show_bug.cgi?id=56403 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sd/source
sd/source/core/drawdoc.cxx |5 - 1 file changed, 5 deletions(-) New commits: commit cf425acfd4a5ff7c660523601964d45cbad74b53 Author: Khaled HosnyDate: Fri Aug 26 15:19:26 2016 +0200 tdf#56403: Text is right aligned in RTL locales Draw/Impress is setting writing mode to RTL (which in turn sets text alignment to right) if the current locale is RTL one. This does not make sense at all since it means document prepared on a LTR locale and contains LTR text will appear right aligned on RTL locales. It would have slightly more sense if SetDefaultWritingMode() actually just set a default (for e.g. new documents), but that is not the case here as it affects all documents. This was introduced in 2c32696a04bc195c8ce61a0df6dcafb8c0c49fe0 with a branch merge and no further explanation. Change-Id: Idee0f58e153498a6676a22242d2edd5054b908c6 Reviewed-on: https://gerrit.libreoffice.org/28411 Tested-by: Jenkins Reviewed-by: Khaled Hosny diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index bdf3395..c448609 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -243,11 +243,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) // If the current application language is a language that uses right-to-left text... LanguageType eRealCTLLanguage = Application::GetSettings().GetLanguageTag().getLanguageType(); -if( MsLangId::isRightToLeft( eRealCTLLanguage ) ) -{ -// ... then we have to set this as a default -SetDefaultWritingMode( css::text::WritingMode_RL_TB ); -} // for korean and japanese languages we have a different default for apply spacing between asian, latin and ctl text if (MsLangId::isKorean(eRealCTLLanguage) || (LANGUAGE_JAPANESE == eRealCTLLanguage)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 100143] libreoffice 5.1 crashes on opening an XLS file
https://bugs.documentfoundation.org/show_bug.cgi?id=100143 Petr Pisarchanged: What|Removed |Added Status|NEEDINFO|ASSIGNED --- Comment #8 from Petr Pisar --- I'm sorry for the delay. I had long vacation and I do not carry all the credentials with myself. I verified with official 5.1.5.2 release that it behaves exactly as the 5.1.5.1 prerelease. I have Czech localization and I'm not sitting at the machine right know, so my description can be misleading. The OpenCL configuration tab has two options. If I remember correctly, since the fixed release 5.1.5.1 the lower option (Allow use of OpenCL) gets automatically disabled after the initial crash, while the upper one (Software interpreter) keeps enabled. I'm fine with the current solution that disables the offending feature on first crash. -- 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 55168] Writer functionality request: add options for improving reading of text in Fullscreen Mode
https://bugs.documentfoundation.org/show_bug.cgi?id=55168 --- Comment #7 from BrendaEM--- No, it's not all a duplicate, but there is some cross-over. The Drag functionality would be a great feature--even if it's implemented 4 years later. Mouse wheel scrolling is jumps by line, making it easier to lose ones place. I find myself wondering why we should try to even post bugs and feature requests. -- 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 101805] New: bad documentation of function ERF.PRECISE
https://bugs.documentfoundation.org/show_bug.cgi?id=101805 Bug ID: 101805 Summary: bad documentation of function ERF.PRECISE Product: LibreOffice Version: 5.3.0.0.alpha0+ Master Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Documentation Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: r...@post.cz Documentation : http://vm173.documentfoundation.org/text/scalc/01/04060115.xhp#bm_id2983446 Actual: Syntax ERF.PRECISE(LowerLimit; UpperLimit) expected: Syntax ERF.PRECISE(LowerLimit) This syntax is used in function wizzard. See the excel's docs: https://support.office.com/en-US/article/ERF-PRECISE-function-9A349593-705C-4278-9A98-E4122831A8E0 Example in documentation (=ERF.PRECISE(0;1) ) returns error in Calc. Function was added into Calc in bug 73149. -- 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 97055] Interactive hyphenation claims it' s already active in another document after closing it once
https://bugs.documentfoundation.org/show_bug.cgi?id=97055 Caolán McNamarachanged: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |caol...@redhat.com |desktop.org | -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 64145] 'sub-title' appears when copying chart from Calc and pasting to Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=64145 Laurent BPchanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 101563] Export to PDF with linked images creates huge PDF files.
https://bugs.documentfoundation.org/show_bug.cgi?id=101563 Xisco Faulíchanged: What|Removed |Added Keywords||bibisected, filter:pdf CC||aniste...@gmail.com --- Comment #8 from Xisco Faulí --- Issue introduced in range 28ac7d0f0cea9067d7faba3b72a164729df26e5d..c58655c5a221d986fa3c3eed2f28810269205721 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'feature/fixes32' -
0 files changed New commits: commit 6e4bed9a60c55b01887693207fef00830b5aa82b Author: László NémethDate: Tue Aug 30 18:39:22 2016 +0200 repeat Change-Id: Ifa6b1265eed24d6b1a40dca1d6d69ad712b30fdf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-ux-advise] [Bug 61174] [META] Rework of Recent Documents List, options to prevent logging and to manage entries on the list
https://bugs.documentfoundation.org/show_bug.cgi?id=61174 inp...@gmail.com changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=99 ||187 -- 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 99187] Documents listed in the "Load URL" toolbar dropdown should update immediately, e.g. after clearing recent documents or opening another document
https://bugs.documentfoundation.org/show_bug.cgi?id=99187 inp...@gmail.com changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=61 ||174 -- 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