diff options
| author | Heiko Tietze <tietze.heiko@gmail.com> | 2020-09-01 10:45:05 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2020-09-18 01:11:18 +0200 |
| commit | 705226338beeabd214f260c00f1a6db2cfb52475 (patch) | |
| tree | 3643bda35f5878ef39cdb4548bcd8f8d7e42ec15 /include | |
| parent | 90a5b6844409ee46b8cb4d87ad8446994a546575 (diff) | |
Resolves tdf#97918 - Individual UNO commands for distribution options
New UNO commands added, SID_DISTRIBUTE_DLG bend to dropdown, ui removed
Menus and toolbars adjusted
Change-Id: Ic0a3cc299f745a1a0cd18edead1f410ff57a1f1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102272
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdedtv.hxx | 2 | ||||
| -rw-r--r-- | include/svx/svxdlg.hxx | 12 | ||||
| -rw-r--r-- | include/svx/svxids.hrc | 10 |
3 files changed, 10 insertions, 14 deletions
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 35236d6e2570..5ddf6856bb7f 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -264,7 +264,7 @@ public: void MergeMarkedObjects(SdrMergeMode eMode); // for distribution dialog function - void DistributeMarkedObjects(weld::Window* pParent); + void DistributeMarkedObjects(sal_uInt16 SlotID); // for setting either the width or height of all selected // objects to the width/height of the last selected object diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index c07db29b516f..df6f6f106c47 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -66,15 +66,6 @@ namespace weld{ class Window; } -class AbstractSvxDistributeDialog :public VclAbstractDialog -{ -protected: - virtual ~AbstractSvxDistributeDialog() override = default; -public: - virtual SvxDistributeHorizontal GetDistributeHor() const = 0; - virtual SvxDistributeVertical GetDistributeVer() const = 0; -}; - class AbstractFmShowColsDialog : public VclAbstractDialog { protected: @@ -334,9 +325,6 @@ public: const SdrView* pView, SvxAnchorIds nAnchorTypes = SvxAnchorIds::NONE) = 0; - virtual VclPtr<AbstractSvxDistributeDialog> CreateSvxDistributeDialog(weld::Window* pParent, - const SfxItemSet& rAttr)= 0; - virtual VclPtr<AbstractFmShowColsDialog> CreateFmShowColsDialog(weld::Window* pParent) = 0; virtual VclPtr<AbstractSvxZoomDialog> CreateSvxZoomDialog(weld::Window* pParent, const SfxItemSet& rCoreSet) = 0; diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index ead0bd87d48c..c057e16d81d7 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -92,9 +92,17 @@ class SvxSetItem; #define SID_POLY_MERGE (SID_SFX_START + 679) #define SID_POLY_SUBSTRACT (SID_SFX_START + 680) #define SID_POLY_INTERSECT (SID_SFX_START + 681) -#define SID_DISTRIBUTE_DLG (SID_SFX_START + 683) +#define SID_DISTRIBUTE_DLG (SID_SFX_START + 683) // dialog replaced by dropdown #define SID_EQUALIZEWIDTH (SID_SFX_START + 684) #define SID_EQUALIZEHEIGHT (SID_SFX_START + 685) +#define SID_DISTRIBUTE_HLEFT (SID_SFX_START + 686) +#define SID_DISTRIBUTE_HCENTER (SID_SFX_START + 687) +#define SID_DISTRIBUTE_HDISTANCE (SID_SFX_START + 688) +#define SID_DISTRIBUTE_HRIGHT (SID_SFX_START + 689) +#define SID_DISTRIBUTE_VTOP (SID_SFX_START + 690) +#define SID_DISTRIBUTE_VCENTER (SID_SFX_START + 691) +#define SID_DISTRIBUTE_VDISTANCE (SID_SFX_START + 692) +#define SID_DISTRIBUTE_VBOTTOM (SID_SFX_START + 693) // StarBase IDs |