summaryrefslogtreecommitdiff
path: root/xmlhelp
diff options
context:
space:
mode:
authorAndy Holder <andy.m.holder@googlemail.com>2010-12-11 18:02:43 +0000
committerCaolán McNamara <caolanm@redhat.com>2010-12-12 21:16:57 +0000
commitc0bc502f55fe555dc14e18362dcea246ab2f054c (patch)
tree485a1d7995d953d0d728729e141aa1e78f9a2375 /xmlhelp
parent4dfd93a3b31e8e9421fff0c6b81cd6d4fb8f4103 (diff)
Change unnamespace file.hxx macros
Diffstat (limited to 'xmlhelp')
-rw-r--r--xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx6
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx4
-rw-r--r--xmlhelp/source/cxxhelp/provider/inputstream.cxx2
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.cxx2
-rw-r--r--xmlhelp/source/treeview/tvread.cxx4
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 8e20d13cbf15..fc88fcba88b4 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 711021d17627..47efc881a64a 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 d4914a8ad6d7..8cba751dff67 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 1c56d5fcb9ba..7c6f646b3358 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 8c9851fb33bd..73fad53c9647 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 );