[Libreoffice-commits] core.git: filter/source

[Peter Foley]

 filter/source/placeware/exporter.cxx |    8 ++++----
 filter/source/placeware/tempfile.cxx |    8 ++++----
 filter/source/placeware/tempfile.hxx |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 4e3c5f4e50e40a40bbd0db1c249d9957e181b71d
Author: Peter Foley <pefol...@verizon.net>
Date:   Mon Apr 8 19:01:17 2013 -0400

    rename overly generic placeware TempFile class to avoid symbol clashes
    
    Change-Id: I64adee63fd8802884d3c2388b0e21a237f61b922

diff --git a/filter/source/placeware/exporter.cxx 
b/filter/source/placeware/exporter.cxx
index 2219a3a..393394c 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -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");
diff --git a/filter/source/placeware/tempfile.cxx 
b/filter/source/placeware/tempfile.cxx
index e680e45..d4c4c50 100644
--- a/filter/source/placeware/tempfile.cxx
+++ b/filter/source/placeware/tempfile.cxx
@@ -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;
 }
diff --git a/filter/source/placeware/tempfile.hxx 
b/filter/source/placeware/tempfile.hxx
index 0712017..4b37024 100644
--- a/filter/source/placeware/tempfile.hxx
+++ b/filter/source/placeware/tempfile.hxx
@@ -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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits