diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2022-03-09 21:32:35 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2022-03-14 08:42:12 +0100 |
| commit | 0d069f8eeb25e59802c0a8d9cd05287f40aced1f (patch) | |
| tree | 9866bad74d46dd95f1fff0363778303a6bcf066e | |
| parent | lokCalcRTL: chart-edit: no bounding box (diff) | |
| download | core-0d069f8eeb25e59802c0a8d9cd05287f40aced1f.tar.gz core-0d069f8eeb25e59802c0a8d9cd05287f40aced1f.zip | |
lok: insert textbox directly in Calc
Change-Id: I3ae00b255dfbaa34ab8d973356d12dfd0f71d345
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131267
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
| -rw-r--r-- | sc/source/ui/view/tabvwsh2.cxx | 11 | ||||
| -rw-r--r-- | svx/sdi/svx.sdi | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 6644c28098d5..1b9548364be5 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -261,6 +261,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) case SID_DRAW_TEXT_MARQUEE: case SID_DRAW_NOTEEDIT: pTabView->SetDrawFuncPtr(new FuText(*this, pWin, pView, pDoc, aNewReq)); + bCreateDirectly = comphelper::LibreOfficeKit::isActive(); break; case SID_FM_CREATE_CONTROL: @@ -331,7 +332,6 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) } else { - GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SfxCallMode::ASYNCHRON); ScViewData& rViewData = GetViewData(); tools::Long nLayoutSign = rViewData.GetDocument().IsLayoutRTL(rViewData.GetTabNo()) ? -1 : 1; aInsertPos = rViewData.getLOKVisibleArea().Center(); @@ -367,13 +367,20 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) // insert into page pView->InsertObjectAtView(pObj.release(), *pPageView); - if ( nNewId == SID_DRAW_CAPTION || nNewId == SID_DRAW_CAPTION_VERTICAL ) + switch ( nNewId ) { + case SID_DRAW_CAPTION: + case SID_DRAW_CAPTION_VERTICAL: + case SID_DRAW_TEXT: + case SID_DRAW_TEXT_VERTICAL: // use KeyInput to start edit mode (FuText is created). // For FuText objects, edit mode is handled within CreateDefaultObject. // KEY_F2 is handled in FuDraw::KeyInput. pFuActual->KeyInput( KeyEvent( 0, vcl::KeyCode( KEY_F2 ) ) ); + break; + default: + break; } } diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 81a6909b0757..e905cd0daca1 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -8508,7 +8508,7 @@ SfxBoolItem Text SID_ATTR_CHAR SfxBoolItem DrawText SID_DRAW_TEXT - +(SfxBoolItem CreateDirectly FN_PARAM_1) [ AutoUpdate = TRUE, FastCall = FALSE, |