[PATCH] Change unnamedspaced file.hxx macros
Andy Holder
andy.m.holder at googlemail.com
Sat Dec 11 12:05:07 PST 2010
---
filter/source/flash/swffilter.cxx | 2 +-
filter/source/placeware/exporter.cxx | 2 +-
filter/source/svg/test/svg2odf.cxx | 4 ++--
filter/source/xsltdialog/xmlfileview.cxx | 2 +-
filter/source/xsltdialog/xmlfilterjar.cxx | 2 +-
filter/source/xsltdialog/xmlfiltertabdialog.cxx | 8 ++++----
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 6 +++---
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index c0e7b9c..3c6c87a 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -76,7 +76,7 @@ public:
OslOutputStreamWrapper(const OUString& sFileName) : mrFile(sFileName)
{
osl_removeFile(sFileName.pData);
- mrFile.open(OpenFlag_Create|OpenFlag_Write);
+ mrFile.open( osl_File_OpenFlag_Create|osl_File_OpenFlag_Write );
}
// stario::XOutputStream
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index 6971677..4fc25cc 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -276,7 +276,7 @@ static void createSlideFile( Reference< XComponent > xDoc, ZipFile& rZipFile, co
osl::File::RC nRC;
sal_uInt64 nTemp;
- nRC = aInfoFile.open( OpenFlag_Write );
+ nRC = aInfoFile.open( osl_File_OpenFlag_Write );
if( osl::File::E_None == nRC )
{
nRC = aInfoFile.write( aInfo.getStr(), aInfo.getLength(), nTemp );
diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx
index ffce4e1..c18440e 100644
--- a/filter/source/svg/test/svg2odf.cxx
+++ b/filter/source/svg/test/svg2odf.cxx
@@ -45,7 +45,7 @@ namespace
explicit OutputWrap( const rtl::OUString& rURL ) : maFile(rURL)
{
- maFile.open(osl_File_OpenFlag_Create|OpenFlag_Write);
+ maFile.open( osl_File_OpenFlag_Create|osl_File_OpenFlag_Write );
}
virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (com::sun::star::io::NotConnectedException,com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException)
@@ -111,7 +111,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
}
osl::File aInputFile(aSrcURL);
- if( osl::FileBase::E_None!=aInputFile.open(OpenFlag_Read) )
+ if( osl::FileBase::E_None!=aInputFile.open(osl_File_OpenFlag_Read) )
{
OSL_TRACE( "Cannot open input file" );
return 1;
diff --git a/filter/source/xsltdialog/xmlfileview.cxx b/filter/source/xsltdialog/xmlfileview.cxx
index b4f6523..a9ab5b7 100644
--- a/filter/source/xsltdialog/xmlfileview.cxx
+++ b/filter/source/xsltdialog/xmlfileview.cxx
@@ -622,7 +622,7 @@ void XMLSourceFileDialog::onValidate()
if( xImporter.is() )
{
osl::File aInputFile( maFileURL );
- /* osl::File::RC rc = */ aInputFile.open( OpenFlag_Read );
+ /* osl::File::RC rc = */ aInputFile.open( osl_File_OpenFlag_Read );
Reference< XInputStream > xIS( new comphelper::OSLInputStreamWrapper( aInputFile ) );
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index a0c97bd..dac4448 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -240,7 +240,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
{
osl::File aOutputFile( aTempFileURL );
- /* osl::File::RC rc = */ aOutputFile.open( OpenFlag_Write );
+ /* osl::File::RC rc = */ aOutputFile.open( osl_File_OpenFlag_Write );
Reference< XOutputStream > xOS( new OSLOutputStreamWrapper( aOutputFile ) );
TypeDetectionExporter aExporter( mxMSF );
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index ab15348..64f855d 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -230,7 +230,7 @@ bool XMLFilterTabDialog::onOk()
if( (mpNewInfo->maDTD != mpOldInfo->maDTD) && isFileURL( mpNewInfo->maDTD ) )
{
osl::File aFile( mpNewInfo->maDTD );
- osl::File::RC aRC = aFile.open( OpenFlag_Read );
+ osl::File::RC aRC = aFile.open( osl_File_OpenFlag_Read );
if( aRC != osl::File::E_None )
{
nErrorId = STR_ERROR_DTD_NOT_FOUND;
@@ -246,7 +246,7 @@ bool XMLFilterTabDialog::onOk()
if( (mpNewInfo->maExportXSLT != mpOldInfo->maExportXSLT) && isFileURL( mpNewInfo->maExportXSLT ) )
{
osl::File aFile( mpNewInfo->maExportXSLT );
- osl::File::RC aRC = aFile.open( OpenFlag_Read );
+ osl::File::RC aRC = aFile.open( osl_File_OpenFlag_Read );
if( aRC != osl::File::E_None )
{
nErrorId = STR_ERROR_EXPORT_XSLT_NOT_FOUND;
@@ -262,7 +262,7 @@ bool XMLFilterTabDialog::onOk()
if( (mpNewInfo->maImportXSLT != mpOldInfo->maImportXSLT) && isFileURL( mpNewInfo->maImportXSLT ) )
{
osl::File aFile( mpNewInfo->maImportXSLT );
- osl::File::RC aRC = aFile.open( OpenFlag_Read );
+ osl::File::RC aRC = aFile.open( osl_File_OpenFlag_Read );
if( aRC != osl::File::E_None )
{
nErrorId = STR_ERROR_IMPORT_XSLT_NOT_FOUND;
@@ -286,7 +286,7 @@ bool XMLFilterTabDialog::onOk()
if( (mpNewInfo->maImportTemplate != mpOldInfo->maImportTemplate) && isFileURL( mpNewInfo->maImportTemplate ) )
{
osl::File aFile( mpNewInfo->maImportTemplate );
- osl::File::RC aRC = aFile.open( OpenFlag_Read );
+ osl::File::RC aRC = aFile.open( osl_File_OpenFlag_Read );
if( aRC != osl::File::E_None )
{
nErrorId = STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND;
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index b052030..69c2152 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -477,7 +477,7 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
if( pAppInfo )
{
File aOutputFile( aTempFileURL );
- /* File::RC rc = */ aOutputFile.open( OpenFlag_Write );
+ /* File::RC rc = */ aOutputFile.open( osl_File_OpenFlag_Write );
// create xslt exporter
Reference< XOutputStream > xIS( new comphelper::OSLOutputStreamWrapper( aOutputFile ) );
@@ -652,7 +652,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
if( xImporter.is() )
{
osl::File aInputFile( rURL );
- osl::File::RC rc = aInputFile.open( OpenFlag_Read );
+ osl::File::RC rc = aInputFile.open( osl_File_OpenFlag_Read );
Reference< XInputStream > xIS( new comphelper::OSLInputStreamWrapper( aInputFile ) );
@@ -677,7 +677,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
Reference< XDocumentHandler > xWriter( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" )) ), UNO_QUERY );
File aOutputFile( aTempFileURL );
- rc = aOutputFile.open( OpenFlag_Write );
+ rc = aOutputFile.open( osl_File_OpenFlag_Write );
Reference< XOutputStream > xOS( new OSLOutputStreamWrapper( aOutputFile ) );
Reference< XActiveDataSource > xDocSrc( xWriter, UNO_QUERY );
--
1.7.3.2
--MP_/b/7eCpPSuNsI+VjM0PBzGO.
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename=0001-Change-unnamedspaced-file.hxx-macros-ure.patch
More information about the LibreOffice
mailing list