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

#105134# fixed debug msvc internal compiler error

Browse Source
This commit is contained in:
Daniel Boelzle
2002-11-18 12:58:33 +00:00
parent e8f0d2f782
commit c7b5232924
1 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
stoc/source/implementationregistration/implreg.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: implreg.cxx,v $ * $RCSfile: implreg.cxx,v $
* *
* $Revision: 1.18 $ * $Revision: 1.19 $
* *
* last change: $Author: dbo $ $Date: 2002-11-11 16:39:08 $ * last change: $Author: dbo $ $Date: 2002-11-18 13:58:33 $
* *
* 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
@@ -334,36 +334,31 @@ static void prepareLink( const Reference < XSimpleRegistry > & xDest,
//************************************************************************* //*************************************************************************
// static searchImplForLink // static searchImplForLink
// //
static OUString searchImplForLink(const Reference < XRegistryKey > & xRootKey, static OUString searchImplForLink(
const Reference < XRegistryKey > & xRootKey,
const OUString& linkName, const OUString& linkName,
const OUString& implName) throw ( InvalidRegistryException ) const OUString& implName )
throw ( InvalidRegistryException )
{ {
OUString ret;
// try
// {
const StringPool & pool = spool(); const StringPool & pool = spool();
Reference < XRegistryKey > xKey = xRootKey->openKey( pool.slash_IMPLEMENTATIONS ); Reference < XRegistryKey > xKey = xRootKey->openKey( pool.slash_IMPLEMENTATIONS );
if (xKey.is()) if (xKey.is())
{ {
Sequence< Reference < XRegistryKey > > subKeys = xKey->openKeys(); Sequence< Reference < XRegistryKey > > subKeys( xKey->openKeys() );
const Reference < XRegistryKey > * pSubKeys = subKeys.getConstArray(); const Reference < XRegistryKey > * pSubKeys = subKeys.getConstArray();
Reference < XRegistryKey > xImplKey; OUString key_name( pool.slash_UNO + linkName );
for (sal_Int32 i = 0; i < subKeys.getLength(); i++) for (sal_Int32 i = 0; i < subKeys.getLength(); i++)
{ {
xImplKey = pSubKeys[i];
try try
{ {
if (xImplKey->getKeyType( pool.slash_UNO + linkName) == RegistryKeyType_LINK) Reference < XRegistryKey > xImplKey( pSubKeys[i] );
if (xImplKey->getKeyType( key_name ) == RegistryKeyType_LINK)
{ {
OUString oldImplName = xImplKey->getKeyName().copy(strlen("/IMPLEMENTATIONS/")); OUString oldImplName = xImplKey->getKeyName().copy(strlen("/IMPLEMENTATIONS/"));
if (implName != oldImplName) if (implName != oldImplName)
{ {
ret = oldImplName; return oldImplName;
break;
} }
} }
} }
@@ -372,12 +367,8 @@ static OUString searchImplForLink(const Reference < XRegistryKey > & xRootKey,
} }
} }
} }
// }
// catch(InvalidRegistryException&)
// {
// }
return ret; return OUString();
} }
//************************************************************************* //*************************************************************************