Apache OpenOffice (AOO) Bugzilla – Issue 52061
break in slideshow caused by changes in animations
Last modified: 2005-07-19 13:11:54 UTC
break in slideshow, building m118 on both Linux The log : Making: ../unxlngppc.pro/lib/slideshow.uno.so ccache g++ -Wl,-rpath,'$ORIGIN' -shared -Wl,--version-script ../unxlngppc.pro/misc/exports_slideshow.uno.map -L../unxlngppc.pro/lib -L../lib -L/home/eric/OpenOffice/solenv/unxlngppc/lib -L/home/eric/OpenOffice/solver/680/unxlngppc.pro/lib -L/home/eric/OpenOffice/solenv/unxlngppc/lib -L/usr/local/IBMJava2-ppc-142/lib -L/usr/local/IBMJava2-ppc-142/jre/bin -L/usr/local/IBMJava2-ppc-142/jre/bin/classic -L/usr/local/IBMJava2-ppc-142/jre/bin -L/usr/X11R6/lib ../unxlngppc.pro/slo/slideshow.uno_version.o ../unxlngppc.pro/slo/slideshow.uno_description.o -o ../unxlngppc.pro/lib/slideshow.uno.so ../unxlngppc.pro/slo/barwipepolypolygon.o ../unxlngppc.pro/slo/boxwipe.o ../unxlngppc.pro/slo/clippingfunctor.o ../unxlngppc.pro/slo/combtransition.o ../unxlngppc.pro/slo/fourboxwipe.o ../unxlngppc.pro/slo/barndoorwipe.o ../unxlngppc.pro/slo/iriswipe.o ../unxlngppc.pro/slo/veewipe.o ../unxlngppc.pro/slo/ellipsewipe.o ../unxlngppc.pro/slo/checkerboardwipe.o ../unxlngppc.pro/slo/randomwipe.o ../unxlngppc.pro/slo/waterfallwipe.o ../unxlngppc.pro/slo/clockwipe.o ../unxlngppc.pro/slo/fanwipe.o ../unxlngppc.pro/slo/pinwheelwipe.o ../unxlngppc.pro/slo/snakewipe.o ../unxlngppc.pro/slo/spiralwipe.o ../unxlngppc.pro/slo/sweepwipe.o ../unxlngppc.pro/slo/figurewipe.o ../unxlngppc.pro/slo/doublediamondwipe.o ../unxlngppc.pro/slo/zigzagwipe.o ../unxlngppc.pro/slo/parametricpolypolygonfactory.o ../unxlngppc.pro/slo/shapetransitionfactory.o ../unxlngppc.pro/slo/slidetransitionfactory.o ../unxlngppc.pro/slo/transitionfactorytab.o ../unxlngppc.pro/slo/transitiontools.o ../unxlngppc.pro/slo/slidechangebase.o ../unxlngppc.pro/slo/activitybase.o ../unxlngppc.pro/slo/activitiesfactory.o ../unxlngppc.pro/slo/continuousactivitybase.o ../unxlngppc.pro/slo/continuouskeytimeactivitybase.o ../unxlngppc.pro/slo/discreteactivitybase.o ../unxlngppc.pro/slo/simplecontinuousactivitybase.o ../unxlngppc.pro/slo/activityanimationbasenode.o ../unxlngppc.pro/slo/animationaudionode.o ../unxlngppc.pro/slo/animationcommandnode.o ../unxlngppc.pro/slo/animationbasenode.o ../unxlngppc.pro/slo/animationcolornode.o ../unxlngppc.pro/slo/animationnodefactory.o ../unxlngppc.pro/slo/animationpathmotionnode.o ../unxlngppc.pro/slo/animationsetnode.o ../unxlngppc.pro/slo/animationtransformnode.o ../unxlngppc.pro/slo/animationtransitionfilternode.o ../unxlngppc.pro/slo/basecontainernode.o ../unxlngppc.pro/slo/basenode.o ../unxlngppc.pro/slo/nodetools.o ../unxlngppc.pro/slo/paralleltimecontainer.o ../unxlngppc.pro/slo/propertyanimationnode.o ../unxlngppc.pro/slo/sequentialtimecontainer.o ../unxlngppc.pro/slo/activitiesqueue.o ../unxlngppc.pro/slo/animatedsprite.o ../unxlngppc.pro/slo/animationfactory.o ../unxlngppc.pro/slo/attributemap.o ../unxlngppc.pro/slo/backgroundshape.o ../unxlngppc.pro/slo/color.o ../unxlngppc.pro/slo/drawshape.o ../unxlngppc.pro/slo/drawshapesubsetting.o ../unxlngppc.pro/slo/eventmultiplexer.o ../unxlngppc.pro/slo/eventqueue.o ../unxlngppc.pro/slo/expressionnodefactory.o ../unxlngppc.pro/slo/gdimtftools.o ../unxlngppc.pro/slo/intrinsicanimationactivity.o ../unxlngppc.pro/slo/layer.o ../unxlngppc.pro/slo/layermanager.o ../unxlngppc.pro/slo/mediashape.o ../unxlngppc.pro/slo/presentation.o ../unxlngppc.pro/slo/shapeattributelayer.o ../unxlngppc.pro/slo/shapeeventbroadcaster.o ../unxlngppc.pro/slo/shapeimporter.o ../unxlngppc.pro/slo/shapesubset.o ../unxlngppc.pro/slo/slide.o ../unxlngppc.pro/slo/slideanimations.o ../unxlngppc.pro/slo/slidebitmap.o ../unxlngppc.pro/slo/smilfunctionparser.o ../unxlngppc.pro/slo/soundplayer.o ../unxlngppc.pro/slo/tools.o ../unxlngppc.pro/slo/unoviewcontainer.o ../unxlngppc.pro/slo/usereventqueue.o ../unxlngppc.pro/slo/userpaintoverlay.o ../unxlngppc.pro/slo/viewbackgroundshape.o ../unxlngppc.pro/slo/viewmediashape.o ../unxlngppc.pro/slo/viewshape.o ../unxlngppc.pro/slo/wakeupevent.o ../unxlngppc.pro/slo/rehearsetimingsactivity.o ../unxlngppc.pro/slo/waitsymbol.o ../unxlngppc.pro/slo/slideshow.o -ltl680lp -luno_cppu -luno_sal -lvcl680lp -lcomphelp4gcc3 -luno_cppuhelpergcc3 -lbasegfx680lp -lcanvastools680lp -lcppcanvas680lp -lutl680lp -lgo680lp -ltk680lp -ldl -lpthread -lm -Wl,-Bdynamic -lstlport_gcc -lstdc++ ../unxlngppc.pro/slo/slide.o: In function `anim::create_deep_vector(com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> const&, _STL::vector<com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode>, _STL::allocator<com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> > >&)': slide.cxx:(.text+0x4): multiple definition of `anim::create_deep_vector(com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> const&, _STL::vector<com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode>, _STL::allocator<com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> > >&)' ../unxlngppc.pro/slo/animationnodefactory.o:animationnodefactory.cxx:(.text+0x4): first defined here /usr/bin/ld: `.gnu.linkonce.t._ZN3com3sun4star3unorSERKNS2_3AnyERd' referenced in section `.rodata' of ../unxlngppc.pro/slo/basenode.o: defined in discarded section `.gnu.linkonce.t._ZN3com3sun4star3unorSERKNS2_3AnyERd' of ../unxlngppc.pro/slo/basenode.o /usr/bin/ld: `.gnu.linkonce.t._ZN3com3sun4star3unorSERKNS2_3AnyERd' referenced in section `.rodata' of ../unxlngppc.pro/slo/animationfactory.o: defined in discarded section `.gnu.linkonce.t._ZN3com3sun4star3unorSERKNS2_3AnyERd' of ../unxlngppc.pro/slo/animationfactory.o /usr/bin/ld: `.gnu.linkonce.t._ZN3com3sun4star3unorSERKNS2_3AnyERd' referenced in section `.rodata' of ../unxlngppc.pro/slo/presentation.o: defined in discarded section `.gnu.linkonce.t._ZN3com3sun4star3unorSERKNS2_3AnyERd' of ../unxlngppc.pro/slo/presentation.o /usr/bin/ld: `.gnu.linkonce.t._ZN3com3sun4star3unorSERKNS2_3AnyERd' referenced in section `.rodata' of ../unxlngppc.pro/slo/shapeimporter.o: defined in discarded section `.gnu.linkonce.t._ZN3com3sun4star3unorSERKNS2_3AnyERd' of ../unxlngppc.pro/slo/shapeimporter.o /usr/bin/ld: `.gnu.linkonce.t._ZN3com3sun4star3unorSERKNS2_3AnyERd' referenced in section `.rodata' of ../unxlngppc.pro/slo/slide.o: defined in discarded section `.gnu.linkonce.t._ZN3com3sun4star3unorSERKNS2_3AnyERd' of ../unxlngppc.pro/slo/slide.o /usr/bin/ld: `.gnu.linkonce.t._ZN3com3sun4star3unorSERKNS2_3AnyERd' referenced in section `.rodata' of ../unxlngppc.pro/slo/tools.o: defined in discarded section `.gnu.linkonce.t._ZN3com3sun4star3unorSERKNS2_3AnyERd' of ../unxlngppc.pro/slo/tools.o collect2: ld returned 1 exit status dmake: Error code 1, while making '../unxlngppc.pro/lib/slideshow.uno.so' '---* tg_merge.mk *---' ERROR: Error 65280 occurred while making /home/eric/OpenOffice/slideshow/util """"""""""""""""""""""""""""""""""" Comments : After a research on EIS, I found animations changed between m117 and m118, with just a change in animations/inc/animations/animationnodehelper.hxx Workaround : If I reverse changes, using animations from m117 , slideshow builds fine. I thought first to a multiple inclusion of vector header file, but I'm not sure now...
set target, Please try to build module slideshow after delivery of module animations. The definition (not declaration!) of function create_deep_vector is in the header file animations/inc/animations/animationnodehelper.hxx. This file is included in two files in module slideshow: source/engine/slide.cxx:#include <animations/animationnodehelper.hxx> source/engine/animationnodes/animationnodefactory.cxx:#include <animations/animationnodehelper.hxx> -> it is defined twice while linking it all together.
pjanik: build.lst of slideshow contains animations, though...
maho: and? What is the meaning of your comment? I do not understand...
FYI, other problem in sd with create_deep_vector. The log : Making: ../../unxlngi4.pro/slo/CustomAnimationCloner.obj ccache g++ -Wuninitialized -fmessage-length=0 -c -I. -I/home/eric/OpenOffice.org/solver/680/unxlngi4.pro/inc/offuh -I../inc -I../../inc -I../../unx/inc -I../../unxlngi4.pro/inc -I. -I/home/eric/OpenOffice.org/solver/680/unxlngi4.pro/inc/stl -I/home/eric/OpenOffice.org/solver/680/unxlngi4.pro/inc/external -I/home/eric/OpenOffice.org/solver/680/unxlngi4.pro/inc -I/home/eric/OpenOffice.org/solenv/unxlngi4/inc -I/home/eric/OpenOffice.org/solenv/inc -I/home/eric/OpenOffice.org/res -I/home/eric/OpenOffice.org/solver/680/unxlngi4.pro/inc/stl -I/home/eric/OpenOffice.org/solenv/inc/Xp31 -I/usr/local/j2sdk1.4.2_06/include -I/usr/local/j2sdk1.4.2_06/include/linux -I/usr/local/j2sdk1.4.2_06/include/native_threads/include -I/usr/X11R6/include -I. -I../../res -I. -O1 -pipe -mcpu=pentiumpro -Wno-ctor-dtor-privacy -include preinclude.h -fexceptions -fno-enforce-eh-specs -fpic -DLINUX -DUNX -DVCL -DGCC -DC300 -DINTEL -DGXX_INCLUDE_PATH=/usr/include/c++/3.3 -DCVER=C300 -D_USE_NAMESPACE -DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DSUPD=680 -DPRODUCT -DNDEBUG -DPRODUCT_FULL -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DEXCEPTIONS_ON -DCUI -DSOLAR_JAVA -DSRC680 -DSD_DLLIMPLEMENTATION -DSHAREDLIB -D_DLL_ -DMULTITHREAD -o ../../unxlngi4.pro/slo/CustomAnimationCloner.o /home/eric/OpenOffice.org/sd/source/core/CustomAnimationCloner.cxx /home/eric/OpenOffice.org/sd/source/core/CustomAnimationCloner.cxx: Dans member function « com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode> sd::CustomAnimationClonerImpl::Clone(const com::sun::star::uno::Reference<com::sun::star::animations::XAnimationNode>&, const SdPage*, const SdPage*) »:/home/eric/OpenOffice.org/sd/source/core/CustomAnimationCloner.cxx:203: error: `create_deep_vector' undeclared in namespace `anim' /home/eric/OpenOffice.org/sd/source/core/CustomAnimationCloner.cxx:204: error: `create_deep_vector' undeclared in namespace `anim' dmake: Error code 1, while making '../../unxlngi4.pro/slo/CustomAnimationCloner.obj' '---* tg_merge.mk *---' ERROR: Error 65280 occurred while making /home/eric/OpenOffice.org/sd/source/core
I forgot to mention I have deleted create_deep_vector definition in animations. with this definition : slideshow breaks and sd builds without : slideshow builds, sd breaks
@cl->dbo: please fix
obo: fixed in m119.
fixed.
Sorry if I'm curious, but what is the fix ? Second, is : "cvs -z3 co -r SRC680_m118 animations slideshow sd " usefull, or is the fix only in m119 ? Thank's in advance :-)
@ericb: "inline" has been added to both functions in that header file, although currently only the latter causes problems. Not marking them inline violates C++'s "one definition rule". As OBO mentioned, the fix will be in m119, but if you'd like to proceed with your build, apply "inline" in that header file and... try again.
ericb -> dbo If I find the time, I'll sure give it a try. Thank you very much :-)
I confirm : the fix works both on Linux Intel and Linux PPC
Created attachment 28015 [details] fix for animations (create_deep_vector linked twice) in m118
ericb: 1. attaching patch after issue is fixed is useless 2. you extracted only half of the patch.
Created attachment 28019 [details] correct patch
ericb -> pjanik 1) no, at least 2 people asked for a fix 2) you're right, I forgot another function, and I prefer send correct patch.
The answer to such people should be: cvs diff -kk -r 1.3 -r 1.4 animations/inc/animations/animationnodehelper.hxx -> attaching patch is really useless.
@ericb: I think you are the right one to verify the fix. Please close issue when master is ok. re-open issue and reassign to ericb
reassign to ericb
reset resolution to FIXED
Verified with a checkout of animations from Milestone 119 (updating m118) : eric@lou:~/ANIM$ cvs co -r SRC680_m119 animations cvs checkout: Updating animations cvs checkout: Updating animations/inc cvs checkout: Updating animations/inc/animations U animations/inc/animations/animationnodehelper.hxx cvs checkout: Updating animations/prj cvs checkout: Updating animations/source cvs checkout: Updating animations/source/animcore cvs checkout: Updating animations/source/api cvs checkout: Updating animations/source/api/com cvs checkout: Updating animations/source/api/com/sun cvs checkout: Updating animations/source/api/com/sun/star cvs checkout: Updating animations/source/api/com/sun/star/animations cvs checkout: Updating animations/source/api/com/sun/star/presentation Verification : eric@lou:~/ANIM/animations/inc/animations$ cat -n animationnodehelper.hxx | grep inline 103 template< typename Functor > inline bool for_each_childNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >xNode, 136 inline void create_deep_vector( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, Changes are OK for me on master.
Verified on master -> issue closed