Author: paveljanik
Date: Fri May 17 08:34:38 2013
New Revision: 1483688
URL: http://svn.apache.org/r1483688
Log:
Rename local macro TOOLBOX_ITEM_HEIGHT which hides the same macro from sfx2.
Modified:
openoffice/trunk/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc
Modified:
openoffice/trunk/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc?rev=1483688&r1=1483687&r2=1483688&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc
(original)
+++ openoffice/trunk/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hrc
Fri May 17 08:34:38 2013
@@ -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