diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-18 12:40:45 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-18 12:40:45 +0000 |
| commit | 4ad36d7047c93ccec11fe5768b285d7ffeef51f1 (patch) | |
| tree | c4a5203c40d25472a8e668e4a5370bcf1fb4a0b8 /idlc/source/idlccompile.cxx | |
| parent | d6d60f0b6c6d097657d201c2aa90d4866c199a4a (diff) | |
INTEGRATION: CWS sdk13 (1.12.56); FILE MERGED
2004/05/12 09:56:29 jsc 1.12.56.2: RESYNC: (1.12-1.13); FILE MERGED
2004/05/07 07:19:41 jsc 1.12.56.1: #116180# change default for generation urd files
Diffstat (limited to 'idlc/source/idlccompile.cxx')
| -rw-r--r-- | idlc/source/idlccompile.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index c155e3b698d6..d1bafe2b9b4b 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -2,9 +2,9 @@ * * $RCSfile: idlccompile.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2004-03-30 16:47:20 $ + * last change: $Author: rt $ $Date: 2004-05-18 13:40:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -123,15 +123,12 @@ OString convertToAbsoluteSystemPath(const OString& fileName) { OSL_VERIFY(FileBase::getSystemPathFromFileURL(uFileName, uSysFileName) == FileBase::E_None); } else - if ( fileName.indexOf('.') == 0 || fileName.indexOf(SEPARATOR) < 0) { - OUString uWorkingDir, uUrlFileName; + OUString uWorkingDir, uUrlFileName, uTmp; OSL_VERIFY( osl_getProcessWorkingDir(&uWorkingDir.pData) == osl_Process_E_None ); - OSL_VERIFY( FileBase::getAbsoluteFileURL(uWorkingDir, uFileName, uUrlFileName) == FileBase::E_None ); + OSL_VERIFY( FileBase::getFileURLFromSystemPath(uFileName, uTmp) == FileBase::E_None ); + OSL_VERIFY( FileBase::getAbsoluteFileURL(uWorkingDir, uTmp, uUrlFileName) == FileBase::E_None ); OSL_VERIFY( FileBase::getSystemPathFromFileURL(uUrlFileName, uSysFileName) == FileBase::E_None ); - } else - { - return fileName; } return OUStringToOString(uSysFileName, osl_getThreadTextEncoding()); @@ -141,7 +138,8 @@ OString convertToFileUrl(const OString& fileName) { if ( !isFileUrl(fileName) ) { - OUString uFileName(fileName.getStr(), fileName.getLength(), osl_getThreadTextEncoding()); + OString tmp = convertToAbsoluteSystemPath(fileName); + OUString uFileName(tmp.getStr(), tmp.getLength(), osl_getThreadTextEncoding()); OUString uUrlFileName; OSL_VERIFY(FileBase::getFileURLFromSystemPath(uFileName, uUrlFileName) == FileBase::E_None); return OUStringToOString(uUrlFileName, osl_getThreadTextEncoding()); @@ -262,7 +260,7 @@ sal_Bool copyFile(const OString* source, const OString& target) sal_Int32 compileFile(const OString * pathname) { - // preporcess input file + // preprocess input file OString tmpFile = makeTempName(OString("idli_"), OString(".idl")); OString preprocFile = makeTempName(OString("idlf_"), OString(".idl")); |