[Libreoffice] [GSoC] library merging

Hi all,

I tried to merge svxcore into svx library and it seems to be working.
I'm sending diff for it, so you can tell me if that's alright (and the
right way to do it).
I also had to adjust dependencies of other libraries but that's not
worth sending.

I'd like first to merge libraries in modules with more than one often
used library.
But it's just svx,
framework <- but that won't be easy, I already unsuccessfully tried.
There is the same one component_ method (defined in .hxx) used in
three libraries.
vcl <- there are many vclplug_foo libraries,
svl <- could be easy.
Then there are not so often used libraries in sd, sw, formula, dbacces, ..

And I don't know what to do about merging from different modules.
How and where to do that. Maybe in one of the modules or somewhere in
postprocess.

Any thoughts welcomed.

Matus

diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index aba2265..1bbf3cf 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -28,12 +28,22 @@
 $(eval $(call gb_Library_Library,svx))
 
 $(eval $(call gb_Library_set_componentfile,svx,svx/util/svx))
+$(eval $(call gb_Library_set_componentfile,svx,svx/util/svxcore))
+
+$(eval $(call gb_Library_add_sdi_headers,svx,svx/sdi/svxslots))
+
+$(eval $(call gb_Library_add_package_headers,svx,\
+    svx_inc \
+    svx_sdi \
+))
 
 $(eval $(call gb_Library_set_include,svx,\
     -I$(realpath $(SRCDIR)/svx/inc) \
     -I$(realpath $(SRCDIR)/svx/source/inc) \
     -I$(realpath $(SRCDIR)/svx/inc/pch) \
+    -I$(WORKDIR)/SdiTarget/svx/sdi \
     $$(SOLARINC) \
+    $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_api,svx,\
@@ -48,6 +58,7 @@ $(eval $(call gb_Library_set_defs,svx,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,svx,\
+    avmedia \
     basegfx \
     sb \
     comphelper \
@@ -55,6 +66,7 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
     cppu \
     drawinglayer \
     editeng \
+    fwe \
     i18nisolang1 \
     icuuc \
     sal \
@@ -62,7 +74,6 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
     sot \
     svl \
     svt \
-    svxcore \
     tk \
     tl \
     ucbhelper \
@@ -214,6 +225,347 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/unogallery/unogalitem \
     svx/source/unogallery/unogaltheme \
     svx/source/unogallery/unogalthemeprovider \
+    svx/source/core/coreservices \
+    svx/source/customshapes/EnhancedCustomShape2d \
+    svx/source/customshapes/EnhancedCustomShapeGeometry \
+    svx/source/customshapes/EnhancedCustomShapeTypeNames \
+    svx/source/dialog/checklbx \
+    svx/source/dialog/dialmgr \
+    svx/source/dialog/dlgutil \
+    svx/source/dialog/framelink \
+    svx/source/dialog/langbox \
+    svx/source/dialog/simptabl \
+    svx/source/dialog/stddlg \
+    svx/source/dialog/svxdlg \
+    svx/source/engine3d/camera3d \
+    svx/source/engine3d/cube3d \
+    svx/source/engine3d/deflt3d \
+    svx/source/engine3d/dragmt3d \
+    svx/source/engine3d/e3dsceneupdater \
+    svx/source/engine3d/e3dundo \
+    svx/source/engine3d/extrud3d \
+    svx/source/engine3d/helperhittest3d \
+    svx/source/engine3d/helperminimaldepth3d \
+    svx/source/engine3d/lathe3d \
+    svx/source/engine3d/obj3d \
+    svx/source/engine3d/objfac3d \
+    svx/source/engine3d/polygn3d \
+    svx/source/engine3d/polysc3d \
+    svx/source/engine3d/scene3d \
+    svx/source/engine3d/sphere3d \
+    svx/source/engine3d/svx3ditems \
+    svx/source/engine3d/view3d \
+    svx/source/engine3d/view3d1 \
+    svx/source/engine3d/viewpt3d2 \
+    svx/source/fmcomp/dbaexchange \
+    svx/source/fmcomp/fmgridcl \
+    svx/source/fmcomp/fmgridif \
+    svx/source/fmcomp/gridcell \
+    svx/source/fmcomp/gridcols \
+    svx/source/fmcomp/gridctrl \
+    svx/source/fmcomp/trace \
+    svx/source/fmcomp/xmlexchg \
+    svx/source/form/dataaccessdescriptor \
+    svx/source/form/datalistener \
+    svx/source/form/datanavi \
+    svx/source/form/dbtoolsclient \
+    svx/source/form/delayedevent \
+    svx/source/form/fmcontrolbordermanager \
+    svx/source/form/fmcontrollayout \
+    svx/source/form/fmdmod \
+    svx/source/form/fmdocumentclassification \
+    svx/source/form/fmdpage \
+    svx/source/form/fmexch \
+    svx/source/form/fmexpl \
+    svx/source/form/fmitems \
+    svx/source/form/fmmodel \
+    svx/source/form/fmobj \
+    svx/source/form/fmpage \
+    svx/source/form/fmpgeimp \
+    svx/source/form/fmscriptingenv \
+    svx/source/form/fmservs \
+    svx/source/form/fmshell \
+    svx/source/form/fmshimp \
+    svx/source/form/fmtextcontroldialogs \
+    svx/source/form/fmtextcontrolfeature \
+    svx/source/form/fmtextcontrolshell \
+    svx/source/form/fmtools \
+    svx/source/form/fmundo \
+    svx/source/form/fmview \
+    svx/source/form/fmvwimp \
+    svx/source/form/formcontrolfactory \
+    svx/source/form/formcontroller \
+    svx/source/form/formcontrolling \
+    svx/source/form/formdispatchinterceptor \
+    svx/source/form/formfeaturedispatcher \
+    svx/source/form/formtoolbars \
+    svx/source/form/legacyformcontroller \
+    svx/source/form/navigatortree \
+    svx/source/form/navigatortreemodel \
+    svx/source/form/ParseContext \
+    svx/source/form/sdbdatacolumn \
+    svx/source/form/sqlparserclient \
+    svx/source/form/stringlistresource \
+    svx/source/form/typeconversionclient \
+    svx/source/form/typemap \
+    svx/source/form/xfm_addcondition \
+    svx/source/gallery2/codec \
+    svx/source/gallery2/galbrws \
+    svx/source/gallery2/galbrws1 \
+    svx/source/gallery2/galbrws2 \
+    svx/source/gallery2/galctrl \
+    svx/source/gallery2/galexpl \
+    svx/source/gallery2/gallery1 \
+    svx/source/gallery2/galmisc \
+    svx/source/gallery2/galobj \
+    svx/source/gallery2/galtheme \
+    svx/source/items/chrtitem \
+    svx/source/items/clipfmtitem \
+    svx/source/items/customshapeitem \
+    svx/source/items/drawitem \
+    svx/source/items/e3ditem \
+    svx/source/items/grfitem \
+    svx/source/sdr/animation/scheduler \
+    svx/source/sdr/animation/objectanimator \
+    svx/source/sdr/animation/animationstate \
+    svx/source/sdr/attribute/sdrlinefillshadowtextattribute \
+    svx/source/sdr/attribute/sdrfilltextattribute \
+    svx/source/sdr/attribute/sdrshadowtextattribute \
+    svx/source/sdr/attribute/sdrtextattribute \
+    svx/source/sdr/attribute/sdrlineshadowtextattribute \
+    svx/source/sdr/attribute/sdrformtextattribute \
+    svx/source/sdr/attribute/sdrformtextoutlineattribute \
+    svx/source/sdr/contact/viewobjectcontactofgroup \
+    svx/source/sdr/contact/viewobjectcontactofsdrpage \
+    svx/source/sdr/contact/viewcontactofpageobj \
+    svx/source/sdr/contact/viewcontactofe3d \
+    svx/source/sdr/contact/viewcontactofe3dcube \
+    svx/source/sdr/contact/viewcontactofsdrmediaobj \
+    svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor \
+    svx/source/sdr/contact/viewobjectcontactofpageobj \
+    svx/source/sdr/contact/viewobjectcontactofe3dscene \
+    svx/source/sdr/contact/viewcontactofgraphic \
+    svx/source/sdr/contact/viewobjectcontactredirector \
+    svx/source/sdr/contact/viewcontactofsdrcircobj \
+    svx/source/sdr/contact/viewcontactofgroup \
+    svx/source/sdr/contact/viewcontactofunocontrol \
+    svx/source/sdr/contact/viewcontactofsdrobjcustomshape \
+    svx/source/sdr/contact/viewcontactofsdrobj \
+    svx/source/sdr/contact/objectcontact \
+    svx/source/sdr/contact/viewcontactoftextobj \
+    svx/source/sdr/contact/viewcontactofe3dlathe \
+    svx/source/sdr/contact/viewcontactofsdrpage \
+    svx/source/sdr/contact/viewcontactofe3dextrude \
+    svx/source/sdr/contact/viewcontactofmasterpagedescriptor \
+    svx/source/sdr/contact/viewcontact \
+    svx/source/sdr/contact/viewcontactofsdrole2obj \
+    svx/source/sdr/contact/displayinfo \
+    svx/source/sdr/contact/objectcontacttools \
+    svx/source/sdr/contact/viewcontactofe3dscene \
+    svx/source/sdr/contact/viewcontactofsdrrectobj \
+    svx/source/sdr/contact/viewobjectcontactofsdrole2obj \
+    svx/source/sdr/contact/viewobjectcontactofunocontrol \
+    svx/source/sdr/contact/viewobjectcontactofgraphic \
+    svx/source/sdr/contact/sdrmediawindow \
+    svx/source/sdr/contact/viewobjectcontactofsdrmediaobj \
+    svx/source/sdr/contact/viewcontactofsdrcaptionobj \
+    svx/source/sdr/contact/viewcontactofvirtobj \
+    svx/source/sdr/contact/viewcontactofe3dsphere \
+    svx/source/sdr/contact/viewcontactofe3dpolygon \
+    svx/source/sdr/contact/viewcontactofsdredgeobj \
+    svx/source/sdr/contact/viewobjectcontact \
+    svx/source/sdr/contact/viewobjectcontactofsdrobj \
+    svx/source/sdr/contact/objectcontactofpageview \
+    svx/source/sdr/contact/viewcontactofsdrpathobj \
+    svx/source/sdr/contact/viewcontactofsdrmeasureobj \
+    svx/source/sdr/contact/objectcontactofobjlistpainter \
+    svx/source/sdr/contact/viewobjectcontactofe3d \
+    svx/source/sdr/event/eventhandler \
+    svx/source/sdr/overlay/overlayline \
+    svx/source/sdr/overlay/overlaycrosshair \
+    svx/source/sdr/overlay/overlayrollingrectangle \
+    svx/source/sdr/overlay/overlaytriangle \
+    svx/source/sdr/overlay/overlayselection \
+    svx/source/sdr/overlay/overlayhatchrect \
+    svx/source/sdr/overlay/overlaybitmapex \
+    svx/source/sdr/overlay/overlaymanagerbuffered \
+    svx/source/sdr/overlay/overlayhelpline \
+    svx/source/sdr/overlay/overlayanimatedbitmapex \
+    svx/source/sdr/overlay/overlaypolypolygon \
+    svx/source/sdr/overlay/overlayobjectcell \
+    svx/source/sdr/overlay/overlaytools \
+    svx/source/sdr/overlay/overlayprimitive2dsequenceobject \
+    svx/source/sdr/overlay/overlayobject \
+    svx/source/sdr/overlay/overlaymanager \
+    svx/source/sdr/overlay/overlayobjectlist \
+    svx/source/sdr/primitive2d/sdrellipseprimitive2d \
+    svx/source/sdr/primitive2d/sdrprimitivetools \
+    svx/source/sdr/primitive2d/sdrtextprimitive2d \
+    svx/source/sdr/primitive2d/primitivefactory2d \
+    svx/source/sdr/primitive2d/sdrolecontentprimitive2d \
+    svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d \
+    svx/source/sdr/primitive2d/sdrgrafprimitive2d \
+    svx/source/sdr/primitive2d/sdrole2primitive2d \
+    svx/source/sdr/primitive2d/sdrpathprimitive2d \
+    svx/source/sdr/primitive2d/sdrrectangleprimitive2d \
+    svx/source/sdr/primitive2d/sdrcaptionprimitive2d \
+    svx/source/sdr/primitive2d/sdrconnectorprimitive2d \
+    svx/source/sdr/primitive2d/sdrmeasureprimitive2d \
+    svx/source/sdr/primitive2d/sdrattributecreator \
+    svx/source/sdr/primitive2d/sdrdecompositiontools \
+    svx/source/sdr/primitive3d/sdrattributecreator3d \
+    svx/source/sdr/properties/pageproperties \
+    svx/source/sdr/properties/e3dsceneproperties \
+    svx/source/sdr/properties/itemsettools \
+    svx/source/sdr/properties/captionproperties \
+    svx/source/sdr/properties/e3dextrudeproperties \
+    svx/source/sdr/properties/e3dproperties \
+    svx/source/sdr/properties/measureproperties \
+    svx/source/sdr/properties/customshapeproperties \
+    svx/source/sdr/properties/rectangleproperties \
+    svx/source/sdr/properties/groupproperties \
+    svx/source/sdr/properties/properties \
+    svx/source/sdr/properties/e3dlatheproperties \
+    svx/source/sdr/properties/graphicproperties \
+    svx/source/sdr/properties/circleproperties \
+    svx/source/sdr/properties/emptyproperties \
+    svx/source/sdr/properties/e3dsphereproperties \
+    svx/source/sdr/properties/defaultproperties \
+    svx/source/sdr/properties/textproperties \
+    svx/source/sdr/properties/attributeproperties \
+    svx/source/sdr/properties/connectorproperties \
+    svx/source/sdr/properties/e3dcompoundproperties \
+    svx/source/sdr/properties/oleproperties \
+    svx/source/svdraw/clonelist \
+    svx/source/svdraw/gradtrns \
+    svx/source/svdraw/polypolygoneditor \
+    svx/source/svdraw/sdrcomment \
+    svx/source/svdraw/sdrhittesthelper \
+    svx/source/svdraw/sdrmasterpagedescriptor \
+    svx/source/svdraw/sdrpagewindow \
+    svx/source/svdraw/sdrpaintwindow \
+    svx/source/svdraw/selectioncontroller \
+    svx/source/svdraw/svdattr \
+    svx/source/svdraw/svdcrtv \
+    svx/source/svdraw/svddrag \
+    svx/source/svdraw/svddrgmt \
+    svx/source/svdraw/svddrgv \
+    svx/source/svdraw/svdedtv \
+    svx/source/svdraw/svdedtv1 \
+    svx/source/svdraw/svdedtv2 \
+    svx/source/svdraw/svdedxv \
+    svx/source/svdraw/svdetc \
+    svx/source/svdraw/svdfmtf \
+    svx/source/svdraw/svdglev \
+    svx/source/svdraw/svdglue \
+    svx/source/svdraw/svdhdl \
+    svx/source/svdraw/svdhlpln \
+    svx/source/svdraw/svdibrow \
+    svx/source/svdraw/svditer \
+    svx/source/svdraw/svdlayer \
+    svx/source/svdraw/svdmark \
+    svx/source/svdraw/svdmodel \
+    svx/source/svdraw/svdmrkv \
+    svx/source/svdraw/svdmrkv1 \
+    svx/source/svdraw/svdoashp \
+    svx/source/svdraw/svdoattr \
+    svx/source/svdraw/svdobj \
+    svx/source/svdraw/svdocapt \
+    svx/source/svdraw/svdocirc \
+    svx/source/svdraw/svdoedge \
+    svx/source/svdraw/svdograf \
+    svx/source/svdraw/svdogrp \
+    svx/source/svdraw/svdomeas \
+    svx/source/svdraw/svdomedia \
+    svx/source/svdraw/svdoole2 \
+    svx/source/svdraw/svdopage \
+    svx/source/svdraw/svdopath \
+    svx/source/svdraw/svdorect \
+    svx/source/svdraw/svdotext \
+    svx/source/svdraw/svdotextdecomposition \
+    svx/source/svdraw/svdotextpathdecomposition \
+    svx/source/svdraw/svdotxat \
+    svx/source/svdraw/svdotxdr \
+    svx/source/svdraw/svdotxed \
+    svx/source/svdraw/svdotxfl \
+    svx/source/svdraw/svdotxln \
+    svx/source/svdraw/svdotxtr \
+    svx/source/svdraw/svdouno \
+    svx/source/svdraw/svdoutl \
+    svx/source/svdraw/svdoutlinercache \
+    svx/source/svdraw/svdovirt \
+    svx/source/svdraw/svdpage \
+    svx/source/svdraw/svdpagv \
+    svx/source/svdraw/svdpntv \
+    svx/source/svdraw/svdpoev \
+    svx/source/svdraw/svdsnpv \
+    svx/source/svdraw/svdtext \
+    svx/source/svdraw/svdtrans \
+    svx/source/svdraw/svdundo \
+    svx/source/svdraw/svdview \
+    svx/source/svdraw/svdviter \
+    svx/source/svdraw/svdxcgv \
+    svx/source/table/cell \
+    svx/source/table/cellcursor \
+    svx/source/table/cellrange \
+    svx/source/table/propertyset \
+    svx/source/table/svdotable \
+    svx/source/table/tablecolumn \
+    svx/source/table/tablecolumns \
+    svx/source/table/tablecontroller \
+    svx/source/table/tablehandles \
+    svx/source/table/tablelayouter \
+    svx/source/table/tablemodel \
+    svx/source/table/tablerow \
+    svx/source/table/tablerows \
+    svx/source/table/tableundo \
+    svx/source/table/viewcontactoftableobj \
+    svx/source/tbxctrls/extrusioncontrols \
+    svx/source/tbxctrls/fontworkgallery \
+    svx/source/tbxctrls/tbcontrl \
+    svx/source/tbxctrls/tbxcolorupdate \
+    svx/source/toolbars/extrusionbar \
+    svx/source/toolbars/fontworkbar \
+    svx/source/unodraw/gluepts \
+    svx/source/unodraw/shapepropertynotifier \
+    svx/source/unodraw/tableshape \
+    svx/source/unodraw/unobtabl \
+    svx/source/unodraw/unodtabl \
+    svx/source/unodraw/UnoGraphicExporter \
+    svx/source/unodraw/unogtabl \
+    svx/source/unodraw/unohtabl \
+    svx/source/unodraw/unomlstr \
+    svx/source/unodraw/unomod \
+    svx/source/unodraw/unomtabl \
+    svx/source/unodraw/UnoNameItemTable \
+    svx/source/unodraw/unopage \
+    svx/source/unodraw/unoprov \
+    svx/source/unodraw/unoshap2 \
+    svx/source/unodraw/unoshap3 \
+    svx/source/unodraw/unoshap4 \
+    svx/source/unodraw/unoshape \
+    svx/source/unodraw/unoshtxt \
+    svx/source/unodraw/unottabl \
+    svx/source/unodraw/XPropertyTable \
+    svx/source/xml/xmleohlp \
+    svx/source/xml/xmlexport \
+    svx/source/xml/xmlgrhlp \
+    svx/source/xml/xmlxtexp \
+    svx/source/xml/xmlxtimp \
+    svx/source/xoutdev/xattr \
+    svx/source/xoutdev/xattr2 \
+    svx/source/xoutdev/xattrbmp \
+    svx/source/xoutdev/xexch \
+    svx/source/xoutdev/_xoutbmp \
+    svx/source/xoutdev/_xpoly \
+    svx/source/xoutdev/xpool \
+    svx/source/xoutdev/xtabbtmp \
+    svx/source/xoutdev/xtabcolr \
+    svx/source/xoutdev/xtabdash \
+    svx/source/xoutdev/xtabgrdt \
+    svx/source/xoutdev/xtabhtch \
+    svx/source/xoutdev/xtable \
+    svx/source/xoutdev/xtablend \
 ))
 
 ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
@@ -235,4 +587,26 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
 endif
 endif
 
+# the following source file can't be compiled with optimization by some compilers (crash or 
endless loop):
+# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC
+# the latter is currently not supported by gbuild and needs a fix here later
+ifeq ($(OS),$(filter-out SOLARIS MACOSX,$(OS)))
+$(eval $(call gb_Library_add_exception_objects,svx,\
+    svx/source/customshapes/EnhancedCustomShapeFunctionParser \
+))
+else
+$(eval $(call gb_Library_add_cxxobjects,svx,\
+    svx/source/customshapes/EnhancedCustomShapeFunctionParser \
+    , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+endif
+
+$(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx))
+
+$(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/svx/inc) \
+    -I$(realpath $(SRCDIR)/svx/sdi) \
+))
+
 # vim: set noet sw=4 ts=4: