[Libreoffice] [PATCH] Kill Pos_XXX in favour of osl_Pos_XXX
Michael Lefevre
lefevre00 at yahoo.fr
Wed Apr 13 13:43:55 PDT 2011
---
sal/qa/osl/file/osl_File.cxx | 14 +++++++-------
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 555f70a..f42a965 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 309d669..16cdfdf 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 );
--
1.7.1
More information about the LibreOffice
mailing list