diff --git a/.gitignore b/.gitignore index 96027f8..3ecbd17 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,6 @@ SOURCES/185d60944ea767075d27247c3162b3bc-unowinreg.dll SOURCES/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf SOURCES/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip SOURCES/gpgkey-C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.gpg.asc -SOURCES/libreoffice-6.3.5.2.tar.xz -SOURCES/libreoffice-help-6.3.5.2.tar.xz -SOURCES/libreoffice-translations-6.3.5.2.tar.xz +SOURCES/libreoffice-6.3.6.2.tar.xz +SOURCES/libreoffice-help-6.3.6.2.tar.xz +SOURCES/libreoffice-translations-6.3.6.2.tar.xz diff --git a/.libreoffice.metadata b/.libreoffice.metadata index 64fc40f..d45e2c5 100644 --- a/.libreoffice.metadata +++ b/.libreoffice.metadata @@ -3,6 +3,6 @@ d336802a36ed2c87dd243e7c2f1d0542dace5cca SOURCES/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf 2d49e11b0b711970f494294dc3698f05eb294853 SOURCES/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 7b5fd93d787fbc6d9c2d4025d543730ee8dc4559 SOURCES/gpgkey-C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.gpg.asc -76ef06f0cd0ce0f29c3e78f73763ec63ee34fc32 SOURCES/libreoffice-6.3.5.2.tar.xz -2cb7747b123c4bc8b0986889f55794a93e7b5319 SOURCES/libreoffice-help-6.3.5.2.tar.xz -0ef79bb374a9919d8e49daedf6de4b39b81c3f27 SOURCES/libreoffice-translations-6.3.5.2.tar.xz +79aa683b98c465ce570652852faead9f973f8d95 SOURCES/libreoffice-6.3.6.2.tar.xz +f6f94206dad1038c4369610a90e1727e4266ea80 SOURCES/libreoffice-help-6.3.6.2.tar.xz +52b483e3d868345f7aa9ed187fd8b59d713d24fc SOURCES/libreoffice-translations-6.3.6.2.tar.xz diff --git a/SOURCES/0001-General-Internet-Error-dialog-appearing-on-gio-mount.patch b/SOURCES/0001-General-Internet-Error-dialog-appearing-on-gio-mount.patch new file mode 100644 index 0000000..4d853be --- /dev/null +++ b/SOURCES/0001-General-Internet-Error-dialog-appearing-on-gio-mount.patch @@ -0,0 +1,40 @@ +From ac68d29966f78ac8799f31f13578e4843a49043f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 14 Apr 2020 13:46:44 +0100 +Subject: [PATCH] "General Internet Error" dialog appearing on gio mount + +we get a GError of G_IO_ERROR_FAILED_HANDLED which is documented +as "Operation failed and a helper program has already interacted with the user. +Do not display any error dialog." PENDING seems to describe this state +better than a generic error case and results in no error dialog. + +Change-Id: Iee382e49edaa0a734526659971e0339991e2c03e +--- + ucb/source/ucp/gio/gio_content.cxx | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx +index 77a5c0127ae7..8576713974a8 100644 +--- a/ucb/source/ucp/gio/gio_content.cxx ++++ b/ucb/source/ucp/gio/gio_content.cxx +@@ -196,6 +196,9 @@ css::uno::Any convertToException(GError *pError, const css::uno::Reference< css: + css::task::InteractionClassification_ERROR, css::ucb::IOErrorCode_NAME_TOO_LONG, aArgs); + EXCEPT(aExcept); } + break; ++ case G_IO_ERROR_FAILED_HANDLED: /* Operation failed and a helper program ++ has already interacted with the user. Do not display any error ++ dialog */ + case G_IO_ERROR_PENDING: + { css::ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext, + css::task::InteractionClassification_ERROR, css::ucb::IOErrorCode_PENDING, aArgs); +@@ -257,7 +260,6 @@ css::uno::Any convertToException(GError *pError, const css::uno::Reference< css: + case G_IO_ERROR_NOT_EMPTY: + case G_IO_ERROR_NOT_SYMBOLIC_LINK: + case G_IO_ERROR_NOT_MOUNTABLE_FILE: +- case G_IO_ERROR_FAILED_HANDLED: + { css::ucb::InteractiveNetworkGeneralException aExcept(sMessage, rContext, + css::task::InteractionClassification_ERROR); + EXCEPT(aExcept);} +-- +2.25.1 + diff --git a/SOURCES/0001-Resolves-tdf-132288-don-t-merge-adjacent-properties-.patch b/SOURCES/0001-Resolves-tdf-132288-don-t-merge-adjacent-properties-.patch new file mode 100644 index 0000000..49b9edb --- /dev/null +++ b/SOURCES/0001-Resolves-tdf-132288-don-t-merge-adjacent-properties-.patch @@ -0,0 +1,255 @@ +From fd1692b657838f137c8974eae7730510b7d190df Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Fri, 24 Apr 2020 16:38:26 +0100 +Subject: [PATCH] Resolves: tdf#132288 don't merge adjacent properties for + spell checking +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +spell checking relies on each attribute chunk being unmerged with identical +adjacent chunks + +squash includes... + +nStartPosition and nEndPosition are always the same + +and + +tdf#132288 preservation of footnote depends on reverse iteration + +like TextCharAttribList::FindAttrib does which spell checking +used before + +commit 243b5b392906042ab03800e0b5765e6f3513372c +Author: Caolán McNamara +Date: Fri Jun 14 21:56:44 2019 +0100 + + weld SpellDialog + +converted to use an EditEngine instead of a TextEngine in order to +be able to host it in a native widget + +Change-Id: Ia835fa054cad0dee4304f16724b9eb0c29b46102 +--- + cui/source/dialogs/SpellDialog.cxx | 37 ++++++++++++++++-------------- + editeng/inc/editdoc.hxx | 3 +++ + editeng/source/editeng/editdoc.cxx | 12 +++++++++- + editeng/source/editeng/editeng.cxx | 4 ++++ + include/editeng/editeng.hxx | 5 ++++ + 5 files changed, 43 insertions(+), 18 deletions(-) + +diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx +index 1bb15c934552..17bff36056fb 100644 +--- a/cui/source/dialogs/SpellDialog.cxx ++++ b/cui/source/dialogs/SpellDialog.cxx +@@ -1142,6 +1142,8 @@ void SentenceEditWindow_Impl::SetDrawingArea(weld::DrawingArea* pDrawingArea) + pDrawingArea->get_text_height() * 6); + pDrawingArea->set_size_request(aSize.Width(), aSize.Height()); + WeldEditView::SetDrawingArea(pDrawingArea); ++ // tdf#132288 don't merge equal adjacent attributes ++ m_xEditEngine->DisableAttributeExpanding(); + } + + SentenceEditWindow_Impl::~SentenceEditWindow_Impl() +@@ -1150,13 +1152,14 @@ SentenceEditWindow_Impl::~SentenceEditWindow_Impl() + + namespace + { +- const EECharAttrib* FindCharAttrib(int nStartPosition, int nEndPosition, sal_uInt16 nWhich, std::vector& rAttribList) ++ const EECharAttrib* FindCharAttrib(int nPosition, sal_uInt16 nWhich, std::vector& rAttribList) + { +- for (const auto& rTextAtr : rAttribList) ++ for (auto it = rAttribList.rbegin(); it != rAttribList.rend(); ++it) + { ++ const auto& rTextAtr = *it; + if (rTextAtr.pAttr->Which() != nWhich) + continue; +- if (rTextAtr.nStart <= nStartPosition && rTextAtr.nEnd >= nEndPosition) ++ if (rTextAtr.nStart <= nPosition && rTextAtr.nEnd >= nPosition) + { + return &rTextAtr; + } +@@ -1272,8 +1275,8 @@ bool SentenceEditWindow_Impl::KeyInput(const KeyEvent& rKeyEvt) + m_xEditEngine->GetCharAttribs(0, aAttribList); + + auto nCursor = aCurrentSelection.nStartPos; +- const EECharAttrib* pBackAttr = FindCharAttrib(nCursor, nCursor, EE_CHAR_BKGCOLOR, aAttribList); +- const EECharAttrib* pErrorAttr = FindCharAttrib(nCursor, nCursor, EE_CHAR_GRABBAG, aAttribList); ++ const EECharAttrib* pBackAttr = FindCharAttrib(nCursor, EE_CHAR_BKGCOLOR, aAttribList); ++ const EECharAttrib* pErrorAttr = FindCharAttrib(nCursor, EE_CHAR_GRABBAG, aAttribList); + const EECharAttrib* pBackAttrLeft = nullptr; + const EECharAttrib* pErrorAttrLeft = nullptr; + +@@ -1299,8 +1302,8 @@ bool SentenceEditWindow_Impl::KeyInput(const KeyEvent& rKeyEvt) + while (nCursor < aCurrentSelection.nEndPos) + { + ++nCursor; +- const EECharAttrib* pIntBackAttr = FindCharAttrib(nCursor, nCursor, EE_CHAR_BKGCOLOR, aAttribList); +- const EECharAttrib* pIntErrorAttr = FindCharAttrib(nCursor, nCursor, EE_CHAR_GRABBAG, aAttribList); ++ const EECharAttrib* pIntBackAttr = FindCharAttrib(nCursor, EE_CHAR_BKGCOLOR, aAttribList); ++ const EECharAttrib* pIntErrorAttr = FindCharAttrib(nCursor, EE_CHAR_GRABBAG, aAttribList); + //if any attr has been found then BRACE + if (pIntBackAttr || pIntErrorAttr) + nSelectionType = BRACE; +@@ -1342,8 +1345,8 @@ bool SentenceEditWindow_Impl::KeyInput(const KeyEvent& rKeyEvt) + if (nCursor) + { + --nCursor; +- pBackAttrLeft = FindCharAttrib(nCursor, nCursor, EE_CHAR_BKGCOLOR, aAttribList); +- pErrorAttrLeft = FindCharAttrib(nCursor, nCursor, EE_CHAR_GRABBAG, aAttribList); ++ pBackAttrLeft = FindCharAttrib(nCursor, EE_CHAR_BKGCOLOR, aAttribList); ++ pErrorAttrLeft = FindCharAttrib(nCursor, EE_CHAR_GRABBAG, aAttribList); + bHasFieldLeft = pBackAttrLeft !=nullptr; + bHasErrorLeft = pErrorAttrLeft != nullptr; + ++nCursor; +@@ -1492,8 +1495,8 @@ bool SentenceEditWindow_Impl::KeyInput(const KeyEvent& rKeyEvt) + //start position + if (!IsUndoEditMode() && bIsErrorActive) + { +- const EECharAttrib* pFontColor = FindCharAttrib(nCursor, nCursor, EE_CHAR_COLOR, aAttribList); +- const EECharAttrib* pErrorAttrib = FindCharAttrib(m_nErrorStart, m_nErrorStart, EE_CHAR_GRABBAG, aAttribList); ++ const EECharAttrib* pFontColor = FindCharAttrib(nCursor, EE_CHAR_COLOR, aAttribList); ++ const EECharAttrib* pErrorAttrib = FindCharAttrib(m_nErrorStart, EE_CHAR_GRABBAG, aAttribList); + if (pFontColor && pErrorAttrib) + { + m_nErrorStart = pFontColor->nStart; +@@ -1695,7 +1698,7 @@ int SentenceEditWindow_Impl::ChangeMarkedWord(const OUString& rNewWord, Language + auto nDiffLen = rNewWord.getLength() - m_nErrorEnd + m_nErrorStart; + //Remove spell error attribute + m_xEditEngine->UndoActionStart(SPELLUNDO_MOVE_ERROREND); +- const EECharAttrib* pErrorAttrib = FindCharAttrib(m_nErrorStart, m_nErrorStart, EE_CHAR_GRABBAG, aAttribList); ++ const EECharAttrib* pErrorAttrib = FindCharAttrib(m_nErrorStart, EE_CHAR_GRABBAG, aAttribList); + DBG_ASSERT(pErrorAttrib, "no error attribute found"); + bool bSpellErrorDescription = false; + SpellErrorDescription aSpellErrorDescription; +@@ -1706,7 +1709,7 @@ int SentenceEditWindow_Impl::ChangeMarkedWord(const OUString& rNewWord, Language + bSpellErrorDescription = true; + } + +- const EECharAttrib* pBackAttrib = FindCharAttrib(m_nErrorStart, m_nErrorStart, EE_CHAR_BKGCOLOR, aAttribList); ++ const EECharAttrib* pBackAttrib = FindCharAttrib(m_nErrorStart, EE_CHAR_BKGCOLOR, aAttribList); + + ESelection aSel(0, m_nErrorStart, 0, m_nErrorEnd); + m_xEditEngine->QuickInsertText(rNewWord, aSel); +@@ -1721,7 +1724,7 @@ int SentenceEditWindow_Impl::ChangeMarkedWord(const OUString& rNewWord, Language + //attributes following an error at the start of the text are not moved but expanded from the + //text engine - this is done to keep full-paragraph-attributes + //in the current case that handling is not desired +- const EECharAttrib* pLangAttrib = FindCharAttrib(m_nErrorEnd, m_nErrorEnd, EE_CHAR_LANGUAGE, aAttribList); ++ const EECharAttrib* pLangAttrib = FindCharAttrib(m_nErrorEnd, EE_CHAR_LANGUAGE, aAttribList); + + if (pLangAttrib && !pLangAttrib->nStart && pLangAttrib->nEnd == nTextLen) + { +@@ -1776,7 +1779,7 @@ bool SentenceEditWindow_Impl::GetErrorDescription(SpellErrorDescription& rSpellE + std::vector aAttribList; + m_xEditEngine->GetCharAttribs(0, aAttribList); + +- if (const EECharAttrib* pEECharAttrib = FindCharAttrib(nPosition, nPosition, EE_CHAR_GRABBAG, aAttribList)) ++ if (const EECharAttrib* pEECharAttrib = FindCharAttrib(nPosition, EE_CHAR_GRABBAG, aAttribList)) + { + ExtractErrorDescription(*pEECharAttrib, rSpellErrorDescription); + return true; +@@ -1895,7 +1898,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions() const + const EECharAttrib* pError = nullptr; + while (nCursor < nTextLen) + { +- const EECharAttrib* pLang = FindCharAttrib(nCursor, nCursor, EE_CHAR_LANGUAGE, aAttribList); ++ const EECharAttrib* pLang = FindCharAttrib(nCursor, EE_CHAR_LANGUAGE, aAttribList); + if(pLang && pLang != pLastLang) + { + eLang = static_cast(pLang->pAttr)->GetLanguage(); +@@ -1903,7 +1906,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions() const + lcl_InsertBreakPosition_Impl(aBreakPositions, pLang->nEnd, eLang); + pLastLang = pLang; + } +- pError = FindCharAttrib(nCursor, nCursor, EE_CHAR_GRABBAG, aAttribList); ++ pError = FindCharAttrib(nCursor, EE_CHAR_GRABBAG, aAttribList); + if (pError && pLastError != pError) + { + lcl_InsertBreakPosition_Impl(aBreakPositions, pError->nStart, eLang); +diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx +index 089addc59c07..258fa945912c 100644 +--- a/editeng/inc/editdoc.hxx ++++ b/editeng/inc/editdoc.hxx +@@ -747,6 +747,7 @@ private: + + bool bOwnerOfPool:1; + bool bModified:1; ++ bool bDisableAttributeExpanding:1; + + private: + void ImplDestroyContents(); +@@ -761,6 +762,8 @@ public: + bool IsModified() const { return bModified; } + void SetModified( bool b ); + ++ void DisableAttributeExpanding() { bDisableAttributeExpanding = true; } ++ + void SetModifyHdl( const Link& rLink ) { aModifyHdl = rLink; } + + void CreateDefFont( bool bUseStyles ); +diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx +index 73a356054741..aacc0b2c7b6b 100644 +--- a/editeng/source/editeng/editdoc.cxx ++++ b/editeng/source/editeng/editdoc.cxx +@@ -1906,7 +1906,8 @@ EditDoc::EditDoc( SfxItemPool* pPool ) : + bIsTopToBottomVert(false), + bIsFixedCellHeight(false), + bOwnerOfPool(pPool == nullptr), +- bModified(false) ++ bModified(false), ++ bDisableAttributeExpanding(false) + { + // Don't create an empty node, Clear() will be called in EditEngine-CTOR + }; +@@ -2354,6 +2355,15 @@ void EditDoc::InsertAttribInSelection( ContentNode* pNode, sal_Int32 nStart, sal + + RemoveAttribs( pNode, nStart, nEnd, pStartingAttrib, pEndingAttrib, rPoolItem.Which() ); + ++ // tdf#132288 By default inserting an attribute beside another that is of ++ // the same type expands the original instead of inserting another. But the ++ // spell check dialog doesn't want that behaviour ++ if (bDisableAttributeExpanding) ++ { ++ pStartingAttrib = nullptr; ++ pEndingAttrib = nullptr; ++ } ++ + if ( pStartingAttrib && pEndingAttrib && + ( *(pStartingAttrib->GetItem()) == rPoolItem ) && + ( *(pEndingAttrib->GetItem()) == rPoolItem ) ) +diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx +index 458f71b34d3f..f46106a5773c 100644 +--- a/editeng/source/editeng/editeng.cxx ++++ b/editeng/source/editeng/editeng.cxx +@@ -2802,6 +2802,10 @@ bool EditEngine::IsPageOverflow() { + return pImpEditEngine->IsPageOverflow(); + } + ++void EditEngine::DisableAttributeExpanding() { ++ pImpEditEngine->GetEditDoc().DisableAttributeExpanding(); ++} ++ + EFieldInfo::EFieldInfo() + { + } +diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx +index f585ce8b5796..7d4129c0ad0b 100644 +--- a/include/editeng/editeng.hxx ++++ b/include/editeng/editeng.hxx +@@ -618,6 +618,11 @@ public: + sal_Int32 GetOverflowingLineNum() const; + void ClearOverflowingParaNum(); + bool IsPageOverflow(); ++ ++ // tdf#132288 By default inserting an attribute beside another that is of ++ // the same type expands the original instead of inserting another. But the ++ // spell check dialog doesn't want that behaviour ++ void DisableAttributeExpanding(); + }; + + #endif // INCLUDED_EDITENG_EDITENG_HXX +-- +2.25.3 + diff --git a/SOURCES/0001-opengl-slide-transitions-not-working-with-glm-GLM-0..patch b/SOURCES/0001-opengl-slide-transitions-not-working-with-glm-GLM-0..patch deleted file mode 100644 index 08c4758..0000000 --- a/SOURCES/0001-opengl-slide-transitions-not-working-with-glm-GLM-0..patch +++ /dev/null @@ -1,30 +0,0 @@ -From 44d4060c9d3dcf8d28ba4f4569ba6e0971237cd2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Fri, 31 Jan 2020 21:45:11 +0000 -Subject: [PATCH] opengl slide transitions not working with glm >= GLM 0.9.9.0 - -tracked it down to... - -Removed default initialization, use GLM_FORCE_CTOR_INIT to restore the old behavior -so adding in GLM_FORCE_CTOR_INIT to get them working again - -Change-Id: I1c6e7d8eb748fce40f0c518ff708708e5fb1e3d2 ---- - slideshow/Library_OGLTrans.mk | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk -index 4eca2a1ecaa3..9b64181d6a46 100644 ---- a/slideshow/Library_OGLTrans.mk -+++ b/slideshow/Library_OGLTrans.mk -@@ -17,6 +17,7 @@ endif - - $(eval $(call gb_Library_add_defs,OGLTrans,\ - -DGLM_FORCE_RADIANS \ -+ -DGLM_FORCE_CTOR_INIT \ - )) - - $(eval $(call gb_Library_use_sdk_api,OGLTrans)) --- -2.24.1 - diff --git a/SOURCES/0001-rhbz-1820868-deref-of-null-xLayoutManager.patch b/SOURCES/0001-rhbz-1820868-deref-of-null-xLayoutManager.patch new file mode 100644 index 0000000..10301cf --- /dev/null +++ b/SOURCES/0001-rhbz-1820868-deref-of-null-xLayoutManager.patch @@ -0,0 +1,26 @@ +From 1a1a8a95d6f36411e1110bf9b6d27b7d58dd685b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Sat, 4 Apr 2020 19:27:41 +0100 +Subject: [PATCH] rhbz#1820868 deref of null xLayoutManager + +Change-Id: Ib396ef9f5b019b08a181eeb5a8eb983bdb401db4 +--- + svx/source/dialog/srchdlg.cxx | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx +index 1f95fbe21a7c..445bc318718b 100644 +--- a/svx/source/dialog/srchdlg.cxx ++++ b/svx/source/dialog/srchdlg.cxx +@@ -2440,6 +2440,8 @@ OUString SvxSearchDialogWrapper::GetSearchLabel() + pViewFrame->GetFrame().GetFrameInterface(), css::uno::UNO_QUERY_THROW); + css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; + xPropSet->getPropertyValue("LayoutManager") >>= xLayoutManager; ++ if (!xLayoutManager.is()) ++ return; + css::uno::Reference< css::ui::XUIElement > xUIElement = + xLayoutManager->getElement("private:resource/toolbar/findbar"); + if (!xUIElement.is()) +-- +2.25.1 + diff --git a/SOURCES/0001-selecting-multiple-slides-and-using-print.-doesn-t-s.patch b/SOURCES/0001-selecting-multiple-slides-and-using-print.-doesn-t-s.patch deleted file mode 100644 index cf36328..0000000 --- a/SOURCES/0001-selecting-multiple-slides-and-using-print.-doesn-t-s.patch +++ /dev/null @@ -1,55 +0,0 @@ -From c82b891dc9370d4bf72bc07752884603df7d05ac Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Tue, 24 Mar 2020 14:51:09 +0000 -Subject: [PATCH] selecting multiple slides and using "print..." doesn't set - selection as range -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -start impress, copy the default slide a few times, select more than -one slide and use "print..." - -"slides" is selected, but just the first selected slide is shown in the range - -since... - -commit 76e22667625ce8d16dfaa8617a199b774e987a70 -Date: Thu Jun 14 23:29:34 2018 -0300 - - Configures page range in print dialog - -where - -aPageRange = aBuf.getStr() - -was removed, but if that line is removed then the surrounding loop -of "for (auto pPage: *pPageSelection)" just accumulates text -in the OUStringBuffer to then discard it and no longer makes sense - -perhaps this was an oversight rather than a planned change. - -Change-Id: I39e76c70714ee39d189016179fb1d13a71ec74ae -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90994 -Tested-by: Jenkins -Tested-by: Caolán McNamara -Reviewed-by: Caolán McNamara ---- - sd/source/ui/view/DocumentRenderer.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx -index bb59ccda6b1b..b91771f623c4 100644 ---- a/sd/source/ui/view/DocumentRenderer.cxx -+++ b/sd/source/ui/view/DocumentRenderer.cxx -@@ -616,6 +616,7 @@ namespace { - else - aBuf.append(','); - aBuf.append(OUString::number(pPage->GetPageNum() / 2 + 1)); -+ aPageRange = aBuf.getStr(); - } - nPrintRange = 1; - } --- -2.24.1 - diff --git a/SOURCES/0001-spreadsheetml2ooo.xsl-was-not-well-formed-xml.patch b/SOURCES/0001-spreadsheetml2ooo.xsl-was-not-well-formed-xml.patch deleted file mode 100644 index e79a2ee..0000000 --- a/SOURCES/0001-spreadsheetml2ooo.xsl-was-not-well-formed-xml.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7b06527648992cf29de5ad6bd9f80462a3c5f491 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Fri, 27 Mar 2020 19:21:19 +0000 -Subject: [PATCH] spreadsheetml2ooo.xsl was not well formed xml - -broken by... - -commit 6909838e2966b3fd3c2de6b6db70d952cd8b3114 -Date: Thu Apr 25 18:08:33 2019 +0200 - - Fix typo - -Change-Id: I40ee245faa75c885d76299ddee79fdaca9d0d715 ---- - filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl -index b9f18a2e0306..09b01a360aba 100644 ---- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl -+++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl -@@ -8863,7 +8863,7 @@ - - - -- -+ - - - --- -2.25.1 - diff --git a/SOURCES/libreoffice-6.3.5.2.tar.xz.asc b/SOURCES/libreoffice-6.3.5.2.tar.xz.asc deleted file mode 100644 index a23530f..0000000 --- a/SOURCES/libreoffice-6.3.5.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl5CouoACgkQ9DSh76/u -rqMHMw/9ES6F5YQTO5fnjh5o/yFU8uUxCC3iDudkgEv7g5p+Dj5evYRwjEAQEqv/ -N/9LEW/g1SNAw4gqIX+fHC6PWcEnRuCbulJo3YqsTA/tVi2VmTXynRorrAJARmb7 -tasOMb1vMPXCu8CsiPDvfCGcuScx+We2scBZeMOOjNtmX6MGwlPpGCzyAcfVB+Tc -LdALuRHHpIA+J7dudoFXLkBfEI7p51txwKChteLSjYCmd/jR87qEr4NcaoTKcwxX -/ojtj/4LxRRr0uFRDoEsJ42ycjKILST6a2eYQKaPkiIJDGo6bZbEV/3K2ge7i0WF -jbhSY2feCyZrFMJLTtVCLgv+Gns/S/hx7RKsNxU3kkaNh8MqptXlb/tC1HEo5prH -K4xjenaeFLn7kC2eA8qpeLBzNgIhGWM4rEF5TZIIonpyGxecOqzet8fNunXAsw8U -2gxtq37vnrRns4bt1nEhJUKZ7f70JzHBZg/QpPdY1BE2twUFWzeYSs1/D29U8qhX -c2baGKmtFb/xkDs1e2cYoyv5gEl5aREWSOWfdkT2TRD1AyDJ3XAD4QxgOcfRyhps -TtBXdqttEkO/U/CgG9myRyacQ7TCRME2kN+d9b4uCPxEQC1onQq4QENtdIezAd8x -xf3+us39q9Vb+iD7OmnuSwAxzt8ZZSLMUzt06sWgldqAA7eDy1A= -=L24V ------END PGP SIGNATURE----- diff --git a/SOURCES/libreoffice-6.3.6.2.tar.xz.asc b/SOURCES/libreoffice-6.3.6.2.tar.xz.asc new file mode 100644 index 0000000..ea04adb --- /dev/null +++ b/SOURCES/libreoffice-6.3.6.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl6gIF4ACgkQ9DSh76/u +rqN6sBAAyAGXPcw8Uyd3KCczDuYBJa+lDkO3RJj5CD+69XFCD4Mp+Wo1pGZWhJdT +k1xU/KC+w5BkUP8B5Hf0HVXAt+nwAjZMafhUJssogKr2/2NTrjJ1xovo60/DVZCp +eRu/pAudlR1b8B+giwrO0dDKJ1DvbrOUUIbdqXmKQcb2XA0Actyxa5zBcg19/iPN +zL3Sv1ExsXTG67pqMU19ch/GfqcaQeH6KZCIpJTLFg8hfY6q3stJ1s7jpxPvPlcY +fV9NR3bpO7GGvcOoo2SOr7oV95jCP3G3f/qUTLo7VgVsKIWOUGBPl5MfsHDNIxt+ +MAmlWaEMjxA82LZ8A1aGu4vvGS9ejytEiKv8tkEfaq6Ixaizh30iZecBoATJFA28 +CT3yTaHBImvHzot+zDc3TNMKXJjQ5MSTGNLRXN+gNpaa/NUPUgJ4csMgQVjTwwEP +2qqSvJB23I+6DVJnxUJC/cHL7SV0JPJ08ccQi4kAAJ+9f45/hTCQsP24RG+ZHIlS +wxsS55Py2jHOd7HySYjJzLHxXum9zSMRqDi4qGTi8TTUGJKLiANW/SdlS96UUgjG +Xby+jHEvqClWBryygyj7MndlXjOYU4QS1YezIaO6lSFNb4IA+zYAOqfXr2aM2xZK +GnhCCvJNFqe0IX+ZAYIjWBMaBTNZ2SJ61C9hM+4WncO0acekaMQ= +=+JKG +-----END PGP SIGNATURE----- diff --git a/SOURCES/libreoffice-help-6.3.5.2.tar.xz.asc b/SOURCES/libreoffice-help-6.3.5.2.tar.xz.asc deleted file mode 100644 index 4ce5c8d..0000000 --- a/SOURCES/libreoffice-help-6.3.5.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl5Cou0ACgkQ9DSh76/u -rqMrSw/9HftkvLOtAvzR0Es6JtodxFSI09fSjLy2rCMH5zb3hIVW3+ozc3cZe8ZK -6fH3KwRZFBSQtk2MAGGLMzgsLefOjzbHO5KtzxYPTX2/QpIIpzawVPYir6jxrvZd -vuKMpaSI5X7UuEWaqzx8uDuVB0uz1/b6hsgrY8+BdFOKdvRAT/I7Cf+3SMJe69e/ -EIKv9ioD0YXd0AlYjG2cHDOSEwp3W2ggoigYzPr+sAKc7laJluo/jR+XL6Zr89T4 -m28g6xM8AYPS1FxlRgzvNnGoOqD3RBZhGwnq5tshXY3w/IKAZhpTMHCPENi0ifiQ -bhNpSzfCGZLgfEXLvqpu6/Vz2xcijz5n452NJhnJYg+ztocpJqP15zktQ/KkviZq -yIPI2o2duIf7/94lGfLlowL8TemP5/uKrJWmLcvnPvfqSd+Bi+gBCi2LDxDbgH16 -AEqzsNrScGcg0uy3mXf1C9TCK9iSTijuOQROzChB9/stY6QT0MwuUdbmk3wKfP31 -lP1BMM8fIfofiQVmK+TdHmIJIQRuWJ6dDVR63fZUQx4ReUNpjZbxeix+2tOxev1p -y0tGzW88DKzj7YuEBbmyCTexXSrWovMdj81vjur/h9yeMVtDRe99T6/jOK1q3uwh -mAOPB5ErBOtnRrChi0IciQc+RYY1Hs1XkSzXR0HK5WLCMJL3bNI= -=2jXj ------END PGP SIGNATURE----- diff --git a/SOURCES/libreoffice-help-6.3.6.2.tar.xz.asc b/SOURCES/libreoffice-help-6.3.6.2.tar.xz.asc new file mode 100644 index 0000000..6fbb0e2 --- /dev/null +++ b/SOURCES/libreoffice-help-6.3.6.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl6gIGQACgkQ9DSh76/u +rqPMoQ/+OpSwyMQ5fy2eaJF+tVRJWroNZw/PmyXpwoinNX2EQNe6f6Nswej4u+YA +sYU1QCxmEMBY27LOli9Fa4ll5fAW2X8kThdxDiGPRs9+NMnZv7uEnf5eWvvjh9aT +BZLF01BOR798u+ympR6w+6xBRs5sPIqE4Lv7oOafAr5P9nEFAmR7aF9KiIQZWgcK +dUUBm8xhfXkd8/2uAFNJQg+SfMYgbipU18mImRorFwU27WLaNLCqrDTPbA76sdf/ +LvvXDJi8t49x+vvquWgOUND+96u/oESQhXveaRgXYLWUt+pFghw7E3P3BZPf6VOX +3hWngv9llNyFccgVMpvUqRSkwbG9TYnWPAXlyYEPF+E6JUe+n3D4UAWn8rJquf6F +ZdmHFNuqQR8XB8Vtc0fwsEu+l0MMg/OmF9R7oeYXx6orAe2WtnpLD45G6lxdoGDx +JVAPvNAq8ys8Hj8xoIO3AuXR/QHeNdxQi3/VXoC8hjfowhsRfvL4TmvT2TIE+/J6 +fTyOP1gKeI5aBTYHlIwwTFoPntlOLQ56Kck8YlZMQl6KdaUN1CJRdYjg36HPgXHg +cF9ZxR3rT4dxC8qmtnlAl8SWI37uvbiUM1IjyT9dmGSFBHPm5ph2dRaGeWWVE/Z3 +D3qdN2c0+AW7UXk4r0h5KVfFEvTBsbNUk2jPcup7sf3S8ZSXZ0o= +=+b1s +-----END PGP SIGNATURE----- diff --git a/SOURCES/libreoffice-translations-6.3.5.2.tar.xz.asc b/SOURCES/libreoffice-translations-6.3.5.2.tar.xz.asc deleted file mode 100644 index c08ce6e..0000000 --- a/SOURCES/libreoffice-translations-6.3.5.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl5Cou4ACgkQ9DSh76/u -rqPPHxAArwNpZTvjuFues+TCBj7lTO7wxKrBkKqdznps3Lp+Zrx2+57zP1dF5N+i -fb1IrrJk0swk5jxFztx0WQCv/a4sfxKEGPZWV+dOO9Cj0KXolkfpVHEph1TAHOos -hXLGS3mWRJvWZK5HgtL/jV/8n8eGphvZzcfZNlD6dR0UbvN9M79IscXPhKIWwNA+ -x3+7zf9AAnAPdx341ltpkKhCfhisgAXHKnlZNH6joJOG4GoIWa3dbVIqRFJ1Kzaf -sufm2jF9A09I4ETf4Wz3bcAfNDokPwC9EMN7nawx2T78DePAJM2j1jq/elbIQtNB -7I7kR7W+rxIwaOgJeNI4t4C5uhayWfEoeMf2tchuMRzYcvx4Z44ac4/jts7JbL/l -vrmck/wIkYNzlfvmsEwfUDtSeMOGIvX2SGsKIpk7MBGcBduUxIp+Ik77x1YH/h8X -ZQ8VIpafHe+izIctHsCxtqbO1wKdSIQ2lUWYqKZ7MPsDcq+ftmTZDYKO/2DZzy6R -a2aOn6ZXXqA1+eYq0YXD+F6LRr+8qxg++tGpeL8Fn8RPREhlPKHF6/cya1ZiU1Bt -w0aOnXL09YoXTzVB7H05TAQ/GtZwsG5wD1QxVStk66JxYF7P6QYh90EeOW6KWnE3 -yVVfC0cxYjFc8LzoHNyCQp7D+X1hqNuSuUM2eRWLraTHxXpR93w= -=cer4 ------END PGP SIGNATURE----- diff --git a/SOURCES/libreoffice-translations-6.3.6.2.tar.xz.asc b/SOURCES/libreoffice-translations-6.3.6.2.tar.xz.asc new file mode 100644 index 0000000..7c4deac --- /dev/null +++ b/SOURCES/libreoffice-translations-6.3.6.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl6gIGUACgkQ9DSh76/u +rqPyqQ/9GeLFssbtcXE3IO2ZJMTgRQZyfAZ3bP0kI8LG8vYXskHj+HQdpe0qg0ik +EKUZWh+gy37TTX88FhZqZ4FErZ67rSBAqW9yvq3+T17+bCSoxynEJzrDy2yhirru +XHhkDC1QO0n1aY2Fe7p/Qw0cb5jzxnPyIf55fOH0gwWTq/ZQiA+qRej8TMvTd1vW +zaOU9k4zd4rMxdaQg+WpOmwf/QuxK4jPbU9dB5dMFW7JxBYWjgplhH5DI4wVysvn +8S3LVgwKB5t0mMK0SAm5jAa9urIDdH9F1ZDnPSsngGQ0PmiSIQnRcfA7SbfZ4IIA +SehTcW0rNoqeCv6H+vOX5EIIVehtBun5bJXFZ/y9a3PHxPqDR0xtjF7H95a3+Vrq +Yf0/52MowGpgEwPgLWrdLJId0xdVymhKw5k4rZu5l5DEGS0PteGUJ7C50P+HMeAm +6RuP+CaSFW31+pEJMYCgMtmUK3s+ru9dj/rUdEDHXi5IUZQ8IEtCLou3Uwzs47Tb +kf2m3r9a9jQIhv5Cba2yAluhIbsKC2WmZbRzioPwnHV7ULUDy+E/Pz1tEQ0Vy4/M +Xed4RDoukZRy8VzsVqyneNOTMia22P1oy1xXtNzQ/CA+6vByQrByGTnt3ro3/frm +jwbFTSyuYgWuX0l++nxjt6dSVxwczouqFjR0UJU/dADnxsHqMc8= +=FOsh +-----END PGP SIGNATURE----- diff --git a/SPECS/libreoffice.spec b/SPECS/libreoffice.spec index 84fd119..5efcb68 100644 --- a/SPECS/libreoffice.spec +++ b/SPECS/libreoffice.spec @@ -3,7 +3,7 @@ %global _python_bytecompile_extra 1 # download path contains version without the last (fourth) digit -%global libo_version 6.3.5 +%global libo_version 6.3.6 # Should contain .alphaX / .betaX, if this is pre-release (actually # pre-RC) version. The pre-release string is part of tarball file names, # so we need a way to define it easily at one place. @@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 6%{?libo_prerelease}%{?dist} +Release: 1%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -241,11 +241,11 @@ Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch Patch3: 0001-rhbz-1775767-null-deref.patch Patch4: 0001-Adapt-SAL_WARN-to-C-20-deleted-ostream-for-sal_Unico.patch -Patch5: 0001-opengl-slide-transitions-not-working-with-glm-GLM-0..patch -Patch6: 0001-rhbz-1810732-crash-assert-inserting-document-with-in.patch -Patch7: 0001-selecting-multiple-slides-and-using-print.-doesn-t-s.patch -Patch8: 0001-spreadsheetml2ooo.xsl-was-not-well-formed-xml.patch -Patch9: 0001-AppendInfoBar-can-return-null.patch +Patch5: 0001-rhbz-1810732-crash-assert-inserting-document-with-in.patch +Patch6: 0001-AppendInfoBar-can-return-null.patch +Patch7: 0001-General-Internet-Error-dialog-appearing-on-gio-mount.patch +Patch8: 0001-rhbz-1820868-deref-of-null-xLayoutManager.patch +Patch9: 0001-Resolves-tdf-132288-don-t-merge-adjacent-properties-.patch %if 0%{?rhel} # not upstreamed @@ -2148,6 +2148,12 @@ done %{_includedir}/LibreOfficeKit %changelog +* Tue Apr 28 2020 Caolán McNamara - 1:6.3.6.2-1 +- rhbz#1796893 latest stable release + +* Tue Apr 14 2020 Caolán McNamara - 1:6.3.5.2-7 +- rhbz#1796893 don't show error dialog on G_IO_ERROR_FAILED_HANDLED + * Wed Apr 01 2020 Caolán McNamara - 1:6.3.5.2-6 - rhbz#1819798 Start Center crash after pressing Help button before using any topevel module