#90267# remove TF_FILEURL

3 files changed, 7 insertions, 39 deletions

diff --git a/psprint/source/printer/printerinfomanager.cxx b/psprint/source/printer/printerinfomanager.cxx
index bdcbe2b38d47..7679f0d1a94e 100644
--- a/psprint/source/printer/printerinfomanager.cxx
+++ b/psprint/source/printer/printerinfomanager.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: printerinfomanager.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: pl $ $Date: 2001-06-19 16:08:12 $
+ *  last change: $Author: pl $ $Date: 2001-07-27 07:58:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -248,22 +248,14 @@ void PrinterInfoManager::initialize()
 
         // check directory validity
         OUString aUniPath;
-#ifdef TF_FILEURL
         FileBase::getFileURLFromSystemPath( aDir.PathToFileName(), aUniPath );
-#else
-        FileBase::normalizePath( aDir.PathToFileName(), aUniPath );
-#endif
         Directory aDirectory( aUniPath );
         if( aDirectory.open() )
             continue;
         aDirectory.close();
 
 
-#ifdef TF_FILEURL
         FileBase::getFileURLFromSystemPath( aFile.PathToFileName(), aUniPath );
-#else
-        FileBase::normalizePath( aFile.PathToFileName(), aUniPath );
-#endif
         FileStatus aStatus( FileStatusMask_All );
         DirectoryItem aItem;
 
@@ -440,11 +432,7 @@ void PrinterInfoManager::initialize()
                 fillFontSubstitutions( aPrinter.m_aInfo );
 
                 // finally insert printer
-#ifdef TF_FILEURL
                 FileBase::getFileURLFromSystemPath( aFile.PathToFileName(), aPrinter.m_aFile );
-#else
-                FileBase::normalizePath( aFile.PathToFileName(), aPrinter.m_aFile );
-#endif
                 aPrinter.m_bModified    = false;
                 aPrinter.m_aGroup       = aConfig.GetGroupName( nGroup );
                 m_aPrinters[ aPrinterName ] = aPrinter;
@@ -557,11 +545,7 @@ static bool checkWriteability( const OUString& rUniPath )
 {
     bool bRet = false;
     OUString aSysPath;
-#ifdef TF_FILEURL
     FileBase::getSystemPathFromFileURL( rUniPath, aSysPath );
-#else
-    FileBase::getSystemPathFromNormalizedPath( rUniPath, aSysPath );
-#endif
     SvFileStream aStream( aSysPath, STREAM_READ | STREAM_WRITE );
     if( aStream.IsOpen() && aStream.IsWritable() )
         bRet = true;
diff --git a/psprint/source/printergfx/printerjob.cxx b/psprint/source/printergfx/printerjob.cxx
index 8521782f1b20..1798c5c008a1 100644
--- a/psprint/source/printergfx/printerjob.cxx
+++ b/psprint/source/printergfx/printerjob.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: printerjob.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: pl $ $Date: 2001-07-26 16:07:49 $
+ *  last change: $Author: pl $ $Date: 2001-07-27 07:58:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -140,11 +140,7 @@ PrinterJob::CreateSpoolFile (const rtl::OUString& rName, const rtl::OUString& rE
     rtl::OUString aFileName = maSpoolDirName + rtl::OUString::createFromAscii ("/")
         + rName + rExtension;
     rtl::OUString aNormFileName;
-#ifdef TF_FILEURL
-    OSL_VERIFY( osl_File_E_None == osl::File::getFileURLFromSystemPath( aFileName, aNormFileName ) );
-#else
-    osl::File::normalizePath (aFileName, aNormFileName);
-#endif
+    osl::File::getFileURLFromSystemPath( aFileName, aNormFileName );
 
     osl::File* pFile = new osl::File (aNormFileName);
     pFile->open (OpenFlag_Read | OpenFlag_Write | OpenFlag_Create);
@@ -302,7 +298,6 @@ void
 removeSpoolDir (const rtl::OUString& rSpoolDir)
 {
     rtl::OUString aSysPath;
-#ifdef TF_FILEURL
     if( osl_File_E_None != osl::File::getSystemPathFromFileURL( rSpoolDir, aSysPath ) )
     {
         // Conversion did not work, as this is quite a dangerous action,
@@ -310,9 +305,6 @@ removeSpoolDir (const rtl::OUString& rSpoolDir)
         OSL_ENSURE( 0, "psprint: couldn't remove spool directory" );
         return;
     }
-#else
-    osl::File::getSystemPathFromNormalizedPath (rSpoolDir, aSysPath);
-#endif
     rtl::OString aSysPathByte =
         rtl::OUStringToOString (aSysPath, osl_getThreadTextEncoding());
     sal_Char  pSystem [128];
@@ -343,11 +335,7 @@ createSpoolDir ()
     char* pName = tempnam (pTmpDir, "psp");
     rtl::OUString aSubDir = rtl::OUString::createFromAscii (pName);
     rtl::OUString aUNCSubDir;
-#ifdef TF_FILEURL
     osl::File::getFileURLFromSystemPath (aSubDir, aUNCSubDir);
-#else
-    osl::File::normalizePath (aSubDir, aUNCSubDir);
-#endif
     free (pName);
 
     /* create directory with attributes */
diff --git a/psprint/source/printergfx/text_gfx.cxx b/psprint/source/printergfx/text_gfx.cxx
index 8000845f85ae..5462cb8e3f8e 100644
--- a/psprint/source/printergfx/text_gfx.cxx
+++ b/psprint/source/printergfx/text_gfx.cxx
@@ -2,9 +2,9 @@
   *
   *  $RCSfile: text_gfx.cxx,v $
   *
-  *  $Revision: 1.9 $
+  *  $Revision: 1.10 $
   *
-  *  last change: $Author: cp $ $Date: 2001-07-06 16:11:14 $
+  *  last change: $Author: pl $ $Date: 2001-07-27 07:58:33 $
   *
   *  The Contents of this file are made available subject to the terms of
   *  either of the following licenses
@@ -160,11 +160,7 @@ PrinterGfx::PSUploadPS1Font (sal_Int32 nFontID)
     {
         const rtl::OString& rSysPath (mrFontMgr.getFontFileSysPath(nFontID) );
         rtl::OUString aUNCPath;
-#ifdef TF_FILEURL
         osl::File::getFileURLFromSystemPath (OStringToOUString (rSysPath, osl_getThreadTextEncoding()), aUNCPath);
-#else
-        osl::File::normalizePath (OStringToOUString (rSysPath, osl_getThreadTextEncoding()), aUNCPath);
-#endif
         osl::File aFontFile (aUNCPath);
 
         // provide the pfb or pfa font as a (pfa-)font resource