diff options
| author | Mathias Bauer <mba@openoffice.org> | 2000-10-11 14:37:30 +0000 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2000-10-11 14:37:30 +0000 |
| commit | a14066bd47cc5b0f58d26982787580b5fd63a810 (patch) | |
| tree | 6d3a83caf953822721f7c9e9ec4c4b8b064a3fa8 /sfx2 | |
| parent | 03d9b00f1903bdcebc312f39ab2156c301b947a0 (diff) | |
#79394#: missing referer
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index eb6a1ebcb77a..0d88905e43ef 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewfrm.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: pb $ $Date: 2000-09-25 11:22:30 $ + * last change: $Author: mba $ $Date: 2000-10-11 15:37:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -736,21 +736,20 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) nMode, pMedium->IsDirect(), sal_True, bUseFilter ? pMedium->GetFilter() : 0, pNewSet ); + pNewSet = pNewMedium->GetItemSet(); if ( pURLItem ) { - pNewSet = pNewMedium->GetItemSet(); pNewSet->Put( SfxStringItem( SID_REFERER, pMedium->GetName() ) ); } + else + pNewSet->Put( SfxStringItem( SID_REFERER, String() ) ); SFX_REQUEST_ARG( rReq, pBindingItem, SfxRefItem, SID_BINDING, sal_False); if( pBindingItem ) - { DBG_ERROR( "Not implemented!" ); - } xOldObj->CancelTransfers(); - pNewMedium->GetItemSet()->Put( - SfxUInt32Item( SID_FLAGS, + pNewSet->Put( SfxUInt32Item( SID_FLAGS, xOldObj->GetFlags() & ( SFXOBJECTSHELL_DONTREPLACE | SFXOBJECTSHELL_DONTCLOSE ) ) ); @@ -760,11 +759,10 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) // eigentliches Reload if ( pDesc ) - pNewMedium->GetItemSet()->Put( - SfxFrameDescriptorItem( pDesc, SID_FRAMEDESCRIPTOR ) ); - pNewMedium->GetItemSet()->Put( SfxUInt16Item( SID_BROWSEMODE, NO_BROWSE ) ); - pNewMedium->GetItemSet()->Put( SfxBoolItem( SID_RELOAD, sal_True ) ); - pNewMedium->GetItemSet()->Put( SfxFrameItem ( SID_DOCFRAME, GetFrame() ) ); + pNewSet->Put( SfxFrameDescriptorItem( pDesc, SID_FRAMEDESCRIPTOR ) ); + pNewSet->Put( SfxUInt16Item( SID_BROWSEMODE, NO_BROWSE ) ); + pNewSet->Put( SfxBoolItem( SID_RELOAD, sal_True ) ); + pNewSet->Put( SfxFrameItem ( SID_DOCFRAME, GetFrame() ) ); LoadEnvironment_ImplRef xLoader = new LoadEnvironment_Impl( |