[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/source svx/sdi

[Szymon Kłos (via logerrit)]

 sc/source/ui/view/tabvwsh2.cxx |   11 +--
 svx/sdi/svx.sdi|2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit bf995bf71c87cd2deb5237a2ab87a78b57caecf2
Author: Szymon Kłos 
AuthorDate: Wed Mar 9 21:32:35 2022 +0100
Commit: Szymon Kłos 
CommitDate: Mon Mar 14 21:23:33 2022 +0100

lok: insert textbox directly in Calc

Change-Id: I3ae00b255dfbaa34ab8d973356d12dfd0f71d345
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131267
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Mert Tumer 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131535
Reviewed-by: Szymon Kłos 

diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index dc48b24dc52c..693ef04ed055 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -262,6 +262,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();
 aInsertPos = rViewData.getLOKVisibleArea().Center();
 if (comphelper::LibreOfficeKit::isCompatFlagSet(
@@ -363,13 +363,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 9b3d9c89a48f..3f268536390e 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -8373,7 +8373,7 @@ SfxBoolItem Text SID_ATTR_CHAR
 
 
 SfxBoolItem DrawText SID_DRAW_TEXT
-
+(SfxBoolItem CreateDirectly FN_PARAM_1)
 [
 AutoUpdate = TRUE,
 FastCall = FALSE,

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/source svx/sdi

[Szymon Kłos (via logerrit)]

 sc/source/ui/drawfunc/drawsh.cxx |8 
 svx/sdi/svx.sdi  |2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 3e9dda1e2ea7ce16c9d2c2d86c311d2b50188dac
Author: Szymon Kłos 
AuthorDate: Tue Aug 11 15:14:23 2020 +0200
Commit: Andras Timar 
CommitDate: Sun Aug 23 19:16:34 2020 +0200

Shadow color setter for online

Change-Id: Id79d879a6017beb39e95a8d923e8368178901c74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100502
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101235
Reviewed-by: Andras Timar 

diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 069642c55268..36d18b69ba43 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -58,6 +58,7 @@
 #include 
 #include 
 #include 
+#include 
 
 SFX_IMPL_INTERFACE(ScDrawShell, SfxShell)
 
@@ -103,6 +104,13 @@ namespace
 pArgs->Put(aFillColorItem);
 break;
 }
+
+case SID_ATTR_SHADOW_COLOR:
+{
+XColorItem aItem(SDRATTR_SHADOWCOLOR, aColor);
+pArgs->Put(aItem);
+break;
+}
 }
 }
 if (SfxItemState::SET == pArgs->GetItemState(SID_FILL_GRADIENT_JSON, 
false, ))
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 8e43464f8b4a..3b4ae1fdd48c 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -7669,7 +7669,7 @@ SdrOnOffItem FillShadow SID_ATTR_FILL_SHADOW
 ]
 
 XColorItem FillShadowColor SID_ATTR_SHADOW_COLOR
-
+(SfxStringItem Color SID_ATTR_COLOR_STR)
 [
 
 AutoUpdate = TRUE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits