sw/source/uibase/wrtsh/wrtsh1.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
New commits: commit eb3193ffe0660a845210e4aba83aaefae3e003d7 Author: Jan Holesovsky <ke...@collabora.com> AuthorDate: Wed Sep 25 11:40:46 2019 +0200 Commit: Jan Holesovsky <ke...@collabora.com> CommitDate: Thu Sep 26 10:08:01 2019 +0200 tdf#127673 lok: On double-click, don't enter the embedded objects in Writer. There are all sorts of problems when we'd try to edit the embedded objects, like that that LOK thinks it is a separate view etc., so better to disable it for now, before we really need to edit embedded objects. Change-Id: Ie8c0249cb0ca8b25a2ac97c1ccec4a5a62cbb770 Reviewed-on: https://gerrit.libreoffice.org/79549 Reviewed-by: Tor Lillqvist <t...@collabora.com> Tested-by: Tor Lillqvist <t...@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 183f964c9d25..a36efc29fbf7 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -579,7 +579,14 @@ void SwWrtShell::LaunchOLEObj( long nVerb ) { svt::EmbeddedObjectRef& xRef = GetOLEObject(); OSL_ENSURE( xRef.is(), "OLE not found" ); - SfxInPlaceClient* pCli=nullptr; + + // LOK: we don't want to handle any other embedded objects than + // charts, there are too many problems with eg. embedded spreadsheets + // (like it creates a separate view for the calc sheet) + if (comphelper::LibreOfficeKit::isActive() && !SotExchange::IsChart(xRef->getClassID())) + return; + + SfxInPlaceClient* pCli = nullptr; pCli = GetView().FindIPClient( xRef.GetObject(), &GetView().GetEditWin() ); if ( !pCli ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits