diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-02 13:50:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-19 10:45:00 +0200 |
| commit | 5133b27e638140ba574016b33dae70ca92edc323 (patch) | |
| tree | 8c113b072c017a2beb6b96fa144c7ccb399373f5 /sfx2/source/view/viewfrm.cxx | |
| parent | 062e40c76bcab664907737feace74f134a25c29c (diff) | |
loplugin:constantfunction: sfx2
Change-Id: I7b4c18b1f9644048f506fc1b1d1fb8c8c590ea7f
Diffstat (limited to 'sfx2/source/view/viewfrm.cxx')
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 24ad62e384a2..0501ed65cb34 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -328,9 +328,6 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) { case SID_EDITDOC: { - if ( GetFrame().HasComponent() ) - break; - // Due to Double occupancy in toolboxes (with or without Ctrl), // it is also possible that the slot is enabled, but Ctrl-click // despite this is not! @@ -857,14 +854,6 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet ) SfxWhichIter aIter( rSet ); for ( sal_uInt16 nWhich = aIter.FirstWhich(); nWhich; nWhich = aIter.NextWhich() ) { - if ( GetFrame().HasComponent() ) - { - // If the component is not self-dispatched, then - // it makes no sense! - rSet.DisableItem( nWhich ); - continue; - } - switch ( nWhich ) { case SID_EDITDOC: @@ -1441,7 +1430,6 @@ void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh ) pDispatcher->Push( *pObjSh ); pDispatcher->Flush(); StartListening( *pObjSh ); - pObjSh->ViewAssigned(); Notify( *pObjSh, SfxSimpleHint(SFX_HINT_TITLECHANGED) ); Notify( *pObjSh, SfxSimpleHint(SFX_HINT_DOCCHANGED) ); pDispatcher->SetReadOnly_Impl( pObjSh->IsReadOnly() ); @@ -1756,8 +1744,7 @@ void SfxViewFrame::Show() // Display Frame-window, but only if the ViewFrame has no window of its // own or if it does not contain a Component - if ( &GetWindow() == &GetFrame().GetWindow() || !GetFrame().HasComponent() ) - GetWindow().Show(); + GetWindow().Show(); GetFrame().GetWindow().Show(); } |