vcl/source/gdi/pdfwriter_impl.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
New commits: commit 9efaaa57d73367ba737be151de8ecc3730374230 Author: Tor Lillqvist <t...@collabora.com> Date: Wed Dec 3 14:00:38 2014 +0200 PDF signing feature backported from 4.4 Cherry picked from: 840f75065918c4584fa9159fdc90242b5374ab37 1fe9ee73a758603ee0e1465931352c41ef8bd999 d8a8ff8177df628636d80c4dc1d8f597f6677dfc bfa01d8a8248f7e44675de5ed1f85a1d17105022 bbb18f679f5a50e9c709520d6c3260d3d9db5aa9 c4cc31b5b55019aabad4045c8174b45e1b27073a 7e3c931786c3cbe83ee170b8b0746d141b520ce6 070c93af73df9aa4eb333265c81060d123b530b9 6e91763769a562b88882a4c2a94b1367c6ed4866 Change-Id: Ib4b67eec0fb7f032a395b5463b481a5680287768 diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index c0791f6..e1fe341 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -6192,7 +6192,7 @@ bool PDFWriterImpl::finalizeSignature() #else // Prepare buffer and calculate PDF file digest - CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 0)) ); + CHECK_RETURN( (osl_File_E_None == osl_setFilePos(m_aFile, osl_Pos_Absolut, 0))); PCCERT_CONTEXT pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, reinterpret_cast<const BYTE*>(n_derArray), n_derLength); if (pCertContext == NULL) @@ -6204,7 +6204,7 @@ bool PDFWriterImpl::finalizeSignature() boost::scoped_array<char> buffer1(new char[m_nSignatureContentOffset - 1]); sal_uInt64 bytesRead1; - if (osl::File::E_None != m_aFile.read(buffer1.get(), m_nSignatureContentOffset - 1 , bytesRead1) || + if (osl_File_E_None != osl_readFile(m_aFile, buffer1.get(), m_nSignatureContentOffset - 1 , &bytesRead1) || bytesRead1 != (sal_uInt64)m_nSignatureContentOffset - 1) { SAL_WARN("vcl.pdfwriter", "PDF Signing: First buffer read failed!"); @@ -6215,8 +6215,8 @@ bool PDFWriterImpl::finalizeSignature() boost::scoped_array<char> buffer2(new char[nLastByteRangeNo]); sal_uInt64 bytesRead2; - if (osl::File::E_None != m_aFile.setPos(osl_Pos_Absolut, m_nSignatureContentOffset + MAX_SIGNATURE_CONTENT_LENGTH + 1) || - osl::File::E_None != m_aFile.read(buffer2.get(), nLastByteRangeNo, bytesRead2) || + if (osl_File_E_None != osl_setFilePos(m_aFile, osl_Pos_Absolut, m_nSignatureContentOffset + MAX_SIGNATURE_CONTENT_LENGTH + 1) || + osl_File_E_None != osl_readFile(m_aFile, buffer2.get(), nLastByteRangeNo, &bytesRead2) || bytesRead2 != (sal_uInt64) nLastByteRangeNo) { SAL_WARN("vcl.pdfwriter", "PDF Signing: Second buffer read failed!"); @@ -6279,10 +6279,10 @@ bool PDFWriterImpl::finalizeSignature() // Set file pointer to the m_nSignatureContentOffset, we're ready to overwrite PKCS7 object nWritten = 0; - CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, m_nSignatureContentOffset)) ); - m_aFile.write(cms_hexbuffer.getStr(), cms_hexbuffer.getLength(), nWritten); + CHECK_RETURN( (osl_File_E_None == osl_setFilePos(m_aFile, osl_Pos_Absolut, m_nSignatureContentOffset)) ); + osl_writeFile(m_aFile, cms_hexbuffer.getStr(), cms_hexbuffer.getLength(), &nWritten); - CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, nOffset)) ); + CHECK_RETURN( (osl_File_E_None == osl_setFilePos(m_aFile, osl_Pos_Absolut, nOffset)) ); return true; #endif _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits