From 5f4a3e7bd77c3294ef85eebec17ed2d624dc3a2d Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 7 Nov 2017 09:02:11 +0100 Subject: tdf#113550 RTF import: fix incorrect text indent Left indent was set to non-zero in the style, but direct formatting set it back to zero. Teach deduplication to remove the NS_ooxml::LN_CT_PPrBase_ind SPRM itself in case the last attribute was removed. Change-Id: I01b202f0241b02816b2b392326737b1150caffc2 Reviewed-on: https://gerrit.libreoffice.org/44385 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- vcl/source/filter/ipdf/pdfread.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vcl/source/filter/ipdf') diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx index 59a7b1f80469..07e9d8994cd7 100644 --- a/vcl/source/filter/ipdf/pdfread.cxx +++ b/vcl/source/filter/ipdf/pdfread.cxx @@ -142,7 +142,7 @@ bool getCompatibleStream(SvStream& rInStream, SvStream& rOutStream, sal_uInt64 nPos, sal_uInt64 nSize) { bool bCompatible = isCompatible(rInStream, nPos, nSize); - rInStream.Seek( nPos ); + rInStream.Seek(nPos); if (bCompatible) // Not converting. rOutStream.WriteStream(rInStream, nSize); @@ -205,8 +205,8 @@ bool getCompatibleStream(SvStream& rInStream, SvStream& rOutStream, namespace vcl { -bool ImportPDF(SvStream& rStream, Bitmap &rBitmap, - css::uno::Sequence &rPdfData, +bool ImportPDF(SvStream& rStream, Bitmap& rBitmap, + css::uno::Sequence& rPdfData, sal_uInt64 nPos, sal_uInt64 nSize) { // Get the preview of the first page. -- cgit v1.2.3