[Libreoffice] patches for Remove unhelpful File.hxx macros

[Andy Holder]

Hi

I'm new here and to start I've done 3 patches to start the "Remove
unhelpful File.hxx macros" task in the Easy hacks.

Andy
>From 6ed89bdba49c524eb9d04d4058890e9b08f1fbcc Mon Sep 17 00:00:00 2001
From: Andy Holder <andy.m.hol...@googlemail.com>
Date: Wed, 8 Dec 2010 13:38:03 +0000
Subject: [PATCH] Change unnamespaced file.hxx macro

---
 extensions/source/update/check/updatecheck.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index ef93d21..747d642 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -1544,7 +1544,7 @@ UpdateCheck::storeReleaseNote(sal_Int8 nNum, const rtl::OUString &rURL)
         return true;
 
     osl::File aFile( aFilePath );
-    rc = aFile.open( OpenFlag_Write | OpenFlag_Create );
+    rc = aFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
 
     if ( rc != osl::FileBase::E_None ) return false;
 
-- 
1.7.3.2


>From ef2d850e0a469c4c394073b122c8b6c971ed6d80 Mon Sep 17 00:00:00 2001
From: Andy Holder <andy.m.hol...@googlemail.com>
Date: Mon, 6 Dec 2010 12:13:11 +0000
Subject: [PATCH] Change unnamespaced file.hxx macros

---
 sdext/source/pdfimport/sax/emitcontext.cxx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx
index 21de113..da04b08 100644
--- a/sdext/source/pdfimport/sax/emitcontext.cxx
+++ b/sdext/source/pdfimport/sax/emitcontext.cxx
@@ -70,9 +70,9 @@ SaxEmitter::SaxEmitter( const uno::Reference< xml::sax::XDocumentHandler >& xDoc
         aBuf.append( aFileURL );
         aBuf.appendAscii( "/pdfimport.xml" );
         pStream = new osl::File( aBuf.makeStringAndClear() );
-        if( pStream->open( OpenFlag_Write | OpenFlag_Create ) )
+        if( pStream->open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ) )
         {
-            pStream->open( OpenFlag_Write );
+            pStream->open( osl_File_OpenFlag_Write );
             pStream->setSize( 0 );
         }
     }
-- 
1.7.3.2


>From bebf98beab45b053312e5c7d0ab4ec7497d61bf6 Mon Sep 17 00:00:00 2001
From: Andy Holder <andy.m.hol...@googlemail.com>
Date: Tue, 7 Dec 2010 20:07:14 +0000
Subject: [PATCH] Change unnamespaced file.hxx macros

---
 sd/source/filter/html/buttonset.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index aed8306..0aa6623 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -127,7 +127,7 @@ bool ButtonsImpl::copyGraphic( const OUString& rName, const OUString& rPath )
     {
         osl::File::remove( rPath );
         osl::File aOutputFile( rPath );
-        if( aOutputFile.open( OpenFlag_Write|OpenFlag_Create ) == osl::FileBase::E_None )
+        if( aOutputFile.open( osl_File_OpenFlag_Write|osl_File_OpenFlag_Create ) == osl::FileBase::E_None )
         {
             Reference< XOutputStream > xOutput( new comphelper::OSLOutputStreamWrapper( aOutputFile ) );
             comphelper::OStorageHelper::CopyInputToOutput( xInput, xOutput );
-- 
1.7.3.2


_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice