fdo#44081 don't remove 'edit' pop-up menu entry from form in design mode

Change-Id: I009b0e1a155c298bd7f461547125df4ba76805d9
Reviewed-on: https://gerrit.libreoffice.org/11230
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>

8 files changed, 24 insertions, 13 deletions

diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index b79fd2da53ce..44c8d8c46321 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -160,7 +160,7 @@ protected:
         */
     SfxShell( SfxViewShell *pViewSh );
 
-    SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell* pView );
+    void SetViewShell_Impl( SfxViewShell* pView );
     SAL_DLLPRIVATE void Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId );
     SAL_DLLPRIVATE SfxShellObject* GetShellObj_Impl() const;
     SAL_DLLPRIVATE void SetShellObj_Impl( SfxShellObject* pObj );
@@ -351,6 +351,8 @@ public:
         */
     virtual void                Invalidate(sal_uInt16 nId = 0);
 
+    virtual bool                IsDesignMode() const { return false; };
+
     bool                        IsActive() const;
 
     /**
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 5cde8317aa2b..b32c78930768 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -207,6 +207,9 @@ public:
     void                        RemoveSubShell( SfxShell *pShell=NULL );
     SfxShell*                   GetSubShell( sal_uInt16 );
 
+    virtual       SfxShell*     GetFormShell()       { return 0; };
+    virtual const SfxShell*     GetFormShell() const { return 0; };
+
     // Focus, KeyInput, Cursor
     void                        GotFocus() const;
     inline void                 LostFocus() const;
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index b733b253d06c..40228fcd9efd 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -166,8 +166,8 @@ public:
                 const OutputDevice& i_rDevice
             ) const;
 
-    bool        IsDesignMode() const { return m_bDesignMode; }
-    void        SetDesignMode( bool _bDesignMode );
+    virtual bool IsDesignMode() const { return m_bDesignMode; }
+    void         SetDesignMode( bool _bDesignMode );
 
 protected:
     void GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich);
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index b20b82973be0..e6573085524f 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_TABVWSH_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_TABVWSH_HXX
 
+#include <svx/fmshell.hxx>
 #include <svtools/htmlcfg.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfac.hxx>
@@ -33,7 +34,6 @@
 
 #include <boost/ptr_container/ptr_map.hpp>
 
-class FmFormShell;
 class SbxObject;
 class SdrOle2Obj;
 class SfxBindings;
@@ -366,7 +366,8 @@ public:
     inline void     SetScSbxObject( SbxObject* pOb )
                     { pScSbxObject = pOb; }
 
-    FmFormShell*    GetFormShell() const    { return pFormShell; }
+    virtual const FmFormShell* GetFormShell() const SAL_OVERRIDE { return pFormShell; }
+    virtual       FmFormShell* GetFormShell()       SAL_OVERRIDE { return pFormShell; }
 
     void    InsertURL( const OUString& rName, const OUString& rURL, const OUString& rTarget,
                             sal_uInt16 nMode );
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 1e70bd693330..2bf098933649 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -866,8 +866,15 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
         {
             case SID_EDITDOC:
             {
-                if ( !pSh || !pSh->HasName() || !( pSh->Get_Impl()->nLoadedFlags &  SFX_LOADED_MAINDOCUMENT )
-                  || pSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
+                const SfxViewShell *pVSh;
+                const SfxShell *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())))
                     rSet.DisableItem( SID_EDITDOC );
                 else
                 {
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 343c624c6f17..b4e8a960975a 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -130,9 +130,6 @@ void FmFormView::Init()
         }
     }
 
-    if( pObjShell && pObjShell->IsReadOnly() )
-        bInitDesignMode = false;
-
     // dieses wird in der Shell vorgenommen
     // bDesignMode = !bInitDesignMode;  // erzwingt, dass SetDesignMode ausgefuehrt wird
     SetDesignMode( bInitDesignMode );
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index e3491cb26f76..3da955070e6f 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1084,6 +1084,7 @@ SfxStyleSheetBasePool*  SwDocShell::GetStyleSheetPool()
 
 void SwDocShell::SetView(SwView* pVw)
 {
+    SetViewShell_Impl(pVw);
     if ( 0 != (mpView = pVw) )
         mpWrtShell = &mpView->GetWrtShell();
     else
diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx
index fd09bf43ac0e..627b02292d80 100644
--- a/sw/source/uibase/inc/view.hxx
+++ b/sw/source/uibase/inc/view.hxx
@@ -29,6 +29,7 @@
 #include <editeng/svxenum.hxx>
 #include <sfx2/zoomitem.hxx>
 #include <svx/svxids.hrc>
+#include <svx/fmshell.hxx>
 #include <editeng/editstat.hxx>
 #include "swdllapi.h"
 #include <swtypes.hxx>
@@ -63,7 +64,6 @@ class SwEditWin;
 class SwWrtShell;
 class SwView_Impl;
 struct SwSearchOptions;
-class FmFormShell;
 class CommandEvent;
 class InsCaptionOpt;
 class SvGlobalName;
@@ -588,8 +588,8 @@ public:
                  SfxShell       *GetCurShell()  { return m_pShell; }
                  SwDocShell     *GetDocShell();
     inline const SwDocShell     *GetDocShell() const;
-    inline       FmFormShell    *GetFormShell() { return m_pFormShell; }
-    inline const FmFormShell    *GetFormShell() const { return m_pFormShell; }
+    inline virtual       FmFormShell    *GetFormShell()       SAL_OVERRIDE { return m_pFormShell; }
+    inline virtual const FmFormShell    *GetFormShell() const SAL_OVERRIDE { return m_pFormShell; }
 
     // so that in the SubShells' DTors m_pShell can be reset if applicable
     void ResetSubShell()    { m_pShell = 0; }