From 9001d8b519bdffb147cdd05b991621fb853bde778d4d8e52833976876853c9e5 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Thu, 7 Apr 2022 09:33:32 +0000 Subject: [PATCH] Accepting request 967376 from LibreOffice:7.3 - Fix bsc#1195881 - LO-L3: Bullets appear larger and green (instead of black) * bsc#1195881.patch - Fix bsc#1196212 - LO-L3: Text with tabs appears quite different in Impress than in PowerPoint * bsc1196212.patch * fix_gtk_popover_on_3.20.patch OBS-URL: https://build.opensuse.org/request/show/967376 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1008 --- bsc1195881.patch | 87 +++++++++++++++++++++++++++++++++++++++++++++ bsc1196212.patch | 23 ++++++++++++ libreoffice.changes | 15 +++++++- libreoffice.spec | 6 ++++ 4 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 bsc1195881.patch create mode 100644 bsc1196212.patch diff --git a/bsc1195881.patch b/bsc1195881.patch new file mode 100644 index 0000000..976d599 --- /dev/null +++ b/bsc1195881.patch @@ -0,0 +1,87 @@ +From e072e4149ffd4c07be1b6ded38e560f9cb635515 Mon Sep 17 00:00:00 2001 +From: Sarper Akdemir +Date: Wed, 30 Mar 2022 17:02:30 +0300 +Subject: [PATCH] tdf#148273 docx import: fix section break format leak to + bullets + +Fixes RES_PARATR_LIST_AUTOFMT leaking into the next section. + +Achieves this by resetting list related attributes on the cursor's +text node in DomainMapper_Impl::RemoveLastParagraph() after the +deletion of the paragraph. + +Change-Id: Ib4d09c5f190b8b8fd3bdc119ddd57d91f353de2f +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132324 +Tested-by: Jenkins +Reviewed-by: Miklos Vajna +--- +diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx +index db77b87481c3..579e1752508a 100644 +--- a/sw/inc/unoprnms.hxx ++++ b/sw/inc/unoprnms.hxx +@@ -502,6 +502,7 @@ + #define UNO_NAME_SEPARATOR_LINE_IS_ON "SeparatorLineIsOn" + #define UNO_NAME_IS_SKIP_HIDDEN_TEXT "IsSkipHiddenText" + #define UNO_NAME_IS_SKIP_PROTECTED_TEXT "IsSkipProtectedText" ++#define UNO_NAME_RESET_PARAGRAPH_LIST_ATTRIBUTES "ResetParagraphListAttributes" + #define UNO_NAME_DOCUMENT_INDEX_MARKS "DocumentIndexMarks" + #define UNO_NAME_FOOTNOTE_IS_COLLECT_AT_TEXT_END "FootnoteIsCollectAtTextEnd" + #define UNO_NAME_FOOTNOTE_IS_RESTART_NUMBERING "FootnoteIsRestartNumbering" +diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx +index 72376372fe2f..067daf3d25f4 100644 +--- a/sw/source/core/unocore/unoobj.cxx ++++ b/sw/source/core/unocore/unoobj.cxx +@@ -2118,6 +2118,15 @@ SwXTextCursor::setPropertyValue( + } + rUnoCursor.SetSkipOverProtectSections(bSet); + } ++ else if (rPropertyName == UNO_NAME_RESET_PARAGRAPH_LIST_ATTRIBUTES) ++ { ++ SwTextNode* pTextNode= GetPaM()->GetNode().GetTextNode(); ++ ++ if(pTextNode) ++ { ++ pTextNode->ResetAttr(RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END); ++ } ++ } + else + { + SwUnoCursorHelper::SetPropertyValue(rUnoCursor, +diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx +index f261538a0f19..22f2be927f8d 100644 +--- a/writerfilter/source/dmapper/DomainMapper.cxx ++++ b/writerfilter/source/dmapper/DomainMapper.cxx +@@ -3789,10 +3789,10 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) + static_cast(xContext.get())->SetListId(-1);; + xContext->Erase(PROP_NUMBERING_LEVEL); + } +- m_pImpl->SetParaSectpr(false); + finishParagraph(bRemove, bNoNumbering); + if (bRemove) + m_pImpl->RemoveLastParagraph(); ++ m_pImpl->SetParaSectpr(false); + } + else + { +diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx +index f8700faee88c..e3d6f4c41952 100644 +--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx ++++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx +@@ -717,6 +717,14 @@ void DomainMapper_Impl::RemoveLastParagraph( ) + // delete + xCursor->setString(OUString()); + ++ // While removing paragraphs that contain section properties, reset list ++ // related attributes to prevent them leaking into the following section's lists ++ if (GetParaSectpr()) ++ { ++ uno::Reference XCursorProps(xCursor, uno::UNO_QUERY); ++ XCursorProps->setPropertyValue("ResetParagraphListAttributes", uno::Any()); ++ } ++ + // call to xCursor->setString possibly did remove final bookmark + // from previous paragraph. We need to restore it, if there was any. + if (sLastBookmarkName.getLength()) +-- +2.34.1 + diff --git a/bsc1196212.patch b/bsc1196212.patch new file mode 100644 index 0000000..7160790 --- /dev/null +++ b/bsc1196212.patch @@ -0,0 +1,23 @@ +diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx +index 622d35c..b57b06b 100644 +--- a/sd/source/ui/docshell/docshel4.cxx ++++ b/sd/source/ui/docshell/docshel4.cxx +@@ -399,6 +399,18 @@ + mpDoc->SetSummationOfParagraphs(); + } + ++ if (aFilterName == "Impress MS PowerPoint 2007 XML" || ++ aFilterName == "Impress MS PowerPoint 2007 XML AutoPlay" || ++ aFilterName == "Impress MS PowerPoint 2007 XML VBA" || ++ aFilterName == "Impress Office Open XML") ++ { ++ // We need to be able to set the default tab size for each text object. ++ // This is possible at the moment only for the whole document. See ++ // TextParagraphPropertiesContext constructor. So default tab width ++ // of the LibreOffice is 1270 but MSO is 2540 on general settings. ++ mpDoc->SetDefaultTabulator( 2540 ); ++ } ++ + const bool bRet = SfxObjectShell::ImportFrom(rMedium, xInsertPosition); + + SfxItemSet* pSet = rMedium.GetItemSet(); diff --git a/libreoffice.changes b/libreoffice.changes index 6f38826..05d67d3 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 6 10:09:59 UTC 2022 - Andras Timar + +- Fix bsc#1195881 - LO-L3: Bullets appear larger and green (instead of black) + * bsc#1195881.patch + ------------------------------------------------------------------- Thu Mar 31 10:33:24 UTC 2022 - Danilo Spinella @@ -11,6 +17,13 @@ Thu Mar 31 10:33:24 UTC 2022 - Danilo Spinella You can find the complete release notes here: https://wiki.documentfoundation.org/Releases/7.3.2/RC2 +------------------------------------------------------------------- +Fri Mar 25 12:13:06 UTC 2022 - Andras Timar + +- Fix bsc#1196212 - LO-L3: Text with tabs appears quite different in + Impress than in PowerPoint + * bsc1196212.patch + ------------------------------------------------------------------- Fri Mar 25 11:45:21 UTC 2022 - Cor Blom @@ -35,7 +48,7 @@ Wed Mar 9 16:33:59 UTC 2022 - Danilo Spinella - Refresh patches: * 0001-Revert-java-9-changes.patch - * fix_gtk_popover_on_3.20.patch + * fix_gtk_popover_on_3.20.patch ------------------------------------------------------------------- Sat Mar 5 14:30:08 UTC 2022 - Bjørn Lie diff --git a/libreoffice.spec b/libreoffice.spec index 678fe85..1c2d97f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -105,6 +105,10 @@ Patch3: mediawiki-no-broken-help.diff Patch6: gcc11-fix-error.patch Patch9: fix_math_desktop_file.patch Patch10: fix_gtk_popover_on_3.20.patch +# Bug 1196212 - LO-L3: Text with tabs appears quite different in Impress than in PowerPoint +Patch11: bsc1196212.patch +# Bug 1195881 - LO-L3: Bullets appear larger and green (instead of black) +Patch12: bsc1195881.patch # Build with java 8 Patch101: 0001-Revert-java-9-changes.patch # try to save space by using hardlinks @@ -1014,6 +1018,8 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch3 %patch6 -p1 %patch9 -p1 +%patch11 -p1 +%patch12 -p1 %if 0%{?suse_version} < 1500 %patch10 -p1 %patch101 -p1