mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert oslCheckMode to scoped enum

Browse Source 
Change-Id: I7cd31d5624682bf7bd021586769593499d2481af
Reviewed-on: https://gerrit.libreoffice.org/25204
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin
2016-05-20 15:34:02 +02:00
committed by Noel Grandin
parent 602fc6153f
commit 90cd1b56c9
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sal/qa/osl/file/osl_File.cxx
View File

@@ -296,12 +296,12 @@ inline void deleteTestDirectory( const ::rtl::OUString& basename, const ::rtl::O
/** Check for the file and directory access right. /** Check for the file and directory access right.
*/ */
typedef enum { enum class oslCheckMode {
osl_Check_Mode_Exist, Exist,
osl_Check_Mode_OpenAccess, OpenAccess,
osl_Check_Mode_ReadAccess, ReadAccess,
osl_Check_Mode_WriteAccess WriteAccess
} oslCheckMode; };
//check if the file exist //check if the file exist
inline bool ifFileExist( const ::rtl::OUString & str ) inline bool ifFileExist( const ::rtl::OUString & str )
@@ -345,15 +345,15 @@ inline bool checkDirectory( const ::rtl::OUString & str, oslCheckMode nCheckMode
if ( ( ::osl::FileBase::E_NOENT != rc ) && ( ::osl::FileBase::E_ACCES != rc ) ){ if ( ( ::osl::FileBase::E_NOENT != rc ) && ( ::osl::FileBase::E_ACCES != rc ) ){
switch ( nCheckMode ) { switch ( nCheckMode ) {
case osl_Check_Mode_Exist: case oslCheckMode::Exist:
if ( rc == ::osl::FileBase::E_None ) if ( rc == ::osl::FileBase::E_None )
bCheckResult = true; bCheckResult = true;
break; break;
case osl_Check_Mode_OpenAccess: case oslCheckMode::OpenAccess:
if ( rc == ::osl::FileBase::E_None ) if ( rc == ::osl::FileBase::E_None )
bCheckResult = true; bCheckResult = true;
break; break;
case osl_Check_Mode_ReadAccess: case oslCheckMode::ReadAccess:
//rc = pDir->getNextItem( rItem, 0 ); //rc = pDir->getNextItem( rItem, 0 );
rc = aDir.getNextItem( rItem ); rc = aDir.getNextItem( rItem );
if ( ( rc == ::osl::FileBase::E_None ) || ( rc == ::osl::FileBase::E_NOENT ) ) if ( ( rc == ::osl::FileBase::E_None ) || ( rc == ::osl::FileBase::E_NOENT ) )
@@ -361,7 +361,7 @@ inline bool checkDirectory( const ::rtl::OUString & str, oslCheckMode nCheckMode
else else
bCheckResult = false; bCheckResult = false;
break; break;
case osl_Check_Mode_WriteAccess: case oslCheckMode::WriteAccess:
( ( aUString += str ) += aSlashURL ) += aTmpName2; ( ( aUString += str ) += aSlashURL ) += aTmpName2;
//if ( ( rc = pDir->create( aUString ) ) == ::osl::FileBase::E_None ) //if ( ( rc = pDir->create( aUString ) ) == ::osl::FileBase::E_None )
if ( ( rc = Directory::create( aUString ) ) == ::osl::FileBase::E_None ) if ( ( rc = Directory::create( aUString ) ) == ::osl::FileBase::E_None )
@@ -1104,9 +1104,9 @@ namespace osl_FileBase
void getTempDirURL_002() void getTempDirURL_002()
{ {
CPPUNIT_ASSERT_MESSAGE( "test for getTempDirURL function: test for open and write access rights", CPPUNIT_ASSERT_MESSAGE( "test for getTempDirURL function: test for open and write access rights",
checkDirectory( aUStr, osl_Check_Mode_OpenAccess ) && checkDirectory( aUStr, oslCheckMode::OpenAccess ) &&
checkDirectory( aUStr, osl_Check_Mode_ReadAccess ) && checkDirectory( aUStr, oslCheckMode::ReadAccess ) &&
checkDirectory( aUStr,osl_Check_Mode_WriteAccess ) ); checkDirectory( aUStr, oslCheckMode::WriteAccess ) );
} }
CPPUNIT_TEST_SUITE( getTempDirURL ); CPPUNIT_TEST_SUITE( getTempDirURL );