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

INTEGRATION: CWS native177 (1.43.10); FILE MERGED

Browse source 
2008/07/23 15:57:49 sb 1.43.10.1: #i92049# .override failed for non-existing files
This commit is contained in:
Rüdiger Timm 2008-08-01 10:23:51 +00:00
parent 521d6cbfc2
commit 1594c65164
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sal/rtl/source/bootstrap.cxx
View file

@ -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