diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2021-02-05 11:10:34 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2021-02-05 15:01:48 +0100 |
commit | 0ce7c84cc7b3f53a56a70586f73d7615f68ec1dc (patch) | |
tree | 410bb933b09711440bed16f006f2556140d5ce7f | |
parent | cb4ba42fbf421a17a8ba0e32ef09add928f2b694 (diff) |
Revert "Fix typo in code"
This reverts commit 3ed9bba283a6a67864c0928186e277240be0d9ba. osl_Pos_Absolut
(include/osl/file.h) is part of the stable URE interface; it must not be changed.
Change-Id: I1f49923a9351e4be5aee39b10720d38b424feb9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110435
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r-- | basic/source/runtime/iosys.cxx | 2 | ||||
-rw-r--r-- | comphelper/source/misc/backupfilehelper.cxx | 10 | ||||
-rw-r--r-- | comphelper/source/streaming/oslfile2streamwrap.cxx | 4 | ||||
-rw-r--r-- | desktop/source/deployment/dp_persmap.cxx | 4 | ||||
-rw-r--r-- | include/osl/file.h | 4 | ||||
-rw-r--r-- | sal/osl/unx/file.cxx | 2 | ||||
-rw-r--r-- | sal/osl/w32/file.cxx | 2 | ||||
-rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 18 | ||||
-rw-r--r-- | sdext/source/pdfimport/filterdet.cxx | 4 | ||||
-rw-r--r-- | sdext/source/pdfimport/test/pdfunzip.cxx | 4 | ||||
-rw-r--r-- | tools/source/stream/strmunx.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/filinpstr.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/filrec.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/filstr.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpurl.cxx | 2 | ||||
-rw-r--r-- | ucbhelper/source/provider/fd_inputstream.cxx | 4 | ||||
-rw-r--r-- | unoidl/source/unoidl-write.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 16 | ||||
-rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/print/printerjob.cxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/inputstream.cxx | 4 |
21 files changed, 48 insertions, 48 deletions
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 24407c670698..4c991c6676c7 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -239,7 +239,7 @@ sal_uInt64 OslStream::SeekPos( sal_uInt64 nPos ) } else { - rc = maFile.setPos( osl_Pos_Absolute, nPos ); + rc = maFile.setPos( osl_Pos_Absolut, nPos ); } OSL_VERIFY(rc == ::osl::FileBase::E_None); sal_uInt64 nRealPos(0); diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx index 8db40af9f76f..c7bcd4253ed0 100644 --- a/comphelper/source/misc/backupfilehelper.cxx +++ b/comphelper/source/misc/backupfilehelper.cxx @@ -70,7 +70,7 @@ namespace // set offset in source file - should be zero due to crc32 should // only be needed to be created for new entries, gets loaded with old // ones - if (osl::File::E_None == rCandidate->setPos(osl_Pos_Absolute, sal_Int64(nOffset))) + if (osl::File::E_None == rCandidate->setPos(osl_Pos_Absolut, sal_Int64(nOffset))) { while (nSize != 0) { @@ -815,7 +815,7 @@ namespace sal_uInt64 nSize(getPackFileSize()); // set offset in source file - when this is zero, a new file is to be added - if (osl::File::E_None == maFile->setPos(osl_Pos_Absolute, sal_Int64(getOffset()))) + if (osl::File::E_None == maFile->setPos(osl_Pos_Absolut, sal_Int64(getOffset()))) { while (nSize != 0) { @@ -856,7 +856,7 @@ namespace if (Z_OK == deflateInit(zstream.get(), Z_BEST_COMPRESSION)) { // set offset in source file - when this is zero, a new file is to be added - if (osl::File::E_None == maFile->setPos(osl_Pos_Absolute, sal_Int64(getOffset()))) + if (osl::File::E_None == maFile->setPos(osl_Pos_Absolut, sal_Int64(getOffset()))) { bool bOkay(true); @@ -939,7 +939,7 @@ namespace if (Z_OK == inflateInit(zstream.get())) { // set offset in source file - when this is zero, a new file is to be added - if (osl::File::E_None == maFile->setPos(osl_Pos_Absolute, sal_Int64(getOffset()))) + if (osl::File::E_None == maFile->setPos(osl_Pos_Absolut, sal_Int64(getOffset()))) { bool bOkay(true); @@ -1314,7 +1314,7 @@ namespace if (bRetval) { // seek back to header start (at position 8) - if (osl_File_E_None != osl_setFilePos(aHandle, osl_Pos_Absolute, sal_Int64(8))) + if (osl_File_E_None != osl_setFilePos(aHandle, osl_Pos_Absolut, sal_Int64(8))) { bRetval = false; } diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx index 980efa317757..eff916a833ff 100644 --- a/comphelper/source/streaming/oslfile2streamwrap.cxx +++ b/comphelper/source/streaming/oslfile2streamwrap.cxx @@ -90,7 +90,7 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); sal_uInt64 nNewPos = nCurrentPos + nBytesToSkip; - eError = m_pFile->setPos(osl_Pos_Absolute, nNewPos); + eError = m_pFile->setPos(osl_Pos_Absolut, nNewPos); if (eError != FileBase::E_None) throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); } @@ -116,7 +116,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw css::io::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this)); nAvailable = nAvailable - nPos; - eError = m_pFile->setPos(osl_Pos_Absolute, nPos); + eError = m_pFile->setPos(osl_Pos_Absolut, nPos); if (eError != FileBase::E_None) throw css::io::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this)); return std::min<sal_Int64>(nAvailable, SAL_MAX_INT32); diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx index 05e1712af6e9..222a6cf99c03 100644 --- a/desktop/source/deployment/dp_persmap.cxx +++ b/desktop/source/deployment/dp_persmap.cxx @@ -160,7 +160,7 @@ void PersistentMap::readAll() { // prepare for re-reading the map-file m_entries.clear(); - const osl::FileBase::RC nRes = m_MapFile.setPos( osl_Pos_Absolute, 0); + const osl::FileBase::RC nRes = m_MapFile.setPos( osl_Pos_Absolut, 0); if (nRes != osl::FileBase::E_None) { SAL_WARN("desktop.deployment", "setPos failed with " << +nRes); @@ -223,7 +223,7 @@ void PersistentMap::flush() return; // write header magic - const osl::FileBase::RC nRes = m_MapFile.setPos( osl_Pos_Absolute, 0); + const osl::FileBase::RC nRes = m_MapFile.setPos( osl_Pos_Absolut, 0); if (nRes != osl::FileBase::E_None) { SAL_WARN("desktop.deployment", "setPos failed with " << +nRes); diff --git a/include/osl/file.h b/include/osl/file.h index 6fa9f937407a..07d2beb2ae1f 100644 --- a/include/osl/file.h +++ b/include/osl/file.h @@ -693,7 +693,7 @@ typedef void *oslFileHandle; SAL_DLLPUBLIC oslFileError SAL_CALL osl_openFile( rtl_uString *pustrFileURL, oslFileHandle *pHandle, sal_uInt32 uFlags ); -#define osl_Pos_Absolute 1 +#define osl_Pos_Absolut 1 #define osl_Pos_Current 2 #define osl_Pos_End 3 @@ -703,7 +703,7 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_openFile( Handle to a file received by a previous call to osl_openFile(). @param[in] uHow - How to calculate the offset - osl_Pos_Absolute means start at the + How to calculate the offset - osl_Pos_Absolut means start at the beginning of the file, osl_Pos_Current means offset from the current seek position and osl_Pos_End means the offset will be negative and the position will be calculated backwards from the end of the file by diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index f4d6b229c3f7..d8396f6279b6 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -1549,7 +1549,7 @@ oslFileError SAL_CALL osl_setFilePos(oslFileHandle Handle, sal_uInt32 uHow, sal_ FileHandle_Impl::Guard lock(&(pImpl->m_mutex)); switch (uHow) { - case osl_Pos_Absolute: + case osl_Pos_Absolut: if (nOffset < 0) return osl_File_E_INVAL; break; diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx index 1803121f503d..ca31d714dfef 100644 --- a/sal/osl/w32/file.cxx +++ b/sal/osl/w32/file.cxx @@ -976,7 +976,7 @@ oslFileError SAL_CALL osl_setFilePos(oslFileHandle Handle, sal_uInt32 uHow, sal_ FileHandle_Impl::Guard lock(&(pImpl->m_mutex)); switch (uHow) { - case osl_Pos_Absolute: + case osl_Pos_Absolut: if (nOffset < 0) return osl_File_E_INVAL; break; diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index a9f7183f673e..30ef0e322eeb 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -2254,7 +2254,7 @@ namespace osl_File auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); auto nError2 = testFile.write(buffer_write, 30, nCount_write); - osl::FileBase::RC nError4 = testFile.setPos(osl_Pos_Absolute, 0); + osl::FileBase::RC nError4 = testFile.setPos(osl_Pos_Absolut, 0); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError4); auto nError3 = testFile.read(buffer_read, 10, nCount_read); @@ -2328,7 +2328,7 @@ namespace osl_File auto nError2 = testFile.close(); - auto nError3 = testFile.setPos(osl_Pos_Absolute, 0); + auto nError3 = testFile.setPos(osl_Pos_Absolut, 0); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for close function: manipulate a file after it has been closed", osl::FileBase::E_None, nError2); @@ -2380,7 +2380,7 @@ namespace osl_File auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); - nError1 = testFile.setPos(osl_Pos_Absolute, 26); + nError1 = testFile.setPos(osl_Pos_Absolut, 26); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); sal_uInt64 nCount_read = 0; nError1 = testFile.read(buffer_read, 1, nCount_read); @@ -2388,7 +2388,7 @@ namespace osl_File nError1 = testFile.close(); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); - CPPUNIT_ASSERT_EQUAL_MESSAGE("test for setPos function: test for osl_Pos_Absolute, set the position to 26, test if the 26th char in file is correct", + CPPUNIT_ASSERT_EQUAL_MESSAGE("test for setPos function: test for osl_Pos_Absolut, set the position to 26, test if the 26th char in file is correct", pBuffer_Char[26], buffer_read[0]); } @@ -2399,7 +2399,7 @@ namespace osl_File auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); - nError1 = testFile.setPos(osl_Pos_Absolute, sizeof(pBuffer_Char) - 2); + nError1 = testFile.setPos(osl_Pos_Absolut, sizeof(pBuffer_Char) - 2); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.setPos(osl_Pos_Current, 0); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); @@ -2486,7 +2486,7 @@ namespace osl_File nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); - nError1 = testFile.setPos(osl_Pos_Absolute, 26); + nError1 = testFile.setPos(osl_Pos_Absolut, 26); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.getPos(nFilePointer); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); @@ -2566,7 +2566,7 @@ namespace osl_File auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); - nError1 = testFile.setPos(osl_Pos_Absolute, 0); + nError1 = testFile.setPos(osl_Pos_Absolut, 0); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); *pEOF = false; @@ -2745,7 +2745,7 @@ namespace osl_File auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); - nError1 = testFile.setPos(osl_Pos_Absolute, 26); + nError1 = testFile.setPos(osl_Pos_Absolut, 26); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); sal_uInt64 nCount_read = 0; nError1 = testFile.read(buffer_read, 26, nCount_read); @@ -2806,7 +2806,7 @@ namespace osl_File nError1 = testFile.getPos(nFilePointer); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // reset pointer to the beginning; - nError1 = testFile.setPos(osl_Pos_Absolute, 0); + nError1 = testFile.setPos(osl_Pos_Absolut, 0); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.read(buffer_read, 10, nCount_read); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index c072c964dad7..7e6e72f4d707 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -142,7 +142,7 @@ bool FileEmitContext::copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen if( nOrigOffset + nLen > m_nReadLen ) return false; - if( osl_setFilePos( m_aReadHandle, osl_Pos_Absolute, nOrigOffset ) != osl_File_E_None ) + if( osl_setFilePos( m_aReadHandle, osl_Pos_Absolut, nOrigOffset ) != osl_File_E_None ) return false; uno::Sequence< sal_Int8 > aSeq( nLen ); @@ -167,7 +167,7 @@ unsigned int FileEmitContext::readOrigBytes( unsigned int nOrigOffset, unsigned return 0; if( osl_setFilePos( m_aReadHandle, - osl_Pos_Absolute, + osl_Pos_Absolut, nOrigOffset ) != osl_File_E_None ) { return 0; diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx index 58169c0ebd08..a4d93c611d7d 100644 --- a/sdext/source/pdfimport/test/pdfunzip.cxx +++ b/sdext/source/pdfimport/test/pdfunzip.cxx @@ -181,7 +181,7 @@ bool FileEmitContext::copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen if( nOrigOffset + nLen > m_nReadLen ) return false; - if( osl_setFilePos( m_aReadHandle, osl_Pos_Absolute, nOrigOffset ) != osl_File_E_None ) + if( osl_setFilePos( m_aReadHandle, osl_Pos_Absolut, nOrigOffset ) != osl_File_E_None ) { fprintf( stderr, "could not seek to offset %u\n", nOrigOffset ); return false; @@ -207,7 +207,7 @@ unsigned int FileEmitContext::readOrigBytes( unsigned int nOrigOffset, unsigned if( nOrigOffset + nLen > m_nReadLen ) return 0; - if( osl_setFilePos( m_aReadHandle, osl_Pos_Absolute, nOrigOffset ) != osl_File_E_None ) + if( osl_setFilePos( m_aReadHandle, osl_Pos_Absolut, nOrigOffset ) != osl_File_E_None ) { fprintf( stderr, "could not seek to offset %u\n", nOrigOffset ); return 0; diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index c6d20210e641..40cbe382213a 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -268,7 +268,7 @@ sal_uInt64 SvFileStream::SeekPos(sal_uInt64 const nPos) oslFileError rc; sal_uInt64 nNewPos; if ( nPos != STREAM_SEEK_TO_END ) - rc = osl_setFilePos( pInstanceData->rHandle, osl_Pos_Absolute, nPos ); + rc = osl_setFilePos( pInstanceData->rHandle, osl_Pos_Absolut, nPos ); else rc = osl_setFilePos( pInstanceData->rHandle, osl_Pos_End, 0 ); diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 7fa0b3b157c1..5838dcda39ac 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -139,7 +139,7 @@ XInputStream_impl::seek( sal_Int64 location ) { if( location < 0 ) throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 0 ); - if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolute, sal_uInt64( location ) ) ) + if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolut, sal_uInt64( location ) ) ) throw io::IOException( THROW_WHERE ); } diff --git a/ucb/source/ucp/file/filrec.cxx b/ucb/source/ucp/file/filrec.cxx index 2e0343ae59b6..5af520bc351d 100644 --- a/ucb/source/ucp/file/filrec.cxx +++ b/ucb/source/ucp/file/filrec.cxx @@ -74,7 +74,7 @@ bool ReconnectingFile::reconnect() { ::osl::FileBase::RC nRes = ::osl::FileBase::E_NETWORK; - if ( uHow == osl_Pos_Absolute && uPos > 0 ) + if ( uHow == osl_Pos_Absolut && uPos > 0 ) { if ( m_bDisconnect ) { diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 78e0fafcb207..3031510a6b7f 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -111,7 +111,7 @@ void SAL_CALL XStream_impl::truncate() if (osl::FileBase::E_None != m_aFile.setSize(0)) throw io::IOException( THROW_WHERE ); - if (osl::FileBase::E_None != m_aFile.setPos(osl_Pos_Absolute,sal_uInt64(0))) + if (osl::FileBase::E_None != m_aFile.setPos(osl_Pos_Absolut,sal_uInt64(0))) throw io::IOException( THROW_WHERE ); } @@ -232,7 +232,7 @@ XStream_impl::seek( sal_Int64 location ) { if( location < 0 ) throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 0 ); - if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolute, sal_uInt64( location ) ) ) + if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolut, sal_uInt64( location ) ) ) throw io::IOException( THROW_WHERE ); } diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx index 78c6105c6c37..74b77dec15be 100644 --- a/ucb/source/ucp/ftp/ftpurl.cxx +++ b/ucb/source/ucp/ftp/ftpurl.cxx @@ -411,7 +411,7 @@ oslFileHandle FTPURL::open() if(err == CURLE_OK) { - oslFileError rc = osl_setFilePos( res, osl_Pos_Absolute, 0 ); + oslFileError rc = osl_setFilePos( res, osl_Pos_Absolut, 0 ); SAL_WARN_IF(rc != osl_File_E_None, "ucb.ucp.ftp", "osl_setFilePos failed"); } diff --git a/ucbhelper/source/provider/fd_inputstream.cxx b/ucbhelper/source/provider/fd_inputstream.cxx index 9a2b256a1c7c..795c2dcaea7c 100644 --- a/ucbhelper/source/provider/fd_inputstream.cxx +++ b/ucbhelper/source/provider/fd_inputstream.cxx @@ -43,7 +43,7 @@ namespace ucbhelper sal_uInt64 nFileSize = 0; if ( osl_getFilePos( m_tmpfl, &nFileSize ) == osl_File_E_None ) m_nLength = nFileSize; - oslFileError rc = osl_setFilePos( m_tmpfl, osl_Pos_Absolute, 0 ); + oslFileError rc = osl_setFilePos( m_tmpfl, osl_Pos_Absolut, 0 ); SAL_WARN_IF(rc != osl_File_E_None, "ucbhelper", "osl_setFilePos failed"); } } @@ -119,7 +119,7 @@ namespace ucbhelper if(!m_tmpfl) throw IOException(); - oslFileError rc = osl_setFilePos( m_tmpfl, osl_Pos_Absolute, location ); + oslFileError rc = osl_setFilePos( m_tmpfl, osl_Pos_Absolut, location ); SAL_WARN_IF(rc != osl_File_E_None, "ucbhelper", "osl_setFilePos failed"); } diff --git a/unoidl/source/unoidl-write.cxx b/unoidl/source/unoidl-write.cxx index e5b8f8dba086..1afca0e218b0 100644 --- a/unoidl/source/unoidl-write.cxx +++ b/unoidl/source/unoidl-write.cxx @@ -915,7 +915,7 @@ SAL_IMPLEMENT_MAIN() { << +e << std::endl; std::exit(EXIT_FAILURE); } - e = f.setPos(osl_Pos_Absolute, 8); + e = f.setPos(osl_Pos_Absolut, 8); if (e != osl::FileBase::E_None) { std::cerr << "Cannot rewind current position in <" << f.getURL() diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 3e40cda84d5f..967dcf62dece 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2711,7 +2711,7 @@ bool PDFWriterImpl::emitFonts() sal_uInt64 nLength1; if ( osl::File::E_None != aFontFile.setPos(osl_Pos_End, 0) ) return false; if ( osl::File::E_None != aFontFile.getPos(nLength1) ) return false; - if ( osl::File::E_None != aFontFile.setPos(osl_Pos_Absolute, 0) ) return false; + if ( osl::File::E_None != aFontFile.setPos(osl_Pos_Absolut, 0) ) return false; if (g_bDebugDisableCompression) { @@ -2768,7 +2768,7 @@ bool PDFWriterImpl::emitFonts() sal_uInt64 nBytesRead = 0; if ( osl::File::E_None != aFontFile.read(xBuffer.get(), nLength1, nBytesRead) ) return false; SAL_WARN_IF( nBytesRead!=nLength1, "vcl.pdfwriter", "PDF-FontSubset read incomplete!" ); - if ( osl::File::E_None != aFontFile.setPos(osl_Pos_Absolute, 0) ) return false; + if ( osl::File::E_None != aFontFile.setPos(osl_Pos_Absolut, 0) ) return false; // get the PFB-segment lengths ThreeInts aSegmentLengths = {0,0,0}; getPfbSegmentLengths(xBuffer.get(), static_cast<int>(nBytesRead), aSegmentLengths); @@ -4920,19 +4920,19 @@ bool PDFWriterImpl::finalizeSignature() // 2- overwrite the value to the m_nSignatureLastByteRangeNoOffset position sal_uInt64 nWritten = 0; - CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolute, m_nSignatureLastByteRangeNoOffset) ) ); + CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, m_nSignatureLastByteRangeNoOffset) ) ); OString aByteRangeNo = OString::number( nLastByteRangeNo ) + " ]"; if (m_aFile.write(aByteRangeNo.getStr(), aByteRangeNo.getLength(), nWritten) != osl::File::E_None) { - CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolute, nOffset)) ); + CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, nOffset)) ); return false; } // 3- create the PKCS#7 object using NSS // Prepare buffer and calculate PDF file digest - CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolute, 0)) ); + CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 0)) ); std::unique_ptr<char[]> buffer1(new char[m_nSignatureContentOffset + 1]); sal_uInt64 bytesRead1; @@ -4948,7 +4948,7 @@ bool PDFWriterImpl::finalizeSignature() std::unique_ptr<char[]> buffer2(new char[nLastByteRangeNo + 1]); sal_uInt64 bytesRead2; - if (osl::File::E_None != m_aFile.setPos(osl_Pos_Absolute, m_nSignatureContentOffset + MAX_SIGNATURE_CONTENT_LENGTH + 1) || + 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) || bytesRead2 != static_cast<sal_uInt64>(nLastByteRangeNo)) { @@ -4972,10 +4972,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_Absolute, m_nSignatureContentOffset)) ); + CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, m_nSignatureContentOffset)) ); m_aFile.write(aCMSHexBuffer.getStr(), aCMSHexBuffer.getLength(), nWritten); - return osl::File::E_None == m_aFile.setPos(osl_Pos_Absolute, nOffset); + return osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, nOffset); } #endif //HAVE_FEATURE_NSS diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index bd9d166ba675..bd511f6d9326 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -1140,7 +1140,7 @@ bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJo { oslFileHandle pFile = nullptr; osl_openFile( aPDFFiles[i].maTmpURL.pData, &pFile, osl_File_OpenFlag_Read ); - if (pFile && (osl_setFilePos(pFile, osl_Pos_Absolute, 0) == osl_File_E_None)) + if (pFile && (osl_setFilePos(pFile, osl_Pos_Absolut, 0) == osl_File_E_None)) { std::vector< char > buffer( 0x10000, 0 ); // update job data with current page size diff --git a/vcl/unx/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx index c6e2470b5c6c..1ce42b6e0d40 100644 --- a/vcl/unx/generic/print/printerjob.cxx +++ b/vcl/unx/generic/print/printerjob.cxx @@ -56,7 +56,7 @@ AppendPS (FILE* pDst, osl::File* pSrc, unsigned char* pBuffer) if ((pDst == nullptr) || (pSrc == nullptr)) return false; - if (pSrc->setPos(osl_Pos_Absolute, 0) != osl::FileBase::E_None) + if (pSrc->setPos(osl_Pos_Absolut, 0) != osl::FileBase::E_None) return false; sal_uInt64 nIn = 0; diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx index 73d5f0e2f9ed..8eaebf364320 100644 --- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx @@ -143,7 +143,7 @@ XInputStream_impl::seek( sal_Int64 location ) { if( location < 0 ) throw lang::IllegalArgumentException(); - if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolute, sal_uInt64( location ) ) ) + if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolut, sal_uInt64( location ) ) ) throw io::IOException(); } @@ -175,7 +175,7 @@ XInputStream_impl::getLength() if( err != osl::FileBase::E_None ) throw io::IOException(); - err = m_aFile.setPos( osl_Pos_Absolute, uCurrentPos ); + err = m_aFile.setPos( osl_Pos_Absolut, uCurrentPos ); if( err != osl::FileBase::E_None ) throw io::IOException(); |