sc/source/ui/drawfunc/drawsh.cxx | 8 ++++++++
svx/sdi/svx.sdi | 2 +-
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 16 ++++++++++++++++
3 files changed, 25 insertions(+), 1 deletion(-)
New commits:
commit e99e7499a8e738251ecf42f29d5f2e898b08ef4f
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Aug 11 15:14:23 2020 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu Aug 27 14:42:07 2020 +0200
Shadow color setter for online
Change-Id: Id79d879a6017beb39e95a8d923e8368178901c74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100502
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101388
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 2302367e9aa1..ab0baaf89402 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -58,6 +58,7 @@
#include <svx/xlnclit.hxx>
#include <svx/xflclit.hxx>
#include <svx/xflgrit.hxx>
+#include <editeng/colritem.hxx>
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, &pItem))
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index d2ba31f57608..d382a1814121 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -7671,7 +7671,7 @@ SdrOnOffItem FillShadow SID_ATTR_FILL_SHADOW
]
XColorItem FillShadowColor SID_ATTR_SHADOW_COLOR
-
+(SfxStringItem Color SID_ATTR_COLOR_STR)
[
AutoUpdate = TRUE,
commit 09111f124be4f3c34b4d7cebcc238dcd29ceaede
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Aug 11 10:28:52 2020 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu Aug 27 14:41:53 2020 +0200
Instant update shadow fields in sidebar
This allows mobile LOK client to receive updated
state.
Change-Id: I07fb397c1566546e6e2eb8071eaf6d848f6effc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100466
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101387
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index 0d69afa1520e..43bdec9b61f2 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -21,6 +21,7 @@
#include <svx/sdprcitm.hxx>
#include <svx/sdsxyitm.hxx>
#include <svx/sdshcitm.hxx>
+#include <comphelper/lok.hxx>
using namespace css;
using namespace css::uno;
@@ -109,12 +110,27 @@ IMPL_LINK_NOARG(ShadowPropertyPanel, ClickShadowHdl,
weld::ToggleButton&, void)
SdrOnOffItem aItem(makeSdrShadowItem(false));
GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_SHADOW,
SfxCallMode::RECORD, { &aItem });
+
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ mxShowShadow->set_state( TRISTATE_FALSE );
+ UpdateControls();
+ }
}
else
{
SdrOnOffItem aItem(makeSdrShadowItem(true));
GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_SHADOW,
SfxCallMode::RECORD, { &aItem });
+
+ if (mxShadowDistance->get_value(FieldUnit::POINT) == 0)
+ mxShadowDistance->set_value( 8, FieldUnit::POINT );
+
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ mxShowShadow->set_state( TRISTATE_TRUE );
+ UpdateControls();
+ }
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
