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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/ui/inc/tabvwsh.hxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index d1be5015b855..b20b82973be0 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -366,8 +366,7 @@ public: inline void SetScSbxObject( SbxObject* pOb ) { pScSbxObject = pOb; } - virtual const FmFormShell* GetFormShell() const SAL_OVERRIDE { return pFormShell; } - virtual FmFormShell* GetFormShell() SAL_OVERRIDE { return pFormShell; } + FmFormShell* GetFormShell() const { return pFormShell; } void InsertURL( const OUString& rName, const OUString& rURL, const OUString& rTarget, sal_uInt16 nMode ); |