remove FileStatusMask_XXX in favour of osl_FileStatus_Mask_XXX (ure)

jvmfwk/plugins/sunmajor/pluginlib/util.cxx

@@ -831,9 +831,9 @@ OUString resolveDirPath(const OUString & path)
     DirectoryItem item;
     if (DirectoryItem::get(sResolved, item) == File::E_None)
     {
-        FileStatus status(FileStatusMask_Type |
-                          FileStatusMask_LinkTargetURL |
-                          FileStatusMask_FileURL);
+        FileStatus status(osl_FileStatus_Mask_Type |
+                          osl_FileStatus_Mask_LinkTargetURL |
+                          osl_FileStatus_Mask_FileURL);
 
         if (item.getFileStatus(status) == File::E_None
             && status.getFileType() == FileStatus::Directory)
@@ -865,9 +865,9 @@ OUString resolveFilePath(const OUString & path)
     DirectoryItem item;
     if (DirectoryItem::get(sResolved, item) == File::E_None)
     {
-        FileStatus status(FileStatusMask_Type |
-                          FileStatusMask_LinkTargetURL |
-                          FileStatusMask_FileURL);
+        FileStatus status(osl_FileStatus_Mask_Type |
+                          osl_FileStatus_Mask_LinkTargetURL |
+                          osl_FileStatus_Mask_FileURL);
         if (item.getFileStatus(status) == File::E_None
             && status.getFileType() == FileStatus::Regular)
         {
@@ -1157,7 +1157,7 @@ bool makeDriveLetterSame(OUString * fileURL)
     DirectoryItem item;
     if (DirectoryItem::get(*fileURL, item) == File::E_None)
     {
-        FileStatus status(FileStatusMask_FileURL);
+        FileStatus status(osl_FileStatus_Mask_FileURL);
         if (item.getFileStatus(status) == File::E_None)
         {
             *fileURL = status.getFileURL();
@@ -1246,7 +1246,7 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
                     File::RC errNext = File::E_None;
                     while( (errNext = aCollectionDir.getNextItem(curIt)) == File::E_None)
                     {
-                        FileStatus aStatus(FileStatusMask_FileURL);
+                        FileStatus aStatus(osl_FileStatus_Mask_FileURL);
                         File::RC errStatus = File::E_None;
                         if ((errStatus = curIt.getFileStatus(aStatus)) != File::E_None)
                         {

jvmfwk/source/elements.cxx

@@ -750,9 +750,9 @@ jfw::FileStatus NodeJava::checkSettingsFileStatus() const
     if (File::E_None == rc)
     {
         ::osl::FileStatus stat(
-            FileStatusMask_Validate
-            | FileStatusMask_CreationTime
-            | FileStatusMask_ModifyTime);
+            osl_FileStatus_Mask_Validate
+            | osl_FileStatus_Mask_CreationTime
+            | osl_FileStatus_Mask_ModifyTime);
         File::RC rc_stat = item.getFileStatus(stat);
         if (File::E_None == rc_stat)
         {

jvmfwk/source/fwkutil.cxx

@@ -330,7 +330,7 @@ jfw::FileStatus checkFileURL(const rtl::OUString & sURL)
     File::RC rc_item = DirectoryItem::get(sURL, item);
     if (File::E_None == rc_item)
     {
-        osl::FileStatus status(FileStatusMask_Validate);
+        osl::FileStatus status(osl_FileStatus_Mask_Validate);
 
         File::RC rc_stat = item.getFileStatus(status);
         if (File::E_None == rc_stat)

sal/inc/osl/file.hxx

@@ -677,18 +677,6 @@ public:
 
 // -----------------------------------------------------------------------------
 
-#define FileStatusMask_Type             osl_FileStatus_Mask_Type
-#define FileStatusMask_Attributes       osl_FileStatus_Mask_Attributes
-#define FileStatusMask_CreationTime     osl_FileStatus_Mask_CreationTime
-#define FileStatusMask_AccessTime       osl_FileStatus_Mask_AccessTime
-#define FileStatusMask_ModifyTime       osl_FileStatus_Mask_ModifyTime
-#define FileStatusMask_FileSize         osl_FileStatus_Mask_FileSize
-#define FileStatusMask_FileName         osl_FileStatus_Mask_FileName
-#define FileStatusMask_FileURL          osl_FileStatus_Mask_FileURL
-#define FileStatusMask_LinkTargetURL    osl_FileStatus_Mask_LinkTargetURL
-#define FileStatusMask_All              osl_FileStatus_Mask_All
-#define FileStatusMask_Validate         osl_FileStatus_Mask_Validate
-
 #define Attribute_ReadOnly     osl_File_Attribute_ReadOnly
 #define Attribute_Hidden       osl_File_Attribute_Hidden
 #define Attribute_Executable   osl_File_Attribute_Executable
@@ -783,7 +771,7 @@ public:
     */
     inline Type getFileType() const
     {
-        return (_aStatus.uValidFields & FileStatusMask_Type) ?  (Type) _aStatus.eType : Unknown;
+        return (_aStatus.uValidFields & osl_FileStatus_Mask_Type) ?  (Type) _aStatus.eType : Unknown;
     }
 
     /** Get the file attributes.

sal/rtl/source/bootstrap.cxx

@@ -353,7 +353,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
 {
     OUString base_ini( getIniFileName_Impl() );
     // normalize path
-    FileStatus status( FileStatusMask_FileURL );
+    FileStatus status( osl_FileStatus_Mask_FileURL );
     DirectoryItem dirItem;
     if (DirectoryItem::E_None == DirectoryItem::get( base_ini, dirItem ) &&
         DirectoryItem::E_None == dirItem.getFileStatus( status ))
@@ -645,7 +645,7 @@ rtlBootstrapHandle SAL_CALL rtl_bootstrap_args_open (
     OUString iniName( pIniName );
 
     // normalize path
-    FileStatus status( FileStatusMask_FileURL );
+    FileStatus status( osl_FileStatus_Mask_FileURL );
     DirectoryItem dirItem;
     if (DirectoryItem::E_None != DirectoryItem::get( iniName, dirItem ) ||
         DirectoryItem::E_None != dirItem.getFileStatus( status ))

sal/workben/testfile.cxx

@@ -129,7 +129,7 @@ sal_Bool testLineBreak( sal_Char *pCount , sal_uInt64 nLen , sal_uInt32 *cLineBr
 sal_Bool Initialize( void )
 {
     DirectoryItem   aItem;
-    FileStatus      aStatus( FileStatusMask_All );
+    FileStatus      aStatus( osl_FileStatus_Mask_All );
     rtl_uString     *strExeFileURL=NULL;
     oslProcessError ProcessError;
 
@@ -1110,7 +1110,7 @@ void FileSizeTest( void )
 
         if ( rc == FileBase::E_None )
         {
-            FileStatus rStatus( FileStatusMask_FileSize  );
+            FileStatus rStatus( osl_FileStatus_Mask_FileSize  );
             rc=aItem.getFileStatus( rStatus );
             print_error( rtl::OString( "Get FileStatus" ), rc );
 
@@ -1239,7 +1239,7 @@ void verifyFileAttributes( void )
 {
     FileBase::RC    rc;
     DirectoryItem   aItem;
-    FileStatus rStatus( FileStatusMask_Attributes  );
+    FileStatus rStatus( osl_FileStatus_Mask_Attributes  );
 
     printf( "\nVerify:\n" );
 
@@ -1497,7 +1497,7 @@ void FileTimeTest( void )
     // Verify
     //--------------------------------------------------
 
-    FileStatus rStatus( FileStatusMask_CreationTime | FileStatusMask_AccessTime | FileStatusMask_ModifyTime);
+    FileStatus rStatus( osl_FileStatus_Mask_CreationTime | osl_FileStatus_Mask_AccessTime | osl_FileStatus_Mask_ModifyTime);
 
     printf( "\nVerify:\n" );
 
@@ -1588,7 +1588,7 @@ void DirectoryItemTest( void )
     rc=DirectoryItem::get( dir1 , aItem );
     print_error( rtl::OString( "GetDirectoryItem" ), rc );
 
-    pStatus=new FileStatus( FileStatusMask_All );
+    pStatus=new FileStatus( osl_FileStatus_Mask_All );
     rc=aItem.getFileStatus( *pStatus );
 
     if ( rc==FileBase::E_None )
@@ -1626,7 +1626,7 @@ void DirectoryItemTest( void )
     rc=DirectoryItem::get( file1 , aItem );
     print_error( rtl::OString( "GetDirectoryItem" ), rc );
 
-    pStatus=new FileStatus( FileStatusMask_All );
+    pStatus=new FileStatus( osl_FileStatus_Mask_All );
     rc=aItem.getFileStatus( *pStatus );
 
     if ( rc==FileBase::E_None )
@@ -1682,7 +1682,7 @@ void DirectoryItemTest( void )
         rc=DirectoryItem::get( file1 , aItem );
         print_error( rtl::OString( "GetDirectoryItem" ), rc );
 
-        pStatus=new FileStatus( FileStatusMask_All );
+        pStatus=new FileStatus( osl_FileStatus_Mask_All );
         rc=aItem.getFileStatus( *pStatus );
 
         if ( rc==FileBase::E_None )
@@ -1741,7 +1741,7 @@ void DirectoryItemTest( void )
         while( rc==FileBase::E_None )
         {
 
-            FileStatus rStatus( FileStatusMask_All );
+            FileStatus rStatus( osl_FileStatus_Mask_All );
             aItem.getFileStatus( rStatus );
 
             str=rStatus.getFileName();
@@ -1766,7 +1766,7 @@ void DirectoryItemTest( void )
             rc=pDir->reset();
             rc=pDir->getNextItem( aItem );
 
-            FileStatus rStatus( FileStatusMask_All );
+            FileStatus rStatus( osl_FileStatus_Mask_All );
             aItem.getFileStatus( rStatus );
 
             str1[i]=rStatus.getFileName();
@@ -1945,7 +1945,7 @@ void DirectoryFileStatusTest( void )
 
     if ( rc==FileBase::E_None )
     {
-        pStatus=new FileStatus( FileStatusMask_All );
+        pStatus=new FileStatus( osl_FileStatus_Mask_All );
         rc=aItem.getFileStatus( *pStatus );
 
         FileStatusTest( pStatus );
@@ -1984,7 +1984,7 @@ void FileFileStatusTest( void )
 
     if ( rc==FileBase::E_None )
     {
-        pStatus=new FileStatus( FileStatusMask_All );
+        pStatus=new FileStatus( osl_FileStatus_Mask_All );
         rc=aItem.getFileStatus( *pStatus );
 
         FileStatusTest( pStatus );
@@ -2023,7 +2023,7 @@ void VolumeFileStatusTest( void )
 
     if ( rc==FileBase::E_None )
     {
-        pStatus=new FileStatus( FileStatusMask_All) ;
+        pStatus=new FileStatus( osl_FileStatus_Mask_All) ;
         rc=aItem.getFileStatus( *pStatus );
 
         FileStatusTest( pStatus );