diff options
| author | Jörg Budischewski <jbu@openoffice.org> | 2001-05-22 08:03:19 +0000 |
|---|---|---|
| committer | Jörg Budischewski <jbu@openoffice.org> | 2001-05-22 08:03:19 +0000 |
| commit | 2c88b51c60745767d016e1feb8af8d4b8196fcbb (patch) | |
| tree | 9627d8eaa243d2c60da64de6df0f91b601eb33cc /psprint/source | |
| parent | 85b8d854835162272904dc10c79736c8042e8aaf (diff) | |
file url changes
Diffstat (limited to 'psprint/source')
| -rw-r--r-- | psprint/source/printer/printerinfomanager.cxx | 8 | ||||
| -rw-r--r-- | psprint/source/printergfx/printerjob.cxx | 18 |
2 files changed, 17 insertions, 9 deletions
diff --git a/psprint/source/printer/printerinfomanager.cxx b/psprint/source/printer/printerinfomanager.cxx index 0228769ef8ae..80e9bcdb6a49 100644 --- a/psprint/source/printer/printerinfomanager.cxx +++ b/psprint/source/printer/printerinfomanager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: printerinfomanager.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jbu $ $Date: 2001-05-14 09:09:53 $ + * last change: $Author: jbu $ $Date: 2001-05-22 09:03:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -532,7 +532,11 @@ 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 076570e3ddbc..71debe207359 100644 --- a/psprint/source/printergfx/printerjob.cxx +++ b/psprint/source/printergfx/printerjob.cxx @@ -2,9 +2,9 @@ * * $RCSfile: printerjob.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jbu $ $Date: 2001-05-15 12:53:43 $ + * last change: $Author: jbu $ $Date: 2001-05-22 09:02:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,16 +111,16 @@ PrinterJob::CreateSpoolFile (const rtl::OUString& rName, const rtl::OUString& rE rtl::OUString aFileName = maSpoolDirName + rtl::OUString::createFromAscii ("/") + rName + rExtension; - rtl::OUString aUNCFileName; + rtl::OUString aNormFileName; #ifdef TF_FILEURL - OSL_VERIFY( osl_File_E_None == osl::File::getFileURLFromSystemPath( aSubDir, aUNCSubDir ) ); + OSL_VERIFY( osl_File_E_None == osl::File::getFileURLFromSystemPath( aFileName, aNormFileName ) ); #else - osl::File::normalizePath (aFileName, aUNCFileName); + osl::File::normalizePath (aFileName, aNormFileName); #endif - osl::File* pFile = new osl::File (aUNCFileName); + osl::File* pFile = new osl::File (aNormFileName); pFile->open (OpenFlag_Read | OpenFlag_Write | OpenFlag_Create); - pFile->setAttributes (aUNCFileName, + pFile->setAttributes (aNormFileName, osl_File_Attribute_OwnWrite | osl_File_Attribute_OwnRead ); return pFile; @@ -338,7 +338,11 @@ 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 */ |