diff options
author | Andy Holder <andy.m.holder@googlemail.com> | 2010-12-11 18:02:43 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-12-12 21:16:57 +0000 |
commit | e24beb41b32301a8afc6134cbe87099f1e0f2fce (patch) | |
tree | 1e91531dbd8793ca4e76d8c83bdc5d4dac8196ce /xmlhelp | |
parent | 4eb3791faee5050fc338a5ef66d48b22992005e6 (diff) |
Change unnamespace file.hxx macros
Diffstat (limited to 'xmlhelp')
-rw-r--r-- | xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx | 6 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.cxx | 4 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/inputstream.cxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/treeview/tvread.cxx | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx b/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx index bff2eef991..c4ecca2da2 100644 --- a/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx +++ b/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx @@ -51,9 +51,9 @@ namespace xmlsearch { protected: - enum OPENFLAG { Read = OpenFlag_Read, - Write = OpenFlag_Write, - Create = OpenFlag_Create }; + enum OPENFLAG { Read = osl_File_OpenFlag_Read, + Write = osl_File_OpenFlag_Write, + Create = osl_File_OpenFlag_Create }; }; diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index c1d57c7f14..361fafaa30 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -494,7 +494,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU key + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".cfg" )) ); - if( osl::FileBase::E_None != cfgFile.open( OpenFlag_Read ) ) + if( osl::FileBase::E_None != cfgFile.open( osl_File_OpenFlag_Read ) ) it->second = 0; else { @@ -1329,7 +1329,7 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language, osl::FileStatus aStatus( FileStatusMask_FileSize ); if( osl::FileBase::E_None == osl::DirectoryItem::get( fileURL,aDirItem ) && - osl::FileBase::E_None == aFile.open( OpenFlag_Read ) && + osl::FileBase::E_None == aFile.open( osl_File_OpenFlag_Read ) && osl::FileBase::E_None == aDirItem.getFileStatus( aStatus ) ) { sal_uInt64 nSize; diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx index 52fbe601c1..b668a7da93 100644 --- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx @@ -42,7 +42,7 @@ XInputStream_impl::XInputStream_impl( const rtl::OUString& aUncPath ) : m_bIsOpen( false ), m_aFile( aUncPath ) { - m_bIsOpen = ( osl::FileBase::E_None == m_aFile.open( OpenFlag_Read ) ); + m_bIsOpen = ( osl::FileBase::E_None == m_aFile.open( osl_File_OpenFlag_Read ) ); } diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 0d5aa3e8d2..3b5b30b699 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -761,7 +761,7 @@ helpMatch(const char * URI) { static void * fileOpen(const char *URI) { osl::File *pRet = new osl::File(rtl::OUString(URI, strlen(URI), RTL_TEXTENCODING_UTF8)); - pRet->open(OpenFlag_Read); + pRet->open(osl_File_OpenFlag_Read); return pRet; } diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 502e8bde26..f39461c865 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -519,7 +519,7 @@ TVChildTarget::TVChildTarget( const Reference< XMultiServiceFactory >& xMSF ) len = configData.vFileLen[--j]; char* s = new char[ int(len) ]; // the buffer to hold the installed files osl::File aFile( configData.vFileURL[j] ); - aFile.open( OpenFlag_Read ); + aFile.open( osl_File_OpenFlag_Read ); aFile.read( s,len,ret ); aFile.close(); @@ -781,7 +781,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) if(! showBasic && baseName.compareToAscii("sbasic") == 0 ) continue; osl::File aFile( aFileUrl ); - if( osl::FileBase::E_None == aFile.open( OpenFlag_Read ) ) + if( osl::FileBase::E_None == aFile.open( osl_File_OpenFlag_Read ) ) { sal_uInt64 nSize; aFile.getSize( nSize ); |