diff options
| author | Christina Rossmanith <ChrRossmanith@web.de> | 2011-04-13 21:06:55 +0200 |
|---|---|---|
| committer | Christina Rossmanith <ChrRossmanith@web.de> | 2011-04-19 20:36:11 +0200 |
| commit | b0b3e5fdf811fa5939366f378a22755fb80e51ab (patch) | |
| tree | 23a560589b182bafd33621adfdcfabd1c1e7ceff /xmlhelp | |
| parent | 8a75a1f07d0c575ef08ab8385df3ef45e8552df1 (diff) | |
remove FileStatusMask_XXX in favour of osl_FileStatus_Mask_XXX (libs-core)
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.cxx | 6 | ||||
| -rw-r--r-- | xmlhelp/source/treeview/tvread.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index eb0ca7e6d886..570f9eebd5d7 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -435,7 +435,7 @@ const std::vector< rtl::OUString >& Databases::getModuleList( const rtl::OUStrin osl::Directory dirFile( dirName ); osl::DirectoryItem aDirItem; - osl::FileStatus aStatus( FileStatusMask_FileName ); + osl::FileStatus aStatus( osl_FileStatus_Mask_FileName ); sal_Int32 idx; @@ -445,7 +445,7 @@ const std::vector< rtl::OUString >& Databases::getModuleList( const rtl::OUStrin while( dirFile.getNextItem( aDirItem ) == osl::FileBase::E_None && aDirItem.getFileStatus( aStatus ) == osl::FileBase::E_None ) { - if( ! aStatus.isValid( FileStatusMask_FileName ) ) + if( ! aStatus.isValid( osl_FileStatus_Mask_FileName ) ) continue; fileName = aStatus.getFileName(); @@ -1296,7 +1296,7 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language, osl::DirectoryItem aDirItem; osl::File aFile( fileURL ); - osl::FileStatus aStatus( FileStatusMask_FileSize ); + osl::FileStatus aStatus( osl_FileStatus_Mask_FileSize ); if( osl::FileBase::E_None == osl::DirectoryItem::get( fileURL,aDirItem ) && osl::FileBase::E_None == aFile.open( osl_File_OpenFlag_Read ) && diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 6b74767acbed..ce9acf05663a 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -753,15 +753,15 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) } osl::Directory aDirectory( url ); - osl::FileStatus aFileStatus( FileStatusMask_FileName | FileStatusMask_FileSize | FileStatusMask_FileURL ); + osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_FileSize | osl_FileStatus_Mask_FileURL ); if( osl::Directory::E_None == aDirectory.open() ) { int idx_ = 0; rtl::OUString aFileUrl, aFileName; while( aDirectory.getNextItem( aDirItem ) == osl::FileBase::E_None && aDirItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None && - aFileStatus.isValid( FileStatusMask_FileURL ) && - aFileStatus.isValid( FileStatusMask_FileName ) ) + aFileStatus.isValid( osl_FileStatus_Mask_FileURL ) && + aFileStatus.isValid( osl_FileStatus_Mask_FileName ) ) { aFileUrl = aFileStatus.getFileURL(); aFileName = aFileStatus.getFileName(); @@ -777,7 +777,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) ( str[idx_ + 3] == 'e' || str[idx_ + 3] == 'E' ) && ( str[idx_ + 4] == 'e' || str[idx_ + 4] == 'E' ) ) { - OSL_ENSURE( aFileStatus.isValid( FileStatusMask_FileSize ), + OSL_ENSURE( aFileStatus.isValid( osl_FileStatus_Mask_FileSize ), "invalid file size" ); rtl::OUString baseName = aFileName.copy(0,idx_).toAsciiLowerCase(); |