diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-06 14:29:08 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-06 14:29:08 +0000 |
commit | e29db6f1e0b0bbf2ab078736df853c920cafc42f (patch) | |
tree | 53683afde9c675a481b2ee944e91ff9412bcfd9a /psprint | |
parent | cefea87138f045512d0d4b1ec2d40947d2412f9b (diff) |
INTEGRATION: CWS vcl56 (1.24.34); FILE MERGED
2006/03/14 16:09:21 pl 1.24.34.2: #i49251# try to ensure existance of user/psprint directory
2006/03/14 15:41:09 pl 1.24.34.1: join from vcl55
Diffstat (limited to 'psprint')
-rw-r--r-- | psprint/source/helper/helper.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/psprint/source/helper/helper.cxx b/psprint/source/helper/helper.cxx index 382ea36027ab..871476474a8f 100644 --- a/psprint/source/helper/helper.cxx +++ b/psprint/source/helper/helper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: helper.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: obo $ $Date: 2006-03-22 10:12:06 $ + * last change: $Author: vg $ $Date: 2006-04-06 15:29:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,6 +78,7 @@ const OUString& getOfficePath( enum whichOfficePath ePath ) aBootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "CustomDataUrl" ) ), aConfigPath ); aBootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseInstallation" ) ), aNetPath ); aBootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "UserInstallation" ) ), aUserPath ); + OUString aUPath = aUserPath; if( ! aConfigPath.compareToAscii( "file://", 7 ) ) { @@ -97,6 +98,15 @@ const OUString& getOfficePath( enum whichOfficePath ePath ) if( osl_getSystemPathFromFileURL( aUserPath.pData, &aSysPath.pData ) == osl_File_E_None ) aUserPath = aSysPath; } + // ensure user path exists + aUPath += OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/psprint" ) ); + #if OSL_DEBUG_LEVEL > 1 + oslFileError eErr = + #endif + osl_createDirectoryPath( aUPath.pData, NULL, NULL ); + #if OSL_DEBUG_LEVEL > 1 + fprintf( stderr, "try to create \"%s\" = %d\n", OUStringToOString( aUPath, RTL_TEXTENCODING_UTF8 ).getStr(), eErr ); + #endif } switch( ePath ) |