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

INTEGRATION: CWS jl13 (1.20.2); FILE MERGED

Browse source 
2004/10/15 12:38:16 dbo 1.20.2.1: #i35536#
This commit is contained in:
Jens-Heiner Rechtien 2004-11-09 12:40:32 +00:00
parent b70d6cfee0
commit 409ce21618
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cppuhelper/source/bootstrap.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: bootstrap.cxx,v $ * $RCSfile: bootstrap.cxx,v $
* *
* $Revision: 1.20 $ * $Revision: 1.21 $
* *
* last change: $Author: obo $ $Date: 2004-08-12 13:34:35 $ * last change: $Author: hr $ $Date: 2004-11-09 13:40:32 $
* *
* 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
@ -322,6 +322,7 @@ static Reference< registry::XSimpleRegistry > nestRegistries(
} }
catch (registry::InvalidRegistryException & invalidRegistryException) catch (registry::InvalidRegistryException & invalidRegistryException)
{ {
(void) invalidRegistryException;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OString rdb_name_tmp = OUStringToOString( OString rdb_name_tmp = OUStringToOString(
write_rdb, RTL_TEXTENCODING_ASCII_US); write_rdb, RTL_TEXTENCODING_ASCII_US);
@ -350,15 +351,6 @@ static Reference< registry::XSimpleRegistry > nestRegistries(
if (optional) if (optional)
rdb_name = rdb_name.copy( 1 ); rdb_name = rdb_name.copy( 1 );
if (rdb_name.matchIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.expand:") ))
{
rdb_name = ::rtl::Uri::decode(
rdb_name.copy( sizeof ("vnd.sun.star.expand:") -1 ),
rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
bootstrap.expandMacrosFrom( rdb_name );
}
try try
{ {
Reference<registry::XSimpleRegistry> simpleRegistry( Reference<registry::XSimpleRegistry> simpleRegistry(
@ -394,6 +386,7 @@ static Reference< registry::XSimpleRegistry > nestRegistries(
throw; throw;
} }
(void) invalidRegistryException;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OString rdb_name_tmp = OUStringToOString( OString rdb_name_tmp = OUStringToOString(
rdb_name, RTL_TEXTENCODING_ASCII_US ); rdb_name, RTL_TEXTENCODING_ASCII_US );