diff options
| author | sb <sb@openoffice.org> | 2010-08-25 14:21:49 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-08-25 14:21:49 +0200 |
| commit | 9f2a658025c92f5d9dac1d717e0517fba8589d69 (patch) | |
| tree | 00352b0961ea55132f422c1543947d18ecc8c2f0 /sfx2/source/view/viewfrm.cxx | |
| parent | 8325f6b22551883c99c5b11cff50d454ad394a60 (diff) | |
| parent | 45ba31b194bc51b16d8f0892e432b2b77fce144d (diff) | |
sb130: merged in OOO330_m5
Diffstat (limited to 'sfx2/source/view/viewfrm.cxx')
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 21d10471fc..a8edc018ce 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -813,6 +813,13 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) xNewObj->SetModifyPasswordEntered( sal_False ); xNewObj->SetReadOnly(); } + else if ( rReq.GetSlot() == SID_EDITDOC && bForEdit && !xNewObj->IsReadOnlyMedium() ) + { + // the filter might request setting of the document to readonly state + // but in case of SID_EDITDOC it should not happen if the document + // can be opened for editing + xNewObj->SetReadOnlyUI( sal_False ); + } if ( xNewObj->IsDocShared() ) { @@ -2144,6 +2151,8 @@ SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc aTransformLoadArgs.remove( "Hidden" ); ::rtl::OUString sURL( RTL_CONSTASCII_USTRINGPARAM( "private:object" ) ); + if ( !sURL.getLength() ) + sURL = i_rDoc.GetFactory().GetFactoryURL(); Reference< XComponentLoader > xLoader( i_rFrame, UNO_QUERY_THROW ); xLoader->loadComponentFromURL( sURL, ::rtl::OUString::createFromAscii( "_self" ), 0, |