summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorPavel Janík <paveljanik@apache.org>2013-05-17 08:34:38 +0000
committerPavel Janík <paveljanik@apache.org>2013-05-17 08:34:38 +0000
commit3a01ed4d74ab4035e40102e74670f868ff8317a5 (patch)
tree946da17701fe7b83b968ea918cc05350ba90b230 /sc
parentebc280815ce15efd3782bf2962e8fea1fd81a931 (diff)
Rename local macro TOOLBOX_ITEM_HEIGHT which hides the same macro from sfx2.
Notes
Notes: prefer: d02f75a8c36705924ddd6a5921fe3012fafce812
Diffstat (limited to 'sc')
-rwxr-xr-xsc/source/ui/sidebar/NumberFormatPropertyPanel.hrc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc
index 9c4777a50389..4572b220a8d9 100755
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc
@@ -37,7 +37,7 @@
//===============================================================position=============================================
#define MBOX_WIDTH 28
-#define TOOLBOX_ITEM_HEIGHT 12
+#define LOCAL_TOOLBOX_ITEM_HEIGHT 12
#define CHECKBOX_HEIGHT 10
#define FT_CATEGORY_X SECTIONPAGE_MARGIN_HORIZONTAL
@@ -49,7 +49,7 @@
#define TBX_CATEGORY_Y LB_CATEGORY_Y + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL
#define FT_DECIMALS_X SECTIONPAGE_MARGIN_HORIZONTAL
-#define FT_DECIMALS_Y TBX_CATEGORY_Y + TOOLBOX_ITEM_HEIGHT + 4 + CONTROL_SPACING_VERTICAL
+#define FT_DECIMALS_Y TBX_CATEGORY_Y + LOCAL_TOOLBOX_ITEM_HEIGHT + 4 + CONTROL_SPACING_VERTICAL
#define LB_DECIMALS_X FT_CATEGORY_X
#define LB_DECIMALS_Y FT_DECIMALS_Y + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL