Kaydet (Commit) 66f866d2 authored tarafından Miklos Vajna's avatar Miklos Vajna

dbaccess: avoid exceptions during loading embedded data sources

Situation before/after the patch is the same, just silence lots of
harmless warnings for now.

Change-Id: I00428bdfd939d8cdd3bfd447339e0417e70f4689
üst 5eb6bd4d
......@@ -824,6 +824,11 @@ Reference< XStorage > ODatabaseModelImpl::getOrCreateRootStorage()
aStorageCreationArgs[1] <<= ElementModes::READWRITE;
Reference< XStorage > xDocumentStorage;
OUString sURL;
aSource >>= sURL;
// Don't try to load a meta-URL as-is.
if (!sURL.startsWithIgnoreAsciiCase("vnd.sun.star.pkg:"))
{
try
{
xDocumentStorage.set( xStorageFactory->createInstanceWithArguments( aStorageCreationArgs ), UNO_QUERY_THROW );
......@@ -841,6 +846,7 @@ Reference< XStorage > ODatabaseModelImpl::getOrCreateRootStorage()
DBG_UNHANDLED_EXCEPTION();
}
}
}
impl_switchToStorage_throw( xDocumentStorage );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment