On 17.05.2013 07:36, Pavel Janík wrote:
On Apr 11, 2013, at 7:58 AM, Pavel Janík wrote:
current trunk:
Compiling: sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
In file included from
/Users/pavel/BUILD/BuildDir/ooo_trunk_src/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx:28:
./NumberFormatPropertyPanel.hrc:45:1: error: "TOOLBOX_ITEM_HEIGHT" redefined
In file included from
/Users/pavel/BUILD/BuildDir/ooo_trunk_src/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx:24:
/Users/pavel/BUILD/BuildDir/ooo_trunk_src/solver/400/unxmacxi.pro/inc/sfx2/sidebar/propertypanel.hrc:94:1:
error: this is the location of the previous definition
dmake: Error code 1, while making
'../../../unxmacxi.pro/slo/NumberFormatPropertyPanel.obj'
ERROR: error 65280 occurred while making
/Users/pavel/BUILD/BuildDir/ooo_trunk_src/sc/source/ui/sidebar
This is still the case in the current tree.
As a workaround, I have this in my tree. Is this constant the same as in sfx2?
Should it be the same value?
Index: source/ui/sidebar/NumberFormatPropertyPanel.hrc
===================================================================
--- source/ui/sidebar/NumberFormatPropertyPanel.hrc (revision 1483653)
+++ source/ui/sidebar/NumberFormatPropertyPanel.hrc (working copy)
@@ -37,7 +37,7 @@
//===============================================================position=============================================
#define MBOX_WIDTH 28
-#define TOOLBOX_ITEM_HEIGHT 12
+// #define TOOLBOX_ITEM_HEIGHT 12
#define CHECKBOX_HEIGHT 10
#define FT_CATEGORY_X SECTIONPAGE_MARGIN_HORIZONTAL
This should make a difference because in
sfx2/sidebar/ResourceDefinitions.hrcTOOLBOX_ITEM_HEIGHT is defined to be
15, not 12. But I tried both versions and can not see a difference.
But still
#undef TOOLBOX_ITEM_HEIGHT
#define TOOLBOX_ITEM_HEIGHT 12
might be safer.
-Andre
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org
