remove FileStatusMask_XXX in favour of osl_FileStatus_Mask_XXX (libs-core)

10 files changed, 20 insertions, 20 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b3c9d45338..78961b374d 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 a41dccd0da..ed36cdab44 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 6fdc9adaad..ca5c61feee 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 7834b44624..534df3d2e8 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 c9c4f74d2c..b8e2889921 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 ebf5f256fb..c1e82b30c0 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 b3b68e9833..d58aa58088 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 b904179536..1f6e836b6e 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 4e93a59936..121a2d2890 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 1aad5b14c3..33192eb27e 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();