remove FileStatusMask_XXX in favour of osl_FileStatus_Mask_XXX (libs-core)

22 files changed, 87 insertions, 94 deletions

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 1f73c8a80745..39737fbcf9f0 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -689,7 +689,7 @@ void implRemoveDirRecursive( const String& aDirPath )
     FileBase::RC nRet = DirectoryItem::get( aDirPath, aItem );
     sal_Bool bExists = (nRet == FileBase::E_None);
 
-    FileStatus aFileStatus( FileStatusMask_Type );
+    FileStatus aFileStatus( osl_FileStatus_Mask_Type );
     nRet = aItem.getFileStatus( aFileStatus );
     FileStatus::Type aType = aFileStatus.getFileType();
     sal_Bool bFolder = isFolder( aType );
@@ -716,7 +716,7 @@ void implRemoveDirRecursive( const String& aDirPath )
             break;
 
         // Handle flags
-        FileStatus aFileStatus2( FileStatusMask_Type | FileStatusMask_FileURL );
+        FileStatus aFileStatus2( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL );
         nRet = aItem2.getFileStatus( aFileStatus2 );
         ::rtl::OUString aPath = aFileStatus2.getFileURL();
 
@@ -845,7 +845,7 @@ RTLFUNC(FileLen)
         {
             DirectoryItem aItem;
             DirectoryItem::get( getFullPathUNC( aStr ), aItem );
-            FileStatus aFileStatus( FileStatusMask_FileSize );
+            FileStatus aFileStatus( osl_FileStatus_Mask_FileSize );
             aItem.getFileStatus( aFileStatus );
             nLen = (sal_Int32)aFileStatus.getFileSize();
         }
@@ -2459,7 +2459,7 @@ String getDirectoryPath( String aPathStr )
     FileBase::RC nRet = DirectoryItem::get( aPathStr, aItem );
     if( nRet == FileBase::E_None )
     {
-        FileStatus aFileStatus( FileStatusMask_Type );
+        FileStatus aFileStatus( osl_FileStatus_Mask_Type );
         nRet = aItem.getFileStatus( aFileStatus );
         if( nRet == FileBase::E_None )
         {
@@ -2470,7 +2470,7 @@ String getDirectoryPath( String aPathStr )
             }
             else if( aType == FileStatus::Link )
             {
-                FileStatus aFileStatus2( FileStatusMask_LinkTargetURL );
+                FileStatus aFileStatus2( osl_FileStatus_Mask_LinkTargetURL );
                 nRet = aItem.getFileStatus( aFileStatus2 );
                 if( nRet == FileBase::E_None )
                     aRetStr = getDirectoryPath( aFileStatus2.getLinkTargetURL() );
@@ -2817,7 +2817,7 @@ RTLFUNC(Dir)
                         }
 
                         // Handle flags
-                        FileStatus aFileStatus( FileStatusMask_Type | FileStatusMask_FileName );
+                        FileStatus aFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName );
                         nRet = aItem.getFileStatus( aFileStatus );
 
                         // Only directories?
