diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2014-08-27 18:34:02 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2014-09-02 11:16:04 -0500 |
| commit | b3062ae65fc7069442cb5fc23dd68c2e8344e999 (patch) | |
| tree | e3708580a152a9285b6bc1cde2ed810430b3f7da /include | |
| parent | 33927ae1208766d6fdb40fdc700afbe10ca91647 (diff) | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/shell.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/viewsh.hxx | 3 | ||||
| -rw-r--r-- | include/svx/fmshell.hxx | 4 |
3 files changed, 8 insertions, 3 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); |