[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - sw/source

[Tamás Zolnai (via logerrit)]

 sw/source/uibase/lingu/olmenu.cxx    |   12 ------------
 sw/source/uibase/uiview/viewling.cxx |    1 -
 2 files changed, 13 deletions(-)

New commits:
commit 806dd155809710ff707fdce5d07198ac00c59e46
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Nov 29 15:23:19 2019 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon Dec 2 18:17:44 2019 +0100

    Remove unused variable.
    
    Change-Id: I34a15cb1e457c3ac0329e5ba735ac93db99e9fbf
    Reviewed-on: https://gerrit.libreoffice.org/84154
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit 18cd65bebe27dbaa5cb0a079f0b3df09c9e12ec5)
    Reviewed-on: https://gerrit.libreoffice.org/84237

diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index e8755a54acd2..c954dce5bbd8 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -781,7 +781,6 @@ bool SwView::ExecSpellPopup(const Point& rPt)
                         }
                         else
                         {
-                            boost::property_tree::ptree aMenu = SfxDispatcher::fillPopupMenu(&xPopup->GetMenu());
                             xPopup->Execute(aToFill.SVRect(), m_pEditWin);
                         }
                     }
commit da1fdd37d0a59ae1adc0231b7e01693e723cb437
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Nov 29 15:00:22 2019 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon Dec 2 18:17:32 2019 +0100

    SpellingPopup: lok: we don't need to disable menu items for online.
    
    Now, that we generate the conext menu in JS code, we can control
    the visibility of items.
    
    Change-Id: I09112619a9669e6ebf1a8d468e0329b8914db0ff
    Reviewed-on: https://gerrit.libreoffice.org/84153
    Tested-by: Jenkins
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit 2f75a2cc6915f85321f848e6ede38fe40b13bf98)
    Reviewed-on: https://gerrit.libreoffice.org/84236
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 0f4b1c32e742..29f27bf0ca4f 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -299,13 +299,6 @@ SwSpellPopup::SwSpellPopup(
     m_xPopupMenu->SetItemText(m_nCorrectDialogId,
         vcl::CommandInfoProvider::GetPopupLabelForCommand(".uno:AutoCorrectDlg", aModuleName));
 
-    if (comphelper::LibreOfficeKit::isActive())
-    {
-        m_xPopupMenu->HideItem(m_nCorrectDialogId);
-        m_xPopupMenu->HideItem(m_nAddId);
-        m_xPopupMenu->HideItem(m_nAddMenuId);
-        m_xPopupMenu->HideItem(m_nCorrectMenuId);
-    }
     sal_uInt16 nItemPos = m_xPopupMenu->GetItemPos(m_nIgnoreWordId);
     m_xPopupMenu->InsertItem(MN_IGNORE_SELECTION, aIgnoreSelection, MenuItemBits::NONE, OString(), nItemPos);
     m_xPopupMenu->SetHelpId(MN_IGNORE_SELECTION, HID_LINGU_IGNORE_SELECTION);
@@ -590,11 +583,6 @@ SwSpellPopup::SwSpellPopup(
 
     SvtLinguConfig().SetProperty( UPN_IS_GRAMMAR_INTERACTIVE, uno::makeAny( true ));
 
-    if (comphelper::LibreOfficeKit::isActive())
-    {
-        m_xPopupMenu->HideItem(MN_EXPLANATION_LINK);
-    }
-
     InitItemCommands(rSuggestions);
 }