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

#96232# throw exception when merging into read-only rdb

Browse source
This commit is contained in:
Daniel Boelzle 2002-06-07 14:14:15 +00:00
parent dabd8c92f8
commit 2a4158ff5b
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
stoc/source/implementationregistration/mergekeys.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: mergekeys.cxx,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: dbo $ $Date: 2001-09-11 09:27:11 $
* last change: $Author: dbo $ $Date: 2002-06-07 15:14:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -174,6 +174,14 @@ void SAL_CALL mergeKeys(
Reference< registry::XRegistryKey > const & xSource )
SAL_THROW( (registry::InvalidRegistryException, registry::MergeConflictException) )
{
if (xDest->isReadOnly())
{
throw registry::InvalidRegistryException(
OUString( RTL_CONSTASCII_USTRINGPARAM(
"destination registry is read-only! cannot merge!") ),
Reference< XInterface >() );
}
t_links links;
links.reserve( 16 );
mergeKeys( xDest, xSource, links );