rename overly generic placeware TempFile class to avoid symbol clashes
Change-Id: I64adee63fd8802884d3c2388b0e21a237f61b922
This commit is contained in:
@@ -71,7 +71,7 @@ PlaceWareExporter::~PlaceWareExporter()
|
||||
class PageEntry
|
||||
{
|
||||
private:
|
||||
TempFile maTempFile;
|
||||
PlaceWareTempFile maTempFile;
|
||||
OUString maName;
|
||||
OUString maTitle;
|
||||
OUString maNotes;
|
||||
@@ -97,7 +97,7 @@ public:
|
||||
};
|
||||
|
||||
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;
|
||||
sal_uInt64 nTemp;
|
||||
@@ -309,7 +309,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
|
||||
osl::File::RC nRC;
|
||||
|
||||
#ifndef PLACEWARE_DEBUG
|
||||
TempFile aTempFile( TempFile::createTempFileURL() );
|
||||
PlaceWareTempFile aTempFile( PlaceWareTempFile::createTempFileURL() );
|
||||
nRC = aTempFile.open( osl_File_OpenFlag_Write|osl_File_OpenFlag_Read );
|
||||
#else
|
||||
OUString aURL("file:///e:/test.zip");
|
||||
|
@@ -118,12 +118,12 @@ oslFileError SAL_CALL my_getTempDirURL( rtl_uString** pustrTempDir )
|
||||
|
||||
#include "tempfile.hxx"
|
||||
|
||||
TempFile::TempFile( const OUString& rTempFileURL )
|
||||
PlaceWareTempFile::PlaceWareTempFile( const OUString& rTempFileURL )
|
||||
:osl::File( rTempFileURL ), maURL( rTempFileURL )
|
||||
{
|
||||
}
|
||||
|
||||
TempFile::~TempFile()
|
||||
PlaceWareTempFile::~PlaceWareTempFile()
|
||||
{
|
||||
close();
|
||||
|
||||
@@ -131,7 +131,7 @@ TempFile::~TempFile()
|
||||
osl::File::remove( maURL );
|
||||
}
|
||||
|
||||
OUString TempFile::createTempFileURL()
|
||||
OUString PlaceWareTempFile::createTempFileURL()
|
||||
{
|
||||
OUString aTempFileURL;
|
||||
|
||||
@@ -168,7 +168,7 @@ OUString TempFile::createTempFileURL()
|
||||
return aTempFileURL;
|
||||
}
|
||||
|
||||
OUString TempFile::getFileURL()
|
||||
OUString PlaceWareTempFile::getFileURL()
|
||||
{
|
||||
return maURL;
|
||||
}
|
||||
|
@@ -23,11 +23,11 @@
|
||||
#include <osl/file.hxx>
|
||||
#include <rtl/ustring.hxx>
|
||||
|
||||
class TempFile : public osl::File
|
||||
class PlaceWareTempFile : public osl::File
|
||||
{
|
||||
public:
|
||||
TempFile( const OUString& aURL );
|
||||
~TempFile();
|
||||
PlaceWareTempFile( const OUString& aURL );
|
||||
~PlaceWareTempFile();
|
||||
|
||||
static OUString createTempFileURL();
|
||||
OUString getFileURL();
|
||||
|
Reference in New Issue
Block a user