From b267650fd097f16d1b31c87a11a497294ad4ee42 Mon Sep 17 00:00:00 2001 From: Aron Budea Date: Mon, 13 Apr 2020 05:14:13 +0200 Subject: tdf#131193: MSO PP complains about an ODP saved as PPT pPara was supposed to be the first paragraph, as before the below commit. Regression from d458adeed0c34fae26fe7f3d6ecc9b75b431922f Change-Id: I50b993ff8f37fd5572d60fe5d103c3cf5e636a6b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92105 Reviewed-by: Arkadiy Illarionov Reviewed-by: Mike Kaganski Tested-by: Jenkins --- sd/source/filter/eppt/epptso.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sd') diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 0f5abc02cfbf..b56f82c13051 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -1170,9 +1170,9 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u pPara = aTextObj.GetParagraph(0); sal_uInt32 nParaFlags = 0x1f; sal_Int16 nMask, nNumberingRule[ 10 ]; - sal_uInt32 nTextOfs = pPara->nTextOfs; - sal_uInt32 nTabs = pPara->maTabStop.getLength(); - const css::style::TabStop* pTabStop = pPara->maTabStop.getConstArray(); + const sal_uInt32 nTextOfs = pPara->nTextOfs; + const sal_uInt32 nTabs = pPara->maTabStop.getLength(); + const auto& rTabStops = pPara->maTabStop; for ( sal_uInt32 i = 0; i < aTextObj.ParagraphCount(); ++i ) { @@ -1209,7 +1209,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u const sal_uInt32 nDefaultTabSize = MapSize( awt::Size( nDefaultTabSizeSrc, 1 ) ).Width; sal_uInt32 nDefaultTabs = std::abs( maRect.GetWidth() ) / nDefaultTabSize; if ( nTabs ) - nDefaultTabs -= static_cast( ( ( pTabStop[ nTabs - 1 ].Position / 4.40972 ) + nTextOfs ) / nDefaultTabSize ); + nDefaultTabs -= static_cast( ( ( rTabStops[ nTabs - 1 ].Position / 4.40972 ) + nTextOfs ) / nDefaultTabSize ); if ( static_cast(nDefaultTabs) < 0 ) nDefaultTabs = 0; @@ -1236,7 +1236,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u if ( nTextRulerAtomFlags & 4 ) { pRuleOut->WriteUInt16( nTabCount ); - for ( const css::style::TabStop& rTabStop : std::as_const(pPara->maTabStop) ) + for ( const css::style::TabStop& rTabStop : rTabStops ) { sal_uInt16 nPosition = static_cast( ( rTabStop.Position / 4.40972 ) + nTextOfs ); sal_uInt16 nType; @@ -1255,7 +1255,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u sal_uInt32 nWidth = 1; if ( nTabs ) - nWidth += static_cast( ( pTabStop[ nTabs - 1 ].Position / 4.40972 + nTextOfs ) / nDefaultTabSize ); + nWidth += static_cast( ( rTabStops[ nTabs - 1 ].Position / 4.40972 + nTextOfs ) / nDefaultTabSize ); nWidth *= nDefaultTabSize; for ( i = 0; i < nDefaultTabs; i++, nWidth += nDefaultTabSize ) pRuleOut->WriteUInt32( nWidth ); -- cgit