diff options
| author | Michael Lefevre <lefevre00@yahoo.fr> | 2011-04-13 22:43:55 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-04-14 12:45:39 +0200 |
| commit | 0b943523249455c876fefdf19ba345d85f190a29 (patch) | |
| tree | ce57a42fdb1c6fd996ffd50a23dd1c7cd45ed6a2 | |
| parent | e66dee1df168c25deb94a5015b9f3ae1694a74ff (diff) | |
Kill Pos_XXX in favour of osl_Pos_XXX
| -rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 14 | ||||
| -rw-r--r-- | sal/workben/testfile.cxx | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 555f70ad0..f42a965bd 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -3627,17 +3627,17 @@ namespace osl_File nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); //the file size is smaller than 100 - nError1 = testFile.setPos( Pos_End, -100 ); + nError1 = testFile.setPos( osl_Pos_End, -100 ); CPPUNIT_ASSERT_MESSAGE( "should return error", ::osl::FileBase::E_INVAL == nError1 ); - nError1 = testFile.setPos( Pos_End, -53 ); + nError1 = testFile.setPos( osl_Pos_End, -53 ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); nError1 = testFile.read( buffer_read, 1, nCount_read ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); nError1 = testFile.close( ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); - CPPUNIT_ASSERT_MESSAGE( "test for setPos function: test for Pos_End, set the position to end, test if the first char in file is correct", + CPPUNIT_ASSERT_MESSAGE( "test for setPos function: test for osl_Pos_End, set the position to end, test if the first char in file is correct", buffer_read[0] == pBuffer_Char[0] ); } @@ -3759,7 +3759,7 @@ namespace osl_File nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); - nError1 = testFile.setPos( Pos_End, 0 ); + nError1 = testFile.setPos( osl_Pos_End, 0 ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); nError1 = testFile.isEndOfFile( pEOF ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); @@ -3859,7 +3859,7 @@ namespace osl_File CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); //get the file size; - nError1 = testFile.setPos( Pos_End, 0 ); + nError1 = testFile.setPos( osl_Pos_End, 0 ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); nError1 = testFile.getPos( nFilePointer ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); @@ -3887,7 +3887,7 @@ namespace osl_File CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); //get the file size; - nError1 = testFile.setPos( Pos_End, 0 ); + nError1 = testFile.setPos( osl_Pos_End, 0 ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); nError1 = testFile.getPos( nFilePointer ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); @@ -4241,7 +4241,7 @@ namespace osl_File //check if is the new file File newFile( aTmpName4 ); newFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Read ); - newFile.setPos( Pos_End, 0 ); + newFile.setPos( osl_Pos_End, 0 ); // CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); sal_uInt64 nFilePointer; nError1 = newFile.getPos( nFilePointer ); diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx index 309d66924..16cdfdf88 100644 --- a/sal/workben/testfile.cxx +++ b/sal/workben/testfile.cxx @@ -1197,7 +1197,7 @@ void FilePointerTest( void ) rFile.setSize( 5000 ); printf( "Set the FilePointer at the end of the file (5000)\n" ); - rc=rFile.setPos( Pos_End,0 ); + rc=rFile.setPos( osl_Pos_End,0 ); print_error( rtl::OString( "SetPos" ), rc ); rc=rFile.getPos( filepointer ); |