diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:09:44 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:09:44 +0000 |
| commit | 59f94050fca667bef75cdbe80ba616a001f10faf (patch) | |
| tree | 918ba3a7c588d98cc4db580160d5614fb8640dd1 /rdbmaker | |
| parent | 5da739c80b71fa7a26359cfabf089a862554b5b0 (diff) | |
INTEGRATION: CWS warnings01 (1.9.80); FILE MERGED
2005/11/07 19:41:39 pl 1.9.80.4: RESYNC: (1.10-1.11); FILE MERGED
2005/09/23 00:24:05 sb 1.9.80.3: RESYNC: (1.9-1.10); FILE MERGED
2005/09/07 13:50:20 sb 1.9.80.2: #i53898# Made code warning-free.
2005/09/01 11:29:58 sb 1.9.80.1: #i53898# Made code warning-free.
Diffstat (limited to 'rdbmaker')
| -rw-r--r-- | rdbmaker/source/codemaker/global.cxx | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/rdbmaker/source/codemaker/global.cxx b/rdbmaker/source/codemaker/global.cxx index 55eee7009faf..faa54f44d0eb 100644 --- a/rdbmaker/source/codemaker/global.cxx +++ b/rdbmaker/source/codemaker/global.cxx @@ -4,9 +4,9 @@ * * $RCSfile: global.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2005-10-17 13:30:39 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:09:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -261,11 +261,21 @@ OUString convertToFileUrl(const OString& fileName) if ( fileName.indexOf('.') == 0 || fileName.indexOf(SEPARATOR) < 0 ) { OUString uWorkingDir; - OSL_VERIFY( osl_getProcessWorkingDir(&uWorkingDir.pData) == osl_Process_E_None ); - OSL_VERIFY( FileBase::getAbsoluteFileURL(uWorkingDir, uFileName, uUrlFileName) == FileBase::E_None ); + if (osl_getProcessWorkingDir(&uWorkingDir.pData) != osl_Process_E_None) { + OSL_ASSERT(false); + } + if (FileBase::getAbsoluteFileURL(uWorkingDir, uFileName, uUrlFileName) + != FileBase::E_None) + { + OSL_ASSERT(false); + } } else { - OSL_VERIFY( FileBase::getFileURLFromSystemPath(uFileName, uUrlFileName) == FileBase::E_None ); + if (FileBase::getFileURLFromSystemPath(uFileName, uUrlFileName) + != FileBase::E_None) + { + OSL_ASSERT(false); + } } return uUrlFileName; |