Apache OpenOffice (AOO) Bugzilla – Issue 87946
to-be-DEV300_m6: toolkit's layout.hxx
Last modified: 2013-07-30 02:37:07 UTC
In svx: f:/home\pavel\BuildDir\ooo_DEV300_m6_src\solver\300\wntmsci10.pro\inc\layout\layout.hxx(4) : error C2220: warning treated as error - no object file generated f:/home\pavel\BuildDir\ooo_DEV300_m6_src\solver\300\wntmsci10.pro\inc\layout\layout.hxx(4) : warning C4668: 'ENABLE_LAYOUT' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' f:/home\pavel\BuildDir\ooo_DEV300_m6_src\solver\300\wntmsci10.pro\inc\layout\layout-pre.hxx(4) : warning C4668: 'ENABLE_LAYOUT' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' f:/home\pavel\BuildDir\ooo_DEV300_m6_src\solver\300\wntmsci10.pro\inc\layout\layout- post.hxx(4) : warning C4668: 'ENABLE_LAYOUT' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' dmake: Error code 2, while making '../../wntmsci10.pro/slo/dlgfact.obj' ERROR: Error 65280 occurred while making /cygdrive/f/home/pavel/BuildDir/ooo_DEV300_m6_src/svx/source/dialog
#if ENABLE_LAYOUT -> #ifdef ENABLE_LAYOUT Please also add copyright headers...
Thanks for catching this, but I object to such a patch as it is not helpful if code is built when ENABLE_LAYOUT==0. I would much rather have ENABLE_LAYOUT always be defined. I'm kind of flabbergasted it isn't, because ./configure will define it either 0 or 1. Is this a Windows build? Is Windows using an alternative mechanism? Could you help me with that, I have never built for Windows. I do not understand how this issue can crop-up now, this code has been integrated in m2 or m3 already? Wrt copyright headers (and lots of other fixes, amongst which building for Windows with --enable-layout switched on), those are in the "layoutdialogs" CWS.
Hi, yes wntmsci10.pro is Windows build. It pop up now, because wntmsci10.pro was broken for a few milestones ;-) What about #if VARIABLE > 0? There is a long way from configure's ENABLE_LAYOUT to C++ ENABLE_LAYOUT... BUT: I do not like this if in the header at all...
I suggest we add the following to toolkit/util/makefile.pmk svx/util/makefile.pmk sw/util/makefile.pmk .IF "$(ENABLE_LAYOUT)" == "TRUE" CFLAGS+=-DENABLE_LAYOUT=1 .ELSE CFLAGS+=-DENABLE_LAYOUT=0 .ENDIF # ENABLE_LAYOUT == TRUE In the cws layouterdialogs we will decide how to implement this gracefully.
looks like sw project has no makefile.pmk In that case the proposed patch must be added to each makefile.mk of the directories that fail
In the current m6, while compiling svx/source/dialog/dlgfact.cxx: In file included from /home/oo/BuildDir/ooo_DEV300_m6_src/svx/source/dialog/zoom.hxx:40, from /home/oo/BuildDir/ooo_DEV300_m6_src/svx/source/dialog/dlgfact.cxx:74: /home/oo/BuildDir/ooo_DEV300_m6_src/solver/300/unxlngx6.pro/inc/layout/layout.hxx:7:49: error: com/sun/star/awt/XLayoutContainer.hpp: No such file or directory and that file really is not part of the build tree...
lowering prio. Works now. But still has to be cleaned-out as the masterfix is only workaround.
can this issue be closed or get another target ?
OOo 3.1 is released. Please check the issue, if it still exists in OOo 3.1. If yes, please work on it to get it fixed in one of the next releases. Until then the issue get the target 3.x.
Reset assignee on issues not touched by assignee in more than 1000 days.