[Libreoffice-commits] .: framework/source ucb/source

[Thorsten Behrens]

 framework/source/services/autorecovery.cxx |    4 ++--
 ucb/source/ucp/file/filglob.cxx            |    2 +-
 ucb/source/ucp/file/shell.cxx              |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 1065f006215ab354256fd030f84ab9463510d045
Author: Michael Lefevre <lefevre00 at yahoo.fr>
Date:   Mon Apr 11 23:19:36 2011 +0200

    remove VolumeInfoMask_XXX in favour of osl_VolumeInfo_Mask_XXX

diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 3420a4f..80fdf7f 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -3443,11 +3443,11 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace)
     sal_uInt64 nFreeSpace = SAL_MAX_UINT64;
 
     ::rtl::OUString     sBackupPath(SvtPathOptions().GetBackupPath());
-    ::osl::VolumeInfo   aInfo      (VolumeInfoMask_FreeSpace);
+    ::osl::VolumeInfo   aInfo      (osl_VolumeInfo_Mask_FreeSpace);
     ::osl::FileBase::RC aRC         = ::osl::Directory::getVolumeInfo(sBackupPath, aInfo);
 
     if (
-        (aInfo.isValid(VolumeInfoMask_FreeSpace)) &&
+        (aInfo.isValid(osl_VolumeInfo_Mask_FreeSpace)) &&
         (aRC == ::osl::FileBase::E_None         )
        )
     {
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index 3b7af59..63209f3 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -112,7 +112,7 @@ namespace {
                                 RTL_CONSTASCII_USTRINGPARAM("volume"));
                         bResourceType = true;
                         osl::VolumeInfo aVolumeInfo(
-                            VolumeInfoMask_Attributes );
+                            osl_VolumeInfo_Mask_Attributes );
                         if( osl::Directory::getVolumeInfo(
                             rPhysicalUrl,aVolumeInfo ) ==
                             osl::FileBase::E_None )
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 691f883..139acd8 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -2371,10 +2371,10 @@ shell::commit( const shell::ContentMap::iterator& it,
         if( it1 != properties.end() )
             it1->setValue( uno::makeAny( isFile ) );
 
-        osl::VolumeInfo aVolumeInfo( VolumeInfoMask_Attributes );
+        osl::VolumeInfo aVolumeInfo( osl_VolumeInfo_Mask_Attributes );
         if( isVolume &&
             osl::FileBase::E_None == osl::Directory::getVolumeInfo( it->first,aVolumeInfo ) &&
-            aVolumeInfo.isValid( VolumeInfoMask_Attributes ) )
+            aVolumeInfo.isValid( osl_VolumeInfo_Mask_Attributes ) )
         {
             // Retrieve the flags;
             isRemote = aVolumeInfo.getRemoteFlag();