diff --git a/0002-Revert-Require-HarfBuzz-5.1.0.patch b/0002-Revert-Require-HarfBuzz-5.1.0.patch index 7e100a8..f04eefb 100644 --- a/0002-Revert-Require-HarfBuzz-5.1.0.patch +++ b/0002-Revert-Require-HarfBuzz-5.1.0.patch @@ -11,10 +11,10 @@ This reverts commit cbdcc18778f9736ca6f186e2bbb9f0db456b1cee. vcl/source/gdi/CommonSalLayout.cxx | 9 +++++++-- 4 files changed, 21 insertions(+), 4 deletions(-) -Index: libreoffice-7.5.1.2/configure.ac +Index: libreoffice-7.5.3.2/configure.ac =================================================================== ---- libreoffice-7.5.1.2.orig/configure.ac -+++ libreoffice-7.5.1.2/configure.ac +--- libreoffice-7.5.3.2.orig/configure.ac ++++ libreoffice-7.5.3.2/configure.ac @@ -10848,7 +10848,7 @@ AC_SUBST(SYSTEM_LIBORCUS) dnl =================================================================== dnl HarfBuzz @@ -24,10 +24,10 @@ Index: libreoffice-7.5.1.2/configure.ac GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include -DGRAPHITE2_STATIC" GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite" -Index: libreoffice-7.5.1.2/vcl/inc/font/LogicalFontInstance.hxx +Index: libreoffice-7.5.3.2/vcl/inc/font/LogicalFontInstance.hxx =================================================================== ---- libreoffice-7.5.1.2.orig/vcl/inc/font/LogicalFontInstance.hxx -+++ libreoffice-7.5.1.2/vcl/inc/font/LogicalFontInstance.hxx +--- libreoffice-7.5.3.2.orig/vcl/inc/font/LogicalFontInstance.hxx ++++ libreoffice-7.5.3.2/vcl/inc/font/LogicalFontInstance.hxx @@ -156,8 +156,10 @@ private: // The value is initialized and used in NeedOffsetCorrection(). std::optional m_xeFontFamilyEnum; @@ -39,10 +39,10 @@ Index: libreoffice-7.5.1.2/vcl/inc/font/LogicalFontInstance.hxx }; inline hb_font_t* LogicalFontInstance::GetHbFont() -Index: libreoffice-7.5.1.2/vcl/source/font/LogicalFontInstance.cxx +Index: libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx =================================================================== ---- libreoffice-7.5.1.2.orig/vcl/source/font/LogicalFontInstance.cxx -+++ libreoffice-7.5.1.2/vcl/source/font/LogicalFontInstance.cxx +--- libreoffice-7.5.3.2.orig/vcl/source/font/LogicalFontInstance.cxx ++++ libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx @@ -54,8 +54,10 @@ LogicalFontInstance::~LogicalFontInstanc if (m_pHbFontUntransformed) hb_font_destroy(m_pHbFontUntransformed); @@ -105,9 +105,9 @@ Index: libreoffice-7.5.1.2/vcl/source/font/LogicalFontInstance.cxx if (!m_pHbDrawFuncs) { m_pHbDrawFuncs = hb_draw_funcs_create(); -@@ -308,6 +316,9 @@ bool LogicalFontInstance::GetGlyphOutlin - +@@ -312,6 +320,9 @@ bool LogicalFontInstance::GetGlyphOutlin hb_font_get_glyph_shape(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, &rPolyPoly); + #endif return true; +#else + return false; @@ -115,10 +115,10 @@ Index: libreoffice-7.5.1.2/vcl/source/font/LogicalFontInstance.cxx } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -Index: libreoffice-7.5.1.2/vcl/source/gdi/CommonSalLayout.cxx +Index: libreoffice-7.5.3.2/vcl/source/gdi/CommonSalLayout.cxx =================================================================== ---- libreoffice-7.5.1.2.orig/vcl/source/gdi/CommonSalLayout.cxx -+++ libreoffice-7.5.1.2/vcl/source/gdi/CommonSalLayout.cxx +--- libreoffice-7.5.3.2.orig/vcl/source/gdi/CommonSalLayout.cxx ++++ libreoffice-7.5.3.2/vcl/source/gdi/CommonSalLayout.cxx @@ -421,10 +421,10 @@ bool GenericSalLayout::LayoutText(vcl::t const int nRunLen = nEndRunPos - nMinRunPos; diff --git a/bsc1200085.patch b/bsc1200085.patch new file mode 100644 index 0000000..d787a43 --- /dev/null +++ b/bsc1200085.patch @@ -0,0 +1,741 @@ +From 016b7dc2d32f8165a22a07d1ff274426c3e07235 Mon Sep 17 00:00:00 2001 +From: Sarper Akdemir +Date: Tue, 21 Feb 2023 02:33:01 +0300 +Subject: [PATCH] related tdf#148966: rework sdr compatibility flags + +Rework access/set methods for sdr compatibility flags so it +is possible to address a compatibility flag without directly +interfacing with SdrModel. + +(preliminary work for exposing compatibility flags to +editeng) + +Change-Id: I2fab219f9e125151916228300be2d9d88156d8a6 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147407 +Tested-by: Jenkins +Reviewed-by: Miklos Vajna +--- + +Index: libreoffice-7.5.3.2/include/svx/compatflags.hxx +=================================================================== +--- /dev/null ++++ libreoffice-7.5.3.2/include/svx/compatflags.hxx +@@ -0,0 +1,18 @@ ++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ ++/* ++ * This file is part of the LibreOffice project. ++ * ++ * This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. ++ */ ++ ++/// SdrCompatibilityFlags that are implemented in SdrModelImpl ++enum class SdrCompatibilityFlag ++{ ++ AnchoredTextOverflowLegacy, ///< for tdf#99729 ++ LegacySingleLineFontwork, ///< for tdf#148000 ++ IgnoreBreakAfterMultilineField, ///< for tdf#148966 ++}; ++ ++/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ +Index: libreoffice-7.5.3.2/include/svx/svdmodel.hxx +=================================================================== +--- libreoffice-7.5.3.2.orig/include/svx/svdmodel.hxx ++++ libreoffice-7.5.3.2/include/svx/svdmodel.hxx +@@ -77,6 +77,7 @@ class SdrUndoFactory; + class ImageMap; + class TextChain; + enum class CharCompressType; ++enum class SdrCompatibilityFlag; + namespace comphelper + { + class IEmbeddedHelper; +@@ -571,13 +572,9 @@ public: + void SetAddExtLeading( bool bEnabled ); + bool IsAddExtLeading() const { return mbAddExtLeading; } + +- // tdf#99729 compatibility flag +- void SetAnchoredTextOverflowLegacy(bool bEnabled); +- bool IsAnchoredTextOverflowLegacy() const; +- +- // tdf#148000 compatibility flag +- void SetLegacySingleLineFontwork(bool bEnabled); +- bool IsLegacySingleLineFontwork() const; ++ void SetCompatibilityFlag(SdrCompatibilityFlag eFlag, bool bEnabled); ++ /// @returns state of the SdrCompatibilityFlag ++ bool GetCompatibilityFlag(SdrCompatibilityFlag eFlag) const; + + // tdf#149756 compatibility flag + void SetConnectorUseSnapRect(bool bEnabled); +Index: libreoffice-7.5.3.2/sc/source/ui/docshell/docsh.cxx +=================================================================== +--- libreoffice-7.5.3.2.orig/sc/source/ui/docshell/docsh.cxx ++++ libreoffice-7.5.3.2/sc/source/ui/docshell/docsh.cxx +@@ -77,6 +77,7 @@ + + #include + #include ++#include + #include + + #include +@@ -585,13 +586,16 @@ bool ScDocShell::Load( SfxMedium& rMediu + InitOptions(true); + + // If this is an ODF file being loaded, then by default, use legacy processing +- // for tdf#99729 (if required, it will be overridden in *::ReadUserDataSequence()) ++ // (if required, it will be overridden in *::ReadUserDataSequence()) + if (IsOwnStorageFormat(rMedium)) + { +- if (m_pDocument->GetDrawLayer()) +- m_pDocument->GetDrawLayer()->SetAnchoredTextOverflowLegacy(true); +- if (m_pDocument->GetDrawLayer()) +- m_pDocument->GetDrawLayer()->SetLegacySingleLineFontwork(true); //for tdf#148000 ++ if (ScDrawLayer* pDrawLayer = m_pDocument->GetDrawLayer()) ++ { ++ pDrawLayer->SetCompatibilityFlag(SdrCompatibilityFlag::AnchoredTextOverflowLegacy, ++ true); // for tdf#99729 ++ pDrawLayer->SetCompatibilityFlag(SdrCompatibilityFlag::LegacySingleLineFontwork, ++ true); // for tdf#148000 ++ } + } + + GetUndoManager()->Clear(); +Index: libreoffice-7.5.3.2/sd/source/ui/docshell/docshel4.cxx +=================================================================== +--- libreoffice-7.5.3.2.orig/sd/source/ui/docshell/docshel4.cxx ++++ libreoffice-7.5.3.2/sd/source/ui/docshell/docshel4.cxx +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -265,11 +266,11 @@ bool DrawDocShell::InitNew( const css::u + bool DrawDocShell::Load( SfxMedium& rMedium ) + { + // If this is an ODF file being loaded, then by default, use legacy processing +- // for tdf#99729 (if required, it will be overridden in *::ReadUserDataSequence()) ++ // (if required, it will be overridden in *::ReadUserDataSequence()) + if (IsOwnStorageFormat(rMedium)) + { +- mpDoc->SetAnchoredTextOverflowLegacy(true); +- mpDoc->SetLegacySingleLineFontwork(true); //for tdf#148000 ++ mpDoc->SetCompatibilityFlag(SdrCompatibilityFlag::AnchoredTextOverflowLegacy, true); // for tdf#99729 ++ mpDoc->SetCompatibilityFlag(SdrCompatibilityFlag::LegacySingleLineFontwork, true); // for tdf#148000 + } + + bool bRet = false; +@@ -410,6 +411,12 @@ bool DrawDocShell::ImportFrom(SfxMedium + mpDoc->SetConnectorUseSnapRect(true); + } + ++ if (aFilterName == "Impress MS PowerPoint 2007 XML") ++ { ++ // compatibility flag for tdf#148966 ++ mpDoc->SetCompatibilityFlag(SdrCompatibilityFlag::IgnoreBreakAfterMultilineField, true); ++ } ++ + if (aFilterName == "Impress MS PowerPoint 2007 XML" || + aFilterName == "Impress MS PowerPoint 2007 XML AutoPlay" || + aFilterName == "Impress MS PowerPoint 2007 XML VBA" || +Index: libreoffice-7.5.3.2/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +=================================================================== +--- libreoffice-7.5.3.2.orig/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx ++++ libreoffice-7.5.3.2/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +@@ -19,6 +19,7 @@ + + #include "EnhancedCustomShapeFontWork.hxx" + #include ++#include + #include + #include + #include +@@ -133,7 +134,8 @@ static bool InitializeFontWorkData( + do + { + // search line break. +- if (!rSdrObjCustomShape.getSdrModelFromSdrObject().IsLegacySingleLineFontwork()) ++ if (!rSdrObjCustomShape.getSdrModelFromSdrObject().GetCompatibilityFlag( ++ SdrCompatibilityFlag::LegacySingleLineFontwork)) + nPos = aParaText[nPara].indexOf(sal_Unicode(u'\1'), nPrevPos); + else + nPos = -1; // tdf#148000: ignore line breaks in legacy fontworks +Index: libreoffice-7.5.3.2/svx/source/svdraw/svdmodel.cxx +=================================================================== +--- libreoffice-7.5.3.2.orig/svx/source/svdraw/svdmodel.cxx ++++ libreoffice-7.5.3.2/svx/source/svdraw/svdmodel.cxx +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -85,6 +86,7 @@ struct SdrModelImpl + bool mbAnchoredTextOverflowLegacy; // tdf#99729 compatibility flag + bool mbLegacySingleLineFontwork; // tdf#148000 compatibility flag + bool mbConnectorUseSnapRect; // tdf#149756 compatibility flag ++ bool mbIgnoreBreakAfterMultilineField; ///< tdf#148966 compatibility flag + std::unique_ptr mpTheme; + + SdrModelImpl() +@@ -93,6 +95,7 @@ struct SdrModelImpl + , mbAnchoredTextOverflowLegacy(false) + , mbLegacySingleLineFontwork(false) + , mbConnectorUseSnapRect(false) ++ , mbIgnoreBreakAfterMultilineField(false) + {} + }; + +@@ -1715,24 +1718,35 @@ void SdrModel::SetAddExtLeading( bool bE + } + } + +-void SdrModel::SetAnchoredTextOverflowLegacy(bool bEnabled) ++void SdrModel::SetCompatibilityFlag(SdrCompatibilityFlag eFlag, bool bEnabled) + { +- mpImpl->mbAnchoredTextOverflowLegacy = bEnabled; +-} +- +-bool SdrModel::IsAnchoredTextOverflowLegacy() const +-{ +- return mpImpl->mbAnchoredTextOverflowLegacy; +-} +- +-void SdrModel::SetLegacySingleLineFontwork(bool bEnabled) +-{ +- mpImpl->mbLegacySingleLineFontwork = bEnabled; ++ switch (eFlag) ++ { ++ case SdrCompatibilityFlag::AnchoredTextOverflowLegacy: ++ mpImpl->mbAnchoredTextOverflowLegacy = bEnabled; ++ break; ++ case SdrCompatibilityFlag::LegacySingleLineFontwork: ++ mpImpl->mbLegacySingleLineFontwork = bEnabled; ++ break; ++ case SdrCompatibilityFlag::IgnoreBreakAfterMultilineField: ++ mpImpl->mbIgnoreBreakAfterMultilineField = bEnabled; ++ break; ++ } + } + +-bool SdrModel::IsLegacySingleLineFontwork() const ++bool SdrModel::GetCompatibilityFlag(SdrCompatibilityFlag eFlag) const + { +- return mpImpl->mbLegacySingleLineFontwork; ++ switch (eFlag) ++ { ++ case SdrCompatibilityFlag::AnchoredTextOverflowLegacy: ++ return mpImpl->mbAnchoredTextOverflowLegacy; ++ case SdrCompatibilityFlag::LegacySingleLineFontwork: ++ return mpImpl->mbLegacySingleLineFontwork; ++ case SdrCompatibilityFlag::IgnoreBreakAfterMultilineField: ++ return mpImpl->mbIgnoreBreakAfterMultilineField; ++ default: ++ return false; ++ } + } + + void SdrModel::SetConnectorUseSnapRect(bool bEnabled) +@@ -1822,6 +1836,14 @@ void SdrModel::ReadUserDataSequenceValue + } + } + } ++ else if (pValue->Name == "IgnoreBreakAfterMultilineField") ++ { ++ bool bBool = false; ++ if (pValue->Value >>= bBool) ++ { ++ mpImpl->mbIgnoreBreakAfterMultilineField = bBool; ++ } ++ } + } + + template +@@ -1833,8 +1855,12 @@ static void addPair(std::vector< std::pa + void SdrModel::WriteUserDataSequence(uno::Sequence & rValues) + { + std::vector< std::pair< OUString, uno::Any > > aUserData; +- addPair(aUserData, "AnchoredTextOverflowLegacy", IsAnchoredTextOverflowLegacy()); +- addPair(aUserData, "LegacySingleLineFontwork", IsLegacySingleLineFontwork()); ++ addPair(aUserData, "AnchoredTextOverflowLegacy", ++ GetCompatibilityFlag(SdrCompatibilityFlag::AnchoredTextOverflowLegacy)); ++ addPair(aUserData, "LegacySingleLineFontwork", ++ GetCompatibilityFlag(SdrCompatibilityFlag::LegacySingleLineFontwork)); ++ addPair(aUserData, "IgnoreBreakAfterMultilineField", ++ GetCompatibilityFlag(SdrCompatibilityFlag::IgnoreBreakAfterMultilineField)); + addPair(aUserData, "ConnectorUseSnapRect", IsConnectorUseSnapRect()); + + const sal_Int32 nOldLength = rValues.getLength(); +Index: libreoffice-7.5.3.2/svx/source/svdraw/svdoedge.cxx +=================================================================== +--- libreoffice-7.5.3.2.orig/svx/source/svdraw/svdoedge.cxx ++++ libreoffice-7.5.3.2/svx/source/svdraw/svdoedge.cxx +@@ -27,6 +27,7 @@ + + #include + #include ++#include + #include + #include + #include +Index: libreoffice-7.5.3.2/svx/source/svdraw/svdotextdecomposition.cxx +=================================================================== +--- libreoffice-7.5.3.2.orig/svx/source/svdraw/svdotextdecomposition.cxx ++++ libreoffice-7.5.3.2/svx/source/svdraw/svdotextdecomposition.cxx +@@ -17,7 +17,7 @@ + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +- ++#include + #include + #include + #include +@@ -1021,7 +1021,8 @@ void SdrTextObj::impDecomposeBlockTextPr + bool bAllowGrowHorizontal = bVerticalWriting; + + // Compatibility mode for tdf#99729 +- if (getSdrModelFromSdrObject().IsAnchoredTextOverflowLegacy()) ++ if (getSdrModelFromSdrObject().GetCompatibilityFlag( ++ SdrCompatibilityFlag::AnchoredTextOverflowLegacy)) + { + bAllowGrowVertical = bHorizontalIsBlock; + bAllowGrowHorizontal = bVerticalIsBlock; +Index: libreoffice-7.5.3.2/sw/source/uibase/app/docshini.cxx +=================================================================== +--- libreoffice-7.5.3.2.orig/sw/source/uibase/app/docshini.cxx ++++ libreoffice-7.5.3.2/sw/source/uibase/app/docshini.cxx +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -479,8 +480,10 @@ bool SwDocShell::Load( SfxMedium& rMedi + SwDrawModel* pDrawModel = m_xDoc->getIDocumentDrawModelAccess().GetDrawModel(); + if (pDrawModel) + { +- pDrawModel->SetAnchoredTextOverflowLegacy(true); // legacy processing for tdf#99729 +- pDrawModel->SetLegacySingleLineFontwork(true); // legacy processing for tdf#148000 ++ pDrawModel->SetCompatibilityFlag(SdrCompatibilityFlag::AnchoredTextOverflowLegacy, ++ true); // legacy processing for tdf#99729 ++ pDrawModel->SetCompatibilityFlag(SdrCompatibilityFlag::LegacySingleLineFontwork, ++ true); // legacy processing for tdf#148000 + } + } + +Index: libreoffice-7.5.3.2/editeng/inc/outleeng.hxx +=================================================================== +--- /dev/null ++++ libreoffice-7.5.3.2/editeng/inc/outleeng.hxx +@@ -0,0 +1,90 @@ ++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ++ * This file is part of the LibreOffice project. ++ * ++ * This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. ++ * ++ * This file incorporates work covered by the following license notice: ++ * ++ * Licensed to the Apache Software Foundation (ASF) under one or more ++ * contributor license agreements. See the NOTICE file distributed ++ * with this work for additional information regarding copyright ++ * ownership. The ASF licenses this file to you under the Apache ++ * License, Version 2.0 (the "License"); you may not use this file ++ * except in compliance with the License. You may obtain a copy of ++ * the License at http://www.apache.org/licenses/LICENSE-2.0 . ++ */ ++#pragma once ++ ++#include ++#include ++ ++enum class SdrCompatibilityFlag; ++ ++typedef std::vector NotifyList; ++ ++class OutlinerEditEng : public EditEngine ++{ ++ Outliner* pOwner; ++ ++protected: ++ ++ // derived from EditEngine. Allows Outliner objects to provide ++ // bullet access to the EditEngine. ++ virtual const SvxNumberFormat* GetNumberFormat( sal_Int32 nPara ) const override; ++ ++public: ++ OutlinerEditEng( Outliner* pOwner, SfxItemPool* pPool ); ++ virtual ~OutlinerEditEng() override; ++ ++ virtual void PaintingFirstLine(sal_Int32 nPara, const Point& rStartPos, const Point& rOrigin, Degree10 nOrientation, OutputDevice& rOutDev) override; ++ ++ virtual void ParagraphInserted( sal_Int32 nNewParagraph ) override; ++ virtual void ParagraphDeleted( sal_Int32 nDeletedParagraph ) override; ++ virtual void ParagraphConnected( sal_Int32 nLeftParagraph, sal_Int32 nRightParagraph ) override; ++ ++ virtual void DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, ++ sal_Int32 nTextLen, o3tl::span pDXArray, ++ o3tl::span pKashidaArray, const SvxFont& rFont, ++ sal_Int32 nPara, sal_uInt8 nRightToLeft, ++ const EEngineData::WrongSpellVector* pWrongSpellVector, ++ const SvxFieldData* pFieldData, ++ bool bEndOfLine, ++ bool bEndOfParagraph, ++ const css::lang::Locale* pLocale, ++ const Color& rOverlineColor, ++ const Color& rTextLineColor) override; ++ ++ virtual void DrawingTab( ++ const Point& rStartPos, tools::Long nWidth, const OUString& rChar, ++ const SvxFont& rFont, sal_Int32 nPara, sal_uInt8 nRightToLeft, ++ bool bEndOfLine, ++ bool bEndOfParagraph, ++ const Color& rOverlineColor, ++ const Color& rTextLineColor) override; ++ ++ virtual void StyleSheetChanged( SfxStyleSheet* pStyle ) override; ++ virtual void ParaAttribsChanged( sal_Int32 nPara ) override; ++ virtual bool SpellNextDocument() override; ++ virtual OUString GetUndoComment( sal_uInt16 nUndoId ) const override; ++ ++ // for text conversion ++ virtual bool ConvertNextDocument() override; ++ ++ virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, std::optional& rTxtColor, std::optional& rFldColor ) override; ++ ++ virtual tools::Rectangle GetBulletArea( sal_Int32 nPara ) override; ++ ++ /// @returns state of the SdrCompatibilityFlag ++ std::optional GetCompatFlag(SdrCompatibilityFlag eFlag) const; ++ ++ virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) override; ++ ++ // belongs into class Outliner, move there before incompatible update! ++ Link aOutlinerNotifyHdl; ++ NotifyList aNotifyCache; ++}; ++ ++/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +Index: libreoffice-7.5.3.2/editeng/source/editeng/impedit3.cxx +=================================================================== +--- libreoffice-7.5.3.2.orig/editeng/source/editeng/impedit3.cxx ++++ libreoffice-7.5.3.2/editeng/source/editeng/impedit3.cxx +@@ -24,6 +24,7 @@ + #include + #include + ++#include + #include + #include + #include +@@ -44,11 +45,14 @@ + #include + #include + #include ++#include + + #include + #include + #include + ++#include ++ + #include + #include + +@@ -3606,6 +3610,22 @@ void ImpEditEngine::Paint( OutputDevice& + nTextStart = *curIt; + nTextLen = nTextLen - nTextStart; + bParsingFields = false; ++ ++ if (nLine + 1 < nLines) ++ { ++ // tdf#148966 don't paint the line break following a ++ // multiline field based on a compat flag ++ OutlinerEditEng* pOutlEditEng{ dynamic_cast(pEditEngine) }; ++ if (pOutlEditEng ++ && pOutlEditEng->GetCompatFlag(SdrCompatibilityFlag::IgnoreBreakAfterMultilineField) ++ .value_or(false)) ++ { ++ int nStartNextLine = pPortion->GetLines()[nLine + 1].GetStartPortion(); ++ const TextPortion& rNextTextPortion = pPortion->GetTextPortions()[nStartNextLine]; ++ if (rNextTextPortion.GetKind() == PortionKind::LINEBREAK) ++ ++nLine; //ignore the following linebreak ++ } ++ } + } + } + +Index: libreoffice-7.5.3.2/editeng/source/outliner/outleeng.cxx +=================================================================== +--- libreoffice-7.5.3.2.orig/editeng/source/outliner/outleeng.cxx ++++ libreoffice-7.5.3.2/editeng/source/outliner/outleeng.cxx +@@ -21,9 +21,10 @@ + #include + + #include +-#include "outleeng.hxx" ++#include + #include "paralist.hxx" + #include ++#include + #include + #include + #include "outlundo.hxx" +@@ -69,6 +70,15 @@ tools::Rectangle OutlinerEditEng::GetBul + return aBulletArea; + } + ++std::optional OutlinerEditEng::GetCompatFlag(SdrCompatibilityFlag eFlag) const ++{ ++ if(pOwner) ++ { ++ return pOwner->GetCompatFlag(eFlag); ++ } ++ return {}; ++} ++ + void OutlinerEditEng::ParagraphInserted( sal_Int32 nNewParagraph ) + { + pOwner->ParagraphInserted( nNewParagraph ); +Index: libreoffice-7.5.3.2/editeng/source/outliner/outleeng.hxx +=================================================================== +--- libreoffice-7.5.3.2.orig/editeng/source/outliner/outleeng.hxx ++++ /dev/null +@@ -1,85 +0,0 @@ +-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +-/* +- * This file is part of the LibreOffice project. +- * +- * This Source Code Form is subject to the terms of the Mozilla Public +- * License, v. 2.0. If a copy of the MPL was not distributed with this +- * file, You can obtain one at http://mozilla.org/MPL/2.0/. +- * +- * This file incorporates work covered by the following license notice: +- * +- * Licensed to the Apache Software Foundation (ASF) under one or more +- * contributor license agreements. See the NOTICE file distributed +- * with this work for additional information regarding copyright +- * ownership. The ASF licenses this file to you under the Apache +- * License, Version 2.0 (the "License"); you may not use this file +- * except in compliance with the License. You may obtain a copy of +- * the License at http://www.apache.org/licenses/LICENSE-2.0 . +- */ +-#pragma once +- +-#include +-#include +- +-typedef std::vector NotifyList; +- +-class OutlinerEditEng : public EditEngine +-{ +- Outliner* pOwner; +- +-protected: +- +- // derived from EditEngine. Allows Outliner objects to provide +- // bullet access to the EditEngine. +- virtual const SvxNumberFormat* GetNumberFormat( sal_Int32 nPara ) const override; +- +-public: +- OutlinerEditEng( Outliner* pOwner, SfxItemPool* pPool ); +- virtual ~OutlinerEditEng() override; +- +- virtual void PaintingFirstLine(sal_Int32 nPara, const Point& rStartPos, const Point& rOrigin, Degree10 nOrientation, OutputDevice& rOutDev) override; +- +- virtual void ParagraphInserted( sal_Int32 nNewParagraph ) override; +- virtual void ParagraphDeleted( sal_Int32 nDeletedParagraph ) override; +- virtual void ParagraphConnected( sal_Int32 nLeftParagraph, sal_Int32 nRightParagraph ) override; +- +- virtual void DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, +- sal_Int32 nTextLen, o3tl::span pDXArray, +- o3tl::span pKashidaArray, const SvxFont& rFont, +- sal_Int32 nPara, sal_uInt8 nRightToLeft, +- const EEngineData::WrongSpellVector* pWrongSpellVector, +- const SvxFieldData* pFieldData, +- bool bEndOfLine, +- bool bEndOfParagraph, +- const css::lang::Locale* pLocale, +- const Color& rOverlineColor, +- const Color& rTextLineColor) override; +- +- virtual void DrawingTab( +- const Point& rStartPos, tools::Long nWidth, const OUString& rChar, +- const SvxFont& rFont, sal_Int32 nPara, sal_uInt8 nRightToLeft, +- bool bEndOfLine, +- bool bEndOfParagraph, +- const Color& rOverlineColor, +- const Color& rTextLineColor) override; +- +- virtual void StyleSheetChanged( SfxStyleSheet* pStyle ) override; +- virtual void ParaAttribsChanged( sal_Int32 nPara ) override; +- virtual bool SpellNextDocument() override; +- virtual OUString GetUndoComment( sal_uInt16 nUndoId ) const override; +- +- // for text conversion +- virtual bool ConvertNextDocument() override; +- +- virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, std::optional& rTxtColor, std::optional& rFldColor ) override; +- +- virtual tools::Rectangle GetBulletArea( sal_Int32 nPara ) override; +- +- virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) override; +- +- // belongs into class Outliner, move there before incompatible update! +- Link aOutlinerNotifyHdl; +- NotifyList aNotifyCache; +-}; +- +-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +Index: libreoffice-7.5.3.2/editeng/source/outliner/outlin2.cxx +=================================================================== +--- libreoffice-7.5.3.2.orig/editeng/source/outliner/outlin2.cxx ++++ libreoffice-7.5.3.2/editeng/source/outliner/outlin2.cxx +@@ -30,7 +30,7 @@ + + #include + #include "paralist.hxx" +-#include "outleeng.hxx" ++#include + #include + + +Index: libreoffice-7.5.3.2/editeng/source/outliner/outliner.cxx +=================================================================== +--- libreoffice-7.5.3.2.orig/editeng/source/outliner/outliner.cxx ++++ libreoffice-7.5.3.2/editeng/source/outliner/outliner.cxx +@@ -30,7 +30,7 @@ + #include + #include "paralist.hxx" + #include +-#include "outleeng.hxx" ++#include + #include "outlundo.hxx" + #include + #include +Index: libreoffice-7.5.3.2/editeng/source/outliner/outlvw.cxx +=================================================================== +--- libreoffice-7.5.3.2.orig/editeng/source/outliner/outlvw.cxx ++++ libreoffice-7.5.3.2/editeng/source/outliner/outlvw.cxx +@@ -30,7 +30,7 @@ + #include + + #include +-#include "outleeng.hxx" ++#include + #include "paralist.hxx" + #include "outlundo.hxx" + #include +Index: libreoffice-7.5.3.2/include/editeng/outliner.hxx +=================================================================== +--- libreoffice-7.5.3.2.orig/include/editeng/outliner.hxx ++++ libreoffice-7.5.3.2/include/editeng/outliner.hxx +@@ -77,6 +77,7 @@ class SvxFieldData; + enum class PointerStyle; + class SvxNumRule; + enum class TextRotation; ++enum class SdrCompatibilityFlag; + + namespace com::sun::star::linguistic2 { + class XSpellChecker1; +@@ -987,6 +988,9 @@ public: + + // convenient method to determine the bullets/numbering status for all paragraphs + sal_Int32 GetBulletsNumberingStatus() const; ++ ++ // overriden in SdrOutliner ++ virtual std::optional GetCompatFlag(SdrCompatibilityFlag /*eFlag*/) const { return {}; }; + }; + + #endif +Index: libreoffice-7.5.3.2/include/svx/svdoutl.hxx +=================================================================== +--- libreoffice-7.5.3.2.orig/include/svx/svdoutl.hxx ++++ libreoffice-7.5.3.2/include/svx/svdoutl.hxx +@@ -20,11 +20,13 @@ + #pragma once + + #include ++#include + #include + #include + + class SdrTextObj; + class SdrPage; ++enum class SdrCompatibilityFlag; + + class SVXCORE_DLLPUBLIC SdrOutliner : public Outliner + { +@@ -45,6 +47,9 @@ public: + virtual OUString CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, std::optional& rpTxtColor, std::optional& rpFldColor) override; + + bool hasEditViewCallbacks() const; ++ ++ /// @returns state of the SdrCompatibilityFlag ++ virtual std::optional GetCompatFlag(SdrCompatibilityFlag eFlag) const override; + }; + + +Index: libreoffice-7.5.3.2/solenv/clang-format/excludelist +=================================================================== +--- libreoffice-7.5.3.2.orig/solenv/clang-format/excludelist ++++ libreoffice-7.5.3.2/solenv/clang-format/excludelist +@@ -3397,6 +3397,7 @@ editeng/inc/editattr.hxx + editeng/inc/editdoc.hxx + editeng/inc/edtspell.hxx + editeng/inc/eerdll2.hxx ++editeng/inc/outleeng.hxx + editeng/inc/unomodel.hxx + editeng/qa/items/borderline_test.cxx + editeng/qa/lookuptree/lookuptree_test.cxx +@@ -3475,7 +3476,6 @@ editeng/source/misc/swafopt.cxx + editeng/source/misc/txtrange.cxx + editeng/source/misc/unolingu.cxx + editeng/source/outliner/outleeng.cxx +-editeng/source/outliner/outleeng.hxx + editeng/source/outliner/outlin2.cxx + editeng/source/outliner/outliner.cxx + editeng/source/outliner/outlobj.cxx +Index: libreoffice-7.5.3.2/svx/source/svdraw/svdoutl.cxx +=================================================================== +--- libreoffice-7.5.3.2.orig/svx/source/svdraw/svdoutl.cxx ++++ libreoffice-7.5.3.2/svx/source/svdraw/svdoutl.cxx +@@ -17,9 +17,12 @@ + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + ++#include + #include + #include ++#include + #include ++#include + #include + #include + #include +@@ -104,4 +107,13 @@ bool SdrOutliner::hasEditViewCallbacks() + return false; + } + ++std::optional SdrOutliner::GetCompatFlag(SdrCompatibilityFlag eFlag) const ++{ ++ if( mpVisualizedPage ) ++ { ++ return {mpVisualizedPage->getSdrModelFromSdrPage().GetCompatibilityFlag(eFlag)}; ++ } ++ return {}; ++} ++ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/libreoffice-7.5.3.1.tar.xz b/libreoffice-7.5.3.1.tar.xz deleted file mode 100644 index 232d4b8..0000000 --- a/libreoffice-7.5.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c39eab83534859c615a234b663be1715e809c1b4ffc94dbbf296f0b8df2df6bb -size 269854912 diff --git a/libreoffice-7.5.3.1.tar.xz.asc b/libreoffice-7.5.3.1.tar.xz.asc deleted file mode 100644 index 386198b..0000000 --- a/libreoffice-7.5.3.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmQ4Up0ACgkQ9DSh76/u -rqNNrhAAyUJeoO0d88diOvERbje07Z24nEzSCQb1Zl+E3JDwgKnMfrJqoIjTUhLy -WELn17x7XV113RMPqoiqHJKnZT/35in3pKKzvYhQ3EwMzfUxWRaouD1Axxi4UHm6 -Vjo68KKvK7zOPPJXhwYEXkjDpXUXezSBsvgH7zrGZvstfmMHpLzOpUlnM32a7GRg -o0Yn4zNiVb5RKcb1nncA1Lk68m1m9UPMnGAbJrnIUHnCJ6IfPfww9HDYdQYs4Knu -6uEPNL4Ik7ePm1QzgUqICIOOZZ1ZbSTbzAH0AmR9RgBqr/9XIGG+uWrnLrO7yaak -yn6kaQJGnxs/oCoEQeBOXbvwi7VAckF6DAG5l5G5dieqwzokDwYn/xPSRyhAazvc -igM3FVkhVQ7en7M+mx2uV0fFaiFr6cTrvd3Xv11ST0x8cNA9MCVKAL15ZE9w3vuu -ijVPN9vSoZSvifee/iDahLvb2JYy86g54y6MxkfKHHHIU5S/VzBSSGUlZnQD1PyD -bLjFhVxiW3zjZHZhnPXiCodwgJuZiPeE8PL1PaDhpiqe+kvYIvw1rsNxzBB3IpNB -0MPh9LcrR7ZtSRct+cWbg0aPMg6H9LRfBwLpyhhHFjwy60q676uXefyM1O99pLvw -+Kb7eqqW91BDPjwAfzVR3HwY01Js+OckAaa0Caeb3iqWlHVpxWY= -=+YvO ------END PGP SIGNATURE----- diff --git a/libreoffice-7.5.3.2.tar.xz b/libreoffice-7.5.3.2.tar.xz new file mode 100644 index 0000000..2b0d252 --- /dev/null +++ b/libreoffice-7.5.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14367aeed3a8ae01e17438679d93c4905ca7f9d2f2cb99e716ea297b8af2e048 +size 269840284 diff --git a/libreoffice-7.5.3.2.tar.xz.asc b/libreoffice-7.5.3.2.tar.xz.asc new file mode 100644 index 0000000..989ad9a --- /dev/null +++ b/libreoffice-7.5.3.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmRK22kACgkQ9DSh76/u +rqPtrw/8CCc/kvlUIGEzO4ipNCnjxyBx7Uf+FqbdGXnZMNOvhCsCa0ANR54yBgdo +dswa8oWHv0Uc1aOu2AHnbwfVoxWgSwZA9kNJJsgmj9vF3rqYtL0TEZZPY+tJ5eCn +ydpbKWqoMEPdiHO5WruY4yTftGR6jZt8Ey1hf0J/trQ59MHS4sa5RM0PITzq2UeM +UjsAsPwzSla55iYLeI4Z0laK+S6Lq0/CRW7+4YrwsaGKRNm4WBqAi5XtkenZSWuv +2y0tNeaZDAWfMluCs9DRBJ87OqYzPkjH5d0em3EGKpkLlotdYVpyPcYAg5prXyu1 +liH1mLRrG2iBHaQoIuI8N907K2RMny9Z6D38fJHL/OvGyVulO/zdKgm3tsR3beEC +Vy8AD5K+bn5aQvBe6SSf9ekt5o8dYM/v7X886TXEFXhADemYduSwFSPKLa1VYM/K +5SFyR/+gCis000VM8QXL1HRg8tu4NoP5adKmP/j5RY3Qutg9fnn7teH0RQ+Y8ij8 +uDUxrtVSsbRcmGjDbYEZ9Qwpq7DLmTD1kJRjJdwSxRF8bSxlOaIcDxRgsIlN1fbZ +UNChIR2vA54GkzmDRr085dtqsv0ksImJdvHiOll1LcTbNDQrQHX1fJkHZJO9aH1r +dLmnRmtc+HGKoDchmAVYiAb3bjEoONs2kQC9N5zjV1PVkKi3Ja8= +=NmhR +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-7.5.3.1.tar.xz b/libreoffice-help-7.5.3.1.tar.xz deleted file mode 100644 index 4d2bfd6..0000000 --- a/libreoffice-help-7.5.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:380f2ef2074e7e405630ca1aac5d97580e59ebcaf78f6365dbb2aeac1af70e66 -size 166238428 diff --git a/libreoffice-help-7.5.3.1.tar.xz.asc b/libreoffice-help-7.5.3.1.tar.xz.asc deleted file mode 100644 index 9e4610f..0000000 --- a/libreoffice-help-7.5.3.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmQ4UqIACgkQ9DSh76/u -rqMOyQ//WGg1527mSiXFdInDhapOJ7oXryXHNDND6wFd2T0Hga7+L5WD+ZJfSbNA -MrTQVzUHLYfSlPbMLOBli2e50r5fmcouB1Hfd7blgjQwYIZyivLEAOmhcHAC2Uby -urKGil6TcZE45AwzUWhzW2K+Eov6dLlyfyFE7ImK4Xv7wClUL5Ncx6a9J9XkABGI -TPaXSdhYQ0rlU77rOrY0RdumlHThcep181S1x8IsCQpnwtOo4kqT0qnJdCQwQiDG -WfMa/VJr7SW4nVbg1AH+rR4K/yFkHt4KeZf+Z55KO22bTZxA9r7n+ni+uMJt1aqs -cE8aorJk+IMNVeLzoODX3eGnI4dJCcP3QSDleVi5yeQdEqTZ81w+orupgpJ5JxyE -1t/i4j7jE2kZYzNF1v25ELoQHueV7UNsXr/bglZGMNPUQ5KNSYQV3UFljl/gr5Ff -cKIW7nrX7BXNu75jCI65njZf+rPqF1ptvTy5arXcPf3vCGHNcJGErC5k23KeX7zH -w/91HvqsIi7hS9S7/wMCjj1nlOMXFz3YoRGyeBVux4CvYIIwVtzKHnsUiAffzoYv -7A981KFQnNF4pdQfnXkZmU+hsv/Fna04lbXQW5/371fezkHCMRPSjpVahQJxdA0A -TtMmw2jf/S3K7VKeRSp1OthEC/ZeuC+FxByJrxbfCGW5rsWZR3o= -=559p ------END PGP SIGNATURE----- diff --git a/libreoffice-help-7.5.3.2.tar.xz b/libreoffice-help-7.5.3.2.tar.xz new file mode 100644 index 0000000..0eb9f98 --- /dev/null +++ b/libreoffice-help-7.5.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9c4edf276c1c024550455b9c98762ab8bfdc1a10df417dd78e469aa8b8baad3 +size 166237184 diff --git a/libreoffice-help-7.5.3.2.tar.xz.asc b/libreoffice-help-7.5.3.2.tar.xz.asc new file mode 100644 index 0000000..d3cdd4e --- /dev/null +++ b/libreoffice-help-7.5.3.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmRK23AACgkQ9DSh76/u +rqPMVBAAo0N+s2KylzRsCqC0TSQp4rmMFys/Oi6xTuCOW4PsCTc93Q2CGegYo67F +k+T7g/PomMJaw6qrsqaQ7MABY85BbeckvgudZ3FGrmJgtQ1Iza2pOAyCvWzwugzO +obwHOhilwSlEmTB98UfeI55SgvZaTE5MYSY9cuL2tvwWDI5GTQquvS2uUH3R0j6l +a+Hke5ji6V+6vAOb6roaoaLJ9osiElQ/iCy7IWohHIocrw6jJhImZ9GSpEmiyNzJ +LyVySAEUz9qTzskLGc5IKSZfBSYptxk8VRgMAWVBvHU3n7Rj6ky4jVeg2kthfns4 +hhI/WR/T43xNKp2YH5XXWAdsAS2gTG6l8fKEDYk8SB+Baximlt2lhIDMcJZmPMpb +9CjtrU+rucEYg8K3eNrtjqUlceqFPCCMiOsolI3tajhyVICVnL66KOOv46QdjCVG +2OwqwxqtcoY3bQiCuN1cCkVhBexbWs5iTp7JRVI+05vAlRBgaC2C7eXMKCn7a76c +rzEL43oQViNtNdG0Rycr+QDwXYp4wdISyFClYuHcqfMYJEnSTYQmHMKhWUuIUMrB +13Sdfy83MVIYy2/bu0PmFGMqevBMTdpcpex5VVvDCUzdGcP89q9xG6KPG/a42Rid +Vxe7Y096kvjgAQVs8iHfLMMf7t+2HaWF4BSs3q1qXK6rKSDJTOY= +=oIoS +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.5.3.1.tar.xz b/libreoffice-translations-7.5.3.1.tar.xz deleted file mode 100644 index 78fe182..0000000 --- a/libreoffice-translations-7.5.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8054aa3a2a0be619fdfcb69e05b5fe8020c0b1c7eda49b0c232fbe695e390bd3 -size 204472376 diff --git a/libreoffice-translations-7.5.3.1.tar.xz.asc b/libreoffice-translations-7.5.3.1.tar.xz.asc deleted file mode 100644 index b81c647..0000000 --- a/libreoffice-translations-7.5.3.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmQ4UqMACgkQ9DSh76/u -rqN02w//YSvd5jXDaIFV+9uJHQuMTmLQRt7jAZgjO4lxGl8EHuT8Z5w4OMcAGIEq -VdjCPkKImVvxeGo1YOgTf2jSmbCmirNgMeffuSCQuBTGqcfhmVEUTPqJPQEMBZ8w -URIupw3VY29DWmQQqXgqao1UcRHJbbv7e4rjBCJOzCA7y1uQt1ZkCQx075A+gv5S -6pRjUBKprRN+uu429Zqi9UKC3JkS4Kgrp0O93mFx5Af3QXPhCyOxxp9AoQS4pN0W -Q/91JrVLGq6lH5bd3mkkNibNstf/H6K0gwVXC20hcgsFxEHqpG3Aq0vGUMSC8E3a -O5GizNdLlaa4DFEoO+cPgu+eauREQcT+ybrgkw950YMjpaNXFbJ6LhFsOLAF+IvE -DsIhiC64LoR7XxOuCqx2Xog1JFLAqYYZiEKfMu4oKU4VmhQzRxEvFPS1rcFuw0Em -L52UrUOQHALe9PbMOYB8/w3fe/KLZt4Obzdz016lMqSq4g1yeK1JbuYDvor1VGyJ -dJiNKkjI/bdfpAUdDFz72mwYHiYNthk0rDhvmUfz6rBusGC8UrnCjIa36ooTSNOZ -Q63Sf+LQXZjTW5/gZaD+tgZo/cpHFmLhjW3OIg2UoSpah2VX83+sYzymj+HrShVw -4jihRQihhC/qg3084+U2MoRPTv3BUOrbByJeAgTK64kZdD30gVw= -=1eEg ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.5.3.2.tar.xz b/libreoffice-translations-7.5.3.2.tar.xz new file mode 100644 index 0000000..1aa7f16 --- /dev/null +++ b/libreoffice-translations-7.5.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aef14e7808c10a78bbb6723029ecafb1e6a693e376ac2260ec935d45c098064f +size 204503208 diff --git a/libreoffice-translations-7.5.3.2.tar.xz.asc b/libreoffice-translations-7.5.3.2.tar.xz.asc new file mode 100644 index 0000000..e1ccdd5 --- /dev/null +++ b/libreoffice-translations-7.5.3.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmRK23AACgkQ9DSh76/u +rqMl8xAAwd8/fDaZ//FSKpX7e4+fEs++y8QB8MfIpzaNo6wwAJ+1meSMztNqmClw +zB1BQTY5pHKmPCufxKdVkr00cGjQO0+O+iKQdMDf65q+MnL7vc3IBKFzVs5MN59k +UQiMazA/Vxr4WoNnkjLRH4UPQ+luigJsszzE+/OchFM3PWROFzYrWniQhYOiP9zN +iGg/6fvcFHHU9cjjzXuzB8lXuHjWvyq/x/9E2Fl1YD7PC9sP+7uJUhcsqUXzE6KE +4uOtKKHJ/IhmG8q4YAa4s7/RMoTxMwVgsTf76wn2QI2rUqNtB5fVxDdewLBbPBTI +7gSGTP1dxNQvToCy3R1ifcHhQxSD1RC5mWY/LhH3UjYeAf+bggBjifvj8wEzIPSy +fiBnMwf5ZW5+pGKFFWlFivEKvaZH5YOgN+F2wEhzsQ4X+nuHVrVUg7cIehgRxyO+ +gfmMRZVW2WBrRfcSc8VJhvXcjXUYC3HbOyoda7cBIO58qN49A6jMHUqCYTXf0R8E +juwKf/tObnfvJS9ZpwP8mX5HeUBTM6MS3xjzDsx2Qq44Ifl96Z4F08oByFSLlmoJ +jIL5BLYJpv4lxCbzPVi3uFC/L5Y4bjKIZ3oY7Mda2qD8Jrzr+gE4N7kbtJxLvmiH +lsK99cycrOiaes/euWN3jFBqpO7lAMUC6doobDzYbYdnpQzCYI8= +=ZI79 +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index 117eca3..5959bed 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,7 +1,22 @@ +------------------------------------------------------------------- +Wed May 24 07:49:40 UTC 2023 - Danilo Spinella + +- Update to 7.5.3.2: + https://wiki.documentfoundation.org/Releases/7.5.3/RC2 +- Refresh patches: + * 0002-Revert-Require-HarfBuzz-5.1.0.patch + * bsc1200085.patch + +------------------------------------------------------------------- +Tue May 23 14:26:46 UTC 2023 - Andras Timar + +- Fix bsc#1200085 - LO-L3: FILEOPEN PPTX: extra paragraph after some 2-line text with link + * bsc1200085.patch + ------------------------------------------------------------------- Fri Apr 21 13:57:23 UTC 2023 - Danilo Spinella -- Update to 7.5.3.1 +- Update to 7.5.3.1: https://wiki.documentfoundation.org/Releases/7.5.3/RC1 ------------------------------------------------------------------- diff --git a/libreoffice.spec b/libreoffice.spec index 960f592..5b0d878 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -49,7 +49,7 @@ %endif %bcond_with firebird Name: libreoffice -Version: 7.5.3.1 +Version: 7.5.3.2 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -115,6 +115,8 @@ Patch14: use-fixmath-shared-library.patch Patch15: fix-sdk-idl.patch # PATCH-FIX-SUSE Allow the use of old harfbuzz versions Patch16: 0002-Revert-Require-HarfBuzz-5.1.0.patch +# LO-L3: FILEOPEN PPTX: extra paragraph after some 2-line text with link +Patch17: bsc1200085.patch # Build with java 8 Patch101: 0001-Revert-java-9-changes.patch # try to save space by using hardlinks @@ -1041,6 +1043,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %if 0%{?suse_version} < 1550 %patch16 -p1 %endif +%patch17 -p1 %patch990 -p1 %patch991 -p1