diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-26 19:18:51 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-09-05 04:06:34 +0200 |
| commit | c9faae3481b18a84b1583a18003c297dfe7264e6 (patch) | |
| tree | 6018614641be70448d7c88a87ff04f0ac0869435 | |
| parent | f6698fe54f7d599ed6f7808cdb66c02b533e4c3e (diff) | |
src: use ToolBoxItem, as all other do
Change-Id: I77b0f8a670e4f0a8f75b99662c370b65ce737d3d
| -rw-r--r-- | sd/source/ui/app/tbxids_tmpl.src | 1 | ||||
| -rw-r--r-- | sd/source/ui/app/toolbox2_tmpl.src | 35 |
2 files changed, 28 insertions, 8 deletions
diff --git a/sd/source/ui/app/tbxids_tmpl.src b/sd/source/ui/app/tbxids_tmpl.src index 524419b9be86..6e790cd80e45 100644 --- a/sd/source/ui/app/tbxids_tmpl.src +++ b/sd/source/ui/app/tbxids_tmpl.src @@ -20,7 +20,6 @@ #ifndef _TBXIDS_SRC #define _TBXIDS_SRC #define SEPARATOR ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; -#define TBI(x) ToolBoxItem { x }; // Toolbox bar #define TBI_OBJECT_SELECT \ diff --git a/sd/source/ui/app/toolbox2_tmpl.src b/sd/source/ui/app/toolbox2_tmpl.src index ca7bd0c90336..35e36d5be8ec 100644 --- a/sd/source/ui/app/toolbox2_tmpl.src +++ b/sd/source/ui/app/toolbox2_tmpl.src @@ -137,14 +137,35 @@ ToolBox RID_DRAW_OBJ_TOOLBOX { TBI_FORMAT_BEZIER_EDIT_RC SEPARATOR - TBI ( ITEM_FORMAT_ATTRIBUTES_LINE ) - TBI ( ITEM_TOOLBAR_ATTR_LINEEND_STYLE ) - TBI ( ITEM_TOOLBAR_ATTR_LINE_STYLE ) - TBI ( ITEM_TOOLBAR_ATTR_LINE_WIDTH ) - TBI ( ITEM_TOOLBAR_ATTR_LINE_COLOR ) + ToolBoxItem + { + ITEM_FORMAT_ATTRIBUTES_LINE + }; + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_LINEEND_STYLE + }; + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_LINE_STYLE + }; + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_LINE_WIDTH + }; + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_LINE_COLOR + }; SEPARATOR - TBI ( ITEM_FORMAT_ATTRIBUTES_AREA ) - TBI ( ITEM_TOOLBAR_ATTR_FILL_STYLE ) + ToolBoxItem + { + ITEM_FORMAT_ATTRIBUTES_AREA + }; + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_FILL_STYLE + }; SEPARATOR TBI_ATTR_FILL_SHADOW TBI_TOGGLECOMMONTASKBAR |