@@ -2917,7 +2917,7 @@ RTLFUNC(GetAttr)
         {
             DirectoryItem aItem;
             DirectoryItem::get( getFullPathUNC( rPar.Get(1)->GetString() ), aItem );
-            FileStatus aFileStatus( FileStatusMask_Attributes | FileStatusMask_Type );
+            FileStatus aFileStatus( osl_FileStatus_Mask_Attributes | osl_FileStatus_Mask_Type );
             aItem.getFileStatus( aFileStatus );
             sal_uInt64 nAttributes = aFileStatus.getAttributes();
             sal_Bool bReadOnly = (nAttributes & Attribute_ReadOnly) != 0;
@@ -2969,7 +2969,7 @@ RTLFUNC(FileDateTime)
         {
             DirectoryItem aItem;
             DirectoryItem::get( getFullPathUNC( aPath ), aItem );
-            FileStatus aFileStatus( FileStatusMask_ModifyTime );
+            FileStatus aFileStatus( osl_FileStatus_Mask_ModifyTime );
             aItem.getFileStatus( aFileStatus );
             TimeValue aTimeVal = aFileStatus.getModifyTime();
             oslDateTime aDT;
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 108e08fa7a12..3896fbee4cdc 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -650,8 +650,8 @@ void Components::parseFiles(
                 css::uno::Reference< css::uno::XInterface >());
         }
         osl::FileStatus stat(
-            FileStatusMask_Type | FileStatusMask_FileName |
-            FileStatusMask_FileURL);
+            osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |
+            osl_FileStatus_Mask_FileURL);
         if (i.getFileStatus(stat) != osl::FileBase::E_None) {
             throw css::uno::RuntimeException(
                 (rtl::OUString(
@@ -742,8 +742,8 @@ void Components::parseXcdFiles(int layer, rtl::OUString const & url) {
                 css::uno::Reference< css::uno::XInterface >());
         }
         osl::FileStatus stat(
-            FileStatusMask_Type | FileStatusMask_FileName |
-            FileStatusMask_FileURL);
+            osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |
+            osl_FileStatus_Mask_FileURL);
         if (i.getFileStatus(stat) != osl::FileBase::E_None) {
             throw css::uno::RuntimeException(
                 (rtl::OUString(
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 481cc7863c20..50870491cf0b 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -124,7 +124,7 @@ namespace
                     ::osl::FileBase::RC result = ::osl::DirectoryItem::get( sProductDirCandidate + ::rtl::OUString::createFromAscii( pProfileRegistry ), aRegistryItem );
                     if ( result == ::osl::FileBase::E_None  )
                     {
-                        ::osl::FileStatus aStatus( FileStatusMask_Validate );
+                        ::osl::FileStatus aStatus( osl_FileStatus_Mask_Validate );
                         result = aRegistryItem.getFileStatus( aStatus );
                         if ( result == ::osl::FileBase::E_None  )
                         {
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 8335825ce6a9..b37820578355 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -478,8 +478,8 @@ static bool needsSynchronization(
 
     //compare the modification time of the extension folder and the last
     //modified file
-    ::osl::FileStatus statUser(FileStatusMask_ModifyTime);
-    ::osl::FileStatus statBase(FileStatusMask_ModifyTime);
+    ::osl::FileStatus statUser(osl_FileStatus_Mask_ModifyTime);
+    ::osl::FileStatus statBase(osl_FileStatus_Mask_ModifyTime);
     if (itemUserFile.getFileStatus(statUser) == ::osl::File::E_None)
     {
         if (itemBaseFile.getFileStatus(statBase) == ::osl::File::E_None)
@@ -612,9 +612,9 @@ throw()
             bool bExcludeFiles = excludeTmpFilesAndFolders(srcUnqPath);
             if (aDir.open() == 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;
                 while( err == osl::FileBase::E_None && ( next = aDir.getNextItem( aDirItem ) ) == osl::FileBase::E_None )
@@ -623,19 +623,19 @@ throw()
                     sal_Bool bFilter = 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 ) )
                     {
                         ::rtl::OUString aFileName = aFileStatus.getFileName();
                         tit = rtl::Uri::encode( aFileName,
@@ -2972,7 +2972,7 @@ String GetURL_Impl(
                                                 RTL_TEXTENCODING_UTF8, true );
     String        aFileURL = aURL.GetMainURL(INetURLObject::NO_DECODE);
 
-    ::osl::FileStatus aStatus( FileStatusMask_FileURL );
+    ::osl::FileStatus aStatus( osl_FileStatus_Mask_FileURL );
     ::osl::DirectoryItem aItem;
     if( ::osl::FileBase::E_None == ::osl::DirectoryItem::get( aFileURL, aItem ) &&
         ::osl::FileBase::E_None == aItem.getFileStatus( aStatus ) )
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 0c55c6db4aff..b88355910d51 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -171,7 +171,7 @@ namespace desktop {
         FileBase::RC err;
         DirectoryItem aDirItem;
         DirectoryItem::get(srcUnqPath, aDirItem);
-        FileStatus aFileStatus(FileStatusMask_All);
+        FileStatus aFileStatus(osl_FileStatus_Mask_All);
         aDirItem.getFileStatus(aFileStatus);
 
         if( aFileStatus.getFileType() == FileStatus::Directory)
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 053e193729dc..02bffa948e03 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -299,7 +299,7 @@ bool BackendImpl::PackageImpl::extensionContainsCompiledHelp()
         while ((errorNext = helpFolder.getNextItem(item)) == ::osl::File::E_None)
         {
             //No find the language folders
-            ::osl::FileStatus stat(FileStatusMask_Type | FileStatusMask_FileName |FileStatusMask_FileURL);
+            ::osl::FileStatus stat(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |osl_FileStatus_Mask_FileURL);
             if (item.getFileStatus(stat) == ::osl::File::E_None)
             {
                 if (stat.getFileType() != ::osl::FileStatus::Directory)
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 1ed91e906886..f8f0a99606df 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -644,7 +644,7 @@ strings_vr MigrationImpl::getAllFiles(const OUString& baseURL) const
 
         // work through directory contents...
         DirectoryItem item;
-        FileStatus fs(FileStatusMask_Type | FileStatusMask_FileURL);
+        FileStatus fs(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL);
         while (dir.getNextItem(item) == FileBase::E_None)
         {
             if (item.getFileStatus(fs) == FileBase::E_None)
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index e769d9cd8257..fb86474c8578 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -179,7 +179,7 @@ LicensePage::LicensePage( svt::OWizardMachine* parent, const ResId& resid, const
     {
         DirectoryItem d;
         DirectoryItem::get(rLicensePath, d);
-        FileStatus fs(FileStatusMask_FileSize);
+        FileStatus fs(osl_FileStatus_Mask_FileSize);
         d.getFileStatus(fs);
         sal_uInt64 nBytesRead = 0;
         sal_uInt64 nPosition = 0;
diff --git a/desktop/source/migration/services/autocorrmigration.cxx b/desktop/source/migration/services/autocorrmigration.cxx
index 6e2f26c771ec..c3d24e941375 100644
--- a/desktop/source/migration/services/autocorrmigration.cxx
+++ b/desktop/source/migration/services/autocorrmigration.cxx
@@ -115,7 +115,7 @@ namespace migration
             ::osl::DirectoryItem aItem;
             while ( aDir.getNextItem( aItem ) == ::osl::FileBase::E_None )
             {
-                ::osl::FileStatus aFileStatus( FileStatusMask_Type | FileStatusMask_FileURL );
+                ::osl::FileStatus aFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL );
                 if ( aItem.getFileStatus( aFileStatus ) == ::osl::FileBase::E_None )
                 {
                     if ( aFileStatus.getFileType() == ::osl::FileStatus::Directory )
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index ab8e95055724..f4adfa27ed9d 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -112,7 +112,7 @@ namespace migration
             ::osl::DirectoryItem aItem;
             while ( aDir.getNextItem( aItem ) == ::osl::FileBase::E_None )
             {
-                ::osl::FileStatus aFileStatus( FileStatusMask_Type | FileStatusMask_FileURL );
+                ::osl::FileStatus aFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL );
                 if ( aItem.getFileStatus( aFileStatus ) == ::osl::FileBase::E_None )
                 {
                     if ( aFileStatus.getFileType() == ::osl::FileStatus::Directory )
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 43d1036b65a7..dc508e712cc9 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -140,7 +140,7 @@ OO3ExtensionMigration::~OO3ExtensionMigration()
 void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDir, TStringVector& aMigrateExtensions )
 {
     osl::Directory    aScanRootDir( sSourceDir );
-    osl::FileStatus   fs(FileStatusMask_Type | FileStatusMask_FileURL);
+    osl::FileStatus   fs(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL);
     osl::FileBase::RC nRetCode = aScanRootDir.open();
     if ( nRetCode == osl::Directory::E_None )
     {
@@ -187,7 +187,7 @@ OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( co
     {
         // work through directory contents...
         osl::DirectoryItem item;
-        osl::FileStatus fs(FileStatusMask_Type | FileStatusMask_FileURL);
+        osl::FileStatus fs(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL);
         TStringVector aDirectories;
         while ((aDir.getNextItem(item) == osl::FileBase::E_None ) &&
                ( aResult == SCANRESULT_NOTFOUND ))
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index fa114022897a..dc3c73efff5b 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -114,7 +114,7 @@ namespace migration
             ::osl::DirectoryItem aItem;
             while ( aDir.getNextItem( aItem ) == ::osl::FileBase::E_None )
             {
-                ::osl::FileStatus aFileStatus( FileStatusMask_Type | FileStatusMask_FileURL );
+                ::osl::FileStatus aFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL );
                 if ( aItem.getFileStatus( aFileStatus ) == ::osl::FileBase::E_None )
                 {
                     if ( aFileStatus.getFileType() == ::osl::FileStatus::Directory )
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 2021e7698b9b..b4993e24f4b3 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -544,7 +544,7 @@ bool hasNoFolder(OUString const & folderUrl)
         osl::File::RC rcNext = osl::File::E_None;
         while ( (rcNext = dir.getNextItem(i)) == osl::File::E_None)
         {
-            osl::FileStatus stat(FileStatusMask_Type);
+            osl::FileStatus stat(osl_FileStatus_Mask_Type);
             if (i.getFileStatus(stat) == osl::File::E_None)
             {
                 if (stat.getFileType() == osl::FileStatus::Directory)
@@ -596,7 +596,7 @@ void removeFolder(OUString const & folderUrl)
         ::osl::File::RC rcNext = ::osl::File::E_None;
         while ( (rcNext = dir.getNextItem(i)) == ::osl::File::E_None)
         {
-            ::osl::FileStatus stat(FileStatusMask_Type | FileStatusMask_FileURL);
+            ::osl::FileStatus stat(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL);
             if (i.getFileStatus(stat) == ::osl::File::E_None)
             {
                 ::osl::FileStatus::Type t = stat.getFileType();
diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx
index e56725288813..2f02cc09b39b 100644
--- a/framework/source/classes/droptargetlistener.cxx
+++ b/framework/source/classes/droptargetlistener.cxx
@@ -225,7 +225,7 @@ void DropTargetListener::implts_OpenFile( const String& rFilePath )
     if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFilePath, aFileURL ) )
         aFileURL = rFilePath;
 
-    ::osl::FileStatus aStatus( FileStatusMask_FileURL );
+    ::osl::FileStatus aStatus( osl_FileStatus_Mask_FileURL );
     ::osl::DirectoryItem aItem;
     if( ::osl::FileBase::E_None == ::osl::DirectoryItem::get( aFileURL, aItem ) &&
         ::osl::FileBase::E_None == aItem.getFileStatus( aStatus ) )
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index cdcb26e67f2d..fa2a40938b4c 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -320,7 +320,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
             DirectoryItem aDirItem;
             if (DirectoryItem::get(aLicenseURL, aDirItem) != FileBase::E_None)
                 return makeAny(sal_False);
-            FileStatus aStatus(FileStatusMask_All);
+            FileStatus aStatus(osl_FileStatus_Mask_All);
             if (aDirItem.getFileStatus(aStatus) != FileBase::E_None)
                 return makeAny(sal_False);
             TimeValue aTimeVal = aStatus.getModifyTime();
@@ -442,7 +442,7 @@ LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResM
     {
         DirectoryItem d;
         DirectoryItem::get(aLicensePath, d);
-        FileStatus fs(FileStatusMask_FileSize);
+        FileStatus fs(osl_FileStatus_Mask_FileSize);
         d.getFileStatus(fs);
         sal_uInt64 nBytesRead = 0;
         sal_uInt64 nPosition = 0;
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 40a4cced46d1..1be60dabb72c 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -188,7 +188,7 @@ namespace basprov
             if ( aFileURL.getLength() )
             {
                 osl::DirectoryItem aFileItem;
-                osl::FileStatus aFileStatus( FileStatusMask_FileURL );
+                osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileURL );
                 OSL_VERIFY( osl::DirectoryItem::get( aFileURL, aFileItem ) == osl::FileBase::E_None );
                 OSL_VERIFY( aFileItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None );
                 ::rtl::OUString aCanonicalFileURL( aFileStatus.getFileURL() );
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 7ae6a811bd15..c61f68f21266 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3326,9 +3326,9 @@ sal_Bool SfxMedium::SetWritableForUserOnly( const ::rtl::OUString& aURL )
     ::osl::DirectoryItem aDirItem;
     if ( ::osl::DirectoryItem::get( aURL, aDirItem ) == ::osl::FileBase::E_None )
     {
-        ::osl::FileStatus aFileStatus( FileStatusMask_Attributes );
+        ::osl::FileStatus aFileStatus( osl_FileStatus_Mask_Attributes );
         if ( aDirItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None
-          && aFileStatus.isValid( FileStatusMask_Attributes ) )
+          && aFileStatus.isValid( osl_FileStatus_Mask_Attributes ) )
         {
             sal_uInt64 nAttributes = aFileStatus.getAttributes();
 
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 ) ) )
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();