mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS jscpp1 (1.3.12); FILE MERGED

Browse Source 
2005/08/10 07:39:41 jsc 1.3.12.1: #i41875# integrate patch, use osl::FileBase::createTempFile
This commit is contained in:
Rüdiger Timm
2005-10-17 12:31:01 +00:00
parent 2b69089ecc
commit af91f9416d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rdbmaker/source/codemaker/typemanager.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: typemanager.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: rt $ $Date: 2005-09-09 05:04:44 $
* last change: $Author: rt $ $Date: 2005-10-17 13:31:01 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,6 +36,9 @@
#ifndef _RTL_ALLOC_H_
#include <rtl/alloc.h>
#endif
#ifndef _OSL_FILE_HXX_
#include <osl/file.hxx>
#endif
#ifndef _CODEMAKER_TYPEMANAGER_HXX_
#include <codemaker/typemanager.hxx>
@@ -134,9 +137,10 @@ sal_Bool RegistryTypeManager::init(sal_Bool bMerged, const StringVector& regFile
if (m_pImpl->m_isMerged)
{
Registry *pTmpReg = new Registry(loader);
OString tmpName(makeTempName(NULL));
if (!pTmpReg->create( convertToFileUrl(tmpName) ) )
OUString tmpName;
osl::FileBase::createTempFile(0, 0, &tmpName);
if (!pTmpReg->create(tmpName))
{
RegistryKey rootKey;
RegError ret = REG_NO_ERROR;