[Libreoffice] [PUSHED] [PATCH] Part of FDO #42454 - Remove code associated with unused icons
Noel Power
nopower at suse.com
Tue Nov 15 08:02:37 PST 2011
On 15/11/11 15:16, Julien Chaffraix wrote:
>> some physical images removed here are
>> lx03139.png
>> sx03139.png
>> oth_16_8.png
>> oth_32_8.png
>> oth_48_8.png
>>
>> these images are associated with SV_ICON_ID_HTML_DOCUMENT which according to
>> opengrok ( assuming it is correct ) isn't used in code.
>>
>> however there are still entries for these in images.src and ditto svids.hrc
>>
>> ok, I have removed these in an additional commit and hope I did the right
>> thing
> I think your change was a mistake: SV_ICON_ID_HTML_DOCUMENT is used
> but never mentioned.
not sure what you mean by "used but never mentioned" where is it used ?
opengrok at least doesn't show it being used just beyond the 'Bitmap'
definitions in images.src and the define itself. Can you elaborate?
> I fell into the same pitfall while removing the
> images. The patch AS-IS was compiling on linux AFAICT.
not from clean ( on linux )
>
> Btw, do you have the error message from the tinderbox by any chance as
> it would be useful to know what was missed here?
[...]
[ build DEP ] LNK:CppunitTest/libtest_svtools_filters_test.so
[ build CMP ] svtools/source/hatchwindow/hatchwindowfactory
[ build CMP ] svtools/util/svt
[ build LNK ] Executable/bmp
[ build LNK ] Executable/bmpsum
[ build LNK ] Library/hatchwindowfactory.uno.so
[ build LNK ] Library/libsvtlo.so
[ build DEP ] SRS:svt/res
[ build SRS ] svt/res
[ build RES ] svten-US
f268: Error: The image(s)<lx03128 lx03128 lx03252 sx03128 sx03128 sx03252> could not be found.
Terminating compiler
make[1]: *** [/fast/core/workdir/unxlngx6.pro/ResTarget/svten-US.res] Error 1
make[1]: *** Waiting for unfinished jobs....
dmake: Error code 2, while making 'all'
ERROR: error 65280 occurred while making /fast/core/svtools/prj
I think I have tracked where this is coming from (see attached),
I have restarted my build from clean, assuming the build completes without errors, unless I get some sort of "stop the world will end" I will commit the patches again
-------------- next part --------------
A non-text attachment was scrubbed...
Name: images-removal-extra.diff
Type: text/x-patch
Size: 813 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20111115/630e62c3/attachment.bin>
More information about the LibreOffice
mailing list