diff options
author | Andy Holder <andy.m.holder@gmail.com> | 2010-12-12 14:51:41 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-12-13 20:56:42 +0000 |
commit | 5c0df36de34462cbe5d2fb556a2e2b6ea30eb55d (patch) | |
tree | 0f43955c95da9e00d6942091d260b12982c78f17 | |
parent | dfdbbd15412f41b986fa6bc6df682856ec1581c8 (diff) |
Change unnamespaced file.hxx macros
-rw-r--r-- | l10ntools/source/help/HelpLinker.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/layout/core/byteseq.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/impimagetree.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/source/printergfx/printerjob.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/source/printergfx/text_gfx.cxx | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx index 3f6f2c9379bc..c483507a8f45 100644 --- a/l10ntools/source/help/HelpLinker.cxx +++ b/l10ntools/source/help/HelpLinker.cxx @@ -1200,7 +1200,7 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp sal_uInt64 ret, len = aFileStatus.getFileSize(); char* s = new char[ int(len) ]; // the buffer to hold the installed files osl::File aFile( aTreeFileURL ); - aFile.open( OpenFlag_Read ); + aFile.open( osl_File_OpenFlag_Read ); aFile.read( s, len, ret ); aFile.close(); diff --git a/toolkit/source/layout/core/byteseq.cxx b/toolkit/source/layout/core/byteseq.cxx index 41141fbc777d..641750b52b93 100644 --- a/toolkit/source/layout/core/byteseq.cxx +++ b/toolkit/source/layout/core/byteseq.cxx @@ -44,7 +44,7 @@ uno::Reference< io::XInputStream > getFileAsStream( const rtl::OUString &rName ) sFileURL = rName; // maybe it already was a file url File * blobFile = new File(sFileURL); - File::RC errorCode = blobFile->open(OpenFlag_Read); + File::RC errorCode = blobFile->open(osl_File_OpenFlag_Read); uno::Reference<io::XInputStream> xResult; switch (errorCode) diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index 79a3ad051446..f5d319f6c936 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -138,7 +138,7 @@ bool ImplImageTree::checkStyle(rtl::OUString const & style) // skip brand-specific icon themes; they are incomplete and thus not useful for this check if (nFromIndex < 0 || !aZipURL.match(sBrandURLSuffix, nFromIndex)) { osl::File aZip(aZipURL); - if (aZip.open(OpenFlag_Read) == ::osl::FileBase::E_None) { + if (aZip.open(osl_File_OpenFlag_Read) == ::osl::FileBase::E_None) { aZip.close(); exists = true; } diff --git a/vcl/unx/source/printergfx/printerjob.cxx b/vcl/unx/source/printergfx/printerjob.cxx index 1d8924913703..be9fb3b23278 100644 --- a/vcl/unx/source/printergfx/printerjob.cxx +++ b/vcl/unx/source/printergfx/printerjob.cxx @@ -113,7 +113,7 @@ PrinterJob::CreateSpoolFile (const rtl::OUString& rName, const rtl::OUString& rE aFileURL = maSpoolDirName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("/")) + aFileURL; pFile = new osl::File (aFileURL); - nError = pFile->open (OpenFlag_Read | OpenFlag_Write | OpenFlag_Create); + nError = pFile->open (osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); if (nError != osl::File::E_None) { delete pFile; @@ -579,7 +579,7 @@ PrinterJob::EndJob () { if( *pPageHead ) { - osl::File::RC nError = (*pPageHead)->open(OpenFlag_Read); + osl::File::RC nError = (*pPageHead)->open(osl_File_OpenFlag_Read); if (nError == osl::File::E_None) { AppendPS (pDestFILE, *pPageHead, pBuffer); @@ -590,7 +590,7 @@ PrinterJob::EndJob () bSuccess = sal_False; if( *pPageBody ) { - osl::File::RC nError = (*pPageBody)->open(OpenFlag_Read); + osl::File::RC nError = (*pPageBody)->open(osl_File_OpenFlag_Read); if (nError == osl::File::E_None) { AppendPS (pDestFILE, *pPageBody, pBuffer); diff --git a/vcl/unx/source/printergfx/text_gfx.cxx b/vcl/unx/source/printergfx/text_gfx.cxx index f700a69c932b..60066b9a1017 100644 --- a/vcl/unx/source/printergfx/text_gfx.cxx +++ b/vcl/unx/source/printergfx/text_gfx.cxx @@ -813,7 +813,7 @@ PrinterGfx::writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppli WritePS (pFile, aPostScriptName.getStr()); WritePS (pFile, "\n"); - osl::File::RC nError = aFontFile.open (OpenFlag_Read); + osl::File::RC nError = aFontFile.open(osl_File_OpenFlag_Read); if (nError == osl::File::E_None) { convertPfbToPfa (aFontFile, *pFile); |