sw/source/uibase/uiview/viewling.cxx | 5 ++++- vcl/source/window/menu.cxx | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-)
New commits: commit 7828e8dcd82324ee15a5f739bcb63a47bf0e0778 Author: Jan Holesovsky <ke...@collabora.com> Date: Tue Mar 13 09:43:10 2018 +0100 lokdialog: Guard the SetLOKNotifier to be used only with LibreOfficeKit. Change-Id: Ia15a3d7a36ad280270ed066392f6b67b3f32f234 Reviewed-on: https://gerrit.libreoffice.org/51199 Reviewed-by: pranavk <pran...@collabora.co.uk> Tested-by: pranavk <pran...@collabora.co.uk> diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 8672139bc3b3..c0a78d74df0e 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/linguistic2/ProofreadingResult.hpp> #include <com/sun/star/i18n/TextConversionOption.hpp> #include <linguistic/lngprops.hxx> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertyvalue.hxx> #include <comphelper/scopeguard.hxx> @@ -779,7 +780,9 @@ bool SwView::ExecSpellPopup(const Point& rPt) } else { - pPopup->SetLOKNotifier(SfxViewShell::Current()); + if (comphelper::LibreOfficeKit::isActive()) + pPopup->SetLOKNotifier(SfxViewShell::Current()); + pPopup->Execute( aToFill.SVRect(), m_pEditWin ); } } diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 956e773a0606..3a16b383b13f 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -22,6 +22,7 @@ #include <tools/rc.h> #include <tools/stream.hxx> +#include <comphelper/lok.hxx> #include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> #include <vcl/image.hxx> @@ -2972,7 +2973,8 @@ sal_uInt16 PopupMenu::ImplExecute( const VclPtr<vcl::Window>& pW, const Rectangl } VclPtrInstance<MenuFloatingWindow> pWin( this, pW, nStyle | WB_SYSTEMWINDOW ); - pWin->SetLOKNotifier(mpLOKNotifier); + if (comphelper::LibreOfficeKit::isActive() && mpLOKNotifier) + pWin->SetLOKNotifier(mpLOKNotifier); if( pSVData->maNWFData.mbFlatMenu ) pWin->SetBorderStyle( WindowBorderStyle::NOBORDER ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits