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
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index 62104ea..d1d25c8 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -35,7 +35,6 @@
IMG_IMPRESS ; \
IMG_CALC ; \
IMG_CALCTEMPLATE ; \
- IMG_CHART ; \
IMG_IMPRESSTEMPLATE ; \
IMG_HTML ; \
IMG_MATH ; \
@@ -51,7 +50,6 @@
IMG_CALC ; \
IMG_CALCTEMPLATE ; \
IMG_CDROMDEV ; \
- IMG_CHART ; \
IMG_DATABASE ; \
IMG_DRAW ; \
IMG_DRAWTEMPLATE ; \
@@ -74,7 +72,6 @@
IMG_OO_CALC_TEMPLATE ; \
IMG_OO_DATABASE_DOC ; \
IMG_OO_DRAW_DOC ; \
- IMG_OO_DRAW_TEMPLATE ; \
IMG_OO_GLOBAL_DOC ; \
IMG_OO_IMPRESS_DOC ; \
IMG_OO_IMPRESS_TEMPLATE ; \
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
