diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 12:09:22 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 12:09:22 +0000 |
| commit | d2983cad96f9e9ed7c4717fc806e9038956b70e4 (patch) | |
| tree | 186f45f9bc2e184a2bd6cbfbb60c0e91a63d5424 /sfx2 | |
| parent | d881d733084def5d75a3e69de3dbe0254fe1f41b (diff) | |
INTEGRATION: CWS fwk86 (1.133.78); FILE MERGED
2008/04/30 15:47:54 pb 1.133.78.2: RESYNC: (1.133-1.135); FILE MERGED
2008/04/10 10:54:50 mav 1.133.78.1: #i86462# let the current security settings be used during reload
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 712cc3cbc1..1edb60a688 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewfrm.cxx,v $ - * $Revision: 1.135 $ + * $Revision: 1.136 $ * * This file is part of OpenOffice.org. * @@ -673,6 +673,10 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) pNewSet->ClearItem( SID_STREAM ); pNewSet->ClearItem( SID_INPUTSTREAM ); pNewSet->Put( SfxStringItem( SID_FILTER_NAME, pMedium->GetFilter()->GetName() ) ); + + // let the current security settings be checked again + pNewSet->Put( SfxUInt16Item( SID_MACROEXECMODE, document::MacroExecMode::USE_CONFIG ) ); + if ( rReq.GetSlot() == SID_EDITDOC || !bForEdit ) // edit mode is switched or reload of readonly document pNewSet->Put( SfxBoolItem( SID_DOC_READONLY, !bForEdit ) ); |