[Libreoffice-commits] core.git: include/svx officecfg/registry sc/sdi sc/source sd/sdi sd/source svx/Library_svx.mk svx/sdi svx/source svx/uiconfig svx/UIConfig_svx.mk sw/sdi sw/source
include/svx/svxids.hrc |3 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 33 +++ sc/sdi/drawsh.sdi|2 sc/source/ui/drawfunc/drawsh.cxx |2 sc/source/ui/drawfunc/drawsh2.cxx| 15 + sd/sdi/_drvwsh.sdi | 11 + sd/source/ui/view/drviews2.cxx |2 sd/source/ui/view/drviewsf.cxx | 12 + svx/Library_svx.mk |1 svx/UIConfig_svx.mk |1 svx/sdi/svx.sdi | 34 +++ svx/source/sidebar/PanelFactory.cxx |5 svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.cxx | 119 +++ svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.hxx | 48 svx/uiconfig/ui/sidebartextcolumnspanel.ui | 107 + sw/sdi/drawsh.sdi| 14 + sw/source/uibase/shells/drawdlg.cxx | 19 + 17 files changed, 426 insertions(+), 2 deletions(-) New commits: commit dd5bf12193471f064bf7f581dd1b21783390e735 Author: Mike Kaganski AuthorDate: Mon Jun 14 09:51:44 2021 +0300 Commit: Mike Kaganski CommitDate: Tue Jun 15 10:30:53 2021 +0200 editengine-columns: add sidebar property panel Change-Id: I90aefc10f9eb64a65799480777bc4287abae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117107 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 0627c29e1500..6b23b3176f17 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -438,6 +438,9 @@ class SdrAngleItem; //#define SID_SIDEBAR ( SID_SVX_START + 336 ) -> sfxsids.hrc +#define SID_ATTR_TEXTCOLUMNS_NUMBER ( SID_SVX_START + 337 ) +#define SID_ATTR_TEXTCOLUMNS_SPACING( SID_SVX_START + 338 ) + #define SID_SB_CONNECTIONPOOLING( SID_SVX_START + 348 ) #define SID_SB_DBREGISTEROPTIONS( SID_SVX_START + 349 ) #define SID_BMPMASK ( SID_SVX_START + 350 ) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index daeecf5bbaed..6876d922072d 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -1843,6 +1843,39 @@ + + + Columns + + + TextColumnsPropertyPanel + + + PropertyDeck + + + +Calc, Draw, hidden ; +Calc, Graphic,hidden ; +Calc, Media, hidden ; +DrawImpress,Draw, hidden ; +DrawImpress,Graphic,hidden ; +DrawImpress,TextObject, hidden ; +WriterVariants, Draw, hidden ; +WriterVariants, Graphic,hidden ; + + + + private:resource/toolpanel/SvxPanelFactory/TextColumnsPropertyPanel + + + 800 + + + false + + + diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi index b1d5ecec44a8..e097df04036a 100644 --- a/sc/sdi/drawsh.sdi +++ b/sc/sdi/drawsh.sdi @@ -231,6 +231,8 @@ interface TableDraw SID_ATTR_SOFTEDGE_RADIUS[ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; ] SID_MOVE_SHAPE_HANDLE [ ExecMethod = ExecDrawAttr; ] +SID_ATTR_TEXTCOLUMNS_NUMBER [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; ] +SID_ATTR_TEXTCOLUMNS_SPACING[ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; ] } diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index f60fba27b4d2..2be55f8100ab 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -417,6 +417,8 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) case SID_ATTR_GLOW_RADIUS: case SID_ATTR_GLOW_TRANSPARENCY: case SID_ATTR_SOFTEDGE_RADIUS: +case SID_ATTR_TEXTCOLUMNS_NUMBER: +case SID_ATTR_TEXTCOLUMNS_SPACING: if (const SfxItemSet* pNewArgs = rReq.GetArgs()) pView->SetAttrToMarked(*pNewArgs, false); rReq.Done(); diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 22f28e52efe8..82609b657959 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -389,7 +389,20 @@ void
[Libreoffice-commits] core.git: include/svx officecfg/registry sc/sdi sc/source sd/sdi sd/source svx/Library_svx.mk svx/sdi svx/source svx/uiconfig svx/UIConfig_svx.mk sw/sdi sw/source
include/svx/sdglowmetricitem.hxx | 37 --
include/svx/svxids.hrc |3
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 25 +
sc/sdi/drawsh.sdi|5
sc/source/ui/drawfunc/drawsh.cxx |8
sd/sdi/_drvwsh.sdi | 15
sd/source/ui/view/drviews2.cxx | 15
sd/source/ui/view/drviewsf.cxx |3
svx/Library_svx.mk |1
svx/UIConfig_svx.mk |1
svx/sdi/svx.sdi | 51 +++
svx/source/sidebar/PanelFactory.cxx |5
svx/source/sidebar/glow/GlowPropertyPanel.cxx| 169 +++
svx/source/sidebar/glow/GlowPropertyPanel.hxx| 60 +++
svx/source/svdraw/svdattr.cxx|4
svx/uiconfig/ui/sidebarglow.ui | 128
sw/sdi/drawsh.sdi| 24 +
sw/source/uibase/shells/slotadd.cxx |2
18 files changed, 516 insertions(+), 40 deletions(-)
New commits:
commit 5a100a3b62da5ea94d4707c10633023065e1d04f
Author: Mike Kaganski
AuthorDate: Wed Mar 25 14:58:14 2020 +0300
Commit: Mike Kaganski
CommitDate: Wed Mar 25 21:42:54 2020 +0100
tdf#101181: add sidebar panel for Glow effect
... in Writer, Calc, Draw and Impress for CustomShapes.
The artifacts that become apparent using the controls, e.g. remnants
of the effect when decreasing radius (in Impress), or glow not drawn
until reload after enabled or radius set to 0, should be fixed in a
separate commit.
Change-Id: I6107597161bc67ae8c3e62c260ef6ad241c7dedf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91056
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/include/svx/sdglowmetricitem.hxx b/include/svx/sdglowmetricitem.hxx
deleted file mode 100644
index 4a78cdedc19c..
--- a/include/svx/sdglowmetricitem.hxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-#ifndef INCLUDED_SVX_SDGLOWMETRICITEM_HXX
-#define INCLUDED_SVX_SDGLOWMETRICITEM_HXX
-
-#include
-#include
-#include
-
-#include
-#include
-
-class SVX_DLLPUBLIC SdrGlowItem : public SfxPoolItem
-{
-private:
-css::uno::Reference m_xGlow;
-
-public:
-SdrGlowItem();
-virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit
eCoreMetric,
- MapUnit ePresMetric, OUString& rText,
- const IntlWrapper&) const override;
-virtual bool operator==(const SfxPoolItem&) const override;
-virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0)
const override;
-virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId)
override;
-virtual SdrGlowItem* Clone(SfxItemPool* pPool = nullptr) const override;
-
-drawinglayer::attribute::SdrGlowAttribute GetGlowAttr() const;
-};
-
-#endif
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index f12a326d0d2a..32b0f5ba8350 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -414,6 +414,9 @@ class SvxSetItem;
#define SID_ATTR_TRANSFORM_HORI_MIRROR ( SID_SVX_START + 317 )
#define SID_ATTR_TRANSFORM_ANCHOR ( SID_SVX_START + 318 )
#define SID_ATTR_TRANSFORM_VERT_ORIENT ( SID_SVX_START + 319 )
+#define SID_ATTR_GLOW ( SID_SVX_START + 320 )
+#define SID_ATTR_GLOW_COLOR ( SID_SVX_START + 321 )
+#define SID_ATTR_GLOW_RADIUS( SID_SVX_START + 322 )
#define SID_SCAN( SID_SVX_START + 330 )
#define SID_TWAIN_SELECT( SID_SVX_START + 331 )
#define SID_TWAIN_TRANSFER ( SID_SVX_START + 332 )
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 42154bd6f9c1..d0ceb287d714 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -535,6 +535,31 @@
+
+
+ Glow
+
+
+ GlowPropertyPanel
+
+
+ PropertyDeck
+
+
+
+
