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

#101138# using memory registry if no url given && create flag set

Browse source
This commit is contained in:
Daniel Boelzle 2002-07-30 11:00:48 +00:00
parent 9187f4da5b
commit feef1b3466
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
registry/source/regimpl.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: regimpl.cxx,v $ * $RCSfile: regimpl.cxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: jsc $ $Date: 2002-06-18 17:28:00 $ * last change: $Author: dbo $ $Date: 2002-07-30 12:00:48 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -485,7 +485,17 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo
m_readOnly = sal_True; m_readOnly = sal_True;
} }
if (errCode = rRegFile.create(regName, sAccessMode, REG_PAGESIZE)) if (0 == regName.getLength() &&
store_AccessCreate == sAccessMode)
{
errCode = rRegFile.createInMemory();
}
else
{
errCode = rRegFile.create(regName, sAccessMode, REG_PAGESIZE);
}
if (errCode)
{ {
switch (errCode) switch (errCode)
{ {
@ -580,14 +590,17 @@ RegError ORegistry::destroyRegistry(const OUString& regName)
m_file.close(); m_file.close();
m_isOpen = sal_False; m_isOpen = sal_False;
OUString systemName; if (m_name.getLength())
if ( FileBase::getSystemPathFromFileURL(m_name, systemName) != FileBase::E_None )
systemName = m_name;
OString name( OUStringToOString(systemName, osl_getThreadTextEncoding()) );
if (unlink(name.getStr()) != 0)
{ {
return REG_DESTROY_REGISTRY_FAILED; OUString systemName;
if ( FileBase::getSystemPathFromFileURL(m_name, systemName) != FileBase::E_None )
systemName = m_name;
OString name( OUStringToOString(systemName, osl_getThreadTextEncoding()) );
if (unlink(name.getStr()) != 0)
{
return REG_DESTROY_REGISTRY_FAILED;
}
} }
} else } else
{ {