On May 17, 2013, at 9:49 AM, Andre Fischer wrote:

> On 17.05.2013 09:44, Pavel Janík wrote:
>> Hi Andre,
>> 
>>> 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.
>> This only hides the problem and makes the code looking strange. What about 
>> using different name/prefix or something other?
> 
> I would prefer the 'something other' option: refactor the definition of 
> positions of the number format panel.  But I don't have the time for it right 
> now.

Well, yes. But...

This constant is used in three files in sidebar directory:

source/ui/sidebar/AlignmentPropertyPanel.hrc:#define FT_LEFTINDENT_Y            
                                        (ALIGNMENT_Y + TOOLBOX_ITEM_HEIGHT + 
TBX_OUT_BORDER_OFFSET_Y + CONTROL_SPACING_VERTICAL)

source/ui/sidebar/AlignmentPropertyPanel.src:           Size = MAP_APPFONT ( 
TOOLBOX_ITEM_WIDTH * 3 ,  TOOLBOX_ITEM_HEIGHT) ;

source/ui/sidebar/NumberFormatPropertyPanel.hrc:#define TOOLBOX_ITEM_HEIGHT     
                                12
source/ui/sidebar/NumberFormatPropertyPanel.hrc:#define FT_DECIMALS_Y           
                                TBX_CATEGORY_Y + TOOLBOX_ITEM_HEIGHT + 4 + 
CONTROL_SPACING_VERTICAL

In the first case, it's value is 15, in the second case it is 12. This will 
lead to some error in the near future...

So is this the right solution?

sed -i 's#TOOLBOX_ITEM_HEIGHT#LOCAL_TOOLBOX_ITEM_HEIGHT#' 
source/ui/sidebar/NumberFormatPropertyPanel.hrc
-- 
Pavel Janík




---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org

Reply via email to