diff --git a/0001-Resolves-tdf-140250-don-t-share-adjustments-between-.patch b/0001-Resolves-tdf-140250-don-t-share-adjustments-between-.patch new file mode 100644 index 0000000..97e4abe --- /dev/null +++ b/0001-Resolves-tdf-140250-don-t-share-adjustments-between-.patch @@ -0,0 +1,123 @@ +From 197efb35e6f9661ecbeac2897d36a25bc2f6433e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Sun, 14 Nov 2021 14:59:38 +0000 +Subject: [PATCH] Resolves: tdf#140250 don't share adjustments between + differerent spinbuttons + +Change-Id: Ib684c746ff3176cf45ea9364efc12f2d6dde1f70 +--- + cui/uiconfig/ui/breaknumberoption.ui | 18 ++++++++++++++++-- + cui/uiconfig/ui/calloutpage.ui | 14 ++++++++++++-- + svx/uiconfig/ui/sidebareffect.ui | 7 ++++++- + 3 files changed, 34 insertions(+), 5 deletions(-) + +diff --git a/cui/uiconfig/ui/breaknumberoption.ui b/cui/uiconfig/ui/breaknumberoption.ui +index 2641babeeb5d..23fe294ec702 100644 +--- a/cui/uiconfig/ui/breaknumberoption.ui ++++ b/cui/uiconfig/ui/breaknumberoption.ui +@@ -9,6 +9,20 @@ + 1 + 10 + ++ ++ 2 ++ 9 ++ 1 ++ 1 ++ 10 ++ ++ ++ 2 ++ 9 ++ 1 ++ 1 ++ 10 ++ + + False + 6 +@@ -134,7 +148,7 @@ + True + start + True +- adjustment1 ++ adjustment2 + True + + +@@ -179,7 +193,7 @@ + True + start + True +- adjustment1 ++ adjustment3 + True + + +diff --git a/cui/uiconfig/ui/calloutpage.ui b/cui/uiconfig/ui/calloutpage.ui +index 87d4eff64eb4..00898dc3390c 100644 +--- a/cui/uiconfig/ui/calloutpage.ui ++++ b/cui/uiconfig/ui/calloutpage.ui +@@ -7,6 +7,16 @@ + 0.5 + 10 + ++ ++ 2400 ++ 0.5 ++ 10 ++ ++ ++ 2400 ++ 0.5 ++ 10 ++ + + True + False +@@ -231,7 +241,7 @@ + True + True + 0.00 +- adjustment1 ++ adjustment2 + 2 + True + +@@ -277,7 +287,7 @@ + True + True + 0.00 +- adjustment1 ++ adjustment3 + 2 + True + +diff --git a/svx/uiconfig/ui/sidebareffect.ui b/svx/uiconfig/ui/sidebareffect.ui +index 0e633242cd5c..1e041a2a8726 100644 +--- a/svx/uiconfig/ui/sidebareffect.ui ++++ b/svx/uiconfig/ui/sidebareffect.ui +@@ -12,6 +12,11 @@ + 1 + 10 + ++ ++ 150 ++ 1 ++ 10 ++ + + + True +@@ -195,7 +200,7 @@ + True + True + True +- adjustment1 ++ adjustment3 + + + 1 +-- +2.33.1 + diff --git a/0001-fix-comparison-when-searching-cache.patch b/0001-fix-comparison-when-searching-cache.patch new file mode 100644 index 0000000..2928de1 --- /dev/null +++ b/0001-fix-comparison-when-searching-cache.patch @@ -0,0 +1,40 @@ +From a94b58277c7aeaa83ce14347cd0b8f7137969d03 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= +Date: Fri, 29 Oct 2021 14:20:57 +0200 +Subject: [PATCH] fix comparison when searching cache +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This made the cache always fail and re-cache, making CJK text layout +slower over time. A mistake from ef513fd4b049b214a03fbe6e that +converted !strcmp() to != instead of ==. + +Change-Id: Ib70579cd36d7b1df062e4d067e03f5c65e34b142 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124432 +Reviewed-by: Noel Grandin +Reviewed-by: Luboš Luňák +Tested-by: Luboš Luňák +(cherry picked from commit 5b38b5744af1e896892df708c16b83e1b551d2c7) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124206 +Tested-by: Jenkins +--- + i18npool/source/breakiterator/xdictionary.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx +index 947a23c5073b..6b57433370c7 100644 +--- a/i18npool/source/breakiterator/xdictionary.cxx ++++ b/i18npool/source/breakiterator/xdictionary.cxx +@@ -152,7 +152,7 @@ void xdictionary::initDictionaryData(const char *pLang) + osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); + for(const datacache & i : aLoadedCache) + { +- if( i.maLang != pLang ) ++ if( i.maLang == pLang ) + { + data = i.maData; + return; +-- +2.33.1 + diff --git a/0001-tdf-121546-sw-don-t-use-undo-array-s-m_pOutlineNodes.patch b/0001-tdf-121546-sw-don-t-use-undo-array-s-m_pOutlineNodes.patch new file mode 100644 index 0000000..8840208 --- /dev/null +++ b/0001-tdf-121546-sw-don-t-use-undo-array-s-m_pOutlineNodes.patch @@ -0,0 +1,72 @@ +From bced744fea67d50242701ed55271d40e803ac14e Mon Sep 17 00:00:00 2001 +From: Michael Stahl +Date: Mon, 15 Nov 2021 17:29:59 +0100 +Subject: [PATCH] tdf#121546 sw: don't use undo array's m_pOutlineNodes + +It's pointless. + +Change-Id: I304c123bffc16e6133d2953bc9a4f7a3afad14ef +--- + sw/source/core/docnode/ndnum.cxx | 2 ++ + sw/source/core/docnode/nodes.cxx | 18 ++++++++++++------ + 2 files changed, 14 insertions(+), 6 deletions(-) + +diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx +index b3d66affa66e..a7b898ee5f0a 100644 +--- a/sw/source/core/docnode/ndnum.cxx ++++ b/sw/source/core/docnode/ndnum.cxx +@@ -38,6 +38,8 @@ bool SwOutlineNodes::Seek_Entry(SwNode* rP, size_type* pnPos) const + + void SwNodes::UpdateOutlineNode(SwNode & rNd) + { ++ assert(IsDocNodes()); // no point in m_pOutlineNodes for undo nodes ++ + SwTextNode * pTextNd = rNd.GetTextNode(); + + if (!(pTextNd && pTextNd->IsOutlineStateChanged())) +diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx +index a7a2078b2091..ab3eb62ac9f2 100644 +--- a/sw/source/core/docnode/nodes.cxx ++++ b/sw/source/core/docnode/nodes.cxx +@@ -109,6 +109,16 @@ SwNodes::~SwNodes() + m_pEndOfContent.reset(); + } + ++static bool IsInsertOutline(SwNodes const& rNodes, sal_uLong const nIndex) ++{ ++ if (!rNodes.IsDocNodes()) ++ { ++ return false; ++ } ++ return nIndex < rNodes.GetEndOfRedlines().StartOfSectionNode()->GetIndex() ++ || rNodes.GetEndOfRedlines().GetIndex() < nIndex; ++} ++ + void SwNodes::ChgNode( SwNodeIndex const & rDelPos, sal_uLong nSz, + SwNodeIndex& rInsPos, bool bNewFrames ) + { +@@ -124,9 +134,7 @@ void SwNodes::ChgNode( SwNodeIndex const & rDelPos, sal_uLong nSz, + + // NEVER include nodes from the RedLineArea + sal_uLong nNd = rInsPos.GetIndex(); +- bool bInsOutlineIdx = ( +- rNds.GetEndOfRedlines().StartOfSectionNode()->GetIndex() >= nNd || +- nNd >= rNds.GetEndOfRedlines().GetIndex() ); ++ bool const bInsOutlineIdx = IsInsertOutline(rNds, nNd); + + if( &rNds == this ) // if in the same node array -> move + { +@@ -478,9 +486,7 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, + + // NEVER include nodes from the RedLineArea + sal_uLong nNd = aIdx.GetIndex(); +- bool bInsOutlineIdx = ( rNodes.GetEndOfRedlines(). +- StartOfSectionNode()->GetIndex() >= nNd || +- nNd >= rNodes.GetEndOfRedlines().GetIndex() ); ++ bool const bInsOutlineIdx = IsInsertOutline(rNodes, nNd); + + if( bNewFrames ) + // delete all frames +-- +2.33.1 + diff --git a/libreoffice.spec b/libreoffice.spec index 27cb783..b7bfa67 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 2%{?libo_prerelease}%{?dist} +Release: 3%{?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/ @@ -260,6 +260,9 @@ Patch11: 0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch Patch12: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch Patch13: 0001-document-new-shouldn-t-get-prefixed-to-become-libreo.patch Patch14: 0001-Resolves-tdf-145567-restore-focus-to-the-usual-frame.patch +Patch15: 0001-Resolves-tdf-140250-don-t-share-adjustments-between-.patch +Patch16: 0001-fix-comparison-when-searching-cache.patch +Patch17: 0001-tdf-121546-sw-don-t-use-undo-array-s-m_pOutlineNodes.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch @@ -2246,6 +2249,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Mon Nov 22 2021 Caolán McNamara - 1:7.1.7.2-3 +- Resolves: rhbz2023185 merge in fedora 34 changes + * Mon Nov 08 2021 Caolán McNamara - 1:7.1.7.2-2 - Resolves: tdf#145567 restore start center focus to the right widget