diff options
| author | David Tardon <dtardon@redhat.com> | 2016-03-07 08:22:03 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-03-07 08:50:58 +0100 |
| commit | 055fb754c6d7438d4d9e7b45ce458943a0a4793e (patch) | |
| tree | 00d8af267c7099c1beb93ffb5790cfa0b38a36b8 | |
| parent | Bin overly verbose OSL_TRACEs of questionable usefulness (diff) | |
| download | core-055fb754c6d7438d4d9e7b45ce458943a0a4793e.tar.gz core-055fb754c6d7438d4d9e7b45ce458943a0a4793e.zip | |
expand src templates only used in a single place
Change-Id: Ic18e4c0a1617f0284b7ffcfb8859cdced4949471
| -rw-r--r-- | reportdesign/source/ui/report/report.src | 44 | ||||
| -rw-r--r-- | svx/inc/globlmn_tmpl.hrc | 55 |
2 files changed, 33 insertions, 66 deletions
diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src index ed9bfd9c4163..a4d1e9a7e3e5 100644 --- a/reportdesign/source/ui/report/report.src +++ b/reportdesign/source/ui/report/report.src @@ -326,7 +326,9 @@ Menu RID_MENU_REPORT { MenuItem { - ITEM_FORMAT_FRAME_TO_TOP + Identifier = SID_FRAME_TO_TOP ; + Command = ".uno:BringToFront" ; + Text [ en-US ] = "~Bring to Front" ; }; MenuItem { @@ -342,7 +344,9 @@ Menu RID_MENU_REPORT }; MenuItem { - ITEM_FORMAT_FRAME_TO_BOTTOM + Identifier = SID_FRAME_TO_BOTTOM ; + Command = ".uno:SendToBack" ; + Text [ en-US ] = "~Send to Back" ; }; MenuItem { @@ -350,33 +354,45 @@ Menu RID_MENU_REPORT }; MenuItem { - ITEM_FORMAT_OBJECT_HEAVEN + Identifier = SID_OBJECT_HEAVEN ; + Command = ".uno:SetObjectToForeground" ; + Text [ en-US ] = "~To Foreground" ; }; MenuItem { - ITEM_FORMAT_OBJECT_HELL + Identifier = SID_OBJECT_HELL ; + Command = ".uno:SetObjectToBackground" ; + Text [ en-US ] = "T~o Background" ; }; }; }; }; MenuItem { - ITEM_FORMAT_OBJECT_ALIGN + Identifier = SID_OBJECT_ALIGN ; + Command = ".uno:ObjectAlign" ; + Text [ en-US ] = "A~lignment" ; SubMenu = Menu { ItemList = { MenuItem { - ITEM_FORMAT_OBJECT_ALIGN_LEFT + Identifier = SID_OBJECT_ALIGN_LEFT ; + Command = ".uno:ObjectAlignLeft" ; + Text [ en-US ] = "~Left" ; }; MenuItem { - ITEM_FORMAT_OBJECT_ALIGN_CENTER + Identifier = SID_OBJECT_ALIGN_CENTER ; + Command = ".uno:AlignCenter" ; + Text [ en-US ] = "~Centered" ; }; MenuItem { - ITEM_FORMAT_OBJECT_ALIGN_RIGHT + Identifier = SID_OBJECT_ALIGN_RIGHT ; + Command = ".uno:ObjectAlignRight" ; + Text [ en-US ] = "~Right" ; }; MenuItem { @@ -384,15 +400,21 @@ Menu RID_MENU_REPORT }; MenuItem { - ITEM_FORMAT_OBJECT_ALIGN_UP + Identifier = SID_OBJECT_ALIGN_UP ; + Command = ".uno:AlignUp" ; + Text [ en-US ] = "~Top" ; }; MenuItem { - ITEM_FORMAT_OBJECT_ALIGN_MIDDLE + Identifier = SID_OBJECT_ALIGN_MIDDLE ; + Command = ".uno:AlignMiddle" ; + Text [ en-US ] = "C~enter" ; }; MenuItem { - ITEM_FORMAT_OBJECT_ALIGN_DOWN + Identifier = SID_OBJECT_ALIGN_DOWN ; + Command = ".uno:AlignDown" ; + Text [ en-US ] = "~Bottom" ; }; }; }; diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index a7aac50219f6..85ae57d7c70a 100644 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -38,61 +38,6 @@ Command = ".uno:Delete" ; \ Text [ en-US ] = "~Delete" ;\ -#define ITEM_FORMAT_FRAME_TO_TOP \ - Identifier = SID_FRAME_TO_TOP ; \ - Command = ".uno:BringToFront" ; \ - Text [ en-US ] = "~Bring to Front" ;\ - -#define ITEM_FORMAT_FRAME_TO_BOTTOM \ - Identifier = SID_FRAME_TO_BOTTOM ; \ - Command = ".uno:SendToBack" ; \ - Text [ en-US ] = "~Send to Back" ;\ - -#define ITEM_FORMAT_OBJECT_ALIGN \ - Identifier = SID_OBJECT_ALIGN ; \ - Command = ".uno:ObjectAlign" ; \ - Text [ en-US ] = "A~lignment" ;\ - -#define ITEM_FORMAT_OBJECT_ALIGN_LEFT \ - Identifier = SID_OBJECT_ALIGN_LEFT ; \ - Command = ".uno:ObjectAlignLeft" ; \ - Text [ en-US ] = "~Left" ;\ - -#define ITEM_FORMAT_OBJECT_ALIGN_CENTER \ - Identifier = SID_OBJECT_ALIGN_CENTER ; \ - Command = ".uno:AlignCenter" ; \ - Text [ en-US ] = "~Centered" ;\ - -#define ITEM_FORMAT_OBJECT_ALIGN_RIGHT \ - Identifier = SID_OBJECT_ALIGN_RIGHT ; \ - Command = ".uno:ObjectAlignRight" ; \ - Text [ en-US ] = "~Right" ;\ - -#define ITEM_FORMAT_OBJECT_ALIGN_UP \ - Identifier = SID_OBJECT_ALIGN_UP ; \ - Command = ".uno:AlignUp" ; \ - Text [ en-US ] = "~Top" ;\ - -#define ITEM_FORMAT_OBJECT_ALIGN_MIDDLE \ - Identifier = SID_OBJECT_ALIGN_MIDDLE ; \ - Command = ".uno:AlignMiddle" ; \ - Text [ en-US ] = "C~enter" ;\ - -#define ITEM_FORMAT_OBJECT_ALIGN_DOWN \ - Identifier = SID_OBJECT_ALIGN_DOWN ; \ - Command = ".uno:AlignDown" ; \ - Text [ en-US ] = "~Bottom" ;\ - -#define ITEM_FORMAT_OBJECT_HEAVEN \ - Identifier = SID_OBJECT_HEAVEN ; \ - Command = ".uno:SetObjectToForeground" ; \ - Text [ en-US ] = "~To Foreground" ;\ - -#define ITEM_FORMAT_OBJECT_HELL \ - Identifier = SID_OBJECT_HELL ; \ - Command = ".uno:SetObjectToBackground" ; \ - Text [ en-US ] = "T~o Background" ;\ - #define ITEM_EDIT_PASTE \ Identifier = SID_PASTE ; \ Command = ".uno:Paste" ; \ |