diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-22 13:16:03 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-22 15:48:39 +0000 |
| commit | f28672a077375a360879ad34edfbd06b611ea6d8 (patch) | |
| tree | 264aff596617ae94804823189fce9e53c6daef7a /sw/source/uibase/inc/olmenu.hxx | |
| parent | 3c946d688627ba0c31bcb37dfed4e6e180608854 (diff) | |
don't inherit SwSpellPopup from PopupMenu
Change-Id: Ieee1f24713aac368e24730ea835b59855a14848b
Reviewed-on: https://gerrit.libreoffice.org/34542
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase/inc/olmenu.hxx')
| -rw-r--r-- | sw/source/uibase/inc/olmenu.hxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx index 21e731b62224..e6343bf7b45d 100644 --- a/sw/source/uibase/inc/olmenu.hxx +++ b/sw/source/uibase/inc/olmenu.hxx @@ -33,8 +33,9 @@ class SwWrtShell; -class SW_DLLPUBLIC SwSpellPopup : public PopupMenu +class SW_DLLPUBLIC SwSpellPopup { + ScopedVclPtrInstance<PopupMenu> m_xPopupMenu; SwWrtShell* m_pSh; css::uno::Sequence< css::uno::Reference< css::linguistic2::XDictionary > > m_aDics; css::uno::Reference< css::linguistic2::XSpellAlternatives > m_xSpellAlt; @@ -51,7 +52,6 @@ class SW_DLLPUBLIC SwSpellPopup : public PopupMenu std::map< sal_Int16, OUString > m_aLangTable_Text; std::map< sal_Int16, OUString > m_aLangTable_Paragraph; -// std::map< sal_Int16, OUString > aLangTable_Document; OUString m_aDicNameSingle; bool m_bGrammarResults; // show grammar results? Or show spellcheck results? @@ -60,8 +60,6 @@ class SW_DLLPUBLIC SwSpellPopup : public PopupMenu const css::uno::Sequence< OUString >& aSeq, SwWrtShell* pWrtSh, std::map< sal_Int16, OUString > &rLangTable ); - using PopupMenu::Execute; - /// Checks if any of the redline menu items should be hidden. void checkRedline(); @@ -76,6 +74,11 @@ public: const css::uno::Sequence< OUString > &rSuggestions, const OUString & rParaText ); + Menu& GetMenu() + { + return *m_xPopupMenu.get(); + } + void Execute( const Rectangle& rPopupPos, vcl::Window* pWin ); void Execute( sal_uInt16 nId ); |