diff options
author | sj <sj@openoffice.org> | 2010-07-02 13:45:26 +0200 |
---|---|---|
committer | sj <sj@openoffice.org> | 2010-07-02 13:45:26 +0200 |
commit | 15cd5ea7c5e9d144b37867b3ddbe2b3b7d0902bc (patch) | |
tree | 58e4fd81d5987b9bd3c8a32ba407cf3a990e6093 | |
parent | 99e133f3abede854db3c78e1aca60fa16ffa412b (diff) | |
parent | c7b2c4d3702e36f879b6e39aa3b30ab7150f1f1d (diff) |
merged heads
-rw-r--r-- | sfx2/source/view/frame2.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index c9876ce1f0..5b302047ac 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -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, |