summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2011-01-12 12:05:07 +0100
committerMathias Bauer <mba@openoffice.org>2011-01-12 12:05:07 +0100
commit1dca51dbbb12bf2655fe701ac856e3808f300a5c (patch)
treeee46d04e39f7a32d8ca2297acde37c4188f570f1 /svx
parent9b73b029b91f96922c055206ee820ea6b42647d6 (diff)
CWS gnumake3: #i116422#: convert svx to new build system
Diffstat (limited to 'svx')
-rw-r--r--svx/AllLangResTarget_about.mk45
-rw-r--r--svx/AllLangResTarget_ofa.mk46
-rw-r--r--svx/AllLangResTarget_svx.mk (renamed from svx/prj/target_res_svx.mk)81
-rw-r--r--svx/AllLangResTarget_textconversiondlgs.mk47
-rw-r--r--svx/Executable_gengal.mk75
-rw-r--r--svx/Library_svx.mk (renamed from svx/prj/target_lib_svx.mk)262
-rw-r--r--svx/Library_svxcore.mk (renamed from svx/prj/target_lib_svxcore.mk)404
-rw-r--r--svx/Library_textconversiondlgs.mk83
-rw-r--r--svx/Makefile12
-rw-r--r--svx/Module_svx.mk (renamed from svx/prj/target_module_svx.mk)36
-rw-r--r--svx/Package_inc.mk559
-rw-r--r--svx/Package_sdi.mk33
-rw-r--r--svx/prj/target_package_inc.mk154
-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.mk5
18 files changed, 1583 insertions, 557 deletions
diff --git a/svx/AllLangResTarget_about.mk b/svx/AllLangResTarget_about.mk
new file mode 100644
index 000000000000..9d2a37f4a911
--- /dev/null
+++ b/svx/AllLangResTarget_about.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# 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_AllLangResTarget_AllLangResTarget,about))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,about,svx))
+
+$(eval $(call gb_AllLangResTarget_add_srs,about,svx/about))
+
+$(eval $(call gb_SrsTarget_SrsTarget,svx/about))
+
+$(eval $(call gb_SrsTarget_set_include,svx/about,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(SRCDIR)/svx/inc/ \
+))
+
+$(eval $(call gb_SrsTarget_add_files,svx/about,\
+ svx/source/intro/about_ooo.src \
+))
+
diff --git a/svx/AllLangResTarget_ofa.mk b/svx/AllLangResTarget_ofa.mk
new file mode 100644
index 000000000000..07febc115938
--- /dev/null
+++ b/svx/AllLangResTarget_ofa.mk
@@ -0,0 +1,46 @@
+#*************************************************************************
+#
+# 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_AllLangResTarget_AllLangResTarget,ofa))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,ofa,svx))
+
+$(eval $(call gb_AllLangResTarget_add_srs,ofa,svx/ofa))
+
+$(eval $(call gb_SrsTarget_SrsTarget,svx/ofa))
+
+$(eval $(call gb_SrsTarget_set_include,svx/ofa,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(SRCDIR)/svx/inc/ \
+))
+
+$(eval $(call gb_SrsTarget_add_files,svx/ofa,\
+ svx/source/src/errtxt.src \
+ svx/source/src/app.src \
+))
+
diff --git a/svx/prj/target_res_svx.mk b/svx/AllLangResTarget_svx.mk
index 67d3cfab1cc1..cdbc9e13eed5 100644
--- a/svx/prj/target_res_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -43,70 +43,77 @@ $(eval $(call gb_SrsTarget_set_include,svx/res,\
-I$(SRCDIR)/svx/source/inc \
-I$(SRCDIR)/svx/source/dialog \
-I$(SRCDIR)/svx/inc/ \
- -I$(SRCDIR)/svx/unxlngi6.pro/inc/ \
))
+# ofa res:
#svx/source/src/errtxt.src
#svx/source/src/app.src
#svx/source/intro/iso.src
#svx/source/intro/ooo.src
+# textconversiondlgs res:
#svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src
#svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
+# localization of globlmn.hrc
+#echo LASTRUN_MERGED:=TRUE > ../unxlngx6.pro/inc/inc_lastrun.mk
+#mkdir ../unxlngx6.pro/inc/
+#rm -f ../unxlngx6.pro/inc/globlmn.hrc
+#: && LD_LIBRARY_PATH=/home/mathias/OOO/o_gnumake3/DEV300/ooo/solver/300/unxlngx6.pro/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} /home/mathias/OOO/o_gnumake3/DEV300/ooo/solver/300/unxlngx6.pro/bin/transex3 -p svx -i globlmn_tmpl.hrc -o ../unxlngx6.pro/inc//globlmn_tmpl.hrc.unxlngx6.pro -m /home/mathias/OOO/o_gnumake3/DEV300/ooo/l10n/unxlngx6.pro/misc/sdf/svx/inc/localize.sdf -l all
+#mv ../unxlngx6.pro/inc/globlmn_tmpl.hrc.unxlngx6.pro ../unxlngx6.pro/inc/globlmn.hrc
+
$(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/gallery2/gallery.src \
+ svx/source/gallery2/galtheme.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 \
))
-
diff --git a/svx/AllLangResTarget_textconversiondlgs.mk b/svx/AllLangResTarget_textconversiondlgs.mk
new file mode 100644
index 000000000000..0c25f77f018a
--- /dev/null
+++ b/svx/AllLangResTarget_textconversiondlgs.mk
@@ -0,0 +1,47 @@
+#*************************************************************************
+#
+# 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_AllLangResTarget_AllLangResTarget,textconversiondlgs))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,textconversiondlgs,svx))
+
+$(eval $(call gb_AllLangResTarget_add_srs,textconversiondlgs,\
+ svx/textconversiondlgs \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,svx/textconversiondlgs))
+
+$(eval $(call gb_SrsTarget_set_include,svx/textconversiondlgs,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(SRCDIR)/svx/inc/ \
+))
+
+$(eval $(call gb_SrsTarget_add_files,svx/textconversiondlgs,\
+ svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src \
+))
+
diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk
new file mode 100644
index 000000000000..9f65e5f4e26e
--- /dev/null
+++ b/svx/Executable_gengal.mk
@@ -0,0 +1,75 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Executable_Executable,gengal))
+
+$(eval $(call gb_Executable_set_include,gengal,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/svx/inc/ \
+ -I$(SRCDIR)/svx/inc/pch \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Executable_set_cxxflags,gengal,\
+ $$(CXXFLAGS) \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,gengal,\
+ sal \
+ tl \
+ tl \
+ svl \
+ comphelper \
+ cppu \
+ cppuhelper \
+ vcl \
+ ucbhelper \
+ svxcore \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,gengal,\
+ svx/source/gengal/gengal \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Executable_add_linked_libs,gengal,\
+ kernel32 \
+ msvcrt \
+ oldnames \
+ user32 \
+ uwinapi \
+))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_linked_libs,gengal,\
+ dl \
+ pthread \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/prj/target_lib_svx.mk b/svx/Library_svx.mk
index 6810f7f30fed..2ea9066b1f5a 100644
--- a/svx/prj/target_lib_svx.mk
+++ b/svx/Library_svx.mk
@@ -29,18 +29,16 @@ $(eval $(call gb_Library_Library,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 \
-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,\
@@ -70,159 +68,147 @@ $(eval $(call gb_Library_add_linked_libs,svx,\
stl \
))
-# 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)
diff --git a/svx/prj/target_lib_svxcore.mk b/svx/Library_svxcore.mk
index f337588232fb..5401963fb864 100644
--- a/svx/prj/target_lib_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -29,19 +29,31 @@ $(eval $(call gb_Library_Library,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
+#.IF ("$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC") || "$(OS)"=="MACOSX" || ("$(OS)"=="LINUX" && "$(CPU)"=="P")
+#NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj
+#.ENDIF
+
$(eval $(call gb_Library_set_defs,svxcore,\
$$(DEFS) \
- -DACCESSIBLE_LAYOUT \
-DSVX_DLLIMPLEMENTATION \
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
@@ -74,6 +86,107 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\
))
$(eval $(call gb_Library_add_exception_objects,svxcore,\
+ svx/source/core/coreservices \
+ svx/source/customshapes/EnhancedCustomShape2d \
+ svx/source/customshapes/EnhancedCustomShapeFunctionParser \
+ 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,137 +298,136 @@ $(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 \
))
ifeq ($(OS),LINUX)
@@ -439,7 +452,6 @@ 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..8d34482e45c0
--- /dev/null
+++ b/svx/Library_textconversiondlgs.mk
@@ -0,0 +1,83 @@
+#*************************************************************************
+#
+# 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_Library_Library,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) \
+ -DACCESSIBLE_LAYOUT \
+))
+
+$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ sal \
+ svl \
+ svt \
+ tk \
+ tl \
+ utl \
+ vcl \
+))
+
+$(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,svxcore,\
+ dl \
+ m \
+ pthread \
+ stl \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,svxcore,\
+ advapi32 \
+ kernel32 \
+ msvcrt \
+ oldnames \
+ user32 \
+ uwinapi \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/Makefile b/svx/Makefile
index 963c7870d955..5002d3f122a1 100644
--- a/svx/Makefile
+++ b/svx/Makefile
@@ -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/prj/target_module_svx.mk b/svx/Module_svx.mk
index 5978c97e5500..51393f2980ba 100644
--- a/svx/prj/target_module_svx.mk
+++ b/svx/Module_svx.mk
@@ -25,28 +25,24 @@
#
#*************************************************************************
-$(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_Module,svx))
-$(eval $(call gb_Module_read_includes,svx,\
- lib_svx \
- lib_svxcore \
- res_svx \
+$(eval $(call gb_Module_add_targets,svx,\
+ Library_svx \
+ Library_svxcore \
+ Library_textconversiondlgs \
+ AllLangResTarget_svx \
+ AllLangResTarget_ofa \
+ AllLangResTarget_about \
+ AllLangResTarget_textconversiondlgs \
+ Package_inc \
+ Package_sdi \
))
+# Executable_gengal \
+
#todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX
-#todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes
+#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
-
+#todo: globlmn.hrc
+#todo: component file
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
new file mode 100644
index 000000000000..4f19f856ab70
--- /dev/null
+++ b/svx/Package_inc.mk
@@ -0,0 +1,559 @@
+#*************************************************************************
+#
+# 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,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))
+
diff --git a/svx/Package_sdi.mk b/svx/Package_sdi.mk
new file mode 100644
index 000000000000..1fd307abbf67
--- /dev/null
+++ b/svx/Package_sdi.mk
@@ -0,0 +1,33 @@
+#*************************************************************************
+#
+# 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,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))
+
+
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/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
index ec0cdca2620e..7ed43d426226 100644
--- a/svx/source/unodialogs/textconversiondlgs/makefile.mk
+++ b/svx/source/unodialogs/textconversiondlgs/makefile.mk
@@ -31,8 +31,6 @@ TARGET=textconversiondlgs
ENABLE_EXCEPTIONS=TRUE
USE_DEFFILE=TRUE
-LOCALIZE_ME=chinese_direction_tmpl.hrc
-
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
@@ -48,8 +46,7 @@ SLOFILES= \
SRS1NAME=$(TARGET)
SRC1FILES= \
- chinese_translationdialog.src\
- chinese_dictionarydialog.src
+ chinese_dialogs.src
RESLIB1NAME=$(TARGET)
RESLIB1SRSFILES= $(SRS)$/$(TARGET).srs