diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-05-29 15:42:20 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2020-06-04 18:32:34 +0200 |
| commit | 67c09ed54c8a01d8d02a08e4380780e30db35df5 (patch) | |
| tree | 159ab25f9b89baec2bd4a487869d42cac6861933 /sw | |
| parent | af8258512eb7e58054c3d527c2af8aeaeb34364e (diff) | |
sw sd lok: Don't enter the OLE editing mode right after inserting a chart.
Turns out that it is confusing for the users that they can edit the
properties of the chart rather than its position just after inserting
it in the browser.
Let's change it accordingly. When the user wants to edit the chart
itself, they have to double-click.
Calc is not handled in this patch.
Change-Id: If5661b843a06ebaeb8d4cd1b2c469aeedda4257e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95524
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/table/tablemgr.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx index da16e077bad8..38cf44e9c142 100644 --- a/sw/source/uibase/table/tablemgr.cxx +++ b/sw/source/uibase/table/tablemgr.cxx @@ -47,6 +47,8 @@ #include <unochart.hxx> #include <memory> +#include <comphelper/lok.hxx> + using namespace ::com::sun::star; // Adjust line height (dialogue) @@ -247,9 +249,10 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart( } pSh->EndAllAction(); - if ( xObj.is() ) + if (xObj.is() && !comphelper::LibreOfficeKit::isActive()) { - // Let the chart be activated after the inserting + // Let the chart be activated after the inserting (unless + // via LibreOfficeKit) SfxInPlaceClient* pClient = pSh->GetView().FindIPClient( xObj, &pSh->GetView().GetEditWin() ); if ( !pClient ) { |