summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Jung <phil.jung@free.fr>2015-05-01 22:20:22 +0200
committerNorbert Thiebaud <nthiebaud@gmail.com>2015-05-02 19:18:32 +0000
commit7db7698881f2691b7532a621c469b49830c27c4c (patch)
tree61ca7622621d7585670c5016354077005b77807f
parentbf52d1951587bea895902c8b030a19942dd0ba69 (diff)
tdf#34555 Moving SID_OBJECT_CROP out of sd
The crop action in impress is defined in impress but uses code shared in svx. This patch move the declaration of the Crop action in svx so that it can be shared with sc & writer. This is part of a serie of 4 patches that adds Save graphic, Change Picture, Edit with external tool, Crop (by handles) in all products (scalc, sdraw, simpress, swriter). Main menus, toolbars and contextual menus are updated accordingly. Change-Id: Idb6907aa09c0efd456c2ad51232cf37edb28d977 Reviewed-on: https://gerrit.libreoffice.org/15587 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
-rw-r--r--include/svx/svxids.hrc4
-rw-r--r--sd/inc/app.hrc1
-rw-r--r--sd/sdi/sdraw.sdi27
-rw-r--r--svx/sdi/svx.sdi27
4 files changed, 30 insertions, 29 deletions
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index c784c671b3ba..274cf9a7450a 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -1006,8 +1006,10 @@
#define SID_PARASPACE_INCREASE ( SID_SVX_START + 1145 )
#define SID_PARASPACE_DECREASE ( SID_SVX_START + 1146 )
+#define SID_OBJECT_CROP ( SID_SVX_START + 1147 )
+
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE (SID_PARASPACE_DECREASE + 1)
+#define SID_SVX_FIRSTFREE ( SID_OBJECT_CROP + 1 )
// Overflow check for slot IDs
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index a39734f959b0..4f3d82e4bf9d 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -421,7 +421,6 @@
#define SID_SLIDE_SORTER_MULTI_PANE_GUI (SID_SD_START+421)
#define SID_SELECT_BACKGROUND (SID_SD_START+422)
-#define SID_OBJECT_CROP (SID_SD_START+423)
// Slots for the tool pane popup
#define SID_TP_APPLY_TO_ALL_SLIDES (SID_SD_START+425)
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 1de1319c0dff..7297c1f217aa 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -6174,33 +6174,6 @@ SfxVoidItem Mirror SID_OBJECT_MIRROR
GroupId = GID_DOCUMENT ;
]
-SfxVoidItem Crop SID_OBJECT_CROP
-()
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- /* status: */
- SlotType = SfxBoolItem
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_DOCUMENT ;
-]
-
SfxVoidItem HeaderAndFooter SID_HEADER_AND_FOOTER
()
[
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index c312f1f9bf58..6c454389f968 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -6038,6 +6038,33 @@ SfxVoidItem RotateRight SID_ROTATE_GRAPHIC_RIGHT
GroupId = GID_GRAPHIC;
]
+SfxVoidItem Crop SID_OBJECT_CROP
+()
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ /* status: */
+ SlotType = SfxBoolItem
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_DOCUMENT ;
+]
+
SfxVoidItem ChangePicture SID_CHANGE_PICTURE
()
[