summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authoros <os@openoffice.org>2011-02-02 11:06:37 +0100
committeros <os@openoffice.org>2011-02-02 11:06:37 +0100
commit41d0b02c47ed57a2ad76ab7547708db76706e5e0 (patch)
treed6d23cd66d709a2a6a4957d412b73f5590cdd11b /svx
parent14d15cc40ae09b050c896c15f94102a41d3deb7d (diff)
parenta204d0906ddf7498cf6bc0acbae4ac949f1a1af6 (diff)
os146: gnumake3 merged
Diffstat (limited to 'svx')
-rw-r--r--svx/AllLangResTarget_about.mk (renamed from svx/inc/makefile.mk)31
-rwxr-xr-x[-rw-r--r--]svx/AllLangResTarget_gal.mk (renamed from svx/source/sdr/animation/makefile.mk)30
-rw-r--r--svx/AllLangResTarget_ofa.mk (renamed from svx/source/sdr/event/makefile.mk)26
-rw-r--r--svx/AllLangResTarget_svx.mk (renamed from svx/prj/target_res_svx.mk)122
-rw-r--r--svx/AllLangResTarget_textconversiondlgs.mk (renamed from svx/sdi/makefile.mk)40
-rwxr-xr-x[-rw-r--r--]svx/JunitTest_svx_unoapi.mk (renamed from svx/source/fmcomp/makefile.mk)56
-rw-r--r--svx/Library_svx.mk (renamed from svx/prj/target_lib_svx.mk)285
-rw-r--r--svx/Library_svxcore.mk (renamed from svx/prj/target_lib_svxcore.mk)440
-rw-r--r--svx/Library_textconversiondlgs.mk75
-rw-r--r--svx/Makefile14
-rw-r--r--svx/Module_svx.mk (renamed from svx/source/core/makefile.mk)47
-rw-r--r--svx/Package_inc.mk560
-rw-r--r--svx/Package_sdi.mk (renamed from svx/source/sdr/primitive3d/makefile.mk)19
-rw-r--r--svx/prj/build.lst39
-rwxr-xr-x[-rw-r--r--]svx/prj/makefile.mk (renamed from svx/util/makefile.pmk)21
-rw-r--r--svx/prj/target_module_svx.mk52
-rw-r--r--svx/prj/target_package_inc.mk154
-rw-r--r--svx/qa/unoapi/Test.java5
-rw-r--r--svx/qa/unoapi/makefile.mk48
-rwxr-xr-xsvx/source/accessibility/makefile.mk68
-rw-r--r--svx/source/customshapes/makefile.mk71
-rw-r--r--svx/source/dialog/makefile.mk154
-rw-r--r--svx/source/engine3d/makefile.mk76
-rw-r--r--svx/source/form/makefile.mk119
-rw-r--r--svx/source/gallery2/makefile.mk69
-rw-r--r--svx/source/gengal/gengal.cxx319
-rw-r--r--svx/source/gengal/gengal.sh101
-rw-r--r--svx/source/gengal/gengalrc.in12
-rw-r--r--svx/source/gengal/makefile.mk85
-rw-r--r--svx/source/intro/about_ooo.hrc (renamed from svx/source/intro/intro_tmpl.hrc)244
-rw-r--r--svx/source/intro/about_ooo.src40
-rw-r--r--svx/source/intro/iso.src226
-rw-r--r--svx/source/intro/makefile.mk66
-rw-r--r--svx/source/intro/ooo.src196
-rw-r--r--svx/source/items/makefile.mk83
-rw-r--r--svx/source/mnuctrls/makefile.mk71
-rw-r--r--svx/source/sdr/attribute/makefile.mk50
-rw-r--r--svx/source/sdr/contact/makefile.mk92
-rw-r--r--svx/source/sdr/overlay/makefile.mk59
-rw-r--r--svx/source/sdr/primitive2d/makefile.mk57
-rw-r--r--svx/source/sdr/properties/makefile.mk65
-rw-r--r--svx/source/smarttags/makefile.mk48
-rw-r--r--svx/source/src/app.src4
-rw-r--r--svx/source/src/makefile.mk56
-rw-r--r--svx/source/stbctrls/makefile.mk75
-rw-r--r--svx/source/svdraw/makefile.mk124
-rw-r--r--svx/source/table/makefile.mk80
-rw-r--r--svx/source/tbxctrls/makefile.mk83
-rw-r--r--svx/source/toolbars/makefile.mk56
-rw-r--r--svx/source/unodialogs/textconversiondlgs/buttongroup.hrc (renamed from svx/source/unodialogs/inc/buttongroup.hrc)0
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src293
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx2
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc3
-rw-r--r--svx/source/unodialogs/textconversiondlgs/makefile.mk98
-rw-r--r--svx/source/unodialogs/textconversiondlgs/services.cxx4
-rw-r--r--svx/source/unodraw/makefile.mk83
-rwxr-xr-xsvx/source/unogallery/makefile.mk48
-rw-r--r--svx/source/xml/makefile.mk49
-rw-r--r--svx/source/xoutdev/makefile.mk59
-rw-r--r--svx/util/makefile.mk216
-rw-r--r--svx/util/textconversiondlgs.component (renamed from svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component)0
61 files changed, 1544 insertions, 4224 deletions
diff --git a/svx/inc/makefile.mk b/svx/AllLangResTarget_about.mk
index 37a079a68aa8..0d08c0075665 100644
--- a/svx/inc/makefile.mk
+++ b/svx/AllLangResTarget_about.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -25,26 +25,21 @@
#
#*************************************************************************
-PRJ=..
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,about))
-PRJNAME=svx
-TARGET=inc
+$(eval $(call gb_AllLangResTarget_set_reslocation,about,svx))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_AllLangResTarget_add_srs,about,svx/about))
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_SrsTarget_SrsTarget,svx/about))
-# --- Files --------------------------------------------------------
+$(eval $(call gb_SrsTarget_set_include,svx/about,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(SRCDIR)/svx/inc/ \
+))
-LOCALIZE_ME=globlmn_tmpl.hrc
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
+$(eval $(call gb_SrsTarget_add_files,svx/about,\
+ svx/source/intro/about_ooo.src \
+))
diff --git a/svx/source/sdr/animation/makefile.mk b/svx/AllLangResTarget_gal.mk
index a6750647f556..eb0b5b15c444 100644..100755
--- a/svx/source/sdr/animation/makefile.mk
+++ b/svx/AllLangResTarget_gal.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -25,22 +25,24 @@
#
#*************************************************************************
-PRJ=..$/..$/..
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,gal))
-PRJNAME=svx
-TARGET=animation
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_AllLangResTarget_set_reslocation,gal,svx))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_AllLangResTarget_add_srs,gal,svx/gal))
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_SrsTarget_SrsTarget,svx/gal))
-# --- Files --------------------------------------------------------
+$(eval $(call gb_SrsTarget_set_include,svx/gal,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(SRCDIR)/svx/source/gallery \
+ -I$(SRCDIR)/svx/inc/ \
+))
-SLOFILES=\
- $(SLO)$/animationstate.obj \
- $(SLO)$/objectanimator.obj \
- $(SLO)$/scheduler.obj
+$(eval $(call gb_SrsTarget_add_files,svx/gal,\
+ svx/source/gallery2/gallery.src \
+ svx/source/gallery2/galtheme.src \
+))
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/svx/source/sdr/event/makefile.mk b/svx/AllLangResTarget_ofa.mk
index ff379af6be2a..964b6562b3dd 100644
--- a/svx/source/sdr/event/makefile.mk
+++ b/svx/AllLangResTarget_ofa.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -25,20 +25,22 @@
#
#*************************************************************************
-PRJ=..$/..$/..
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,ofa))
-PRJNAME=svx
-TARGET=event
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_AllLangResTarget_set_reslocation,ofa,svx))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_AllLangResTarget_add_srs,ofa,svx/ofa))
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_SrsTarget_SrsTarget,svx/ofa))
-# --- Files --------------------------------------------------------
+$(eval $(call gb_SrsTarget_set_include,svx/ofa,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(SRCDIR)/svx/inc/ \
+))
-SLOFILES=\
- $(SLO)$/eventhandler.obj
+$(eval $(call gb_SrsTarget_add_files,svx/ofa,\
+ svx/source/src/errtxt.src \
+ svx/source/src/app.src \
+))
-.INCLUDE : target.mk
diff --git a/svx/prj/target_res_svx.mk b/svx/AllLangResTarget_svx.mk
index 67d3cfab1cc1..182833cd86e8 100644
--- a/svx/prj/target_res_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -14,12 +14,12 @@
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
+# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
@@ -28,7 +28,6 @@
$(eval $(call gb_AllLangResTarget_AllLangResTarget,svx))
$(eval $(call gb_AllLangResTarget_set_reslocation,svx,svx))
-#$(eval $(call gb_AllLangResTarget_set_reslocation,svx,svx/source/svdraw))
$(eval $(call gb_AllLangResTarget_add_srs,svx,\
svx/res \
@@ -40,73 +39,98 @@ $(eval $(call gb_SrsTarget_set_include,svx/res,\
$$(INCLUDE) \
-I$(OUTDIR)/inc \
-I$(WORKDIR)/inc \
+ -I$(WORKDIR)/inc/svx \
-I$(SRCDIR)/svx/source/inc \
-I$(SRCDIR)/svx/source/dialog \
-I$(SRCDIR)/svx/inc/ \
- -I$(SRCDIR)/svx/unxlngi6.pro/inc/ \
))
-#svx/source/src/errtxt.src
-#svx/source/src/app.src
-
-#svx/source/intro/iso.src
-#svx/source/intro/ooo.src
-
-#svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src
-#svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
-
$(eval $(call gb_SrsTarget_add_files,svx/res,\
- svx/source/stbctrls/stbctrls.src \
- svx/source/dialog/passwd.src \
- svx/source/dialog/language.src \
+ svx/source/accessibility/accessibility.src \
svx/source/dialog/bmpmask.src \
- svx/source/dialog/ucsubset.src \
+ svx/source/dialog/contdlg.src \
+ svx/source/dialog/ctredlin.src \
+ svx/source/dialog/dlgctrl.src \
+ svx/source/dialog/docrecovery.src \
+ svx/source/dialog/fontwork.src \
+ svx/source/dialog/frmsel.src \
svx/source/dialog/hdft.src \
+ svx/source/dialog/hyprlink.src \
svx/source/dialog/imapdlg.src \
- svx/source/dialog/swframeposstrings.src \
+ svx/source/dialog/langbox.src \
+ svx/source/dialog/language.src \
+ svx/source/dialog/optgrid.src \
+ svx/source/dialog/passwd.src \
svx/source/dialog/prtqry.src \
- svx/source/dialog/txenctab.src \
- svx/source/dialog/dlgctrl.src \
- svx/source/dialog/frmsel.src \
- svx/source/dialog/ctredlin.src \
- svx/source/dialog/sdstring.src \
+ svx/source/dialog/rubydialog.src \
svx/source/dialog/ruler.src \
+ svx/source/dialog/sdstring.src \
svx/source/dialog/srchdlg.src \
- svx/source/dialog/optgrid.src \
- svx/source/dialog/langbox.src \
- svx/source/dialog/contdlg.src \
- svx/source/dialog/rubydialog.src \
- svx/source/dialog/fontwork.src \
- svx/source/dialog/docrecovery.src \
- svx/source/dialog/hyprlink.src \
svx/source/dialog/svxbmpnumvalueset.src \
- svx/source/engine3d/string3d.src \
+ svx/source/dialog/swframeposstrings.src \
+ svx/source/dialog/txenctab.src \
+ svx/source/dialog/ucsubset.src \
svx/source/engine3d/float3d.src \
+ svx/source/engine3d/string3d.src \
+ svx/source/fmcomp/gridctrl.src \
+ svx/source/form/datanavi.src \
+ svx/source/form/filtnav.src \
+ svx/source/form/fmexpl.src \
+ svx/source/form/fmstring.src \
+ svx/source/form/formshell.src \
+ svx/source/items/svxerr.src \
+ svx/source/items/svxitems.src \
svx/source/mnuctrls/mnuctrls.src \
- svx/source/tbxctrls/linectrl.src \
+ svx/source/stbctrls/stbctrls.src \
+ svx/source/svdraw/svdstr.src \
+ svx/source/table/table.src \
svx/source/tbxctrls/colrctrl.src \
svx/source/tbxctrls/extrusioncontrols.src \
- svx/source/tbxctrls/tbxdraw.src \
+ svx/source/tbxctrls/fontworkgallery.src \
svx/source/tbxctrls/grafctrl.src \
svx/source/tbxctrls/lboxctrl.src \
+ svx/source/tbxctrls/linectrl.src \
svx/source/tbxctrls/tbcontrl.src \
- svx/source/tbxctrls/fontworkgallery.src \
- svx/source/fmcomp/gridctrl.src \
- svx/source/form/fmexpl.src \
- svx/source/form/formshell.src \
- svx/source/form/fmstring.src \
- svx/source/form/datanavi.src \
- svx/source/form/filtnav.src \
- svx/source/unodraw/unodraw.src \
- svx/source/table/table.src \
+ svx/source/tbxctrls/tbunosearchcontrollers.src \
svx/source/toolbars/extrusionbar.src \
svx/source/toolbars/fontworkbar.src \
- svx/source/gallery2/galtheme.src \
- svx/source/gallery2/gallery.src \
- svx/source/svdraw/svdstr.src \
- svx/source/accessibility/accessibility.src \
- svx/source/items/svxitems.src \
- svx/source/items/svxerr.src \
+ svx/source/unodraw/unodraw.src \
))
+$(call gb_SrsPartTarget_get_target,svx/source/fmcomp/gridctrl.src) : $(WORKDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsPartTarget_get_target,svx/source/form/fmexpl.src) : $(WORKDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsPartTarget_get_target,svx/source/form/datanavi.src) : $(WORKDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsPartTarget_get_target,svx/source/form/formshell.src) : $(WORKDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTarget_get_clean_target,svx/res) : $(WORKDIR)/inc/svx/globlmn.hrc_clean
+
+# hack !!!
+# just a temporary - globlmn.hrc about to be removed!
+ifeq ($(WITH_LANG),)
+$(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc
+ echo copying $@
+ -mkdir -p $(WORKDIR)/inc/svx
+ cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(WORKDIR)/inc/svx/globlmn.hrc
+ rm -f $(WORKDIR)/inc/svx/lastrun.mk
+else
+-include $(WORKDIR)/inc/svx/lastrun.mk
+ifneq ($(gb_lastrun_globlmn),MERGED)
+.PHONY : $(WORKDIR)/inc/svx/globlmn.hrc
+endif
+$(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf
+ echo merging $@
+ -mkdir -p $(WORKDIR)/inc/svx
+ rm -f $(WORKDIR)/inc/svx/lastrun.mk
+ echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk
+ $(call gb_Helper_abbreviate_dirs_native, \
+ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+ -p svx \
+ -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all)
+endif
+
+.PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean
+$(WORKDIR)/inc/svx/globlmn.hrc_clean :
+ rm -f $(WORKDIR)/inc/svx/lastrun.mk \
+ $(WORKDIR)/inc/svx/globlmn.hrc
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/sdi/makefile.mk b/svx/AllLangResTarget_textconversiondlgs.mk
index be41593be71a..d30ccd40641b 100644
--- a/svx/sdi/makefile.mk
+++ b/svx/AllLangResTarget_textconversiondlgs.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -25,33 +25,23 @@
#
#*************************************************************************
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,textconversiondlgs))
-PRJ=..
+$(eval $(call gb_AllLangResTarget_set_reslocation,textconversiondlgs,svx))
-PRJNAME=svx
-TARGET=svxslots
+$(eval $(call gb_AllLangResTarget_add_srs,textconversiondlgs,\
+ svx/textconversiondlgs \
+))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_SrsTarget_SrsTarget,svx/textconversiondlgs))
-.INCLUDE : settings.mk
+$(eval $(call gb_SrsTarget_set_include,svx/textconversiondlgs,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(SRCDIR)/svx/inc/ \
+))
-.IF "$(L10N_framework)"==""
-
-SDI1NAME=$(TARGET)
-SDI1EXPORT=svx
-
-# --- Files --------------------------------------------------------
-
-SVSDI1DEPEND= \
- $(SOLARINCXDIR)$/sfx2/sfx.sdi \
- $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
- svxitems.sdi \
- fmslots.sdi \
- svx.sdi \
- xoitems.sdi \
- svxitems.sdi
-
-# --- Targets -------------------------------------------------------
-.ENDIF
-.INCLUDE : target.mk
+$(eval $(call gb_SrsTarget_add_files,svx/textconversiondlgs,\
+ svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src \
+))
diff --git a/svx/source/fmcomp/makefile.mk b/svx/JunitTest_svx_unoapi.mk
index aa4e9eaba186..d6597f85e8e7 100644..100755
--- a/svx/source/fmcomp/makefile.mk
+++ b/svx/JunitTest_svx_unoapi.mk
@@ -1,8 +1,8 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -25,39 +25,29 @@
#
#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=svx
-TARGET=fmcomp
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
+$(eval $(call gb_JunitTest_JunitTest,svx_unoapi))
-SRS1NAME=fmcomp
-SRC1FILES= \
- gridctrl.src
+$(eval $(call gb_JunitTest_set_defs,svx_unoapi,\
+ $$(DEFS) \
+ -Dorg.openoffice.test.arg.sce=$(SRCDIR)/svx/qa/unoapi/svx.sce \
+ -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/svx/qa/unoapi/knownissues.xcl \
+ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svx/qa/unoapi/testdocuments \
+))
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
- $(SLO)$/dbaexchange.obj \
- $(SLO)$/gridcols.obj \
- $(SLO)$/gridctrl.obj \
- $(SLO)$/gridcell.obj \
- $(SLO)$/fmgridcl.obj \
- $(SLO)$/fmgridif.obj \
- $(SLO)$/trace.obj \
- $(SLO)$/xmlexchg.obj
+$(eval $(call gb_JunitTest_add_jars,svx_unoapi,\
+ $(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/test.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+))
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
- $(SLO)$/dbaobjectex.obj
+$(eval $(call gb_JunitTest_add_sourcefiles,svx_unoapi,\
+ svx/qa/unoapi/Test \
+))
-.INCLUDE : target.mk
+$(eval $(call gb_JunitTest_add_classes,svx_unoapi,\
+ org.openoffice.svx.qa.unoapi.Test \
+))
+# vim: set noet sw=4 ts=4:
diff --git a/svx/prj/target_lib_svx.mk b/svx/Library_svx.mk
index 6810f7f30fed..97cde827eb56 100644
--- a/svx/prj/target_lib_svx.mk
+++ b/svx/Library_svx.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -14,12 +14,12 @@
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
+# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
@@ -27,20 +27,20 @@
$(eval $(call gb_Library_Library,svx))
+$(eval $(call gb_Library_set_componentfile,svx,svx/util/svx))
+
$(eval $(call gb_Library_set_include,svx,\
- $$(SOLARINC) \
- -I$(WORKDIR)/inc/svx/ \
-I$(SRCDIR)/svx/inc \
-I$(SRCDIR)/svx/source/inc \
-I$(SRCDIR)/svx/inc/pch \
+ $$(SOLARINC) \
-I$(OUTDIR)/inc/offuh \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_set_defs,svx,\
$$(DEFS) \
- -DACCESSIBLE_LAYOUT \
-DSVX_DLLIMPLEMENTATION \
+ -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
$(eval $(call gb_Library_add_linked_libs,svx,\
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
sal \
sfx \
sot \
+ stl \
svl \
svt \
svxcore \
@@ -67,162 +68,150 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
vos3 \
xo \
xcr \
- stl \
+ $(gb_StdLibs) \
))
-# svx/source/unodialogs/textconversiondlgs/services \
-# svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog \
-# svx/source/unodialogs/textconversiondlgs/chinese_translationdialog \
-# svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog \
-# svx/source/unodialogs/textconversiondlgs/resid \
-
-
$(eval $(call gb_Library_add_exception_objects,svx,\
- svx/source/unodraw/recoveryui \
- svx/source/unodraw/unoshcol \
- svx/source/unodraw/unoctabl \
- svx/source/unodraw/unopool \
- svx/source/unodraw/UnoNamespaceMap \
- svx/source/tbxctrls/layctrl \
- svx/source/tbxctrls/tbxcolor \
- svx/source/tbxctrls/formatpaintbrushctrl \
- svx/source/tbxctrls/colrctrl \
- svx/source/tbxctrls/itemwin \
- svx/source/tbxctrls/tbxalign \
- svx/source/tbxctrls/fillctrl \
- svx/source/tbxctrls/tbunocontroller \
- svx/source/tbxctrls/subtoolboxcontrol \
- svx/source/tbxctrls/grafctrl \
- svx/source/tbxctrls/linectrl \
- svx/source/tbxctrls/tbxdrctl \
- svx/source/tbxctrls/verttexttbxctrl \
- svx/source/tbxctrls/lboxctrl \
- svx/source/table/tablertfexporter \
- svx/source/table/tablertfimporter \
- svx/source/table/accessiblecell \
- svx/source/table/accessibletableshape \
- svx/source/table/tabledesign \
- svx/source/table/celleditsource \
- svx/source/svdraw/svdoimp \
- svx/source/svdraw/svdscrol \
- svx/source/svdraw/ActionDescriptionProvider \
- svx/source/svdraw/impgrfll \
- svx/source/items/SmartTagItem \
- svx/source/items/svxempty \
- svx/source/items/viewlayoutitem \
- svx/source/items/zoomslideritem \
- svx/source/items/hlnkitem \
- svx/source/items/numfmtsh \
- svx/source/items/algitem \
- svx/source/items/zoomitem \
- svx/source/items/ofaitem \
- svx/source/items/pageitem \
- svx/source/items/numinf \
- svx/source/items/postattr \
- svx/source/items/rotmodit \
- svx/source/items/svxerr \
- svx/source/form/databaselocationinput \
- svx/source/form/fmsrcimp \
- svx/source/form/filtnav \
- svx/source/form/tabwin \
- svx/source/form/fmsrccfg \
- svx/source/form/fmobjfac \
- svx/source/form/tbxform \
- svx/source/form/fmPropBrw \
- svx/source/form/dbcharsethelper \
- svx/source/stbctrls/pszctrl \
- svx/source/stbctrls/insctrl \
- svx/source/stbctrls/selctrl \
- svx/source/stbctrls/xmlsecctrl \
- svx/source/stbctrls/modctrl \
- svx/source/stbctrls/zoomsliderctrl \
- svx/source/stbctrls/zoomctrl \
- svx/source/gengal/gengal \
- svx/source/unogallery/unogaltheme \
- svx/source/unogallery/unogalitem \
- svx/source/unogallery/unogalthemeprovider \
- svx/source/mnuctrls/SmartTagCtl \
- svx/source/mnuctrls/fntctl \
- svx/source/mnuctrls/clipboardctl \
- svx/source/mnuctrls/fntszctl \
- svx/source/fmcomp/dbaobjectex \
- svx/source/smarttags/SmartTagMgr \
+ svx/source/accessibility/AccessibleControlShape \
+ svx/source/accessibility/AccessibleEmptyEditSource \
+ svx/source/accessibility/AccessibleFrameSelector \
+ svx/source/accessibility/AccessibleGraphicShape \
svx/source/accessibility/AccessibleOLEShape \
- svx/source/accessibility/AccessibleShapeTreeInfo \
- svx/source/accessibility/DGColorNameLookUp \
- svx/source/accessibility/charmapacc \
svx/source/accessibility/AccessibleShape \
+ svx/source/accessibility/AccessibleShapeInfo \
+ svx/source/accessibility/AccessibleShapeTreeInfo \
+ svx/source/accessibility/AccessibleTextEventQueue \
svx/source/accessibility/AccessibleTextHelper \
- svx/source/accessibility/svxrectctaccessiblecontext \
- svx/source/accessibility/AccessibleGraphicShape \
- svx/source/accessibility/AccessibleEmptyEditSource \
+ svx/source/accessibility/charmapacc \
+ svx/source/accessibility/ChildrenManager \
svx/source/accessibility/ChildrenManagerImpl \
- svx/source/accessibility/AccessibleShapeInfo \
svx/source/accessibility/DescriptionGenerator \
+ svx/source/accessibility/DGColorNameLookUp \
+ svx/source/accessibility/GraphCtlAccessibleContext \
svx/source/accessibility/ShapeTypeHandler \
- svx/source/accessibility/ChildrenManager \
- svx/source/accessibility/AccessibleControlShape \
- svx/source/accessibility/AccessibleTextEventQueue \
- svx/source/accessibility/AccessibleFrameSelector \
+ svx/source/accessibility/svxrectctaccessiblecontext \
svx/source/accessibility/SvxShapeTypes \
- svx/source/accessibility/GraphCtlAccessibleContext \
+ svx/source/customshapes/EnhancedCustomShape3d \
+ svx/source/customshapes/EnhancedCustomShapeEngine \
+ svx/source/customshapes/EnhancedCustomShapeFontWork \
+ svx/source/customshapes/EnhancedCustomShapeHandle \
svx/source/customshapes/tbxcustomshapes \
- svx/source/engine3d/float3d \
- svx/source/engine3d/volume3d \
- svx/source/engine3d/viewpt3d \
- svx/source/dialog/srchdlg \
- svx/source/dialog/rubydialog \
- svx/source/dialog/srchctrl \
- svx/source/dialog/paraprev \
- svx/source/dialog/fontwork \
- svx/source/dialog/framelinkarray \
- svx/source/dialog/svxbmpnumvalueset \
- svx/source/dialog/hyperdlg \
- svx/source/dialog/wrapfield \
- svx/source/dialog/svxruler \
- svx/source/dialog/ctredlin \
- svx/source/dialog/rulritem \
- svx/source/dialog/dialcontrol \
- svx/source/dialog/databaseregistrationui \
- svx/source/dialog/txencbox \
+ svx/source/dialog/_bmpmask \
svx/source/dialog/charmap \
- svx/source/dialog/passwd \
- svx/source/dialog/dlgctrl \
- svx/source/dialog/hdft \
- svx/source/dialog/frmdirlbox \
- svx/source/dialog/fntctrl \
- svx/source/dialog/docrecovery \
- svx/source/dialog/checklbx \
- svx/source/dialog/swframeposstrings \
- svx/source/dialog/svxgrahicitem \
- svx/source/dialog/relfld \
- svx/source/dialog/SpellDialogChildWindow \
- svx/source/dialog/strarray \
- svx/source/dialog/prtqry \
svx/source/dialog/connctrl \
+ svx/source/dialog/_contdlg \
svx/source/dialog/contwnd \
- svx/source/dialog/pfiledlg \
+ svx/source/dialog/ctredlin \
+ svx/source/dialog/databaseregistrationui \
+ svx/source/dialog/dialcontrol \
svx/source/dialog/dlgctl3d \
- svx/source/dialog/hyprlink \
- svx/source/dialog/grfflt \
- svx/source/dialog/measctrl \
- svx/source/dialog/orienthelper \
+ svx/source/dialog/dlgctrl \
+ svx/source/dialog/docrecovery \
+ svx/source/dialog/fntctrl \
+ svx/source/dialog/fontlb \
+ svx/source/dialog/fontwork \
+ svx/source/dialog/framelinkarray \
+ svx/source/dialog/frmdirlbox \
svx/source/dialog/frmsel \
- svx/source/dialog/swframeexample \
- svx/source/dialog/_bmpmask \
svx/source/dialog/graphctl \
- svx/source/dialog/rlrcitem \
- svx/source/dialog/fontlb \
- svx/source/dialog/optgrid \
+ svx/source/dialog/grfflt \
+ svx/source/dialog/hdft \
+ svx/source/dialog/hyperdlg \
+ svx/source/dialog/hyprlink \
+ svx/source/dialog/imapdlg \
svx/source/dialog/imapwnd \
+ svx/source/dialog/measctrl \
+ svx/source/dialog/optgrid \
+ svx/source/dialog/orienthelper \
svx/source/dialog/pagectrl \
- svx/source/dialog/_contdlg \
+ svx/source/dialog/paraprev \
+ svx/source/dialog/passwd \
+ svx/source/dialog/pfiledlg \
+ svx/source/dialog/prtqry \
+ svx/source/dialog/relfld \
+ svx/source/dialog/rlrcitem \
+ svx/source/dialog/rubydialog \
+ svx/source/dialog/rulritem \
+ svx/source/dialog/SpellDialogChildWindow \
+ svx/source/dialog/srchctrl \
+ svx/source/dialog/srchdlg \
+ svx/source/dialog/strarray \
+ svx/source/dialog/svxbmpnumvalueset \
+ svx/source/dialog/svxgrahicitem \
+ svx/source/dialog/svxruler \
+ svx/source/dialog/swframeexample \
+ svx/source/dialog/swframeposstrings \
+ svx/source/dialog/txencbox \
svx/source/dialog/txenctab \
- svx/source/dialog/imapdlg \
- svx/source/customshapes/EnhancedCustomShape3d \
- svx/source/customshapes/EnhancedCustomShapeHandle \
- svx/source/customshapes/EnhancedCustomShapeEngine \
- svx/source/customshapes/EnhancedCustomShapeFontWork \
+ svx/source/dialog/wrapfield \
+ svx/source/engine3d/float3d \
+ svx/source/fmcomp/dbaobjectex \
+ svx/source/form/databaselocationinput \
+ svx/source/form/dbcharsethelper \
+ svx/source/form/filtnav \
+ svx/source/form/fmobjfac \
+ svx/source/form/fmPropBrw \
+ svx/source/form/fmsrccfg \
+ svx/source/form/fmsrcimp \
+ svx/source/form/tabwin \
+ svx/source/form/tbxform \
+ svx/source/items/algitem \
+ svx/source/items/hlnkitem \
+ svx/source/items/numfmtsh \
+ svx/source/items/numinf \
+ svx/source/items/ofaitem \
+ svx/source/items/pageitem \
+ svx/source/items/postattr \
+ svx/source/items/rotmodit \
+ svx/source/items/SmartTagItem \
+ svx/source/items/svxempty \
+ svx/source/items/svxerr \
+ svx/source/items/viewlayoutitem \
+ svx/source/items/zoomitem \
+ svx/source/items/zoomslideritem \
+ svx/source/mnuctrls/clipboardctl \
+ svx/source/mnuctrls/fntctl \
+ svx/source/mnuctrls/fntszctl \
+ svx/source/mnuctrls/SmartTagCtl \
+ svx/source/stbctrls/pszctrl \
+ svx/source/stbctrls/insctrl \
+ svx/source/stbctrls/selctrl \
+ svx/source/stbctrls/xmlsecctrl \
+ svx/source/stbctrls/modctrl \
+ svx/source/stbctrls/zoomsliderctrl \
+ svx/source/stbctrls/zoomctrl \
+ svx/source/svdraw/ActionDescriptionProvider \
+ svx/source/smarttags/SmartTagMgr \
+ svx/source/svdraw/impgrfll \
+ svx/source/table/accessiblecell \
+ svx/source/table/accessibletableshape \
+ svx/source/table/celleditsource \
+ svx/source/table/tabledesign \
+ svx/source/table/tablertfexporter \
+ svx/source/table/tablertfimporter \
+ svx/source/tbxctrls/colrctrl \
+ svx/source/tbxctrls/fillctrl \
+ svx/source/tbxctrls/formatpaintbrushctrl \
+ svx/source/tbxctrls/grafctrl \
+ svx/source/tbxctrls/itemwin \
+ svx/source/tbxctrls/layctrl \
+ svx/source/tbxctrls/lboxctrl \
+ svx/source/tbxctrls/linectrl \
+ svx/source/tbxctrls/subtoolboxcontrol \
+ svx/source/tbxctrls/tbunocontroller \
+ svx/source/tbxctrls/tbunosearchcontrollers \
+ svx/source/tbxctrls/tbxalign \
+ svx/source/tbxctrls/tbxcolor \
+ svx/source/tbxctrls/tbxdrctl \
+ svx/source/tbxctrls/verttexttbxctrl \
+ svx/source/unodraw/recoveryui \
+ svx/source/unodraw/unoctabl \
+ svx/source/unodraw/UnoNamespaceMap \
+ svx/source/unodraw/unopool \
+ svx/source/unodraw/unoshcol \
+ svx/source/unogallery/unogalitem \
+ svx/source/unogallery/unogaltheme \
+ svx/source/unogallery/unogalthemeprovider \
))
ifeq ($(OS),LINUX)
@@ -238,24 +227,16 @@ else
ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_linked_libs,svx,\
advapi32 \
- kernel32 \
- msvcrt \
oldnames \
- user32 \
- uwinapi \
+))
$(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/dialog/sendreportw32 \
))
-))
else
$(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/dialog/sendreportgen \
))
endif
-
-$(eval $(call gb_Library_add_linked_libs,svx,\
- shell \
-))
endif
# vim: set noet sw=4 ts=4:
diff --git a/svx/prj/target_lib_svxcore.mk b/svx/Library_svxcore.mk
index f337588232fb..6e811cead2a9 100644
--- a/svx/prj/target_lib_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -14,12 +14,12 @@
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
+# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
@@ -27,21 +27,32 @@
$(eval $(call gb_Library_Library,svxcore))
+$(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,svxcore,\
+ svx_inc \
+ svx_sdi \
+))
+
$(eval $(call gb_Library_set_include,svxcore,\
-I$(SRCDIR)/svx/inc \
- -I$(SRCDIR)/svx/source/inc \
-I$(SRCDIR)/svx/inc/pch \
- -I$(WORKDIR)/SdiTarget/svx/sdi \
+ -I$(SRCDIR)/svx/source/inc \
$$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
- -I$(OUTDIR)/inc \
+ -I$(WORKDIR)/SdiTarget/svx/sdi \
))
+#BOOST switch in customshapes
+#dialog:
+#.IF "$(GUI)"=="WNT"
+#CFLAGS+= -DUNICODE -D_UNICODE
+#.ENDIF
+
$(eval $(call gb_Library_set_defs,svxcore,\
$$(DEFS) \
- -DACCESSIBLE_LAYOUT \
-DSVX_DLLIMPLEMENTATION \
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
@@ -62,6 +73,7 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\
sal \
sfx \
sot \
+ stl \
svl \
svt \
tk \
@@ -71,9 +83,110 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\
vcl \
vos3 \
xo \
+ $(gb_StdLibs) \
))
$(eval $(call gb_Library_add_exception_objects,svxcore,\
+ 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 \
@@ -129,106 +242,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/sdr/contact/viewcontactofsdrmeasureobj \
svx/source/sdr/contact/objectcontactofobjlistpainter \
svx/source/sdr/contact/viewobjectcontactofe3d \
- svx/source/customshapes/EnhancedCustomShapeGeometry \
- svx/source/customshapes/EnhancedCustomShapeTypeNames \
- svx/source/customshapes/EnhancedCustomShape2d \
- svx/source/customshapes/EnhancedCustomShapeFunctionParser \
- svx/source/dialog/dialmgr \
- svx/source/dialog/dlgutil \
- svx/source/dialog/framelink \
- svx/source/dialog/langbox \
- svx/source/dialog/simptabl \
- svx/source/dialog/svxdlg \
- svx/source/dialog/stddlg \
- svx/source/engine3d/deflt3d \
- svx/source/engine3d/polysc3d \
- svx/source/engine3d/sphere3d \
- svx/source/engine3d/helperminimaldepth3d \
- svx/source/engine3d/obj3d \
- svx/source/engine3d/dragmt3d \
- svx/source/engine3d/scene3d \
- svx/source/engine3d/view3d \
- svx/source/engine3d/e3dsceneupdater \
- svx/source/engine3d/viewpt3d2 \
- svx/source/engine3d/svx3ditems \
- svx/source/engine3d/camera3d \
- svx/source/engine3d/e3dundo \
- svx/source/engine3d/objfac3d \
- svx/source/engine3d/lathe3d \
- svx/source/engine3d/polygn3d \
- svx/source/engine3d/view3d1 \
- svx/source/engine3d/cube3d \
- svx/source/engine3d/helperhittest3d \
- svx/source/engine3d/extrud3d \
svx/source/sdr/event/eventhandler \
- svx/source/fmcomp/gridctrl \
- svx/source/fmcomp/xmlexchg \
- svx/source/fmcomp/trace \
- svx/source/fmcomp/fmgridcl \
- svx/source/fmcomp/gridcell \
- svx/source/fmcomp/dbaexchange \
- svx/source/fmcomp/gridcols \
- svx/source/fmcomp/fmgridif \
- svx/source/form/formfeaturedispatcher \
- svx/source/form/typeconversionclient \
- svx/source/form/fmpgeimp \
- svx/source/form/fmcontrolbordermanager \
- svx/source/form/fmshell \
- svx/source/form/fmundo \
- svx/source/form/ParseContext \
- svx/source/form/fmexpl \
- svx/source/form/fmtools \
- svx/source/form/fmexch \
- svx/source/form/formcontroller \
- svx/source/form/dataaccessdescriptor \
- svx/source/form/fmtextcontrolshell \
- svx/source/form/datalistener \
- svx/source/form/formcontrolfactory \
- svx/source/form/sdbdatacolumn \
- svx/source/form/fmview \
- svx/source/form/delayedevent \
- svx/source/form/fmservs \
- svx/source/form/fmobj \
- svx/source/form/fmdocumentclassification \
- svx/source/form/sqlparserclient \
- svx/source/form/fmshimp \
- svx/source/form/typemap \
- svx/source/form/fmscriptingenv \
- svx/source/form/dbtoolsclient \
- svx/source/form/fmpage \
- svx/source/form/stringlistresource \
- svx/source/form/fmmodel \
- svx/source/form/formtoolbars \
- svx/source/form/fmdpage \
- svx/source/form/fmitems \
- svx/source/form/navigatortreemodel \
- svx/source/form/fmvwimp \
- svx/source/form/fmtextcontrolfeature \
- svx/source/form/fmdmod \
- svx/source/form/fmcontrollayout \
- svx/source/form/fmtextcontroldialogs \
- svx/source/form/formdispatchinterceptor \
- svx/source/form/formcontrolling \
- svx/source/form/navigatortree \
- svx/source/form/datanavi \
- svx/source/form/legacyformcontroller \
- svx/source/form/xfm_addcondition \
- svx/source/gallery2/galexpl \
- svx/source/gallery2/galtheme \
- svx/source/gallery2/galctrl \
- svx/source/gallery2/gallery1 \
- svx/source/gallery2/galmisc \
- svx/source/gallery2/galobj \
- svx/source/gallery2/galbrws2 \
- svx/source/gallery2/galbrws \
- svx/source/gallery2/galbrws1 \
- svx/source/gallery2/codec \
- svx/source/items/drawitem \
- svx/source/items/chrtitem \
- svx/source/items/e3ditem \
- svx/source/items/grfitem \
- svx/source/items/clipfmtitem \
- svx/source/items/customshapeitem \
svx/source/sdr/overlay/overlayline \
svx/source/sdr/overlay/overlaycrosshair \
svx/source/sdr/overlay/overlayrollingrectangle \
@@ -284,162 +298,166 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/sdr/properties/connectorproperties \
svx/source/sdr/properties/e3dcompoundproperties \
svx/source/sdr/properties/oleproperties \
- svx/source/svdraw/svdglev \
- svx/source/svdraw/svdhdl \
- svx/source/svdraw/svdomedia \
- svx/source/svdraw/svdedxv \
- svx/source/svdraw/svdoedge \
- svx/source/svdraw/svdundo \
- svx/source/svdraw/svdmrkv1 \
- svx/source/svdraw/svdotxfl \
+ svx/source/svdraw/clonelist \
+ svx/source/svdraw/gradtrns \
+ svx/source/svdraw/polypolygoneditor \
svx/source/svdraw/sdrcomment \
- svx/source/svdraw/svdcrtv \
- svx/source/svdraw/svdouno \
- svx/source/svdraw/svditer \
- svx/source/svdraw/svdotxln \
- svx/source/svdraw/svdxcgv \
- svx/source/svdraw/svdomeas \
- svx/source/svdraw/svdpntv \
+ 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/svdotxdr \
- svx/source/svdraw/svdtext \
- svx/source/svdraw/svdedtv2 \
+ svx/source/svdraw/svdcrtv \
svx/source/svdraw/svddrag \
- svx/source/svdraw/svdopage \
svx/source/svdraw/svddrgmt \
- svx/source/svdraw/svdogrp \
- svx/source/svdraw/svdovirt \
svx/source/svdraw/svddrgv \
- svx/source/svdraw/sdrpaintwindow \
- svx/source/svdraw/polypolygoneditor \
- svx/source/svdraw/svdpoev \
- svx/source/svdraw/svdotextpathdecomposition \
- svx/source/svdraw/svdmrkv \
- svx/source/svdraw/svdview \
- svx/source/svdraw/svdoashp \
- svx/source/svdraw/svdoutlinercache \
+ svx/source/svdraw/svdedtv \
+ svx/source/svdraw/svdedtv1 \
+ svx/source/svdraw/svdedtv2 \
+ svx/source/svdraw/svdedxv \
svx/source/svdraw/svdetc \
- svx/source/svdraw/svdlayer \
svx/source/svdraw/svdfmtf \
- svx/source/svdraw/gradtrns \
- svx/source/svdraw/svdotxed \
+ svx/source/svdraw/svdglev \
+ svx/source/svdraw/svdglue \
+ svx/source/svdraw/svdhdl \
svx/source/svdraw/svdhlpln \
- svx/source/svdraw/svdedtv \
+ svx/source/svdraw/svdibrow \
+ svx/source/svdraw/svditer \
+ svx/source/svdraw/svdlayer \
+ svx/source/svdraw/svdmark \
svx/source/svdraw/svdmodel \
- svx/source/svdraw/svdopath \
- svx/source/svdraw/svdtrans \
- svx/source/svdraw/svdpagv \
- svx/source/svdraw/svdorect \
- svx/source/svdraw/svdedtv1 \
- svx/source/svdraw/svdograf \
- svx/source/svdraw/sdrhittesthelper \
- svx/source/svdraw/svdglue \
- svx/source/svdraw/svdobj \
- svx/source/svdraw/svdsnpv \
- svx/source/svdraw/svdotext \
+ svx/source/svdraw/svdmrkv \
+ svx/source/svdraw/svdmrkv1 \
+ svx/source/svdraw/svdoashp \
svx/source/svdraw/svdoattr \
- svx/source/svdraw/svdviter \
- svx/source/svdraw/svdpage \
- svx/source/svdraw/svdoole2 \
- svx/source/svdraw/svdibrow \
- svx/source/svdraw/sdrmasterpagedescriptor \
+ svx/source/svdraw/svdobj \
svx/source/svdraw/svdocapt \
- svx/source/svdraw/svdmark \
svx/source/svdraw/svdocirc \
- svx/source/svdraw/selectioncontroller \
- svx/source/svdraw/clonelist \
+ 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/sdrpagewindow \
- svx/source/svdraw/svdotxat \
- svx/source/svdraw/svdotextdecomposition \
- svx/source/table/tablecontroller \
- svx/source/table/tablerow \
- svx/source/table/tablelayouter \
- svx/source/table/tablecolumn \
- svx/source/table/tablemodel \
- svx/source/table/svdotable \
+ 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/viewcontactoftableobj \
- svx/source/table/cellrange \
- svx/source/table/tableundo \
- svx/source/table/tablerows \
+ svx/source/table/tablecontroller \
svx/source/table/tablehandles \
- svx/source/table/cell \
- svx/source/tbxctrls/fontworkgallery \
+ 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/toolbarmenu \
svx/source/tbxctrls/tbxcolorupdate \
- svx/source/toolbars/fontworkbar \
svx/source/toolbars/extrusionbar \
- svx/source/unodraw/unoshap4 \
- svx/source/unodraw/unomlstr \
- svx/source/unodraw/unoshtxt \
+ svx/source/toolbars/fontworkbar \
svx/source/unodraw/gluepts \
svx/source/unodraw/shapepropertynotifier \
svx/source/unodraw/tableshape \
- svx/source/unodraw/unohtabl \
- svx/source/unodraw/unoshape \
- svx/source/unodraw/UnoGraphicExporter \
svx/source/unodraw/unobtabl \
- svx/source/unodraw/XPropertyTable \
- svx/source/unodraw/unoshap3 \
- svx/source/unodraw/unottabl \
- svx/source/unodraw/UnoNameItemTable \
+ 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/unomtabl \
svx/source/unodraw/unoshap2 \
- svx/source/unodraw/unodtabl \
+ 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/xmlxtimp \
svx/source/xml/xmlxtexp \
- svx/source/xml/xmleohlp \
- svx/source/xoutdev/xtablend \
+ svx/source/xml/xmlxtimp \
svx/source/xoutdev/xattr \
- svx/source/xoutdev/xtabgrdt \
- svx/source/xoutdev/xtabhtch \
- svx/source/xoutdev/_xoutbmp \
- svx/source/xoutdev/xtabdash \
- svx/source/xoutdev/xtabbtmp \
- svx/source/xoutdev/xexch \
- svx/source/xoutdev/xtabcolr \
svx/source/xoutdev/xattr2 \
- svx/source/xoutdev/xtable \
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 \
))
+#.IF ("$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC") || "$(OS)"=="MACOSX" || ("$(OS)"=="LINUX" && "$(CPU)"=="P")
+#NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj
+#.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,svxcore,\
+ svx/source/customshapes/EnhancedCustomShapeFunctionParser \
+))
+else
+$(eval $(call gb_Library_add_cxxobjects,svxcore,\
+ svx/source/customshapes/EnhancedCustomShapeFunctionParser \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+endif
+
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_linked_libs,svxcore,\
dl \
m \
pthread \
- stl \
-))
-endif
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,svxcore,\
- advapi32 \
- kernel32 \
- msvcrt \
- oldnames \
- user32 \
- uwinapi \
))
endif
$(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx))
-
$(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\
$$(INCLUDE) \
-I$(SRCDIR)/svx/inc \
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
new file mode 100644
index 000000000000..2e0880aced18
--- /dev/null
+++ b/svx/Library_textconversiondlgs.mk
@@ -0,0 +1,75 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,textconversiondlgs))
+
+$(eval $(call gb_Library_set_componentfile,textconversiondlgs,svx/util/textconversiondlgs))
+
+$(eval $(call gb_Library_set_include,textconversiondlgs,\
+ -I$(SRCDIR)/svx/inc \
+ -I$(SRCDIR)/svx/inc/pch \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,textconversiondlgs,\
+ $$(DEFS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ sal \
+ svl \
+ svt \
+ stl \
+ tk \
+ tl \
+ utl \
+ vcl \
+ $(gb_StdLibs) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\
+ svx/source/unodialogs/textconversiondlgs/services \
+ svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog \
+ svx/source/unodialogs/textconversiondlgs/chinese_translationdialog \
+ svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog \
+ svx/source/unodialogs/textconversiondlgs/resid \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
+ dl \
+ m \
+ pthread \
+ stl \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/Makefile b/svx/Makefile
index 963c7870d955..90947b2e5f48 100644
--- a/svx/Makefile
+++ b/svx/Makefile
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -25,12 +25,14 @@
#
#*************************************************************************
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
GBUILDDIR := $(SOLARENV)/gbuild
include $(GBUILDDIR)/gbuild.mk
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))
-
-$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE)))
-
-
+# vim: set noet sw=4 ts=4:
diff --git a/svx/source/core/makefile.mk b/svx/Module_svx.mk
index da874894bae6..d9288ea9e6b1 100644
--- a/svx/source/core/makefile.mk
+++ b/svx/Module_svx.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -25,23 +25,28 @@
#
#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=svx
-TARGET=core
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/coreservices.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
+$(eval $(call gb_Module_Module,svx))
+
+$(eval $(call gb_Module_add_targets,svx,\
+ Library_svx \
+ Library_svxcore \
+ Library_textconversiondlgs \
+ AllLangResTarget_svx \
+ AllLangResTarget_ofa \
+ AllLangResTarget_gal \
+ AllLangResTarget_about \
+ AllLangResTarget_textconversiondlgs \
+ Package_inc \
+ Package_sdi \
+))
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
+ JunitTest_svx_unoapi \
+))
+
+#todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX
+#todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes ?
+#todo: -DUNICODE and -D_UNICODE on WNT for source/dialog
+#todo: globlmn.hrc
+#todo: component file
+# vim: set noet ts=4 sw=4:
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
new file mode 100644
index 000000000000..81066e9c7bff
--- /dev/null
+++ b/svx/Package_inc.mk
@@ -0,0 +1,560 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,svx_inc,$(SRCDIR)/svx/inc))
+
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsoitm.hxx,svx/sxsoitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdshtitm.hxx,svx/sdshtitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/polysc3d.hxx,svx/polysc3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dataaccessdescriptor.hxx,svx/dataaccessdescriptor.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoashp.hxx,svx/svdoashp.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbaobjectex.hxx,svx/dbaobjectex.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeTypeNames.hxx,svx/EnhancedCustomShapeTypeNames.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftdiit.hxx,svx/xftdiit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntctl.hxx,svx/fntctl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdattr.hxx,svx/svdattr.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/imapdlg.hxx,svx/imapdlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/formatpaintbrushctrl.hxx,svx/formatpaintbrushctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xcolit.hxx,svx/xcolit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftmrit.hxx,svx/xftmrit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxcommands.h,svx/svxcommands.h))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdview.hxx,svx/svdview.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxraitm.hxx,svx/sxraitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxroaitm.hxx,svx/sxroaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleTableShape.hxx,svx/AccessibleTableShape.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmsxy.hxx,svx/xflbmsxy.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dlgctl3d.hxx,svx/dlgctl3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaiitm.hxx,svx/sdtaiitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xtextit.hxx,svx/xtextit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeFunctionParser.hxx,svx/EnhancedCustomShapeFunctionParser.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ucsubset.hxx,svx/ucsubset.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sderitm.hxx,svx/sderitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/obj3d.hxx,svx/obj3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbcharsethelper.hxx,svx/dbcharsethelper.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdangitm.hxx,svx/sdangitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/grfcrop.hxx,svx/grfcrop.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxtraitm.hxx,svx/sxtraitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/orienthelper.hxx,svx/orienthelper.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxonitm.hxx,svx/sxonitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmpit.hxx,svx/xflbmpit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlineit.hxx,svx/xlineit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SmartTagItem.hxx,svx/SmartTagItem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xpoly.hxx,svx/xpoly.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ParseContext.hxx,svx/ParseContext.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numinf.hxx,svx/numinf.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/objfac3d.hxx,svx/objfac3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxcolorupdate.hxx,svx/tbxcolorupdate.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdhdl.hxx,svx/svdhdl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdedxv.hxx,svx/svdedxv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SmartTagMgr.hxx,svx/SmartTagMgr.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/shapeproperty.hxx,svx/shapeproperty.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galtheme.hxx,svx/galtheme.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/anchorid.hxx,svx/anchorid.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshprp.hxx,svx/unoshprp.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/viewlayoutitem.hxx,svx/viewlayoutitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmmodel.hxx,svx/fmmodel.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/scene3d.hxx,svx/scene3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmgridif.hxx,svx/fmgridif.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdasitm.hxx,svx/sdasitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrgmt.hxx,svx/svddrgmt.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnasit.hxx,svx/xlnasit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlndsit.hxx,svx/xlndsit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hyprlink.hxx,svx/hyprlink.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/framelinkarray.hxx,svx/framelinkarray.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdetc.hxx,svx/svdetc.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmtit.hxx,svx/xflbmtit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtfsitm.hxx,svx/sdtfsitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/txencbox.hxx,svx/txencbox.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/e3ditem.hxx,svx/e3ditem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xoutbmp.hxx,svx/xoutbmp.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdotable.hxx,svx/svdotable.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshcit.hxx,svx/xftshcit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxlogitm.hxx,svx/sxlogitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxrooitm.hxx,svx/sxrooitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontwork.hxx,svx/fontwork.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcecitm.hxx,svx/sxcecitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdginitm.hxx,svx/sdginitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpntv.hxx,svx/svdpntv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontlb.hxx,svx/fontlb.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xfillit0.hxx,svx/xfillit0.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xsflclit.hxx,svx/xsflclit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrpageuser.hxx,svx/sdrpageuser.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xbtmpit.hxx,svx/xbtmpit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxids.hrc,svx/svxids.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galmisc.hxx,svx/galmisc.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmfsitm.hxx,svx/sxmfsitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/extrusioncolorcontrol.hxx,svx/extrusioncolorcontrol.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmsrccfg.hxx,svx/fmsrccfg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pageitem.hxx,svx/pageitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrpaintwindow.hxx,svx/sdrpaintwindow.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmkitm.hxx,svx/sxmkitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xfillit.hxx,svx/xfillit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflftrit.hxx,svx/xflftrit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxopitm.hxx,svx/sxopitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unofill.hxx,svx/unofill.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/drawitem.hxx,svx/drawitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlgrhlp.hxx,svx/xmlgrhlp.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmresids.hrc,svx/fmresids.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomitem.hxx,svx/zoomitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtcfitm.hxx,svx/sdtcfitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdmetitm.hxx,svx/sdmetitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmtools.hxx,svx/fmtools.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntszctl.hxx,svx/fntszctl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsiitm.hxx,svx/sxsiitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxlayitm.hxx,svx/sxlayitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomid.hxx,svx/unomid.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/frmsel.hxx,svx/frmsel.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/e3dsceneupdater.hxx,svx/e3dsceneupdater.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdcrtv.hxx,svx/svdcrtv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/itemwin.hxx,svx/itemwin.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtfchim.hxx,svx/sdtfchim.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/wrapfield.hxx,svx/wrapfield.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntctrl.hxx,svx/fntctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdxcgv.hxx,svx/svdxcgv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbtoolsclient.hxx,svx/dbtoolsclient.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rotmodit.hxx,svx/rotmodit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/layctrl.hxx,svx/layctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rectenum.hxx,svx/rectenum.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdopath.hxx,svx/svdopath.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshtxt.hxx,svx/unoshtxt.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdopage.hxx,svx/svdopage.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftadit.hxx,svx/xftadit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstcit.hxx,svx/xlnstcit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/splitcelldlg.hxx,svx/splitcelldlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdynitm.hxx,svx/sdynitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rulritem.hxx,svx/rulritem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fillctrl.hxx,svx/fillctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SvxShapeTypes.hxx,svx/SvxShapeTypes.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galctrl.hxx,svx/galctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdmod.hxx,svx/fmdmod.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/exthelpid.hrc,svx/exthelpid.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmsearch.hxx,svx/fmsearch.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pfiledlg.hxx,svx/pfiledlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmovitm.hxx,svx/sxmovitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmsrcimp.hxx,svx/fmsrcimp.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsalitm.hxx,svx/sxsalitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoole2.hxx,svx/svdoole2.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdsnpv.hxx,svx/svdsnpv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/gallery1.hxx,svx/gallery1.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/passwd.hxx,svx/passwd.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xgrscit.hxx,svx/xgrscit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdglev.hxx,svx/svdglev.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontworkbar.hxx,svx/fontworkbar.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeGeometry.hxx,svx/EnhancedCustomShapeGeometry.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxitems.hrc,svx/svxitems.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmpage.hxx,svx/fmpage.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/srchdlg.hxx,svx/srchdlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcaitm.hxx,svx/sxcaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/subtoolboxcontrol.hxx,svx/subtoolboxcontrol.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdasaitm.hxx,svx/sdasaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbexch.hrc,svx/dbexch.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomaster.hxx,svx/unomaster.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdedtv.hxx,svx/svdedtv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlinjoit.hxx,svx/xlinjoit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmbritm.hxx,svx/sxmbritm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleGraphicShape.hxx,svx/AccessibleGraphicShape.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstit.hxx,svx/xlnstit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/volume3d.hxx,svx/volume3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/scheduler.hxx,svx/sdr/animation/scheduler.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/animationstate.hxx,svx/sdr/animation/animationstate.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/objectanimator.hxx,svx/sdr/animation/objectanimator.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayhelpline.hxx,svx/sdr/overlay/overlayhelpline.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayobjectcell.hxx,svx/sdr/overlay/overlayobjectcell.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaymanager.hxx,svx/sdr/overlay/overlaymanager.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx,svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayobjectlist.hxx,svx/sdr/overlay/overlayobjectlist.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayhatchrect.hxx,svx/sdr/overlay/overlayhatchrect.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaytools.hxx,svx/sdr/overlay/overlaytools.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayselection.hxx,svx/sdr/overlay/overlayselection.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaytriangle.hxx,svx/sdr/overlay/overlaytriangle.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaypolypolygon.hxx,svx/sdr/overlay/overlaypolypolygon.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaymanagerbuffered.hxx,svx/sdr/overlay/overlaymanagerbuffered.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayrollingrectangle.hxx,svx/sdr/overlay/overlayrollingrectangle.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayline.hxx,svx/sdr/overlay/overlayline.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaycrosshair.hxx,svx/sdr/overlay/overlaycrosshair.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayobject.hxx,svx/sdr/overlay/overlayobject.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx,svx/sdr/overlay/overlayanimatedbitmapex.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaybitmapex.hxx,svx/sdr/overlay/overlaybitmapex.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/event/eventhandler.hxx,svx/sdr/event/eventhandler.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/itemsettools.hxx,svx/sdr/properties/itemsettools.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/connectorproperties.hxx,svx/sdr/properties/connectorproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dlatheproperties.hxx,svx/sdr/properties/e3dlatheproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/circleproperties.hxx,svx/sdr/properties/circleproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dsphereproperties.hxx,svx/sdr/properties/e3dsphereproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/captionproperties.hxx,svx/sdr/properties/captionproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/customshapeproperties.hxx,svx/sdr/properties/customshapeproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/attributeproperties.hxx,svx/sdr/properties/attributeproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/rectangleproperties.hxx,svx/sdr/properties/rectangleproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/pageproperties.hxx,svx/sdr/properties/pageproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/oleproperties.hxx,svx/sdr/properties/oleproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/textproperties.hxx,svx/sdr/properties/textproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/emptyproperties.hxx,svx/sdr/properties/emptyproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dextrudeproperties.hxx,svx/sdr/properties/e3dextrudeproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/properties.hxx,svx/sdr/properties/properties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/defaultproperties.hxx,svx/sdr/properties/defaultproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dproperties.hxx,svx/sdr/properties/e3dproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/groupproperties.hxx,svx/sdr/properties/groupproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/graphicproperties.hxx,svx/sdr/properties/graphicproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dcompoundproperties.hxx,svx/sdr/properties/e3dcompoundproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dsceneproperties.hxx,svx/sdr/properties/e3dsceneproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/measureproperties.hxx,svx/sdr/properties/measureproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/table/tabledesign.hxx,svx/sdr/table/tabledesign.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/primitiveFactory2d.hxx,svx/sdr/primitive2d/primitiveFactory2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx,svx/sdr/primitive2d/sdrpathprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx,svx/sdr/primitive2d/sdrtextprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrprimitivetools.hxx,svx/sdr/primitive2d/sdrprimitivetools.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx,svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx,svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx,svx/sdr/primitive2d/svx_primitivetypes2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx,svx/sdr/primitive2d/sdrdecompositiontools.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx,svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx,svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx,svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx,svx/sdr/primitive2d/sdrellipseprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx,svx/sdr/primitive2d/sdrole2primitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrattributecreator.hxx,svx/sdr/primitive2d/sdrattributecreator.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx,svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx,svx/sdr/primitive2d/sdrgrafprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx,svx/sdr/primitive3d/sdrattributecreator3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dextrude.hxx,svx/sdr/contact/viewcontactofe3dextrude.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofvirtobj.hxx,svx/sdr/contact/viewcontactofvirtobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dscene.hxx,svx/sdr/contact/viewcontactofe3dscene.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontacttools.hxx,svx/sdr/contact/objectcontacttools.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontact.hxx,svx/sdr/contact/objectcontact.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofpageobj.hxx,svx/sdr/contact/viewcontactofpageobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dcube.hxx,svx/sdr/contact/viewcontactofe3dcube.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx,svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx,svx/sdr/contact/viewobjectcontactofunocontrol.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontactofpageview.hxx,svx/sdr/contact/objectcontactofpageview.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx,svx/sdr/contact/viewcontactofe3dpolygon.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx,svx/sdr/contact/viewobjectcontactofsdrpage.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx,svx/sdr/contact/viewobjectcontactofsdrobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx,svx/sdr/contact/objectcontactofobjlistpainter.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx,svx/sdr/contact/viewobjectcontactofe3dscene.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontact.hxx,svx/sdr/contact/viewcontact.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx,svx/sdr/contact/viewobjectcontactofpageobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx,svx/sdr/contact/viewcontactofsdrcaptionobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx,svx/sdr/contact/viewcontactofsdrcircobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx,svx/sdr/contact/viewcontactofsdrole2obj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactoftextobj.hxx,svx/sdr/contact/viewcontactoftextobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrpage.hxx,svx/sdr/contact/viewcontactofsdrpage.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofunocontrol.hxx,svx/sdr/contact/viewcontactofunocontrol.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx,svx/sdr/contact/viewcontactofsdredgeobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx,svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofe3d.hxx,svx/sdr/contact/viewobjectcontactofe3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dsphere.hxx,svx/sdr/contact/viewcontactofe3dsphere.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx,svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3d.hxx,svx/sdr/contact/viewcontactofe3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontact.hxx,svx/sdr/contact/viewobjectcontact.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx,svx/sdr/contact/viewcontactofsdrpathobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx,svx/sdr/contact/viewcontactofsdrmediaobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx,svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dlathe.hxx,svx/sdr/contact/viewcontactofe3dlathe.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx,svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofgraphic.hxx,svx/sdr/contact/viewcontactofgraphic.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactredirector.hxx,svx/sdr/contact/viewobjectcontactredirector.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx,svx/sdr/contact/viewobjectcontactofgraphic.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofgroup.hxx,svx/sdr/contact/viewcontactofgroup.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/displayinfo.hxx,svx/sdr/contact/displayinfo.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrobj.hxx,svx/sdr/contact/viewcontactofsdrobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx,svx/sdr/contact/viewcontactofsdrmeasureobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx,svx/sdr/contact/viewcontactofsdrrectobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofgroup.hxx,svx/sdr/contact/viewobjectcontactofgroup.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx,svx/sdr/attribute/sdrformtextoutlineattribute.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrformtextattribute.hxx,svx/sdr/attribute/sdrformtextattribute.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx,svx/sdr/attribute/sdrlineshadowtextattribute.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrfilltextattribute.hxx,svx/sdr/attribute/sdrfilltextattribute.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx,svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrshadowtextattribute.hxx,svx/sdr/attribute/sdrshadowtextattribute.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrtextattribute.hxx,svx/sdr/attribute/sdrtextattribute.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dialcontrol.hxx,svx/dialcontrol.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmlhitm.hxx,svx/sxmlhitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/optgenrl.hxx,svx/optgenrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshcol.hxx,svx/unoshcol.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtagitm.hxx,svx/sdtagitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftsfit.hxx,svx/xftsfit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdograf.hxx,svx/svdograf.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/cube3d.hxx,svx/cube3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnwtit.hxx,svx/xlnwtit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoom_def.hxx,svx/zoom_def.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/charmap.hxx,svx/charmap.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/connctrl.hxx,svx/connctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtacitm.hxx,svx/sdtacitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hyperdlg.hxx,svx/hyperdlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxctl.hxx,svx/tbxctl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/f3dchild.hxx,svx/f3dchild.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdogrp.hxx,svx/svdogrp.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/simptabl.hxx,svx/simptabl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxelditm.hxx,svx/sxelditm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomslideritem.hxx,svx/zoomslideritem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshtit.hxx,svx/xftshtit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/float3d.hxx,svx/float3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlntrit.hxx,svx/xlntrit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdmodel.hxx,svx/svdmodel.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdtext.hxx,svx/svdtext.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleTextHelper.hxx,svx/AccessibleTextHelper.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtayitm.hxx,svx/sdtayitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtmfitm.hxx,svx/sdtmfitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomsliderctrl.hxx,svx/zoomsliderctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/polygn3d.hxx,svx/polygn3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdglob.hxx,svx/svdglob.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/graphctl.hxx,svx/graphctl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xpool.hxx,svx/xpool.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/framelink.hxx,svx/framelink.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoprov.hxx,svx/unoprov.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/checklbx.hxx,svx/checklbx.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/selctrl.hxx,svx/selctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdggaitm.hxx,svx/sdggaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbtoxy.hxx,svx/xflbtoxy.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tabline.hxx,svx/tabline.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpool.hxx,svx/svdpool.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/stddlg.hxx,svx/stddlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/databaseregistrationui.hxx,svx/databaseregistrationui.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xdef.hxx,svx/xdef.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/algitem.hxx,svx/algitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxfiitm.hxx,svx/sxfiitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/grfflt.hxx,svx/grfflt.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/databaselocationinput.hxx,svx/databaselocationinput.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmsuitm.hxx,svx/sxmsuitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dialmgr.hxx,svx/dialmgr.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xdash.hxx,svx/xdash.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/grafctrl.hxx,svx/grafctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlineit0.hxx,svx/xlineit0.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xfltrit.hxx,svx/xfltrit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/viewpt3d.hxx,svx/viewpt3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmsli.hxx,svx/xflbmsli.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmoitm.hxx,svx/sxmoitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/htmlmode.hxx,svx/htmlmode.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlsecctrl.hxx,svx/xmlsecctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svx3ditems.hxx,svx/svx3ditems.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/camera3d.hxx,svx/camera3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/measctrl.hxx,svx/measctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdooitm.hxx,svx/sdooitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpage.hxx,svx/svdpage.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdsob.hxx,svx/svdsob.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdshcitm.hxx,svx/sdshcitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaitm.hxx,svx/sdtaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdtrans.hxx,svx/svdtrans.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgtritm.hxx,svx/sdgtritm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxdraw.hxx,svx/tbxdraw.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdprcitm.hxx,svx/sdprcitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomodel.hxx,svx/unomodel.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/IAccessibleViewForwarderListener.hxx,svx/IAccessibleViewForwarderListener.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdlayer.hxx,svx/svdlayer.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflasit.hxx,svx/xflasit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflclit.hxx,svx/xflclit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsaitm.hxx,svx/sxsaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/verttexttbxctrl.hxx,svx/verttexttbxctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/contdlg.hxx,svx/contdlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxerr.hxx,svx/svxerr.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpagv.hxx,svx/svdpagv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdocapt.hxx,svx/svdocapt.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdfield.hxx,svx/svdfield.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/relfld.hxx,svx/relfld.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleShapeInfo.hxx,svx/AccessibleShapeInfo.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numvset.hxx,svx/numvset.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrcomment.hxx,svx/sdrcomment.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/txenctab.hxx,svx/txenctab.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdorect.hxx,svx/svdorect.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshit.hxx,svx/xftshit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pagectrl.hxx,svx/pagectrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxreoitm.hxx,svx/sxreoitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdtypes.hxx,svx/svdtypes.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ucsubset.hrc,svx/ucsubset.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pszctrl.hxx,svx/pszctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdattrx.hxx,svx/svdattrx.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtditm.hxx,svx/sdtditm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/swframevalidation.hxx,svx/swframevalidation.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xgrad.hxx,svx/xgrad.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpoev.hxx,svx/svdpoev.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbckit.hxx,svx/xflbckit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xtextit0.hxx,svx/xtextit0.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxreaitm.hxx,svx/sxreaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/lboxctrl.hxx,svx/lboxctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontworkgallery.hxx,svx/fontworkgallery.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ShapeTypeHandler.hxx,svx/ShapeTypeHandler.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdstr.hrc,svx/svdstr.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svditext.hxx,svx/svditext.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxekitm.hxx,svx/sxekitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxgrahicitem.hxx,svx/svxgrahicitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbstit.hxx,svx/xflbstit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galbrws.hxx,svx/galbrws.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomod.hxx,svx/unomod.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnclit.hxx,svx/xlnclit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/deflt3d.hxx,svx/deflt3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/e3dundo.hxx,svx/e3dundo.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ChildrenManager.hxx,svx/ChildrenManager.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmgridcl.hxx,svx/fmgridcl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdobj.hxx,svx/svdobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtaitm.hxx,svx/sxmtaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/clipboardctl.hxx,svx/clipboardctl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xtable.hxx,svx/xtable.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgcoitm.hxx,svx/sdgcoitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdovirt.hxx,svx/svdovirt.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmshell.hxx,svx/fmshell.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/IAccessibleParent.hxx,svx/IAccessibleParent.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdmark.hxx,svx/svdmark.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/strarray.hxx,svx/strarray.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgluitm.hxx,svx/sdgluitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtakitm.hxx,svx/sdtakitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SpellDialogChildWindow.hxx,svx/SpellDialogChildWindow.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xexch.hxx,svx/xexch.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/gallery.hxx,svx/gallery.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dlgctrl.hxx,svx/dlgctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/DescriptionGenerator.hxx,svx/DescriptionGenerator.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xenum.hxx,svx/xenum.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numfmtsh.hxx,svx/numfmtsh.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmglob.hxx,svx/fmglob.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/framebordertype.hxx,svx/framebordertype.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdomeas.hxx,svx/svdomeas.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/insctrl.hxx,svx/insctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoedge.hxx,svx/svdoedge.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/bmpmask.hxx,svx/bmpmask.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdshitm.hxx,svx/sdshitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddef.hxx,svx/svddef.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbcontrl.hxx,svx/tbcontrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dstribut_enum.hxx,svx/dstribut_enum.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcllitm.hxx,svx/sxcllitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rubydialog.hxx,svx/rubydialog.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ipolypolygoneditorcontroller.hxx,svx/ipolypolygoneditorcontroller.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleOLEShape.hxx,svx/AccessibleOLEShape.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/extrusionbar.hxx,svx/extrusionbar.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleControlShape.hxx,svx/AccessibleControlShape.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/paraprev.hxx,svx/paraprev.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshxy.hxx,svx/xftshxy.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxcustomshapes.hxx,svx/tbxcustomshapes.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrhittesthelper.hxx,svx/sdrhittesthelper.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdviter.hxx,svx/svdviter.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ofaitem.hxx,svx/ofaitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/frmdirlbox.hxx,svx/frmdirlbox.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShape2d.hxx,svx/EnhancedCustomShape2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxoneitm.hxx,svx/sxoneitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/msdffdef.hxx,svx/msdffdef.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globl3d.hxx,svx/globl3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xattr.hxx,svx/xattr.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmuitm.hxx,svx/sxmuitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdsxyitm.hxx,svx/sdsxyitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/postattr.hxx,svx/postattr.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoattr.hxx,svx/svdoattr.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/prtqry.hxx,svx/prtqry.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sphere3d.hxx,svx/sphere3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdomedia.hxx,svx/svdomedia.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflboxy.hxx,svx/xflboxy.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/swframeposstrings.hxx,svx/swframeposstrings.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svditer.hxx,svx/svditer.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmspitm.hxx,svx/sxmspitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmobjfac.hxx,svx/fmobjfac.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdocirc.hxx,svx/svdocirc.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxdlg.hxx,svx/svxdlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxenditm.hxx,svx/sxenditm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/def3d.hxx,svx/def3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/UnoNamespaceMap.hxx,svx/UnoNamespaceMap.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxciaitm.hxx,svx/sxciaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/polypolygoneditor.hxx,svx/polypolygoneditor.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgmoitm.hxx,svx/sdgmoitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/linectrl.hxx,svx/linectrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnedcit.hxx,svx/xlnedcit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmsitm.hxx,svx/sxmsitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaditm.hxx,svx/sdtaditm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdotext.hxx,svx/svdotext.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/chrtitem.hxx,svx/chrtitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xbitmap.hxx,svx/xbitmap.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxallitm.hxx,svx/sxallitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dlgutil.hxx,svx/dlgutil.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unopage.hxx,svx/unopage.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrag.hxx,svx/svddrag.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleShapeTreeInfo.hxx,svx/AccessibleShapeTreeInfo.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcgitm.hxx,svx/sxcgitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnedwit.hxx,svx/xlnedwit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdouno.hxx,svx/svdouno.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrmasterpagedescriptor.hxx,svx/sdrmasterpagedescriptor.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcikitm.hxx,svx/sxcikitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoutl.hxx,svx/svdoutl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/shapepropertynotifier.hxx,svx/shapepropertynotifier.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxctitm.hxx,svx/sxctitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbaexchange.hxx,svx/dbaexchange.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtritm.hxx,svx/sxmtritm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrobjectuser.hxx,svx/sdrobjectuser.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleShape.hxx,svx/AccessibleShape.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hlnkitem.hxx,svx/hlnkitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xhatch.hxx,svx/xhatch.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/swframeexample.hxx,svx/swframeexample.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstwit.hxx,svx/xlnstwit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xit.hxx,svx/xit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdhlpln.hxx,svx/svdhlpln.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ctredlin.hxx,svx/ctredlin.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/lathe3d.hxx,svx/lathe3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/optgrid.hxx,svx/optgrid.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/langbox.hxx,svx/langbox.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/clipfmtitem.hxx,svx/clipfmtitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xsetit.hxx,svx/xsetit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tabarea.hxx,svx/tabarea.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SmartTagCtl.hxx,svx/SmartTagCtl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxcolor.hxx,svx/tbxcolor.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdmrkv.hxx,svx/svdmrkv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/modctrl.hxx,svx/modctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoapi.hxx,svx/unoapi.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ruler.hxx,svx/ruler.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrobjectfilter.hxx,svx/sdrobjectfilter.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtfitm.hxx,svx/sxmtfitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdundo.hxx,svx/svdundo.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hdft.hxx,svx/hdft.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlexchg.hxx,svx/xmlexchg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/IAccessibleViewForwarder.hxx,svx/IAccessibleViewForwarder.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dialogs.hrc,svx/dialogs.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/extrud3d.hxx,svx/extrud3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unopool.hxx,svx/unopool.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflhtit.hxx,svx/xflhtit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnedit.hxx,svx/xlnedit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmleohlp.hxx,svx/xmleohlp.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ifaceids.hxx,svx/ifaceids.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftouit.hxx,svx/xftouit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/selectioncontroller.hxx,svx/selectioncontroller.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrpagewindow.hxx,svx/sdrpagewindow.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgcpitm.hxx,svx/sdgcpitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/view3d.hxx,svx/view3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshape.hxx,svx/unoshape.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflgrit.hxx,svx/xflgrit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ActionDescriptionProvider.hxx,svx/ActionDescriptionProvider.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/gridctrl.hxx,svx/gridctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxalign.hxx,svx/tbxalign.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svimbase.hxx,svx/svimbase.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomctrl.hxx,svx/zoomctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrgv.hxx,svx/svddrgv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/XPropertyTable.hxx,svx/XPropertyTable.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftstit.hxx,svx/xftstit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdglue.hxx,svx/svdglue.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/helperhittest3d.hxx,svx/helperhittest3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/flagsdef.hxx,svx/flagsdef.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaaitm.hxx,svx/sdtaaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmview.hxx,svx/fmview.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxdllapi.h,svx/svxdllapi.h))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/colrctrl.hxx,svx/colrctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdpage.hxx,svx/fmdpage.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtpitm.hxx,svx/sxmtpitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globlmn.hrc,globlmn_tmpl.hrc))
+
diff --git a/svx/source/sdr/primitive3d/makefile.mk b/svx/Package_sdi.mk
index c845cadc90a4..0a43a1ae7be3 100644
--- a/svx/source/sdr/primitive3d/makefile.mk
+++ b/svx/Package_sdi.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -25,18 +25,9 @@
#
#*************************************************************************
-PRJ=..$/..$/..
-PRJNAME=svx
-TARGET=primitive3d
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_Package_Package,svx_sdi,$(SRCDIR)/svx/sdi))
+$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/svx.sdi,svx.sdi))
+$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/svxitems.sdi,svxitems.sdi))
+$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/xoitems.sdi,xoitems.sdi))
-# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
- $(SLO)$/sdrattributecreator3d.obj
-
-.INCLUDE : target.mk
diff --git a/svx/prj/build.lst b/svx/prj/build.lst
index 536d7cc29fc8..7b541b2d77c4 100644
--- a/svx/prj/build.lst
+++ b/svx/prj/build.lst
@@ -1,39 +1,2 @@
sx svx : sfx2 l10n oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt NULL
-sx svx usr1 - all sx_mkout NULL
-sx svx\inc nmake - all sx_inc NULL
-sx svx\uiconfig\layout nmake - all sx_layout NULL
-sx svx\source\unodialogs\textconversiondlgs nmake - all sx_textconversiondlgs sx_inc NULL
-sx svx\sdi nmake - all sx_sdi sx_inc NULL
-sx svx\source\src nmake - all sx_src sx_inc sx_sdi NULL
-sx svx\source\intro nmake - all sx_intro sx_inc NULL
-sx svx\source\items nmake - all sx_items sx_inc sx_sdi NULL
-sx svx\source\xoutdev nmake - all sx_xout sx_items sx_inc NULL
-sx svx\source\svdraw nmake - all sx_draw sx_inc NULL
-sx svx\source\sdr\attribute nmake - all sx_attribute sx_inc NULL
-sx svx\source\sdr\primitive2d nmake - all sx_primitive2d sx_inc NULL
-sx svx\source\sdr\primitive3d nmake - all sx_primitive3d sx_inc NULL
-sx svx\source\table nmake - all sx_table sx_inc NULL
-sx svx\source\sdr\properties nmake - all sx_properties sx_inc NULL
-sx svx\source\sdr\contact nmake - all sx_contact sx_inc NULL
-sx svx\source\sdr\event nmake - all sx_event sx_inc NULL
-sx svx\source\sdr\animation nmake - all sx_animation sx_inc NULL
-sx svx\source\sdr\overlay nmake - all sx_overlay sx_inc NULL
-sx svx\source\smarttags nmake - all sx_smarttags sx_inc NULL
-sx svx\source\stbctrls nmake - all sx_stbc sx_inc NULL
-sx svx\source\mnuctrls nmake - all sx_mnuc sx_inc NULL
-sx svx\source\engine3d nmake - all sx_3deng sx_inc NULL
-sx svx\source\form nmake - all sx_form sx_sdi sx_inc NULL
-sx svx\source\fmcomp nmake - all sx_fmcmp sx_sdi sx_inc NULL
-sx svx\source\tbxctrls nmake - all sx_tbxc sx_inc NULL
-sx svx\source\dialog nmake - all sx_dlg sx_inc NULL
-sx svx\source\unodraw nmake - all sx_undrw sx_inc NULL
-sx svx\source\unogallery nmake - all sx_ungal sx_inc NULL
-sx svx\source\gallery2 nmake - all sx_gall sx_inc NULL
-sx svx\source\xml nmake - all sx_xml sx_inc NULL
-sx svx\source\core nmake - all sx_core sx_inc NULL
-sx svx\source\accessibility nmake - all sx_accessibility sx_inc NULL
-sx svx\source\customshapes nmake - all sx_customshapes sx_inc NULL
-sx svx\source\toolbars nmake - all sx_toolbars sx_inc NULL
-sx svx\util nmake - all sx_util sx_3deng sx_dlg sx_draw sx_attribute sx_properties sx_contact sx_event sx_animation sx_primitive2d sx_primitive3d sx_overlay sx_fmcmp sx_form sx_gall sx_items sx_mnuc sx_sdi sx_stbc sx_tbxc sx_undrw sx_ungal sx_xml sx_core sx_xout sx_accessibility sx_intro sx_customshapes sx_toolbars sx_table sx_smarttags NULL
-sx svx\source\gengal nmake - all sx_gengal sx_util NULL
-sx svx\qa\unoapi nmake - all sx_qa_unoapi NULL
+sx svx\prj nmake - all sx_prj NULL
diff --git a/svx/util/makefile.pmk b/svx/prj/makefile.mk
index e0fffdb1fdeb..e312a7ccab65 100644..100755
--- a/svx/util/makefile.pmk
+++ b/svx/prj/makefile.mk
@@ -25,19 +25,16 @@
#
#*************************************************************************
-# define SVX_DLLIMPLEMENTATION (see @ svxdllapi.h)
-CDEFS += -DSVX_DLLIMPLEMENTATION
+PRJ=..
+TARGET=prj
-.IF "$(ENABLE_GTK)" != ""
-CFLAGS+=-DENABLE_GTK
-.ENDIF
-
-.IF "$(ENABLE_KDE)" != ""
-CFLAGS+=-DENABLE_KDE
-.ENDIF
+.INCLUDE : settings.mk
-.IF "$(ENABLE_KDE4)" != ""
-CFLAGS+=-DENABLE_KDE4
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
.ENDIF
-VISIBILITY_HIDDEN=TRUE
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/svx/prj/target_module_svx.mk b/svx/prj/target_module_svx.mk
deleted file mode 100644
index 5978c97e5500..000000000000
--- a/svx/prj/target_module_svx.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2009 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Module_Module,svx,\
- $(call gb_AllLangResTarget_get_target,svx) \
- $(call gb_Library_get_target,svxcore) \
- $(call gb_Library_get_target,svx) \
-))
-
-$(eval $(call gb_Module_read_includes,svx,\
- lib_svx \
- lib_svxcore \
- res_svx \
-))
-
-#todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX
-#todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes
-#todo: -DUNICODE and -D_UNICODE on WNT for source/dialog
-#todo: noopt for viewpt3d.cxx with MSVC and ICC
-#todo: set -DENABLE_VBA in case $(ENABLE_VBA)="YES"; can we do it in gbuild.mk?
-#todo: gengal
-#todo: set -D... for ENABLE_GTK/KDE/KDE4 -> in gbuild.mk?
-#todo: ibrwimp.lib in util/makefile.mk on Windows ?!
-#todo: GENHID
-#todo: uiconfig
-#todo: exports from gallery (util/gal.dxp) and svx (svx.dxp)
-#todo: resources, textconversion, packages
-
diff --git a/svx/prj/target_package_inc.mk b/svx/prj/target_package_inc.mk
deleted file mode 100644
index dd836b286f8b..000000000000
--- a/svx/prj/target_package_inc.mk
+++ /dev/null
@@ -1,154 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2009 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Package_Package,sfx2_inc,$(SRCDIR)/sfx2/inc))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/childwin.hxx,sfx2/childwin.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ctrlitem.hxx,sfx2/ctrlitem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfdlg.hxx,sfx2/dinfdlg.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfedt.hxx,sfx2/dinfedt.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfac.hxx,sfx2/docfac.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfile.hxx,sfx2/docfile.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfilt.hxx,sfx2/docfilt.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctdlg.hxx,sfx2/doctdlg.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/fcontnr.hxx,sfx2/fcontnr.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frame.hxx,sfx2/frame.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmdescr.hxx,sfx2/frmdescr.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtml.hxx,sfx2/frmhtml.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtmlw.hxx,sfx2/frmhtmlw.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/macrconf.hxx,sfx2/macrconf.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msg.hxx,sfx2/msg.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msgpool.hxx,sfx2/msgpool.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objface.hxx,sfx2/objface.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objitem.hxx,sfx2/objitem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objsh.hxx,sfx2/objsh.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/opengrf.hxx,sfx2/opengrf.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printer.hxx,sfx2/printer.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printopt.hxx,sfx2/printopt.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhelp.hxx,sfx2/sfxhelp.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxresid.hxx,sfx2/sfxresid.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/qa/unoapi/Test.java b/svx/qa/unoapi/Test.java
index 90abd12776d0..2f7581e22efa 100644
--- a/svx/qa/unoapi/Test.java
+++ b/svx/qa/unoapi/Test.java
@@ -27,6 +27,7 @@ package org.openoffice.svx.qa.unoapi;
import org.openoffice.Runner;
import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
import static org.junit.Assert.*;
public final class Test {
@@ -43,8 +44,8 @@ public final class Test {
@org.junit.Test public void test() {
assertTrue(
Runner.run(
- "-sce", "svx.sce", "-xcl", "knownissues.xcl", "-tdoc",
- "testdocuments", "-cs", connection.getDescription()));
+ "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc",
+ Argument.get("tdoc"), "-cs", connection.getDescription()));
}
private final OfficeConnection connection = new OfficeConnection();
diff --git a/svx/qa/unoapi/makefile.mk b/svx/qa/unoapi/makefile.mk
deleted file mode 100644
index 133e9a3458e4..000000000000
--- a/svx/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = svx
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/svx/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/svx/source/accessibility/makefile.mk b/svx/source/accessibility/makefile.mk
deleted file mode 100755
index 9ac9cff08a1d..000000000000
--- a/svx/source/accessibility/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svx
-TARGET=accessibility
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/charmapacc.obj \
- $(SLO)$/svxrectctaccessiblecontext.obj \
- $(SLO)$/GraphCtlAccessibleContext.obj \
- $(SLO)$/ChildrenManager.obj \
- $(SLO)$/ChildrenManagerImpl.obj \
- $(SLO)$/DescriptionGenerator.obj \
- $(SLO)$/AccessibleShape.obj \
- $(SLO)$/AccessibleGraphicShape.obj \
- $(SLO)$/AccessibleOLEShape.obj \
- $(SLO)$/AccessibleShapeInfo.obj \
- $(SLO)$/AccessibleShapeTreeInfo.obj \
- $(SLO)$/AccessibleTextHelper.obj \
- $(SLO)$/AccessibleEmptyEditSource.obj \
- $(SLO)$/AccessibleTextEventQueue.obj \
- $(SLO)$/ShapeTypeHandler.obj \
- $(SLO)$/SvxShapeTypes.obj \
- $(SLO)$/AccessibleControlShape.obj \
- $(SLO)$/DGColorNameLookUp.obj \
- $(SLO)$/AccessibleFrameSelector.obj
-
-SRS2NAME = accessibility
-SRC2FILES = accessibility.src
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/svx/source/customshapes/makefile.mk b/svx/source/customshapes/makefile.mk
deleted file mode 100644
index 3feca8f25007..000000000000
--- a/svx/source/customshapes/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svx
-TARGET=customshapes
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Types -------------------------------------
-
-# Disable optimization for SunCC SPARC and MACOSX (funny loops
-# when parsing e.g. "x+width/2"),
-# also http://gcc.gnu.org/PR22392
-.IF ("$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC") || "$(OS)"=="MACOSX" || ("$(OS)"=="LINUX" && "$(CPU)"=="P")
-NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj
-.ENDIF
-
-ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE
-
-# --- Files -------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
- $(SLO)$/EnhancedCustomShapeTypeNames.obj \
- $(SLO)$/EnhancedCustomShapeGeometry.obj \
- $(SLO)$/EnhancedCustomShape2d.obj \
- $(SLO)$/EnhancedCustomShapeFunctionParser.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
- $(SLO)$/EnhancedCustomShapeEngine.obj \
- $(SLO)$/EnhancedCustomShape3d.obj \
- $(SLO)$/EnhancedCustomShapeFontWork.obj \
- $(SLO)$/EnhancedCustomShapeHandle.obj \
- $(SLO)$/tbxcustomshapes.obj
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
deleted file mode 100644
index ac608fae8ec8..000000000000
--- a/svx/source/dialog/makefile.mk
+++ /dev/null
@@ -1,154 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-PRJNAME=svx
-TARGET=dialogs
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-#
-.IF "$(GUI)"=="WNT"
-CFLAGS+= -DUNICODE -D_UNICODE
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=dialogs
-SRC1FILES = \
- bmpmask.src \
- contdlg.src \
- ctredlin.src \
- dlgctrl.src \
- docrecovery.src \
- fontwork.src \
- frmsel.src \
- hdft.src \
- hyprlink.src \
- imapdlg.src \
- langbox.src \
- language.src \
- passwd.src \
- prtqry.src \
- rubydialog.src\
- ruler.src \
- srchdlg.src \
- svxbmpnumvalueset.src \
- swframeposstrings.src \
- txenctab.src \
- ucsubset.src \
- optgrid.src
-
-SRS2NAME=drawdlgs
-SRC2FILES = \
- sdstring.src
-
-LIB1TARGET=$(SLB)$/$(TARGET)-core.lib
-
-LIB1OBJFILES= \
- $(SLO)$/checklbx.obj \
- $(SLO)$/dialmgr.obj\
- $(SLO)$/dlgutil.obj \
- $(SLO)$/framelink.obj\
- $(SLO)$/langbox.obj \
- $(SLO)$/simptabl.obj \
- $(SLO)$/svxdlg.obj \
- $(SLO)$/stddlg.obj \
-
-LIB2TARGET=$(SLB)$/$(TARGET).lib
-
-LIB2OBJFILES= \
- $(SLO)$/charmap.obj \
- $(SLO)$/connctrl.obj \
- $(SLO)$/contwnd.obj \
- $(SLO)$/ctredlin.obj \
- $(SLO)$/databaseregistrationui.obj \
- $(SLO)$/dialcontrol.obj \
- $(SLO)$/dlgctl3d.obj \
- $(SLO)$/dlgctrl.obj \
- $(SLO)$/docrecovery.obj \
- $(SLO)$/fntctrl.obj \
- $(SLO)$/fontlb.obj \
- $(SLO)$/fontwork.obj \
- $(SLO)$/framelinkarray.obj \
- $(SLO)$/frmdirlbox.obj \
- $(SLO)$/frmsel.obj \
- $(SLO)$/graphctl.obj \
- $(SLO)$/grfflt.obj \
- $(SLO)$/hdft.obj \
- $(SLO)$/hyperdlg.obj \
- $(SLO)$/hyprlink.obj \
- $(SLO)$/imapdlg.obj \
- $(SLO)$/imapwnd.obj \
- $(SLO)$/measctrl.obj \
- $(SLO)$/orienthelper.obj \
- $(SLO)$/pagectrl.obj \
- $(SLO)$/paraprev.obj \
- $(SLO)$/passwd.obj \
- $(SLO)$/pfiledlg.obj \
- $(SLO)$/prtqry.obj \
- $(SLO)$/relfld.obj \
- $(SLO)$/rlrcitem.obj \
- $(SLO)$/rubydialog.obj \
- $(SLO)$/rulritem.obj \
- $(SLO)$/SpellDialogChildWindow.obj \
- $(SLO)$/srchctrl.obj \
- $(SLO)$/srchdlg.obj \
- $(SLO)$/strarray.obj \
- $(SLO)$/svxbmpnumvalueset.obj\
- $(SLO)$/svxgrahicitem.obj \
- $(SLO)$/svxruler.obj \
- $(SLO)$/swframeexample.obj \
- $(SLO)$/swframeposstrings.obj \
- $(SLO)$/txencbox.obj \
- $(SLO)$/txenctab.obj \
- $(SLO)$/wrapfield.obj \
- $(SLO)$/_bmpmask.obj \
- $(SLO)$/_contdlg.obj \
- $(SLO)$/optgrid.obj
-
-
-.IF "$(GUI)"=="UNX"
-LIB2OBJFILES += $(SLO)$/sendreportunx.obj
-.ELSE
-.IF "$(GUI)"=="WNT"
-LIB2OBJFILES += $(SLO)$/sendreportw32.obj
-.ELSE
-LIB2OBJFILES += $(SLO)$/sendreportgen.obj
-.ENDIF
-.ENDIF
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/svx/source/engine3d/makefile.mk b/svx/source/engine3d/makefile.mk
deleted file mode 100644
index 71916df4a83c..000000000000
--- a/svx/source/engine3d/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svx
-TARGET=engine3d
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
- $(SLO)$/e3dsceneupdater.obj \
- $(SLO)$/helperminimaldepth3d.obj \
- $(SLO)$/helperhittest3d.obj \
- $(SLO)$/obj3d.obj \
- $(SLO)$/scene3d.obj \
- $(SLO)$/polysc3d.obj \
- $(SLO)$/cube3d.obj \
- $(SLO)$/sphere3d.obj \
- $(SLO)$/extrud3d.obj \
- $(SLO)$/lathe3d.obj \
- $(SLO)$/polygn3d.obj \
- $(SLO)$/svx3ditems.obj \
- $(SLO)$/deflt3d.obj \
- $(SLO)$/e3dundo.obj \
- $(SLO)$/viewpt3d2.obj \
- $(SLO)$/camera3d.obj \
- $(SLO)$/objfac3d.obj \
- $(SLO)$/dragmt3d.obj \
- $(SLO)$/view3d.obj \
- $(SLO)$/view3d1.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
- $(SLO)$/float3d.obj
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-SRS1NAME=engine3d
-SRC1FILES=\
- string3d.src \
- float3d.src
-
-.INCLUDE : target.mk
diff --git a/svx/source/form/makefile.mk b/svx/source/form/makefile.mk
deleted file mode 100644
index d6dc1bd65357..000000000000
--- a/svx/source/form/makefile.mk
+++ /dev/null
@@ -1,119 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svx
-TARGET=form
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(ENABLE_VBA)"=="YES"
- CDEFS+=-DENABLE_VBA
-.ENDIF
-
-SRS1NAME=form
-SRC1FILES= \
- fmexpl.src \
- filtnav.src \
- fmstring.src \
- formshell.src \
- datanavi.src
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
- $(SLO)$/formtoolbars.obj \
- $(SLO)$/fmdocumentclassification.obj \
- $(SLO)$/fmcontrolbordermanager.obj \
- $(SLO)$/fmcontrollayout.obj \
- $(SLO)$/fmtextcontroldialogs.obj \
- $(SLO)$/fmtextcontrolfeature.obj \
- $(SLO)$/fmtextcontrolshell.obj \
- $(SLO)$/ParseContext.obj \
- $(SLO)$/typeconversionclient.obj \
- $(SLO)$/dbtoolsclient.obj \
- $(SLO)$/sqlparserclient.obj \
- $(SLO)$/dataaccessdescriptor.obj \
- $(SLO)$/fmpage.obj \
- $(SLO)$/fmundo.obj \
- $(SLO)$/fmmodel.obj \
- $(SLO)$/navigatortree.obj \
- $(SLO)$/navigatortreemodel.obj \
- $(SLO)$/fmexpl.obj \
- $(SLO)$/formcontroller.obj \
- $(SLO)$/fmpgeimp.obj \
- $(SLO)$/fmvwimp.obj \
- $(SLO)$/fmdpage.obj \
- $(SLO)$/fmitems.obj \
- $(SLO)$/fmobj.obj \
- $(SLO)$/fmdmod.obj \
- $(SLO)$/fmservs.obj \
- $(SLO)$/typemap.obj \
- $(SLO)$/fmexch.obj \
- $(SLO)$/fmtools.obj \
- $(SLO)$/fmshimp.obj \
- $(SLO)$/fmshell.obj \
- $(SLO)$/fmview.obj \
- $(SLO)$/sdbdatacolumn.obj \
- $(SLO)$/formcontrolling.obj \
- $(SLO)$/formfeaturedispatcher.obj \
- $(SLO)$/formdispatchinterceptor.obj \
- $(SLO)$/datanavi.obj \
- $(SLO)$/xfm_addcondition.obj \
- $(SLO)$/datalistener.obj \
- $(SLO)$/fmscriptingenv.obj \
- $(SLO)$/stringlistresource.obj \
- $(SLO)$/delayedevent.obj \
- $(SLO)$/formcontrolfactory.obj \
- $(SLO)$/legacyformcontroller.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
- $(SLO)$/dbcharsethelper.obj \
- $(SLO)$/fmPropBrw.obj \
- $(SLO)$/tbxform.obj \
- $(SLO)$/fmobjfac.obj \
- $(SLO)$/fmsrccfg.obj \
- $(SLO)$/tabwin.obj \
- $(SLO)$/filtnav.obj \
- $(SLO)$/fmsrcimp.obj \
- $(SLO)$/databaselocationinput.obj
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/svx/source/gallery2/makefile.mk b/svx/source/gallery2/makefile.mk
deleted file mode 100644
index 4d73a4af2ad2..000000000000
--- a/svx/source/gallery2/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svx
-TARGET=gal
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
- gallery.src \
- galtheme.src
-
-SLOFILES = \
- $(SLO)$/galexpl.obj \
- $(SLO)$/galctrl.obj \
- $(SLO)$/gallery1.obj \
- $(SLO)$/galtheme.obj \
- $(SLO)$/galmisc.obj \
- $(SLO)$/galobj.obj \
- $(SLO)$/codec.obj \
- $(SLO)$/galbrws.obj \
- $(SLO)$/galbrws1.obj \
- $(SLO)$/galbrws2.obj
-
-EXCEPTIONSFILES = \
- $(SLO)$/gallery1.obj \
- $(SLO)$/galtheme.obj \
- $(SLO)$/galmisc.obj \
- $(SLO)$/galbrws1.obj \
- $(SLO)$/galexpl.obj
-
-RESLIB1NAME = $(TARGET)
-RESLIB1IMAGES = $(PRJ)$/res
-RESLIB1SRSFILES = $(SRS)$/$(TARGET).srs
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
deleted file mode 100644
index e7001d176920..000000000000
--- a/svx/source/gengal/gengal.cxx
+++ /dev/null
@@ -1,319 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#include <stdio.h>
-#include <unistd.h>
-#include <memory>
-#include <list>
-
-#include <unotools/streamwrap.hxx>
-#include <unotools/ucbstreamhelper.hxx>
-
-#include <comphelper/processfactory.hxx>
-#include <comphelper/regpathhelper.hxx>
-#include <cppuhelper/servicefactory.hxx>
-#include <cppuhelper/bootstrap.hxx>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/registry/XSimpleRegistry.hpp>
-
-#include <ucbhelper/contentbroker.hxx>
-#include <ucbhelper/configurationkeys.hxx>
-
-#include <tools/urlobj.hxx>
-#include <tools/fsys.hxx>
-#include <svtools/filedlg.hxx>
-
-#include <vcl/window.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/font.hxx>
-#include <vcl/sound.hxx>
-#include <vcl/print.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/help.hxx>
-#include <vcl/scrbar.hxx>
-#include <vcl/wrkwin.hxx>
-#include <vcl/msgbox.hxx>
-
-#include <osl/file.hxx>
-#include <osl/process.h>
-#include <rtl/bootstrap.hxx>
-
-#include <svx/galtheme.hxx>
-#include <svx/gallery1.hxx>
-
-using namespace ::vos;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::registry;
-using namespace ::com::sun::star::lang;
-
-typedef ::std::list<rtl::OUString> FileNameList;
-
-class GalApp : public Application
-{
-public:
- virtual void Main();
-
-protected:
- Reference<XMultiServiceFactory> xMSF;
- void Init();
- void InitUCB();
-};
-
-Gallery* createGallery( const rtl::OUString& aGalleryURL )
-{
- return new Gallery( aGalleryURL );
-}
-
-void disposeGallery( Gallery* pGallery )
-{
- delete pGallery;
-}
-
-static void createTheme( rtl::OUString aThemeName,
- rtl::OUString aGalleryURL,
- rtl::OUString aDestDir,
- UINT32 nNumFrom,
- FileNameList &rFiles )
-{
- Gallery * pGallery( createGallery( aGalleryURL ) );
-
- if (!pGallery ) {
- fprintf( stderr, "Could't acquire '%s'\n",
- (const sal_Char *) rtl::OUStringToOString( aGalleryURL,
- RTL_TEXTENCODING_UTF8 ) );
- exit( 1 );
- }
- fprintf( stderr, "Work on gallery '%s'\n",
- (const sal_Char *) rtl::OUStringToOString( aGalleryURL, RTL_TEXTENCODING_UTF8 ) );
-
- fprintf( stderr, "Existing themes: %lu\n",
- sal::static_int_cast< unsigned long >(
- pGallery->GetThemeCount() ) );
-
- if( !pGallery->HasTheme( aThemeName) ) {
- if( !pGallery->CreateTheme( aThemeName, nNumFrom ) ) {
- fprintf( stderr, "Failed to create theme\n" );
- disposeGallery( pGallery );
- exit( 1 );
- }
- }
-
- fprintf( stderr, "Existing themes: %lu\n",
- sal::static_int_cast< unsigned long >(
- pGallery->GetThemeCount() ) );
-
- SfxListener aListener;
-
- GalleryTheme *pGalTheme = pGallery->AcquireTheme( aThemeName, aListener );
- if ( pGalTheme == NULL ) {
- fprintf( stderr, "Failed to acquire theme\n" );
- disposeGallery( pGallery );
- exit( 1 );
- }
-
- fprintf( stderr, "Using DestDir: %s\n",
- (const sal_Char *) rtl::OUStringToOString( aDestDir, RTL_TEXTENCODING_UTF8 ) );
- pGalTheme->SetDestDir(String(aDestDir));
-
- FileNameList::const_iterator aIter;
-
- for( aIter = rFiles.begin(); aIter != rFiles.end(); aIter++ )
- {
-// Should/could use:
-// if ( ! pGalTheme->InsertFileOrDirURL( aURL ) ) {
-// Requires a load more components ...
-
- Graphic aGraphic;
- String aFormat;
-
-#if 1
- if ( ! pGalTheme->InsertURL( *aIter ) )
- fprintf( stderr, "Failed to import '%s'\n",
- (const sal_Char *) rtl::OUStringToOString( *aIter, RTL_TEXTENCODING_UTF8 ) );
- else
- fprintf( stderr, "Imported file '%s' (%lu)\n",
- (const sal_Char *) rtl::OUStringToOString( *aIter, RTL_TEXTENCODING_UTF8 ),
- sal::static_int_cast< unsigned long >(
- pGalTheme->GetObjectCount() ) );
-
-#else // only loads BMPs
- SvStream *pStream = ::utl::UcbStreamHelper::CreateStream( *aIter, STREAM_READ );
- if (!pStream) {
- fprintf( stderr, "Can't find image to import\n" );
- disposeGallery( pGallery );
- exit (1);
- }
- *pStream >> aGraphic;
- delete pStream;
- if( aGraphic.GetType() == GRAPHIC_NONE )
- {
- fprintf( stderr, "Failed to load '%s'\n",
- (const sal_Char *) rtl::OUStringToOString( *aIter, RTL_TEXTENCODING_UTF8 ) );
- continue;
- }
-
- SgaObjectBmp aObject( aGraphic, *aIter, aFormat );
- if ( ! aObject.IsValid() ) {
- fprintf( stderr, "Failed to create thumbnail for image\n" );
- continue;
- }
-
- if ( ! pGalTheme->InsertObject( aObject ) ) {
- fprintf( stderr, "Failed to insert file or URL\n" );
- continue;
- }
-#endif
- }
-
- pGallery->ReleaseTheme( pGalTheme, aListener );
- disposeGallery( pGallery );
-}
-
-static void PrintHelp()
-{
- fprintf( stdout, "Utility to generate OO.o gallery files\n\n" );
-
- fprintf( stdout, "using: gengal --name <name> --path <dir> [ --destdir <path> ]\n");
- fprintf( stdout, " [ --number-from <num> ] [ files ... ]\n\n" );
-
- fprintf( stdout, "options:\n");
- fprintf( stdout, " --name <theme>\t\tdefines a name of the created or updated theme.\n");
- fprintf( stdout, " --path <dir>\t\tdefines directory where the gallery files are created\n");
- fprintf( stdout, "\t\t\tor updated.\n");
- fprintf( stdout, " --destdir <dir>\tdefines a path prefix to be removed from the paths\n");
- fprintf( stdout, "\t\t\tstored in the gallery files. It is useful to create\n");
- fprintf( stdout, "\t\t\tRPM packages using the BuildRoot feature.\n");
- fprintf( stdout, " --number-from <num>\tdefines minimal number for the newly created gallery\n");
- fprintf( stdout, "\t\t\ttheme files.\n");
- fprintf( stdout, " files\t\t\tlists files to be added to the gallery. Absolute paths\n");
- fprintf( stdout, "\t\t\tare required.\n");
-}
-
-static rtl::OUString Smartify( const rtl::OUString &rPath )
-{
- INetURLObject aURL;
- aURL.SetSmartURL( rPath );
- return aURL.GetMainURL( INetURLObject::NO_DECODE );
-}
-
-#define OUSTRING_CSTR( str ) \
- rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ).getStr()
-
-void GalApp::Init()
-{
- if( getenv( "OOO_INSTALL_PREFIX" ) == NULL ) {
- rtl::OUString fileName = GetAppFileName();
- int lastSlash = fileName.lastIndexOf( '/' );
-#ifdef WNT
- // Don't know which directory separators GetAppFileName() returns on Windows.
- // Be safe and take into consideration they might be backslashes.
- if( fileName.lastIndexOf( '\\' ) > lastSlash )
- lastSlash = fileName.lastIndexOf( '\\' );
-#endif
- rtl::OUString baseBinDir = fileName.copy( 0, lastSlash );
- rtl::OUString installPrefix = baseBinDir + rtl::OUString::createFromAscii( "/../.." );
-
- rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("OOO_INSTALL_PREFIX"));
- osl_setEnvironment(envVar.pData, installPrefix.pData);
- }
- OSL_TRACE( "OOO_INSTALL_PREFIX=%s", getenv( "OOO_INSTALL_PREFIX" ) );
-
- Reference<XComponentContext> xComponentContext
- = ::cppu::defaultBootstrap_InitialComponentContext();
- xMSF = Reference<XMultiServiceFactory>
- ( xComponentContext->getServiceManager(), UNO_QUERY );
- if( !xMSF.is() )
- fprintf( stderr, "Failed to bootstrap\n" );
- ::comphelper::setProcessServiceFactory( xMSF );
-
- InitUCB();
-}
-
-void GalApp::InitUCB()
-{
- rtl::OUString aEmpty;
- Sequence< Any > aArgs(6);
- aArgs[0]
- <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY1_LOCAL);
- aArgs[1]
- <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY2_OFFICE);
- aArgs[2] <<= rtl::OUString::createFromAscii("PIPE");
- aArgs[3] <<= aEmpty;
- aArgs[4] <<= rtl::OUString::createFromAscii("PORTAL");
- aArgs[5] <<= aEmpty;
-
- if (! ::ucbhelper::ContentBroker::initialize( xMSF, aArgs ) )
- fprintf( stderr, "Failed to init content broker\n" );
-}
-
-void GalApp::Main()
-{
- bool bHelp = false;
- rtl::OUString aPath, aDestDir;
- rtl::OUString aName = rtl::OUString::createFromAscii( "Default name" );
- UINT32 nNumFrom = 0;
- FileNameList aFiles;
-
- for( USHORT i = 0; i < GetCommandLineParamCount(); i++ )
- {
- rtl::OUString aParam = GetCommandLineParam( i );
-
- if( aParam.equalsAscii( "--help" ) ||
- aParam.equalsAscii( "-h" ) )
- bHelp = true;
-
- else if ( aParam.equalsAscii( "--name" ) )
- aName = GetCommandLineParam( ++i );
-
- else if ( aParam.equalsAscii( "--path" ) )
- aPath = Smartify( GetCommandLineParam( ++i ) );
-
- else if ( aParam.equalsAscii( "--destdir" ) )
- aDestDir = GetCommandLineParam( ++i );
-
- else if ( aParam.equalsAscii( "--number-from" ) )
- nNumFrom = GetCommandLineParam( ++i ).ToInt32();
-
- else
- aFiles.push_back( Smartify( aParam ) );
- }
-
- if( bHelp )
- {
- PrintHelp();
- return;
- }
-
- createTheme( aName, aPath, aDestDir, nNumFrom, aFiles );
-}
-
-GalApp aGalApp;
diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh
deleted file mode 100644
index a760b8e085d0..000000000000
--- a/svx/source/gengal/gengal.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# enable file locking
-SAL_ENABLE_FILE_LOCKING=1
-export SAL_ENABLE_FILE_LOCKING
-
-# resolve installation directory
-sd_cwd="`pwd`"
-if [ -h "$0" ] ; then
- sd_basename=`basename "$0"`
- sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
- cd "`dirname "$0"`"
- cd "`dirname "$sd_script"`"
-else
- cd "`dirname "$0"`"
-fi
-
-sd_prog="`pwd`"
-
-cd ..
-sd_binary=`basename "$0"`".bin"
-sd_inst="`pwd`"
-
-# change back directory
-cd "$sd_cwd"
-
-# check if all required patches are installed
-if [ -x "$sd_prog/sopatchlevel.sh" ]; then
- "$sd_prog/sopatchlevel.sh"
- if [ $? -eq 1 ]; then
- exit 0
- fi
-fi
-
-# set search path for shared libraries
-sd_platform=`uname -s`
-case $sd_platform in
- AIX)
- LIBPATH=${sd_prog}${LIBPATH+:${LIBPATH}}
- export LIBPATH
- ;;
-
- Darwin)
- DYLD_LIBRARY_PATH=${sd_prog}${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
- export DYLD_LIBRARY_PATH
- ;;
-
- HP-UX)
- SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH:+:${SHLIB_PATH}}
- export SHLIB_PATH
- ;;
-
- *)
- LD_LIBRARY_PATH=${sd_prog}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
- export LD_LIBRARY_PATH
- ;;
-esac
-
-# misc. environment variables
-unset XENVIRONMENT
-
-# set path so that other apps can be started just by name
-PATH="$sd_prog":$PATH
-export PATH
-
-OOO_INSTALL_PREFIX=${OOO_INSTALL_PREFIX-$sd_prog/../..}
-if ! test -e $OOO_INSTALL_PREFIX/basis-link; then
- # Hack for vanilla OOo binaries' split install layout
- OOO_INSTALL_PREFIX=$OOO_INSTALL_PREFIX/../openoffice.org3
-fi
-
-export OOO_INSTALL_PREFIX
-
-# execute binary
-exec "$sd_prog/$sd_binary" "$@"
diff --git a/svx/source/gengal/gengalrc.in b/svx/source/gengal/gengalrc.in
deleted file mode 100644
index 00ae5eb3cd5e..000000000000
--- a/svx/source/gengal/gengalrc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-OOO_INSTALL_PREFIX_URL=file://${OOO_INSTALL_PREFIX}
-OOO_BASIS_URL=${OOO_INSTALL_PREFIX_URL}/basis-link
-OOO_BASIS_BIN_URL=${OOO_BASIS_URL}/program
-OOO_URE_URL=${OOO_BASIS_URL}/ure-link
-#
-#CFG_INIFILE=${OOO_BASIS_BIN_URL}/configmgrrc
-#BaseInstallation=${OOO_BASIS_URL}
-BRAND_BASE_DIR=${OOO_INSTALL_PREFIX_URL}
-OOO_BASE_DIR=${OOO_BASIS_URL}
-#
-UNO_TYPES=${OOO_URE_URL}/share/misc/types.rdb ${OOO_BASIS_BIN_URL}/offapi.rdb
-UNO_SERVICES=${OOO_URE_URL}/share/misc/services.rdb ${OOO_BASIS_BIN_URL}/services.rdb
diff --git a/svx/source/gengal/makefile.mk b/svx/source/gengal/makefile.mk
deleted file mode 100644
index eefe8679a139..000000000000
--- a/svx/source/gengal/makefile.mk
+++ /dev/null
@@ -1,85 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svx
-
-TARGET=gengal
-TARGETTYPE=GUI
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SCRIPTFILES = $(BIN)$/gengal
-
-OBJFILES= $(OBJ)$/gengal.obj
-
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
-APP1TARGET= $(TARGET)
-.ELSE # .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
-APP1TARGET= $(TARGET).bin
-.ENDIF # .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
-
-APP1OBJS= $(OBJFILES)
-
-APP1STDLIBS=$(TOOLSLIB) \
- $(SO2LIB) \
- $(SVLLIB) \
- $(COMPHELPERLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB) \
- $(VCLLIB) \
- $(UCBHELPERLIB) \
- $(SVXCORELIB)
-
-#.IF "$(COM)"=="GCC"
-#ADDOPTFILES=$(OBJ)$/gengal.obj
-#add_cflagscxx="-frtti -fexceptions"
-#.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : \
- $(SCRIPTFILES)\
- $(BIN)/gengalrc
-
-$(SCRIPTFILES) : $$(@:f:+".sh")
- @tr -d "\015" < $(@:f:+".sh") > $@
-
-$(BIN)/%: %.in
- cp $< $@
-
diff --git a/svx/source/intro/intro_tmpl.hrc b/svx/source/intro/about_ooo.hrc
index e49b27cb29e8..2d81fff3b454 100644
--- a/svx/source/intro/intro_tmpl.hrc
+++ b/svx/source/intro/about_ooo.hrc
@@ -25,11 +25,6 @@
*
************************************************************************/
-#include <svx/svxids.hrc>
-
-#define RID_IMGLIST_TREEOPT (RID_OFA_START + 174)
-#define RID_IMGLIST_TREEOPT_HC (RID_OFA_START + 175)
-
#define OOO_CONTRIBUTOR_LIST \
ItemList = \
{ \
@@ -1086,242 +1081,3 @@ ItemList = \
< "Mattia Zuliani" ; > ; \
};
-
-#define DEVELOPER_LIST \
-ItemList = \
-{ \
- < "" ; > ; \
- < "GENERAL MANAGEMENT" ; 8 ; > ; \
- < "" ; > ; \
- < "Michael Bemmer" ; > ; \
- < "" ; > ; \
- < "FUNCTIONAL STAFF" ; 8 ; > ; \
- < "" ; > ; \
- < "Sabine Huetsch" ; > ; \
- < "" ; > ; \
- < "OpenOffice.org COORDINATION" ; 8 ; > ; \
- < "" ; > ; \
- < "Stefan Taxhet" ; > ; \
- < "" ; > ; \
- < "TECHNICAL ARCHITECT" ; 8 ; > ; \
- < "" ; > ; \
- < "Matthias Huetsch" ; > ; \
- < "Kay Ramme" ; > ; \
- < "" ; > ; \
- < "PROGRAM MANAGEMENT" ; 8 ; > ; \
- < "" ; > ; \
- < "Joost Andrae" ; > ; \
- < "Martin Damboldt" ; > ; \
- < "Martin Hollmichel" ; > ; \
- < "Andre Kuemmel" ; > ; \
- < "Marcus Lange" ; > ; \
- < "Uwe Luebbers" ; > ; \
- < "" ; > ; \
- < "" ; > ; \
- < "%PRODUCTNAME DEVELOPMENT" ; 8 ; > ; \
- < "" ; > ; \
- < "Dieter Loeschky" ; > ; \
- < "" ; > ; \
- < "TECHNICAL ARCHITECT" ; 8 ; > ; \
- < "" ; > ; \
- < "Michael Brauer" ; > ; \
- < "Malte Timmermann" ; > ; \
- < "" ; > ; \
- < "ODF" ; 8 ; > ; \
- < "" ; > ; \
- < "Svante Schubert" ; > ; \
- < "" ; > ; \
- < "DESIGN" ; 8 ; > ; \
- < "" ; > ; \
- < "Stella Schulze" ; > ; \
- < "" ; > ; \
- < "Migration" ; 8 ; > ; \
- < "" ; > ; \
- < "Michael Bohn" ; > ; \
- < "" ; > ; \
- < "%PRODUCTNAME WRITER & FRAMEWORK" ; 8 ; > ; \
- < "" ; > ; \
- < "Mathias Bauer" ; > ; \
- < "" ; > ; \
- < "Henning Brinkmann" ; > ; \
- < "Steffen Grund" ; > ; \
- < "Hans-Peter Burow" ; > ; \
- < "Carsten Driesner" ; > ; \
- < "Thomas Lange" ; > ; \
- < "Andreas Martens" ; > ; \
- < "Frank Meies" ; > ; \
- < "Bjoern Michaelsen" ; > ; \
- < "Andreas Schluens" ; > ; \
- < "Oliver Specht" ; > ; \
- < "Oliver-Rainer Wittmann" ; > ; \
- < "Michael Stahl" ; > ; \
- < "Mikhail Voitenko" ; > ; \
- < "" ; > ; \
- < "%PRODUCTNAME IMPRESS, GRAPHICS & BASE" ; 8 ; > ; \
- < "" ; > ; \
- < "Kai Ahrens" ; > ; \
- < "" ; > ; \
- < "Volker Ahrendt" ; > ; \
- < "Herbert Duerr" ; > ; \
- < "Andre Fischer" ; > ; \
- < "Ilko Hoepping" ; > ; \
- < "Sven Jacobi" ; > ; \
- < "Ocke Janssen" ; > ; \
- < "Artem Khvat" ; > ; \
- < "Lars Langhans" ; > ; \
- < "Armin Le Grand" ; > ; \
- < "Christian Lippka" ; > ; \
- < "Philipp Lohmann" ; > ; \
- < "Frank Schoenheit" ; > ; \
- < "" ; > ; \
- < "%PRODUCTNAME PROGRAMMABILITY & DEPLOYMENT" ; 8 ; > ; \
- < "" ; > ; \
- < "Kai Sommerfeld" ; > ; \
- < "" ; > ; \
- < "Stephan Bergmann" ; > ; \
- < "Andreas Bregas" ; > ; \
- < "Steffen Grund" ; > ; \
- < "Mihaela Kedikova" ; > ; \
- < "Tobias Krause" ; > ; \
- < "Joachim Lingner" ; > ; \
- < "Christoph Neumann" ; > ; \
- < "Hennes Rohling" ; > ; \
- < "Juergen Schmidt" ; > ; \
- < "Ingo Schmidt-Rosbiegal" ; > ; \
- < "Dirk Voelzke" ; > ; \
- < "" ; > ; \
- < "" ; > ; \
- < "%PRODUCTNAME CALC" ; 8 ; > ; \
- < "" ; > ; \
- < "Stephan Schaefer" ; > ; \
- < "" ; > ; \
- < "Thomas Benisch" ; > ; \
- < "Daniel Boelzle" ; > ; \
- < "Berend Cornelius" ; > ; \
- < "Ingrid Halama" ; > ; \
- < "Bjoern Milcke" ; > ; \
- < "Niklas Nebel" ; > ; \
- < "Eike Rathke" ; > ; \
- < "Daniel Rentz" ; > ; \
- < "" ; > ; \
- < "" ; > ; \
- < "USER EXPERIENCE" ; 8 ; > ; \
- < "" ; > ; \
- < "Andreas Bartel" ; > ; \
- < "Bettina Haberer" ; > ; \
- < "Christian Jansen" ; > ; \
- < "Frank Loehmann" ; > ; \
- < "Elizabeth Matthis" ; > ; \
- < "" ; > ; \
- < "" ; > ; \
- < "QUALITY ASSURANCE & COORDINATION" ; 8 ; > ; \
- < "" ; > ; \
- < "Nils Fuhrmann" ; > ; \
- < "" ; > ; \
- < "" ; > ; \
- < "RELEASE ENGINEERING " ; 8 ; > ; \
- < "" ; > ; \
- < "Ruediger Timm" ; > ; \
- < "" ; > ; \
- < "Oliver Bolte" ; > ; \
- < "Vladimir Glazounov" ; > ; \
- < "Ivo Hinkelmann" ; > ; \
- < "Hans-Joachim Lankenau" ; > ; \
- < "Jens-Heiner Rechtien" ; > ; \
- < "Kurt Zenker" ; > ; \
- < "" ; > ; \
- < "DEVELOPMENT TOOLS" ; 8 ; > ; \
- < "" ; > ; \
- < "Joerg Jahnke" ; > ; \
- < "" ; > ; \
- < "Bernd Eilers" ; > ; \
- < "Gregor Hartmann" ; > ; \
- < "Frank Mau" ; > ; \
- < "Nikolai Pretzell" ; > ; \
- < "" ; > ; \
- < "QUALITY ASSURANCE" ; 8 ; > ; \
- < "" ; > ; \
- < "Thorsten Ziehm" ; > ; \
- < "" ; > ; \
- < "QA %PRODUCTNAME AUTOMATION" ; 8 ; > ; \
- < "" ; > ; \
- < "Thorsten Bosbach" ; > ; \
- < "Helge Delfs" ; > ; \
- < "Joerg Sievers" ; > ; \
- < "" ; > ; \
- < "QA %PRODUCTNAME WRITER" ; 8 ; > ; \
- < "" ; > ; \
- < "Stefan Baltzer" ; > ; \
- < "Hasan Ilter" ; > ; \
- < "Michael Ruess" ; > ; \
- < "Eric Savary" ; > ; \
- < "Ulf Stroehler" ; > ; \
- < "" ; > ; \
- < "QA %PRODUCTNAME CALC" ; 8 ; > ; \
- < "" ; > ; \
- < "Oliver Craemer" ; > ; \
- < "Thomas Klarhoefer" ; > ; \
- < "Frank Stecher" ; > ; \
- < "" ; > ; \
- < "QA %PRODUCTNAME IMPRESS & BASE" ; 8 ; > ; \
- < "" ; > ; \
- < "Christoph Lukasiak" ; > ; \
- < "Marc Neumann" ; > ; \
- < "Wolfram Garten" ; > ; \
- < "Christian Guenther" ; > ; \
- < "" ; > ; \
- < "QA %PRODUCTNAME INFRASTRUCTURE" ; 8 ; > ; \
- < "" ; > ; \
- < "Olaf Felka" ; > ; \
- < "Thorsten Martens" ; > ; \
- < "Joerg W. Skottke" ; > ; \
- < "Andreas Treumann" ; > ; \
- < "" ; > ; \
- < "INFORMATION TECHNOLOGY" ; 8 ; > ; \
- < "" ; > ; \
- < "Dirk Marquardt" ; > ; \
- < "Gerd Weiss" ; > ; \
- < "" ; > ; \
- < "" ; > ; \
- < "MANUALS & ONLINE HELP" ; 8 ; > ; \
- < "" ; > ; \
- < "Frank Peters" ; > ; \
- < "" ; > ; \
- < "Clayton Cornell" ; > ; \
- < "Uwe Fischer" ; > ; \
- < "Martina Waller" ; > ; \
- < "" ; > ; \
- < "" ; > ; \
- < "GLOBALIZATION PROGRAM MANAGEMENT" ; 8 ; > ; \
- < "" ; > ; \
- < "Rafaella Braconi" ; > ; \
- < "" ; > ; \
- < "MARKETING & OPERATIONS" ; 8 ; > ; \
- < "" ; > ; \
- < "PRODUCT MANAGMENT" ; 8 ; > ; \
- < "" ; > ; \
- < "Goetz Wohlberg" ; > ; \
- < "Lutz Hoeger" ; > ; \
- < "" ; > ; \
- < "MARKETING" ; 8 ; > ; \
- < "" ; > ; \
- < "Rosana Ardila Biela" ; > ; \
- < "Kay Koll" ; > ; \
- < "Iyer Venkatesan" ; > ; \
- < "" ; > ; \
- < "OPERATIONS" ; 8 ; > ; \
- < "" ; > ; \
- < "Parker Proffitt" ; > ; \
- < "" ; > ; \
- < "SUN SIGMA BLACK BELT" ; 8 ; > ; \
- < "" ; > ; \
- < "Stefan Zimmermann" ; > ; \
- < "" ; > ; \
-};\
-
-#define TEXT_DEFAULTABOUT \
- Text [ x-comment ] = "PB: ; PB: only %PRODUCTNAME"; \
- Text [ en-US ] = "About %PRODUCTNAME" ; \
-
-// ******************************************************************* EOF
-
diff --git a/svx/source/intro/about_ooo.src b/svx/source/intro/about_ooo.src
new file mode 100644
index 000000000000..b49a0ff927cf
--- /dev/null
+++ b/svx/source/intro/about_ooo.src
@@ -0,0 +1,40 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <svtools/svtools.hrc>
+#include "about_ooo.hrc"
+
+String ABOUT_STR_COPYRIGHT
+{
+ Text[ en-US ] = "Copyright © 2000, 2010 Oracle and/or its affiliates. All rights reserved.\nThis product was created by %OOOVENDOR, based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at\n http://www.openoffice.org/welcome/credits.html.";
+};
+
+StringArray ABOUT_STR_DEVELOPER_ARY
+{
+ OOO_CONTRIBUTOR_LIST
+};
+
diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src
deleted file mode 100644
index 7b9067662c7a..000000000000
--- a/svx/source/intro/iso.src
+++ /dev/null
@@ -1,226 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVTOOLS_IMAGEMGR_HRC
-#include <svtools/imagemgr.hrc>
-#endif
-
-#ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
-#endif
-
-#include "intro.hrc"
-String RID_APPTITLE
-{
- Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION" ;
-};
-
-// der String wird fuer die Registrierung gebraucht: 01 Voll, 02 OEM, 03 Vobis
-String STR_VERSION_TYPE
-{
- Text = "01";
-};
-
-// der String wird fuer die Registrierung gebraucht - hier steht die Version zweistellig!
-String STR_VERSION_ID
-{
- Text = "50";
-};
-
-String RID_BUILDVERSION
-{
- Text = UPDVER ;
-};
-
-ModalDialog RID_DEFAULTABOUT
-{
- HelpID = "svx:ModalDialog:RID_DEFAULTABOUT";
- OutputSize = TRUE ;
- Size = MAP_APPFONT ( 245 , 260 ) ;
- Moveable = TRUE ;
- SVLook = TRUE ;
- TEXT_DEFAULTABOUT
- OKButton ABOUT_BTN_OK
- {
- DefButton = TRUE ;
- Pos = MAP_APPFONT ( 174 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- FixedText ABOUT_FTXT_VERSION
- {
- Pos = MAP_APPFONT ( 54 , 6 ) ;
- Size = MAP_APPFONT ( 118 , 16 ) ;
- WordBreak = TRUE ;
- Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ;
- };
- MultiLineEdit ABOUT_FTXT_COPYRIGHT
- {
- HelpID = "svx:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 54 , 25 ) ;
- Size = MAP_APPFONT ( 168 , 51 ) ;
- IgnoreTab = TRUE ;
- ReadOnly = TRUE ;
- AutoVScroll = TRUE ;
- };
- String ABOUT_STR_COPYRIGHT
- {
- Text[ en-US ] = "Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.\n\nThis software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.\n\nThe information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.\n\nIf this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:\n\nU.S. GOVERNMENT RIGHTS\nPrograms, software, databases, and related documentation and technical data delivered to U.S. Government customers are \"commercial computer software\" or \"commercial technical data\" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.\n\nThis software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.\n\nOracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.\n\nThis software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.\n\nThis product is based on the OpenOffice.org project.";
- };
- StringArray ABOUT_STR_DEVELOPER_ARY
- {
- DEVELOPER_LIST
- };
- String ABOUT_STR_FRENCH_COPYRIGHT
- {
- Text = "Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.\n\nThis software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.\n\nThe information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.\n\nIf this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:\n\nU.S. GOVERNMENT RIGHTS\nPrograms, software, databases, and related documentation and technical data delivered to U.S. Government customers are ""commercial computer software"" or ""commercial technical data"" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.\n\nThis software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.\n\nOracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.\n\nThis software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.\n\nThis product is based on the OpenOffice.org project." ;
- };
- String ABOUT_STR_ACCEL
- {
- Text = "SDT" ;
- };
-};
-
-#define MASK_COL MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } ;
-#define IMGLST_IDLST \
- IdList = { \
- SID_GENERAL_OPTIONS; \
- SID_LANGUAGE_OPTIONS; \
- SID_INET_DLG; \
- SID_SW_EDITOPTIONS; \
- SID_SW_ONLINEOPTIONS; \
- SID_SC_EDITOPTIONS; \
- SID_SD_EDITOPTIONS; \
- SID_SD_GRAPHIC_OPTIONS; \
- SID_SM_EDITOPTIONS; \
- SID_SCH_EDITOPTIONS; \
- SID_SB_STARBASEOPTIONS; \
- SID_FILTER_DLG; \
- }; \
- IdCount = { \
- 12; \
- };
-
-ImageList RID_IMGLIST_TREEOPT
-{
- Prefix = "tr";
- MASK_COL
- IMGLST_IDLST
-};
-ImageList RID_IMGLIST_TREEOPT_HC
-{
- Prefix = "trh";
- MASK_COL
- IMGLST_IDLST
-};
-
-#define MASK_COL2 MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; } ;
-#define X_IMAGE_LIST \
- IdList = { \
- IMG_IMPRESS ; \
- IMG_CALC ; \
- IMG_CALCTEMPLATE ; \
- IMG_CHART ; \
- IMG_IMPRESSTEMPLATE ; \
- IMG_HTML ; \
- IMG_MATH ; \
- IMG_WRITER ; \
- IMG_WRITERTEMPLATE ; \
- IMG_MACROLIB ; \
- IMG_GLOBAL_DOC ; \
- IMG_DRAW ; \
- IMG_DRAWTEMPLATE ; \
- IMG_NEWFROMTEMPLATE ; \
- IMG_DATABASE ; \
- }; \
- IdCount = { \
- 15; \
- };
-
-ImageList RID_SVTOOLS_IMAGELIST_BIG
-{
- Prefix = "lx";
- MASK_COL2
- X_IMAGE_LIST
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_SMALL
-{
- Prefix = "sx";
- MASK_COL2
- X_IMAGE_LIST
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST
-{
- Prefix = "lxh";
- MASK_COL2
- X_IMAGE_LIST
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST
-{
- Prefix = "sxh";
- MASK_COL2
- X_IMAGE_LIST
-};
-
-// ******************************************************************* EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/intro/makefile.mk b/svx/source/intro/makefile.mk
deleted file mode 100644
index 4d0686baac04..000000000000
--- a/svx/source/intro/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$
-
-PRJNAME=svx
-TARGET=intro
-
-# --- Settings ------------------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-RSCLOCINC!:=$(RSCLOCINC);$(PRJ)$/RES
-
-# --- Allgemein -----------------------------------------------------------
-
-LOCALIZE_ME=intro_tmpl.hrc
-
-SRS1NAME= iso
-SRC1FILES= \
- $(SRS1NAME).src
-
-RESLIB1NAME=$(SRS1NAME)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES= \
- $(SRS)$/$(SRS1NAME).srs
-
-# Version "OpenOffice.org"
-SRS2NAME= ooo
-SRC2FILES= \
- $(SRS2NAME).src
-
-RESLIB2NAME=$(SRS2NAME)
-RESLIB2IMAGES=$(PRJ)$/res
-RESLIB2SRSFILES= \
- $(SRS)$/$(SRS2NAME).srs
-
-.INCLUDE : target.mk
-
-$(SRS)$/iso.srs: $(INCCOM)$/intro.hrc
-$(SRS)$/ooo.srs: $(INCCOM)$/intro.hrc
-
diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src
deleted file mode 100644
index 7f6f0ed6ff47..000000000000
--- a/svx/source/intro/ooo.src
+++ /dev/null
@@ -1,196 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
-#endif
-
-#ifndef _SVTOOLS_IMAGEMGR_HRC
-#include <svtools/imagemgr.hrc>
-#endif
-
-#ifndef _SFX_HRC
-#include <sfx2/sfx.hrc>
-#endif
-
-#include <svx/svxids.hrc>
-#include "intro.hrc"
-
-String RID_APPTITLE
-{
- Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION" ;
-};
-
-// der String wird fuer die Registrierung gebraucht: 01 Voll, 02 OEM, 03 Vobis
-String STR_VERSION_TYPE
-{
- Text = "01";
-};
-
-// der String wird fuer die Registrierung gebraucht - hier steht die Version zweistellig!
-String STR_VERSION_ID
-{
- Text = "50";
-};
-
-String RID_BUILDVERSION
-{
- Text = UPDVER ;
-};
-
-ModalDialog RID_DEFAULTABOUT
-{
- HelpID = "svx:ModalDialog:RID_DEFAULTABOUT";
- OutputSize = TRUE ;
- Size = MAP_APPFONT ( 245 , 260 ) ;
- Moveable = TRUE ;
- SVLook = TRUE ;
- TEXT_DEFAULTABOUT
- OKButton ABOUT_BTN_OK
- {
- DefButton = TRUE ;
- Pos = MAP_APPFONT ( 174 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- FixedText ABOUT_FTXT_VERSION
- {
- Pos = MAP_APPFONT ( 54 , 6 ) ;
- Size = MAP_APPFONT ( 118 , 16 ) ;
- WordBreak = TRUE ;
- Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ;
- };
- MultiLineEdit ABOUT_FTXT_COPYRIGHT
- {
- HelpID = "svx:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 54 , 25 ) ;
- Size = MAP_APPFONT ( 168 , 51 ) ;
- IgnoreTab = TRUE ;
- ReadOnly = TRUE ;
- AutoVScroll = TRUE ;
- };
- String ABOUT_STR_COPYRIGHT
- {
- Text[ en-US ] = "Copyright © 2000, 2010 Oracle and/or its affiliates. All rights reserved.\nThis product was created by %OOOVENDOR, based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at\n http://www.openoffice.org/welcome/credits.html.";
- };
- StringArray ABOUT_STR_DEVELOPER_ARY
- {
- OOO_CONTRIBUTOR_LIST
- };
- String ABOUT_STR_ACCEL
- {
- Text = "SDT" ;
- };
-};
-
-// imagelist with images of the "New" menu and the file open dialog
-
-#define MASK_COL2 MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; } ;
-#define X_IMAGE_LIST \
- IdList = { \
- IMG_IMPRESS ; \
- IMG_CALC ; \
- IMG_CALCTEMPLATE ; \
- IMG_CHART ; \
- IMG_IMPRESSTEMPLATE ; \
- IMG_HTML ; \
- IMG_MATH ; \
- IMG_WRITER ; \
- IMG_WRITERTEMPLATE ; \
- IMG_MACROLIB ; \
- IMG_GLOBAL_DOC ; \
- IMG_DRAW ; \
- IMG_DRAWTEMPLATE ; \
- IMG_NEWFROMTEMPLATE ; \
- IMG_DATABASE; \
- }; \
- IdCount = { \
- 15; \
- };
-
-ImageList RID_SVTOOLS_IMAGELIST_BIG
-{
- Prefix = "lx";
- MASK_COL2
- X_IMAGE_LIST
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_SMALL
-{
- Prefix = "sx";
- MASK_COL2
- X_IMAGE_LIST
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST
-{
- Prefix = "lxh";
- MASK_COL2
- X_IMAGE_LIST
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST
-{
- Prefix = "sxh";
- MASK_COL2
- X_IMAGE_LIST
-};
-
-#define MASK_COL MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } ;
-#define IMGLST_IDLST \
- IdList = { \
- SID_GENERAL_OPTIONS; \
- SID_LANGUAGE_OPTIONS; \
- SID_INET_DLG; \
- SID_SW_EDITOPTIONS; \
- SID_SW_ONLINEOPTIONS; \
- SID_SC_EDITOPTIONS; \
- SID_SD_EDITOPTIONS; \
- SID_SD_GRAPHIC_OPTIONS; \
- SID_SM_EDITOPTIONS; \
- SID_SCH_EDITOPTIONS; \
- SID_SB_STARBASEOPTIONS; \
- SID_FILTER_DLG; \
- }; \
- IdCount = { \
- 12; \
- };
-
-ImageList RID_IMGLIST_TREEOPT
-{
- Prefix = "tr";
- MASK_COL
- IMGLST_IDLST
-};
-
-ImageList RID_IMGLIST_TREEOPT_HC
-{
- Prefix = "trh";
- MASK_COL
- IMGLST_IDLST
-};
-
diff --git a/svx/source/items/makefile.mk b/svx/source/items/makefile.mk
deleted file mode 100644
index 188e6171bd26..000000000000
--- a/svx/source/items/makefile.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=svxpch
-PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
-#ENABLE_EXCEPTIONS=TRUE
-
-PRJNAME=svx
-TARGET=items
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=svxitems
-SRC1FILES = \
- svxerr.src \
- svxitems.src
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
- $(SLO)$/drawitem.obj \
- $(SLO)$/chrtitem.obj \
- $(SLO)$/e3ditem.obj \
- $(SLO)$/grfitem.obj \
- $(SLO)$/clipfmtitem.obj \
- $(SLO)$/customshapeitem.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
- $(SLO)$/ofaitem.obj \
- $(SLO)$/postattr.obj \
- $(SLO)$/hlnkitem.obj \
- $(SLO)$/pageitem.obj \
- $(SLO)$/viewlayoutitem.obj \
- $(SLO)$/algitem.obj \
- $(SLO)$/rotmodit.obj \
- $(SLO)$/numinf.obj \
- $(SLO)$/svxerr.obj \
- $(SLO)$/numfmtsh.obj \
- $(SLO)$/zoomitem.obj \
- $(SLO)$/svxempty.obj \
- $(SLO)$/SmartTagItem.obj \
- $(SLO)$/zoomslideritem.obj \
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-EXCEPTIONSFILES= \
- $(SLO)$/customshapeitem.obj
-
-.INCLUDE : target.mk
-
diff --git a/svx/source/mnuctrls/makefile.mk b/svx/source/mnuctrls/makefile.mk
deleted file mode 100644
index 31c8e532143f..000000000000
--- a/svx/source/mnuctrls/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=svxpch
-PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
-
-ENABLE_EXCEPTIONS=TRUE
-
-PRJNAME=svx
-TARGET=mnuctrls
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
- mnuctrls.src
-
-SLOFILES= \
- $(SLO)$/clipboardctl.obj \
- $(SLO)$/fntctl.obj \
- $(SLO)$/fntszctl.obj \
- $(SLO)$/SmartTagCtl.obj
-
-HXX1TARGET=mnuctrls
-HXX1EXT= hxx
-HXX1EXCL= -E:*include*
-HXX1DEPN=\
- $(INC)$/svx/clipboardctl.hxx \
- $(INC)$/fntctl.hxx \
- $(INC)$/fntszctl.hxx \
- $(INC)$/SmartTagCtl.hxx
-
-EXCEPTIONSFILES= \
- $(SLO)$/SmartTagCtl.obj
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/svx/source/sdr/attribute/makefile.mk b/svx/source/sdr/attribute/makefile.mk
deleted file mode 100644
index 177654ff1e1c..000000000000
--- a/svx/source/sdr/attribute/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=svx
-TARGET=attribute
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
- $(SLO)$/sdrfilltextattribute.obj \
- $(SLO)$/sdrlinefillshadowtextattribute.obj \
- $(SLO)$/sdrlineshadowtextattribute.obj \
- $(SLO)$/sdrshadowtextattribute.obj \
- $(SLO)$/sdrtextattribute.obj \
- $(SLO)$/sdrformtextattribute.obj \
- $(SLO)$/sdrformtextoutlineattribute.obj
-
-.INCLUDE : target.mk
diff --git a/svx/source/sdr/contact/makefile.mk b/svx/source/sdr/contact/makefile.mk
deleted file mode 100644
index 9e4356c4aa52..000000000000
--- a/svx/source/sdr/contact/makefile.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJINC=$(PRJ)$/source
-
-PRJNAME=svx
-TARGET=contact
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=\
- $(SLO)$/viewobjectcontactofunocontrol.obj
-
-SLOFILES=\
- $(EXCEPTIONSFILES) \
- $(SLO)$/displayinfo.obj \
- $(SLO)$/viewcontact.obj \
- $(SLO)$/viewcontactofe3d.obj \
- $(SLO)$/viewcontactofsdrobj.obj \
- $(SLO)$/viewcontactofvirtobj.obj \
- $(SLO)$/viewcontactoftextobj.obj \
- $(SLO)$/viewcontactofsdrrectobj.obj \
- $(SLO)$/viewcontactofsdrpathobj.obj \
- $(SLO)$/viewcontactofsdrole2obj.obj \
- $(SLO)$/viewcontactofsdrcircobj.obj \
- $(SLO)$/viewcontactofsdrcaptionobj.obj \
- $(SLO)$/viewcontactofsdrmeasureobj.obj \
- $(SLO)$/viewcontactofsdredgeobj.obj \
- $(SLO)$/viewcontactofsdrpage.obj \
- $(SLO)$/viewcontactofmasterpagedescriptor.obj \
- $(SLO)$/viewcontactofgroup.obj \
- $(SLO)$/viewcontactofe3dscene.obj \
- $(SLO)$/viewcontactofe3dcube.obj \
- $(SLO)$/viewcontactofe3dextrude.obj \
- $(SLO)$/viewcontactofe3dlathe.obj \
- $(SLO)$/viewcontactofe3dsphere.obj \
- $(SLO)$/viewcontactofe3dpolygon.obj \
- $(SLO)$/viewcontactofpageobj.obj \
- $(SLO)$/viewcontactofgraphic.obj \
- $(SLO)$/viewcontactofsdrobjcustomshape.obj \
- $(SLO)$/viewcontactofsdrmediaobj.obj \
- $(SLO)$/viewcontactofunocontrol.obj \
- $(SLO)$/objectcontact.obj \
- $(SLO)$/objectcontacttools.obj \
- $(SLO)$/objectcontactofobjlistpainter.obj \
- $(SLO)$/objectcontactofpageview.obj \
- $(SLO)$/viewobjectcontact.obj \
- $(SLO)$/viewobjectcontactofe3d.obj \
- $(SLO)$/viewobjectcontactredirector.obj \
- $(SLO)$/viewobjectcontactofsdrmediaobj.obj \
- $(SLO)$/viewobjectcontactofgroup.obj \
- $(SLO)$/viewobjectcontactofe3dscene.obj \
- $(SLO)$/viewobjectcontactofsdrpage.obj \
- $(SLO)$/viewobjectcontactofsdrobj.obj \
- $(SLO)$/viewobjectcontactofpageobj.obj \
- $(SLO)$/viewobjectcontactofsdrole2obj.obj \
- $(SLO)$/viewobjectcontactofgraphic.obj \
- $(SLO)$/viewobjectcontactofmasterpagedescriptor.obj \
- $(SLO)$/sdrmediawindow.obj
-
-.INCLUDE : target.mk
diff --git a/svx/source/sdr/overlay/makefile.mk b/svx/source/sdr/overlay/makefile.mk
deleted file mode 100644
index 155053826f0d..000000000000
--- a/svx/source/sdr/overlay/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=svx
-TARGET=overlay
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
- $(SLO)$/overlayanimatedbitmapex.obj \
- $(SLO)$/overlaybitmapex.obj \
- $(SLO)$/overlaycrosshair.obj \
- $(SLO)$/overlayhatchrect.obj \
- $(SLO)$/overlayhelpline.obj \
- $(SLO)$/overlayline.obj \
- $(SLO)$/overlaymanager.obj \
- $(SLO)$/overlaymanagerbuffered.obj \
- $(SLO)$/overlayobject.obj \
- $(SLO)$/overlayobjectcell.obj \
- $(SLO)$/overlayobjectlist.obj \
- $(SLO)$/overlaypolypolygon.obj \
- $(SLO)$/overlayprimitive2dsequenceobject.obj \
- $(SLO)$/overlayrollingrectangle.obj \
- $(SLO)$/overlayselection.obj \
- $(SLO)$/overlaytools.obj \
- $(SLO)$/overlaytriangle.obj
-
-.INCLUDE : target.mk
diff --git a/svx/source/sdr/primitive2d/makefile.mk b/svx/source/sdr/primitive2d/makefile.mk
deleted file mode 100644
index 078bc4bc977e..000000000000
--- a/svx/source/sdr/primitive2d/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=svx
-TARGET=primitive2d
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
- $(SLO)$/primitivefactory2d.obj \
- $(SLO)$/sdrdecompositiontools.obj \
- $(SLO)$/sdrattributecreator.obj \
- $(SLO)$/sdrellipseprimitive2d.obj \
- $(SLO)$/sdrrectangleprimitive2d.obj \
- $(SLO)$/sdrcustomshapeprimitive2d.obj \
- $(SLO)$/sdrcaptionprimitive2d.obj \
- $(SLO)$/sdrgrafprimitive2d.obj \
- $(SLO)$/sdrole2primitive2d.obj \
- $(SLO)$/sdrolecontentprimitive2d.obj \
- $(SLO)$/sdrpathprimitive2d.obj \
- $(SLO)$/sdrprimitivetools.obj \
- $(SLO)$/sdrmeasureprimitive2d.obj \
- $(SLO)$/sdrconnectorprimitive2d.obj \
- $(SLO)$/sdrtextprimitive2d.obj
-
-.INCLUDE : target.mk
diff --git a/svx/source/sdr/properties/makefile.mk b/svx/source/sdr/properties/makefile.mk
deleted file mode 100644
index 5296765769b1..000000000000
--- a/svx/source/sdr/properties/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=svx
-TARGET=properties
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
- $(SLO)$/properties.obj \
- $(SLO)$/emptyproperties.obj \
- $(SLO)$/pageproperties.obj \
- $(SLO)$/defaultproperties.obj \
- $(SLO)$/attributeproperties.obj \
- $(SLO)$/textproperties.obj \
- $(SLO)$/customshapeproperties.obj \
- $(SLO)$/rectangleproperties.obj \
- $(SLO)$/oleproperties.obj \
- $(SLO)$/captionproperties.obj \
- $(SLO)$/circleproperties.obj \
- $(SLO)$/connectorproperties.obj \
- $(SLO)$/e3dproperties.obj \
- $(SLO)$/e3dcompoundproperties.obj \
- $(SLO)$/e3dextrudeproperties.obj \
- $(SLO)$/e3dlatheproperties.obj \
- $(SLO)$/e3dsceneproperties.obj \
- $(SLO)$/e3dsphereproperties.obj \
- $(SLO)$/graphicproperties.obj \
- $(SLO)$/groupproperties.obj \
- $(SLO)$/measureproperties.obj \
- $(SLO)$/itemsettools.obj
-
-.INCLUDE : target.mk
diff --git a/svx/source/smarttags/makefile.mk b/svx/source/smarttags/makefile.mk
deleted file mode 100644
index e92a4c0a6b0a..000000000000
--- a/svx/source/smarttags/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svx
-TARGET=smarttags
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/SmartTagMgr.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
diff --git a/svx/source/src/app.src b/svx/source/src/app.src
index 934fbd76a86f..2fea800b4a00 100644
--- a/svx/source/src/app.src
+++ b/svx/source/src/app.src
@@ -29,6 +29,10 @@
#include "app.hrc"
//----------------------------------------------------------------------------
+String RID_APPTITLE
+{
+ Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION" ;
+};
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
diff --git a/svx/source/src/makefile.mk b/svx/source/src/makefile.mk
deleted file mode 100644
index c41b3e492e00..000000000000
--- a/svx/source/src/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-
-PRJ=..$/..$
-
-PRJNAME=svx
-TARGET=ofa
-
-# --- Settings ------------------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-RES1FILELIST=\
- $(SRS)$/app.srs \
- $(SOLARCOMMONRESDIR)$/basic.srs
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/src
-RESLIB1SRSFILES=$(RES1FILELIST)
-
-# --- Allgemein -----------------------------------------------------------
-
-SRS1NAME= app
-SRC1FILES= \
- app.src \
- errtxt.src
-
-.INCLUDE : target.mk
-
diff --git a/svx/source/stbctrls/makefile.mk b/svx/source/stbctrls/makefile.mk
deleted file mode 100644
index 71c639cecdd3..000000000000
--- a/svx/source/stbctrls/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=svxpch
-PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
-
-PRJNAME=svx
-TARGET=stbctrls
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
- stbctrls.src
-
-SLOFILES= \
- $(SLO)$/insctrl.obj \
- $(SLO)$/zoomctrl.obj \
- $(SLO)$/pszctrl.obj \
- $(SLO)$/selctrl.obj \
- $(SLO)$/modctrl.obj \
- $(SLO)$/xmlsecctrl.obj \
- $(SLO)$/zoomsliderctrl.obj
-
-EXCEPTIONSFILES= \
- $(SLO)$/zoomsliderctrl.obj
-
-HXX1TARGET=stbctrls
-HXX1EXT= hxx
-HXX1EXCL= -E:*include*
-HXX1DEPN=\
- $(INC)$/svx/insctrl.hxx \
- $(INC)$/svx/zoomctrl.hxx \
- $(INC)$/svx/pszctrl.hxx \
- $(INC)$/svx/selctrl.hxx \
- $(INC)$/svx/modctrl.hxx \
- $(INC)$/svx/xmlsecctrl.hxx \
- $(INC)$/zoomsliderctrl.hxx \
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/svx/source/svdraw/makefile.mk b/svx/source/svdraw/makefile.mk
deleted file mode 100644
index 514c5b6d2cbc..000000000000
--- a/svx/source/svdraw/makefile.mk
+++ /dev/null
@@ -1,124 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svx
-TARGET=svdraw
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
- $(SLO)$/svdxcgv.obj \
- $(SLO)$/svdmodel.obj \
- $(SLO)$/svdpage.obj \
- $(SLO)$/svdobj.obj \
- $(SLO)$/svdedtv1.obj \
- $(SLO)$/svdcrtv.obj \
- $(SLO)$/svdograf.obj \
- $(SLO)$/svdoole2.obj \
- $(SLO)$/svdhdl.obj \
- $(SLO)$/svdmrkv.obj \
- $(SLO)$/svdogrp.obj \
- $(SLO)$/svdotxln.obj \
- $(SLO)$/svdotextdecomposition.obj \
- $(SLO)$/svdotextpathdecomposition.obj \
- $(SLO)$/svdouno.obj \
- $(SLO)$/svdpagv.obj \
- $(SLO)$/svddrgmt.obj \
- $(SLO)$/svdpntv.obj \
- $(SLO)$/svdsnpv.obj \
- $(SLO)$/svdview.obj \
- $(SLO)$/svdtext.obj \
- $(SLO)$/svdoashp.obj \
- $(SLO)$/svdoattr.obj \
- $(SLO)$/svdotext.obj \
- $(SLO)$/svdotxat.obj \
- $(SLO)$/svdotxdr.obj \
- $(SLO)$/svdotxed.obj \
- $(SLO)$/svdotxfl.obj \
- $(SLO)$/svdotxtr.obj \
- $(SLO)$/svdorect.obj \
- $(SLO)$/svdoedge.obj \
- $(SLO)$/svdomeas.obj \
- $(SLO)$/svdopath.obj \
- $(SLO)$/svdocapt.obj \
- $(SLO)$/svdocirc.obj \
- $(SLO)$/svdopage.obj \
- $(SLO)$/svdoutl.obj \
- $(SLO)$/svdovirt.obj \
- $(SLO)$/svdoutlinercache.obj \
- $(SLO)$/gradtrns.obj \
- $(SLO)$/svdattr.obj \
- $(SLO)$/svddrag.obj \
- $(SLO)$/svddrgv.obj \
- $(SLO)$/svdedtv2.obj \
- $(SLO)$/svdedxv.obj \
- $(SLO)$/svdetc.obj \
- $(SLO)$/sdrhittesthelper.obj \
- $(SLO)$/svdfmtf.obj \
- $(SLO)$/svdglev.obj \
- $(SLO)$/svdglue.obj \
- $(SLO)$/svdhlpln.obj \
- $(SLO)$/svditer.obj \
- $(SLO)$/svdlayer.obj \
- $(SLO)$/svdmark.obj \
- $(SLO)$/svdmrkv1.obj \
- $(SLO)$/sdrcomment.obj \
- $(SLO)$/sdrmasterpagedescriptor.obj \
- $(SLO)$/sdrpagewindow.obj \
- $(SLO)$/sdrpaintwindow.obj \
- $(SLO)$/svdpoev.obj \
- $(SLO)$/svdtrans.obj \
- $(SLO)$/svdundo.obj \
- $(SLO)$/svdviter.obj \
- $(SLO)$/clonelist.obj \
- $(SLO)$/svdedtv.obj \
- $(SLO)$/selectioncontroller.obj \
- $(SLO)$/polypolygoneditor.obj \
- $(SLO)$/svdibrow.obj \
- $(SLO)$/svdomedia.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
- $(SLO)$/ActionDescriptionProvider.obj \
- $(SLO)$/impgrfll.obj
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-SRS1NAME=svdstr
-SRC1FILES= svdstr.src
-
-.INCLUDE : target.mk
diff --git a/svx/source/table/makefile.mk b/svx/source/table/makefile.mk
deleted file mode 100644
index 1eaaef12aa02..000000000000
--- a/svx/source/table/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=svxpch
-PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
-
-PRJNAME=svx
-TARGET=table
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE;
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
- $(SLO)$/propertyset.obj\
- $(SLO)$/cell.obj\
- $(SLO)$/cellrange.obj\
- $(SLO)$/cellcursor.obj\
- $(SLO)$/tablerow.obj\
- $(SLO)$/tablerows.obj\
- $(SLO)$/tablecolumn.obj\
- $(SLO)$/tablecolumns.obj\
- $(SLO)$/tablemodel.obj\
- $(SLO)$/svdotable.obj\
- $(SLO)$/viewcontactoftableobj.obj\
- $(SLO)$/tablelayouter.obj\
- $(SLO)$/tablehandles.obj\
- $(SLO)$/tablecontroller.obj\
- $(SLO)$/tableundo.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
- $(SLO)$/celleditsource.obj \
- $(SLO)$/tabledesign.obj \
- $(SLO)$/accessibletableshape.obj \
- $(SLO)$/accessiblecell.obj \
- $(SLO)$/tablertfexporter.obj \
- $(SLO)$/tablertfimporter.obj
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-SRS1NAME=table
-SRC1FILES= table.src
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/svx/source/tbxctrls/makefile.mk b/svx/source/tbxctrls/makefile.mk
deleted file mode 100644
index 351ed4f162ef..000000000000
--- a/svx/source/tbxctrls/makefile.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svx
-TARGET=tbxctrls
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
- $(SLO)$/fontworkgallery.obj\
- $(SLO)$/extrusioncontrols.obj \
- $(SLO)$/tbcontrl.obj \
- $(SLO)$/tbxcolorupdate.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
- $(SLO)$/formatpaintbrushctrl.obj\
- $(SLO)$/colrctrl.obj \
- $(SLO)$/fillctrl.obj \
- $(SLO)$/grafctrl.obj \
- $(SLO)$/itemwin.obj \
- $(SLO)$/layctrl.obj \
- $(SLO)$/lboxctrl.obj \
- $(SLO)$/linectrl.obj \
- $(SLO)$/tbxalign.obj \
- $(SLO)$/tbxdrctl.obj \
- $(SLO)$/verttexttbxctrl.obj \
- $(SLO)$/subtoolboxcontrol.obj \
- $(SLO)$/tbxcolor.obj \
- $(SLO)$/tbunocontroller.obj \
- $(SLO)$/tbunosearchcontrollers.obj
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
- fontworkgallery.src \
- extrusioncontrols.src \
- colrctrl.src \
- lboxctrl.src \
- linectrl.src \
- tbcontrl.src \
- tbunosearchcontrollers.src \
- grafctrl.src
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/svx/source/toolbars/makefile.mk b/svx/source/toolbars/makefile.mk
deleted file mode 100644
index 40c7f2ccb73e..000000000000
--- a/svx/source/toolbars/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=svxpch
-PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
-
-PRJNAME=svx
-TARGET=toolbars
-ENABLE_EXCEPTIONS=TRUE;
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=toolbars
-SRC1FILES = \
- extrusionbar.src \
- fontworkbar.src
-
-SLOFILES= \
- $(SLO)$/extrusionbar.obj \
- $(SLO)$/fontworkbar.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/svx/source/unodialogs/inc/buttongroup.hrc b/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc
index b99403b57e1f..b99403b57e1f 100644
--- a/svx/source/unodialogs/inc/buttongroup.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src
new file mode 100644
index 000000000000..9c94496a1747
--- /dev/null
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src
@@ -0,0 +1,293 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "chinese_dictionarydialog.hrc"
+#include "chinese_translationdialog.hrc"
+
+#include <svtools/controldims.hrc>
+
+#define DIRECTION_RADIOBUTTONS( D_XPOS, D_YPOS, D_FULLWIDTH ) \
+RadioButton RB_TO_SIMPLIFIED \
+{ \
+ Pos = MAP_APPFONT( D_XPOS, D_YPOS ); \
+ Size = MAP_APPFONT ( D_FULLWIDTH, RSC_CD_RADIOBUTTON_HEIGHT ) ; \
+ Text [ en-US ] = "~Traditional Chinese to simplified Chinese"; \
+}; \
+RadioButton RB_TO_TRADITIONAL \
+{ \
+ Pos = MAP_APPFONT( D_XPOS, D_YPOS + RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y ); \
+ Size = MAP_APPFONT ( D_FULLWIDTH, RSC_CD_RADIOBUTTON_HEIGHT ) ; \
+ Text [ en-US ] = "~Simplified Chinese to traditional Chinese"; \
+};
+
+//-----------------------------------------------------------------------------
+//defines for positions and sizes:
+
+#define FULL_WIDTH (245)
+#define FULL_HEIGHT (165)
+
+#define ROW_1 (RSC_SP_DLG_INNERBORDER_TOP)
+#define ROW_2 (ROW_1+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y)
+#define ROW_3 (ROW_2+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y)
+#define ROW_4 (ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_GROUP_Y)
+#define ROW_5 (ROW_4+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
+#define ROW_6 (ROW_5+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_CTRL_DESC_Y)
+
+#define ROW_5a (ROW_5+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y)
+#define ROW_5b (ROW_5a+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y)
+
+#define ROW_8 (FULL_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM-RSC_CD_PUSHBUTTON_HEIGHT)
+#define ROW_7 (ROW_8-RSC_CD_FIXEDLINE_HEIGHT-2)
+
+#define LIST_HEIGHT (ROW_7-RSC_SP_CTRL_Y-ROW_6)
+
+#define COL_WIDTH 60
+#define BUTTONCOL_WIDTH 40
+#define COL_1 (RSC_SP_DLG_INNERBORDER_LEFT+RSC_SP_FLGR_SPACE_X)
+#define COL_2 (COL_1+COL_WIDTH+1)
+#define COL_3 (COL_2+COL_WIDTH+1)
+#define COL_4 (FULL_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-BUTTONCOL_WIDTH)
+
+#define REST_COL_WIDTH (COL_4-COL_3-RSC_SP_CTRL_GROUP_X)
+
+//-----------------------------------------------------------------------------
+
+ModalDialog DLG_CHINESEDICTIONARY
+{
+ HelpID = "svx:ModalDialog:DLG_CHINESEDICTIONARY";
+ //HelpId = ;
+ Size = MAP_APPFONT( FULL_WIDTH, FULL_HEIGHT );
+ OutputSize = TRUE;
+ Closeable = TRUE ;
+ Moveable = TRUE ;
+ SVLook = TRUE;
+
+ Text [ en-US ] = "Edit Dictionary";
+
+ DIRECTION_RADIOBUTTONS( COL_1, ROW_1, FULL_WIDTH - COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT )
+
+ CheckBox CB_REVERSE
+ {
+ HelpID = "svx:CheckBox:DLG_CHINESEDICTIONARY:CB_REVERSE";
+ Pos = MAP_APPFONT ( COL_1, ROW_3 ) ;
+ Size = MAP_APPFONT ( FULL_WIDTH - COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT , RSC_CD_CHECKBOX_HEIGHT ) ;
+
+ Text [ en-US ] = "Reverse mapping";
+ };
+
+ FixedText FT_TERM
+ {
+ Pos = MAP_APPFONT ( COL_1 , ROW_4 ) ;
+ Size = MAP_APPFONT ( COL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "Term";
+ };
+ Edit ED_TERM
+ {
+ HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_TERM";
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( COL_1 , ROW_5 ) ;
+ Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
+ };
+
+
+ FixedText FT_MAPPING
+ {
+ Pos = MAP_APPFONT ( COL_2 , ROW_4 ) ;
+ Size = MAP_APPFONT ( COL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "Mapping";
+ };
+ Edit ED_MAPPING
+ {
+ HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_MAPPING";
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( COL_2 , ROW_5 ) ;
+ Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
+ };
+
+ FixedText FT_PROPERTY
+ {
+ Pos = MAP_APPFONT ( COL_3 , ROW_4 ) ;
+ Size = MAP_APPFONT ( REST_COL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "Property";
+ };
+ ListBox LB_PROPERTY
+ {
+ HelpID = "svx:ListBox:DLG_CHINESEDICTIONARY:LB_PROPERTY";
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( COL_3 , ROW_5 ) ;
+ Size = MAP_APPFONT ( REST_COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
+ DropDown = TRUE ;
+
+ stringlist [ en-US ] =
+ {
+ < "Other" ; Default ; > ;
+ < "Foreign" ; > ;
+ < "First name" ; > ;
+ < "Last name" ; > ;
+ < "Title" ; > ;
+ < "Status" ; > ;
+ < "Place name" ; > ;
+ < "Business" ; > ;
+ < "Adjective" ; > ;
+ < "Idiom" ; > ;
+ < "Abbreviation" ; > ;
+ < "Numerical" ; > ;
+ < "Noun" ; > ;
+ < "Verb" ; > ;
+ < "Brand name" ; > ;
+ };
+ };
+
+ Control CT_MAPPINGLIST
+ {
+ Pos = MAP_APPFONT ( COL_1, ROW_6 ) ;
+ Size = MAP_APPFONT ( COL_4 - COL_1 - RSC_SP_CTRL_GROUP_X, LIST_HEIGHT ) ;
+ TabStop = TRUE ;
+ };
+
+ PushButton PB_ADD
+ {
+ HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_ADD";
+ Pos = MAP_APPFONT( COL_4, ROW_5 );
+ Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT );
+
+ Text [ en-US ] = "~Add";
+ };
+ PushButton PB_MODIFY
+ {
+ HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_MODIFY";
+ Pos = MAP_APPFONT( COL_4, ROW_5a );
+ Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT );
+
+ Text [ en-US ] = "~Modify";
+ };
+ PushButton PB_DELETE
+ {
+ HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_DELETE";
+ Pos = MAP_APPFONT( COL_4, ROW_5b );
+ Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT );
+
+ Text [ en-US ] = "~Delete";
+ };
+
+ FixedLine FL_BOTTOMLINE
+ {
+ Pos = MAP_APPFONT ( 0 , ROW_7 ) ;
+ Size = MAP_APPFONT ( FULL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+ };
+
+ BUTTONS_OK_CANCEL_HELP_ABREAST( FULL_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT, ROW_8 )
+};
+
+//-----------------------------------------------------------------------------
+//defines for positions and sizes:
+
+#define T_FULL_WIDTH (220)
+#define T_FULL_HEIGHT (120)
+#define T_EDITBUTTON_WIDTH (75)
+
+#define T_COL_1 (RSC_SP_DLG_INNERBORDER_LEFT)
+#define T_COL_2 (T_COL_1+RSC_SP_FLGR_SPACE_X)
+#define T_COL_3 (T_COL_2+RSC_SP_CHK_TEXTINDENT)
+#define T_COL_4 (T_FULL_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-T_EDITBUTTON_WIDTH)
+
+#define T_ROW_1 (RSC_SP_DLG_INNERBORDER_TOP)
+#define T_ROW_2 (T_ROW_1+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_GROUP_Y)
+#define T_ROW_3 (T_ROW_2+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y)
+#define T_ROW_4 (T_ROW_3+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y)
+#define T_ROW_5 (T_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y)
+#define T_ROW_6 (T_ROW_5+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_GROUP_Y)
+
+#define T_ROW_8 (T_FULL_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM-RSC_CD_PUSHBUTTON_HEIGHT)
+#define T_ROW_7 (T_ROW_8-RSC_CD_FIXEDLINE_HEIGHT-2)
+
+//-----------------------------------------------------------------------------
+
+ModalDialog DLG_CHINESETRANSLATION
+{
+ HelpID = "svx:ModalDialog:DLG_CHINESETRANSLATION";
+ //HelpId = ;
+ Size = MAP_APPFONT( T_FULL_WIDTH, T_FULL_HEIGHT );
+ OutputSize = TRUE;
+ Closeable = TRUE ;
+ Moveable = TRUE ;
+ SVLook = TRUE;
+
+ Text [ en-US ] = "Chinese Conversion";
+
+ FixedLine FL_DIRECTION
+ {
+ Pos = MAP_APPFONT ( T_COL_1 , T_ROW_1 ) ;
+ Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Text [ en-US ] = "Conversion direction";
+ };
+
+ DIRECTION_RADIOBUTTONS( T_COL_2, T_ROW_2, (T_FULL_WIDTH - T_COL_2 - RSC_SP_DLG_INNERBORDER_RIGHT) )
+
+ CheckBox CB_USE_VARIANTS
+ {
+ HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_USE_VARIANTS";
+ Pos = MAP_APPFONT( T_COL_3, T_ROW_4 );
+ Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_3 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT ) ;
+
+ Text [ en-US ] = "~Use Taiwan, Hong Kong SAR, and Macao SAR character variants";
+ };
+
+ FixedLine FL_COMMONTERMS
+ {
+ Pos = MAP_APPFONT ( T_COL_1 , T_ROW_5 ) ;
+ Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Text [ en-US ] = "Common terms";
+ };
+
+ CheckBox CB_TRANSLATE_COMMONTERMS
+ {
+ HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_TRANSLATE_COMMONTERMS";
+ Pos = MAP_APPFONT( T_COL_2, T_ROW_6 );
+ Size = MAP_APPFONT ( T_COL_4 - T_COL_2, RSC_CD_CHECKBOX_HEIGHT ) ;
+
+ Text [ en-US ] = "Translate ~common terms";
+ };
+
+ PushButton PB_EDITTERMS
+ {
+ HelpID = "svx:PushButton:DLG_CHINESETRANSLATION:PB_EDITTERMS";
+ Pos = MAP_APPFONT( T_COL_4, T_ROW_6-(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_CHECKBOX_HEIGHT)/2 );
+ Size = MAP_APPFONT( T_EDITBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
+
+ Text [ en-US ] = "~Edit Terms...";
+ };
+
+ FixedLine T_FL_BOTTOMLINE
+ {
+ Pos = MAP_APPFONT ( 0 , T_ROW_7 ) ;
+ Size = MAP_APPFONT ( T_FULL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+ };
+
+ BUTTONS_OK_CANCEL_HELP_ABREAST( T_FULL_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT, T_ROW_8 )
+};
+
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index 213ddc22bace..7888884b6d78 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -64,7 +64,7 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent )
, m_aFL_Commonterms( this, TextConversionDlgs_ResId( FL_COMMONTERMS ) )
, m_aCB_Translate_Commonterms( this, TextConversionDlgs_ResId( CB_TRANSLATE_COMMONTERMS ) )
, m_aPB_Editterms( this, TextConversionDlgs_ResId( PB_EDITTERMS ) )
- , m_aFL_Bottomline( this, TextConversionDlgs_ResId( FL_BOTTOMLINE ) )
+ , m_aFL_Bottomline( this, TextConversionDlgs_ResId( T_FL_BOTTOMLINE ) )
, m_aBP_OK( this, TextConversionDlgs_ResId( PB_OK ) )
, m_aBP_Cancel( this, TextConversionDlgs_ResId( PB_CANCEL ) )
, m_aBP_Help( this, TextConversionDlgs_ResId( PB_HELP ) )
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc
index 5e593ef467a3..f7607cf087dd 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc
@@ -35,10 +35,9 @@
#define CB_USE_VARIANTS 1
#define CB_TRANSLATE_COMMONTERMS 2
-#define CB_REVERSE 3
#define FL_DIRECTION 1
#define FL_COMMONTERMS 2
-#define FL_BOTTOMLINE 3
+#define T_FL_BOTTOMLINE 3
#endif
diff --git a/svx/source/unodialogs/textconversiondlgs/makefile.mk b/svx/source/unodialogs/textconversiondlgs/makefile.mk
deleted file mode 100644
index ec0cdca2620e..000000000000
--- a/svx/source/unodialogs/textconversiondlgs/makefile.mk
+++ /dev/null
@@ -1,98 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=svx
-TARGET=textconversiondlgs
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-LOCALIZE_ME=chinese_direction_tmpl.hrc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/services.obj\
- $(SLO)$/resid.obj\
- $(SLO)$/chinese_dictionarydialog.obj\
- $(SLO)$/chinese_translationdialog.obj\
- $(SLO)$/chinese_translation_unodialog.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES= \
- chinese_translationdialog.src\
- chinese_dictionarydialog.src
-
-RESLIB1NAME=$(TARGET)
-RESLIB1SRSFILES= $(SRS)$/$(TARGET).srs
-
-.IF "$(GUI)" == "OS2"
-SHL1TARGET= txcnvdlg
-.ELSE
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-.ENDIF
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(SALLIB) \
- $(CPPUHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(COMPHELPERLIB) \
- $(TOOLSLIB) \
- $(TKLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(VCLLIB)
-
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-SHL1IMPLIB= i$(TARGET)
-SHL1DEPN= $(SHL1LIBS)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-
-
-# --- Targets ------------------------------------------------------
-.INCLUDE : target.mk
-
-$(SRS)$/$(TARGET).srs: $(INCCOM)$/chinese_direction.hrc
-$(SLO)$/chinese_dictionarydialog.obj: $(INCCOM)$/chinese_direction.hrc
-$(SLO)$/chinese_translationdialog.obj: $(INCCOM)$/chinese_direction.hrc
-
-
-ALLTAR : $(MISC)/textconversiondlgs.component
-
-$(MISC)/textconversiondlgs.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt textconversiondlgs.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt textconversiondlgs.component
diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx
index 02d18cef9c45..e0e8a8effb7f 100644
--- a/svx/source/unodialogs/textconversiondlgs/services.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/services.cxx
@@ -47,13 +47,13 @@ static struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetranslatio
extern "C"
{
//==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper(
diff --git a/svx/source/unodraw/makefile.mk b/svx/source/unodraw/makefile.mk
deleted file mode 100644
index 6815f28f4c79..000000000000
--- a/svx/source/unodraw/makefile.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svx
-TARGET=unodraw
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
- $(SLO)$/UnoGraphicExporter.obj \
- $(SLO)$/XPropertyTable.obj \
- $(SLO)$/UnoNameItemTable.obj \
- $(SLO)$/unoshape.obj \
- $(SLO)$/unoshap2.obj \
- $(SLO)$/unoshap3.obj \
- $(SLO)$/unoshap4.obj \
- $(SLO)$/unopage.obj \
- $(SLO)$/unoshtxt.obj \
- $(SLO)$/unoprov.obj \
- $(SLO)$/unomod.obj \
- $(SLO)$/unomlstr.obj \
- $(SLO)$/unogtabl.obj \
- $(SLO)$/unohtabl.obj \
- $(SLO)$/unobtabl.obj \
- $(SLO)$/unottabl.obj \
- $(SLO)$/unomtabl.obj \
- $(SLO)$/unodtabl.obj \
- $(SLO)$/gluepts.obj \
- $(SLO)$/tableshape.obj \
- $(SLO)$/shapepropertynotifier.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
- $(SLO)$/UnoNamespaceMap.obj \
- $(SLO)$/unopool.obj \
- $(SLO)$/unoctabl.obj \
- $(SLO)$/unoshcol.obj \
- $(SLO)$/recoveryui.obj
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-SRS1NAME=unodraw
-SRC1FILES = \
- unodraw.src
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/svx/source/unogallery/makefile.mk b/svx/source/unogallery/makefile.mk
deleted file mode 100755
index 113bd70db0ee..000000000000
--- a/svx/source/unogallery/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svx
-TARGET=unogallery
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/unogalthemeprovider.obj \
- $(SLO)$/unogaltheme.obj \
- $(SLO)$/unogalitem.obj
-
-# --- Target -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/svx/source/xml/makefile.mk b/svx/source/xml/makefile.mk
deleted file mode 100644
index 02e6f3ae1f23..000000000000
--- a/svx/source/xml/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svx
-TARGET=xml
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-SLOFILES = \
- $(SLO)$/xmlexport.obj \
- $(SLO)$/xmlxtimp.obj \
- $(SLO)$/xmlxtexp.obj \
- $(SLO)$/xmlgrhlp.obj \
- $(SLO)$/xmleohlp.obj
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/svx/source/xoutdev/makefile.mk b/svx/source/xoutdev/makefile.mk
deleted file mode 100644
index 1ed48bc71f08..000000000000
--- a/svx/source/xoutdev/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svx
-PROJECTPCH=xout
-PROJECTPCHSOURCE=xoutpch
-TARGET=xout
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/xattr.obj \
- $(SLO)$/xattr2.obj \
- $(SLO)$/xattrbmp.obj \
- $(SLO)$/xpool.obj \
- $(SLO)$/xtable.obj \
- $(SLO)$/xtabcolr.obj \
- $(SLO)$/xtablend.obj \
- $(SLO)$/xtabdash.obj \
- $(SLO)$/xtabhtch.obj \
- $(SLO)$/xtabgrdt.obj \
- $(SLO)$/xtabbtmp.obj \
- $(SLO)$/xexch.obj \
- $(SLO)$/_xpoly.obj \
- $(SLO)$/_xoutbmp.obj
-
-.INCLUDE : target.mk
diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
deleted file mode 100644
index 277581a4a7a7..000000000000
--- a/svx/util/makefile.mk
+++ /dev/null
@@ -1,216 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=svx
-TARGET=svx
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-RSCLOCINC+=-I$(PRJ)$/source$/svdraw
-
-HELPIDFILES= ..$/inc$/helpid.hrc
-
-# svxcore
-SHL1TARGET= svxcore$(DLLPOSTFIX)
-SHL1IMPLIB= isvxcore
-SHL1USE_EXPORTS=name
-
-SHL1OBJS= \
- $(SLO)$/coreservices.obj
-
-
-SHL1LIBS= \
- $(SLB)$/animation.lib \
- $(SLB)$/attribute.lib \
- $(SLB)$/contact.lib \
- $(SLB)$/customshapes-core.lib \
- $(SLB)$/dialogs-core.lib \
- $(SLB)$/engine3d-core.lib \
- $(SLB)$/event.lib \
- $(SLB)$/fmcomp-core.lib \
- $(SLB)$/form-core.lib \
- $(SLB)$/gal.lib \
- $(SLB)$/items-core.lib \
- $(SLB)$/overlay.lib \
- $(SLB)$/primitive2d.lib \
- $(SLB)$/primitive3d.lib \
- $(SLB)$/properties.lib \
- $(SLB)$/svdraw-core.lib \
- $(SLB)$/table-core.lib \
- $(SLB)$/tbxctrls-core.lib \
- $(SLB)$/toolbars.lib \
- $(SLB)$/unodraw-core.lib \
- $(SLB)$/xml.lib \
- $(SLB)$/xout.lib
-
-
-SHL1STDLIBS= \
- $(AVMEDIALIB) \
- $(BASEGFXLIB) \
- $(BASICLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(DRAWINGLAYERLIB) \
- $(EDITENGLIB) \
- $(FWELIB) \
- $(GOODIESLIB) \
- $(I18NISOLANGLIB) \
- $(I18NPAPERLIB) \
- $(ICUUCLIB) \
- $(LNGLIB) \
- $(SALLIB) \
- $(SFX2LIB) \
- $(SOTLIB) \
- $(SVLLIB) \
- $(SVTOOLLIB) \
- $(TKLIB) \
- $(TOOLSLIB) \
- $(UCBHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(VCLLIB) \
- $(VOSLIB) \
- $(XMLOFFLIB) \
-
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-DEFLIB1NAME=$(SHL1LIBS:b)
-
-# svx
-SHL2TARGET= svx$(DLLPOSTFIX)
-SHL2IMPLIB= i$(TARGET)
-SHL2USE_EXPORTS=name
-SHL2DEPN=$(SHL1TARGETN)
-
-SHL2LIBS= \
- $(SLB)$/svdraw.lib \
- $(SLB)$/form.lib \
- $(SLB)$/items.lib \
- $(SLB)$/dialogs.lib \
- $(SLB)$/mnuctrls.lib \
- $(SLB)$/stbctrls.lib \
- $(SLB)$/tbxctrls.lib \
- $(SLB)$/smarttags.lib \
- $(SLB)$/unodraw.lib \
- $(SLB)$/unogallery.lib\
- $(SLB)$/accessibility.lib \
- $(SLB)$/customshapes.lib \
- $(SLB)$/fmcomp.lib \
- $(SLB)$/engine3d.lib \
- $(SLB)$/table.lib
-
-.IF "(GUIBASE)" == "WIN"
-SHL2LIBS+=$(SLB)$/ibrwimp.lib
-.ENDIF # (WIN)
-
-SHL2STDLIBS= \
- $(BASEGFXLIB) \
- $(BASICLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(DRAWINGLAYERLIB) \
- $(EDITENGLIB) \
- $(GOODIESLIB) \
- $(I18NISOLANGLIB) \
- $(ICUUCLIB) \
- $(SALLIB) \
- $(SFX2LIB) \
- $(SOTLIB) \
- $(SVLLIB) \
- $(SVTOOLLIB) \
- $(SVXCORELIB) \
- $(TKLIB) \
- $(TOOLSLIB) \
- $(UCBHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(VCLLIB) \
- $(VOSLIB) \
- $(XMLOFFLIB) \
- $(XMLSCRIPTLIB) \
-
-
-.IF "$(GUI)"=="WNT"
-SHL2STDLIBS+=$(SHELLLIB)
-.ENDIF # WNT
-
-SHL2DEF= $(MISC)$/$(SHL2TARGET).def
-DEF2NAME= $(SHL2TARGET)
-DEFLIB2NAME=$(SHL2LIBS:b)
-
-.IF "$(debug)$(dbgutil)"!=""
-SHL2STDLIBS += $(CPPUHELPERLIB)
-.ENDIF # "$(debug)$(dbgutil)"!=""
-
-# ------------------------------------------------------------------------------
-
-# Resource files
-SRSFILELIST=\
- $(SRS)$/svdstr.srs \
- $(SRS)$/dialogs.srs \
- $(SRS)$/drawdlgs.srs \
- $(SRS)$/mnuctrls.srs \
- $(SRS)$/stbctrls.srs \
- $(SRS)$/tbxctrls.srs \
- $(SRS)$/svxitems.srs \
- $(SRS)$/form.srs \
- $(SRS)$/fmcomp.srs \
- $(SRS)$/engine3d.srs \
- $(SRS)$/unodraw.srs \
- $(SRS)$/accessibility.srs \
- $(SRS)$/table.srs \
- $(SRS)$/toolbars.srs
-
-RESLIB1NAME=svx
-RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw
-RESLIB1SRSFILES= $(SRSFILELIST)
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/svx.component $(MISC)/svxcore.component
-
-$(MISC)/svx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- svx.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt svx.component
-
-$(MISC)/svxcore.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- svxcore.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt svxcore.component
diff --git a/svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component b/svx/util/textconversiondlgs.component
index 184743583645..184743583645 100644
--- a/svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component
+++ b/svx/util/textconversiondlgs.component