summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-01-18 20:52:58 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-01-18 20:52:58 +0000
commitba49d03a60b340dfb217d334cd342e1090a7af71 (patch)
tree92cb489878d474810d005982091d7d4fd316d33d /sw
parentdb9ef688edd86b31606e0dd6df6a77732faca49b (diff)
we only need this image once, don't need to keep it
Change-Id: I4ab3fc515bb1484d00f3a690b9fe8ae9c9dca9fe
Diffstat (limited to 'sw')
-rw-r--r--sw/source/uibase/inc/olmenu.hxx2
-rw-r--r--sw/source/uibase/lingu/olmenu.cxx17
2 files changed, 8 insertions, 11 deletions
diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx
index 0ebdfed4e3c5..21e731b62224 100644
--- a/sw/source/uibase/inc/olmenu.hxx
+++ b/sw/source/uibase/inc/olmenu.hxx
@@ -56,8 +56,6 @@ class SW_DLLPUBLIC SwSpellPopup : public PopupMenu
OUString m_aDicNameSingle;
bool m_bGrammarResults; // show grammar results? Or show spellcheck results?
- Image m_aInfo16;
-
static void fillLangPopupMenu( PopupMenu *pPopupMenu, sal_uInt16 nLangStart,
const css::uno::Sequence< OUString >& aSeq, SwWrtShell* pWrtSh,
std::map< sal_Int16, OUString > &rLangTable );
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index f4007a3aee44..a5fe2b6a8992 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -450,14 +450,13 @@ SwSpellPopup::SwSpellPopup(
const linguistic2::ProofreadingResult &rResult,
sal_Int32 nErrorInResult,
const uno::Sequence< OUString > &rSuggestions,
- const OUString &rParaText ) :
-PopupMenu( SW_RES(MN_SPELL_POPUP) ),
-m_pSh( pWrtSh ),
-m_xGrammarResult( rResult ),
-m_aSuggestions( rSuggestions ),
-m_sExplanationLink( ),
-m_bGrammarResults( true ),
-m_aInfo16( SW_RES(IMG_INFO_16) )
+ const OUString &rParaText )
+ : PopupMenu(SW_RES(MN_SPELL_POPUP))
+ , m_pSh(pWrtSh)
+ , m_xGrammarResult(rResult)
+ , m_aSuggestions(rSuggestions)
+ , m_sExplanationLink()
+ , m_bGrammarResults(true)
{
m_nCheckedLanguage = LanguageTag::convertToLanguageType( rResult.aLocale );
m_nGrammarError = nErrorInResult;
@@ -468,7 +467,7 @@ m_aInfo16( SW_RES(IMG_INFO_16) )
InsertSeparator(OString(), nPos++);
InsertItem(MN_SHORT_COMMENT, aMessageText, MenuItemBits::NOSELECT, OString(), nPos++);
if (bUseImagesInMenus)
- SetItemImage( MN_SHORT_COMMENT, m_aInfo16 );
+ SetItemImage(MN_SHORT_COMMENT, Image(SW_RES(IMG_INFO_16)));
// Add an item to show detailed infos if the FullCommentURL property is defined
beans::PropertyValues aProperties = rResult.aErrors[ nErrorInResult ].aProperties;