mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename overly generic placeware TempFile class to avoid symbol clashes

Browse Source 
Change-Id: I64adee63fd8802884d3c2388b0e21a237f61b922
This commit is contained in:
Peter Foley
2013-04-08 19:01:17 -04:00
parent 43a23fb3f8
commit 4e3c5f4e50
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
filter/source/placeware/exporter.cxx
View File

@@ -71,7 +71,7 @@ PlaceWareExporter::~PlaceWareExporter()
class PageEntry class PageEntry
{ {
private: private:
TempFile maTempFile; PlaceWareTempFile maTempFile;
OUString maName; OUString maName;
OUString maTitle; OUString maTitle;
OUString maNotes; OUString maNotes;
@@ -97,7 +97,7 @@ public:
}; };
PageEntry::PageEntry() PageEntry::PageEntry()
: maTempFile( TempFile::createTempFileURL() ) : maTempFile( PlaceWareTempFile::createTempFileURL() )
{ {
} }
@@ -259,7 +259,7 @@ static void createSlideFile( Reference< XComponent > xDoc, ZipFile& rZipFile, co
} }
} }
TempFile aInfoFile( TempFile::createTempFileURL() ); PlaceWareTempFile aInfoFile( PlaceWareTempFile::createTempFileURL() );
osl::File::RC nRC; osl::File::RC nRC;
sal_uInt64 nTemp; sal_uInt64 nTemp;
@@ -309,7 +309,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
osl::File::RC nRC; osl::File::RC nRC;
#ifndef PLACEWARE_DEBUG #ifndef PLACEWARE_DEBUG
TempFile aTempFile( TempFile::createTempFileURL() ); PlaceWareTempFile aTempFile( PlaceWareTempFile::createTempFileURL() );
nRC = aTempFile.open( osl_File_OpenFlag_Write|osl_File_OpenFlag_Read ); nRC = aTempFile.open( osl_File_OpenFlag_Write|osl_File_OpenFlag_Read );
#else #else
OUString aURL("file:///e:/test.zip"); OUString aURL("file:///e:/test.zip");

8
filter/source/placeware/tempfile.cxx
View File

@@ -118,12 +118,12 @@ oslFileError SAL_CALL my_getTempDirURL( rtl_uString** pustrTempDir )
#include "tempfile.hxx" #include "tempfile.hxx"
TempFile::TempFile( const OUString& rTempFileURL ) PlaceWareTempFile::PlaceWareTempFile( const OUString& rTempFileURL )
:osl::File( rTempFileURL ), maURL( rTempFileURL ) :osl::File( rTempFileURL ), maURL( rTempFileURL )
{ {
} }
TempFile::~TempFile() PlaceWareTempFile::~PlaceWareTempFile()
{ {
close(); close();
@@ -131,7 +131,7 @@ TempFile::~TempFile()
osl::File::remove( maURL ); osl::File::remove( maURL );
} }
OUString TempFile::createTempFileURL() OUString PlaceWareTempFile::createTempFileURL()
{ {
OUString aTempFileURL; OUString aTempFileURL;
@@ -168,7 +168,7 @@ OUString TempFile::createTempFileURL()
return aTempFileURL; return aTempFileURL;
} }
OUString TempFile::getFileURL() OUString PlaceWareTempFile::getFileURL()
{ {
return maURL; return maURL;
} }

6
filter/source/placeware/tempfile.hxx
View File

@@ -23,11 +23,11 @@
#include <osl/file.hxx> #include <osl/file.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
class TempFile : public osl::File class PlaceWareTempFile : public osl::File
{ {
public: public:
TempFile( const OUString& aURL ); PlaceWareTempFile( const OUString& aURL );
~TempFile(); ~PlaceWareTempFile();
static OUString createTempFileURL(); static OUString createTempFileURL();
OUString getFileURL(); OUString getFileURL();