Re: [Libreoffice] [PATCH] Custom-intro-and-about-files-now-defaultly-png-files

Hi Kami,

On 2010-12-24 at 03:33 +0100, Kálmán „KAMI” Szalai wrote:

> Please review the attached files and integrate into libreoffice-3-3
>
> Background:
> Now png files are default as intro and about picture files. It seems
> only intro.png and about.png used. These patches are:
> * force tu specify png files
> * rename and pack custom definied intro as intro.png and about as about.png.

I am sorry, but the second patch does not look correct to me :-(

$(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png
$(INTRO_BITMAPS))

means "expand $(INTRO_BITMAPS), and if it is NULL, return
$(MISC)$/$(RSCDEFIMG)$/brand$/intro.png, otherwise $(INTRO_BITMAPS)".

With your change, $(COMMONBIN)$/brand_new$/intro.png is always non-NULL,
and always returns $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png.

More here: http://tools.openoffice.org/dmake/dmake_4.9.html

Can you please revisit the patch?

Thank you,
Kendy