diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-20 14:39:22 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-20 17:44:00 +0200 |
| commit | ad236a3e1b456531ea758c2a3c5075860d823109 (patch) | |
| tree | 9e0b12e26e85c06a25c14368845429b34fc8b21c /include | |
| parent | c5a1278fa2bcc193a82d78ee408ea7a913420675 (diff) | |
i#107205 Remove SfxDispatcher::Popup and SfxPopupMenuManager::Popup
Change-Id: I1a8bee75a2dbfb039ec32faf001b75b26ea1f3fe
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/dispatch.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/mnumgr.hxx | 11 |
2 files changed, 0 insertions, 13 deletions
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index c6bc45870736..47be2d7aaf0e 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -154,8 +154,6 @@ public: SfxShell* GetShell(sal_uInt16 nIdx) const; SfxViewFrame* GetFrame() const; SfxModule* GetModule() const; - // caller has to clean up the Manager on his own - static SfxPopupMenuManager* Popup( sal_uInt16 nConfigId, vcl::Window *pWin, const Point *pPos ); void ExecutePopup( const ResId &rId, vcl::Window *pWin = nullptr, const Point *pPos = nullptr ); void ExecutePopup( const OUString &rResName, vcl::Window *pWin = nullptr, const Point *pPos = nullptr ); diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx index 7682fc624464..a1607b9bcfa6 100644 --- a/include/sfx2/mnumgr.hxx +++ b/include/sfx2/mnumgr.hxx @@ -68,12 +68,6 @@ class SAL_DLLPUBLIC_EXPORT SfxPopupMenuManager : public SfxMenuManager { private: Menu* pSVMenu; - - // when #i107205 gets fixed this one should be superfluous. - // But right now we want to avoid the memory leak that would otherwise occur, - // if we don't delete the pointer that got created in SfxPopupMenuManager::Popup - static PopupMenu * pStaticThesSubMenu; - SfxPopupMenuManager( const SfxPopupMenuManager& ) = delete; SfxPopupMenuManager& operator=( const SfxPopupMenuManager& ) = delete; @@ -81,11 +75,6 @@ public: SfxPopupMenuManager( PopupMenu*, SfxBindings& ); ~SfxPopupMenuManager(); static void ExecutePopup( const ResId&, SfxViewFrame* pViewFrame, const Point& rPoint, vcl::Window* pWindow ); - // @deprecated!! - // Don't use this method any longer. The whole class will be removed in the future. - // Changing code which relies on Popup would need much more effort. - static SfxPopupMenuManager* Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, vcl::Window* pWindow ); - void Execute( const Point& rPos, vcl::Window *pWindow ); void RemoveDisabledEntries(); |