impress193: merging changes

This commit is contained in:
Christian Lippka
2010-07-05 10:34:12 +02:00

View File

@@ -280,10 +280,7 @@ SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, Window& rWindow, USHORT nViewI
aLoadArgs = aArgs.getPropertyValues();
// load the doc into that frame
::rtl::OUString sLoaderURL( rDoc.GetModel()->getURL() );
if ( sLoaderURL.getLength() == 0 )
sLoaderURL = rDoc.GetFactory().GetFactoryURL();
::rtl::OUString sLoaderURL( RTL_CONSTASCII_USTRINGPARAM( "private:object" ) );
Reference< XComponentLoader > xLoader( xFrame, UNO_QUERY_THROW );
xLoader->loadComponentFromURL(
sLoaderURL,