From c0bc502f55fe555dc14e18362dcea246ab2f054c Mon Sep 17 00:00:00 2001
From: Andy Holder <andy.m.holder@googlemail.com>
Date: Sat, 11 Dec 2010 18:02:43 +0000
Subject: Change unnamespace file.hxx macros

---
 ucb/source/ucp/file/filinpstr.cxx |  4 ++--
 ucb/source/ucp/file/filrec.cxx    |  6 +++---
 ucb/source/ucp/file/filstr.cxx    |  4 ++--
 ucb/source/ucp/file/shell.cxx     | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'ucb')

diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx
index 02d5d6b953e6..555a83bb0272 100644
--- a/ucb/source/ucp/file/filinpstr.cxx
+++ b/ucb/source/ucp/file/filinpstr.cxx
@@ -48,9 +48,9 @@ XInputStream_impl::XInputStream_impl( shell* pMyShell,const rtl::OUString& aUncP
       m_nErrorCode( TASKHANDLER_NO_ERROR ),
       m_nMinorErrorCode( TASKHANDLER_NO_ERROR )
 {
-    sal_uInt32 nFlags = OpenFlag_Read;
+    sal_uInt32 nFlags = osl_File_OpenFlag_Read;
     if ( !bLock )
-        nFlags |= OpenFlag_NoLock;
+        nFlags |= osl_File_OpenFlag_NoLock;
 
     osl::FileBase::RC err = m_aFile.open( nFlags );
     if( err != osl::FileBase::E_None )
diff --git a/ucb/source/ucp/file/filrec.cxx b/ucb/source/ucp/file/filrec.cxx
index 2e2b979e7e42..0986e3a738ab 100644
--- a/ucb/source/ucp/file/filrec.cxx
+++ b/ucb/source/ucp/file/filrec.cxx
@@ -46,7 +46,7 @@ sal_Bool ReconnectingFile::reconnect()
     {
         disconnect();
         if ( m_aFile.open( m_nFlags ) == ::osl::FileBase::E_None
-          || m_aFile.open( OpenFlag_Read ) == ::osl::FileBase::E_None )
+          || m_aFile.open( osl_File_OpenFlag_Read ) == ::osl::FileBase::E_None )
         {
             m_bDisconnect = sal_False;
             bResult = sal_True;
@@ -61,8 +61,8 @@ sal_Bool ReconnectingFile::reconnect()
     ::osl::FileBase::RC nResult = m_aFile.open( uFlags );
     if ( nResult == ::osl::FileBase::E_None )
     {
-        if ( uFlags & OpenFlag_Create )
-            m_nFlags = (uFlags & ( ~OpenFlag_Create )) | OpenFlag_Write;
+        if ( uFlags & osl_File_OpenFlag_Create )
+            m_nFlags = (uFlags & ( ~osl_File_OpenFlag_Create )) | osl_File_OpenFlag_Write;
         else
             m_nFlags = uFlags;
 
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index 6860acfeac41..63b8fd46b140 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -110,9 +110,9 @@ XStream_impl::XStream_impl( shell* pMyShell,const rtl::OUString& aUncPath, sal_B
       m_nErrorCode( TASKHANDLER_NO_ERROR ),
       m_nMinorErrorCode( TASKHANDLER_NO_ERROR )
 {
-    sal_uInt32 nFlags = ( OpenFlag_Read | OpenFlag_Write );
+    sal_uInt32 nFlags = ( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write );
     if ( !bLock )
-        nFlags |= OpenFlag_NoLock;
+        nFlags |= osl_File_OpenFlag_NoLock;
 
     osl::FileBase::RC err = m_aFile.open( nFlags );
     if(  err != osl::FileBase::E_None )
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 250d58db9b7f..d4c09b0444b2 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -594,7 +594,7 @@ void SAL_CALL shell::page( sal_Int32 CommandId,
 {
     uno::Reference< XContentProvider > xProvider( m_pProvider );
     osl::File aFile( aUnqPath );
-    osl::FileBase::RC err = aFile.open( OpenFlag_Read );
+    osl::FileBase::RC err = aFile.open( osl_File_OpenFlag_Read );
 
     if( err != osl::FileBase::E_None )
     {
@@ -905,7 +905,7 @@ shell::setv( const rtl::OUString& aUnqPath,
                 {   // valid value for the size
                     osl::File aFile(aUnqPath);
                     bool err =
-                        aFile.open(OpenFlag_Write) != osl::FileBase::E_None ||
+                        aFile.open(osl_File_OpenFlag_Write) != osl::FileBase::E_None ||
                         aFile.setSize(sal_uInt64(newSize)) != osl::FileBase::E_None ||
                         aFile.close() != osl::FileBase::E_None;
 
@@ -1800,12 +1800,12 @@ shell::write( sal_Int32 CommandId,
 
     if( OverWrite )
     {
-        err = aFile.open( OpenFlag_Write | OpenFlag_Create );
+        err = aFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
 
         if( err != osl::FileBase::E_None )
         {
             aFile.close();
-            err = aFile.open( OpenFlag_Write );
+            err = aFile.open( osl_File_OpenFlag_Write );
         }
 
         if( err != osl::FileBase::E_None )
@@ -1818,7 +1818,7 @@ shell::write( sal_Int32 CommandId,
     }
     else
     {
-        err = aFile.open( OpenFlag_Read | OpenFlag_NoLock );
+        err = aFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_NoLock );
         if( err == osl::FileBase::E_None )  // The file exists and shall not be overwritten
         {
             installError( CommandId,
@@ -1831,7 +1831,7 @@ shell::write( sal_Int32 CommandId,
 
         // as a temporary solution the creation does not lock the file at all
         // in future it should be possible to create the file without lock explicitly
-        err = aFile.open( OpenFlag_Write | OpenFlag_Create | OpenFlag_NoLock );
+        err = aFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create | osl_File_OpenFlag_NoLock );
 
         if( err != osl::FileBase::E_None )
         {
-- 
cgit v1.2.3