strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS sdk13 (1.12.56); FILE MERGED

Browse source 
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
This commit is contained in:
Rüdiger Timm 2004-05-18 12:40:45 +00:00
parent d6d60f0b6c
commit 4ad36d7047
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
idlc/source/idlccompile.cxx
View file

@ -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"));