diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-07 09:02:11 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-07 10:42:03 +0100 |
| commit | 5f4a3e7bd77c3294ef85eebec17ed2d624dc3a2d (patch) | |
| tree | 7f0ae3e18850cd5451d366ebf9efeec4e46ab428 /vcl | |
| parent | ded02dafbce173f2f1a23e10deee8002f73317b2 (diff) | |
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 <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/pdfread.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/filter/ipdf/pdfread.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/inc/pdfread.hxx b/vcl/inc/pdfread.hxx index e873c49a1cdd..d3bcac84a29a 100644 --- a/vcl/inc/pdfread.hxx +++ b/vcl/inc/pdfread.hxx @@ -17,8 +17,8 @@ namespace vcl { /// Imports a PDF stream into rGraphic as a GDIMetaFile. -VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Bitmap &rBitmap, - css::uno::Sequence<sal_Int8> &rPdfFata, +VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Bitmap& rBitmap, + css::uno::Sequence<sal_Int8>& rPdfFata, sal_uInt64 nPos = STREAM_SEEK_TO_BEGIN, sal_uInt64 nSize = STREAM_SEEK_TO_END); VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Graphic& rGraphic); 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<sal_Int8> &rPdfData, +bool ImportPDF(SvStream& rStream, Bitmap& rBitmap, + css::uno::Sequence<sal_Int8>& rPdfData, sal_uInt64 nPos, sal_uInt64 nSize) { // Get the preview of the first page. |