summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2019-10-13 12:00:50 +0200
committerTomaž Vajngerl <quikee@gmail.com>2019-10-13 14:39:17 +0200
commitb2e5f9ead2bb7f2979afe4ba13e3950e8a3cc278 (patch)
tree72e2eb4d7d4ec5ef5be471e32369c9f0ffe41463 /sd/source
parent9e4cbac83094c13ffbfd117f534d4275cc1ffb16 (diff)
tdf#125566 Add arrangement functions to position & size sidebar
Adds arrangement actions to position & size sidebar so it is possible to move the object up/down in the stack. As Draw/Impress uses it's own action names for the same UNO action (Forward/Back in Draw and ObjectForwardOne and ObjectBackOne in Writer/Calc) also add the global ones to Draw/Impress and connect them to the same function as Forward/Back. This commit does not unify them however (Forward/Back are still used in menus/toolbars) but this could be done in the future. Change-Id: Ibb152f29dbe11dfb1b6a057e6ea60b21029912e2 Reviewed-on: https://gerrit.libreoffice.org/80729 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/ui/view/drviews2.cxx2
-rw-r--r--sd/source/ui/view/drviewsj.cxx8
2 files changed, 10 insertions, 0 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 0928056174de..bd4f39205b3d 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2899,6 +2899,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
break;
case SID_MOREFRONT: // BASIC
+ case SID_FRAME_UP: // BASIC
{
mpDrawView->MovMarkedToTop();
Cancel();
@@ -2907,6 +2908,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
break;
case SID_MOREBACK: // BASIC
+ case SID_FRAME_DOWN: // BASIC
{
mpDrawView->MovMarkedToBtm();
Cancel();
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index 165a9c3038d5..addc54e4fc9f 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -83,7 +83,9 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
SfxItemState::DEFAULT == rSet.GetItemState( SID_OBJECT_ALIGN_DOWN ) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_FRAME_TO_TOP ) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_MOREFRONT ) ||
+ SfxItemState::DEFAULT == rSet.GetItemState( SID_FRAME_UP ) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_MOREBACK ) ||
+ SfxItemState::DEFAULT == rSet.GetItemState( SID_FRAME_DOWN ) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_FRAME_TO_BOTTOM ) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_BEFORE_OBJ ) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_BEHIND_OBJ ) ||
@@ -220,7 +222,9 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
rSet.DisableItem( SID_OBJECT_ALIGN_DOWN );
rSet.DisableItem( SID_FRAME_TO_TOP );
rSet.DisableItem( SID_MOREFRONT );
+ rSet.DisableItem( SID_FRAME_UP );
rSet.DisableItem( SID_MOREBACK );
+ rSet.DisableItem( SID_FRAME_DOWN );
rSet.DisableItem( SID_FRAME_TO_BOTTOM );
rSet.DisableItem( SID_BEFORE_OBJ );
rSet.DisableItem( SID_BEHIND_OBJ );
@@ -398,7 +402,9 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
rSet.DisableItem( SID_OBJECT_ALIGN_DOWN );
rSet.DisableItem( SID_FRAME_TO_TOP );
rSet.DisableItem( SID_MOREFRONT );
+ rSet.DisableItem( SID_FRAME_UP );
rSet.DisableItem( SID_MOREBACK );
+ rSet.DisableItem( SID_FRAME_DOWN );
rSet.DisableItem( SID_FRAME_TO_BOTTOM );
rSet.DisableItem( SID_BEFORE_OBJ );
rSet.DisableItem( SID_BEHIND_OBJ );
@@ -458,7 +464,9 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
rSet.DisableItem( SID_FRAME_TO_TOP );
rSet.DisableItem( SID_MOREFRONT );
+ rSet.DisableItem( SID_FRAME_UP );
rSet.DisableItem( SID_MOREBACK );
+ rSet.DisableItem( SID_FRAME_DOWN );
rSet.DisableItem( SID_FRAME_TO_BOTTOM );
rSet.DisableItem( SID_BEFORE_OBJ );
rSet.DisableItem( SID_BEHIND_OBJ );