From 1594c65164ac28ef3f180822dd64c03721e9baca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 1 Aug 2008 10:23:51 +0000 Subject: [PATCH] INTEGRATION: CWS native177 (1.43.10); FILE MERGED 2008/07/23 15:57:49 sb 1.43.10.1: #i92049# .override failed for non-existing files --- sal/rtl/source/bootstrap.cxx | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx index 173b565ef427..004ddb60a9ed 100644 --- a/sal/rtl/source/bootstrap.cxx +++ b/sal/rtl/source/bootstrap.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: bootstrap.cxx,v $ - * $Revision: 1.43 $ + * $Revision: 1.44 $ * * This file is part of OpenOffice.org. * @@ -994,13 +994,10 @@ rtl::OUString expandMacros( rtl::Bootstrap b(seg[1]); Bootstrap_Impl * f = static_cast< Bootstrap_Impl * >( b.getHandle()); - // Silently ignore bootstrap files that cannot be opened: - if (f != NULL) { - buf.append( - lookup( - f == NULL ? get_static_bootstrap_handle() : f, - f != NULL, seg[2], requestStack)); - } + buf.append( + lookup( + f == NULL ? get_static_bootstrap_handle() : f, + f != NULL, seg[2], requestStack)); } else { // Going through osl::Profile, this code erroneously does // not recursively expand macros in the resulting