diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-01 10:40:56 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-01 10:42:12 +0200 |
| commit | 024f334c48bc3d6cfac91ab7499f6b2863223c24 (patch) | |
| tree | 32fcf0402aeeb593ab0165bf180a5681a19c0917 /sfx2/source/view | |
| parent | 15cea073e7ed4970e60967fe036fc492e2052203 (diff) | |
Revert "fdo#44081 don't remove 'edit' pop-up menu entry from form in design mode"
This reverts commit 15cea073e7ed4970e60967fe036fc492e2052203. I
overlooked the fact during review that this introduces an svx <-> sfx2
circular dependency.
Diffstat (limited to 'sfx2/source/view')
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 5434fa6c1add..c01974d4ef5c 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -21,7 +21,6 @@ #include <stdio.h> -#include <svx/fmshell.hxx> #include <sfx2/infobar.hxx> #include <sfx2/viewfrm.hxx> #include <com/sun/star/document/MacroExecMode.hpp> @@ -867,15 +866,8 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet ) { case SID_EDITDOC: { - SfxViewShell *pVSh; - FmFormShell *pFSh; - if ( !pSh || - !pSh->HasName() || - !( pSh->Get_Impl()->nLoadedFlags & SFX_LOADED_MAINDOCUMENT ) || - ( pSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED && - ( !(pVSh = pSh->GetViewShell()) || - !(pFSh = pVSh->GetFormShell()) || - !pFSh->IsDesignMode()))) + if ( !pSh || !pSh->HasName() || !( pSh->Get_Impl()->nLoadedFlags & SFX_LOADED_MAINDOCUMENT ) + || pSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) rSet.DisableItem( SID_EDITDOC ); else { |