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

Unbreak stuff on iOS a bit after bootstrapping changes

Browse source 
Change-Id: I0d2ebfc9aa78a9fed057b853d54797a88218c587
This commit is contained in:
Tor Lillqvist 2012-06-04 09:20:19 +03:00
parent 9c0b624286
commit f79d5b9116
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cppuhelper/source/defaultbootstrap.cxx
View file

@ -450,6 +450,7 @@ void Parser::handleComponent() {
reader_.getUrl() + ": <component> is missing \"uri\" attribute",
css::uno::Reference< css::uno::XInterface >());
}
#ifndef DISABLE_DYNLOADING
try {
attrUri_ = rtl::Uri::convertRelToAbs(reader_.getUrl(), attrUri_);
} catch (const rtl::MalformedUriException & e) {
@ -457,6 +458,7 @@ void Parser::handleComponent() {
reader_.getUrl() + ": bad \"uri\" attribute: " + e.getMessage(),
css::uno::Reference< css::uno::XInterface >());
}
#endif
}
void Parser::handleImplementation() {

2
cppuhelper/source/shlib.cxx
View file

@ -541,6 +541,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
// First test library names that aren't app-specific.
static lib_to_component_mapping non_app_specific_map[] = {
{ "bootstrap.uno" SAL_DLLEXTENSION, bootstrap_component_getFactory },
{ "bootstrap.uno.a", bootstrap_component_getFactory },
{ "configmgr.uno.a", configmgr_component_getFactory },
{ "expwrap.uno.a", expwrap_component_getFactory },
{ "fastsax.uno.a", fastsax_component_getFactory },
@ -568,6 +569,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
if ( pSym == NULL)
{
// The call the app-specific lo_get_libmap() to get a mapping for the rest
const lib_to_component_mapping *map = lo_get_libmap();
for (int i = 0; pSym == NULL && map[i].lib != NULL; ++i)
{