remove FileStatusMask_XXX in favour of osl_FileStatus_Mask_XXX (libs-core)

3 files changed, 41 insertions, 48 deletions

diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index 1a7b37b6988e..dda322c10fa9 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -94,7 +94,7 @@ namespace {
         if (osl::DirectoryItem::get(rPhysicalUrl, aItem) ==
             osl::FileBase::E_None)
         {
-            osl::FileStatus aStatus( FileStatusMask_Type );
+            osl::FileStatus aStatus( osl_FileStatus_Mask_Type );
             if (aItem.getFileStatus(aStatus) == osl::FileBase::E_None)
                 switch (aStatus.getFileType())
                 {
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index bb14f176532d..7f6a3c159170 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -321,8 +321,8 @@ FileProvider::compareContentIds(
         if ( error != osl::FileBase::E_None )
             return iComp;
 
-        osl::FileStatus aStatus1( FileStatusMask_FileURL );
-        osl::FileStatus aStatus2( FileStatusMask_FileURL );
+        osl::FileStatus aStatus1( osl_FileStatus_Mask_FileURL );
+        osl::FileStatus aStatus2( osl_FileStatus_Mask_FileURL );
         error = aItem1.getFileStatus( aStatus1 );
         if ( error == osl::FileBase::E_None )
             error = aItem2.getFileStatus( aStatus2 );
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index f51b7c7721e2..bee624e0414d 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -941,10 +941,10 @@ shell::setv( const rtl::OUString& aUnqPath,
                     sal_uInt64 nAttributes(0);
                     if(err == osl::FileBase::E_None)
                     {
-                        osl::FileStatus aFileStatus(FileStatusMask_Attributes);
+                        osl::FileStatus aFileStatus(osl_FileStatus_Mask_Attributes);
                         err = aDirItem.getFileStatus(aFileStatus);
                         if(err == osl::FileBase::E_None &&
-                           aFileStatus.isValid(FileStatusMask_Attributes))
+                           aFileStatus.isValid(osl_FileStatus_Mask_Attributes))
                             nAttributes = aFileStatus.getAttributes();
                     }
                     // now we have the attributes provided all went well.
@@ -1162,13 +1162,13 @@ shell::move( sal_Int32 CommandId,
             // stat to determine whether we have a symlink
             rtl::OUString targetPath(dstUnqPath);
 
-            osl::FileStatus aStatus(FileStatusMask_Type|FileStatusMask_LinkTargetURL);
+            osl::FileStatus aStatus(osl_FileStatus_Mask_Type|osl_FileStatus_Mask_LinkTargetURL);
             osl::DirectoryItem aItem;
             osl::DirectoryItem::get(dstUnqPath,aItem);
             aItem.getFileStatus(aStatus);
 
-            if( aStatus.isValid(FileStatusMask_Type)          &&
-                aStatus.isValid(FileStatusMask_LinkTargetURL) &&
+            if( aStatus.isValid(osl_FileStatus_Mask_Type)          &&
+                aStatus.isValid(osl_FileStatus_Mask_LinkTargetURL) &&
                 aStatus.getFileType() == osl::FileStatus::Link )
                 targetPath = aStatus.getLinkTargetURL();
 
@@ -1279,9 +1279,9 @@ shell::move( sal_Int32 CommandId,
                       nError );
         return;
     }
-    osl::FileStatus aStatus( FileStatusMask_Type );
+    osl::FileStatus aStatus( osl_FileStatus_Mask_Type );
     nError = aItem.getFileStatus( aStatus );
-    if( nError != osl::FileBase::E_None || ! aStatus.isValid( FileStatusMask_Type ) )
+    if( nError != osl::FileBase::E_None || ! aStatus.isValid( osl_FileStatus_Mask_Type ) )
     {
         installError( CommandId,
                       TASKHANDLING_TRANSFER_BY_MOVE_SOURCESTAT,
@@ -1330,7 +1330,7 @@ bool getType(
         task.installError(id, TASKHANDLING_TRANSFER_BY_COPY_SOURCE, err);
         return false;
     }
-    osl::FileStatus stat(FileStatusMask_Type);
+    osl::FileStatus stat(osl_FileStatus_Mask_Type);
     err = item->getFileStatus(stat);
     if (err != osl::FileBase::E_None) {
         task.installError(id, TASKHANDLING_TRANSFER_BY_COPY_SOURCESTAT, err);
@@ -1365,7 +1365,7 @@ shell::copy(
     }
     rtl::OUString rslvdSrcUnqPath;
     if (type == osl::FileStatus::Link) {
-        osl::FileStatus stat(FileStatusMask_LinkTargetURL);
+        osl::FileStatus stat(osl_FileStatus_Mask_LinkTargetURL);
         nError = item.getFileStatus(stat);
         if (nError != osl::FileBase::E_None) {
             installError(
@@ -1525,7 +1525,7 @@ shell::remove( sal_Int32 CommandId,
                sal_Bool  MustExist )
     throw()
 {
-    sal_Int32 nMask = FileStatusMask_Type | FileStatusMask_FileURL;
+    sal_Int32 nMask = osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL;
 
     osl::DirectoryItem aItem;
     osl::FileStatus aStatus( nMask );
@@ -2034,7 +2034,7 @@ shell::copy_recursive( const rtl::OUString& srcUnqPath,
         osl::FileBase::RC next = err;
         if( err == osl::FileBase::E_None )
         {
-            sal_Int32 n_Mask = FileStatusMask_FileURL | FileStatusMask_FileName | FileStatusMask_Type;
+            sal_Int32 n_Mask = osl_FileStatus_Mask_FileURL | osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_Type;
 
             osl::DirectoryItem aDirItem;
 
@@ -2043,19 +2043,19 @@ shell::copy_recursive( const rtl::OUString& srcUnqPath,
                 sal_Bool IsDoc = false;
                 osl::FileStatus aFileStatus( n_Mask );
                 aDirItem.getFileStatus( aFileStatus );
-                if( aFileStatus.isValid( FileStatusMask_Type ) )
+                if( aFileStatus.isValid( osl_FileStatus_Mask_Type ) )
                     IsDoc = aFileStatus.getFileType() == osl::FileStatus::Regular;
 
                 // Getting the information for the next recursive copy
                 sal_Int32 newTypeToCopy = IsDoc ? -1 : +1;
 
                 rtl::OUString newSrcUnqPath;
-                if( aFileStatus.isValid( FileStatusMask_FileURL ) )
+                if( aFileStatus.isValid( osl_FileStatus_Mask_FileURL ) )
                     newSrcUnqPath = aFileStatus.getFileURL();
 
                 rtl::OUString newDstUnqPath = dstUnqPath;
                 rtl::OUString tit;
-                if( aFileStatus.isValid( FileStatusMask_FileName ) )
+                if( aFileStatus.isValid( osl_FileStatus_Mask_FileName ) )
                     tit = rtl::Uri::encode( aFileStatus.getFileName(),
                                           rtl_UriCharClassPchar,
                                           rtl_UriEncodeIgnoreEscapes,
@@ -2168,9 +2168,9 @@ shell::getMaskFromProperties(
     n_Mask = 0;
     for(sal_Int32 j = 0; j < seq.getLength(); ++j) {
         if(seq[j].Name == Title)
-            n_Mask |= FileStatusMask_FileName;
+            n_Mask |= osl_FileStatus_Mask_FileName;
         else if(seq[j].Name == CasePreservingURL)
-            n_Mask |= FileStatusMask_FileURL;
+            n_Mask |= osl_FileStatus_Mask_FileURL;
         else if(seq[j].Name == IsDocument ||
                 seq[j].Name == IsFolder ||
                 seq[j].Name == IsVolume ||
@@ -2179,23 +2179,16 @@ shell::getMaskFromProperties(
                 seq[j].Name == IsCompactDisc ||
                 seq[j].Name == IsFloppy ||
                 seq[j].Name == ContentType)
-            n_Mask |= (FileStatusMask_Type | FileStatusMask_LinkTargetURL);
+            n_Mask |= (osl_FileStatus_Mask_Type | osl_FileStatus_Mask_LinkTargetURL);
         else if(seq[j].Name == Size)
-            n_Mask |= (FileStatusMask_FileSize |
-                      FileStatusMask_Type |
-                      FileStatusMask_LinkTargetURL);
+            n_Mask |= (osl_FileStatus_Mask_FileSize |
+                      osl_FileStatus_Mask_Type |
+                      osl_FileStatus_Mask_LinkTargetURL);
         else if(seq[j].Name == IsHidden ||
                 seq[j].Name == IsReadOnly)
-            n_Mask |= FileStatusMask_Attributes;
+            n_Mask |= osl_FileStatus_Mask_Attributes;
         else if(seq[j].Name == DateModified)
-            n_Mask |= FileStatusMask_ModifyTime;
-//         n_Mask = FileStatusMask_FileURL;
-//         n_Mask |= FileStatusMask_LinkTargetURL;
-//         n_Mask |= FileStatusMask_FileName;
-//         n_Mask |= FileStatusMask_Type;
-//         n_Mask |= FileStatusMask_ModifyTime;
-//         n_Mask |= FileStatusMask_FileSize;
-//         n_Mask |= FileStatusMask_Attributes;
+            n_Mask |= osl_FileStatus_Mask_ModifyTime;
     }
 }
 
@@ -2290,7 +2283,7 @@ shell::commit( const shell::ContentMap::iterator& it,
     it1 = properties.find( MyProperty( Title ) );
     if( it1 != properties.end() )
     {
-        if( aFileStatus.isValid( FileStatusMask_FileName ) )
+        if( aFileStatus.isValid( osl_FileStatus_Mask_FileName ) )
         {
             aAny <<= aFileStatus.getFileName();
             it1->setValue( aAny );
@@ -2300,7 +2293,7 @@ shell::commit( const shell::ContentMap::iterator& it,
     it1 = properties.find( MyProperty( CasePreservingURL ) );
     if( it1 != properties.end() )
     {
-        if( aFileStatus.isValid( FileStatusMask_FileURL ) )
+        if( aFileStatus.isValid( osl_FileStatus_Mask_FileURL ) )
         {
             aAny <<= aFileStatus.getFileURL();
             it1->setValue( aAny );
@@ -2312,19 +2305,19 @@ shell::commit( const shell::ContentMap::iterator& it,
 
     sal_Int64 dirSize = 0;
 
-    if( aFileStatus.isValid( FileStatusMask_FileSize ) )
+    if( aFileStatus.isValid( osl_FileStatus_Mask_FileSize ) )
         dirSize = aFileStatus.getFileSize();
 
-    if( aFileStatus.isValid( FileStatusMask_Type ) )
+    if( aFileStatus.isValid( osl_FileStatus_Mask_Type ) )
     {
         if( osl::FileStatus::Link == aFileStatus.getFileType() &&
-            aFileStatus.isValid( FileStatusMask_LinkTargetURL ) )
+            aFileStatus.isValid( osl_FileStatus_Mask_LinkTargetURL ) )
         {
             osl::DirectoryItem aDirItem;
-            osl::FileStatus aFileStatus2( FileStatusMask_Type );
+            osl::FileStatus aFileStatus2( osl_FileStatus_Mask_Type );
             if( osl::FileBase::E_None == osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(),aDirItem ) &&
                 osl::FileBase::E_None == aDirItem.getFileStatus( aFileStatus2 )    &&
-                aFileStatus2.isValid( FileStatusMask_Type ) )
+                aFileStatus2.isValid( osl_FileStatus_Mask_Type ) )
             {
                 isVolume = osl::FileStatus::Volume == aFileStatus2.getFileType();
                 isDirectory =
@@ -2333,7 +2326,7 @@ shell::commit( const shell::ContentMap::iterator& it,
                 isFile =
                     osl::FileStatus::Regular == aFileStatus2.getFileType();
 
-                if( aFileStatus2.isValid( FileStatusMask_FileSize ) )
+                if( aFileStatus2.isValid( osl_FileStatus_Mask_FileSize ) )
                     dirSize = aFileStatus2.getFileSize();
             }
             else
@@ -2431,7 +2424,7 @@ shell::commit( const shell::ContentMap::iterator& it,
     it1 = properties.find( MyProperty( IsReadOnly ) );
     if( it1 != properties.end() )
     {
-        if( aFileStatus.isValid( FileStatusMask_Attributes ) )
+        if( aFileStatus.isValid( osl_FileStatus_Mask_Attributes ) )
         {
             sal_uInt64 Attr = aFileStatus.getAttributes();
             sal_Bool readonly = ( Attr & Attribute_ReadOnly ) != 0;
@@ -2442,7 +2435,7 @@ shell::commit( const shell::ContentMap::iterator& it,
     it1 = properties.find( MyProperty( IsHidden ) );
     if( it1 != properties.end() )
     {
-        if( aFileStatus.isValid( FileStatusMask_Attributes ) )
+        if( aFileStatus.isValid( osl_FileStatus_Mask_Attributes ) )
         {
             sal_uInt64 Attr = aFileStatus.getAttributes();
             sal_Bool ishidden = ( Attr & Attribute_Hidden ) != 0;
@@ -2453,7 +2446,7 @@ shell::commit( const shell::ContentMap::iterator& it,
     it1 = properties.find( MyProperty( DateModified ) );
     if( it1 != properties.end() )
     {
-        if( aFileStatus.isValid( FileStatusMask_ModifyTime ) )
+        if( aFileStatus.isValid( osl_FileStatus_Mask_ModifyTime ) )
         {
             TimeValue temp = aFileStatus.getModifyTime();
 
@@ -2479,7 +2472,7 @@ shell::commit( const shell::ContentMap::iterator& it,
     it1 = properties.find( MyProperty( CreatableContentsInfo ) );
     if( it1 != properties.end() )
         it1->setValue( uno::makeAny(
-            isDirectory || !aFileStatus.isValid( FileStatusMask_Type )
+            isDirectory || !aFileStatus.isValid( osl_FileStatus_Mask_Type )
                 ? queryCreatableContentsInfo()
                 : uno::Sequence< ucb::ContentInfo >() ) );
 }
@@ -2504,9 +2497,9 @@ shell::getv(
 
     // Always retrieve the type and the target URL because item might be a link
     osl::FileStatus aFileStatus( n_Mask |
-                                 FileStatusMask_FileURL |
-                                 FileStatusMask_Type |
-                                 FileStatusMask_LinkTargetURL );
+                                 osl_FileStatus_Mask_FileURL |
+                                 osl_FileStatus_Mask_Type |
+                                 osl_FileStatus_Mask_LinkTargetURL );
     aDirItem.getFileStatus( aFileStatus );
     aUnqPath = aFileStatus.getFileURL();
 
@@ -2521,7 +2514,7 @@ shell::getv(
         osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), aTargetItem );
         if ( aTargetItem.is() )
         {
-            osl::FileStatus aTargetStatus( FileStatusMask_Type );
+            osl::FileStatus aTargetStatus( osl_FileStatus_Mask_Type );
 
             if ( osl::FileBase::E_None ==
                  ( result = aTargetItem.getFileStatus( aTargetStatus ) ) )