sw/qa/extras/uiwriter/uiwriter2.cxx | 2 - sw/source/core/crsr/callnk.cxx | 42 +++++++++++++++++++++++++----------- sw/source/core/inc/UndoTable.hxx | 8 ++++++ sw/source/core/undo/untbl.cxx | 2 + tools/source/fsys/fileutil.cxx | 7 +++++- 5 files changed, 47 insertions(+), 14 deletions(-)
New commits: commit 66e25aad35cf538da86bdd0157428f4bed95258d Author: Michael Stahl <[email protected]> AuthorDate: Thu Jul 14 17:57:18 2022 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Thu Jul 14 18:57:32 2022 +0200 tools: try to work around DavGetHTTPFromUNCPath() not URL-encoding path This was added in commit 20b1e6440aacab043753e93be4499e939a80b05b "tdf#126121: WebDAV redirection detection" and it works fine when i test it on my local Windows 10, returning an URL with encoded path. The logs from the customer system however show a http URL containing an unencoded ' ' in the path, which curl_url_set chokes on. Try to encode the returned URL with rtl_UriEncodeKeepEscapes, which should hopefully work in either situation. Change-Id: I6862fe0828307a13b0004b192153747d85bb3a42 diff --git a/tools/source/fsys/fileutil.cxx b/tools/source/fsys/fileutil.cxx index 9470fabd2fee..acf174cf8581 100644 --- a/tools/source/fsys/fileutil.cxx +++ b/tools/source/fsys/fileutil.cxx @@ -10,6 +10,7 @@ #include <tools/fileutil.hxx> #if defined _WIN32 #include <osl/file.hxx> +#include <rtl/uri.hxx> #include <o3tl/char16_t2wchar_t.hxx> #define WIN32_LEAN_AND_MEAN #include <Windows.h> @@ -29,7 +30,11 @@ OUString UNCToDavURL(LPCWSTR sUNC) bufURL = std::make_unique<wchar_t[]>(nSize); nResult = DavGetHTTPFromUNCPath(sUNC, bufURL.get(), &nSize); } - return nResult == ERROR_SUCCESS ? o3tl::toU(bufURL.get()) : OUString(); + // looks like on different Windowses this may or may not be URL encoded? + return nResult == ERROR_SUCCESS + ? ::rtl::Uri::encode(o3tl::toU(bufURL.get()), rtl_UriCharClassUric, + rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8) + : OUString(); } #endif } commit 158012bcd3ed56cd1c9c5b3472d42d94d5a437da Author: Michael Stahl <[email protected]> AuthorDate: Mon Jul 11 19:20:33 2022 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Thu Jul 14 18:57:32 2022 +0200 sw: fix spurious layout invalidation from ~SwCallLink() This code was added in commit 56b2cf0c10d9caa01ebae1d80465e342d046a85c "sw-collapse-empty-table-par-like-html.diff" and leaves us to guess what it should do. Apparently it's trying to replicate a Word feature where an empty paragraph at the end of a table cell and preceded by a nested table is effectively hidden, *unless* the user moves the cursor into it, at which point it grows to its ordinary height. The problem is that this is implemented by invalidating the position of any table once the cursor is moved into it, causing it to be reformatted, at potentially great expense, regardless if the cursor is actually on a paragraph that may be hidden. Also limit invalidations to when the cursor has actually moved to a different node. To fix tdf#105330, un-collapse a paragraph after Undo, requires additionally doing the same notification from SwUndoInsTable::UndoImpl() because the SwCallLink won't see the removed table any more. Mysteriously this causes the test SwLayoutWriter2 testTdf124261 to fail in Jenkins, but only on MacOSX so impossible to debug; tb86 fails with: layout2.cxx:2227:testTdf124261::TestBody equality assertion failed - Expected: 1721 - Actual : 5437 ... and tb84 with: layout2.cxx:2227:testTdf124261::TestBody equality assertion failed - Expected: 1721 - Actual : 3740 Change-Id: Ifd55097735d3675e6b82264f455baa44e9c9e30a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136963 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit c605283ad6785dea762feab5fdffd9d27e75c292) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137034 Reviewed-by: Miklos Vajna <[email protected]> (cherry picked from commit dadaf930d14283f96cc06741d2eec6d846e59f7f) diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx index 1825d3483148..aa58a895ed09 100644 --- a/sw/qa/extras/uiwriter/uiwriter2.cxx +++ b/sw/qa/extras/uiwriter/uiwriter2.cxx @@ -1779,7 +1779,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testMixedFormFieldInsertion) CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf124261) { -#if !defined(WNT) +#if !defined(WNT) && !defined(MACOSX) // Make sure that pressing a key in a btlr cell frame causes an immediate, correct repaint. SwDoc* pDoc = createDoc("tdf124261.docx"); SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout(); diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx index 4d956e90e2c5..d2840ae5406d 100644 --- a/sw/source/core/crsr/callnk.cxx +++ b/sw/source/core/crsr/callnk.cxx @@ -30,6 +30,7 @@ #include <ndtxt.hxx> #include <flyfrm.hxx> #include <breakit.hxx> +#include <UndoTable.hxx> SwCallLink::SwCallLink( SwCursorShell & rSh ) : rShell( rSh ) @@ -59,24 +60,36 @@ SwCallLink::SwCallLink( SwCursorShell & rSh ) } } -static void lcl_notifyRow(const SwContentNode* pNode, SwCursorShell & rShell) +namespace sw { + +/** + An empty paragraph inside a table with a nested table preceding it + should be hidden, unless the cursor is positioned in the paragraph. + + If the cursor is now (or was previously) inside such a paragraph, + send a size change notification on the row frame to force reformatting. + */ +void NotifyTableCollapsedParagraph(const SwContentNode *const pNode, SwCursorShell *const pShell) { if ( !pNode ) return; - SwFrame *const pMyFrame = pNode->getLayoutFrame( rShell.GetLayout() ); + SwFrame *const pMyFrame = pNode->getLayoutFrame(pShell ? pShell->GetLayout() : nullptr); if ( !pMyFrame ) return; - // We need to emulated a change of the row height in order - // to have the complete row redrawn + // important: only invalidate layout if something is actually hidden or + // shown! Otherwise performance is going to suffer with "difficult" tables. + if (!pMyFrame->IsCollapse()) + return; + SwRowFrame *const pRow = pMyFrame->FindRowFrame(); if ( !pRow ) return; const SwTableLine* pLine = pRow->GetTabLine( ); - if (rShell.IsTableMode() || (rShell.StartsWithTable() && rShell.ExtendedSelectedAll())) + if (pShell && (pShell->IsTableMode() || (pShell->StartsWithTable() && pShell->ExtendedSelectedAll()))) { // If we have a table selection, then avoid the notification: it's not necessary (the text // cursor needs no updating) and the notification may kill the selection overlay, leading to @@ -85,10 +98,13 @@ static void lcl_notifyRow(const SwContentNode* pNode, SwCursorShell & rShell) return; } + // notify a change in frame size to force reformatting of the row SwFormatFrameSize aSize = pLine->GetFrameFormat()->GetFrameSize(); pRow->ModifyNotification(nullptr, &aSize); } +} // namespace sw + SwCallLink::~SwCallLink() COVERITY_NOEXCEPT_FALSE { if( nNdTyp == SwNodeType::NONE || !rShell.m_bCallChgLnk ) // see ctor @@ -101,15 +117,17 @@ SwCallLink::~SwCallLink() COVERITY_NOEXCEPT_FALSE if( !pCNd ) return; - lcl_notifyRow(pCNd, rShell); - - const SwDoc *pDoc=rShell.GetDoc(); - const SwContentNode *pNode = nullptr; - if ( pDoc && nNode < pDoc->GetNodes( ).Count( ) ) + if (pCNd->GetIndex() != nNode) // only if moved to different node { - pNode = pDoc->GetNodes()[nNode]->GetContentNode(); + ::sw::NotifyTableCollapsedParagraph(pCNd, &rShell); + + const SwDoc *pDoc=rShell.GetDoc(); + if (nNode < pDoc->GetNodes().Count()) + { + const SwContentNode *const pNode = pDoc->GetNodes()[nNode]->GetContentNode(); + ::sw::NotifyTableCollapsedParagraph(pNode, &rShell); + } } - lcl_notifyRow(pNode, rShell); sal_Int32 nCmp, nCurrentContent = pCurrentCursor->GetPoint()->nContent.GetIndex(); SwNodeType nNdWhich = pCNd->GetNodeType(); diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx index ecfa87745ef7..2b51dbdbb111 100644 --- a/sw/source/core/inc/UndoTable.hxx +++ b/sw/source/core/inc/UndoTable.hxx @@ -42,6 +42,14 @@ class SwStartNode; class SwTableNode; class SwTableAutoFormat; class SwTableSortBoxes; +class SwContentNode; +class SwCursorShell; + +namespace sw { + +void NotifyTableCollapsedParagraph(const SwContentNode* pNode, SwCursorShell *const pShell); + +} class SwUndoInsTable : public SwUndo { diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 9d1675c0f304..19da5dd787f0 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -277,6 +277,8 @@ void SwUndoInsTable::UndoImpl(::sw::UndoRedoContext & rContext) if( SfxItemState::SET == pTableFormat->GetItemState( RES_BREAK, false, &pItem ) ) pNextNd->SetAttr( *pItem ); + + ::sw::NotifyTableCollapsedParagraph(pNextNd, nullptr); } m_sTableName = pTableNd->GetTable().GetFrameFormat()->GetName();
