diff options
264 files changed, 2919 insertions, 6725 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index cc3c7df91ca0..13ae406cb305 100755 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -39,8 +39,8 @@ #include <cppuhelper/implbase2.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/typeprovider.hxx> -#include <cppuhelper/extract.hxx> #include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> #include <rtl/ustrbuf.hxx> diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index 1e39befaf5f7..95aabb821b1a 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -32,7 +32,7 @@ #include "connectivity/FValue.hxx" #include "connectivity/CommonTools.hxx" #include <connectivity/dbconversion.hxx> -#include <cppuhelper/extract.hxx> +#include <comphelper/extract.hxx> #include <com/sun/star/io/XInputStream.hpp> #include <rtl/ustrbuf.hxx> #include <rtl/logfile.hxx> diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index a1a399af81c4..a2f602082fe4 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1665,14 +1665,8 @@ void Desktop::Main() // create title string sal_Bool bCheckOk = sal_False; ::com::sun::star::lang::Locale aLocale; - String aMgrName = String::CreateFromAscii( "iso" ); + String aMgrName = String::CreateFromAscii( "ofa" ); ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLocale ); - if ( !pLabelResMgr ) - { - // no "iso" resource -> search for "ooo" resource - aMgrName = String::CreateFromAscii( "ooo" ); - pLabelResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLocale); - } String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE, *pLabelResMgr ) ) : String(); delete pLabelResMgr; diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index 664e63c7f6ca..664e63c7f6ca 100644..100755 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 8bd8a6191201..8bd8a6191201 100644..100755 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx index 7ac00e2740d4..7ac00e2740d4 100644..100755 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx index 01511b1f2d21..01511b1f2d21 100644..100755 --- a/desktop/source/deployment/inc/dp_update.hxx +++ b/desktop/source/deployment/inc/dp_update.hxx diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 6eb547c4e98a..8939bb97d4e8 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -758,9 +758,10 @@ Reference<deploy::XPackage> ExtensionManager::addExtension( if (repository.equals(OUSTR("user"))) bUserDisabled2 = false; + ::rtl::OUString const name(xNewExtension->getName()); activateExtension( dp_misc::getIdentifier(xNewExtension), - xNewExtension->getName(), bUserDisabled2, false, xAbortChannel, + name, bUserDisabled2, false, xAbortChannel, Reference<ucb::XCommandEnvironment>()); } else diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 314537836921..314537836921 100644..100755 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx diff --git a/desktop/util/verinfo.rc b/desktop/util/verinfo.rc index 7d589956ec83..7d589956ec83 100644..100755 --- a/desktop/util/verinfo.rc +++ b/desktop/util/verinfo.rc diff --git a/desktop/win32/source/applauncher/ooo/verinfo.rc b/desktop/win32/source/applauncher/ooo/verinfo.rc index c13e723527fc..c13e723527fc 100644..100755 --- a/desktop/win32/source/applauncher/ooo/verinfo.rc +++ b/desktop/win32/source/applauncher/ooo/verinfo.rc diff --git a/desktop/win32/source/applauncher/verinfo.rc b/desktop/win32/source/applauncher/verinfo.rc index c0ff71494014..c0ff71494014 100644..100755 --- a/desktop/win32/source/applauncher/verinfo.rc +++ b/desktop/win32/source/applauncher/verinfo.rc diff --git a/editeng/AllLangResTarget_editeng.mk b/editeng/AllLangResTarget_editeng.mk new file mode 100755 index 000000000000..e2bd16e4885c --- /dev/null +++ b/editeng/AllLangResTarget_editeng.mk @@ -0,0 +1,50 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,editeng)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,editeng,svx)) + +$(eval $(call gb_AllLangResTarget_add_srs,editeng, editeng/res)) +$(eval $(call gb_SrsTarget_SrsTarget,editeng/res)) + +$(eval $(call gb_SrsTarget_set_include,editeng/res,\ + $$(INCLUDE) \ + -I$(SRCDIR)/editeng/inc \ +)) + +# add src files here (complete path relative to repository root) +$(eval $(call gb_SrsTarget_add_files,editeng/res,\ + editeng/source/accessibility/accessibility.src \ + editeng/source/editeng/editeng.src \ + editeng/source/items/page.src \ + editeng/source/items/svxitems.src \ + editeng/source/misc/lingu.src \ + editeng/source/outliner/outliner.src \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk new file mode 100755 index 000000000000..9213abedd3b1 --- /dev/null +++ b/editeng/Library_editeng.mk @@ -0,0 +1,167 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,editeng)) + +$(eval $(call gb_Library_add_package_headers,editeng,editeng_inc)) + +$(eval $(call gb_Library_add_precompiled_header,editeng,$(SRCDIR)/editeng/inc/pch/precompiled_editeng)) + +$(eval $(call gb_Library_set_include,editeng,\ + $$(INCLUDE) \ + -I$(SRCDIR)/editeng/inc/pch \ + -I$(SRCDIR)/editeng/inc \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,editeng,\ + $$(DEFS) \ + -DEDITENG_DLLIMPLEMENTATION \ +)) + +ifneq ($(strip $(EDITDEBUG)),) +$(eval $(call gb_Library_set_defs,editeng,\ + $$(DEFS) \ + -DEDITDEBUG \ +)) +endif + +$(eval $(call gb_Library_add_exception_objects,editeng,\ + editeng/inc/pch/precompiled_editeng \ + editeng/source/accessibility/AccessibleComponentBase \ + editeng/source/accessibility/AccessibleContextBase \ + editeng/source/accessibility/AccessibleEditableTextPara \ + editeng/source/accessibility/AccessibleHyperlink \ + editeng/source/accessibility/AccessibleImageBullet \ + editeng/source/accessibility/AccessibleParaManager \ + editeng/source/accessibility/AccessibleSelectionBase \ + editeng/source/accessibility/AccessibleStaticTextBase \ + editeng/source/accessibility/AccessibleStringWrap \ + editeng/source/editeng/editattr \ + editeng/source/editeng/editdbg \ + editeng/source/editeng/editdoc \ + editeng/source/editeng/editdoc2 \ + editeng/source/editeng/editeng \ + editeng/source/editeng/editobj \ + editeng/source/editeng/editsel \ + editeng/source/editeng/editundo \ + editeng/source/editeng/editview \ + editeng/source/editeng/edtspell \ + editeng/source/editeng/eehtml \ + editeng/source/editeng/eeng_pch \ + editeng/source/editeng/eeobj \ + editeng/source/editeng/eerdll \ + editeng/source/editeng/eertfpar \ + editeng/source/editeng/impedit \ + editeng/source/editeng/impedit2 \ + editeng/source/editeng/impedit3 \ + editeng/source/editeng/impedit4 \ + editeng/source/editeng/impedit5 \ + editeng/source/editeng/textconv \ + editeng/source/items/bulitem \ + editeng/source/items/charhiddenitem \ + editeng/source/items/flditem \ + editeng/source/items/frmitems \ + editeng/source/items/itemtype \ + editeng/source/items/numitem \ + editeng/source/items/optitems \ + editeng/source/items/paperinf \ + editeng/source/items/paraitem \ + editeng/source/items/svdfield \ + editeng/source/items/svxfont \ + editeng/source/items/textitem \ + editeng/source/items/writingmodeitem \ + editeng/source/items/xmlcnitm \ + editeng/source/misc/acorrcfg \ + editeng/source/misc/edtdlg \ + editeng/source/misc/forbiddencharacterstable \ + editeng/source/misc/hangulhanja \ + editeng/source/misc/splwrap \ + editeng/source/misc/svxacorr \ + editeng/source/misc/SvXMLAutoCorrectExport \ + editeng/source/misc/SvXMLAutoCorrectImport \ + editeng/source/misc/swafopt \ + editeng/source/misc/txtrange \ + editeng/source/misc/unolingu \ + editeng/source/outliner/outleeng \ + editeng/source/outliner/outlin2 \ + editeng/source/outliner/outliner \ + editeng/source/outliner/outlobj \ + editeng/source/outliner/outlundo \ + editeng/source/outliner/outlvw \ + editeng/source/outliner/outl_pch \ + editeng/source/outliner/paralist \ + editeng/source/rtf/rtfgrf \ + editeng/source/rtf/rtfitem \ + editeng/source/rtf/svxrtf \ + editeng/source/uno/unoedhlp \ + editeng/source/uno/unoedprx \ + editeng/source/uno/unoedsrc \ + editeng/source/uno/unofdesc \ + editeng/source/uno/unofield \ + editeng/source/uno/UnoForbiddenCharsTable \ + editeng/source/uno/unofored \ + editeng/source/uno/unoforou \ + editeng/source/uno/unoipset \ + editeng/source/uno/unonrule \ + editeng/source/uno/unopracc \ + editeng/source/uno/unotext \ + editeng/source/uno/unotext2 \ + editeng/source/uno/unoviwed \ + editeng/source/uno/unoviwou \ + editeng/source/xml/xmltxtexp \ + editeng/source/xml/xmltxtimp \ +)) + +# add libraries to be linked to editeng; again these names need to be given as +# specified in Repository.mk +$(eval $(call gb_Library_add_linked_libs,editeng,\ + xo \ + basegfx \ + lng \ + svt \ + tk \ + vcl \ + svl \ + stl \ + sot \ + utl \ + tl \ + comphelper \ + ucbhelper \ + cppuhelper \ + cppu \ + vos3 \ + sal \ + icuuc \ + i18nisolang1 \ + i18npaper \ + $(gb_STDLIBS) \ +)) + +# vim: set noet sw=4 ts=4: + diff --git a/svx/util/makefile.pmk b/editeng/Makefile index e0fffdb1fdeb..a79aff831024 100644..100755 --- a/svx/util/makefile.pmk +++ b/editeng/Makefile @@ -25,19 +25,14 @@ # #************************************************************************* -# define SVX_DLLIMPLEMENTATION (see @ svxdllapi.h) -CDEFS += -DSVX_DLLIMPLEMENTATION +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif -.IF "$(ENABLE_GTK)" != "" -CFLAGS+=-DENABLE_GTK -.ENDIF +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -.IF "$(ENABLE_KDE)" != "" -CFLAGS+=-DENABLE_KDE -.ENDIF +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -.IF "$(ENABLE_KDE4)" != "" -CFLAGS+=-DENABLE_KDE4 -.ENDIF - -VISIBILITY_HIDDEN=TRUE +# vim: set noet sw=4 ts=4: diff --git a/svx/inc/makefile.mk b/editeng/Module_editeng.mk index 37a079a68aa8..4a5dbcf30695 100644..100755 --- a/svx/inc/makefile.mk +++ b/editeng/Module_editeng.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,26 +25,21 @@ # #************************************************************************* -PRJ=.. +$(eval $(call gb_Module_Module,editeng)) -PRJNAME=svx -TARGET=inc +$(eval $(call gb_Module_add_targets,editeng,\ + AllLangResTarget_editeng \ + Library_editeng \ + Package_inc \ +)) -# --- Settings ----------------------------------------------------- +# add any runtime tests (unit tests) here +# remove if no tests +$(eval $(call gb_Module_add_check_targets,editeng,\ +)) -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -LOCALIZE_ME=globlmn_tmpl.hrc - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" +# add any subsequent checks (e.g. complex tests) here +$(eval $(call gb_Module_add_subsequentcheck_targets,editeng,\ +)) +# vim: set noet sw=4 ts=4: diff --git a/editeng/Package_inc.mk b/editeng/Package_inc.mk new file mode 100755 index 000000000000..d0c984a78a90 --- /dev/null +++ b/editeng/Package_inc.mk @@ -0,0 +1,154 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,editeng_inc,$(SRCDIR)/editeng/inc)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleComponentBase.hxx,editeng/AccessibleComponentBase.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleContextBase.hxx,editeng/AccessibleContextBase.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleEditableTextPara.hxx,editeng/AccessibleEditableTextPara.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleImageBullet.hxx,editeng/AccessibleImageBullet.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleParaManager.hxx,editeng/AccessibleParaManager.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleSelectionBase.hxx,editeng/AccessibleSelectionBase.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleStaticTextBase.hxx,editeng/AccessibleStaticTextBase.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleStringWrap.hxx,editeng/AccessibleStringWrap.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/acorrcfg.hxx,editeng/acorrcfg.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/adjitem.hxx,editeng/adjitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/akrnitem.hxx,editeng/akrnitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/blnkitem.hxx,editeng/blnkitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/bolnitem.hxx,editeng/bolnitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/borderline.hxx,editeng/borderline.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/boxitem.hxx,editeng/boxitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/brkitem.hxx,editeng/brkitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/brshitem.hxx,editeng/brshitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/bulitem.hxx,editeng/bulitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charhiddenitem.hxx,editeng/charhiddenitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charreliefitem.hxx,editeng/charreliefitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charrotateitem.hxx,editeng/charrotateitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charscaleitem.hxx,editeng/charscaleitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/cmapitem.hxx,editeng/cmapitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/cntritem.hxx,editeng/cntritem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/colritem.hxx,editeng/colritem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/crsditem.hxx,editeng/crsditem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/cscoitem.hxx,editeng/cscoitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editdata.hxx,editeng/editdata.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editeng.hxx,editeng/editeng.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editengdllapi.h,editeng/editengdllapi.h)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editerr.hxx,editeng/editerr.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editids.hrc,editeng/editids.hrc)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editobj.hxx,editeng/editobj.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editrids.hrc,editeng/editrids.hrc)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editstat.hxx,editeng/editstat.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editund2.hxx,editeng/editund2.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editview.hxx,editeng/editview.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/edtdlg.hxx,editeng/edtdlg.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eedata.hxx,editeng/eedata.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eeitem.hxx,editeng/eeitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eeitemid.hxx,editeng/eeitemid.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eerdll.hxx,editeng/eerdll.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/emphitem.hxx,editeng/emphitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/escpitem.hxx,editeng/escpitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fhgtitem.hxx,editeng/fhgtitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/flditem.hxx,editeng/flditem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/flstitem.hxx,editeng/flstitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fontitem.hxx,editeng/fontitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/forbiddencharacterstable.hxx,editeng/forbiddencharacterstable.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/forbiddenruleitem.hxx,editeng/forbiddenruleitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/frmdir.hxx,editeng/frmdir.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/frmdiritem.hxx,editeng/frmdiritem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fwdtitem.hxx,editeng/fwdtitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hangulhanja.hxx,editeng/hangulhanja.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hngpnctitem.hxx,editeng/hngpnctitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hyznitem.hxx,editeng/hyznitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/itemtype.hxx,editeng/itemtype.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/keepitem.hxx,editeng/keepitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/kernitem.hxx,editeng/kernitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/langitem.hxx,editeng/langitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/lcolitem.hxx,editeng/lcolitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/lrspitem.hxx,editeng/lrspitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/lspcitem.hxx,editeng/lspcitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/measfld.hxx,editeng/measfld.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/memberids.hrc,editeng/memberids.hrc)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/mutxhelp.hxx,editeng/mutxhelp.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/nhypitem.hxx,editeng/nhypitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/nlbkitem.hxx,editeng/nlbkitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/numdef.hxx,editeng/numdef.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/numitem.hxx,editeng/numitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/opaqitem.hxx,editeng/opaqitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/optitems.hxx,editeng/optitems.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/orphitem.hxx,editeng/orphitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/outliner.hxx,editeng/outliner.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/outlobj.hxx,editeng/outlobj.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/paperinf.hxx,editeng/paperinf.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/paragraphdata.hxx,editeng/paragraphdata.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/paravertalignitem.hxx,editeng/paravertalignitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/pbinitem.hxx,editeng/pbinitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/pgrditem.hxx,editeng/pgrditem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/pmdlitem.hxx,editeng/pmdlitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/postitem.hxx,editeng/postitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/prntitem.hxx,editeng/prntitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/protitem.hxx,editeng/protitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/prszitem.hxx,editeng/prszitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/scriptspaceitem.hxx,editeng/scriptspaceitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/scripttypeitem.hxx,editeng/scripttypeitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/shaditem.hxx,editeng/shaditem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/shdditem.hxx,editeng/shdditem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/sizeitem.hxx,editeng/sizeitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/SpellPortions.hxx,editeng/SpellPortions.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/spltitem.hxx,editeng/spltitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/splwrap.hxx,editeng/splwrap.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/svxacorr.hxx,editeng/svxacorr.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/svxenum.hxx,editeng/svxenum.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/svxfont.hxx,editeng/svxfont.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/svxrtf.hxx,editeng/svxrtf.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/swafopt.hxx,editeng/swafopt.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/tstpitem.hxx,editeng/tstpitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/twolinesitem.hxx,editeng/twolinesitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/txtrange.hxx,editeng/txtrange.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/udlnitem.hxx,editeng/udlnitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/ulspitem.hxx,editeng/ulspitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoedhlp.hxx,editeng/unoedhlp.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoedprx.hxx,editeng/unoedprx.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoedsrc.hxx,editeng/unoedsrc.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unofdesc.hxx,editeng/unofdesc.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unofield.hxx,editeng/unofield.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/UnoForbiddenCharsTable.hxx,editeng/UnoForbiddenCharsTable.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unofored.hxx,editeng/unofored.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoforou.hxx,editeng/unoforou.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoipset.hxx,editeng/unoipset.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unolingu.hxx,editeng/unolingu.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unonrule.hxx,editeng/unonrule.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unopracc.hxx,editeng/unopracc.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoprnms.hxx,editeng/unoprnms.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unotext.hxx,editeng/unotext.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoviwed.hxx,editeng/unoviwed.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoviwou.hxx,editeng/unoviwou.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/wghtitem.hxx,editeng/wghtitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/widwitem.hxx,editeng/widwitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/writingmodeitem.hxx,editeng/writingmodeitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/wrlmitem.hxx,editeng/wrlmitem.hxx)) +$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/xmlcnitm.hxx,editeng/xmlcnitm.hxx)) + +# vim: set noet sw=4 ts=4: diff --git a/editeng/inc/editeng/splwrap.hxx b/editeng/inc/editeng/splwrap.hxx index 5e46a96adb9f..5e46a96adb9f 100755..100644 --- a/editeng/inc/editeng/splwrap.hxx +++ b/editeng/inc/editeng/splwrap.hxx diff --git a/editeng/prj/build.lst b/editeng/prj/build.lst index 551a21bc37f2..3c714c6dac25 100644 --- a/editeng/prj/build.lst +++ b/editeng/prj/build.lst @@ -1,13 +1,3 @@ ed editeng : l10n svtools xmloff linguistic NULL -ed editeng usr1 - all ed_mkout NULL -ed editeng\inc nmake - all ed_inc NULL -ed editeng\source\items nmake - all ed_items ed_inc NULL -ed editeng\source\editeng nmake - all ed_eeng ed_inc NULL -ed editeng\source\misc nmake - all ed_misc ed_inc NULL -ed editeng\source\outliner nmake - all ed_outl ed_inc NULL -ed editeng\source\rtf nmake - all ed_rtf ed_inc NULL -ed editeng\source\uno nmake - all ed_uno ed_inc NULL -ed editeng\source\xml nmake - all ed_xml ed_inc NULL -ed editeng\source\accessibility nmake - all ed_accessibility ed_inc NULL -ed editeng\util nmake - all ed_util ed_rtf ed_eeng ed_items ed_outl ed_uno ed_xml ed_accessibility ed_misc NULL +ed editeng\prj nmake - all ed_prj NULL diff --git a/editeng/prj/d.lst b/editeng/prj/d.lst index 364c1a8fddba..e69de29bb2d1 100644 --- a/editeng/prj/d.lst +++ b/editeng/prj/d.lst @@ -1,14 +0,0 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %COMMON_DEST%\res%_EXT% - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* -..\%__SRC%\lib\iediteng.lib %_DEST%\lib%_EXT%\iediteng.lib -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res - -mkdir: %_DEST%\inc%_EXT%\svx -..\inc\editeng\*.h %_DEST%\inc%_EXT%\editeng\*.h -..\inc\editeng\*.hrc %_DEST%\inc%_EXT%\editeng\*.hrc -..\inc\editeng\*.hxx %_DEST%\inc%_EXT%\editeng\*.hxx - diff --git a/framework/util/makefile.pmk b/editeng/prj/makefile.mk index 6dc45f466d26..e312a7ccab65 100644 --- a/framework/util/makefile.pmk +++ b/editeng/prj/makefile.mk @@ -25,15 +25,16 @@ # #************************************************************************* -.INCLUDE : settings.mk +PRJ=.. +TARGET=prj -CFLAGS+=-I..$/..$/idl +.INCLUDE : settings.mk -.IF "$(GUI)"=="UNX" -PATH_SEPERATOR=":" +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := .ELSE -PATH_SEPERATOR=";" +VERBOSEFLAG := -s .ENDIF -JARFILES = uno.jar -VISIBILITY_HIDDEN=TRUE +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/editeng/source/editeng/makefile.mk b/editeng/source/editeng/makefile.mk deleted file mode 100644 index 4a8f8f254070..000000000000 --- a/editeng/source/editeng/makefile.mk +++ /dev/null @@ -1,80 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME=editeng -TARGET=editeng -AUTOSEG=true - -#PROJECTPCH4DLL=TRUE -#PROJECTPCH=eeng_pch -#PROJECTPCHSOURCE=eeng_pch - -ENABLE_EXCEPTIONS=TRUE - - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)" != "" || "$(EDITDEBUG)" != "" -CDEFS+=-DEDITDEBUG -.ENDIF - -SLOFILES = \ - $(SLO)$/textconv.obj \ - $(SLO)$/editattr.obj \ - $(SLO)$/editdbg.obj \ - $(SLO)$/editdoc.obj \ - $(SLO)$/editdoc2.obj \ - $(SLO)$/editeng.obj \ - $(SLO)$/editobj.obj \ - $(SLO)$/editsel.obj \ - $(SLO)$/editundo.obj \ - $(SLO)$/editview.obj \ - $(SLO)$/edtspell.obj \ - $(SLO)$/eehtml.obj \ - $(SLO)$/eerdll.obj \ - $(SLO)$/eeobj.obj \ - $(SLO)$/eertfpar.obj \ - $(SLO)$/impedit.obj \ - $(SLO)$/impedit2.obj \ - $(SLO)$/impedit3.obj \ - $(SLO)$/impedit4.obj \ - $(SLO)$/impedit5.obj - -SRS1NAME=$(TARGET) -SRC1FILES= editeng.src - -EXCEPTIONSFILES= \ - $(SLO)$/unolingu.obj - -.INCLUDE : target.mk - diff --git a/editeng/source/items/makefile.mk b/editeng/source/items/makefile.mk deleted file mode 100644 index 512db7cc34bd..000000000000 --- a/editeng/source/items/makefile.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.19 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -#PROJECTPCH4DLL=TRUE -#PROJECTPCH=svxpch -#PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch -#ENABLE_EXCEPTIONS=TRUE - -PRJNAME=editeng -TARGET=items - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SRS1NAME=items -SRC1FILES = \ - page.src \ - svxitems.src - -SLOFILES= \ - $(SLO)$/optitems.obj \ - $(SLO)$/svdfield.obj \ - $(SLO)$/writingmodeitem.obj \ - $(SLO)$/frmitems.obj \ - $(SLO)$/paraitem.obj \ - $(SLO)$/textitem.obj \ - $(SLO)$/flditem.obj \ - $(SLO)$/svxfont.obj \ - $(SLO)$/paperinf.obj \ - $(SLO)$/itemtype.obj \ - $(SLO)$/bulitem.obj \ - $(SLO)$/numitem.obj \ - $(SLO)$/xmlcnitm.obj \ - $(SLO)$/charhiddenitem.obj - -EXCEPTIONSFILES= \ - $(SLO)$/svdfield.obj \ - $(SLO)$/paraitem.obj \ - $(SLO)$/frmitems.obj \ - $(SLO)$/numitem.obj\ - $(SLO)$/xmlcnitm.obj\ - $(SLO)$/flditem.obj - -.INCLUDE : target.mk - diff --git a/editeng/source/misc/makefile.mk b/editeng/source/misc/makefile.mk deleted file mode 100644 index 7eb2d80447a1..000000000000 --- a/editeng/source/misc/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.18 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME=editeng -TARGET=misc - -#PROJECTPCH4DLL=TRUE -#PROJECTPCH=eeng_pch -#PROJECTPCHSOURCE=eeng_pch - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)" != "" || "$(EDITDEBUG)" != "" -CDEFS+=-DEDITDEBUG -.ENDIF - -SLOFILES = \ - $(SLO)$/edtdlg.obj \ - $(SLO)$/unolingu.obj \ - $(SLO)$/acorrcfg.obj \ - $(SLO)$/forbiddencharacterstable.obj \ - $(SLO)$/hangulhanja.obj \ - $(SLO)$/splwrap.obj \ - $(SLO)$/svxacorr.obj \ - $(SLO)$/SvXMLAutoCorrectExport.obj \ - $(SLO)$/SvXMLAutoCorrectImport.obj \ - $(SLO)$/swafopt.obj \ - $(SLO)$/txtrange.obj - -SRS1NAME=misc -SRC1FILES = \ - lingu.src - -.INCLUDE : target.mk - diff --git a/editeng/source/uno/makefile.mk b/editeng/source/uno/makefile.mk deleted file mode 100644 index 573dd21508a2..000000000000 --- a/editeng/source/uno/makefile.mk +++ /dev/null @@ -1,61 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=editeng -TARGET=uno -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/unonrule.obj \ - $(SLO)$/unoedsrc.obj \ - $(SLO)$/unoedhlp.obj \ - $(SLO)$/unofdesc.obj \ - $(SLO)$/unoviwou.obj \ - $(SLO)$/unofored.obj \ - $(SLO)$/unoforou.obj \ - $(SLO)$/unoipset.obj \ - $(SLO)$/unotext.obj \ - $(SLO)$/unotext2.obj \ - $(SLO)$/unofield.obj \ - $(SLO)$/UnoForbiddenCharsTable.obj \ - $(SLO)$/unopracc.obj \ - $(SLO)$/unoedprx.obj \ - $(SLO)$/unoviwed.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/editeng/util/makefile.mk b/editeng/util/makefile.mk deleted file mode 100644 index a11bde28aed3..000000000000 --- a/editeng/util/makefile.mk +++ /dev/null @@ -1,102 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.61 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=editeng -TARGET=editeng -GEN_HID=TRUE -GEN_HID_OTHER=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------- - -HELPIDFILES= ..$/inc$/helpid.hrc - -# editeng -SHL1TARGET= editeng$(DLLPOSTFIX) -SHL1IMPLIB= iediteng -SHL1USE_EXPORTS=name -SHL1LIBS= \ - $(SLB)$/items.lib \ - $(SLB)$/misc.lib \ - $(SLB)$/rtf.lib \ - $(SLB)$/uno.lib \ - $(SLB)$/accessibility.lib \ - $(SLB)$/editeng.lib \ - $(SLB)$/outliner.lib \ - $(SLB)$/xml.lib - -SHL1STDLIBS= \ - $(XMLOFFLIB) \ - $(BASEGFXLIB) \ - $(LNGLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(I18NPAPERLIB) \ - $(COMPHELPERLIB) \ - $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(VOSLIB) \ - $(SALLIB) \ - $(ICUUCLIB) - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) -DEFLIB1NAME=$(TARGET) - -# ------------------------------------------------------------------------------ - -# Resource files -SRSFILELIST=\ - $(SRS)$/editeng.srs \ - $(SRS)$/outliner.srs \ - $(SRS)$/misc.srs \ - $(SRS)$/items.srs - -RESLIB1NAME=editeng -RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw -RESLIB1SRSFILES= $(SRSFILELIST) - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk index 031cb24117d7..10baea76a9e1 100644 --- a/framework/AllLangResTarget_fwe.mk +++ b/framework/AllLangResTarget_fwe.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # diff --git a/framework/JunitTest_framework_complex.mk b/framework/JunitTest_framework_complex.mk new file mode 100755 index 000000000000..5865a6fb9f38 --- /dev/null +++ b/framework/JunitTest_framework_complex.mk @@ -0,0 +1,102 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,framework_complex)) + +$(eval $(call gb_JunitTest_set_defs,framework_complex,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/framework/qa/complex/broken_document/test_documents \ +)) + +$(eval $(call gb_JunitTest_add_jars,framework_complex,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,framework_complex,\ + framework/qa/complex/disposing/GetServiceWhileDisposingOffice \ + framework/qa/complex/path_substitution/PathSubstitutionTest \ + framework/qa/complex/loadAllDocuments/InteractionHandler \ + framework/qa/complex/loadAllDocuments/StreamSimulator \ + framework/qa/complex/loadAllDocuments/TestDocument \ + framework/qa/complex/loadAllDocuments/CheckXComponentLoader \ + framework/qa/complex/loadAllDocuments/StatusIndicator \ + framework/qa/complex/broken_document/TestDocument \ + framework/qa/complex/broken_document/LoadDocument \ + framework/qa/complex/XUserInputInterception/EventTest \ + framework/qa/complex/framework/autosave/AutoSave \ + framework/qa/complex/framework/autosave/Protocol \ + framework/qa/complex/framework/autosave/ConfigHelper \ + framework/qa/complex/framework/recovery/TimeoutThread \ + framework/qa/complex/framework/recovery/KlickButtonThread \ + framework/qa/complex/framework/recovery/RecoveryTools \ + framework/qa/complex/framework/recovery/RecoveryTest \ + framework/qa/complex/framework/recovery/CrashThread \ + framework/qa/complex/accelerators/AcceleratorsConfigurationTest \ + framework/qa/complex/accelerators/KeyMapping \ + framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor \ + framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor \ + framework/qa/complex/path_settings/PathSettingsTest \ + framework/qa/complex/desktop/DesktopTerminate \ + framework/qa/complex/imageManager/_XComponent \ + framework/qa/complex/imageManager/CheckImageManager \ + framework/qa/complex/imageManager/_XTypeProvider \ + framework/qa/complex/imageManager/_XInitialization \ + framework/qa/complex/imageManager/_XImageManager \ + framework/qa/complex/imageManager/_XUIConfigurationPersistence \ + framework/qa/complex/imageManager/_XUIConfiguration \ + framework/qa/complex/api_internal/CheckAPI \ + framework/qa/complex/dispatches/Interceptor \ + framework/qa/complex/ModuleManager/CheckXModuleManager \ +)) + +# does not build +# framework/qa/complex/dispatches/checkdispatchapi \ + +$(eval $(call gb_JunitTest_add_classes,framework_complex,\ +)) +# these were disabled in the old build system too, please check +# carefully before reenabling +# complex.ModuleManager.CheckXModuleManager \ + complex.XUserInputInterception.EventTest \ + complex.accelerators.AcceleratorsConfigurationTest \ + complex.dispatches.checkdispatchapi \ + complex.api_internal.CheckAPI \ + complex.broken_document.LoadDocument \ + complex.desktop.DesktopTerminate \ + complex.disposing.GetServiceWhileDisposingOffice \ + complex.framework.autosave.AutoSave \ + complex.framework.recovery.RecoveryTest \ + complex.imageManager.CheckImageManager \ + complex.loadAllDocuments.CheckXComponentLoader \ + complex.path_settings.PathSettingsTest \ + complex.path_substitution.PathSubstitutionTest \ + +# vim: set noet sw=4 ts=4: diff --git a/framework/JunitTest_framework_unoapi.mk b/framework/JunitTest_framework_unoapi.mk new file mode 100755 index 000000000000..1204ee5262c9 --- /dev/null +++ b/framework/JunitTest_framework_unoapi.mk @@ -0,0 +1,53 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,framework_unoapi)) + +$(eval $(call gb_JunitTest_set_defs,framework_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/framework/qa/unoapi/framework.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/framework/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/framework/qa/unoapi/testdocuments \ +)) + +$(eval $(call gb_JunitTest_add_jars,framework_unoapi,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,framework_unoapi,\ + framework/qa/unoapi/Test \ +)) + +$(eval $(call gb_JunitTest_add_classes,framework_unoapi,\ + org.openoffice.framework.qa.unoapi.Test \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 86abf25f4f95..5d30d108cde6 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\ utl \ vcl \ vos3 \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,fwe,\ @@ -79,8 +80,6 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/fwe/helper/titlehelper \ framework/source/fwe/helper/documentundoguard \ framework/source/fwe/helper/undomanagerhelper \ - framework/source/fwe/helper/uiconfigelementwrapperbase \ - framework/source/fwe/helper/uielementwrapperbase \ framework/source/fwe/interaction/preventduplicateinteraction \ framework/source/fwe/xml/eventsconfiguration \ framework/source/fwe/xml/eventsdocumenthandler \ @@ -96,35 +95,9 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/fwe/xml/xmlnamespaces \ )) +#todo: ImageListDescriptor can't be exported completely without exporting everything ifeq ($(OS),LINUX) - $(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS)))) - -$(eval $(call gb_Library_add_linked_libs,fwe,\ - dl \ - m \ - pthread \ -)) endif -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,fwe,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -else -$(eval $(call gb_Library_add_linked_libs,fwe,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) -endif -endif -# TODO: visibility + # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index 8512b3a874fe..046c7230e35f 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -58,6 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\ utl \ vcl \ vos3 \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,fwi,\ @@ -76,38 +77,10 @@ $(eval $(call gb_Library_add_exception_objects,fwi,\ framework/source/fwi/uielement/rootitemcontainer \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,fwi,\ - dl \ - m \ - pthread \ -)) -endif ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) $(eval $(call gb_Library_add_linked_libs,fwi,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ advapi32 \ - kernel32 \ - msvcrt \ - unicows \ -)) -else -$(eval $(call gb_Library_add_linked_libs,fwi,\ - advapi32 \ - kernel32 \ - msvcrt \ - stl \ - unicows \ - uwinapi \ )) endif -endif -# TODO: visibility + # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 1df0c931e564..a34a1bc59720 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -58,6 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\ ucbhelper \ utl \ vcl \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,fwk,\ @@ -95,6 +96,8 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/helper/statusindicatorfactory \ framework/source/helper/tagwindowasmodified \ framework/source/helper/titlebarupdate \ + framework/source/helper/uiconfigelementwrapperbase \ + framework/source/helper/uielementwrapperbase \ framework/source/helper/vclstatusindicator \ framework/source/helper/wakeupthread \ framework/source/interaction/quietinteraction \ @@ -182,31 +185,4 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/xml/acceleratorconfigurationwriter \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,fwk,\ - dl \ - m \ - pthread \ -)) -endif -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,fwk,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -else -$(eval $(call gb_Library_add_linked_libs,fwk,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) -endif -endif # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index b8b5290f1749..928c723d3f80 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -54,6 +54,7 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\ tl \ utl \ vcl \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,fwl,\ @@ -82,31 +83,5 @@ $(eval $(call gb_Library_add_exception_objects,fwl,\ framework/source/uielement/simpletextstatusbarcontroller \ framework/source/uielement/toolbarsmenucontroller \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,fwl,\ - dl \ - m \ - pthread \ -)) -endif -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,fwl,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -else -$(eval $(call gb_Library_add_linked_libs,fwl,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) -endif -endif + # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index e67c2a627091..dbd486c40de1 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -53,6 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\ utl \ vcl \ vos3 \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,fwm,\ @@ -64,31 +65,4 @@ $(eval $(call gb_Library_add_exception_objects,fwm,\ framework/source/tabwin/tabwinfactory \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,fwm,\ - dl \ - m \ - pthread \ -)) -endif -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,fwm,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -else -$(eval $(call gb_Library_add_linked_libs,fwm,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) -endif -endif # vim: set noet sw=4 ts=4: diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk index 28b2e087b60f..82e5a34e51cf 100644 --- a/framework/Module_framework.mk +++ b/framework/Module_framework.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -40,4 +40,8 @@ $(eval $(call gb_Module_add_targets,framework,\ Package_unotypes \ )) +$(eval $(call gb_Module_add_subsequentcheck_targets,framework,\ + JunitTest_framework_complex \ + JunitTest_framework_unoapi \ +)) # vim: set noet ts=4 sw=4: diff --git a/framework/Package_dtd.mk b/framework/Package_dtd.mk index db23783c4ef9..99318b553acd 100644 --- a/framework/Package_dtd.mk +++ b/framework/Package_dtd.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # diff --git a/framework/Package_inc.mk b/framework/Package_inc.mk index 9db346cf1acf..6d1c03a5975b 100644 --- a/framework/Package_inc.mk +++ b/framework/Package_inc.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # diff --git a/framework/Package_uiconfig.mk b/framework/Package_uiconfig.mk index 295be6c87252..0eca53143c4e 100644 --- a/framework/Package_uiconfig.mk +++ b/framework/Package_uiconfig.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # diff --git a/framework/Package_unotypes.mk b/framework/Package_unotypes.mk index 01069ae93dc4..542dc09902c5 100644 --- a/framework/Package_unotypes.mk +++ b/framework/Package_unotypes.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # diff --git a/framework/inc/classes/fwlresid.hxx b/framework/inc/classes/fwlresid.hxx index 673a110a5097..673a110a5097 100644..100755 --- a/framework/inc/classes/fwlresid.hxx +++ b/framework/inc/classes/fwlresid.hxx diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx index a815e7ac544d..d2df4bc541b3 100644 --- a/framework/inc/helper/uiconfigelementwrapperbase.hxx +++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx @@ -58,7 +58,6 @@ #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weak.hxx> -#include <framework/fwedllapi.h> namespace framework { @@ -79,48 +78,48 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider // public methods //------------------------------------------------------------------------------------------------------------- public: - FWE_DLLPUBLIC UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory ); - virtual FWE_DLLPUBLIC ~UIConfigElementWrapperBase(); + UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory ); + virtual ~UIConfigElementWrapperBase(); // XInterface - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); - virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw(); - virtual FWE_DLLPUBLIC void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XTypeProvider - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ); // XComponent - virtual FWE_DLLPUBLIC void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; - virtual FWE_DLLPUBLIC void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); // XInitialization - virtual FWE_DLLPUBLIC void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XUIElementSettings - virtual FWE_DLLPUBLIC void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException) = 0; - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException); // XUIElement - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; // XUpdatable - virtual FWE_DLLPUBLIC void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); // XUIConfigurationListener - virtual FWE_DLLPUBLIC void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); // XEventListener using cppu::OPropertySetHelper::disposing; - virtual FWE_DLLPUBLIC void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); //------------------------------------------------------------------------------------------------------------- // protected methods @@ -128,21 +127,21 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider protected: // OPropertySetHelper - virtual FWE_DLLPUBLIC sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , + virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , com::sun::star::uno::Any& aOldValue , sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ); - virtual FWE_DLLPUBLIC void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ); using cppu::OPropertySetHelper::getFastPropertyValue; - virtual FWE_DLLPUBLIC void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , + virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , sal_Int32 nHandle ) const; - virtual FWE_DLLPUBLIC ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC void impl_fillNewData(); + virtual void impl_fillNewData(); - static FWE_DLLPUBLIC const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); + static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); sal_Int16 m_nType; bool m_bPersistent : 1, diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx index daa574c9411e..667af7d7f97b 100644 --- a/framework/inc/helper/uielementwrapperbase.hxx +++ b/framework/inc/helper/uielementwrapperbase.hxx @@ -53,7 +53,6 @@ #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weak.hxx> -#include <framework/fwedllapi.h> namespace framework { @@ -72,34 +71,34 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider // public methods //------------------------------------------------------------------------------------------------------------- public: - FWE_DLLPUBLIC UIElementWrapperBase( sal_Int16 nType ); - virtual FWE_DLLPUBLIC ~UIElementWrapperBase(); + UIElementWrapperBase( sal_Int16 nType ); + virtual ~UIElementWrapperBase(); // XInterface - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); - virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw(); - virtual FWE_DLLPUBLIC void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XTypeProvider - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ); // XComponent - virtual FWE_DLLPUBLIC void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; - virtual FWE_DLLPUBLIC void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); // XInitialization - virtual FWE_DLLPUBLIC void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XUpdatable - virtual FWE_DLLPUBLIC void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); // XUIElement - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; //------------------------------------------------------------------------------------------------------------- // protected methods @@ -107,19 +106,19 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider protected: // OPropertySetHelper - virtual FWE_DLLPUBLIC sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , + virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , com::sun::star::uno::Any& aOldValue , sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ); - virtual FWE_DLLPUBLIC void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ); using cppu::OPropertySetHelper::getFastPropertyValue; - virtual FWE_DLLPUBLIC void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , + virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , sal_Int32 nHandle ) const; - virtual FWE_DLLPUBLIC ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); - static FWE_DLLPUBLIC const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); + static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener rtl::OUString m_aResourceURL; diff --git a/framework/prj/build.lst b/framework/prj/build.lst index 3a2eb98457f7..2c847918fee4 100644 --- a/framework/prj/build.lst +++ b/framework/prj/build.lst @@ -1,3 +1,2 @@ fr framework : LIBXSLT:libxslt l10n svtools NULL fr framework\prj nmake - all fr_all NULL -fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL diff --git a/framework/prj/makefile.mk b/framework/prj/makefile.mk index c73a3d944bbf..e312a7ccab65 100644 --- a/framework/prj/makefile.mk +++ b/framework/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/framework/qa/complex/broken_document/TestDocument.java b/framework/qa/complex/broken_document/TestDocument.java index c282790211e3..47a5176734d5 100644 --- a/framework/qa/complex/broken_document/TestDocument.java +++ b/framework/qa/complex/broken_document/TestDocument.java @@ -29,12 +29,13 @@ package complex.broken_document; import java.io.File; import org.openoffice.test.OfficeFileUrl; +import org.openoffice.test.Argument; final class TestDocument { public static String getUrl(String name) { - return OfficeFileUrl.getAbsolute(new File("test_documents", name)); + return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name)); } private TestDocument() {} diff --git a/framework/qa/unoapi/Test.java b/framework/qa/unoapi/Test.java index da9bb3bd5020..71774b4a62bb 100644 --- a/framework/qa/unoapi/Test.java +++ b/framework/qa/unoapi/Test.java @@ -27,6 +27,7 @@ package org.openoffice.framework.qa.unoapi; import org.openoffice.Runner; import org.openoffice.test.OfficeConnection; +import org.openoffice.test.Argument; import static org.junit.Assert.*; public final class Test { @@ -43,8 +44,8 @@ public final class Test { @org.junit.Test public void test() { assertTrue( Runner.run( - "-sce", "framework.sce", "-xcl", "knownissues.xcl", "-tdoc", - "testdocuments", "-cs", connection.getDescription())); + "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc", + Argument.get("tdoc"), "-cs", connection.getDescription())); } private final OfficeConnection connection = new OfficeConnection(); diff --git a/framework/qa/unoapi/makefile.mk b/framework/qa/unoapi/makefile.mk deleted file mode 100644 index 38a6cf7cced8..000000000000 --- a/framework/qa/unoapi/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -#***********************************************************************/ - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../.. -PRJNAME = framework -TARGET = qa_unoapi - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/framework/qa/unoapi -JAVATESTFILES = Test.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx index 8a555d52f820..8a555d52f820 100644..100755 --- a/framework/source/classes/fwlresid.cxx +++ b/framework/source/classes/fwlresid.cxx diff --git a/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index 7c1a8c905588..362764054326 100644 --- a/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -70,7 +70,7 @@ const rtl::OUString UIELEMENT_PROPNAME_TYPE( RTL_CONSTASCII_USTRINGPARAM( "Type" const rtl::OUString UIELEMENT_PROPNAME_XMENUBAR( RTL_CONSTASCII_USTRINGPARAM( "XMenuBar" )); const rtl::OUString UIELEMENT_PROPNAME_NOCLOSE( RTL_CONSTASCII_USTRINGPARAM( "NoClose" )); -using namespace rtl; +//using namespace rtl; using namespace com::sun::star::beans; using namespace com::sun::star::uno; using namespace com::sun::star::frame; diff --git a/framework/source/fwe/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index ef5d01eb85b8..589c6fdd8aad 100644 --- a/framework/source/fwe/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -57,7 +57,7 @@ const rtl::OUString UIELEMENT_PROPNAME_RESOURCEURL( RTL_CONSTASCII_USTRINGPARAM( const rtl::OUString UIELEMENT_PROPNAME_TYPE( RTL_CONSTASCII_USTRINGPARAM( "Type" )); const rtl::OUString UIELEMENT_PROPNAME_FRAME( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); -using namespace rtl; +//using namespace rtl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 43176fe82b72..43176fe82b72 100755..100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 5992e7b42dc5..5992e7b42dc5 100755..100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx diff --git a/framework/source/uielement/panelwrapper.cxx b/framework/source/uielement/panelwrapper.cxx index 02d05d2653a2..02d05d2653a2 100755..100644 --- a/framework/source/uielement/panelwrapper.cxx +++ b/framework/source/uielement/panelwrapper.cxx diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 4f4bc1ea36b8..19972d641492 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -58,10 +58,10 @@ #include <cppuhelper/implbase4.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/interfacecontainer.h> -#include <cppuhelper/extract.hxx> #include <cppuhelper/factory.hxx> #include <i18npool/mslangid.hxx> #include <unotools/processfactory.hxx> +#include <comphelper/extract.hxx> #include <deque> #include <map> diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx index 4fa2986b587d..6f4b1c5d3da8 100644 --- a/linguistic/source/grammarchecker.cxx +++ b/linguistic/source/grammarchecker.cxx @@ -47,7 +47,7 @@ #include <com/sun/star/linguistic2/SingleGrammarError.hpp> #include <com/sun/star/linguistic2/GrammarCheckingResult.hpp> #include "lngopt.hxx" -#include <cppuhelper/extract.hxx> +#include <comphelper/extract.hxx> #include <unotools/processfactory.hxx> #include <map> #include <com/sun/star/text/TextMarkupType.hpp> diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index d4b7ab62e5f4..2b88947aa9ee 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -42,7 +42,7 @@ #include <i18npool/lang.h> #include <i18npool/mslangid.hxx> #include <cppuhelper/factory.hxx> -#include <cppuhelper/extract.hxx> +#include <comphelper/extract.hxx> #include <rtl/logfile.hxx> #include <boost/checked_delete.hpp> diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index e8b483b8622d..e8b483b8622d 100644..100755 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu diff --git a/readlicense_oo/docs/readme.xsl b/readlicense_oo/docs/readme.xsl index 4e77fa522c3d..4e77fa522c3d 100755..100644 --- a/readlicense_oo/docs/readme.xsl +++ b/readlicense_oo/docs/readme.xsl diff --git a/scripting/prj/build.lst b/scripting/prj/build.lst index d0ceb4cb818c..d0ceb4cb818c 100755..100644 --- a/scripting/prj/build.lst +++ b/scripting/prj/build.lst diff --git a/scripting/source/dlgprov/makefile.mk b/scripting/source/dlgprov/makefile.mk index c3a99aa81aff..51f834132129 100644 --- a/scripting/source/dlgprov/makefile.mk +++ b/scripting/source/dlgprov/makefile.mk @@ -59,6 +59,7 @@ SHL1STDLIBS= \ $(CPPUHELPERLIB) \ $(COMPHELPERLIB) \ $(UCBHELPERLIB) \ + $(VBAHELPERLIB) \ $(CPPULIB) \ $(BASICLIB) \ $(SALLIB) diff --git a/scripting/source/vbaevents/makefile.mk b/scripting/source/vbaevents/makefile.mk index 287bbe2b052b..aa4c416da96b 100755 --- a/scripting/source/vbaevents/makefile.mk +++ b/scripting/source/vbaevents/makefile.mk @@ -33,11 +33,6 @@ PRJ=..$/.. PRJNAME=scripting TARGET=vbaevents -.IF "$(ENABLE_VBA)"!="YES" -dummy: - @echo "not building vbaevents..." -.ENDIF - VISIBILITY_HIDDEN=TRUE NO_BSYMBOLIC= TRUE ENABLE_EXCEPTIONS=TRUE diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk index ad1419add42a..c49fd42cd96e 100644 --- a/sfx2/AllLangResTarget_sfx2.mk +++ b/sfx2/AllLangResTarget_sfx2.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # diff --git a/svx/source/core/makefile.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index da874894bae6..67d5a7f43869 100644..100755 --- a/svx/source/core/makefile.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,23 +25,23 @@ # #************************************************************************* -PRJ=..$/.. +$(eval $(call gb_CppunitTest_CppunitTest,sfx2_metadatable)) -PRJNAME=svx -TARGET=core -ENABLE_EXCEPTIONS=TRUE +$(eval $(call gb_CppunitTest_add_exception_objects,sfx2_metadatable, \ + sfx2/qa/cppunit/test_metadatable \ +)) -# --- Settings ----------------------------------------------------- +$(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \ + sal \ + sfx \ + stl \ + $(gb_STDLIBS) \ +)) -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/coreservices.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk +$(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) +# vim: set noet sw=4 ts=4: diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk new file mode 100755 index 000000000000..800612a6c55d --- /dev/null +++ b/sfx2/JunitTest_sfx2_complex.mk @@ -0,0 +1,78 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,sfx2_complex)) + +$(eval $(call gb_JunitTest_set_defs,sfx2_complex,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sfx2/qa/complex/sfx2/testdocuments \ +)) + +$(eval $(call gb_JunitTest_add_jars,sfx2_complex,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/test-tools.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\ + sfx2/qa/complex/sfx2/tools/DialogThread \ + sfx2/qa/complex/sfx2/tools/WriterHelper \ + sfx2/qa/complex/sfx2/tools/TestDocument \ + sfx2/qa/complex/sfx2/GlobalEventBroadcaster \ + sfx2/qa/complex/sfx2/DocumentMetadataAccess \ + sfx2/qa/complex/sfx2/DocumentProperties \ + sfx2/qa/complex/sfx2/DocumentInfo \ + sfx2/qa/complex/sfx2/StandaloneDocumentInfo \ + sfx2/qa/complex/sfx2/UndoManager \ + sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest \ + sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper \ + sfx2/qa/complex/sfx2/standalonedocinfo/Test01 \ + sfx2/qa/complex/sfx2/undo/CalcDocumentTest \ + sfx2/qa/complex/sfx2/undo/ChartDocumentTest \ + sfx2/qa/complex/sfx2/undo/DocumentTest \ + sfx2/qa/complex/sfx2/undo/DocumentTestBase \ + sfx2/qa/complex/sfx2/undo/DrawDocumentTest \ + sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest \ + sfx2/qa/complex/sfx2/undo/ImpressDocumentTest \ + sfx2/qa/complex/sfx2/undo/WriterDocumentTest \ +)) + +$(eval $(call gb_JunitTest_add_classes,sfx2_complex,\ + complex.sfx2.DocumentInfo \ + complex.sfx2.DocumentProperties \ + complex.sfx2.DocumentMetadataAccess \ + complex.sfx2.UndoManager \ +)) +# #i115674# fails currently: misses some OnUnfocus event +# complex.sfx2.GlobalEventBroadcaster \ +# breaks because binfilter export has been removed +# complex.sfx2.StandaloneDocumentInfo \ + +# vim: set noet sw=4 ts=4: diff --git a/sfx2/JunitTest_sfx2_unoapi.mk b/sfx2/JunitTest_sfx2_unoapi.mk new file mode 100644 index 000000000000..33602a0b720d --- /dev/null +++ b/sfx2/JunitTest_sfx2_unoapi.mk @@ -0,0 +1,53 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,sfx2_unoapi)) + +$(eval $(call gb_JunitTest_set_defs,sfx2_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/sfx2/qa/unoapi/sfx.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sfx2/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sfx2/qa/unoapi/testdocuments \ +)) + +$(eval $(call gb_JunitTest_add_jars,sfx2_unoapi,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,sfx2_unoapi,\ + sfx2/qa/unoapi/Test \ +)) + +$(eval $(call gb_JunitTest_add_classes,sfx2_unoapi,\ + org.openoffice.sfx2.qa.unoapi.Test \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 6ed99271d353..2344d79746c4 100755 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -78,13 +78,6 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\ sfx \ )) -$(eval $(call gb_Library_add_linked_system_libs,qstart_gtk,\ - dl \ - icuuc \ - m \ - pthread \ -)) - $(eval $(call gb_Library_add_exception_objects,qstart_gtk,\ sfx2/source/appl/shutdowniconunx \ )) diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index fb4d1a51857e..c18b46c8f16e 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -54,7 +54,6 @@ $(eval $(call gb_Library_set_include,sfx,\ $(eval $(call gb_Library_set_defs,sfx,\ $$(DEFS) \ -DSFX2_DLLIMPLEMENTATION \ - -DABOUTBMPNAMES="$(ABOUTBITMAPS)" \ )) $(eval $(call gb_Library_add_linked_libs,sfx,\ @@ -77,13 +76,7 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ vcl \ vos3 \ xml2 \ -)) - -$(eval $(call gb_Library_add_linked_system_libs,sfx,\ - icuuc \ - dl \ - m \ - pthread \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,sfx,\ @@ -149,7 +142,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/control/sorgitm \ sfx2/source/control/statcach \ sfx2/source/control/unoctitm \ - sfx2/source/dialog/about \ sfx2/source/dialog/alienwarn \ sfx2/source/dialog/basedlgs \ sfx2/source/dialog/dinfdlg \ @@ -275,53 +267,33 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ Cocoa \ )) endif + ifeq ($(OS),WNT) + # workaround: disable PCH for these objects to avoid redeclaration # errors - needs to be fixed in module tools $(eval $(call gb_Library_add_cxxobjects,sfx,\ sfx2/source/appl/shutdowniconw32 \ sfx2/source/doc/sfxacldetect \ sfx2/source/doc/syspathw32 \ - , $(gb_LinkTarget_EXCEPTIONFLAGS) -nologo -UPRECOMPILED_HEADERS \ + , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS) -nologo -UPRECOMPILED_HEADERS \ )) -ifneq ($(USE_MINGW),) $(eval $(call gb_Library_add_linked_libs,sfx,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - advapi32 \ gdi32 \ - kernel32 \ - msvcrt \ - ole32 \ - shell32 \ - user32 \ - uuid \ -)) -else -$(eval $(call gb_Library_add_linked_libs,sfx,\ advapi32 \ - gdi32 \ - kernel32 \ - msvcrt \ - oldnames \ ole32 \ shell32 \ user32 \ uuid \ - uwinapi \ )) -endif + else + $(eval $(call gb_Library_add_cxxobjects,sfx,\ sfx2/source/appl/shutdowniconw32 \ sfx2/source/doc/sfxacldetect \ - , $(gb_LinkTarget_EXCEPTIONFLAGS) \ + , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS) \ )) endif diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index f6ac7c4c053e..b88e2581f2da 100755 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -34,6 +34,15 @@ $(eval $(call gb_Module_add_targets,sfx2,\ Package_sdi \ )) +$(eval $(call gb_Module_add_check_targets,sfx2,\ + CppunitTest_sfx2_metadatable \ +)) + +$(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\ + JunitTest_sfx2_complex \ + JunitTest_sfx2_unoapi \ +)) + ifeq ($(OS),LINUX) ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) $(eval $(call gb_Module_add_targets,sfx2,\ @@ -42,14 +51,10 @@ $(eval $(call gb_Module_add_targets,sfx2,\ endif endif -#todo: map file? -#todo: source/appl ohne Optimierung? -#todo: source/control ohne Optimierung? #todo: source/dialog BUILD_VER_STRING #todo: source/doc SYSTEM_LIBXML2 -#todo: noopt for acldetect.cxx? #todo: ENABLE_LAYOUT -#todo: quickstarter -#todo: link against cocoa on Mac +#todo: clean up quickstarter stuff in both libraries +#todo: move standard pool to svl # vim: set noet sw=4 ts=4: diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk index 85ce4143323c..57317629323b 100644 --- a/sfx2/Package_inc.mk +++ b/sfx2/Package_inc.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # diff --git a/sfx2/Package_sdi.mk b/sfx2/Package_sdi.mk index 63f2138adf4f..43e484b19a2d 100644 --- a/sfx2/Package_sdi.mk +++ b/sfx2/Package_sdi.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # diff --git a/sfx2/inc/about.hxx b/sfx2/inc/about.hxx deleted file mode 100644 index aa4a8e21bd4f..000000000000 --- a/sfx2/inc/about.hxx +++ /dev/null @@ -1,83 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _ABOUT_HXX -#define _ABOUT_HXX - -// include --------------------------------------------------------------- - -#include <tools/resary.hxx> -#include <vcl/button.hxx> -#include <vcl/accel.hxx> -#include <svtools/svmedit.hxx> -#include <tools/list.hxx> -#include <svtools/stdctrl.hxx> -#include <sfx2/basedlgs.hxx> // SfxModalDialog - -DECLARE_LIST( AccelList, Accelerator* ) - -// class AboutDialog ----------------------------------------------------- - -class AboutDialog : public SfxModalDialog -{ -private: - OKButton aOKButton; - Image aAppLogo; - - FixedInfo aVersionText; - MultiLineEdit aCopyrightText; - FixedInfo aBuildData; - - ResStringArray aDeveloperAry; - String aDevVersionStr; - String aAccelStr; - String aVersionData; - String aCopyrightTextStr; - - AccelList aAccelList; - - AutoTimer aTimer; - long nOff; - long m_nDeltaWidth; - int m_nPendingScrolls; - - sal_Bool bNormal; - -protected: - virtual sal_Bool Close(); - virtual void Paint( const Rectangle& ); - -public: - AboutDialog( Window* pParent, const ResId& rId, const String& rVerStr ); - ~AboutDialog(); - - DECL_LINK( TimerHdl, Timer * ); - DECL_LINK( AccelSelectHdl, Accelerator * ); -}; - -#endif // #ifndef _ABOUT_HXX - - diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx index d27d9d6f1ba4..62bb17ea2248 100644 --- a/sfx2/inc/sfx2/app.hxx +++ b/sfx2/inc/sfx2/app.hxx @@ -162,12 +162,16 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell SfxAppData_Impl* pAppData_Impl; -//#if 0 // _SOLAR__PRIVATE DECL_DLLPRIVATE_LINK( GlobalBasicErrorHdl_Impl, StarBASIC* ); +<<<<<<< local + SAL_DLLPRIVATE BOOL SaveAll_Impl(BOOL bPrompt = FALSE, BOOL bAutoSave = FALSE); + SAL_DLLPRIVATE short QuerySave_Impl(SfxObjectShell &, BOOL bAutoSave = FALSE); +======= SAL_DLLPRIVATE sal_Bool SaveAll_Impl(sal_Bool bPrompt = sal_False, sal_Bool bAutoSave = sal_False); SAL_DLLPRIVATE short QuerySave_Impl(SfxObjectShell &, sal_Bool bAutoSave = sal_False); SAL_DLLPRIVATE void InitializeDisplayName_Impl(); //#endif +>>>>>>> other static SfxApplication* Create(); void Init(); @@ -187,11 +191,9 @@ public: static SfxApplication* GetOrCreate(); // Resource Manager - bool InitLabelResMgr( const char* _pLabelPrefix, bool _bException = false ); SfxResourceManager& GetResourceManager() const; ResMgr* GetSfxResManager(); SimpleResMgr* GetSimpleResManager(); - ResMgr* GetLabelResManager() const; static ResMgr* CreateResManager( const char *pPrefix ); SimpleResMgr* CreateSimpleResManager(); diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc index dfc2dec2f5ff..ca1d3eb6b8a4 100755 --- a/sfx2/inc/sfx2/sfx.hrc +++ b/sfx2/inc/sfx2/sfx.hrc @@ -208,18 +208,7 @@ #define RID_DEFAULTABOUT (RID_SFX_START+0) -#define ABOUT_BTN_OK 1 - -#define ABOUT_FTXT_VERSION 1 -#define ABOUT_FTXT_COPYRIGHT 2 - -#define ABOUT_STR_DEVELOPER_ARY 1 -#define ABOUT_STR_FRENCH_COPYRIGHT 2 -#define ABOUT_STR_ACCEL 3 -#define ABOUT_STR_COPYRIGHT 4 - #define RID_APPTITLE (RID_SFX_START+4) -#define RID_BUILDVERSION (RID_SFX_START+5) #define RID_DOCALREADYLOADED_DLG (RID_SFX_START+1) @@ -258,8 +247,6 @@ #define STR_MB (RID_SFX_START+113) #define STR_GB (RID_SFX_START+114) -#define STR_VERSION_TYPE (RID_SFX_START+115) -#define STR_VERSION_ID (RID_SFX_START+116) #define STR_STANDARD_SHORTCUT (RID_SFX_START+117) #define STR_REPAIREDDOCUMENT (RID_SFX_START+118) diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index dc0b094ac4fb..ca582c0aaf12 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,5 +1,3 @@ -sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt test NULL -sf sfx2 usr1 - all sf_mkout NULL -sf sfx2\prj nmake - all sf_prj NULL -sf sfx2\qa\cppunit nmake - all sf_qa_cppunit NULL -sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL +sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL +sf sfx2\prj nmake - all sf_prj NULL + diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk index c73a3d944bbf..e312a7ccab65 100644 --- a/sfx2/prj/makefile.mk +++ b/sfx2/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index ab1b9de910b8..f37530aba726 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -159,7 +159,7 @@ public class UndoManager } // ----------------------------------------------------------------------------------------------------------------- - @Test +//#i116813# disabled @Test public void checkBrokenScripts() throws com.sun.star.uno.Exception, InterruptedException { System.out.println( "testing: broken scripts" ); diff --git a/sfx2/qa/complex/sfx2/tools/TestDocument.java b/sfx2/qa/complex/sfx2/tools/TestDocument.java index 120dca978bba..8f2108df358e 100644 --- a/sfx2/qa/complex/sfx2/tools/TestDocument.java +++ b/sfx2/qa/complex/sfx2/tools/TestDocument.java @@ -29,10 +29,11 @@ package complex.sfx2.tools; import java.io.File; import org.openoffice.test.OfficeFileUrl; +import org.openoffice.test.Argument; public final class TestDocument { public static String getUrl(String name) { - return OfficeFileUrl.getAbsolute(new File("testdocuments", name)); + return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name)); } private TestDocument() {} diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk deleted file mode 100644 index b53a04ec43f9..000000000000 --- a/sfx2/qa/cppunit/makefile.mk +++ /dev/null @@ -1,86 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ=../.. -PRJNAME=sfx2 -TARGET=qa_cppunit - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -#building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - -CFLAGSCXX += $(CPPUNIT_CFLAGS) -DLLPRE = # no leading "lib" on .so files - -# --- Libs --------------------------------------------------------- - -SHL1OBJS= \ - $(SLO)/test_metadatable.obj \ - - -SHL1STDLIBS= \ - $(CPPUNITLIB) \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(VCLLIB) \ - $(SFXLIB) \ - - -SHL1TARGET= test_metadatable -SHL1RPATH = NONE -SHL1IMPLIB= i$(SHL1TARGET) -# SHL1DEF= $(MISC)/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) -# DEF1EXPORTFILE= export.exp -SHL1VERSIONMAP= version.map - -# --- All object files --------------------------------------------- - -SLOFILES= \ - $(SHL1OBJS) \ - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : _cppunit.mk - -.END diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 6a0be13a9c53..9930d61acf20 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -25,15 +25,7 @@ * ************************************************************************/ -#include "precompiled_sfx2.hxx" - -#include "preextstl.h" -#include <cppunit/TestAssert.h> -#include <cppunit/TestFixture.h> -#include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> -#include "postextstl.h" - +#include <sal/cppunit.h> #include <rtl/ustrbuf.hxx> #include <com/sun/star/util/DateTime.hpp> diff --git a/sfx2/qa/unoapi/Test.java b/sfx2/qa/unoapi/Test.java index 4263985c133f..c1231c975a2b 100644 --- a/sfx2/qa/unoapi/Test.java +++ b/sfx2/qa/unoapi/Test.java @@ -27,6 +27,7 @@ package org.openoffice.sfx2.qa.unoapi; import org.openoffice.Runner; import org.openoffice.test.OfficeConnection; +import org.openoffice.test.Argument; import static org.junit.Assert.*; public final class Test { @@ -43,8 +44,8 @@ public final class Test { @org.junit.Test public void test() { assertTrue( Runner.run( - "-sce", "sfx.sce", "-xcl", "knownissues.xcl", "-tdoc", - "testdocuments", "-cs", connection.getDescription())); + "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc", + Argument.get("tdoc"), "-cs", connection.getDescription())); } private final OfficeConnection connection = new OfficeConnection(); diff --git a/sfx2/qa/unoapi/makefile.mk b/sfx2/qa/unoapi/makefile.mk deleted file mode 100644 index ea91ba4d1c44..000000000000 --- a/sfx2/qa/unoapi/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -#***********************************************************************/ - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../.. -PRJNAME = sfx2 -TARGET = qa_unoapi - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/sfx2/qa/unoapi -JAVATESTFILES = Test.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 6a1f58c6de33..d8442bb215f6 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -363,15 +363,8 @@ SfxApplication::SfxApplication() #endif #endif - if ( !InitLabelResMgr( "iso" ) ) - // no "iso" resource -> search for "ooo" resource - InitLabelResMgr( "ooo", true ); pBasic = new BasicDLL; - StarBASIC::SetGlobalErrorHdl( LINK( this, SfxApplication, GlobalBasicErrorHdl_Impl ) ); - - - RTL_LOGFILE_CONTEXT_TRACE( aLog, "} initialize DDE" ); } @@ -589,13 +582,6 @@ ResMgr* SfxApplication::GetSfxResManager() //-------------------------------------------------------------------- -ResMgr* SfxApplication::GetLabelResManager() const -{ - return pAppData_Impl->pLabelResMgr; -} - -//-------------------------------------------------------------------- - SimpleResMgr* SfxApplication::GetSimpleResManager() { if ( !pAppData_Impl->pSimpleResManager ) diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 9d0e759ce575..6d6c8ace5a09 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -99,75 +99,6 @@ using namespace ::com::sun::star::script; using ::basic::BasicManagerRepository; -// #ifndef STR_VERSION_ID -// #define STR_VERSION_ID 1 -// #endif -// #ifndef STR_VERSION_TYPE -// #define STR_VERSION_TYPE 1 -// #endif - -//========================================================================= -/*ASDBG -const SfxConstant __FAR_DATA aConstants[] = -{ - SFX_USHORT_CONSTANT( "AlignBottom", ALIGN_BOTTOM ), - SFX_USHORT_CONSTANT( "AlignTop", ALIGN_TOP ), - SFX_USHORT_CONSTANT( "CharSetANSI", CHARSET_ANSI ), - SFX_USHORT_CONSTANT( "CharSetDontKnow", CHARSET_DONTKNOW ), - SFX_USHORT_CONSTANT( "CharSetIBMPC437", CHARSET_IBMPC_437 ), - SFX_USHORT_CONSTANT( "CharSetIBMPC850", CHARSET_IBMPC_850 ), - SFX_USHORT_CONSTANT( "CharSetIBMPC860", CHARSET_IBMPC_860 ), - SFX_USHORT_CONSTANT( "CharSetIBMPC861", CHARSET_IBMPC_861 ), - SFX_USHORT_CONSTANT( "CharSetIBMPC863", CHARSET_IBMPC_863 ), - SFX_USHORT_CONSTANT( "CharSetIBMPC865", CHARSET_IBMPC_865 ), - SFX_USHORT_CONSTANT( "CharSetIBMPC", CHARSET_IBMPC ), - SFX_USHORT_CONSTANT( "CharSetMac", CHARSET_MAC ), - SFX_USHORT_CONSTANT( "CharSetSymbol", CHARSET_SYMBOL ), - SFX_USHORT_CONSTANT( "CharSetSystem", RTL_TEXTENCODING_UTF8 ), - SFX_USHORT_CONSTANT( "FamilyDecorative", FAMILY_DECORATIVE ), - SFX_USHORT_CONSTANT( "FamilyDontknow", FAMILY_DONTKNOW ), - SFX_USHORT_CONSTANT( "FamilyModern", FAMILY_MODERN ), - SFX_USHORT_CONSTANT( "FamilyRoman", FAMILY_ROMAN ), - SFX_USHORT_CONSTANT( "FamilyScript", FAMILY_SCRIPT ), - SFX_USHORT_CONSTANT( "FamilySwiss", FAMILY_SWISS ), - SFX_USHORT_CONSTANT( "FamilySystem", FAMILY_SYSTEM ), - SFX_USHORT_CONSTANT( "GradientAxial", GRADIENT_AXIAL ), - SFX_USHORT_CONSTANT( "GradientElliptical", GRADIENT_ELLIPTICAL ), - SFX_USHORT_CONSTANT( "GradientLinear", GRADIENT_LINEAR ), - SFX_USHORT_CONSTANT( "GradientRadial", GRADIENT_RADIAL ), - SFX_USHORT_CONSTANT( "GradientRect", GRADIENT_RECT ), - SFX_USHORT_CONSTANT( "GradientSquare", GRADIENT_SQUARE ), - SFX_USHORT_CONSTANT( "ItalicNone", ITALIC_NONE ), - SFX_USHORT_CONSTANT( "ItalicOblique", ITALIC_OBLIQUE ), - SFX_USHORT_CONSTANT( "StrikeThroughDouble", STRIKEOUT_DOUBLE ), - SFX_USHORT_CONSTANT( "StrikeThroughNone", STRIKEOUT_NONE ), - SFX_USHORT_CONSTANT( "StrikeThroughSingle", STRIKEOUT_SINGLE ), - SFX_USHORT_CONSTANT( "UnderlineDotted", UNDERLINE_DOTTED ), - SFX_USHORT_CONSTANT( "UnderlineDouble", UNDERLINE_DOUBLE ), - SFX_USHORT_CONSTANT( "UnderlineNone", UNDERLINE_NONE ), - SFX_USHORT_CONSTANT( "UnderlineSingle", UNDERLINE_SINGLE ), - SFX_USHORT_CONSTANT( "UnitFoot", FUNIT_FOOT ), - SFX_USHORT_CONSTANT( "UnitInch", FUNIT_INCH ), - SFX_USHORT_CONSTANT( "UnitMile", FUNIT_MILE ), - SFX_USHORT_CONSTANT( "UnitPercent", FUNIT_PERCENT ), - SFX_USHORT_CONSTANT( "UnitPoint", FUNIT_POINT ), - SFX_USHORT_CONSTANT( "UnitTwip", FUNIT_TWIP ), - SFX_USHORT_CONSTANT( "Unit_cm", FUNIT_CM ), - SFX_USHORT_CONSTANT( "Unit_m", FUNIT_M ), - SFX_USHORT_CONSTANT( "Unit_mm", FUNIT_MM ), - SFX_USHORT_CONSTANT( "WeightBlack", WEIGHT_BLACK ), - SFX_USHORT_CONSTANT( "WeightBold", WEIGHT_BOLD ), - SFX_USHORT_CONSTANT( "WeightDontKnow", WEIGHT_DONTKNOW ), - SFX_USHORT_CONSTANT( "WeightLight", WEIGHT_LIGHT ), - SFX_USHORT_CONSTANT( "WeightMedium", WEIGHT_MEDIUM ), - SFX_USHORT_CONSTANT( "WeightNormal", WEIGHT_NORMAL ), - SFX_USHORT_CONSTANT( "WeightSemibold", WEIGHT_SEMIBOLD ), - SFX_USHORT_CONSTANT( "WeightSemilight", WEIGHT_SEMILIGHT ), - SFX_USHORT_CONSTANT( "WeightThin", WEIGHT_THIN ), - SFX_USHORT_CONSTANT( "WeightUltrabold", WEIGHT_ULTRABOLD ), - SFX_USHORT_CONSTANT( "WeightUltralight", WEIGHT_ULTRALIGHT ) -}; -*/ //======================================================================== //------------------------------------------------------------------------ @@ -389,20 +320,6 @@ void SfxApplication::PropState_Impl( SfxItemSet &rSet ) rSet.Put( SfxUInt32Item( SID_UPDATE_VERSION, SUPD ) ); break; - case SID_BUILD_VERSION: - { - String aVersion = lcl_GetVersionString(pAppData_Impl->pLabelResMgr); - rSet.Put( SfxUInt32Item( SID_BUILD_VERSION, (sal_uInt32) aVersion.ToInt32() ) ); - break; - } - - case SID_OFFICE_PRIVATE_USE: - case SID_OFFICE_COMMERCIAL_USE: - { - DBG_ASSERT( sal_False, "SfxApplication::PropState_Impl()\nSID_OFFICE_PRIVATE_USE & SID_OFFICE_COMMERCIAL_USE are obsolete!\n" ); - break; - } - case SID_OFFICE_CUSTOMERNUMBER: { rSet.Put( SfxStringItem( nSID, SvtUserOptions().GetCustomerNumber() ) ); diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index ce0dda051886..71a6fc269c11 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -98,7 +98,6 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* ) : pTopFrames( new SfxFrameArr_Impl ), pInitLinkList(0), pMatcher( 0 ), - pLabelResMgr( 0 ), pAppDispatch(NULL), pTemplates( 0 ), pPool(0), diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index 1bde50fec224..64c6673bbafb 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -145,35 +145,6 @@ void SfxApplication::PreInit( ) { } -//--------------------------------------------------------------------------- -bool SfxApplication::InitLabelResMgr( const char* _pLabelPrefix, bool _bException ) -{ - bool bRet = false; - // Label-DLL mit diversen Resourcen fuer OEM-Ver. etc. (Intro, Titel, About) - DBG_ASSERT( _pLabelPrefix, "Wrong initialisation!" ); - if ( _pLabelPrefix ) - { - // versuchen, die Label-DLL zu erzeugen - pAppData_Impl->pLabelResMgr = CreateResManager( _pLabelPrefix ); - - // keine separate Label-DLL vorhanden? - if ( !pAppData_Impl->pLabelResMgr ) - { - if ( _bException ) - { - // maybe corrupted installation - throw (::com::sun::star::uno::RuntimeException( - ::rtl::OUString::createFromAscii("iso resource could not be loaded by SfxApplication"), - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >())); - } - } - else - bRet = true; - } - - return bRet; -} - void SfxApplication::Main( ) { } diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 6471c4eca140..1fdbe5f77107 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -29,9 +29,7 @@ #include "precompiled_sfx2.hxx" #include <vcl/status.hxx> #include <vcl/msgbox.hxx> -#ifndef _VOS_PROCESS_HXX //autogen #include <vos/process.hxx> -#endif #include <vos/xception.hxx> #include <svl/whiter.hxx> #include <svl/stritem.hxx> @@ -41,9 +39,7 @@ #include <unotools/internaloptions.hxx> #include <unotools/pathoptions.hxx> #include <com/sun/star/registry/InvalidRegistryException.hpp> -#ifndef _COM_SUN_STAR_BEANS_PropertyValue_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> @@ -51,11 +47,8 @@ #include <tools/config.hxx> #include <tools/rcid.h> #include <vos/mutex.hxx> -#ifndef GCC -#endif #include <unotools/configmgr.hxx> #include <com/sun/star/frame/XDesktop.hpp> - #include <unotools/ucbstreamhelper.hxx> #include <framework/menuconfiguration.hxx> #include <comphelper/processfactory.hxx> @@ -63,6 +56,7 @@ #include <unotools/bootstrap.hxx> #include <unotools/moduleoptions.hxx> #include <osl/file.hxx> +#include <rtl/bootstrap.hxx> #include "sfx2/sfxresid.hxx" #include <sfx2/app.hxx> @@ -160,6 +154,8 @@ SFX_IMPL_INTERFACE(SfxApplication,SfxShell,SfxResId(RID_DESKTOP)) } //-------------------------------------------------------------------- +<<<<<<< local +======= void SfxApplication::InitializeDisplayName_Impl() { @@ -199,6 +195,7 @@ void SfxApplication::InitializeDisplayName_Impl() } //-------------------------------------------------------------------- +>>>>>>> other SfxProgress* SfxApplication::GetProgress() const /* [Beschreibung] @@ -333,3 +330,71 @@ SfxSlotPool& SfxApplication::GetAppSlotPool_Impl() const { return *pAppData_Impl //SfxOptions& SfxApplication::GetOptions() { return *pAppData_Impl->pOptions; } //const SfxOptions& SfxApplication::GetOptions() const { return *pAppData_Impl->pOptions; } +static bool impl_loadBitmap( + const rtl::OUString &rPath, const rtl::OUString &rBmpFileName, + Image &rLogo ) +{ + rtl::OUString uri( rPath ); + rtl::Bootstrap::expandMacros( uri ); + INetURLObject aObj( uri ); + aObj.insertName( rBmpFileName ); + SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ ); + if ( !aStrm.GetError() ) + { + // Use graphic class to also support more graphic formats (bmp,png,...) + Graphic aGraphic; + + GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); + pGF->ImportGraphic( aGraphic, String(), aStrm, GRFILTER_FORMAT_DONTKNOW ); + + // Default case, we load the intro bitmap from a seperate file + // (e.g. staroffice_intro.bmp or starsuite_intro.bmp) + BitmapEx aBmp = aGraphic.GetBitmapEx(); + rLogo = Image( aBmp ); + return true; + } + return false; +} + +/** loads the application logo as used in the about dialog and impress slideshow pause screen */ +Image SfxApplication::GetApplicationLogo() +{ + Image aAppLogo; + + rtl::OUString aAbouts; + bool bLoaded = false; + sal_Int32 nIndex = 0; + do + { + bLoaded = impl_loadBitmap( + rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ), + aAbouts.getToken( 0, ',', nIndex ), aAppLogo ); + } + while ( !bLoaded && ( nIndex >= 0 ) ); + + // fallback to "about.bmp" + if ( !bLoaded ) + { + bLoaded = impl_loadBitmap( + rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ), + rtl::OUString::createFromAscii( "about.png" ), aAppLogo ); + if ( !bLoaded ) + bLoaded = impl_loadBitmap( + rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ), + rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo ); + } + + if ( !bLoaded ) + { + bLoaded = impl_loadBitmap( + rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ), + rtl::OUString::createFromAscii( "about.png" ), aAppLogo ); + if ( !bLoaded ) + bLoaded = impl_loadBitmap( + rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ), + rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo ); + } + + return aAppLogo; +} + diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 3499f160bdfc..351376091929 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -146,8 +146,6 @@ void SfxApplication::Deinitialize() // ab hier d"urfen keine SvObjects mehr existieren DELETEZ(pAppData_Impl->pMatcher); - delete pAppData_Impl->pLabelResMgr; - DELETEX(pAppData_Impl->pSlotPool); DELETEX(pAppData_Impl->pFactArr); DELETEX(pAppData_Impl->pInitLinkList); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 217bb87d3a04..8720fe8f6f5f 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -87,7 +87,6 @@ #include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include "about.hxx" #include "frmload.hxx" #include "referers.hxx" #include <sfx2/app.hxx> @@ -427,20 +426,16 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - case SID_ABOUT: { - const String sCWSSchema( String::CreateFromAscii( "[CWS:" ) ); - rtl::OUString sDefault; - String sBuildId( utl::Bootstrap::getBuildIdData( sDefault ) ); - OSL_ENSURE( sBuildId.Len() > 0, "No BUILDID in bootstrap file" ); - if ( sBuildId.Len() > 0 && sBuildId.Search( sCWSSchema ) == STRING_NOTFOUND ) + SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); + if ( pFact ) { - // no cws part in brand buildid -> try basis buildid - rtl::OUString sBasisBuildId( DEFINE_CONST_OUSTRING( - "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) ); - rtl::Bootstrap::expandMacros( sBasisBuildId ); - sal_Int32 nIndex = sBasisBuildId.indexOf( sCWSSchema ); - if ( nIndex != -1 ) - sBuildId += String( sBasisBuildId.copy( nIndex ) ); + VclAbstractDialog* pDlg = pFact->CreateVclDialog( 0, RID_DEFAULTABOUT ); + pDlg->Execute(); + delete pDlg; + bDone = TRUE; } +<<<<<<< local +======= String sProductSource( utl::Bootstrap::getProductSource( sDefault ) ); OSL_ENSURE( sProductSource.Len() > 0, "No ProductSource in bootstrap file" ); @@ -507,6 +502,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) pDlg->Execute(); delete pDlg; bDone = sal_True; +>>>>>>> other break; } diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx deleted file mode 100644 index dbe88ab598ce..000000000000 --- a/sfx2/source/dialog/about.cxx +++ /dev/null @@ -1,423 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sfx2.hxx" - -// include --------------------------------------------------------------- - -#ifndef _SV_APP_HXX -#include <vcl/svapp.hxx> -#endif -#ifndef _MSGBOX_HXX //autogen -#include <vcl/msgbox.hxx> -#endif -#ifndef GCC -#endif - -#include <tools/stream.hxx> -#include <tools/urlobj.hxx> -#include <rtl/bootstrap.hxx> -#include <unotools/configmgr.hxx> -#include <unotools/bootstrap.hxx> -#include <com/sun/star/uno/Any.h> -#include <unotools/configmgr.hxx> -#include <vcl/graph.hxx> -#include <svtools/filter.hxx> - -#include <sfx2/sfxuno.hxx> -#include "about.hxx" -#include "sfxresid.hxx" -#include <sfx2/sfxdefs.hxx> -#include <sfx2/app.hxx> -#include <sfx2/sfxcommands.h> -#include "dialog.hrc" - -// defines --------------------------------------------------------------- - -#define SCROLL_OFFSET 1 -#define SPACE_OFFSET 5 -#define SCROLL_TIMER 30 - -#define WELCOME_URL DEFINE_CONST_UNICODE( "http://www.openoffice.org/welcome/credits.html" ) - -// class AboutDialog ----------------------------------------------------- -static void layoutText( FixedInfo &rText, long &nY, long nTextWidth, Size a6Size ) -{ - Point aTextPos = rText.GetPosPixel(); - aTextPos.X() = a6Size.Width() * 2; - aTextPos.Y() = nY; - rText.SetPosPixel( aTextPos ); - - Size aTxtSiz = rText.GetSizePixel(); - aTxtSiz.Width() = nTextWidth; - Size aCalcSize = rText.CalcMinimumSize( nTextWidth ); - aTxtSiz.Height() = aCalcSize.Height(); - rText.SetSizePixel( aTxtSiz ); - - nY += aTxtSiz.Height(); -} - -static bool impl_loadBitmap( - const rtl::OUString &rPath, const rtl::OUString &rBmpFileName, - Image &rLogo ) -{ - rtl::OUString uri( rPath ); - rtl::Bootstrap::expandMacros( uri ); - INetURLObject aObj( uri ); - aObj.insertName( rBmpFileName ); - SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ ); - if ( !aStrm.GetError() ) - { - // Use graphic class to also support more graphic formats (bmp,png,...) - Graphic aGraphic; - - GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); - pGF->ImportGraphic( aGraphic, String(), aStrm, GRFILTER_FORMAT_DONTKNOW ); - - // Default case, we load the intro bitmap from a seperate file - // (e.g. staroffice_intro.bmp or starsuite_intro.bmp) - BitmapEx aBmp = aGraphic.GetBitmapEx(); - rLogo = Image( aBmp ); - return true; - } - return false; -} - -/** loads the application logo as used in the about dialog and impress slideshow pause screen */ -Image SfxApplication::GetApplicationLogo() -{ - Image aAppLogo; - - rtl::OUString aAbouts; - bool bLoaded = false; - sal_Int32 nIndex = 0; - do - { - bLoaded = impl_loadBitmap( - rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ), - aAbouts.getToken( 0, ',', nIndex ), aAppLogo ); - } - while ( !bLoaded && ( nIndex >= 0 ) ); - - // fallback to "about.bmp" - if ( !bLoaded ) - { - bLoaded = impl_loadBitmap( - rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ), - rtl::OUString::createFromAscii( "about.png" ), aAppLogo ); - if ( !bLoaded ) - bLoaded = impl_loadBitmap( - rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ), - rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo ); - } - - if ( !bLoaded ) - { - bLoaded = impl_loadBitmap( - rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ), - rtl::OUString::createFromAscii( "about.png" ), aAppLogo ); - if ( !bLoaded ) - bLoaded = impl_loadBitmap( - rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ), - rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo ); - } - - return aAppLogo; -} - -AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerStr ) : - - SfxModalDialog ( pParent, rId ), - - aOKButton ( this, ResId( ABOUT_BTN_OK, *rId.GetResMgr() ) ), - aVersionText ( this, ResId( ABOUT_FTXT_VERSION, *rId.GetResMgr() ) ), - aCopyrightText ( this, ResId( ABOUT_FTXT_COPYRIGHT, *rId.GetResMgr() ) ), - aBuildData ( this ), - aDeveloperAry ( ResId( ABOUT_STR_DEVELOPER_ARY, *rId.GetResMgr() ) ), - aDevVersionStr ( rVerStr ), - aAccelStr ( ResId( ABOUT_STR_ACCEL, *rId.GetResMgr() ) ), - aCopyrightTextStr( ResId( ABOUT_STR_COPYRIGHT, *rId.GetResMgr() ) ), - aTimer (), - nOff ( 0 ), - m_nDeltaWidth ( 0 ), - m_nPendingScrolls( 0 ), - bNormal ( sal_True ) -{ - rtl::OUString sProduct; - utl::ConfigManager::GetDirectConfigProperty(utl::ConfigManager::PRODUCTNAME) >>= sProduct; - - // load image from module path - aAppLogo = SfxApplication::GetApplicationLogo(); - - // Transparenter Font - Font aFont = GetFont(); - aFont.SetTransparent( sal_True ); - SetFont( aFont ); - - // if necessary more info - String sVersion = aVersionText.GetText(); - sVersion.SearchAndReplaceAscii( "$(VER)", Application::GetDisplayName() ); - sVersion += '\n'; - sVersion += rVerStr; - aVersionText.SetText( sVersion ); - - // Initialisierung fuer Aufruf Entwickler - if ( aAccelStr.Len() && ByteString(U2S(aAccelStr)).IsAlphaAscii() ) - { - Accelerator *pAccel = 0, *pPrevAccel = 0, *pFirstAccel = 0; - aAccelStr.ToUpperAscii(); - - for ( sal_uInt16 i = 0; i < aAccelStr.Len(); ++i ) - { - pPrevAccel = pAccel; - pAccel = new Accelerator; - aAccelList.Insert( pAccel, LIST_APPEND ); - sal_uInt16 nKey = aAccelStr.GetChar(i) - 'A' + KEY_A; - pAccel->InsertItem( 1, KeyCode( nKey, KEY_MOD1 ) ); - if ( i > 0 ) - pPrevAccel->SetAccel( 1, pAccel ); - if ( i == 0 ) - pFirstAccel = pAccel; - } - pAccel->SetSelectHdl( LINK( this, AboutDialog, AccelSelectHdl ) ); - GetpApp()->InsertAccel( pFirstAccel ); - } - - // set for background and text the correct system color - const StyleSettings& rSettings = GetSettings().GetStyleSettings(); - Color aWhiteCol( rSettings.GetWindowColor() ); - Wallpaper aWall( aWhiteCol ); - SetBackground( aWall ); - Font aNewFont( aCopyrightText.GetFont() ); - aNewFont.SetTransparent( sal_True ); - - aVersionText.SetFont( aNewFont ); - aCopyrightText.SetFont( aNewFont ); - - aVersionText.SetBackground(); - aCopyrightText.SetBackground(); - - Color aTextColor( rSettings.GetWindowTextColor() ); - aVersionText.SetControlForeground( aTextColor ); - aCopyrightText.SetControlForeground( aTextColor ); - aBuildData.SetBackground( aWall ); - - Font aSmallFont = rSettings.GetInfoFont(); - Size aSmaller = aNewFont.GetSize(); - aSmaller.Width() = (long) (aSmaller.Width() * 0.75); - aSmaller.Height() = (long) (aSmaller.Height() * 0.75); - aNewFont.SetSize( aSmaller ); - aBuildData.SetFont( aNewFont ); - aBuildData.SetBackground( aWall ); -#ifdef BUILD_VER_STRING - String aBuildString( DEFINE_CONST_UNICODE( BUILD_VER_STRING ) ); -#else - String aBuildString; -#endif - aBuildData.SetText( aBuildString ); - aBuildData.Show(); - - // determine size and position of the dialog & elements - Size aAppLogoSiz = aAppLogo.GetSizePixel(); - Size aOutSiz = GetOutputSizePixel(); - aOutSiz.Width() = aAppLogoSiz.Width(); - - Size a6Size = aVersionText.LogicToPixel( Size( 6, 6 ), MAP_APPFONT ); - long nY = aAppLogoSiz.Height() + ( a6Size.Height() * 2 ); - long nDlgMargin = a6Size.Width() * 4 ; - long nCtrlMargin = a6Size.Height() * 2; - long nTextWidth = aOutSiz.Width() - nDlgMargin; - - aCopyrightText.SetText( aCopyrightTextStr ); - - layoutText( aVersionText, nY, nTextWidth, a6Size ); - nY += nCtrlMargin; - - // OK-Button-Position (at the bottom and centered) - Size aOKSiz = aOKButton.GetSizePixel(); - Point aOKPnt = aOKButton.GetPosPixel(); - - // Multiline edit with Copyright-Text - Point aCopyPnt = aCopyrightText.GetPosPixel(); - Size aCopySize = aCopyrightText.GetSizePixel(); - aCopySize.Width() = nTextWidth; - aCopySize.Height() = aOutSiz.Height() - nY - ( aOKSiz.Height() * 2 ) - nCtrlMargin; - - aCopyPnt.X() = ( aOutSiz.Width() - aCopySize.Width() ) / 2; - aCopyPnt.Y() = nY; - aCopyrightText.SetPosSizePixel( aCopyPnt, aCopySize ); - - nY += aCopySize.Height() + nCtrlMargin; - aOKPnt.X() = ( aOutSiz.Width() - aOKSiz.Width() ) / 2; - aOKPnt.Y() = nY; - aOKButton.SetPosPixel( aOKPnt ); - - // Change the width of the dialog - SetOutputSizePixel( aOutSiz ); - - FreeResource(); - - SetHelpId( CMD_SID_ABOUT ); -} - -// ----------------------------------------------------------------------- - -AboutDialog::~AboutDialog() -{ - // L"oschen des Entwickleraufrufs - if ( aAccelList.Count() ) - { - GetpApp()->RemoveAccel( aAccelList.First() ); - Accelerator* pAccel = aAccelList.Last(); - - while ( pAccel ) - { - delete pAccel; - pAccel = aAccelList.Prev(); - } - } -} - -// ----------------------------------------------------------------------- - -IMPL_LINK( AboutDialog, TimerHdl, Timer *, pTimer ) -{ - (void)pTimer; //unused - ++m_nPendingScrolls; - Invalidate( INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN ); - return 0; -} - -// ----------------------------------------------------------------------- - -IMPL_LINK( AboutDialog, AccelSelectHdl, Accelerator *, pAccelerator ) -{ -#ifdef YURI_DARIO - aCopyrightText.SetHelpText( DEFINE_CONST_UNICODE("Conoscere qualcuno ovunque egli sia, con cui comprendersi nonostante le distanze\n" - "e le differenze, puo' trasformare la terra in un giardino. baci Valeria") ); -#endif - - (void)pAccelerator; //unused - // init Timer - aTimer.SetTimeoutHdl( LINK( this, AboutDialog, TimerHdl ) ); - - // init scroll mode - nOff = GetOutputSizePixel().Height(); - MapMode aMapMode( MAP_PIXEL ); - SetMapMode( aMapMode ); - bNormal = sal_False; - - // start scroll Timer - aTimer.SetTimeout( SCROLL_TIMER ); - aTimer.Start(); - return 0; -} - -// ----------------------------------------------------------------------- - -sal_Bool AboutDialog::Close() -{ - // stop Timer and finish the dialog - aTimer.Stop(); - EndDialog( RET_OK ); - return( sal_False ); -} - -// ----------------------------------------------------------------------- - -void AboutDialog::Paint( const Rectangle& rRect ) -{ - SetClipRegion( rRect ); - - if ( bNormal ) // not in scroll mode - { - Point aPos( m_nDeltaWidth / 2, 0 ); - DrawImage( aPos, aAppLogo ); - return; - } - - // scroll the content - const int nDeltaY = -SCROLL_OFFSET * m_nPendingScrolls; - if( !nDeltaY ) - return; - nOff += nDeltaY; - Scroll( 0, nDeltaY, SCROLL_NOERASE ); - m_nPendingScrolls = 0; - - // draw the credits text - const Font aOrigFont = GetFont(); - const int nFullWidth = GetOutputSizePixel().Width(); - - int nY = nOff; - const int nDevCnt = static_cast<int>( aDeveloperAry.Count() ); - for( int i = 0; i < nDevCnt; ++i ) - { - if( nY >= rRect.Bottom() ) - break; - - int nPos2 = nY + GetTextHeight() + 3; - if( nPos2 >= rRect.Top() + nDeltaY ) - { - const String aStr = aDeveloperAry.GetString(i); - const long nVal = aDeveloperAry.GetValue(i); - - if ( nVal ) - { - // emphasize the headers - Font aFont = aOrigFont; - aFont.SetWeight( (FontWeight)nVal ); - SetFont( aFont ); - nPos2 = nY + GetTextHeight() + 3; - } - - // clear text background - Rectangle aEraseRect( Point(0,nY), Size( nFullWidth, nPos2-nY)); - Erase( aEraseRect ); - - // draw centered text - const long nTextWidth = GetTextWidth( aStr ); - long nX = (nFullWidth - 5 - nTextWidth) / 2; - if( nX < 0 ) - nX = SPACE_OFFSET; - const Point aPnt( nX, nY ); - DrawText( aPnt, aStr ); - - // restore the font if needed - if( nVal ) - SetFont( aOrigFont ); - } - nY = nPos2; - } - - // close dialog if the whole text has been scrolled - if ( nY <= 0 ) - { - bNormal = sal_True; - Close(); - } -} diff --git a/sfx2/source/dialog/securitypage.hrc b/sfx2/source/dialog/securitypage.hrc index d425131b4772..d425131b4772 100644..100755 --- a/sfx2/source/dialog/securitypage.hrc +++ b/sfx2/source/dialog/securitypage.hrc diff --git a/sfx2/source/dialog/securitypage.src b/sfx2/source/dialog/securitypage.src index fee60404d01c..fee60404d01c 100644..100755 --- a/sfx2/source/dialog/securitypage.src +++ b/sfx2/source/dialog/securitypage.src diff --git a/sfx2/source/doc/sfxacldetect.cxx b/sfx2/source/doc/sfxacldetect.cxx index ded9d3000fc8..ded9d3000fc8 100755..100644 --- a/sfx2/source/doc/sfxacldetect.cxx +++ b/sfx2/source/doc/sfxacldetect.cxx diff --git a/sfx2/source/doc/syspath.cxx b/sfx2/source/doc/syspath.cxx index a1025370ed24..a1025370ed24 100755..100644 --- a/sfx2/source/doc/syspath.cxx +++ b/sfx2/source/doc/syspath.cxx diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc index ef5c168c36f0..ef5c168c36f0 100644..100755 --- a/sfx2/source/inc/helpid.hrc +++ b/sfx2/source/inc/helpid.hrc diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index 937c2622cc13..5c01b0d53259 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -62,12 +62,6 @@ class SfxShell; class Timer; -#if !defined(_SFX_APPCTOR_CXX) && defined(WNT) -#ifndef _DLL_ -#error _DLL_ mal wieder nicht defined => GetpApp() == 0 -#endif -#endif - //------------------------------------------------------------------------ // Macro fuer den Call-Profiler unter WinNT diff --git a/editeng/inc/makefile.mk b/svx/AllLangResTarget_about.mk index 6ecb444e03eb..0d08c0075665 100644 --- a/editeng/inc/makefile.mk +++ b/svx/AllLangResTarget_about.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -29,24 +25,21 @@ # #************************************************************************* -PRJ=.. - -PRJNAME=editeng -TARGET=inc +$(eval $(call gb_AllLangResTarget_AllLangResTarget,about)) -# --- Settings ----------------------------------------------------- +$(eval $(call gb_AllLangResTarget_set_reslocation,about,svx)) -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk +$(eval $(call gb_AllLangResTarget_add_srs,about,svx/about)) -# --- Files -------------------------------------------------------- +$(eval $(call gb_SrsTarget_SrsTarget,svx/about)) -.INCLUDE : target.mk +$(eval $(call gb_SrsTarget_set_include,svx/about,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(SRCDIR)/svx/inc/ \ +)) -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" +$(eval $(call gb_SrsTarget_add_files,svx/about,\ + svx/source/intro/about_ooo.src \ +)) diff --git a/editeng/source/rtf/makefile.mk b/svx/AllLangResTarget_gal.mk index 081cd5b506cd..eb0b5b15c444 100644..100755 --- a/editeng/source/rtf/makefile.mk +++ b/svx/AllLangResTarget_gal.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,26 +25,24 @@ # #************************************************************************* -PRJ=..$/.. +$(eval $(call gb_AllLangResTarget_AllLangResTarget,gal)) -PRJNAME=editeng -TARGET=rtf -ENABLE_EXCEPTIONS=TRUE -# --- Settings ----------------------------------------------------- +$(eval $(call gb_AllLangResTarget_set_reslocation,gal,svx)) -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk -# --- Files -------------------------------------------------------- +$(eval $(call gb_AllLangResTarget_add_srs,gal,svx/gal)) -EXCEPTIONSFILES= \ - $(SLO)$/rtfitem.obj \ - $(SLO)$/svxrtf.obj +$(eval $(call gb_SrsTarget_SrsTarget,svx/gal)) -SLOFILES= \ - $(EXCEPTIONSFILES) \ - $(SLO)$/rtfgrf.obj +$(eval $(call gb_SrsTarget_set_include,svx/gal,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(SRCDIR)/svx/source/gallery \ + -I$(SRCDIR)/svx/inc/ \ +)) -# ========================================================================== - -.INCLUDE : target.mk +$(eval $(call gb_SrsTarget_add_files,svx/gal,\ + svx/source/gallery2/gallery.src \ + svx/source/gallery2/galtheme.src \ +)) +# vim: set noet sw=4 ts=4: diff --git a/svx/source/sdr/animation/makefile.mk b/svx/AllLangResTarget_ofa.mk index a6750647f556..964b6562b3dd 100644 --- a/svx/source/sdr/animation/makefile.mk +++ b/svx/AllLangResTarget_ofa.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,22 +25,22 @@ # #************************************************************************* -PRJ=..$/..$/.. +$(eval $(call gb_AllLangResTarget_AllLangResTarget,ofa)) -PRJNAME=svx -TARGET=animation -ENABLE_EXCEPTIONS=TRUE +$(eval $(call gb_AllLangResTarget_set_reslocation,ofa,svx)) -# --- Settings ----------------------------------------------------- +$(eval $(call gb_AllLangResTarget_add_srs,ofa,svx/ofa)) -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk +$(eval $(call gb_SrsTarget_SrsTarget,svx/ofa)) -# --- Files -------------------------------------------------------- +$(eval $(call gb_SrsTarget_set_include,svx/ofa,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(SRCDIR)/svx/inc/ \ +)) -SLOFILES=\ - $(SLO)$/animationstate.obj \ - $(SLO)$/objectanimator.obj \ - $(SLO)$/scheduler.obj +$(eval $(call gb_SrsTarget_add_files,svx/ofa,\ + svx/source/src/errtxt.src \ + svx/source/src/app.src \ +)) -.INCLUDE : target.mk diff --git a/svx/prj/target_res_svx.mk b/svx/AllLangResTarget_svx.mk index 67d3cfab1cc1..b2707b01a637 100644 --- a/svx/prj/target_res_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -28,7 +28,6 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,svx)) $(eval $(call gb_AllLangResTarget_set_reslocation,svx,svx)) -#$(eval $(call gb_AllLangResTarget_set_reslocation,svx,svx/source/svdraw)) $(eval $(call gb_AllLangResTarget_add_srs,svx,\ svx/res \ @@ -40,73 +39,98 @@ $(eval $(call gb_SrsTarget_set_include,svx/res,\ $$(INCLUDE) \ -I$(OUTDIR)/inc \ -I$(WORKDIR)/inc \ + -I$(WORKDIR)/inc/svx \ -I$(SRCDIR)/svx/source/inc \ -I$(SRCDIR)/svx/source/dialog \ -I$(SRCDIR)/svx/inc/ \ - -I$(SRCDIR)/svx/unxlngi6.pro/inc/ \ )) -#svx/source/src/errtxt.src -#svx/source/src/app.src - -#svx/source/intro/iso.src -#svx/source/intro/ooo.src - -#svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src -#svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src - $(eval $(call gb_SrsTarget_add_files,svx/res,\ - svx/source/stbctrls/stbctrls.src \ - svx/source/dialog/passwd.src \ - svx/source/dialog/language.src \ + svx/source/accessibility/accessibility.src \ svx/source/dialog/bmpmask.src \ - svx/source/dialog/ucsubset.src \ + svx/source/dialog/contdlg.src \ + svx/source/dialog/ctredlin.src \ + svx/source/dialog/dlgctrl.src \ + svx/source/dialog/docrecovery.src \ + svx/source/dialog/fontwork.src \ + svx/source/dialog/frmsel.src \ svx/source/dialog/hdft.src \ + svx/source/dialog/hyprlink.src \ svx/source/dialog/imapdlg.src \ - svx/source/dialog/swframeposstrings.src \ + svx/source/dialog/langbox.src \ + svx/source/dialog/language.src \ + svx/source/dialog/optgrid.src \ + svx/source/dialog/passwd.src \ svx/source/dialog/prtqry.src \ - svx/source/dialog/txenctab.src \ - svx/source/dialog/dlgctrl.src \ - svx/source/dialog/frmsel.src \ - svx/source/dialog/ctredlin.src \ - svx/source/dialog/sdstring.src \ + svx/source/dialog/rubydialog.src \ svx/source/dialog/ruler.src \ + svx/source/dialog/sdstring.src \ svx/source/dialog/srchdlg.src \ - svx/source/dialog/optgrid.src \ - svx/source/dialog/langbox.src \ - svx/source/dialog/contdlg.src \ - svx/source/dialog/rubydialog.src \ - svx/source/dialog/fontwork.src \ - svx/source/dialog/docrecovery.src \ - svx/source/dialog/hyprlink.src \ svx/source/dialog/svxbmpnumvalueset.src \ - svx/source/engine3d/string3d.src \ + svx/source/dialog/swframeposstrings.src \ + svx/source/dialog/txenctab.src \ + svx/source/dialog/ucsubset.src \ svx/source/engine3d/float3d.src \ + svx/source/engine3d/string3d.src \ + svx/source/fmcomp/gridctrl.src \ + svx/source/form/datanavi.src \ + svx/source/form/filtnav.src \ + svx/source/form/fmexpl.src \ + svx/source/form/fmstring.src \ + svx/source/form/formshell.src \ + svx/source/items/svxerr.src \ + svx/source/items/svxitems.src \ svx/source/mnuctrls/mnuctrls.src \ - svx/source/tbxctrls/linectrl.src \ + svx/source/stbctrls/stbctrls.src \ + svx/source/svdraw/svdstr.src \ + svx/source/table/table.src \ svx/source/tbxctrls/colrctrl.src \ svx/source/tbxctrls/extrusioncontrols.src \ - svx/source/tbxctrls/tbxdraw.src \ + svx/source/tbxctrls/fontworkgallery.src \ svx/source/tbxctrls/grafctrl.src \ svx/source/tbxctrls/lboxctrl.src \ + svx/source/tbxctrls/linectrl.src \ svx/source/tbxctrls/tbcontrl.src \ - svx/source/tbxctrls/fontworkgallery.src \ - svx/source/fmcomp/gridctrl.src \ - svx/source/form/fmexpl.src \ - svx/source/form/formshell.src \ - svx/source/form/fmstring.src \ - svx/source/form/datanavi.src \ - svx/source/form/filtnav.src \ - svx/source/unodraw/unodraw.src \ - svx/source/table/table.src \ + svx/source/tbxctrls/tbunosearchcontrollers.src \ svx/source/toolbars/extrusionbar.src \ svx/source/toolbars/fontworkbar.src \ - svx/source/gallery2/galtheme.src \ - svx/source/gallery2/gallery.src \ - svx/source/svdraw/svdstr.src \ - svx/source/accessibility/accessibility.src \ - svx/source/items/svxitems.src \ - svx/source/items/svxerr.src \ + svx/source/unodraw/unodraw.src \ )) +$(call gb_SrsPartTarget_get_target,svx/source/fmcomp/gridctrl.src) : $(WORKDIR)/inc/svx/globlmn.hrc +$(call gb_SrsPartTarget_get_target,svx/source/form/fmexpl.src) : $(WORKDIR)/inc/svx/globlmn.hrc +$(call gb_SrsPartTarget_get_target,svx/source/form/datanavi.src) : $(WORKDIR)/inc/svx/globlmn.hrc +$(call gb_SrsPartTarget_get_target,svx/source/form/formshell.src) : $(WORKDIR)/inc/svx/globlmn.hrc +$(call gb_SrsTarget_get_clean_target,svx/res) : $(WORKDIR)/inc/svx/globlmn.hrc_clean + +# hack !!! +# just a temporary - globlmn.hrc about to be removed! +ifeq ($(strip $(WITH_LANG)),) +$(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc + echo copying $@ + -mkdir -p $(WORKDIR)/inc/svx + cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(WORKDIR)/inc/svx/globlmn.hrc + rm -f $(WORKDIR)/inc/svx/lastrun.mk +else +-include $(WORKDIR)/inc/svx/lastrun.mk +ifneq ($(gb_lastrun_globlmn),MERGED) +.PHONY : $(WORKDIR)/inc/svx/globlmn.hrc +endif +$(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf + echo merging $@ + -mkdir -p $(WORKDIR)/inc/svx + rm -f $(WORKDIR)/inc/svx/lastrun.mk + echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk + $(call gb_Helper_abbreviate_dirs_native, \ + $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ + -p svx \ + -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all) +endif + +.PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean +$(WORKDIR)/inc/svx/globlmn.hrc_clean : + rm -f $(WORKDIR)/inc/svx/lastrun.mk \ + $(WORKDIR)/inc/svx/globlmn.hrc + +# vim: set noet sw=4 ts=4: diff --git a/svx/AllLangResTarget_textconversiondlgs.mk b/svx/AllLangResTarget_textconversiondlgs.mk new file mode 100644 index 000000000000..d30ccd40641b --- /dev/null +++ b/svx/AllLangResTarget_textconversiondlgs.mk @@ -0,0 +1,47 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_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/editeng/util/makefile.pmk b/svx/JunitTest_svx_unoapi.mk index fac1139d7b89..d6597f85e8e7 100644..100755 --- a/editeng/util/makefile.pmk +++ b/svx/JunitTest_svx_unoapi.mk @@ -1,14 +1,10 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. # -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: makefile.pmk,v $ +# Copyright 2000, 2011 Oracle and/or its affiliates. # -# $Revision: 1.6 $ +# OpenOffice.org - a multi-platform office productivity suite # # This file is part of OpenOffice.org. # @@ -29,19 +25,29 @@ # #************************************************************************* -# define EDITENG_DLLIMPLEMENTATION (see @ editengdllapi.h) -CDEFS += -DEDITENG_DLLIMPLEMENTATION +$(eval $(call gb_JunitTest_JunitTest,svx_unoapi)) + +$(eval $(call gb_JunitTest_set_defs,svx_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/svx/qa/unoapi/svx.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/svx/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svx/qa/unoapi/testdocuments \ +)) -.IF "$(ENABLE_GTK)" != "" -CFLAGS+=-DENABLE_GTK -.ENDIF +$(eval $(call gb_JunitTest_add_jars,svx_unoapi,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) -.IF "$(ENABLE_KDE)" != "" -CFLAGS+=-DENABLE_KDE -.ENDIF +$(eval $(call gb_JunitTest_add_sourcefiles,svx_unoapi,\ + svx/qa/unoapi/Test \ +)) -.IF "$(ENABLE_KDE4)" != "" -CFLAGS+=-DENABLE_KDE4 -.ENDIF +$(eval $(call gb_JunitTest_add_classes,svx_unoapi,\ + org.openoffice.svx.qa.unoapi.Test \ +)) -VISIBILITY_HIDDEN=TRUE +# vim: set noet sw=4 ts=4: diff --git a/svx/prj/target_lib_svx.mk b/svx/Library_svx.mk index 6810f7f30fed..4ce5250f77a5 100644 --- a/svx/prj/target_lib_svx.mk +++ b/svx/Library_svx.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -27,20 +27,20 @@ $(eval $(call gb_Library_Library,svx)) +$(eval $(call gb_Library_set_componentfile,svx,svx/util/svx)) + $(eval $(call gb_Library_set_include,svx,\ - $$(SOLARINC) \ - -I$(WORKDIR)/inc/svx/ \ -I$(SRCDIR)/svx/inc \ -I$(SRCDIR)/svx/source/inc \ -I$(SRCDIR)/svx/inc/pch \ + $$(SOLARINC) \ -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ )) $(eval $(call gb_Library_set_defs,svx,\ $$(DEFS) \ - -DACCESSIBLE_LAYOUT \ -DSVX_DLLIMPLEMENTATION \ + -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ )) $(eval $(call gb_Library_add_linked_libs,svx,\ @@ -56,6 +56,7 @@ $(eval $(call gb_Library_add_linked_libs,svx,\ sal \ sfx \ sot \ + stl \ svl \ svt \ svxcore \ @@ -67,195 +68,169 @@ $(eval $(call gb_Library_add_linked_libs,svx,\ vos3 \ xo \ xcr \ - stl \ + $(gb_STDLIBS) \ )) -# svx/source/unodialogs/textconversiondlgs/services \ -# svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog \ -# svx/source/unodialogs/textconversiondlgs/chinese_translationdialog \ -# svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog \ -# svx/source/unodialogs/textconversiondlgs/resid \ - - $(eval $(call gb_Library_add_exception_objects,svx,\ - svx/source/unodraw/recoveryui \ - svx/source/unodraw/unoshcol \ - svx/source/unodraw/unoctabl \ - svx/source/unodraw/unopool \ - svx/source/unodraw/UnoNamespaceMap \ - svx/source/tbxctrls/layctrl \ - svx/source/tbxctrls/tbxcolor \ - svx/source/tbxctrls/formatpaintbrushctrl \ - svx/source/tbxctrls/colrctrl \ - svx/source/tbxctrls/itemwin \ - svx/source/tbxctrls/tbxalign \ - svx/source/tbxctrls/fillctrl \ - svx/source/tbxctrls/tbunocontroller \ - svx/source/tbxctrls/subtoolboxcontrol \ - svx/source/tbxctrls/grafctrl \ - svx/source/tbxctrls/linectrl \ - svx/source/tbxctrls/tbxdrctl \ - svx/source/tbxctrls/verttexttbxctrl \ - svx/source/tbxctrls/lboxctrl \ - svx/source/table/tablertfexporter \ - svx/source/table/tablertfimporter \ - svx/source/table/accessiblecell \ - svx/source/table/accessibletableshape \ - svx/source/table/tabledesign \ - svx/source/table/celleditsource \ - svx/source/svdraw/svdoimp \ - svx/source/svdraw/svdscrol \ - svx/source/svdraw/ActionDescriptionProvider \ - svx/source/svdraw/impgrfll \ - svx/source/items/SmartTagItem \ - svx/source/items/svxempty \ - svx/source/items/viewlayoutitem \ - svx/source/items/zoomslideritem \ - svx/source/items/hlnkitem \ - svx/source/items/numfmtsh \ - svx/source/items/algitem \ - svx/source/items/zoomitem \ - svx/source/items/ofaitem \ - svx/source/items/pageitem \ - svx/source/items/numinf \ - svx/source/items/postattr \ - svx/source/items/rotmodit \ - svx/source/items/svxerr \ - svx/source/form/databaselocationinput \ - svx/source/form/fmsrcimp \ - svx/source/form/filtnav \ - svx/source/form/tabwin \ - svx/source/form/fmsrccfg \ - svx/source/form/fmobjfac \ - svx/source/form/tbxform \ - svx/source/form/fmPropBrw \ - svx/source/form/dbcharsethelper \ - svx/source/stbctrls/pszctrl \ - svx/source/stbctrls/insctrl \ - svx/source/stbctrls/selctrl \ - svx/source/stbctrls/xmlsecctrl \ - svx/source/stbctrls/modctrl \ - svx/source/stbctrls/zoomsliderctrl \ - svx/source/stbctrls/zoomctrl \ - svx/source/gengal/gengal \ - svx/source/unogallery/unogaltheme \ - svx/source/unogallery/unogalitem \ - svx/source/unogallery/unogalthemeprovider \ - svx/source/mnuctrls/SmartTagCtl \ - svx/source/mnuctrls/fntctl \ - svx/source/mnuctrls/clipboardctl \ - svx/source/mnuctrls/fntszctl \ - svx/source/fmcomp/dbaobjectex \ - svx/source/smarttags/SmartTagMgr \ + svx/source/accessibility/AccessibleControlShape \ + svx/source/accessibility/AccessibleEmptyEditSource \ + svx/source/accessibility/AccessibleFrameSelector \ + svx/source/accessibility/AccessibleGraphicShape \ svx/source/accessibility/AccessibleOLEShape \ - svx/source/accessibility/AccessibleShapeTreeInfo \ - svx/source/accessibility/DGColorNameLookUp \ - svx/source/accessibility/charmapacc \ svx/source/accessibility/AccessibleShape \ + svx/source/accessibility/AccessibleShapeInfo \ + svx/source/accessibility/AccessibleShapeTreeInfo \ + svx/source/accessibility/AccessibleTextEventQueue \ svx/source/accessibility/AccessibleTextHelper \ - svx/source/accessibility/svxrectctaccessiblecontext \ - svx/source/accessibility/AccessibleGraphicShape \ - svx/source/accessibility/AccessibleEmptyEditSource \ + svx/source/accessibility/charmapacc \ + svx/source/accessibility/ChildrenManager \ svx/source/accessibility/ChildrenManagerImpl \ - svx/source/accessibility/AccessibleShapeInfo \ svx/source/accessibility/DescriptionGenerator \ + svx/source/accessibility/DGColorNameLookUp \ + svx/source/accessibility/GraphCtlAccessibleContext \ svx/source/accessibility/ShapeTypeHandler \ - svx/source/accessibility/ChildrenManager \ - svx/source/accessibility/AccessibleControlShape \ - svx/source/accessibility/AccessibleTextEventQueue \ - svx/source/accessibility/AccessibleFrameSelector \ + svx/source/accessibility/svxrectctaccessiblecontext \ svx/source/accessibility/SvxShapeTypes \ - svx/source/accessibility/GraphCtlAccessibleContext \ + svx/source/customshapes/EnhancedCustomShape3d \ + svx/source/customshapes/EnhancedCustomShapeEngine \ + svx/source/customshapes/EnhancedCustomShapeFontWork \ + svx/source/customshapes/EnhancedCustomShapeHandle \ svx/source/customshapes/tbxcustomshapes \ - svx/source/engine3d/float3d \ - svx/source/engine3d/volume3d \ - svx/source/engine3d/viewpt3d \ - svx/source/dialog/srchdlg \ - svx/source/dialog/rubydialog \ - svx/source/dialog/srchctrl \ - svx/source/dialog/paraprev \ - svx/source/dialog/fontwork \ - svx/source/dialog/framelinkarray \ - svx/source/dialog/svxbmpnumvalueset \ - svx/source/dialog/hyperdlg \ - svx/source/dialog/wrapfield \ - svx/source/dialog/svxruler \ - svx/source/dialog/ctredlin \ - svx/source/dialog/rulritem \ - svx/source/dialog/dialcontrol \ - svx/source/dialog/databaseregistrationui \ - svx/source/dialog/txencbox \ + svx/source/dialog/_bmpmask \ svx/source/dialog/charmap \ - svx/source/dialog/passwd \ - svx/source/dialog/dlgctrl \ - svx/source/dialog/hdft \ - svx/source/dialog/frmdirlbox \ - svx/source/dialog/fntctrl \ - svx/source/dialog/docrecovery \ - svx/source/dialog/checklbx \ - svx/source/dialog/swframeposstrings \ - svx/source/dialog/svxgrahicitem \ - svx/source/dialog/relfld \ - svx/source/dialog/SpellDialogChildWindow \ - svx/source/dialog/strarray \ - svx/source/dialog/prtqry \ svx/source/dialog/connctrl \ + svx/source/dialog/_contdlg \ svx/source/dialog/contwnd \ - svx/source/dialog/pfiledlg \ + svx/source/dialog/ctredlin \ + svx/source/dialog/databaseregistrationui \ + svx/source/dialog/dialcontrol \ svx/source/dialog/dlgctl3d \ - svx/source/dialog/hyprlink \ - svx/source/dialog/grfflt \ - svx/source/dialog/measctrl \ - svx/source/dialog/orienthelper \ + svx/source/dialog/dlgctrl \ + svx/source/dialog/docrecovery \ + svx/source/dialog/fntctrl \ + svx/source/dialog/fontlb \ + svx/source/dialog/fontwork \ + svx/source/dialog/framelinkarray \ + svx/source/dialog/frmdirlbox \ svx/source/dialog/frmsel \ - svx/source/dialog/swframeexample \ - svx/source/dialog/_bmpmask \ svx/source/dialog/graphctl \ - svx/source/dialog/rlrcitem \ - svx/source/dialog/fontlb \ - svx/source/dialog/optgrid \ + svx/source/dialog/grfflt \ + svx/source/dialog/hdft \ + svx/source/dialog/hyperdlg \ + svx/source/dialog/hyprlink \ + svx/source/dialog/imapdlg \ svx/source/dialog/imapwnd \ + svx/source/dialog/measctrl \ + svx/source/dialog/optgrid \ + svx/source/dialog/orienthelper \ svx/source/dialog/pagectrl \ - svx/source/dialog/_contdlg \ + svx/source/dialog/paraprev \ + svx/source/dialog/passwd \ + svx/source/dialog/pfiledlg \ + svx/source/dialog/prtqry \ + svx/source/dialog/relfld \ + svx/source/dialog/rlrcitem \ + svx/source/dialog/rubydialog \ + svx/source/dialog/rulritem \ + svx/source/dialog/SpellDialogChildWindow \ + svx/source/dialog/srchctrl \ + svx/source/dialog/srchdlg \ + svx/source/dialog/strarray \ + svx/source/dialog/svxbmpnumvalueset \ + svx/source/dialog/svxgrahicitem \ + svx/source/dialog/svxruler \ + svx/source/dialog/swframeexample \ + svx/source/dialog/swframeposstrings \ + svx/source/dialog/txencbox \ svx/source/dialog/txenctab \ - svx/source/dialog/imapdlg \ - svx/source/customshapes/EnhancedCustomShape3d \ - svx/source/customshapes/EnhancedCustomShapeHandle \ - svx/source/customshapes/EnhancedCustomShapeEngine \ - svx/source/customshapes/EnhancedCustomShapeFontWork \ + svx/source/dialog/wrapfield \ + svx/source/engine3d/float3d \ + svx/source/fmcomp/dbaobjectex \ + svx/source/form/databaselocationinput \ + svx/source/form/dbcharsethelper \ + svx/source/form/filtnav \ + svx/source/form/fmobjfac \ + svx/source/form/fmPropBrw \ + svx/source/form/fmsrccfg \ + svx/source/form/fmsrcimp \ + svx/source/form/tabwin \ + svx/source/form/tbxform \ + svx/source/items/algitem \ + svx/source/items/hlnkitem \ + svx/source/items/numfmtsh \ + svx/source/items/numinf \ + svx/source/items/ofaitem \ + svx/source/items/pageitem \ + svx/source/items/postattr \ + svx/source/items/rotmodit \ + svx/source/items/SmartTagItem \ + svx/source/items/svxempty \ + svx/source/items/svxerr \ + svx/source/items/viewlayoutitem \ + svx/source/items/zoomitem \ + svx/source/items/zoomslideritem \ + svx/source/mnuctrls/clipboardctl \ + svx/source/mnuctrls/fntctl \ + svx/source/mnuctrls/fntszctl \ + svx/source/mnuctrls/SmartTagCtl \ + svx/source/stbctrls/pszctrl \ + svx/source/stbctrls/insctrl \ + svx/source/stbctrls/selctrl \ + svx/source/stbctrls/xmlsecctrl \ + svx/source/stbctrls/modctrl \ + svx/source/stbctrls/zoomsliderctrl \ + svx/source/stbctrls/zoomctrl \ + svx/source/svdraw/ActionDescriptionProvider \ + svx/source/smarttags/SmartTagMgr \ + svx/source/svdraw/impgrfll \ + svx/source/table/accessiblecell \ + svx/source/table/accessibletableshape \ + svx/source/table/celleditsource \ + svx/source/table/tabledesign \ + svx/source/table/tablertfexporter \ + svx/source/table/tablertfimporter \ + svx/source/tbxctrls/colrctrl \ + svx/source/tbxctrls/fillctrl \ + svx/source/tbxctrls/formatpaintbrushctrl \ + svx/source/tbxctrls/grafctrl \ + svx/source/tbxctrls/itemwin \ + svx/source/tbxctrls/layctrl \ + svx/source/tbxctrls/lboxctrl \ + svx/source/tbxctrls/linectrl \ + svx/source/tbxctrls/subtoolboxcontrol \ + svx/source/tbxctrls/tbunocontroller \ + svx/source/tbxctrls/tbunosearchcontrollers \ + svx/source/tbxctrls/tbxalign \ + svx/source/tbxctrls/tbxcolor \ + svx/source/tbxctrls/tbxdrctl \ + svx/source/tbxctrls/verttexttbxctrl \ + svx/source/unodraw/recoveryui \ + svx/source/unodraw/unoctabl \ + svx/source/unodraw/UnoNamespaceMap \ + svx/source/unodraw/unopool \ + svx/source/unodraw/unoshcol \ + svx/source/unogallery/unogalitem \ + svx/source/unogallery/unogaltheme \ + svx/source/unogallery/unogalthemeprovider \ )) ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/sendreportunx \ )) -$(eval $(call gb_Library_add_linked_libs,svx,\ - dl \ - m \ - pthread \ -)) else ifeq ($(OS),WNT) $(eval $(call gb_Library_add_linked_libs,svx,\ advapi32 \ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ +)) $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/sendreportw32 \ )) -)) else $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/sendreportgen \ )) endif - -$(eval $(call gb_Library_add_linked_libs,svx,\ - shell \ -)) endif # vim: set noet sw=4 ts=4: diff --git a/svx/prj/target_lib_svxcore.mk b/svx/Library_svxcore.mk index f337588232fb..dd31e6b4bdd1 100644 --- a/svx/prj/target_lib_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -27,21 +27,32 @@ $(eval $(call gb_Library_Library,svxcore)) +$(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore)) + $(eval $(call gb_Library_add_sdi_headers,svx,svx/sdi/svxslots)) +$(eval $(call gb_Library_add_package_headers,svxcore,\ + svx_inc \ + svx_sdi \ +)) + $(eval $(call gb_Library_set_include,svxcore,\ -I$(SRCDIR)/svx/inc \ - -I$(SRCDIR)/svx/source/inc \ -I$(SRCDIR)/svx/inc/pch \ - -I$(WORKDIR)/SdiTarget/svx/sdi \ + -I$(SRCDIR)/svx/source/inc \ $$(INCLUDE) \ -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ + -I$(WORKDIR)/SdiTarget/svx/sdi \ )) +#BOOST switch in customshapes +#dialog: +#.IF "$(GUI)"=="WNT" +#CFLAGS+= -DUNICODE -D_UNICODE +#.ENDIF + $(eval $(call gb_Library_set_defs,svxcore,\ $$(DEFS) \ - -DACCESSIBLE_LAYOUT \ -DSVX_DLLIMPLEMENTATION \ -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ )) @@ -62,6 +73,7 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\ sal \ sfx \ sot \ + stl \ svl \ svt \ tk \ @@ -71,9 +83,110 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\ vcl \ vos3 \ xo \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,svxcore,\ + svx/source/core/coreservices \ + svx/source/customshapes/EnhancedCustomShape2d \ + svx/source/customshapes/EnhancedCustomShapeGeometry \ + svx/source/customshapes/EnhancedCustomShapeTypeNames \ + svx/source/dialog/checklbx \ + svx/source/dialog/dialmgr \ + svx/source/dialog/dlgutil \ + svx/source/dialog/framelink \ + svx/source/dialog/langbox \ + svx/source/dialog/simptabl \ + svx/source/dialog/stddlg \ + svx/source/dialog/svxdlg \ + svx/source/engine3d/camera3d \ + svx/source/engine3d/cube3d \ + svx/source/engine3d/deflt3d \ + svx/source/engine3d/dragmt3d \ + svx/source/engine3d/e3dsceneupdater \ + svx/source/engine3d/e3dundo \ + svx/source/engine3d/extrud3d \ + svx/source/engine3d/helperhittest3d \ + svx/source/engine3d/helperminimaldepth3d \ + svx/source/engine3d/lathe3d \ + svx/source/engine3d/obj3d \ + svx/source/engine3d/objfac3d \ + svx/source/engine3d/polygn3d \ + svx/source/engine3d/polysc3d \ + svx/source/engine3d/scene3d \ + svx/source/engine3d/sphere3d \ + svx/source/engine3d/svx3ditems \ + svx/source/engine3d/view3d \ + svx/source/engine3d/view3d1 \ + svx/source/engine3d/viewpt3d2 \ + svx/source/fmcomp/dbaexchange \ + svx/source/fmcomp/fmgridcl \ + svx/source/fmcomp/fmgridif \ + svx/source/fmcomp/gridcell \ + svx/source/fmcomp/gridcols \ + svx/source/fmcomp/gridctrl \ + svx/source/fmcomp/trace \ + svx/source/fmcomp/xmlexchg \ + svx/source/form/dataaccessdescriptor \ + svx/source/form/datalistener \ + svx/source/form/datanavi \ + svx/source/form/dbtoolsclient \ + svx/source/form/delayedevent \ + svx/source/form/fmcontrolbordermanager \ + svx/source/form/fmcontrollayout \ + svx/source/form/fmdmod \ + svx/source/form/fmdocumentclassification \ + svx/source/form/fmdpage \ + svx/source/form/fmexch \ + svx/source/form/fmexpl \ + svx/source/form/fmitems \ + svx/source/form/fmmodel \ + svx/source/form/fmobj \ + svx/source/form/fmpage \ + svx/source/form/fmpgeimp \ + svx/source/form/fmscriptingenv \ + svx/source/form/fmservs \ + svx/source/form/fmshell \ + svx/source/form/fmshimp \ + svx/source/form/fmtextcontroldialogs \ + svx/source/form/fmtextcontrolfeature \ + svx/source/form/fmtextcontrolshell \ + svx/source/form/fmtools \ + svx/source/form/fmundo \ + svx/source/form/fmview \ + svx/source/form/fmvwimp \ + svx/source/form/formcontrolfactory \ + svx/source/form/formcontroller \ + svx/source/form/formcontrolling \ + svx/source/form/formdispatchinterceptor \ + svx/source/form/formfeaturedispatcher \ + svx/source/form/formtoolbars \ + svx/source/form/legacyformcontroller \ + svx/source/form/navigatortree \ + svx/source/form/navigatortreemodel \ + svx/source/form/ParseContext \ + svx/source/form/sdbdatacolumn \ + svx/source/form/sqlparserclient \ + svx/source/form/stringlistresource \ + svx/source/form/typeconversionclient \ + svx/source/form/typemap \ + svx/source/form/xfm_addcondition \ + svx/source/gallery2/codec \ + svx/source/gallery2/galbrws \ + svx/source/gallery2/galbrws1 \ + svx/source/gallery2/galbrws2 \ + svx/source/gallery2/galctrl \ + svx/source/gallery2/galexpl \ + svx/source/gallery2/gallery1 \ + svx/source/gallery2/galmisc \ + svx/source/gallery2/galobj \ + svx/source/gallery2/galtheme \ + svx/source/items/chrtitem \ + svx/source/items/clipfmtitem \ + svx/source/items/customshapeitem \ + svx/source/items/drawitem \ + svx/source/items/e3ditem \ + svx/source/items/grfitem \ svx/source/sdr/animation/scheduler \ svx/source/sdr/animation/objectanimator \ svx/source/sdr/animation/animationstate \ @@ -129,106 +242,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/sdr/contact/viewcontactofsdrmeasureobj \ svx/source/sdr/contact/objectcontactofobjlistpainter \ svx/source/sdr/contact/viewobjectcontactofe3d \ - svx/source/customshapes/EnhancedCustomShapeGeometry \ - svx/source/customshapes/EnhancedCustomShapeTypeNames \ - svx/source/customshapes/EnhancedCustomShape2d \ - svx/source/customshapes/EnhancedCustomShapeFunctionParser \ - svx/source/dialog/dialmgr \ - svx/source/dialog/dlgutil \ - svx/source/dialog/framelink \ - svx/source/dialog/langbox \ - svx/source/dialog/simptabl \ - svx/source/dialog/svxdlg \ - svx/source/dialog/stddlg \ - svx/source/engine3d/deflt3d \ - svx/source/engine3d/polysc3d \ - svx/source/engine3d/sphere3d \ - svx/source/engine3d/helperminimaldepth3d \ - svx/source/engine3d/obj3d \ - svx/source/engine3d/dragmt3d \ - svx/source/engine3d/scene3d \ - svx/source/engine3d/view3d \ - svx/source/engine3d/e3dsceneupdater \ - svx/source/engine3d/viewpt3d2 \ - svx/source/engine3d/svx3ditems \ - svx/source/engine3d/camera3d \ - svx/source/engine3d/e3dundo \ - svx/source/engine3d/objfac3d \ - svx/source/engine3d/lathe3d \ - svx/source/engine3d/polygn3d \ - svx/source/engine3d/view3d1 \ - svx/source/engine3d/cube3d \ - svx/source/engine3d/helperhittest3d \ - svx/source/engine3d/extrud3d \ svx/source/sdr/event/eventhandler \ - svx/source/fmcomp/gridctrl \ - svx/source/fmcomp/xmlexchg \ - svx/source/fmcomp/trace \ - svx/source/fmcomp/fmgridcl \ - svx/source/fmcomp/gridcell \ - svx/source/fmcomp/dbaexchange \ - svx/source/fmcomp/gridcols \ - svx/source/fmcomp/fmgridif \ - svx/source/form/formfeaturedispatcher \ - svx/source/form/typeconversionclient \ - svx/source/form/fmpgeimp \ - svx/source/form/fmcontrolbordermanager \ - svx/source/form/fmshell \ - svx/source/form/fmundo \ - svx/source/form/ParseContext \ - svx/source/form/fmexpl \ - svx/source/form/fmtools \ - svx/source/form/fmexch \ - svx/source/form/formcontroller \ - svx/source/form/dataaccessdescriptor \ - svx/source/form/fmtextcontrolshell \ - svx/source/form/datalistener \ - svx/source/form/formcontrolfactory \ - svx/source/form/sdbdatacolumn \ - svx/source/form/fmview \ - svx/source/form/delayedevent \ - svx/source/form/fmservs \ - svx/source/form/fmobj \ - svx/source/form/fmdocumentclassification \ - svx/source/form/sqlparserclient \ - svx/source/form/fmshimp \ - svx/source/form/typemap \ - svx/source/form/fmscriptingenv \ - svx/source/form/dbtoolsclient \ - svx/source/form/fmpage \ - svx/source/form/stringlistresource \ - svx/source/form/fmmodel \ - svx/source/form/formtoolbars \ - svx/source/form/fmdpage \ - svx/source/form/fmitems \ - svx/source/form/navigatortreemodel \ - svx/source/form/fmvwimp \ - svx/source/form/fmtextcontrolfeature \ - svx/source/form/fmdmod \ - svx/source/form/fmcontrollayout \ - svx/source/form/fmtextcontroldialogs \ - svx/source/form/formdispatchinterceptor \ - svx/source/form/formcontrolling \ - svx/source/form/navigatortree \ - svx/source/form/datanavi \ - svx/source/form/legacyformcontroller \ - svx/source/form/xfm_addcondition \ - svx/source/gallery2/galexpl \ - svx/source/gallery2/galtheme \ - svx/source/gallery2/galctrl \ - svx/source/gallery2/gallery1 \ - svx/source/gallery2/galmisc \ - svx/source/gallery2/galobj \ - svx/source/gallery2/galbrws2 \ - svx/source/gallery2/galbrws \ - svx/source/gallery2/galbrws1 \ - svx/source/gallery2/codec \ - svx/source/items/drawitem \ - svx/source/items/chrtitem \ - svx/source/items/e3ditem \ - svx/source/items/grfitem \ - svx/source/items/clipfmtitem \ - svx/source/items/customshapeitem \ svx/source/sdr/overlay/overlayline \ svx/source/sdr/overlay/overlaycrosshair \ svx/source/sdr/overlay/overlayrollingrectangle \ @@ -284,162 +298,154 @@ $(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) -$(eval $(call gb_Library_add_linked_libs,svxcore,\ - dl \ - m \ - pthread \ - stl \ +# the following source file can't be compiled with optimization by some compilers (crash or endless loop): +# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC +# the latter is currently not supported by gbuild and needs a fix here later +ifeq ($(OS),$(filter-out SOLARIS MACOSX,$(OS))) +$(eval $(call gb_Library_add_exception_objects,svxcore,\ + svx/source/customshapes/EnhancedCustomShapeFunctionParser \ )) -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,svxcore,\ - advapi32 \ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ +else +$(eval $(call gb_Library_add_cxxobjects,svxcore,\ + svx/source/customshapes/EnhancedCustomShapeFunctionParser \ + , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ )) endif $(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx)) - $(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\ $$(INCLUDE) \ -I$(SRCDIR)/svx/inc \ diff --git a/editeng/source/accessibility/makefile.mk b/svx/Library_textconversiondlgs.mk index 80cb6df746e5..c2ddae4fe131 100644 --- a/editeng/source/accessibility/makefile.mk +++ b/svx/Library_textconversiondlgs.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.25 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -29,31 +25,42 @@ # #************************************************************************* -PRJ=..$/.. - -PRJNAME=editeng -TARGET=accessibility -ENABLE_EXCEPTIONS=TRUE +$(eval $(call gb_Library_Library,textconversiondlgs)) -# --- Settings ----------------------------------------------------- +$(eval $(call gb_Library_set_componentfile,textconversiondlgs,svx/util/textconversiondlgs)) -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk +$(eval $(call gb_Library_set_include,textconversiondlgs,\ + -I$(SRCDIR)/svx/inc \ + -I$(SRCDIR)/svx/inc/pch \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ +)) -# --- Files -------------------------------------------------------- +$(eval $(call gb_Library_set_defs,textconversiondlgs,\ + $$(DEFS) \ +)) -SLOFILES = \ - $(SLO)$/AccessibleStringWrap.obj \ - $(SLO)$/AccessibleContextBase.obj \ - $(SLO)$/AccessibleComponentBase.obj \ - $(SLO)$/AccessibleSelectionBase.obj \ - $(SLO)$/AccessibleStaticTextBase.obj \ - $(SLO)$/AccessibleParaManager.obj \ - $(SLO)$/AccessibleEditableTextPara.obj \ - $(SLO)$/AccessibleHyperlink.obj \ - $(SLO)$/AccessibleImageBullet.obj - -# --- Tagets ------------------------------------------------------- +$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\ + comphelper \ + cppuhelper \ + cppu \ + sal \ + svl \ + svt \ + stl \ + tk \ + tl \ + utl \ + vcl \ + $(gb_STDLIBS) \ +)) -.INCLUDE : target.mk +$(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 \ +)) +# vim: set noet sw=4 ts=4: diff --git a/svx/Makefile b/svx/Makefile index 963c7870d955..90947b2e5f48 100644 --- a/svx/Makefile +++ b/svx/Makefile @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,12 +25,14 @@ # #************************************************************************* +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) - -$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) - - +# vim: set noet sw=4 ts=4: diff --git a/editeng/source/outliner/makefile.mk b/svx/Module_svx.mk index df1c795801ae..d9288ea9e6b1 100644 --- a/editeng/source/outliner/makefile.mk +++ b/svx/Module_svx.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,36 +25,28 @@ # #************************************************************************* -PRJ=..$/.. - -PRJNAME=editeng -TARGET=outliner -AUTOSEG=true -ENABLE_EXCEPTIONS=TRUE - -PROJECTPCH4DLL=TRUE -PROJECTPCH=outl_pch -PROJECTPCHSOURCE=outl_pch - - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Allgemein ---------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/outlundo.obj \ - $(SLO)$/outliner.obj \ - $(SLO)$/outlin2.obj \ - $(SLO)$/paralist.obj \ - $(SLO)$/outlvw.obj \ - $(SLO)$/outleeng.obj \ - $(SLO)$/outlobj.obj - -SRS1NAME=$(TARGET) -SRC1FILES= outliner.src - -.INCLUDE : target.mk - +$(eval $(call gb_Module_Module,svx)) + +$(eval $(call gb_Module_add_targets,svx,\ + Library_svx \ + Library_svxcore \ + Library_textconversiondlgs \ + AllLangResTarget_svx \ + AllLangResTarget_ofa \ + AllLangResTarget_gal \ + AllLangResTarget_about \ + AllLangResTarget_textconversiondlgs \ + Package_inc \ + Package_sdi \ +)) + +$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\ + JunitTest_svx_unoapi \ +)) + +#todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX +#todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes ? +#todo: -DUNICODE and -D_UNICODE on WNT for source/dialog +#todo: globlmn.hrc +#todo: component file +# vim: set noet ts=4 sw=4: diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk new file mode 100644 index 000000000000..81066e9c7bff --- /dev/null +++ b/svx/Package_inc.mk @@ -0,0 +1,560 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,svx_inc,$(SRCDIR)/svx/inc)) + +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsoitm.hxx,svx/sxsoitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdshtitm.hxx,svx/sdshtitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/polysc3d.hxx,svx/polysc3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dataaccessdescriptor.hxx,svx/dataaccessdescriptor.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoashp.hxx,svx/svdoashp.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbaobjectex.hxx,svx/dbaobjectex.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeTypeNames.hxx,svx/EnhancedCustomShapeTypeNames.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftdiit.hxx,svx/xftdiit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntctl.hxx,svx/fntctl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdattr.hxx,svx/svdattr.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/imapdlg.hxx,svx/imapdlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/formatpaintbrushctrl.hxx,svx/formatpaintbrushctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xcolit.hxx,svx/xcolit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftmrit.hxx,svx/xftmrit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxcommands.h,svx/svxcommands.h)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdview.hxx,svx/svdview.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxraitm.hxx,svx/sxraitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxroaitm.hxx,svx/sxroaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleTableShape.hxx,svx/AccessibleTableShape.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmsxy.hxx,svx/xflbmsxy.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dlgctl3d.hxx,svx/dlgctl3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaiitm.hxx,svx/sdtaiitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xtextit.hxx,svx/xtextit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeFunctionParser.hxx,svx/EnhancedCustomShapeFunctionParser.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ucsubset.hxx,svx/ucsubset.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sderitm.hxx,svx/sderitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/obj3d.hxx,svx/obj3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbcharsethelper.hxx,svx/dbcharsethelper.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdangitm.hxx,svx/sdangitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/grfcrop.hxx,svx/grfcrop.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxtraitm.hxx,svx/sxtraitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/orienthelper.hxx,svx/orienthelper.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxonitm.hxx,svx/sxonitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmpit.hxx,svx/xflbmpit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlineit.hxx,svx/xlineit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SmartTagItem.hxx,svx/SmartTagItem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xpoly.hxx,svx/xpoly.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ParseContext.hxx,svx/ParseContext.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numinf.hxx,svx/numinf.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/objfac3d.hxx,svx/objfac3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxcolorupdate.hxx,svx/tbxcolorupdate.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdhdl.hxx,svx/svdhdl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdedxv.hxx,svx/svdedxv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SmartTagMgr.hxx,svx/SmartTagMgr.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/shapeproperty.hxx,svx/shapeproperty.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galtheme.hxx,svx/galtheme.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/anchorid.hxx,svx/anchorid.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshprp.hxx,svx/unoshprp.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/viewlayoutitem.hxx,svx/viewlayoutitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmmodel.hxx,svx/fmmodel.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/scene3d.hxx,svx/scene3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmgridif.hxx,svx/fmgridif.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdasitm.hxx,svx/sdasitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrgmt.hxx,svx/svddrgmt.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnasit.hxx,svx/xlnasit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlndsit.hxx,svx/xlndsit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hyprlink.hxx,svx/hyprlink.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/framelinkarray.hxx,svx/framelinkarray.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdetc.hxx,svx/svdetc.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmtit.hxx,svx/xflbmtit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtfsitm.hxx,svx/sdtfsitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/txencbox.hxx,svx/txencbox.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/e3ditem.hxx,svx/e3ditem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xoutbmp.hxx,svx/xoutbmp.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdotable.hxx,svx/svdotable.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshcit.hxx,svx/xftshcit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxlogitm.hxx,svx/sxlogitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxrooitm.hxx,svx/sxrooitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontwork.hxx,svx/fontwork.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcecitm.hxx,svx/sxcecitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdginitm.hxx,svx/sdginitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpntv.hxx,svx/svdpntv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontlb.hxx,svx/fontlb.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xfillit0.hxx,svx/xfillit0.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xsflclit.hxx,svx/xsflclit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrpageuser.hxx,svx/sdrpageuser.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xbtmpit.hxx,svx/xbtmpit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxids.hrc,svx/svxids.hrc)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galmisc.hxx,svx/galmisc.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmfsitm.hxx,svx/sxmfsitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/extrusioncolorcontrol.hxx,svx/extrusioncolorcontrol.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmsrccfg.hxx,svx/fmsrccfg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pageitem.hxx,svx/pageitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrpaintwindow.hxx,svx/sdrpaintwindow.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmkitm.hxx,svx/sxmkitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xfillit.hxx,svx/xfillit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflftrit.hxx,svx/xflftrit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxopitm.hxx,svx/sxopitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unofill.hxx,svx/unofill.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/drawitem.hxx,svx/drawitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlgrhlp.hxx,svx/xmlgrhlp.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmresids.hrc,svx/fmresids.hrc)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomitem.hxx,svx/zoomitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtcfitm.hxx,svx/sdtcfitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdmetitm.hxx,svx/sdmetitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmtools.hxx,svx/fmtools.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntszctl.hxx,svx/fntszctl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsiitm.hxx,svx/sxsiitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxlayitm.hxx,svx/sxlayitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomid.hxx,svx/unomid.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/frmsel.hxx,svx/frmsel.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/e3dsceneupdater.hxx,svx/e3dsceneupdater.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdcrtv.hxx,svx/svdcrtv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/itemwin.hxx,svx/itemwin.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtfchim.hxx,svx/sdtfchim.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/wrapfield.hxx,svx/wrapfield.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntctrl.hxx,svx/fntctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdxcgv.hxx,svx/svdxcgv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbtoolsclient.hxx,svx/dbtoolsclient.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rotmodit.hxx,svx/rotmodit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/layctrl.hxx,svx/layctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rectenum.hxx,svx/rectenum.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdopath.hxx,svx/svdopath.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshtxt.hxx,svx/unoshtxt.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdopage.hxx,svx/svdopage.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftadit.hxx,svx/xftadit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstcit.hxx,svx/xlnstcit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/splitcelldlg.hxx,svx/splitcelldlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdynitm.hxx,svx/sdynitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rulritem.hxx,svx/rulritem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fillctrl.hxx,svx/fillctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SvxShapeTypes.hxx,svx/SvxShapeTypes.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galctrl.hxx,svx/galctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdmod.hxx,svx/fmdmod.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/exthelpid.hrc,svx/exthelpid.hrc)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmsearch.hxx,svx/fmsearch.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pfiledlg.hxx,svx/pfiledlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmovitm.hxx,svx/sxmovitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmsrcimp.hxx,svx/fmsrcimp.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsalitm.hxx,svx/sxsalitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoole2.hxx,svx/svdoole2.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdsnpv.hxx,svx/svdsnpv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/gallery1.hxx,svx/gallery1.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/passwd.hxx,svx/passwd.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xgrscit.hxx,svx/xgrscit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdglev.hxx,svx/svdglev.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontworkbar.hxx,svx/fontworkbar.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeGeometry.hxx,svx/EnhancedCustomShapeGeometry.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxitems.hrc,svx/svxitems.hrc)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmpage.hxx,svx/fmpage.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/srchdlg.hxx,svx/srchdlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcaitm.hxx,svx/sxcaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/subtoolboxcontrol.hxx,svx/subtoolboxcontrol.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdasaitm.hxx,svx/sdasaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbexch.hrc,svx/dbexch.hrc)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomaster.hxx,svx/unomaster.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdedtv.hxx,svx/svdedtv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlinjoit.hxx,svx/xlinjoit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmbritm.hxx,svx/sxmbritm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleGraphicShape.hxx,svx/AccessibleGraphicShape.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstit.hxx,svx/xlnstit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/volume3d.hxx,svx/volume3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/scheduler.hxx,svx/sdr/animation/scheduler.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/animationstate.hxx,svx/sdr/animation/animationstate.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/objectanimator.hxx,svx/sdr/animation/objectanimator.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayhelpline.hxx,svx/sdr/overlay/overlayhelpline.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayobjectcell.hxx,svx/sdr/overlay/overlayobjectcell.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaymanager.hxx,svx/sdr/overlay/overlaymanager.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx,svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayobjectlist.hxx,svx/sdr/overlay/overlayobjectlist.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayhatchrect.hxx,svx/sdr/overlay/overlayhatchrect.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaytools.hxx,svx/sdr/overlay/overlaytools.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayselection.hxx,svx/sdr/overlay/overlayselection.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaytriangle.hxx,svx/sdr/overlay/overlaytriangle.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaypolypolygon.hxx,svx/sdr/overlay/overlaypolypolygon.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaymanagerbuffered.hxx,svx/sdr/overlay/overlaymanagerbuffered.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayrollingrectangle.hxx,svx/sdr/overlay/overlayrollingrectangle.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayline.hxx,svx/sdr/overlay/overlayline.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaycrosshair.hxx,svx/sdr/overlay/overlaycrosshair.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayobject.hxx,svx/sdr/overlay/overlayobject.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx,svx/sdr/overlay/overlayanimatedbitmapex.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaybitmapex.hxx,svx/sdr/overlay/overlaybitmapex.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/event/eventhandler.hxx,svx/sdr/event/eventhandler.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/itemsettools.hxx,svx/sdr/properties/itemsettools.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/connectorproperties.hxx,svx/sdr/properties/connectorproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dlatheproperties.hxx,svx/sdr/properties/e3dlatheproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/circleproperties.hxx,svx/sdr/properties/circleproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dsphereproperties.hxx,svx/sdr/properties/e3dsphereproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/captionproperties.hxx,svx/sdr/properties/captionproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/customshapeproperties.hxx,svx/sdr/properties/customshapeproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/attributeproperties.hxx,svx/sdr/properties/attributeproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/rectangleproperties.hxx,svx/sdr/properties/rectangleproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/pageproperties.hxx,svx/sdr/properties/pageproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/oleproperties.hxx,svx/sdr/properties/oleproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/textproperties.hxx,svx/sdr/properties/textproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/emptyproperties.hxx,svx/sdr/properties/emptyproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dextrudeproperties.hxx,svx/sdr/properties/e3dextrudeproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/properties.hxx,svx/sdr/properties/properties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/defaultproperties.hxx,svx/sdr/properties/defaultproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dproperties.hxx,svx/sdr/properties/e3dproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/groupproperties.hxx,svx/sdr/properties/groupproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/graphicproperties.hxx,svx/sdr/properties/graphicproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dcompoundproperties.hxx,svx/sdr/properties/e3dcompoundproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dsceneproperties.hxx,svx/sdr/properties/e3dsceneproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/measureproperties.hxx,svx/sdr/properties/measureproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/table/tabledesign.hxx,svx/sdr/table/tabledesign.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/primitiveFactory2d.hxx,svx/sdr/primitive2d/primitiveFactory2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx,svx/sdr/primitive2d/sdrpathprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx,svx/sdr/primitive2d/sdrtextprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrprimitivetools.hxx,svx/sdr/primitive2d/sdrprimitivetools.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx,svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx,svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx,svx/sdr/primitive2d/svx_primitivetypes2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx,svx/sdr/primitive2d/sdrdecompositiontools.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx,svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx,svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx,svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx,svx/sdr/primitive2d/sdrellipseprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx,svx/sdr/primitive2d/sdrole2primitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrattributecreator.hxx,svx/sdr/primitive2d/sdrattributecreator.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx,svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx,svx/sdr/primitive2d/sdrgrafprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx,svx/sdr/primitive3d/sdrattributecreator3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dextrude.hxx,svx/sdr/contact/viewcontactofe3dextrude.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofvirtobj.hxx,svx/sdr/contact/viewcontactofvirtobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dscene.hxx,svx/sdr/contact/viewcontactofe3dscene.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontacttools.hxx,svx/sdr/contact/objectcontacttools.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontact.hxx,svx/sdr/contact/objectcontact.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofpageobj.hxx,svx/sdr/contact/viewcontactofpageobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dcube.hxx,svx/sdr/contact/viewcontactofe3dcube.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx,svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx,svx/sdr/contact/viewobjectcontactofunocontrol.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontactofpageview.hxx,svx/sdr/contact/objectcontactofpageview.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx,svx/sdr/contact/viewcontactofe3dpolygon.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx,svx/sdr/contact/viewobjectcontactofsdrpage.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx,svx/sdr/contact/viewobjectcontactofsdrobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx,svx/sdr/contact/objectcontactofobjlistpainter.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx,svx/sdr/contact/viewobjectcontactofe3dscene.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontact.hxx,svx/sdr/contact/viewcontact.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx,svx/sdr/contact/viewobjectcontactofpageobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx,svx/sdr/contact/viewcontactofsdrcaptionobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx,svx/sdr/contact/viewcontactofsdrcircobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx,svx/sdr/contact/viewcontactofsdrole2obj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactoftextobj.hxx,svx/sdr/contact/viewcontactoftextobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrpage.hxx,svx/sdr/contact/viewcontactofsdrpage.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofunocontrol.hxx,svx/sdr/contact/viewcontactofunocontrol.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx,svx/sdr/contact/viewcontactofsdredgeobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx,svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofe3d.hxx,svx/sdr/contact/viewobjectcontactofe3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dsphere.hxx,svx/sdr/contact/viewcontactofe3dsphere.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx,svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3d.hxx,svx/sdr/contact/viewcontactofe3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontact.hxx,svx/sdr/contact/viewobjectcontact.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx,svx/sdr/contact/viewcontactofsdrpathobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx,svx/sdr/contact/viewcontactofsdrmediaobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx,svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dlathe.hxx,svx/sdr/contact/viewcontactofe3dlathe.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx,svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofgraphic.hxx,svx/sdr/contact/viewcontactofgraphic.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactredirector.hxx,svx/sdr/contact/viewobjectcontactredirector.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx,svx/sdr/contact/viewobjectcontactofgraphic.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofgroup.hxx,svx/sdr/contact/viewcontactofgroup.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/displayinfo.hxx,svx/sdr/contact/displayinfo.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrobj.hxx,svx/sdr/contact/viewcontactofsdrobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx,svx/sdr/contact/viewcontactofsdrmeasureobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx,svx/sdr/contact/viewcontactofsdrrectobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofgroup.hxx,svx/sdr/contact/viewobjectcontactofgroup.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx,svx/sdr/attribute/sdrformtextoutlineattribute.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrformtextattribute.hxx,svx/sdr/attribute/sdrformtextattribute.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx,svx/sdr/attribute/sdrlineshadowtextattribute.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrfilltextattribute.hxx,svx/sdr/attribute/sdrfilltextattribute.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx,svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrshadowtextattribute.hxx,svx/sdr/attribute/sdrshadowtextattribute.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrtextattribute.hxx,svx/sdr/attribute/sdrtextattribute.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dialcontrol.hxx,svx/dialcontrol.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmlhitm.hxx,svx/sxmlhitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/optgenrl.hxx,svx/optgenrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshcol.hxx,svx/unoshcol.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtagitm.hxx,svx/sdtagitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftsfit.hxx,svx/xftsfit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdograf.hxx,svx/svdograf.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/cube3d.hxx,svx/cube3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnwtit.hxx,svx/xlnwtit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoom_def.hxx,svx/zoom_def.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/charmap.hxx,svx/charmap.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/connctrl.hxx,svx/connctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtacitm.hxx,svx/sdtacitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hyperdlg.hxx,svx/hyperdlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxctl.hxx,svx/tbxctl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/f3dchild.hxx,svx/f3dchild.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdogrp.hxx,svx/svdogrp.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/simptabl.hxx,svx/simptabl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxelditm.hxx,svx/sxelditm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomslideritem.hxx,svx/zoomslideritem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshtit.hxx,svx/xftshtit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/float3d.hxx,svx/float3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlntrit.hxx,svx/xlntrit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdmodel.hxx,svx/svdmodel.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdtext.hxx,svx/svdtext.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleTextHelper.hxx,svx/AccessibleTextHelper.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtayitm.hxx,svx/sdtayitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtmfitm.hxx,svx/sdtmfitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomsliderctrl.hxx,svx/zoomsliderctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/polygn3d.hxx,svx/polygn3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdglob.hxx,svx/svdglob.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/graphctl.hxx,svx/graphctl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xpool.hxx,svx/xpool.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/framelink.hxx,svx/framelink.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoprov.hxx,svx/unoprov.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/checklbx.hxx,svx/checklbx.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/selctrl.hxx,svx/selctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdggaitm.hxx,svx/sdggaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbtoxy.hxx,svx/xflbtoxy.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tabline.hxx,svx/tabline.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpool.hxx,svx/svdpool.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/stddlg.hxx,svx/stddlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/databaseregistrationui.hxx,svx/databaseregistrationui.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xdef.hxx,svx/xdef.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/algitem.hxx,svx/algitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxfiitm.hxx,svx/sxfiitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/grfflt.hxx,svx/grfflt.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/databaselocationinput.hxx,svx/databaselocationinput.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmsuitm.hxx,svx/sxmsuitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dialmgr.hxx,svx/dialmgr.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xdash.hxx,svx/xdash.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/grafctrl.hxx,svx/grafctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlineit0.hxx,svx/xlineit0.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xfltrit.hxx,svx/xfltrit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/viewpt3d.hxx,svx/viewpt3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmsli.hxx,svx/xflbmsli.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmoitm.hxx,svx/sxmoitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/htmlmode.hxx,svx/htmlmode.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlsecctrl.hxx,svx/xmlsecctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svx3ditems.hxx,svx/svx3ditems.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/camera3d.hxx,svx/camera3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/measctrl.hxx,svx/measctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdooitm.hxx,svx/sdooitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpage.hxx,svx/svdpage.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdsob.hxx,svx/svdsob.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdshcitm.hxx,svx/sdshcitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaitm.hxx,svx/sdtaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdtrans.hxx,svx/svdtrans.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgtritm.hxx,svx/sdgtritm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxdraw.hxx,svx/tbxdraw.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdprcitm.hxx,svx/sdprcitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomodel.hxx,svx/unomodel.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/IAccessibleViewForwarderListener.hxx,svx/IAccessibleViewForwarderListener.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdlayer.hxx,svx/svdlayer.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflasit.hxx,svx/xflasit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflclit.hxx,svx/xflclit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsaitm.hxx,svx/sxsaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/verttexttbxctrl.hxx,svx/verttexttbxctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/contdlg.hxx,svx/contdlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxerr.hxx,svx/svxerr.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpagv.hxx,svx/svdpagv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdocapt.hxx,svx/svdocapt.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdfield.hxx,svx/svdfield.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/relfld.hxx,svx/relfld.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleShapeInfo.hxx,svx/AccessibleShapeInfo.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numvset.hxx,svx/numvset.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrcomment.hxx,svx/sdrcomment.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/txenctab.hxx,svx/txenctab.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdorect.hxx,svx/svdorect.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshit.hxx,svx/xftshit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pagectrl.hxx,svx/pagectrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxreoitm.hxx,svx/sxreoitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdtypes.hxx,svx/svdtypes.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ucsubset.hrc,svx/ucsubset.hrc)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pszctrl.hxx,svx/pszctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdattrx.hxx,svx/svdattrx.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtditm.hxx,svx/sdtditm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/swframevalidation.hxx,svx/swframevalidation.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xgrad.hxx,svx/xgrad.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpoev.hxx,svx/svdpoev.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbckit.hxx,svx/xflbckit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xtextit0.hxx,svx/xtextit0.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxreaitm.hxx,svx/sxreaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/lboxctrl.hxx,svx/lboxctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontworkgallery.hxx,svx/fontworkgallery.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ShapeTypeHandler.hxx,svx/ShapeTypeHandler.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdstr.hrc,svx/svdstr.hrc)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svditext.hxx,svx/svditext.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxekitm.hxx,svx/sxekitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxgrahicitem.hxx,svx/svxgrahicitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbstit.hxx,svx/xflbstit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galbrws.hxx,svx/galbrws.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomod.hxx,svx/unomod.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnclit.hxx,svx/xlnclit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/deflt3d.hxx,svx/deflt3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/e3dundo.hxx,svx/e3dundo.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ChildrenManager.hxx,svx/ChildrenManager.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmgridcl.hxx,svx/fmgridcl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdobj.hxx,svx/svdobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtaitm.hxx,svx/sxmtaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/clipboardctl.hxx,svx/clipboardctl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xtable.hxx,svx/xtable.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgcoitm.hxx,svx/sdgcoitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdovirt.hxx,svx/svdovirt.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmshell.hxx,svx/fmshell.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/IAccessibleParent.hxx,svx/IAccessibleParent.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdmark.hxx,svx/svdmark.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/strarray.hxx,svx/strarray.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgluitm.hxx,svx/sdgluitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtakitm.hxx,svx/sdtakitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SpellDialogChildWindow.hxx,svx/SpellDialogChildWindow.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xexch.hxx,svx/xexch.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/gallery.hxx,svx/gallery.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dlgctrl.hxx,svx/dlgctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/DescriptionGenerator.hxx,svx/DescriptionGenerator.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xenum.hxx,svx/xenum.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numfmtsh.hxx,svx/numfmtsh.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmglob.hxx,svx/fmglob.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/framebordertype.hxx,svx/framebordertype.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdomeas.hxx,svx/svdomeas.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/insctrl.hxx,svx/insctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoedge.hxx,svx/svdoedge.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/bmpmask.hxx,svx/bmpmask.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdshitm.hxx,svx/sdshitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddef.hxx,svx/svddef.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbcontrl.hxx,svx/tbcontrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dstribut_enum.hxx,svx/dstribut_enum.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcllitm.hxx,svx/sxcllitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rubydialog.hxx,svx/rubydialog.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ipolypolygoneditorcontroller.hxx,svx/ipolypolygoneditorcontroller.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleOLEShape.hxx,svx/AccessibleOLEShape.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/extrusionbar.hxx,svx/extrusionbar.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleControlShape.hxx,svx/AccessibleControlShape.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/paraprev.hxx,svx/paraprev.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshxy.hxx,svx/xftshxy.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxcustomshapes.hxx,svx/tbxcustomshapes.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrhittesthelper.hxx,svx/sdrhittesthelper.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdviter.hxx,svx/svdviter.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ofaitem.hxx,svx/ofaitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/frmdirlbox.hxx,svx/frmdirlbox.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShape2d.hxx,svx/EnhancedCustomShape2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxoneitm.hxx,svx/sxoneitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/msdffdef.hxx,svx/msdffdef.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globl3d.hxx,svx/globl3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xattr.hxx,svx/xattr.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmuitm.hxx,svx/sxmuitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdsxyitm.hxx,svx/sdsxyitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/postattr.hxx,svx/postattr.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoattr.hxx,svx/svdoattr.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/prtqry.hxx,svx/prtqry.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sphere3d.hxx,svx/sphere3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdomedia.hxx,svx/svdomedia.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflboxy.hxx,svx/xflboxy.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/swframeposstrings.hxx,svx/swframeposstrings.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svditer.hxx,svx/svditer.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmspitm.hxx,svx/sxmspitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmobjfac.hxx,svx/fmobjfac.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdocirc.hxx,svx/svdocirc.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxdlg.hxx,svx/svxdlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxenditm.hxx,svx/sxenditm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/def3d.hxx,svx/def3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/UnoNamespaceMap.hxx,svx/UnoNamespaceMap.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxciaitm.hxx,svx/sxciaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/polypolygoneditor.hxx,svx/polypolygoneditor.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgmoitm.hxx,svx/sdgmoitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/linectrl.hxx,svx/linectrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnedcit.hxx,svx/xlnedcit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmsitm.hxx,svx/sxmsitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaditm.hxx,svx/sdtaditm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdotext.hxx,svx/svdotext.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/chrtitem.hxx,svx/chrtitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xbitmap.hxx,svx/xbitmap.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxallitm.hxx,svx/sxallitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dlgutil.hxx,svx/dlgutil.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unopage.hxx,svx/unopage.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrag.hxx,svx/svddrag.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleShapeTreeInfo.hxx,svx/AccessibleShapeTreeInfo.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcgitm.hxx,svx/sxcgitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnedwit.hxx,svx/xlnedwit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdouno.hxx,svx/svdouno.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrmasterpagedescriptor.hxx,svx/sdrmasterpagedescriptor.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcikitm.hxx,svx/sxcikitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoutl.hxx,svx/svdoutl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/shapepropertynotifier.hxx,svx/shapepropertynotifier.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxctitm.hxx,svx/sxctitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbaexchange.hxx,svx/dbaexchange.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtritm.hxx,svx/sxmtritm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrobjectuser.hxx,svx/sdrobjectuser.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleShape.hxx,svx/AccessibleShape.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hlnkitem.hxx,svx/hlnkitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xhatch.hxx,svx/xhatch.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/swframeexample.hxx,svx/swframeexample.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstwit.hxx,svx/xlnstwit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xit.hxx,svx/xit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdhlpln.hxx,svx/svdhlpln.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ctredlin.hxx,svx/ctredlin.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/lathe3d.hxx,svx/lathe3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/optgrid.hxx,svx/optgrid.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/langbox.hxx,svx/langbox.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/clipfmtitem.hxx,svx/clipfmtitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xsetit.hxx,svx/xsetit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tabarea.hxx,svx/tabarea.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SmartTagCtl.hxx,svx/SmartTagCtl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxcolor.hxx,svx/tbxcolor.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdmrkv.hxx,svx/svdmrkv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/modctrl.hxx,svx/modctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoapi.hxx,svx/unoapi.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ruler.hxx,svx/ruler.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrobjectfilter.hxx,svx/sdrobjectfilter.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtfitm.hxx,svx/sxmtfitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdundo.hxx,svx/svdundo.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hdft.hxx,svx/hdft.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlexchg.hxx,svx/xmlexchg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/IAccessibleViewForwarder.hxx,svx/IAccessibleViewForwarder.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dialogs.hrc,svx/dialogs.hrc)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/extrud3d.hxx,svx/extrud3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unopool.hxx,svx/unopool.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflhtit.hxx,svx/xflhtit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnedit.hxx,svx/xlnedit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmleohlp.hxx,svx/xmleohlp.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ifaceids.hxx,svx/ifaceids.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftouit.hxx,svx/xftouit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/selectioncontroller.hxx,svx/selectioncontroller.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrpagewindow.hxx,svx/sdrpagewindow.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgcpitm.hxx,svx/sdgcpitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/view3d.hxx,svx/view3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshape.hxx,svx/unoshape.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflgrit.hxx,svx/xflgrit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ActionDescriptionProvider.hxx,svx/ActionDescriptionProvider.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/gridctrl.hxx,svx/gridctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxalign.hxx,svx/tbxalign.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svimbase.hxx,svx/svimbase.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomctrl.hxx,svx/zoomctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrgv.hxx,svx/svddrgv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/XPropertyTable.hxx,svx/XPropertyTable.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftstit.hxx,svx/xftstit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdglue.hxx,svx/svdglue.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/helperhittest3d.hxx,svx/helperhittest3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/flagsdef.hxx,svx/flagsdef.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaaitm.hxx,svx/sdtaaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmview.hxx,svx/fmview.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxdllapi.h,svx/svxdllapi.h)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/colrctrl.hxx,svx/colrctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdpage.hxx,svx/fmdpage.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtpitm.hxx,svx/sxmtpitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globlmn.hrc,globlmn_tmpl.hrc)) + diff --git a/svx/Package_sdi.mk b/svx/Package_sdi.mk new file mode 100644 index 000000000000..0a43a1ae7be3 --- /dev/null +++ b/svx/Package_sdi.mk @@ -0,0 +1,33 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,svx_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/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index 1cdfc9fb2b9e..1cdfc9fb2b9e 100644..100755 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx index 232708d9a14a..232708d9a14a 100755..100644 --- a/svx/inc/svx/unoshprp.hxx +++ b/svx/inc/svx/unoshprp.hxx diff --git a/svx/prj/build.lst b/svx/prj/build.lst index 536d7cc29fc8..7b541b2d77c4 100644 --- a/svx/prj/build.lst +++ b/svx/prj/build.lst @@ -1,39 +1,2 @@ sx svx : sfx2 l10n oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt NULL -sx svx usr1 - all sx_mkout NULL -sx svx\inc nmake - all sx_inc NULL -sx svx\uiconfig\layout nmake - all sx_layout NULL -sx svx\source\unodialogs\textconversiondlgs nmake - all sx_textconversiondlgs sx_inc NULL -sx svx\sdi nmake - all sx_sdi sx_inc NULL -sx svx\source\src nmake - all sx_src sx_inc sx_sdi NULL -sx svx\source\intro nmake - all sx_intro sx_inc NULL -sx svx\source\items nmake - all sx_items sx_inc sx_sdi NULL -sx svx\source\xoutdev nmake - all sx_xout sx_items sx_inc NULL -sx svx\source\svdraw nmake - all sx_draw sx_inc NULL -sx svx\source\sdr\attribute nmake - all sx_attribute sx_inc NULL -sx svx\source\sdr\primitive2d nmake - all sx_primitive2d sx_inc NULL -sx svx\source\sdr\primitive3d nmake - all sx_primitive3d sx_inc NULL -sx svx\source\table nmake - all sx_table sx_inc NULL -sx svx\source\sdr\properties nmake - all sx_properties sx_inc NULL -sx svx\source\sdr\contact nmake - all sx_contact sx_inc NULL -sx svx\source\sdr\event nmake - all sx_event sx_inc NULL -sx svx\source\sdr\animation nmake - all sx_animation sx_inc NULL -sx svx\source\sdr\overlay nmake - all sx_overlay sx_inc NULL -sx svx\source\smarttags nmake - all sx_smarttags sx_inc NULL -sx svx\source\stbctrls nmake - all sx_stbc sx_inc NULL -sx svx\source\mnuctrls nmake - all sx_mnuc sx_inc NULL -sx svx\source\engine3d nmake - all sx_3deng sx_inc NULL -sx svx\source\form nmake - all sx_form sx_sdi sx_inc NULL -sx svx\source\fmcomp nmake - all sx_fmcmp sx_sdi sx_inc NULL -sx svx\source\tbxctrls nmake - all sx_tbxc sx_inc NULL -sx svx\source\dialog nmake - all sx_dlg sx_inc NULL -sx svx\source\unodraw nmake - all sx_undrw sx_inc NULL -sx svx\source\unogallery nmake - all sx_ungal sx_inc NULL -sx svx\source\gallery2 nmake - all sx_gall sx_inc NULL -sx svx\source\xml nmake - all sx_xml sx_inc NULL -sx svx\source\core nmake - all sx_core sx_inc NULL -sx svx\source\accessibility nmake - all sx_accessibility sx_inc NULL -sx svx\source\customshapes nmake - all sx_customshapes sx_inc NULL -sx svx\source\toolbars nmake - all sx_toolbars sx_inc NULL -sx svx\util nmake - all sx_util sx_3deng sx_dlg sx_draw sx_attribute sx_properties sx_contact sx_event sx_animation sx_primitive2d sx_primitive3d sx_overlay sx_fmcmp sx_form sx_gall sx_items sx_mnuc sx_sdi sx_stbc sx_tbxc sx_undrw sx_ungal sx_xml sx_core sx_xout sx_accessibility sx_intro sx_customshapes sx_toolbars sx_table sx_smarttags NULL -sx svx\source\gengal nmake - all sx_gengal sx_util NULL -sx svx\qa\unoapi nmake - all sx_qa_unoapi NULL +sx svx\prj nmake - all sx_prj NULL diff --git a/svx/prj/d.lst b/svx/prj/d.lst index a07db5dbe093..e69de29bb2d1 100644 --- a/svx/prj/d.lst +++ b/svx/prj/d.lst @@ -1,134 +0,0 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %COMMON_DEST%\res%_EXT% -mkdir: %_DEST%\xml%_EXT%\uiconfig -mkdir: %_DEST%\xml%_EXT%\uiconfig\global -mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator -mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\en-US -mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* -..\%__SRC%\lib\isvx*.lib %_DEST%\lib%_EXT%\isvx*.lib -..\%__SRC%\bin\gengal* %_DEST%\bin%_EXT%\gengal* -..\%__SRC%\bin\gengalrc %_DEST%\bin%_EXT%\gengal.ini -..\%__SRC%\bin\cui*.dll %_DEST%\bin%_EXT%\cui*.dll -..\%__SRC%\bin\svx*.dll %_DEST%\bin%_EXT%\svx*.dll -..\%__SRC%\bin\textconv*.dll %_DEST%\bin%_EXT%\textconv*.dll -..\%__SRC%\bin\txcnv*.dll %_DEST%\bin%_EXT%\txcnv*.dll -..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res - -mkdir: %_DEST%\inc%_EXT%\svx -..\inc\svx\svxcommands.h %_DEST%\inc%_EXT%\svx\svxcommands.h -..\sdi\svx.sdi %_DEST%\inc%_EXT%\svx\svx.sdi -..\sdi\svxitems.sdi %_DEST%\inc%_EXT%\svx\svxitems.sdi -..\sdi\xoitems.sdi %_DEST%\inc%_EXT%\svx\xoitems.sdi - -..\inc\svx\*.hxx %_DEST%\inc%_EXT%\svx\*.hxx -..\inc\svx\*.h %_DEST%\inc%_EXT%\svx\*.h -..\inc\svx\*.hrc %_DEST%\inc%_EXT%\svx\*.hrc - -..\%__SRC%\inc\svxslots.hxx %_DEST%\inc%_EXT%\svx\svxslots.hxx -..\%__SRC%\inc\globlmn.hrc %_DEST%\inc%_EXT%\svx\globlmn.hrc - -mkdir: %_DEST%\inc%_EXT%\svx\sdr -mkdir: %_DEST%\inc%_EXT%\svx\sdr\properties -..\inc\svx\sdr\properties\properties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\properties.hxx -..\inc\svx\sdr\properties\emptyproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\emptyproperties.hxx -..\inc\svx\sdr\properties\e3dlatheproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\e3dlatheproperties.hxx -..\inc\svx\sdr\properties\e3dextrudeproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\e3dextrudeproperties.hxx -..\inc\svx\sdr\properties\e3dcompoundproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\e3dcompoundproperties.hxx -..\inc\svx\sdr\properties\e3dproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\e3dproperties.hxx -..\inc\svx\sdr\properties\rectangleproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\rectangleproperties.hxx -..\inc\svx\sdr\properties\attributeproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\attributeproperties.hxx -..\inc\svx\sdr\properties\defaultproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\defaultproperties.hxx -..\inc\svx\sdr\properties\textproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\textproperties.hxx - -mkdir: %_DEST%\inc%_EXT%\svx\sdr\contact -..\inc\svx\sdr\contact\displayinfo.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\displayinfo.hxx -..\inc\svx\sdr\contact\objectcontact.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\objectcontact.hxx -..\inc\svx\sdr\contact\objectcontactofpageview.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\objectcontactofpageview.hxx -..\inc\svx\sdr\contact\viewcontact.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontact.hxx -..\inc\svx\sdr\contact\viewcontactofsdrobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofsdrobj.hxx -..\inc\svx\sdr\contact\viewcontactofsdrmediaobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofsdrmediaobj.hxx -..\inc\svx\sdr\contact\viewcontactofe3dscene.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofe3dscene.hxx -..\inc\svx\sdr\contact\viewcontactofgraphic.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofgraphic.hxx -..\inc\svx\sdr\contact\viewcontactofgroup.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofgroup.hxx -..\inc\svx\sdr\contact\viewcontactofmasterpagedescriptor.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofmasterpagedescriptor.hxx -..\inc\svx\sdr\contact\viewcontactofpageobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofpageobj.hxx -..\inc\svx\sdr\contact\viewcontactofsdrobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofsdrobj.hxx -..\inc\svx\sdr\contact\viewcontactofsdrpage.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofsdrpage.hxx -..\inc\svx\sdr\contact\viewcontactoftextobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactoftextobj.hxx -..\inc\svx\sdr\contact\viewcontactofvirtobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofvirtobj.hxx -..\inc\svx\sdr\contact\viewobjectcontact.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontact.hxx -..\inc\svx\sdr\contact\objectcontactofobjlistpainter.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\objectcontactofobjlistpainter.hxx -..\inc\svx\sdr\contact\viewobjectcontactredirector.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactredirector.hxx -..\inc\svx\sdr\contact\viewobjectcontactofpageobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactofpageobj.hxx -..\inc\svx\sdr\contact\viewobjectcontactofsdrobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactofsdrobj.hxx -..\inc\svx\sdr\contact\vocbitmapbuffer.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\vocbitmapbuffer.hxx - -mkdir: %_DEST%\inc%_EXT%\svx\sdr\overlay -..\inc\svx\sdr\overlay\overlayanimatedbitmapex.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayanimatedbitmapex.hxx -..\inc\svx\sdr\overlay\overlaybitmapex.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaybitmapex.hxx -..\inc\svx\sdr\overlay\overlayline.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayline.hxx -..\inc\svx\sdr\overlay\overlayhelpline.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayhelpline.hxx -..\inc\svx\sdr\overlay\overlaymanager.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaymanager.hxx -..\inc\svx\sdr\overlay\overlaymanagerbuffered.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaymanagerbuffered.hxx -..\inc\svx\sdr\overlay\overlayobject.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayobject.hxx -..\inc\svx\sdr\overlay\overlayobjectlist.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayobjectlist.hxx -..\inc\svx\sdr\overlay\overlaytriangle.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaytriangle.hxx -..\inc\svx\sdr\overlay\overlaypolypolygon.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaypolypolygon.hxx -..\inc\svx\sdr\overlay\overlayobjectcell.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayobjectcell.hxx -..\inc\svx\sdr\overlay\overlayprimitive2dsequenceobject.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayprimitive2dsequenceobject.hxx -..\inc\svx\sdr\overlay\overlayselection.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayselection.hxx -..\inc\svx\sdr\overlay\overlaytools.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaytools.hxx - -mkdir: %_DEST%\inc%_EXT%\svx\sdr\primitive2d -..\inc\svx\sdr\primitive2d\sdrprimitivetools.hxx %_DEST%\inc%_EXT%\svx\sdr\primitive2d\sdrprimitivetools.hxx - -mkdir: %_DEST%\inc%_EXT%\svx\sdr\animation -..\inc\svx\sdr\animation\ainfographic.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\ainfographic.hxx -..\inc\svx\sdr\animation\ainfoscrolltext.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\ainfoscrolltext.hxx -..\inc\svx\sdr\animation\ainfotext.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\ainfotext.hxx -..\inc\svx\sdr\animation\animationinfo.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\animationinfo.hxx -..\inc\svx\sdr\animation\animationstate.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\animationstate.hxx -..\inc\svx\sdr\animation\objectanimator.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\objectanimator.hxx -..\inc\svx\sdr\animation\scheduler.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\scheduler.hxx - -mkdir: %_DEST%\inc%_EXT%\svx\sdr\table -..\inc\svx\sdr\table\tabledesign.hxx %_DEST%\inc%_EXT%\svx\sdr\table\tabledesign.hxx - -..\xml\SvxDrawPage.xml %_DEST%\xml%_EXT%\SvxDrawPage.xml -..\xml\SvxGraphicObject.xml %_DEST%\xml%_EXT%\SvxGraphicObject.xml -..\xml\SvxShape.xml %_DEST%\xml%_EXT%\SvxShape.xml -..\xml\SvxShapeCircle.xml %_DEST%\xml%_EXT%\SvxShapeCircle.xml -..\xml\SvxShapeCollection.xml %_DEST%\xml%_EXT%\SvxShapeCollection.xml -..\xml\SvxShapeConnector.xml %_DEST%\xml%_EXT%\SvxShapeConnector.xml -..\xml\SvxShapeControl.xml %_DEST%\xml%_EXT%\SvxShapeControl.xml -..\xml\SvxShapeDimensioning.xml %_DEST%\xml%_EXT%\SvxShapeDimensioning.xml -..\xml\SvxShapeGroup.xml %_DEST%\xml%_EXT%\SvxShapeGroup.xml -..\xml\SvxShapePolyPolygon.xml %_DEST%\xml%_EXT%\SvxShapePolyPolygon.xml -..\xml\SvxShapePolyPolygonBezier.xml %_DEST%\xml%_EXT%\SvxShapePolyPolygonBezier.xml -..\xml\SvxUnoNumberingRules.xml %_DEST%\xml%_EXT%\SvxUnoNumberingRules.xml -..\xml\SvxUnoText.xml %_DEST%\xml%_EXT%\SvxUnoText.xml -..\xml\SvxUnoTextContent.xml %_DEST%\xml%_EXT%\SvxUnoTextContent.xml -..\xml\SvxUnoTextContentEnum.xml %_DEST%\xml%_EXT%\SvxUnoTextContentEnum.xml -..\xml\SvxUnoTextCursor.xml %_DEST%\xml%_EXT%\SvxUnoTextCursor.xml -..\xml\SvxUnoTextField.xml %_DEST%\xml%_EXT%\SvxUnoTextField.xml -..\xml\SvxUnoTextRange.xml %_DEST%\xml%_EXT%\SvxUnoTextRange.xml -..\xml\SvxUnoTextRangeEnumeration.xml %_DEST%\xml%_EXT%\SvxUnoTextRangeEnumeration.xml -..\xml\SvxGraphicExporter.xml %_DEST%\xml%_EXT%\SvxGraphicExporter.xml -..\xml\SvxGraphCtrlAccessibleContext.xml %_DEST%\xml%_EXT%\SvxGraphCtrlAccessibleContext.xml -..\xml\AccessibleShape.xml %_DEST%\xml%_EXT%\AccessibleShape.xml -..\xml\AccessibleGraphicShape.xml %_DEST%\xml%_EXT%\AccessibleGraphicShape.xml -..\xml\AccessibleOLEShape.xml %_DEST%\xml%_EXT%\AccessibleOLEShape.xml -..\xml\AccessibleControlShape.xml %_DEST%\xml%_EXT%\AccessibleControlShape.xml -..\xml\AccessibleEditableTextPara.xml %_DEST%\xml%_EXT%\AccessibleEditableTextPara.xml - -..\uiconfig\accelerator\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\*.xml -..\uiconfig\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\en-US\*.xml -..\uiconfig\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es\*.xml - -..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.* -..\%__SRC%\misc\svx.component %_DEST%\xml%_EXT%\svx.component -..\%__SRC%\misc\svxcore.component %_DEST%\xml%_EXT%\svxcore.component -..\%__SRC%\misc\textconversiondlgs.component %_DEST%\xml%_EXT%\textconversiondlgs.component diff --git a/framework/util/target.pmk b/svx/prj/makefile.mk index 857dc59d48e7..e312a7ccab65 100644..100755 --- a/framework/util/target.pmk +++ b/svx/prj/makefile.mk @@ -24,11 +24,17 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -ALLSLO: $(SLOFILES) -SOSHL: $(SHL1TARGETN) +PRJ=.. +TARGET=prj -WHOLEPRJ: - cd $(PRJ)$/prj - make debug linkinc prjpch compinc - @echo "READY" +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/svx/prj/target_module_svx.mk b/svx/prj/target_module_svx.mk deleted file mode 100644 index 5978c97e5500..000000000000 --- a/svx/prj/target_module_svx.mk +++ /dev/null @@ -1,52 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Module_Module,svx,\ - $(call gb_AllLangResTarget_get_target,svx) \ - $(call gb_Library_get_target,svxcore) \ - $(call gb_Library_get_target,svx) \ -)) - -$(eval $(call gb_Module_read_includes,svx,\ - lib_svx \ - lib_svxcore \ - res_svx \ -)) - -#todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX -#todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes -#todo: -DUNICODE and -D_UNICODE on WNT for source/dialog -#todo: noopt for viewpt3d.cxx with MSVC and ICC -#todo: set -DENABLE_VBA in case $(ENABLE_VBA)="YES"; can we do it in gbuild.mk? -#todo: gengal -#todo: set -D... for ENABLE_GTK/KDE/KDE4 -> in gbuild.mk? -#todo: ibrwimp.lib in util/makefile.mk on Windows ?! -#todo: GENHID -#todo: uiconfig -#todo: exports from gallery (util/gal.dxp) and svx (svx.dxp) -#todo: resources, textconversion, packages - diff --git a/svx/prj/target_package_inc.mk b/svx/prj/target_package_inc.mk deleted file mode 100644 index dd836b286f8b..000000000000 --- a/svx/prj/target_package_inc.mk +++ /dev/null @@ -1,154 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,sfx2_inc,$(SRCDIR)/sfx2/inc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/childwin.hxx,sfx2/childwin.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ctrlitem.hxx,sfx2/ctrlitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfdlg.hxx,sfx2/dinfdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfedt.hxx,sfx2/dinfedt.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfac.hxx,sfx2/docfac.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfile.hxx,sfx2/docfile.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfilt.hxx,sfx2/docfilt.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctdlg.hxx,sfx2/doctdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/fcontnr.hxx,sfx2/fcontnr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frame.hxx,sfx2/frame.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmdescr.hxx,sfx2/frmdescr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtml.hxx,sfx2/frmhtml.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtmlw.hxx,sfx2/frmhtmlw.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/macrconf.hxx,sfx2/macrconf.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msg.hxx,sfx2/msg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msgpool.hxx,sfx2/msgpool.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objface.hxx,sfx2/objface.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objitem.hxx,sfx2/objitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objsh.hxx,sfx2/objsh.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/opengrf.hxx,sfx2/opengrf.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printer.hxx,sfx2/printer.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printopt.hxx,sfx2/printopt.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhelp.hxx,sfx2/sfxhelp.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxresid.hxx,sfx2/sfxresid.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx)) - - - - - - - - - - - - - - - - - - - - diff --git a/svx/qa/unoapi/Test.java b/svx/qa/unoapi/Test.java index 90abd12776d0..2f7581e22efa 100644 --- a/svx/qa/unoapi/Test.java +++ b/svx/qa/unoapi/Test.java @@ -27,6 +27,7 @@ package org.openoffice.svx.qa.unoapi; import org.openoffice.Runner; import org.openoffice.test.OfficeConnection; +import org.openoffice.test.Argument; import static org.junit.Assert.*; public final class Test { @@ -43,8 +44,8 @@ public final class Test { @org.junit.Test public void test() { assertTrue( Runner.run( - "-sce", "svx.sce", "-xcl", "knownissues.xcl", "-tdoc", - "testdocuments", "-cs", connection.getDescription())); + "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc", + Argument.get("tdoc"), "-cs", connection.getDescription())); } private final OfficeConnection connection = new OfficeConnection(); diff --git a/svx/qa/unoapi/makefile.mk b/svx/qa/unoapi/makefile.mk deleted file mode 100644 index 133e9a3458e4..000000000000 --- a/svx/qa/unoapi/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -#***********************************************************************/ - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../.. -PRJNAME = svx -TARGET = qa_unoapi - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/svx/qa/unoapi -JAVATESTFILES = Test.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/svx/sdi/makefile.mk b/svx/sdi/makefile.mk deleted file mode 100644 index be41593be71a..000000000000 --- a/svx/sdi/makefile.mk +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -PRJ=.. - -PRJNAME=svx -TARGET=svxslots - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(L10N_framework)"=="" - -SDI1NAME=$(TARGET) -SDI1EXPORT=svx - -# --- Files -------------------------------------------------------- - -SVSDI1DEPEND= \ - $(SOLARINCXDIR)$/sfx2/sfx.sdi \ - $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \ - svxitems.sdi \ - fmslots.sdi \ - svx.sdi \ - xoitems.sdi \ - svxitems.sdi - -# --- Targets ------------------------------------------------------- -.ENDIF -.INCLUDE : target.mk - diff --git a/svx/source/accessibility/makefile.mk b/svx/source/accessibility/makefile.mk deleted file mode 100755 index 9ac9cff08a1d..000000000000 --- a/svx/source/accessibility/makefile.mk +++ /dev/null @@ -1,68 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -TARGET=accessibility -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/charmapacc.obj \ - $(SLO)$/svxrectctaccessiblecontext.obj \ - $(SLO)$/GraphCtlAccessibleContext.obj \ - $(SLO)$/ChildrenManager.obj \ - $(SLO)$/ChildrenManagerImpl.obj \ - $(SLO)$/DescriptionGenerator.obj \ - $(SLO)$/AccessibleShape.obj \ - $(SLO)$/AccessibleGraphicShape.obj \ - $(SLO)$/AccessibleOLEShape.obj \ - $(SLO)$/AccessibleShapeInfo.obj \ - $(SLO)$/AccessibleShapeTreeInfo.obj \ - $(SLO)$/AccessibleTextHelper.obj \ - $(SLO)$/AccessibleEmptyEditSource.obj \ - $(SLO)$/AccessibleTextEventQueue.obj \ - $(SLO)$/ShapeTypeHandler.obj \ - $(SLO)$/SvxShapeTypes.obj \ - $(SLO)$/AccessibleControlShape.obj \ - $(SLO)$/DGColorNameLookUp.obj \ - $(SLO)$/AccessibleFrameSelector.obj - -SRS2NAME = accessibility -SRC2FILES = accessibility.src - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index dafd0d868963..dafd0d868963 100755..100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx diff --git a/svx/source/customshapes/makefile.mk b/svx/source/customshapes/makefile.mk deleted file mode 100644 index 3feca8f25007..000000000000 --- a/svx/source/customshapes/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=svx -TARGET=customshapes -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Types ------------------------------------- - -# Disable optimization for SunCC SPARC and MACOSX (funny loops -# when parsing e.g. "x+width/2"), -# also http://gcc.gnu.org/PR22392 -.IF ("$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC") || "$(OS)"=="MACOSX" || ("$(OS)"=="LINUX" && "$(CPU)"=="P") -NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj -.ENDIF - -ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE - -# --- Files ------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/EnhancedCustomShapeTypeNames.obj \ - $(SLO)$/EnhancedCustomShapeGeometry.obj \ - $(SLO)$/EnhancedCustomShape2d.obj \ - $(SLO)$/EnhancedCustomShapeFunctionParser.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/EnhancedCustomShapeEngine.obj \ - $(SLO)$/EnhancedCustomShape3d.obj \ - $(SLO)$/EnhancedCustomShapeFontWork.obj \ - $(SLO)$/EnhancedCustomShapeHandle.obj \ - $(SLO)$/tbxcustomshapes.obj - -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk deleted file mode 100644 index ac608fae8ec8..000000000000 --- a/svx/source/dialog/makefile.mk +++ /dev/null @@ -1,154 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. -PRJNAME=svx -TARGET=dialogs -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# -.IF "$(GUI)"=="WNT" -CFLAGS+= -DUNICODE -D_UNICODE -.ENDIF - -# --- Files -------------------------------------------------------- - -SRS1NAME=dialogs -SRC1FILES = \ - bmpmask.src \ - contdlg.src \ - ctredlin.src \ - dlgctrl.src \ - docrecovery.src \ - fontwork.src \ - frmsel.src \ - hdft.src \ - hyprlink.src \ - imapdlg.src \ - langbox.src \ - language.src \ - passwd.src \ - prtqry.src \ - rubydialog.src\ - ruler.src \ - srchdlg.src \ - svxbmpnumvalueset.src \ - swframeposstrings.src \ - txenctab.src \ - ucsubset.src \ - optgrid.src - -SRS2NAME=drawdlgs -SRC2FILES = \ - sdstring.src - -LIB1TARGET=$(SLB)$/$(TARGET)-core.lib - -LIB1OBJFILES= \ - $(SLO)$/checklbx.obj \ - $(SLO)$/dialmgr.obj\ - $(SLO)$/dlgutil.obj \ - $(SLO)$/framelink.obj\ - $(SLO)$/langbox.obj \ - $(SLO)$/simptabl.obj \ - $(SLO)$/svxdlg.obj \ - $(SLO)$/stddlg.obj \ - -LIB2TARGET=$(SLB)$/$(TARGET).lib - -LIB2OBJFILES= \ - $(SLO)$/charmap.obj \ - $(SLO)$/connctrl.obj \ - $(SLO)$/contwnd.obj \ - $(SLO)$/ctredlin.obj \ - $(SLO)$/databaseregistrationui.obj \ - $(SLO)$/dialcontrol.obj \ - $(SLO)$/dlgctl3d.obj \ - $(SLO)$/dlgctrl.obj \ - $(SLO)$/docrecovery.obj \ - $(SLO)$/fntctrl.obj \ - $(SLO)$/fontlb.obj \ - $(SLO)$/fontwork.obj \ - $(SLO)$/framelinkarray.obj \ - $(SLO)$/frmdirlbox.obj \ - $(SLO)$/frmsel.obj \ - $(SLO)$/graphctl.obj \ - $(SLO)$/grfflt.obj \ - $(SLO)$/hdft.obj \ - $(SLO)$/hyperdlg.obj \ - $(SLO)$/hyprlink.obj \ - $(SLO)$/imapdlg.obj \ - $(SLO)$/imapwnd.obj \ - $(SLO)$/measctrl.obj \ - $(SLO)$/orienthelper.obj \ - $(SLO)$/pagectrl.obj \ - $(SLO)$/paraprev.obj \ - $(SLO)$/passwd.obj \ - $(SLO)$/pfiledlg.obj \ - $(SLO)$/prtqry.obj \ - $(SLO)$/relfld.obj \ - $(SLO)$/rlrcitem.obj \ - $(SLO)$/rubydialog.obj \ - $(SLO)$/rulritem.obj \ - $(SLO)$/SpellDialogChildWindow.obj \ - $(SLO)$/srchctrl.obj \ - $(SLO)$/srchdlg.obj \ - $(SLO)$/strarray.obj \ - $(SLO)$/svxbmpnumvalueset.obj\ - $(SLO)$/svxgrahicitem.obj \ - $(SLO)$/svxruler.obj \ - $(SLO)$/swframeexample.obj \ - $(SLO)$/swframeposstrings.obj \ - $(SLO)$/txencbox.obj \ - $(SLO)$/txenctab.obj \ - $(SLO)$/wrapfield.obj \ - $(SLO)$/_bmpmask.obj \ - $(SLO)$/_contdlg.obj \ - $(SLO)$/optgrid.obj - - -.IF "$(GUI)"=="UNX" -LIB2OBJFILES += $(SLO)$/sendreportunx.obj -.ELSE -.IF "$(GUI)"=="WNT" -LIB2OBJFILES += $(SLO)$/sendreportw32.obj -.ELSE -LIB2OBJFILES += $(SLO)$/sendreportgen.obj -.ENDIF -.ENDIF - -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/svx/source/engine3d/makefile.mk b/svx/source/engine3d/makefile.mk deleted file mode 100644 index 71916df4a83c..000000000000 --- a/svx/source/engine3d/makefile.mk +++ /dev/null @@ -1,76 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -TARGET=engine3d -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/e3dsceneupdater.obj \ - $(SLO)$/helperminimaldepth3d.obj \ - $(SLO)$/helperhittest3d.obj \ - $(SLO)$/obj3d.obj \ - $(SLO)$/scene3d.obj \ - $(SLO)$/polysc3d.obj \ - $(SLO)$/cube3d.obj \ - $(SLO)$/sphere3d.obj \ - $(SLO)$/extrud3d.obj \ - $(SLO)$/lathe3d.obj \ - $(SLO)$/polygn3d.obj \ - $(SLO)$/svx3ditems.obj \ - $(SLO)$/deflt3d.obj \ - $(SLO)$/e3dundo.obj \ - $(SLO)$/viewpt3d2.obj \ - $(SLO)$/camera3d.obj \ - $(SLO)$/objfac3d.obj \ - $(SLO)$/dragmt3d.obj \ - $(SLO)$/view3d.obj \ - $(SLO)$/view3d1.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/float3d.obj - -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - -SRS1NAME=engine3d -SRC1FILES=\ - string3d.src \ - float3d.src - -.INCLUDE : target.mk diff --git a/svx/source/fmcomp/makefile.mk b/svx/source/fmcomp/makefile.mk deleted file mode 100644 index aa4e9eaba186..000000000000 --- a/svx/source/fmcomp/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -TARGET=fmcomp -LIBTARGET=NO - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SRS1NAME=fmcomp -SRC1FILES= \ - gridctrl.src - -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/dbaexchange.obj \ - $(SLO)$/gridcols.obj \ - $(SLO)$/gridctrl.obj \ - $(SLO)$/gridcell.obj \ - $(SLO)$/fmgridcl.obj \ - $(SLO)$/fmgridif.obj \ - $(SLO)$/trace.obj \ - $(SLO)$/xmlexchg.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/dbaobjectex.obj - -.INCLUDE : target.mk - diff --git a/svx/source/form/makefile.mk b/svx/source/form/makefile.mk deleted file mode 100644 index d6dc1bd65357..000000000000 --- a/svx/source/form/makefile.mk +++ /dev/null @@ -1,119 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -TARGET=form -LIBTARGET=NO - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(ENABLE_VBA)"=="YES" - CDEFS+=-DENABLE_VBA -.ENDIF - -SRS1NAME=form -SRC1FILES= \ - fmexpl.src \ - filtnav.src \ - fmstring.src \ - formshell.src \ - datanavi.src - -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/formtoolbars.obj \ - $(SLO)$/fmdocumentclassification.obj \ - $(SLO)$/fmcontrolbordermanager.obj \ - $(SLO)$/fmcontrollayout.obj \ - $(SLO)$/fmtextcontroldialogs.obj \ - $(SLO)$/fmtextcontrolfeature.obj \ - $(SLO)$/fmtextcontrolshell.obj \ - $(SLO)$/ParseContext.obj \ - $(SLO)$/typeconversionclient.obj \ - $(SLO)$/dbtoolsclient.obj \ - $(SLO)$/sqlparserclient.obj \ - $(SLO)$/dataaccessdescriptor.obj \ - $(SLO)$/fmpage.obj \ - $(SLO)$/fmundo.obj \ - $(SLO)$/fmmodel.obj \ - $(SLO)$/navigatortree.obj \ - $(SLO)$/navigatortreemodel.obj \ - $(SLO)$/fmexpl.obj \ - $(SLO)$/formcontroller.obj \ - $(SLO)$/fmpgeimp.obj \ - $(SLO)$/fmvwimp.obj \ - $(SLO)$/fmdpage.obj \ - $(SLO)$/fmitems.obj \ - $(SLO)$/fmobj.obj \ - $(SLO)$/fmdmod.obj \ - $(SLO)$/fmservs.obj \ - $(SLO)$/typemap.obj \ - $(SLO)$/fmexch.obj \ - $(SLO)$/fmtools.obj \ - $(SLO)$/fmshimp.obj \ - $(SLO)$/fmshell.obj \ - $(SLO)$/fmview.obj \ - $(SLO)$/sdbdatacolumn.obj \ - $(SLO)$/formcontrolling.obj \ - $(SLO)$/formfeaturedispatcher.obj \ - $(SLO)$/formdispatchinterceptor.obj \ - $(SLO)$/datanavi.obj \ - $(SLO)$/xfm_addcondition.obj \ - $(SLO)$/datalistener.obj \ - $(SLO)$/fmscriptingenv.obj \ - $(SLO)$/stringlistresource.obj \ - $(SLO)$/delayedevent.obj \ - $(SLO)$/formcontrolfactory.obj \ - $(SLO)$/legacyformcontroller.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/dbcharsethelper.obj \ - $(SLO)$/fmPropBrw.obj \ - $(SLO)$/tbxform.obj \ - $(SLO)$/fmobjfac.obj \ - $(SLO)$/fmsrccfg.obj \ - $(SLO)$/tabwin.obj \ - $(SLO)$/filtnav.obj \ - $(SLO)$/fmsrcimp.obj \ - $(SLO)$/databaselocationinput.obj - -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - diff --git a/svx/source/gallery2/makefile.mk b/svx/source/gallery2/makefile.mk deleted file mode 100644 index 4d73a4af2ad2..000000000000 --- a/svx/source/gallery2/makefile.mk +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=svx -TARGET=gal - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - gallery.src \ - galtheme.src - -SLOFILES = \ - $(SLO)$/galexpl.obj \ - $(SLO)$/galctrl.obj \ - $(SLO)$/gallery1.obj \ - $(SLO)$/galtheme.obj \ - $(SLO)$/galmisc.obj \ - $(SLO)$/galobj.obj \ - $(SLO)$/codec.obj \ - $(SLO)$/galbrws.obj \ - $(SLO)$/galbrws1.obj \ - $(SLO)$/galbrws2.obj - -EXCEPTIONSFILES = \ - $(SLO)$/gallery1.obj \ - $(SLO)$/galtheme.obj \ - $(SLO)$/galmisc.obj \ - $(SLO)$/galbrws1.obj \ - $(SLO)$/galexpl.obj - -RESLIB1NAME = $(TARGET) -RESLIB1IMAGES = $(PRJ)$/res -RESLIB1SRSFILES = $(SRS)$/$(TARGET).srs - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx deleted file mode 100644 index d7328e9ac2e7..000000000000 --- a/svx/source/gengal/gengal.cxx +++ /dev/null @@ -1,319 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svx.hxx" - -#include <stdio.h> -#include <unistd.h> -#include <memory> -#include <list> - -#include <unotools/streamwrap.hxx> -#include <unotools/ucbstreamhelper.hxx> - -#include <comphelper/processfactory.hxx> -#include <comphelper/regpathhelper.hxx> -#include <cppuhelper/servicefactory.hxx> -#include <cppuhelper/bootstrap.hxx> -#include <com/sun/star/uno/Reference.h> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/registry/XSimpleRegistry.hpp> - -#include <ucbhelper/contentbroker.hxx> -#include <ucbhelper/configurationkeys.hxx> - -#include <tools/urlobj.hxx> -#include <tools/fsys.hxx> -#include <svtools/filedlg.hxx> - -#include <vcl/window.hxx> -#include <vcl/svapp.hxx> -#include <vcl/font.hxx> -#include <vcl/sound.hxx> -#include <vcl/print.hxx> -#include <vcl/toolbox.hxx> -#include <vcl/help.hxx> -#include <vcl/scrbar.hxx> -#include <vcl/wrkwin.hxx> -#include <vcl/msgbox.hxx> - -#include <osl/file.hxx> -#include <osl/process.h> -#include <rtl/bootstrap.hxx> - -#include <svx/galtheme.hxx> -#include <svx/gallery1.hxx> - -using namespace ::vos; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::registry; -using namespace ::com::sun::star::lang; - -typedef ::std::list<rtl::OUString> FileNameList; - -class GalApp : public Application -{ -public: - virtual void Main(); - -protected: - Reference<XMultiServiceFactory> xMSF; - void Init(); - void InitUCB(); -}; - -Gallery* createGallery( const rtl::OUString& aGalleryURL ) -{ - return new Gallery( aGalleryURL ); -} - -void disposeGallery( Gallery* pGallery ) -{ - delete pGallery; -} - -static void createTheme( rtl::OUString aThemeName, - rtl::OUString aGalleryURL, - rtl::OUString aDestDir, - sal_uInt32 nNumFrom, - FileNameList &rFiles ) -{ - Gallery * pGallery( createGallery( aGalleryURL ) ); - - if (!pGallery ) { - fprintf( stderr, "Could't acquire '%s'\n", - (const sal_Char *) rtl::OUStringToOString( aGalleryURL, - RTL_TEXTENCODING_UTF8 ) ); - exit( 1 ); - } - fprintf( stderr, "Work on gallery '%s'\n", - (const sal_Char *) rtl::OUStringToOString( aGalleryURL, RTL_TEXTENCODING_UTF8 ) ); - - fprintf( stderr, "Existing themes: %lu\n", - sal::static_int_cast< unsigned long >( - pGallery->GetThemeCount() ) ); - - if( !pGallery->HasTheme( aThemeName) ) { - if( !pGallery->CreateTheme( aThemeName, nNumFrom ) ) { - fprintf( stderr, "Failed to create theme\n" ); - disposeGallery( pGallery ); - exit( 1 ); - } - } - - fprintf( stderr, "Existing themes: %lu\n", - sal::static_int_cast< unsigned long >( - pGallery->GetThemeCount() ) ); - - SfxListener aListener; - - GalleryTheme *pGalTheme = pGallery->AcquireTheme( aThemeName, aListener ); - if ( pGalTheme == NULL ) { - fprintf( stderr, "Failed to acquire theme\n" ); - disposeGallery( pGallery ); - exit( 1 ); - } - - fprintf( stderr, "Using DestDir: %s\n", - (const sal_Char *) rtl::OUStringToOString( aDestDir, RTL_TEXTENCODING_UTF8 ) ); - pGalTheme->SetDestDir(String(aDestDir)); - - FileNameList::const_iterator aIter; - - for( aIter = rFiles.begin(); aIter != rFiles.end(); aIter++ ) - { -// Should/could use: -// if ( ! pGalTheme->InsertFileOrDirURL( aURL ) ) { -// Requires a load more components ... - - Graphic aGraphic; - String aFormat; - -#if 1 - if ( ! pGalTheme->InsertURL( *aIter ) ) - fprintf( stderr, "Failed to import '%s'\n", - (const sal_Char *) rtl::OUStringToOString( *aIter, RTL_TEXTENCODING_UTF8 ) ); - else - fprintf( stderr, "Imported file '%s' (%lu)\n", - (const sal_Char *) rtl::OUStringToOString( *aIter, RTL_TEXTENCODING_UTF8 ), - sal::static_int_cast< unsigned long >( - pGalTheme->GetObjectCount() ) ); - -#else // only loads BMPs - SvStream *pStream = ::utl::UcbStreamHelper::CreateStream( *aIter, STREAM_READ ); - if (!pStream) { - fprintf( stderr, "Can't find image to import\n" ); - disposeGallery( pGallery ); - exit (1); - } - *pStream >> aGraphic; - delete pStream; - if( aGraphic.GetType() == GRAPHIC_NONE ) - { - fprintf( stderr, "Failed to load '%s'\n", - (const sal_Char *) rtl::OUStringToOString( *aIter, RTL_TEXTENCODING_UTF8 ) ); - continue; - } - - SgaObjectBmp aObject( aGraphic, *aIter, aFormat ); - if ( ! aObject.IsValid() ) { - fprintf( stderr, "Failed to create thumbnail for image\n" ); - continue; - } - - if ( ! pGalTheme->InsertObject( aObject ) ) { - fprintf( stderr, "Failed to insert file or URL\n" ); - continue; - } -#endif - } - - pGallery->ReleaseTheme( pGalTheme, aListener ); - disposeGallery( pGallery ); -} - -static void PrintHelp() -{ - fprintf( stdout, "Utility to generate OO.o gallery files\n\n" ); - - fprintf( stdout, "using: gengal --name <name> --path <dir> [ --destdir <path> ]\n"); - fprintf( stdout, " [ --number-from <num> ] [ files ... ]\n\n" ); - - fprintf( stdout, "options:\n"); - fprintf( stdout, " --name <theme>\t\tdefines a name of the created or updated theme.\n"); - fprintf( stdout, " --path <dir>\t\tdefines directory where the gallery files are created\n"); - fprintf( stdout, "\t\t\tor updated.\n"); - fprintf( stdout, " --destdir <dir>\tdefines a path prefix to be removed from the paths\n"); - fprintf( stdout, "\t\t\tstored in the gallery files. It is useful to create\n"); - fprintf( stdout, "\t\t\tRPM packages using the BuildRoot feature.\n"); - fprintf( stdout, " --number-from <num>\tdefines minimal number for the newly created gallery\n"); - fprintf( stdout, "\t\t\ttheme files.\n"); - fprintf( stdout, " files\t\t\tlists files to be added to the gallery. Absolute paths\n"); - fprintf( stdout, "\t\t\tare required.\n"); -} - -static rtl::OUString Smartify( const rtl::OUString &rPath ) -{ - INetURLObject aURL; - aURL.SetSmartURL( rPath ); - return aURL.GetMainURL( INetURLObject::NO_DECODE ); -} - -#define OUSTRING_CSTR( str ) \ - rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ).getStr() - -void GalApp::Init() -{ - if( getenv( "OOO_INSTALL_PREFIX" ) == NULL ) { - rtl::OUString fileName = GetAppFileName(); - int lastSlash = fileName.lastIndexOf( '/' ); -#ifdef WNT - // Don't know which directory separators GetAppFileName() returns on Windows. - // Be safe and take into consideration they might be backslashes. - if( fileName.lastIndexOf( '\\' ) > lastSlash ) - lastSlash = fileName.lastIndexOf( '\\' ); -#endif - rtl::OUString baseBinDir = fileName.copy( 0, lastSlash ); - rtl::OUString installPrefix = baseBinDir + rtl::OUString::createFromAscii( "/../.." ); - - rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("OOO_INSTALL_PREFIX")); - osl_setEnvironment(envVar.pData, installPrefix.pData); - } - OSL_TRACE( "OOO_INSTALL_PREFIX=%s", getenv( "OOO_INSTALL_PREFIX" ) ); - - Reference<XComponentContext> xComponentContext - = ::cppu::defaultBootstrap_InitialComponentContext(); - xMSF = Reference<XMultiServiceFactory> - ( xComponentContext->getServiceManager(), UNO_QUERY ); - if( !xMSF.is() ) - fprintf( stderr, "Failed to bootstrap\n" ); - ::comphelper::setProcessServiceFactory( xMSF ); - - InitUCB(); -} - -void GalApp::InitUCB() -{ - rtl::OUString aEmpty; - Sequence< Any > aArgs(6); - aArgs[0] - <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY1_LOCAL); - aArgs[1] - <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY2_OFFICE); - aArgs[2] <<= rtl::OUString::createFromAscii("PIPE"); - aArgs[3] <<= aEmpty; - aArgs[4] <<= rtl::OUString::createFromAscii("PORTAL"); - aArgs[5] <<= aEmpty; - - if (! ::ucbhelper::ContentBroker::initialize( xMSF, aArgs ) ) - fprintf( stderr, "Failed to init content broker\n" ); -} - -void GalApp::Main() -{ - bool bHelp = false; - rtl::OUString aPath, aDestDir; - rtl::OUString aName = rtl::OUString::createFromAscii( "Default name" ); - sal_uInt32 nNumFrom = 0; - FileNameList aFiles; - - for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ ) - { - rtl::OUString aParam = GetCommandLineParam( i ); - - if( aParam.equalsAscii( "--help" ) || - aParam.equalsAscii( "-h" ) ) - bHelp = true; - - else if ( aParam.equalsAscii( "--name" ) ) - aName = GetCommandLineParam( ++i ); - - else if ( aParam.equalsAscii( "--path" ) ) - aPath = Smartify( GetCommandLineParam( ++i ) ); - - else if ( aParam.equalsAscii( "--destdir" ) ) - aDestDir = GetCommandLineParam( ++i ); - - else if ( aParam.equalsAscii( "--number-from" ) ) - nNumFrom = GetCommandLineParam( ++i ).ToInt32(); - - else - aFiles.push_back( Smartify( aParam ) ); - } - - if( bHelp ) - { - PrintHelp(); - return; - } - - createTheme( aName, aPath, aDestDir, nNumFrom, aFiles ); -} - -GalApp aGalApp; diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh deleted file mode 100644 index a760b8e085d0..000000000000 --- a/svx/source/gengal/gengal.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# enable file locking -SAL_ENABLE_FILE_LOCKING=1 -export SAL_ENABLE_FILE_LOCKING - -# resolve installation directory -sd_cwd="`pwd`" -if [ -h "$0" ] ; then - sd_basename=`basename "$0"` - sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"` - cd "`dirname "$0"`" - cd "`dirname "$sd_script"`" -else - cd "`dirname "$0"`" -fi - -sd_prog="`pwd`" - -cd .. -sd_binary=`basename "$0"`".bin" -sd_inst="`pwd`" - -# change back directory -cd "$sd_cwd" - -# check if all required patches are installed -if [ -x "$sd_prog/sopatchlevel.sh" ]; then - "$sd_prog/sopatchlevel.sh" - if [ $? -eq 1 ]; then - exit 0 - fi -fi - -# set search path for shared libraries -sd_platform=`uname -s` -case $sd_platform in - AIX) - LIBPATH=${sd_prog}${LIBPATH+:${LIBPATH}} - export LIBPATH - ;; - - Darwin) - DYLD_LIBRARY_PATH=${sd_prog}${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}} - export DYLD_LIBRARY_PATH - ;; - - HP-UX) - SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH:+:${SHLIB_PATH}} - export SHLIB_PATH - ;; - - *) - LD_LIBRARY_PATH=${sd_prog}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} - export LD_LIBRARY_PATH - ;; -esac - -# misc. environment variables -unset XENVIRONMENT - -# set path so that other apps can be started just by name -PATH="$sd_prog":$PATH -export PATH - -OOO_INSTALL_PREFIX=${OOO_INSTALL_PREFIX-$sd_prog/../..} -if ! test -e $OOO_INSTALL_PREFIX/basis-link; then - # Hack for vanilla OOo binaries' split install layout - OOO_INSTALL_PREFIX=$OOO_INSTALL_PREFIX/../openoffice.org3 -fi - -export OOO_INSTALL_PREFIX - -# execute binary -exec "$sd_prog/$sd_binary" "$@" diff --git a/svx/source/gengal/gengalrc.in b/svx/source/gengal/gengalrc.in deleted file mode 100644 index 00ae5eb3cd5e..000000000000 --- a/svx/source/gengal/gengalrc.in +++ /dev/null @@ -1,12 +0,0 @@ -OOO_INSTALL_PREFIX_URL=file://${OOO_INSTALL_PREFIX} -OOO_BASIS_URL=${OOO_INSTALL_PREFIX_URL}/basis-link -OOO_BASIS_BIN_URL=${OOO_BASIS_URL}/program -OOO_URE_URL=${OOO_BASIS_URL}/ure-link -# -#CFG_INIFILE=${OOO_BASIS_BIN_URL}/configmgrrc -#BaseInstallation=${OOO_BASIS_URL} -BRAND_BASE_DIR=${OOO_INSTALL_PREFIX_URL} -OOO_BASE_DIR=${OOO_BASIS_URL} -# -UNO_TYPES=${OOO_URE_URL}/share/misc/types.rdb ${OOO_BASIS_BIN_URL}/offapi.rdb -UNO_SERVICES=${OOO_URE_URL}/share/misc/services.rdb ${OOO_BASIS_BIN_URL}/services.rdb diff --git a/svx/source/gengal/makefile.mk b/svx/source/gengal/makefile.mk deleted file mode 100644 index eefe8679a139..000000000000 --- a/svx/source/gengal/makefile.mk +++ /dev/null @@ -1,85 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx - -TARGET=gengal -TARGETTYPE=GUI -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SCRIPTFILES = $(BIN)$/gengal - -OBJFILES= $(OBJ)$/gengal.obj - -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" -APP1TARGET= $(TARGET) -.ELSE # .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" -APP1TARGET= $(TARGET).bin -.ENDIF # .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" - -APP1OBJS= $(OBJFILES) - -APP1STDLIBS=$(TOOLSLIB) \ - $(SO2LIB) \ - $(SVLLIB) \ - $(COMPHELPERLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(VCLLIB) \ - $(UCBHELPERLIB) \ - $(SVXCORELIB) - -#.IF "$(COM)"=="GCC" -#ADDOPTFILES=$(OBJ)$/gengal.obj -#add_cflagscxx="-frtti -fexceptions" -#.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : \ - $(SCRIPTFILES)\ - $(BIN)/gengalrc - -$(SCRIPTFILES) : $$(@:f:+".sh") - @tr -d "\015" < $(@:f:+".sh") > $@ - -$(BIN)/%: %.in - cp $< $@ - diff --git a/svx/source/intro/intro_tmpl.hrc b/svx/source/intro/about_ooo.hrc index e49b27cb29e8..2d81fff3b454 100644 --- a/svx/source/intro/intro_tmpl.hrc +++ b/svx/source/intro/about_ooo.hrc @@ -25,11 +25,6 @@ * ************************************************************************/ -#include <svx/svxids.hrc> - -#define RID_IMGLIST_TREEOPT (RID_OFA_START + 174) -#define RID_IMGLIST_TREEOPT_HC (RID_OFA_START + 175) - #define OOO_CONTRIBUTOR_LIST \ ItemList = \ { \ @@ -1086,242 +1081,3 @@ ItemList = \ < "Mattia Zuliani" ; > ; \ }; - -#define DEVELOPER_LIST \ -ItemList = \ -{ \ - < "" ; > ; \ - < "GENERAL MANAGEMENT" ; 8 ; > ; \ - < "" ; > ; \ - < "Michael Bemmer" ; > ; \ - < "" ; > ; \ - < "FUNCTIONAL STAFF" ; 8 ; > ; \ - < "" ; > ; \ - < "Sabine Huetsch" ; > ; \ - < "" ; > ; \ - < "OpenOffice.org COORDINATION" ; 8 ; > ; \ - < "" ; > ; \ - < "Stefan Taxhet" ; > ; \ - < "" ; > ; \ - < "TECHNICAL ARCHITECT" ; 8 ; > ; \ - < "" ; > ; \ - < "Matthias Huetsch" ; > ; \ - < "Kay Ramme" ; > ; \ - < "" ; > ; \ - < "PROGRAM MANAGEMENT" ; 8 ; > ; \ - < "" ; > ; \ - < "Joost Andrae" ; > ; \ - < "Martin Damboldt" ; > ; \ - < "Martin Hollmichel" ; > ; \ - < "Andre Kuemmel" ; > ; \ - < "Marcus Lange" ; > ; \ - < "Uwe Luebbers" ; > ; \ - < "" ; > ; \ - < "" ; > ; \ - < "%PRODUCTNAME DEVELOPMENT" ; 8 ; > ; \ - < "" ; > ; \ - < "Dieter Loeschky" ; > ; \ - < "" ; > ; \ - < "TECHNICAL ARCHITECT" ; 8 ; > ; \ - < "" ; > ; \ - < "Michael Brauer" ; > ; \ - < "Malte Timmermann" ; > ; \ - < "" ; > ; \ - < "ODF" ; 8 ; > ; \ - < "" ; > ; \ - < "Svante Schubert" ; > ; \ - < "" ; > ; \ - < "DESIGN" ; 8 ; > ; \ - < "" ; > ; \ - < "Stella Schulze" ; > ; \ - < "" ; > ; \ - < "Migration" ; 8 ; > ; \ - < "" ; > ; \ - < "Michael Bohn" ; > ; \ - < "" ; > ; \ - < "%PRODUCTNAME WRITER & FRAMEWORK" ; 8 ; > ; \ - < "" ; > ; \ - < "Mathias Bauer" ; > ; \ - < "" ; > ; \ - < "Henning Brinkmann" ; > ; \ - < "Steffen Grund" ; > ; \ - < "Hans-Peter Burow" ; > ; \ - < "Carsten Driesner" ; > ; \ - < "Thomas Lange" ; > ; \ - < "Andreas Martens" ; > ; \ - < "Frank Meies" ; > ; \ - < "Bjoern Michaelsen" ; > ; \ - < "Andreas Schluens" ; > ; \ - < "Oliver Specht" ; > ; \ - < "Oliver-Rainer Wittmann" ; > ; \ - < "Michael Stahl" ; > ; \ - < "Mikhail Voitenko" ; > ; \ - < "" ; > ; \ - < "%PRODUCTNAME IMPRESS, GRAPHICS & BASE" ; 8 ; > ; \ - < "" ; > ; \ - < "Kai Ahrens" ; > ; \ - < "" ; > ; \ - < "Volker Ahrendt" ; > ; \ - < "Herbert Duerr" ; > ; \ - < "Andre Fischer" ; > ; \ - < "Ilko Hoepping" ; > ; \ - < "Sven Jacobi" ; > ; \ - < "Ocke Janssen" ; > ; \ - < "Artem Khvat" ; > ; \ - < "Lars Langhans" ; > ; \ - < "Armin Le Grand" ; > ; \ - < "Christian Lippka" ; > ; \ - < "Philipp Lohmann" ; > ; \ - < "Frank Schoenheit" ; > ; \ - < "" ; > ; \ - < "%PRODUCTNAME PROGRAMMABILITY & DEPLOYMENT" ; 8 ; > ; \ - < "" ; > ; \ - < "Kai Sommerfeld" ; > ; \ - < "" ; > ; \ - < "Stephan Bergmann" ; > ; \ - < "Andreas Bregas" ; > ; \ - < "Steffen Grund" ; > ; \ - < "Mihaela Kedikova" ; > ; \ - < "Tobias Krause" ; > ; \ - < "Joachim Lingner" ; > ; \ - < "Christoph Neumann" ; > ; \ - < "Hennes Rohling" ; > ; \ - < "Juergen Schmidt" ; > ; \ - < "Ingo Schmidt-Rosbiegal" ; > ; \ - < "Dirk Voelzke" ; > ; \ - < "" ; > ; \ - < "" ; > ; \ - < "%PRODUCTNAME CALC" ; 8 ; > ; \ - < "" ; > ; \ - < "Stephan Schaefer" ; > ; \ - < "" ; > ; \ - < "Thomas Benisch" ; > ; \ - < "Daniel Boelzle" ; > ; \ - < "Berend Cornelius" ; > ; \ - < "Ingrid Halama" ; > ; \ - < "Bjoern Milcke" ; > ; \ - < "Niklas Nebel" ; > ; \ - < "Eike Rathke" ; > ; \ - < "Daniel Rentz" ; > ; \ - < "" ; > ; \ - < "" ; > ; \ - < "USER EXPERIENCE" ; 8 ; > ; \ - < "" ; > ; \ - < "Andreas Bartel" ; > ; \ - < "Bettina Haberer" ; > ; \ - < "Christian Jansen" ; > ; \ - < "Frank Loehmann" ; > ; \ - < "Elizabeth Matthis" ; > ; \ - < "" ; > ; \ - < "" ; > ; \ - < "QUALITY ASSURANCE & COORDINATION" ; 8 ; > ; \ - < "" ; > ; \ - < "Nils Fuhrmann" ; > ; \ - < "" ; > ; \ - < "" ; > ; \ - < "RELEASE ENGINEERING " ; 8 ; > ; \ - < "" ; > ; \ - < "Ruediger Timm" ; > ; \ - < "" ; > ; \ - < "Oliver Bolte" ; > ; \ - < "Vladimir Glazounov" ; > ; \ - < "Ivo Hinkelmann" ; > ; \ - < "Hans-Joachim Lankenau" ; > ; \ - < "Jens-Heiner Rechtien" ; > ; \ - < "Kurt Zenker" ; > ; \ - < "" ; > ; \ - < "DEVELOPMENT TOOLS" ; 8 ; > ; \ - < "" ; > ; \ - < "Joerg Jahnke" ; > ; \ - < "" ; > ; \ - < "Bernd Eilers" ; > ; \ - < "Gregor Hartmann" ; > ; \ - < "Frank Mau" ; > ; \ - < "Nikolai Pretzell" ; > ; \ - < "" ; > ; \ - < "QUALITY ASSURANCE" ; 8 ; > ; \ - < "" ; > ; \ - < "Thorsten Ziehm" ; > ; \ - < "" ; > ; \ - < "QA %PRODUCTNAME AUTOMATION" ; 8 ; > ; \ - < "" ; > ; \ - < "Thorsten Bosbach" ; > ; \ - < "Helge Delfs" ; > ; \ - < "Joerg Sievers" ; > ; \ - < "" ; > ; \ - < "QA %PRODUCTNAME WRITER" ; 8 ; > ; \ - < "" ; > ; \ - < "Stefan Baltzer" ; > ; \ - < "Hasan Ilter" ; > ; \ - < "Michael Ruess" ; > ; \ - < "Eric Savary" ; > ; \ - < "Ulf Stroehler" ; > ; \ - < "" ; > ; \ - < "QA %PRODUCTNAME CALC" ; 8 ; > ; \ - < "" ; > ; \ - < "Oliver Craemer" ; > ; \ - < "Thomas Klarhoefer" ; > ; \ - < "Frank Stecher" ; > ; \ - < "" ; > ; \ - < "QA %PRODUCTNAME IMPRESS & BASE" ; 8 ; > ; \ - < "" ; > ; \ - < "Christoph Lukasiak" ; > ; \ - < "Marc Neumann" ; > ; \ - < "Wolfram Garten" ; > ; \ - < "Christian Guenther" ; > ; \ - < "" ; > ; \ - < "QA %PRODUCTNAME INFRASTRUCTURE" ; 8 ; > ; \ - < "" ; > ; \ - < "Olaf Felka" ; > ; \ - < "Thorsten Martens" ; > ; \ - < "Joerg W. Skottke" ; > ; \ - < "Andreas Treumann" ; > ; \ - < "" ; > ; \ - < "INFORMATION TECHNOLOGY" ; 8 ; > ; \ - < "" ; > ; \ - < "Dirk Marquardt" ; > ; \ - < "Gerd Weiss" ; > ; \ - < "" ; > ; \ - < "" ; > ; \ - < "MANUALS & ONLINE HELP" ; 8 ; > ; \ - < "" ; > ; \ - < "Frank Peters" ; > ; \ - < "" ; > ; \ - < "Clayton Cornell" ; > ; \ - < "Uwe Fischer" ; > ; \ - < "Martina Waller" ; > ; \ - < "" ; > ; \ - < "" ; > ; \ - < "GLOBALIZATION PROGRAM MANAGEMENT" ; 8 ; > ; \ - < "" ; > ; \ - < "Rafaella Braconi" ; > ; \ - < "" ; > ; \ - < "MARKETING & OPERATIONS" ; 8 ; > ; \ - < "" ; > ; \ - < "PRODUCT MANAGMENT" ; 8 ; > ; \ - < "" ; > ; \ - < "Goetz Wohlberg" ; > ; \ - < "Lutz Hoeger" ; > ; \ - < "" ; > ; \ - < "MARKETING" ; 8 ; > ; \ - < "" ; > ; \ - < "Rosana Ardila Biela" ; > ; \ - < "Kay Koll" ; > ; \ - < "Iyer Venkatesan" ; > ; \ - < "" ; > ; \ - < "OPERATIONS" ; 8 ; > ; \ - < "" ; > ; \ - < "Parker Proffitt" ; > ; \ - < "" ; > ; \ - < "SUN SIGMA BLACK BELT" ; 8 ; > ; \ - < "" ; > ; \ - < "Stefan Zimmermann" ; > ; \ - < "" ; > ; \ -};\ - -#define TEXT_DEFAULTABOUT \ - Text [ x-comment ] = "PB: ; PB: only %PRODUCTNAME"; \ - Text [ en-US ] = "About %PRODUCTNAME" ; \ - -// ******************************************************************* EOF - diff --git a/svx/source/intro/about_ooo.src b/svx/source/intro/about_ooo.src new file mode 100644 index 000000000000..b49a0ff927cf --- /dev/null +++ b/svx/source/intro/about_ooo.src @@ -0,0 +1,40 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include <svtools/svtools.hrc> +#include "about_ooo.hrc" + +String ABOUT_STR_COPYRIGHT +{ + Text[ en-US ] = "Copyright © 2000, 2010 Oracle and/or its affiliates. All rights reserved.\nThis product was created by %OOOVENDOR, based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at\n http://www.openoffice.org/welcome/credits.html."; +}; + +StringArray ABOUT_STR_DEVELOPER_ARY +{ + OOO_CONTRIBUTOR_LIST +}; + diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src deleted file mode 100644 index 7b9067662c7a..000000000000 --- a/svx/source/intro/iso.src +++ /dev/null @@ -1,226 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_IMAGEMGR_HRC -#include <svtools/imagemgr.hrc> -#endif - -#ifndef _SVTOOLS_HRC -#include <svtools/svtools.hrc> -#endif - -#include "intro.hrc" -String RID_APPTITLE -{ - Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION" ; -}; - -// der String wird fuer die Registrierung gebraucht: 01 Voll, 02 OEM, 03 Vobis -String STR_VERSION_TYPE -{ - Text = "01"; -}; - -// der String wird fuer die Registrierung gebraucht - hier steht die Version zweistellig! -String STR_VERSION_ID -{ - Text = "50"; -}; - -String RID_BUILDVERSION -{ - Text = UPDVER ; -}; - -ModalDialog RID_DEFAULTABOUT -{ - HelpID = "svx:ModalDialog:RID_DEFAULTABOUT"; - OutputSize = TRUE ; - Size = MAP_APPFONT ( 245 , 260 ) ; - Moveable = TRUE ; - SVLook = TRUE ; - TEXT_DEFAULTABOUT - OKButton ABOUT_BTN_OK - { - DefButton = TRUE ; - Pos = MAP_APPFONT ( 174 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - }; - FixedText ABOUT_FTXT_VERSION - { - Pos = MAP_APPFONT ( 54 , 6 ) ; - Size = MAP_APPFONT ( 118 , 16 ) ; - WordBreak = TRUE ; - Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ; - }; - MultiLineEdit ABOUT_FTXT_COPYRIGHT - { - HelpID = "svx:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT"; - Border = TRUE ; - Pos = MAP_APPFONT ( 54 , 25 ) ; - Size = MAP_APPFONT ( 168 , 51 ) ; - IgnoreTab = TRUE ; - ReadOnly = TRUE ; - AutoVScroll = TRUE ; - }; - String ABOUT_STR_COPYRIGHT - { - Text[ en-US ] = "Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.\n\nThis software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.\n\nThe information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.\n\nIf this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:\n\nU.S. GOVERNMENT RIGHTS\nPrograms, software, databases, and related documentation and technical data delivered to U.S. Government customers are \"commercial computer software\" or \"commercial technical data\" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.\n\nThis software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.\n\nOracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.\n\nThis software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.\n\nThis product is based on the OpenOffice.org project."; - }; - StringArray ABOUT_STR_DEVELOPER_ARY - { - DEVELOPER_LIST - }; - String ABOUT_STR_FRENCH_COPYRIGHT - { - Text = "Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.\n\nThis software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.\n\nThe information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.\n\nIf this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:\n\nU.S. GOVERNMENT RIGHTS\nPrograms, software, databases, and related documentation and technical data delivered to U.S. Government customers are ""commercial computer software"" or ""commercial technical data"" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.\n\nThis software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.\n\nOracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.\n\nThis software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.\n\nThis product is based on the OpenOffice.org project." ; - }; - String ABOUT_STR_ACCEL - { - Text = "SDT" ; - }; -}; - -#define MASK_COL MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } ; -#define IMGLST_IDLST \ - IdList = { \ - SID_GENERAL_OPTIONS; \ - SID_LANGUAGE_OPTIONS; \ - SID_INET_DLG; \ - SID_SW_EDITOPTIONS; \ - SID_SW_ONLINEOPTIONS; \ - SID_SC_EDITOPTIONS; \ - SID_SD_EDITOPTIONS; \ - SID_SD_GRAPHIC_OPTIONS; \ - SID_SM_EDITOPTIONS; \ - SID_SCH_EDITOPTIONS; \ - SID_SB_STARBASEOPTIONS; \ - SID_FILTER_DLG; \ - }; \ - IdCount = { \ - 12; \ - }; - -ImageList RID_IMGLIST_TREEOPT -{ - Prefix = "tr"; - MASK_COL - IMGLST_IDLST -}; -ImageList RID_IMGLIST_TREEOPT_HC -{ - Prefix = "trh"; - MASK_COL - IMGLST_IDLST -}; - -#define MASK_COL2 MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; } ; -#define X_IMAGE_LIST \ - IdList = { \ - IMG_IMPRESS ; \ - IMG_CALC ; \ - IMG_CALCTEMPLATE ; \ - IMG_CHART ; \ - IMG_IMPRESSTEMPLATE ; \ - IMG_HTML ; \ - IMG_MATH ; \ - IMG_WRITER ; \ - IMG_WRITERTEMPLATE ; \ - IMG_MACROLIB ; \ - IMG_GLOBAL_DOC ; \ - IMG_DRAW ; \ - IMG_DRAWTEMPLATE ; \ - IMG_NEWFROMTEMPLATE ; \ - IMG_DATABASE ; \ - }; \ - IdCount = { \ - 15; \ - }; - -ImageList RID_SVTOOLS_IMAGELIST_BIG -{ - Prefix = "lx"; - MASK_COL2 - X_IMAGE_LIST -}; - -ImageList RID_SVTOOLS_IMAGELIST_SMALL -{ - Prefix = "sx"; - MASK_COL2 - X_IMAGE_LIST -}; - -ImageList RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST -{ - Prefix = "lxh"; - MASK_COL2 - X_IMAGE_LIST -}; - -ImageList RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST -{ - Prefix = "sxh"; - MASK_COL2 - X_IMAGE_LIST -}; - -// ******************************************************************* EOF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svx/source/intro/makefile.mk b/svx/source/intro/makefile.mk deleted file mode 100644 index 4d0686baac04..000000000000 --- a/svx/source/intro/makefile.mk +++ /dev/null @@ -1,66 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$ - -PRJNAME=svx -TARGET=intro - -# --- Settings ------------------------------------------------------------ - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -RSCLOCINC!:=$(RSCLOCINC);$(PRJ)$/RES - -# --- Allgemein ----------------------------------------------------------- - -LOCALIZE_ME=intro_tmpl.hrc - -SRS1NAME= iso -SRC1FILES= \ - $(SRS1NAME).src - -RESLIB1NAME=$(SRS1NAME) -RESLIB1IMAGES=$(PRJ)$/res -RESLIB1SRSFILES= \ - $(SRS)$/$(SRS1NAME).srs - -# Version "OpenOffice.org" -SRS2NAME= ooo -SRC2FILES= \ - $(SRS2NAME).src - -RESLIB2NAME=$(SRS2NAME) -RESLIB2IMAGES=$(PRJ)$/res -RESLIB2SRSFILES= \ - $(SRS)$/$(SRS2NAME).srs - -.INCLUDE : target.mk - -$(SRS)$/iso.srs: $(INCCOM)$/intro.hrc -$(SRS)$/ooo.srs: $(INCCOM)$/intro.hrc - diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src deleted file mode 100644 index 7f6f0ed6ff47..000000000000 --- a/svx/source/intro/ooo.src +++ /dev/null @@ -1,196 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_HRC -#include <svtools/svtools.hrc> -#endif - -#ifndef _SVTOOLS_IMAGEMGR_HRC -#include <svtools/imagemgr.hrc> -#endif - -#ifndef _SFX_HRC -#include <sfx2/sfx.hrc> -#endif - -#include <svx/svxids.hrc> -#include "intro.hrc" - -String RID_APPTITLE -{ - Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION" ; -}; - -// der String wird fuer die Registrierung gebraucht: 01 Voll, 02 OEM, 03 Vobis -String STR_VERSION_TYPE -{ - Text = "01"; -}; - -// der String wird fuer die Registrierung gebraucht - hier steht die Version zweistellig! -String STR_VERSION_ID -{ - Text = "50"; -}; - -String RID_BUILDVERSION -{ - Text = UPDVER ; -}; - -ModalDialog RID_DEFAULTABOUT -{ - HelpID = "svx:ModalDialog:RID_DEFAULTABOUT"; - OutputSize = TRUE ; - Size = MAP_APPFONT ( 245 , 260 ) ; - Moveable = TRUE ; - SVLook = TRUE ; - TEXT_DEFAULTABOUT - OKButton ABOUT_BTN_OK - { - DefButton = TRUE ; - Pos = MAP_APPFONT ( 174 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - }; - FixedText ABOUT_FTXT_VERSION - { - Pos = MAP_APPFONT ( 54 , 6 ) ; - Size = MAP_APPFONT ( 118 , 16 ) ; - WordBreak = TRUE ; - Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ; - }; - MultiLineEdit ABOUT_FTXT_COPYRIGHT - { - HelpID = "svx:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT"; - Border = TRUE ; - Pos = MAP_APPFONT ( 54 , 25 ) ; - Size = MAP_APPFONT ( 168 , 51 ) ; - IgnoreTab = TRUE ; - ReadOnly = TRUE ; - AutoVScroll = TRUE ; - }; - String ABOUT_STR_COPYRIGHT - { - Text[ en-US ] = "Copyright © 2000, 2010 Oracle and/or its affiliates. All rights reserved.\nThis product was created by %OOOVENDOR, based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at\n http://www.openoffice.org/welcome/credits.html."; - }; - StringArray ABOUT_STR_DEVELOPER_ARY - { - OOO_CONTRIBUTOR_LIST - }; - String ABOUT_STR_ACCEL - { - Text = "SDT" ; - }; -}; - -// imagelist with images of the "New" menu and the file open dialog - -#define MASK_COL2 MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; } ; -#define X_IMAGE_LIST \ - IdList = { \ - IMG_IMPRESS ; \ - IMG_CALC ; \ - IMG_CALCTEMPLATE ; \ - IMG_CHART ; \ - IMG_IMPRESSTEMPLATE ; \ - IMG_HTML ; \ - IMG_MATH ; \ - IMG_WRITER ; \ - IMG_WRITERTEMPLATE ; \ - IMG_MACROLIB ; \ - IMG_GLOBAL_DOC ; \ - IMG_DRAW ; \ - IMG_DRAWTEMPLATE ; \ - IMG_NEWFROMTEMPLATE ; \ - IMG_DATABASE; \ - }; \ - IdCount = { \ - 15; \ - }; - -ImageList RID_SVTOOLS_IMAGELIST_BIG -{ - Prefix = "lx"; - MASK_COL2 - X_IMAGE_LIST -}; - -ImageList RID_SVTOOLS_IMAGELIST_SMALL -{ - Prefix = "sx"; - MASK_COL2 - X_IMAGE_LIST -}; - -ImageList RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST -{ - Prefix = "lxh"; - MASK_COL2 - X_IMAGE_LIST -}; - -ImageList RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST -{ - Prefix = "sxh"; - MASK_COL2 - X_IMAGE_LIST -}; - -#define MASK_COL MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } ; -#define IMGLST_IDLST \ - IdList = { \ - SID_GENERAL_OPTIONS; \ - SID_LANGUAGE_OPTIONS; \ - SID_INET_DLG; \ - SID_SW_EDITOPTIONS; \ - SID_SW_ONLINEOPTIONS; \ - SID_SC_EDITOPTIONS; \ - SID_SD_EDITOPTIONS; \ - SID_SD_GRAPHIC_OPTIONS; \ - SID_SM_EDITOPTIONS; \ - SID_SCH_EDITOPTIONS; \ - SID_SB_STARBASEOPTIONS; \ - SID_FILTER_DLG; \ - }; \ - IdCount = { \ - 12; \ - }; - -ImageList RID_IMGLIST_TREEOPT -{ - Prefix = "tr"; - MASK_COL - IMGLST_IDLST -}; - -ImageList RID_IMGLIST_TREEOPT_HC -{ - Prefix = "trh"; - MASK_COL - IMGLST_IDLST -}; - diff --git a/svx/source/items/makefile.mk b/svx/source/items/makefile.mk deleted file mode 100644 index 188e6171bd26..000000000000 --- a/svx/source/items/makefile.mk +++ /dev/null @@ -1,83 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PROJECTPCH4DLL=TRUE -PROJECTPCH=svxpch -PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch -#ENABLE_EXCEPTIONS=TRUE - -PRJNAME=svx -TARGET=items -LIBTARGET=NO - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SRS1NAME=svxitems -SRC1FILES = \ - svxerr.src \ - svxitems.src - -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/drawitem.obj \ - $(SLO)$/chrtitem.obj \ - $(SLO)$/e3ditem.obj \ - $(SLO)$/grfitem.obj \ - $(SLO)$/clipfmtitem.obj \ - $(SLO)$/customshapeitem.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/ofaitem.obj \ - $(SLO)$/postattr.obj \ - $(SLO)$/hlnkitem.obj \ - $(SLO)$/pageitem.obj \ - $(SLO)$/viewlayoutitem.obj \ - $(SLO)$/algitem.obj \ - $(SLO)$/rotmodit.obj \ - $(SLO)$/numinf.obj \ - $(SLO)$/svxerr.obj \ - $(SLO)$/numfmtsh.obj \ - $(SLO)$/zoomitem.obj \ - $(SLO)$/svxempty.obj \ - $(SLO)$/SmartTagItem.obj \ - $(SLO)$/zoomslideritem.obj \ - -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - -EXCEPTIONSFILES= \ - $(SLO)$/customshapeitem.obj - -.INCLUDE : target.mk - diff --git a/svx/source/mnuctrls/makefile.mk b/svx/source/mnuctrls/makefile.mk deleted file mode 100644 index 31c8e532143f..000000000000 --- a/svx/source/mnuctrls/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PROJECTPCH4DLL=TRUE -PROJECTPCH=svxpch -PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch - -ENABLE_EXCEPTIONS=TRUE - -PRJNAME=svx -TARGET=mnuctrls - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - mnuctrls.src - -SLOFILES= \ - $(SLO)$/clipboardctl.obj \ - $(SLO)$/fntctl.obj \ - $(SLO)$/fntszctl.obj \ - $(SLO)$/SmartTagCtl.obj - -HXX1TARGET=mnuctrls -HXX1EXT= hxx -HXX1EXCL= -E:*include* -HXX1DEPN=\ - $(INC)$/svx/clipboardctl.hxx \ - $(INC)$/fntctl.hxx \ - $(INC)$/fntszctl.hxx \ - $(INC)$/SmartTagCtl.hxx - -EXCEPTIONSFILES= \ - $(SLO)$/SmartTagCtl.obj - - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/svx/source/sdr/attribute/makefile.mk b/svx/source/sdr/attribute/makefile.mk deleted file mode 100644 index 177654ff1e1c..000000000000 --- a/svx/source/sdr/attribute/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=svx -TARGET=attribute -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/sdrfilltextattribute.obj \ - $(SLO)$/sdrlinefillshadowtextattribute.obj \ - $(SLO)$/sdrlineshadowtextattribute.obj \ - $(SLO)$/sdrshadowtextattribute.obj \ - $(SLO)$/sdrtextattribute.obj \ - $(SLO)$/sdrformtextattribute.obj \ - $(SLO)$/sdrformtextoutlineattribute.obj - -.INCLUDE : target.mk diff --git a/svx/source/sdr/contact/makefile.mk b/svx/source/sdr/contact/makefile.mk deleted file mode 100644 index 9e4356c4aa52..000000000000 --- a/svx/source/sdr/contact/makefile.mk +++ /dev/null @@ -1,92 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source - -PRJNAME=svx -TARGET=contact -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES=\ - $(SLO)$/viewobjectcontactofunocontrol.obj - -SLOFILES=\ - $(EXCEPTIONSFILES) \ - $(SLO)$/displayinfo.obj \ - $(SLO)$/viewcontact.obj \ - $(SLO)$/viewcontactofe3d.obj \ - $(SLO)$/viewcontactofsdrobj.obj \ - $(SLO)$/viewcontactofvirtobj.obj \ - $(SLO)$/viewcontactoftextobj.obj \ - $(SLO)$/viewcontactofsdrrectobj.obj \ - $(SLO)$/viewcontactofsdrpathobj.obj \ - $(SLO)$/viewcontactofsdrole2obj.obj \ - $(SLO)$/viewcontactofsdrcircobj.obj \ - $(SLO)$/viewcontactofsdrcaptionobj.obj \ - $(SLO)$/viewcontactofsdrmeasureobj.obj \ - $(SLO)$/viewcontactofsdredgeobj.obj \ - $(SLO)$/viewcontactofsdrpage.obj \ - $(SLO)$/viewcontactofmasterpagedescriptor.obj \ - $(SLO)$/viewcontactofgroup.obj \ - $(SLO)$/viewcontactofe3dscene.obj \ - $(SLO)$/viewcontactofe3dcube.obj \ - $(SLO)$/viewcontactofe3dextrude.obj \ - $(SLO)$/viewcontactofe3dlathe.obj \ - $(SLO)$/viewcontactofe3dsphere.obj \ - $(SLO)$/viewcontactofe3dpolygon.obj \ - $(SLO)$/viewcontactofpageobj.obj \ - $(SLO)$/viewcontactofgraphic.obj \ - $(SLO)$/viewcontactofsdrobjcustomshape.obj \ - $(SLO)$/viewcontactofsdrmediaobj.obj \ - $(SLO)$/viewcontactofunocontrol.obj \ - $(SLO)$/objectcontact.obj \ - $(SLO)$/objectcontacttools.obj \ - $(SLO)$/objectcontactofobjlistpainter.obj \ - $(SLO)$/objectcontactofpageview.obj \ - $(SLO)$/viewobjectcontact.obj \ - $(SLO)$/viewobjectcontactofe3d.obj \ - $(SLO)$/viewobjectcontactredirector.obj \ - $(SLO)$/viewobjectcontactofsdrmediaobj.obj \ - $(SLO)$/viewobjectcontactofgroup.obj \ - $(SLO)$/viewobjectcontactofe3dscene.obj \ - $(SLO)$/viewobjectcontactofsdrpage.obj \ - $(SLO)$/viewobjectcontactofsdrobj.obj \ - $(SLO)$/viewobjectcontactofpageobj.obj \ - $(SLO)$/viewobjectcontactofsdrole2obj.obj \ - $(SLO)$/viewobjectcontactofgraphic.obj \ - $(SLO)$/viewobjectcontactofmasterpagedescriptor.obj \ - $(SLO)$/sdrmediawindow.obj - -.INCLUDE : target.mk diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx index 485afe35f9c1..485afe35f9c1 100644..100755 --- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx diff --git a/svx/source/sdr/event/makefile.mk b/svx/source/sdr/event/makefile.mk deleted file mode 100644 index ff379af6be2a..000000000000 --- a/svx/source/sdr/event/makefile.mk +++ /dev/null @@ -1,44 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=svx -TARGET=event -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/eventhandler.obj - -.INCLUDE : target.mk diff --git a/svx/source/sdr/overlay/makefile.mk b/svx/source/sdr/overlay/makefile.mk deleted file mode 100644 index 155053826f0d..000000000000 --- a/svx/source/sdr/overlay/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJNAME=svx -TARGET=overlay -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/overlayanimatedbitmapex.obj \ - $(SLO)$/overlaybitmapex.obj \ - $(SLO)$/overlaycrosshair.obj \ - $(SLO)$/overlayhatchrect.obj \ - $(SLO)$/overlayhelpline.obj \ - $(SLO)$/overlayline.obj \ - $(SLO)$/overlaymanager.obj \ - $(SLO)$/overlaymanagerbuffered.obj \ - $(SLO)$/overlayobject.obj \ - $(SLO)$/overlayobjectcell.obj \ - $(SLO)$/overlayobjectlist.obj \ - $(SLO)$/overlaypolypolygon.obj \ - $(SLO)$/overlayprimitive2dsequenceobject.obj \ - $(SLO)$/overlayrollingrectangle.obj \ - $(SLO)$/overlayselection.obj \ - $(SLO)$/overlaytools.obj \ - $(SLO)$/overlaytriangle.obj - -.INCLUDE : target.mk diff --git a/svx/source/sdr/primitive2d/makefile.mk b/svx/source/sdr/primitive2d/makefile.mk deleted file mode 100644 index 078bc4bc977e..000000000000 --- a/svx/source/sdr/primitive2d/makefile.mk +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJNAME=svx -TARGET=primitive2d -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/primitivefactory2d.obj \ - $(SLO)$/sdrdecompositiontools.obj \ - $(SLO)$/sdrattributecreator.obj \ - $(SLO)$/sdrellipseprimitive2d.obj \ - $(SLO)$/sdrrectangleprimitive2d.obj \ - $(SLO)$/sdrcustomshapeprimitive2d.obj \ - $(SLO)$/sdrcaptionprimitive2d.obj \ - $(SLO)$/sdrgrafprimitive2d.obj \ - $(SLO)$/sdrole2primitive2d.obj \ - $(SLO)$/sdrolecontentprimitive2d.obj \ - $(SLO)$/sdrpathprimitive2d.obj \ - $(SLO)$/sdrprimitivetools.obj \ - $(SLO)$/sdrmeasureprimitive2d.obj \ - $(SLO)$/sdrconnectorprimitive2d.obj \ - $(SLO)$/sdrtextprimitive2d.obj - -.INCLUDE : target.mk diff --git a/svx/source/sdr/primitive3d/makefile.mk b/svx/source/sdr/primitive3d/makefile.mk deleted file mode 100644 index c845cadc90a4..000000000000 --- a/svx/source/sdr/primitive3d/makefile.mk +++ /dev/null @@ -1,42 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJNAME=svx -TARGET=primitive3d -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/sdrattributecreator3d.obj - -.INCLUDE : target.mk diff --git a/svx/source/sdr/properties/makefile.mk b/svx/source/sdr/properties/makefile.mk deleted file mode 100644 index 5296765769b1..000000000000 --- a/svx/source/sdr/properties/makefile.mk +++ /dev/null @@ -1,65 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=svx -TARGET=properties -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/properties.obj \ - $(SLO)$/emptyproperties.obj \ - $(SLO)$/pageproperties.obj \ - $(SLO)$/defaultproperties.obj \ - $(SLO)$/attributeproperties.obj \ - $(SLO)$/textproperties.obj \ - $(SLO)$/customshapeproperties.obj \ - $(SLO)$/rectangleproperties.obj \ - $(SLO)$/oleproperties.obj \ - $(SLO)$/captionproperties.obj \ - $(SLO)$/circleproperties.obj \ - $(SLO)$/connectorproperties.obj \ - $(SLO)$/e3dproperties.obj \ - $(SLO)$/e3dcompoundproperties.obj \ - $(SLO)$/e3dextrudeproperties.obj \ - $(SLO)$/e3dlatheproperties.obj \ - $(SLO)$/e3dsceneproperties.obj \ - $(SLO)$/e3dsphereproperties.obj \ - $(SLO)$/graphicproperties.obj \ - $(SLO)$/groupproperties.obj \ - $(SLO)$/measureproperties.obj \ - $(SLO)$/itemsettools.obj - -.INCLUDE : target.mk diff --git a/svx/source/smarttags/makefile.mk b/svx/source/smarttags/makefile.mk deleted file mode 100644 index e92a4c0a6b0a..000000000000 --- a/svx/source/smarttags/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=svx -TARGET=smarttags - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/SmartTagMgr.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - - diff --git a/svx/source/src/app.src b/svx/source/src/app.src index 934fbd76a86f..2fea800b4a00 100644 --- a/svx/source/src/app.src +++ b/svx/source/src/app.src @@ -29,6 +29,10 @@ #include "app.hrc" //---------------------------------------------------------------------------- +String RID_APPTITLE +{ + Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION" ; +}; #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; diff --git a/svx/source/src/makefile.mk b/svx/source/src/makefile.mk deleted file mode 100644 index c41b3e492e00..000000000000 --- a/svx/source/src/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - - -PRJ=..$/..$ - -PRJNAME=svx -TARGET=ofa - -# --- Settings ------------------------------------------------------------ - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -RES1FILELIST=\ - $(SRS)$/app.srs \ - $(SOLARCOMMONRESDIR)$/basic.srs - -RESLIB1NAME=$(TARGET) -RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/src -RESLIB1SRSFILES=$(RES1FILELIST) - -# --- Allgemein ----------------------------------------------------------- - -SRS1NAME= app -SRC1FILES= \ - app.src \ - errtxt.src - -.INCLUDE : target.mk - diff --git a/svx/source/stbctrls/makefile.mk b/svx/source/stbctrls/makefile.mk deleted file mode 100644 index 71c639cecdd3..000000000000 --- a/svx/source/stbctrls/makefile.mk +++ /dev/null @@ -1,75 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PROJECTPCH4DLL=TRUE -PROJECTPCH=svxpch -PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch - -PRJNAME=svx -TARGET=stbctrls -AUTOSEG=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - stbctrls.src - -SLOFILES= \ - $(SLO)$/insctrl.obj \ - $(SLO)$/zoomctrl.obj \ - $(SLO)$/pszctrl.obj \ - $(SLO)$/selctrl.obj \ - $(SLO)$/modctrl.obj \ - $(SLO)$/xmlsecctrl.obj \ - $(SLO)$/zoomsliderctrl.obj - -EXCEPTIONSFILES= \ - $(SLO)$/zoomsliderctrl.obj - -HXX1TARGET=stbctrls -HXX1EXT= hxx -HXX1EXCL= -E:*include* -HXX1DEPN=\ - $(INC)$/svx/insctrl.hxx \ - $(INC)$/svx/zoomctrl.hxx \ - $(INC)$/svx/pszctrl.hxx \ - $(INC)$/svx/selctrl.hxx \ - $(INC)$/svx/modctrl.hxx \ - $(INC)$/svx/xmlsecctrl.hxx \ - $(INC)$/zoomsliderctrl.hxx \ - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/svx/source/svdraw/makefile.mk b/svx/source/svdraw/makefile.mk deleted file mode 100644 index 514c5b6d2cbc..000000000000 --- a/svx/source/svdraw/makefile.mk +++ /dev/null @@ -1,124 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -TARGET=svdraw -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/svdxcgv.obj \ - $(SLO)$/svdmodel.obj \ - $(SLO)$/svdpage.obj \ - $(SLO)$/svdobj.obj \ - $(SLO)$/svdedtv1.obj \ - $(SLO)$/svdcrtv.obj \ - $(SLO)$/svdograf.obj \ - $(SLO)$/svdoole2.obj \ - $(SLO)$/svdhdl.obj \ - $(SLO)$/svdmrkv.obj \ - $(SLO)$/svdogrp.obj \ - $(SLO)$/svdotxln.obj \ - $(SLO)$/svdotextdecomposition.obj \ - $(SLO)$/svdotextpathdecomposition.obj \ - $(SLO)$/svdouno.obj \ - $(SLO)$/svdpagv.obj \ - $(SLO)$/svddrgmt.obj \ - $(SLO)$/svdpntv.obj \ - $(SLO)$/svdsnpv.obj \ - $(SLO)$/svdview.obj \ - $(SLO)$/svdtext.obj \ - $(SLO)$/svdoashp.obj \ - $(SLO)$/svdoattr.obj \ - $(SLO)$/svdotext.obj \ - $(SLO)$/svdotxat.obj \ - $(SLO)$/svdotxdr.obj \ - $(SLO)$/svdotxed.obj \ - $(SLO)$/svdotxfl.obj \ - $(SLO)$/svdotxtr.obj \ - $(SLO)$/svdorect.obj \ - $(SLO)$/svdoedge.obj \ - $(SLO)$/svdomeas.obj \ - $(SLO)$/svdopath.obj \ - $(SLO)$/svdocapt.obj \ - $(SLO)$/svdocirc.obj \ - $(SLO)$/svdopage.obj \ - $(SLO)$/svdoutl.obj \ - $(SLO)$/svdovirt.obj \ - $(SLO)$/svdoutlinercache.obj \ - $(SLO)$/gradtrns.obj \ - $(SLO)$/svdattr.obj \ - $(SLO)$/svddrag.obj \ - $(SLO)$/svddrgv.obj \ - $(SLO)$/svdedtv2.obj \ - $(SLO)$/svdedxv.obj \ - $(SLO)$/svdetc.obj \ - $(SLO)$/sdrhittesthelper.obj \ - $(SLO)$/svdfmtf.obj \ - $(SLO)$/svdglev.obj \ - $(SLO)$/svdglue.obj \ - $(SLO)$/svdhlpln.obj \ - $(SLO)$/svditer.obj \ - $(SLO)$/svdlayer.obj \ - $(SLO)$/svdmark.obj \ - $(SLO)$/svdmrkv1.obj \ - $(SLO)$/sdrcomment.obj \ - $(SLO)$/sdrmasterpagedescriptor.obj \ - $(SLO)$/sdrpagewindow.obj \ - $(SLO)$/sdrpaintwindow.obj \ - $(SLO)$/svdpoev.obj \ - $(SLO)$/svdtrans.obj \ - $(SLO)$/svdundo.obj \ - $(SLO)$/svdviter.obj \ - $(SLO)$/clonelist.obj \ - $(SLO)$/svdedtv.obj \ - $(SLO)$/selectioncontroller.obj \ - $(SLO)$/polypolygoneditor.obj \ - $(SLO)$/svdibrow.obj \ - $(SLO)$/svdomedia.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/ActionDescriptionProvider.obj \ - $(SLO)$/impgrfll.obj - -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - -SRS1NAME=svdstr -SRC1FILES= svdstr.src - -.INCLUDE : target.mk diff --git a/svx/source/table/makefile.mk b/svx/source/table/makefile.mk deleted file mode 100644 index 1eaaef12aa02..000000000000 --- a/svx/source/table/makefile.mk +++ /dev/null @@ -1,80 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PROJECTPCH4DLL=TRUE -PROJECTPCH=svxpch -PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch - -PRJNAME=svx -TARGET=table -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE; - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/propertyset.obj\ - $(SLO)$/cell.obj\ - $(SLO)$/cellrange.obj\ - $(SLO)$/cellcursor.obj\ - $(SLO)$/tablerow.obj\ - $(SLO)$/tablerows.obj\ - $(SLO)$/tablecolumn.obj\ - $(SLO)$/tablecolumns.obj\ - $(SLO)$/tablemodel.obj\ - $(SLO)$/svdotable.obj\ - $(SLO)$/viewcontactoftableobj.obj\ - $(SLO)$/tablelayouter.obj\ - $(SLO)$/tablehandles.obj\ - $(SLO)$/tablecontroller.obj\ - $(SLO)$/tableundo.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/celleditsource.obj \ - $(SLO)$/tabledesign.obj \ - $(SLO)$/accessibletableshape.obj \ - $(SLO)$/accessiblecell.obj \ - $(SLO)$/tablertfexporter.obj \ - $(SLO)$/tablertfimporter.obj - -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - -SRS1NAME=table -SRC1FILES= table.src - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/svx/source/tbxctrls/makefile.mk b/svx/source/tbxctrls/makefile.mk deleted file mode 100644 index 351ed4f162ef..000000000000 --- a/svx/source/tbxctrls/makefile.mk +++ /dev/null @@ -1,83 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -TARGET=tbxctrls -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/fontworkgallery.obj\ - $(SLO)$/extrusioncontrols.obj \ - $(SLO)$/tbcontrl.obj \ - $(SLO)$/tbxcolorupdate.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/formatpaintbrushctrl.obj\ - $(SLO)$/colrctrl.obj \ - $(SLO)$/fillctrl.obj \ - $(SLO)$/grafctrl.obj \ - $(SLO)$/itemwin.obj \ - $(SLO)$/layctrl.obj \ - $(SLO)$/lboxctrl.obj \ - $(SLO)$/linectrl.obj \ - $(SLO)$/tbxalign.obj \ - $(SLO)$/tbxdrctl.obj \ - $(SLO)$/verttexttbxctrl.obj \ - $(SLO)$/subtoolboxcontrol.obj \ - $(SLO)$/tbxcolor.obj \ - $(SLO)$/tbunocontroller.obj \ - $(SLO)$/tbunosearchcontrollers.obj - -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - -SRS1NAME=$(TARGET) -SRC1FILES = \ - fontworkgallery.src \ - extrusioncontrols.src \ - colrctrl.src \ - lboxctrl.src \ - linectrl.src \ - tbcontrl.src \ - tbunosearchcontrollers.src \ - grafctrl.src - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/svx/source/toolbars/makefile.mk b/svx/source/toolbars/makefile.mk deleted file mode 100644 index 40c7f2ccb73e..000000000000 --- a/svx/source/toolbars/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PROJECTPCH4DLL=TRUE -PROJECTPCH=svxpch -PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch - -PRJNAME=svx -TARGET=toolbars -ENABLE_EXCEPTIONS=TRUE; - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SRS1NAME=toolbars -SRC1FILES = \ - extrusionbar.src \ - fontworkbar.src - -SLOFILES= \ - $(SLO)$/extrusionbar.obj \ - $(SLO)$/fontworkbar.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/svx/source/unodialogs/inc/buttongroup.hrc b/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc index b99403b57e1f..b99403b57e1f 100644 --- a/svx/source/unodialogs/inc/buttongroup.hrc +++ b/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src new file mode 100644 index 000000000000..9c94496a1747 --- /dev/null +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src @@ -0,0 +1,293 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "chinese_dictionarydialog.hrc" +#include "chinese_translationdialog.hrc" + +#include <svtools/controldims.hrc> + +#define DIRECTION_RADIOBUTTONS( D_XPOS, D_YPOS, D_FULLWIDTH ) \ +RadioButton RB_TO_SIMPLIFIED \ +{ \ + Pos = MAP_APPFONT( D_XPOS, D_YPOS ); \ + Size = MAP_APPFONT ( D_FULLWIDTH, RSC_CD_RADIOBUTTON_HEIGHT ) ; \ + Text [ en-US ] = "~Traditional Chinese to simplified Chinese"; \ +}; \ +RadioButton RB_TO_TRADITIONAL \ +{ \ + Pos = MAP_APPFONT( D_XPOS, D_YPOS + RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y ); \ + Size = MAP_APPFONT ( D_FULLWIDTH, RSC_CD_RADIOBUTTON_HEIGHT ) ; \ + Text [ en-US ] = "~Simplified Chinese to traditional Chinese"; \ +}; + +//----------------------------------------------------------------------------- +//defines for positions and sizes: + +#define FULL_WIDTH (245) +#define FULL_HEIGHT (165) + +#define ROW_1 (RSC_SP_DLG_INNERBORDER_TOP) +#define ROW_2 (ROW_1+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y) +#define ROW_3 (ROW_2+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y) +#define ROW_4 (ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_GROUP_Y) +#define ROW_5 (ROW_4+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y) +#define ROW_6 (ROW_5+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_CTRL_DESC_Y) + +#define ROW_5a (ROW_5+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y) +#define ROW_5b (ROW_5a+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y) + +#define ROW_8 (FULL_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM-RSC_CD_PUSHBUTTON_HEIGHT) +#define ROW_7 (ROW_8-RSC_CD_FIXEDLINE_HEIGHT-2) + +#define LIST_HEIGHT (ROW_7-RSC_SP_CTRL_Y-ROW_6) + +#define COL_WIDTH 60 +#define BUTTONCOL_WIDTH 40 +#define COL_1 (RSC_SP_DLG_INNERBORDER_LEFT+RSC_SP_FLGR_SPACE_X) +#define COL_2 (COL_1+COL_WIDTH+1) +#define COL_3 (COL_2+COL_WIDTH+1) +#define COL_4 (FULL_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-BUTTONCOL_WIDTH) + +#define REST_COL_WIDTH (COL_4-COL_3-RSC_SP_CTRL_GROUP_X) + +//----------------------------------------------------------------------------- + +ModalDialog DLG_CHINESEDICTIONARY +{ + HelpID = "svx:ModalDialog:DLG_CHINESEDICTIONARY"; + //HelpId = ; + Size = MAP_APPFONT( FULL_WIDTH, FULL_HEIGHT ); + OutputSize = TRUE; + Closeable = TRUE ; + Moveable = TRUE ; + SVLook = TRUE; + + Text [ en-US ] = "Edit Dictionary"; + + DIRECTION_RADIOBUTTONS( COL_1, ROW_1, FULL_WIDTH - COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT ) + + CheckBox CB_REVERSE + { + HelpID = "svx:CheckBox:DLG_CHINESEDICTIONARY:CB_REVERSE"; + Pos = MAP_APPFONT ( COL_1, ROW_3 ) ; + Size = MAP_APPFONT ( FULL_WIDTH - COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT , RSC_CD_CHECKBOX_HEIGHT ) ; + + Text [ en-US ] = "Reverse mapping"; + }; + + FixedText FT_TERM + { + Pos = MAP_APPFONT ( COL_1 , ROW_4 ) ; + Size = MAP_APPFONT ( COL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ; + Text [ en-US ] = "Term"; + }; + Edit ED_TERM + { + HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_TERM"; + Border = TRUE ; + Pos = MAP_APPFONT ( COL_1 , ROW_5 ) ; + Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; + }; + + + FixedText FT_MAPPING + { + Pos = MAP_APPFONT ( COL_2 , ROW_4 ) ; + Size = MAP_APPFONT ( COL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ; + Text [ en-US ] = "Mapping"; + }; + Edit ED_MAPPING + { + HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_MAPPING"; + Border = TRUE ; + Pos = MAP_APPFONT ( COL_2 , ROW_5 ) ; + Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; + }; + + FixedText FT_PROPERTY + { + Pos = MAP_APPFONT ( COL_3 , ROW_4 ) ; + Size = MAP_APPFONT ( REST_COL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ; + Text [ en-US ] = "Property"; + }; + ListBox LB_PROPERTY + { + HelpID = "svx:ListBox:DLG_CHINESEDICTIONARY:LB_PROPERTY"; + Border = TRUE ; + Pos = MAP_APPFONT ( COL_3 , ROW_5 ) ; + Size = MAP_APPFONT ( REST_COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; + DropDown = TRUE ; + + stringlist [ en-US ] = + { + < "Other" ; Default ; > ; + < "Foreign" ; > ; + < "First name" ; > ; + < "Last name" ; > ; + < "Title" ; > ; + < "Status" ; > ; + < "Place name" ; > ; + < "Business" ; > ; + < "Adjective" ; > ; + < "Idiom" ; > ; + < "Abbreviation" ; > ; + < "Numerical" ; > ; + < "Noun" ; > ; + < "Verb" ; > ; + < "Brand name" ; > ; + }; + }; + + Control CT_MAPPINGLIST + { + Pos = MAP_APPFONT ( COL_1, ROW_6 ) ; + Size = MAP_APPFONT ( COL_4 - COL_1 - RSC_SP_CTRL_GROUP_X, LIST_HEIGHT ) ; + TabStop = TRUE ; + }; + + PushButton PB_ADD + { + HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_ADD"; + Pos = MAP_APPFONT( COL_4, ROW_5 ); + Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); + + Text [ en-US ] = "~Add"; + }; + PushButton PB_MODIFY + { + HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_MODIFY"; + Pos = MAP_APPFONT( COL_4, ROW_5a ); + Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); + + Text [ en-US ] = "~Modify"; + }; + PushButton PB_DELETE + { + HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_DELETE"; + Pos = MAP_APPFONT( COL_4, ROW_5b ); + Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); + + Text [ en-US ] = "~Delete"; + }; + + FixedLine FL_BOTTOMLINE + { + Pos = MAP_APPFONT ( 0 , ROW_7 ) ; + Size = MAP_APPFONT ( FULL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ; + }; + + BUTTONS_OK_CANCEL_HELP_ABREAST( FULL_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT, ROW_8 ) +}; + +//----------------------------------------------------------------------------- +//defines for positions and sizes: + +#define T_FULL_WIDTH (220) +#define T_FULL_HEIGHT (120) +#define T_EDITBUTTON_WIDTH (75) + +#define T_COL_1 (RSC_SP_DLG_INNERBORDER_LEFT) +#define T_COL_2 (T_COL_1+RSC_SP_FLGR_SPACE_X) +#define T_COL_3 (T_COL_2+RSC_SP_CHK_TEXTINDENT) +#define T_COL_4 (T_FULL_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-T_EDITBUTTON_WIDTH) + +#define T_ROW_1 (RSC_SP_DLG_INNERBORDER_TOP) +#define T_ROW_2 (T_ROW_1+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_GROUP_Y) +#define T_ROW_3 (T_ROW_2+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y) +#define T_ROW_4 (T_ROW_3+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y) +#define T_ROW_5 (T_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y) +#define T_ROW_6 (T_ROW_5+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_GROUP_Y) + +#define T_ROW_8 (T_FULL_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM-RSC_CD_PUSHBUTTON_HEIGHT) +#define T_ROW_7 (T_ROW_8-RSC_CD_FIXEDLINE_HEIGHT-2) + +//----------------------------------------------------------------------------- + +ModalDialog DLG_CHINESETRANSLATION +{ + HelpID = "svx:ModalDialog:DLG_CHINESETRANSLATION"; + //HelpId = ; + Size = MAP_APPFONT( T_FULL_WIDTH, T_FULL_HEIGHT ); + OutputSize = TRUE; + Closeable = TRUE ; + Moveable = TRUE ; + SVLook = TRUE; + + Text [ en-US ] = "Chinese Conversion"; + + FixedLine FL_DIRECTION + { + Pos = MAP_APPFONT ( T_COL_1 , T_ROW_1 ) ; + Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ; + Text [ en-US ] = "Conversion direction"; + }; + + DIRECTION_RADIOBUTTONS( T_COL_2, T_ROW_2, (T_FULL_WIDTH - T_COL_2 - RSC_SP_DLG_INNERBORDER_RIGHT) ) + + CheckBox CB_USE_VARIANTS + { + HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_USE_VARIANTS"; + Pos = MAP_APPFONT( T_COL_3, T_ROW_4 ); + Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_3 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT ) ; + + Text [ en-US ] = "~Use Taiwan, Hong Kong SAR, and Macao SAR character variants"; + }; + + FixedLine FL_COMMONTERMS + { + Pos = MAP_APPFONT ( T_COL_1 , T_ROW_5 ) ; + Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ; + Text [ en-US ] = "Common terms"; + }; + + CheckBox CB_TRANSLATE_COMMONTERMS + { + HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_TRANSLATE_COMMONTERMS"; + Pos = MAP_APPFONT( T_COL_2, T_ROW_6 ); + Size = MAP_APPFONT ( T_COL_4 - T_COL_2, RSC_CD_CHECKBOX_HEIGHT ) ; + + Text [ en-US ] = "Translate ~common terms"; + }; + + PushButton PB_EDITTERMS + { + HelpID = "svx:PushButton:DLG_CHINESETRANSLATION:PB_EDITTERMS"; + Pos = MAP_APPFONT( T_COL_4, T_ROW_6-(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_CHECKBOX_HEIGHT)/2 ); + Size = MAP_APPFONT( T_EDITBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); + + Text [ en-US ] = "~Edit Terms..."; + }; + + FixedLine T_FL_BOTTOMLINE + { + Pos = MAP_APPFONT ( 0 , T_ROW_7 ) ; + Size = MAP_APPFONT ( T_FULL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ; + }; + + BUTTONS_OK_CANCEL_HELP_ABREAST( T_FULL_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT, T_ROW_8 ) +}; + diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index 213ddc22bace..7888884b6d78 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -64,7 +64,7 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent ) , m_aFL_Commonterms( this, TextConversionDlgs_ResId( FL_COMMONTERMS ) ) , m_aCB_Translate_Commonterms( this, TextConversionDlgs_ResId( CB_TRANSLATE_COMMONTERMS ) ) , m_aPB_Editterms( this, TextConversionDlgs_ResId( PB_EDITTERMS ) ) - , m_aFL_Bottomline( this, TextConversionDlgs_ResId( FL_BOTTOMLINE ) ) + , m_aFL_Bottomline( this, TextConversionDlgs_ResId( T_FL_BOTTOMLINE ) ) , m_aBP_OK( this, TextConversionDlgs_ResId( PB_OK ) ) , m_aBP_Cancel( this, TextConversionDlgs_ResId( PB_CANCEL ) ) , m_aBP_Help( this, TextConversionDlgs_ResId( PB_HELP ) ) diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc index 5e593ef467a3..f7607cf087dd 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc @@ -35,10 +35,9 @@ #define CB_USE_VARIANTS 1 #define CB_TRANSLATE_COMMONTERMS 2 -#define CB_REVERSE 3 #define FL_DIRECTION 1 #define FL_COMMONTERMS 2 -#define FL_BOTTOMLINE 3 +#define T_FL_BOTTOMLINE 3 #endif diff --git a/svx/source/unodialogs/textconversiondlgs/makefile.mk b/svx/source/unodialogs/textconversiondlgs/makefile.mk deleted file mode 100644 index ec0cdca2620e..000000000000 --- a/svx/source/unodialogs/textconversiondlgs/makefile.mk +++ /dev/null @@ -1,98 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=svx -TARGET=textconversiondlgs -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE - -LOCALIZE_ME=chinese_direction_tmpl.hrc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/services.obj\ - $(SLO)$/resid.obj\ - $(SLO)$/chinese_dictionarydialog.obj\ - $(SLO)$/chinese_translationdialog.obj\ - $(SLO)$/chinese_translation_unodialog.obj - -SRS1NAME=$(TARGET) -SRC1FILES= \ - chinese_translationdialog.src\ - chinese_dictionarydialog.src - -RESLIB1NAME=$(TARGET) -RESLIB1SRSFILES= $(SRS)$/$(TARGET).srs - -.IF "$(GUI)" == "OS2" -SHL1TARGET= txcnvdlg -.ELSE -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -.ENDIF -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(SALLIB) \ - $(CPPUHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(COMPHELPERLIB) \ - $(TOOLSLIB) \ - $(TKLIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(VCLLIB) - -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1IMPLIB= i$(TARGET) -SHL1DEPN= $(SHL1LIBS) -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) - - -# --- Targets ------------------------------------------------------ -.INCLUDE : target.mk - -$(SRS)$/$(TARGET).srs: $(INCCOM)$/chinese_direction.hrc -$(SLO)$/chinese_dictionarydialog.obj: $(INCCOM)$/chinese_direction.hrc -$(SLO)$/chinese_translationdialog.obj: $(INCCOM)$/chinese_direction.hrc - - -ALLTAR : $(MISC)/textconversiondlgs.component - -$(MISC)/textconversiondlgs.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt textconversiondlgs.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt textconversiondlgs.component diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx index 02d18cef9c45..e0e8a8effb7f 100644 --- a/svx/source/unodialogs/textconversiondlgs/services.cxx +++ b/svx/source/unodialogs/textconversiondlgs/services.cxx @@ -47,13 +47,13 @@ static struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetranslatio extern "C" { //================================================================================================== -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/svx/source/unodraw/makefile.mk b/svx/source/unodraw/makefile.mk deleted file mode 100644 index 6815f28f4c79..000000000000 --- a/svx/source/unodraw/makefile.mk +++ /dev/null @@ -1,83 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -TARGET=unodraw -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/UnoGraphicExporter.obj \ - $(SLO)$/XPropertyTable.obj \ - $(SLO)$/UnoNameItemTable.obj \ - $(SLO)$/unoshape.obj \ - $(SLO)$/unoshap2.obj \ - $(SLO)$/unoshap3.obj \ - $(SLO)$/unoshap4.obj \ - $(SLO)$/unopage.obj \ - $(SLO)$/unoshtxt.obj \ - $(SLO)$/unoprov.obj \ - $(SLO)$/unomod.obj \ - $(SLO)$/unomlstr.obj \ - $(SLO)$/unogtabl.obj \ - $(SLO)$/unohtabl.obj \ - $(SLO)$/unobtabl.obj \ - $(SLO)$/unottabl.obj \ - $(SLO)$/unomtabl.obj \ - $(SLO)$/unodtabl.obj \ - $(SLO)$/gluepts.obj \ - $(SLO)$/tableshape.obj \ - $(SLO)$/shapepropertynotifier.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/UnoNamespaceMap.obj \ - $(SLO)$/unopool.obj \ - $(SLO)$/unoctabl.obj \ - $(SLO)$/unoshcol.obj \ - $(SLO)$/recoveryui.obj - -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - -SRS1NAME=unodraw -SRC1FILES = \ - unodraw.src - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/svx/source/unogallery/makefile.mk b/svx/source/unogallery/makefile.mk deleted file mode 100755 index 113bd70db0ee..000000000000 --- a/svx/source/unogallery/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -TARGET=unogallery -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/unogalthemeprovider.obj \ - $(SLO)$/unogaltheme.obj \ - $(SLO)$/unogalitem.obj - -# --- Target ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/svx/source/xml/makefile.mk b/svx/source/xml/makefile.mk deleted file mode 100644 index 02e6f3ae1f23..000000000000 --- a/svx/source/xml/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=svx -TARGET=xml - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- -SLOFILES = \ - $(SLO)$/xmlexport.obj \ - $(SLO)$/xmlxtimp.obj \ - $(SLO)$/xmlxtexp.obj \ - $(SLO)$/xmlgrhlp.obj \ - $(SLO)$/xmleohlp.obj - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/svx/source/xoutdev/makefile.mk b/svx/source/xoutdev/makefile.mk deleted file mode 100644 index 1ed48bc71f08..000000000000 --- a/svx/source/xoutdev/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -PROJECTPCH=xout -PROJECTPCHSOURCE=xoutpch -TARGET=xout -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/xattr.obj \ - $(SLO)$/xattr2.obj \ - $(SLO)$/xattrbmp.obj \ - $(SLO)$/xpool.obj \ - $(SLO)$/xtable.obj \ - $(SLO)$/xtabcolr.obj \ - $(SLO)$/xtablend.obj \ - $(SLO)$/xtabdash.obj \ - $(SLO)$/xtabhtch.obj \ - $(SLO)$/xtabgrdt.obj \ - $(SLO)$/xtabbtmp.obj \ - $(SLO)$/xexch.obj \ - $(SLO)$/_xpoly.obj \ - $(SLO)$/_xoutbmp.obj - -.INCLUDE : target.mk diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk deleted file mode 100644 index 277581a4a7a7..000000000000 --- a/svx/util/makefile.mk +++ /dev/null @@ -1,216 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=svx -TARGET=svx -GEN_HID=TRUE -GEN_HID_OTHER=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -RSCLOCINC+=-I$(PRJ)$/source$/svdraw - -HELPIDFILES= ..$/inc$/helpid.hrc - -# svxcore -SHL1TARGET= svxcore$(DLLPOSTFIX) -SHL1IMPLIB= isvxcore -SHL1USE_EXPORTS=name - -SHL1OBJS= \ - $(SLO)$/coreservices.obj - - -SHL1LIBS= \ - $(SLB)$/animation.lib \ - $(SLB)$/attribute.lib \ - $(SLB)$/contact.lib \ - $(SLB)$/customshapes-core.lib \ - $(SLB)$/dialogs-core.lib \ - $(SLB)$/engine3d-core.lib \ - $(SLB)$/event.lib \ - $(SLB)$/fmcomp-core.lib \ - $(SLB)$/form-core.lib \ - $(SLB)$/gal.lib \ - $(SLB)$/items-core.lib \ - $(SLB)$/overlay.lib \ - $(SLB)$/primitive2d.lib \ - $(SLB)$/primitive3d.lib \ - $(SLB)$/properties.lib \ - $(SLB)$/svdraw-core.lib \ - $(SLB)$/table-core.lib \ - $(SLB)$/tbxctrls-core.lib \ - $(SLB)$/toolbars.lib \ - $(SLB)$/unodraw-core.lib \ - $(SLB)$/xml.lib \ - $(SLB)$/xout.lib - - -SHL1STDLIBS= \ - $(AVMEDIALIB) \ - $(BASEGFXLIB) \ - $(BASICLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(DRAWINGLAYERLIB) \ - $(EDITENGLIB) \ - $(FWELIB) \ - $(GOODIESLIB) \ - $(I18NISOLANGLIB) \ - $(I18NPAPERLIB) \ - $(ICUUCLIB) \ - $(LNGLIB) \ - $(SALLIB) \ - $(SFX2LIB) \ - $(SOTLIB) \ - $(SVLLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(TOOLSLIB) \ - $(UCBHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(VCLLIB) \ - $(VOSLIB) \ - $(XMLOFFLIB) \ - - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) -DEFLIB1NAME=$(SHL1LIBS:b) - -# svx -SHL2TARGET= svx$(DLLPOSTFIX) -SHL2IMPLIB= i$(TARGET) -SHL2USE_EXPORTS=name -SHL2DEPN=$(SHL1TARGETN) - -SHL2LIBS= \ - $(SLB)$/svdraw.lib \ - $(SLB)$/form.lib \ - $(SLB)$/items.lib \ - $(SLB)$/dialogs.lib \ - $(SLB)$/mnuctrls.lib \ - $(SLB)$/stbctrls.lib \ - $(SLB)$/tbxctrls.lib \ - $(SLB)$/smarttags.lib \ - $(SLB)$/unodraw.lib \ - $(SLB)$/unogallery.lib\ - $(SLB)$/accessibility.lib \ - $(SLB)$/customshapes.lib \ - $(SLB)$/fmcomp.lib \ - $(SLB)$/engine3d.lib \ - $(SLB)$/table.lib - -.IF "(GUIBASE)" == "WIN" -SHL2LIBS+=$(SLB)$/ibrwimp.lib -.ENDIF # (WIN) - -SHL2STDLIBS= \ - $(BASEGFXLIB) \ - $(BASICLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(DRAWINGLAYERLIB) \ - $(EDITENGLIB) \ - $(GOODIESLIB) \ - $(I18NISOLANGLIB) \ - $(ICUUCLIB) \ - $(SALLIB) \ - $(SFX2LIB) \ - $(SOTLIB) \ - $(SVLLIB) \ - $(SVTOOLLIB) \ - $(SVXCORELIB) \ - $(TKLIB) \ - $(TOOLSLIB) \ - $(UCBHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(VCLLIB) \ - $(VOSLIB) \ - $(XMLOFFLIB) \ - $(XMLSCRIPTLIB) \ - - -.IF "$(GUI)"=="WNT" -SHL2STDLIBS+=$(SHELLLIB) -.ENDIF # WNT - -SHL2DEF= $(MISC)$/$(SHL2TARGET).def -DEF2NAME= $(SHL2TARGET) -DEFLIB2NAME=$(SHL2LIBS:b) - -.IF "$(debug)$(dbgutil)"!="" -SHL2STDLIBS += $(CPPUHELPERLIB) -.ENDIF # "$(debug)$(dbgutil)"!="" - -# ------------------------------------------------------------------------------ - -# Resource files -SRSFILELIST=\ - $(SRS)$/svdstr.srs \ - $(SRS)$/dialogs.srs \ - $(SRS)$/drawdlgs.srs \ - $(SRS)$/mnuctrls.srs \ - $(SRS)$/stbctrls.srs \ - $(SRS)$/tbxctrls.srs \ - $(SRS)$/svxitems.srs \ - $(SRS)$/form.srs \ - $(SRS)$/fmcomp.srs \ - $(SRS)$/engine3d.srs \ - $(SRS)$/unodraw.srs \ - $(SRS)$/accessibility.srs \ - $(SRS)$/table.srs \ - $(SRS)$/toolbars.srs - -RESLIB1NAME=svx -RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw -RESLIB1SRSFILES= $(SRSFILELIST) - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/svx.component $(MISC)/svxcore.component - -$(MISC)/svx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - svx.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt svx.component - -$(MISC)/svxcore.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - svxcore.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt svxcore.component diff --git a/svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component b/svx/util/textconversiondlgs.component index 184743583645..184743583645 100644 --- a/svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component +++ b/svx/util/textconversiondlgs.component diff --git a/sysui/desktop/icons/so7-base-doc.ico b/sysui/desktop/icons/so7-base-doc.ico Binary files differindex e4beab7270e1..e4beab7270e1 100644..100755 --- a/sysui/desktop/icons/so7-base-doc.ico +++ b/sysui/desktop/icons/so7-base-doc.ico diff --git a/sysui/desktop/icons/so7-calc-doc.ico b/sysui/desktop/icons/so7-calc-doc.ico Binary files differindex 8b34fc606c5d..8b34fc606c5d 100644..100755 --- a/sysui/desktop/icons/so7-calc-doc.ico +++ b/sysui/desktop/icons/so7-calc-doc.ico diff --git a/sysui/desktop/icons/so7-calc-tem.ico b/sysui/desktop/icons/so7-calc-tem.ico Binary files differindex d074a214a90b..d074a214a90b 100644..100755 --- a/sysui/desktop/icons/so7-calc-tem.ico +++ b/sysui/desktop/icons/so7-calc-tem.ico diff --git a/sysui/desktop/icons/so7-chart-doc.ico b/sysui/desktop/icons/so7-chart-doc.ico Binary files differindex bdc613fb30e2..bdc613fb30e2 100644..100755 --- a/sysui/desktop/icons/so7-chart-doc.ico +++ b/sysui/desktop/icons/so7-chart-doc.ico diff --git a/sysui/desktop/icons/so7-draw-doc.ico b/sysui/desktop/icons/so7-draw-doc.ico Binary files differindex c2881862053a..c2881862053a 100644..100755 --- a/sysui/desktop/icons/so7-draw-doc.ico +++ b/sysui/desktop/icons/so7-draw-doc.ico diff --git a/sysui/desktop/icons/so7-draw-tem.ico b/sysui/desktop/icons/so7-draw-tem.ico Binary files differindex 8d713d0f470e..8d713d0f470e 100644..100755 --- a/sysui/desktop/icons/so7-draw-tem.ico +++ b/sysui/desktop/icons/so7-draw-tem.ico diff --git a/sysui/desktop/icons/so7-impress-doc.ico b/sysui/desktop/icons/so7-impress-doc.ico Binary files differindex a8f9518e624b..a8f9518e624b 100644..100755 --- a/sysui/desktop/icons/so7-impress-doc.ico +++ b/sysui/desktop/icons/so7-impress-doc.ico diff --git a/sysui/desktop/icons/so7-impress-tem.ico b/sysui/desktop/icons/so7-impress-tem.ico Binary files differindex ac140b269242..ac140b269242 100644..100755 --- a/sysui/desktop/icons/so7-impress-tem.ico +++ b/sysui/desktop/icons/so7-impress-tem.ico diff --git a/sysui/desktop/icons/so7-master-doc.ico b/sysui/desktop/icons/so7-master-doc.ico Binary files differindex 1c3068715990..1c3068715990 100644..100755 --- a/sysui/desktop/icons/so7-master-doc.ico +++ b/sysui/desktop/icons/so7-master-doc.ico diff --git a/sysui/desktop/icons/so7-math-doc.ico b/sysui/desktop/icons/so7-math-doc.ico Binary files differindex d1cd9bd4c6bd..d1cd9bd4c6bd 100644..100755 --- a/sysui/desktop/icons/so7-math-doc.ico +++ b/sysui/desktop/icons/so7-math-doc.ico diff --git a/sysui/desktop/icons/so7-writer-doc.ico b/sysui/desktop/icons/so7-writer-doc.ico Binary files differindex b8eb3df20564..b8eb3df20564 100644..100755 --- a/sysui/desktop/icons/so7-writer-doc.ico +++ b/sysui/desktop/icons/so7-writer-doc.ico diff --git a/sysui/desktop/icons/so7-writer-tem.ico b/sysui/desktop/icons/so7-writer-tem.ico Binary files differindex 318cce4bc9a7..318cce4bc9a7 100644..100755 --- a/sysui/desktop/icons/so7-writer-tem.ico +++ b/sysui/desktop/icons/so7-writer-tem.ico diff --git a/sysui/desktop/icons/so8-base-app.ico b/sysui/desktop/icons/so8-base-app.ico Binary files differindex 4a22d3529614..4a22d3529614 100644..100755 --- a/sysui/desktop/icons/so8-base-app.ico +++ b/sysui/desktop/icons/so8-base-app.ico diff --git a/sysui/desktop/icons/so8-base-doc.ico b/sysui/desktop/icons/so8-base-doc.ico Binary files differindex bcddbf957630..bcddbf957630 100644..100755 --- a/sysui/desktop/icons/so8-base-doc.ico +++ b/sysui/desktop/icons/so8-base-doc.ico diff --git a/sysui/desktop/icons/so8-calc-app.ico b/sysui/desktop/icons/so8-calc-app.ico Binary files differindex a28cab56157b..a28cab56157b 100644..100755 --- a/sysui/desktop/icons/so8-calc-app.ico +++ b/sysui/desktop/icons/so8-calc-app.ico diff --git a/sysui/desktop/icons/so8-calc-doc.ico b/sysui/desktop/icons/so8-calc-doc.ico Binary files differindex 5f293dd82c30..5f293dd82c30 100644..100755 --- a/sysui/desktop/icons/so8-calc-doc.ico +++ b/sysui/desktop/icons/so8-calc-doc.ico diff --git a/sysui/desktop/icons/so8-calc-tem.ico b/sysui/desktop/icons/so8-calc-tem.ico Binary files differindex 98bf90678573..98bf90678573 100644..100755 --- a/sysui/desktop/icons/so8-calc-tem.ico +++ b/sysui/desktop/icons/so8-calc-tem.ico diff --git a/sysui/desktop/icons/so8-chart-doc.ico b/sysui/desktop/icons/so8-chart-doc.ico Binary files differindex 01ff8365434b..01ff8365434b 100644..100755 --- a/sysui/desktop/icons/so8-chart-doc.ico +++ b/sysui/desktop/icons/so8-chart-doc.ico diff --git a/sysui/desktop/icons/so8-configuration.ico b/sysui/desktop/icons/so8-configuration.ico Binary files differindex 57f3b6701b30..57f3b6701b30 100644..100755 --- a/sysui/desktop/icons/so8-configuration.ico +++ b/sysui/desktop/icons/so8-configuration.ico diff --git a/sysui/desktop/icons/so8-draw-app.ico b/sysui/desktop/icons/so8-draw-app.ico Binary files differindex 6003ccb3d7c3..6003ccb3d7c3 100644..100755 --- a/sysui/desktop/icons/so8-draw-app.ico +++ b/sysui/desktop/icons/so8-draw-app.ico diff --git a/sysui/desktop/icons/so8-draw-doc.ico b/sysui/desktop/icons/so8-draw-doc.ico Binary files differindex f4f169bd6fb5..f4f169bd6fb5 100644..100755 --- a/sysui/desktop/icons/so8-draw-doc.ico +++ b/sysui/desktop/icons/so8-draw-doc.ico diff --git a/sysui/desktop/icons/so8-draw-tem.ico b/sysui/desktop/icons/so8-draw-tem.ico Binary files differindex d3f63c38dbe0..d3f63c38dbe0 100644..100755 --- a/sysui/desktop/icons/so8-draw-tem.ico +++ b/sysui/desktop/icons/so8-draw-tem.ico diff --git a/sysui/desktop/icons/so8-empty-doc.ico b/sysui/desktop/icons/so8-empty-doc.ico Binary files differindex b71d2b939ca7..b71d2b939ca7 100644..100755 --- a/sysui/desktop/icons/so8-empty-doc.ico +++ b/sysui/desktop/icons/so8-empty-doc.ico diff --git a/sysui/desktop/icons/so8-empty-tem.ico b/sysui/desktop/icons/so8-empty-tem.ico Binary files differindex 9368b0a81aef..9368b0a81aef 100644..100755 --- a/sysui/desktop/icons/so8-empty-tem.ico +++ b/sysui/desktop/icons/so8-empty-tem.ico diff --git a/sysui/desktop/icons/so8-image-doc.ico b/sysui/desktop/icons/so8-image-doc.ico Binary files differindex 11b4f0f6c718..11b4f0f6c718 100644..100755 --- a/sysui/desktop/icons/so8-image-doc.ico +++ b/sysui/desktop/icons/so8-image-doc.ico diff --git a/sysui/desktop/icons/so8-impress-app.ico b/sysui/desktop/icons/so8-impress-app.ico Binary files differindex 8fae43dab26d..8fae43dab26d 100644..100755 --- a/sysui/desktop/icons/so8-impress-app.ico +++ b/sysui/desktop/icons/so8-impress-app.ico diff --git a/sysui/desktop/icons/so8-impress-doc.ico b/sysui/desktop/icons/so8-impress-doc.ico Binary files differindex 9a91f89f2900..9a91f89f2900 100644..100755 --- a/sysui/desktop/icons/so8-impress-doc.ico +++ b/sysui/desktop/icons/so8-impress-doc.ico diff --git a/sysui/desktop/icons/so8-impress-tem.ico b/sysui/desktop/icons/so8-impress-tem.ico Binary files differindex f84f813f992c..f84f813f992c 100644..100755 --- a/sysui/desktop/icons/so8-impress-tem.ico +++ b/sysui/desktop/icons/so8-impress-tem.ico diff --git a/sysui/desktop/icons/so8-macro-doc.ico b/sysui/desktop/icons/so8-macro-doc.ico Binary files differindex f3742e1274e7..f3742e1274e7 100644..100755 --- a/sysui/desktop/icons/so8-macro-doc.ico +++ b/sysui/desktop/icons/so8-macro-doc.ico diff --git a/sysui/desktop/icons/so8-main-app.ico b/sysui/desktop/icons/so8-main-app.ico Binary files differindex aa044ad9c702..aa044ad9c702 100644..100755 --- a/sysui/desktop/icons/so8-main-app.ico +++ b/sysui/desktop/icons/so8-main-app.ico diff --git a/sysui/desktop/icons/so8-master-doc.ico b/sysui/desktop/icons/so8-master-doc.ico Binary files differindex 27a1d2f61c49..27a1d2f61c49 100644..100755 --- a/sysui/desktop/icons/so8-master-doc.ico +++ b/sysui/desktop/icons/so8-master-doc.ico diff --git a/sysui/desktop/icons/so8-math-app.ico b/sysui/desktop/icons/so8-math-app.ico Binary files differindex 956c259c756a..956c259c756a 100644..100755 --- a/sysui/desktop/icons/so8-math-app.ico +++ b/sysui/desktop/icons/so8-math-app.ico diff --git a/sysui/desktop/icons/so8-math-doc.ico b/sysui/desktop/icons/so8-math-doc.ico Binary files differindex e7b88449999f..e7b88449999f 100644..100755 --- a/sysui/desktop/icons/so8-math-doc.ico +++ b/sysui/desktop/icons/so8-math-doc.ico diff --git a/sysui/desktop/icons/so8-open.ico b/sysui/desktop/icons/so8-open.ico Binary files differindex b77a741b338f..b77a741b338f 100644..100755 --- a/sysui/desktop/icons/so8-open.ico +++ b/sysui/desktop/icons/so8-open.ico diff --git a/sysui/desktop/icons/so8-printer.ico b/sysui/desktop/icons/so8-printer.ico Binary files differindex 25e61f8de5d5..25e61f8de5d5 100644..100755 --- a/sysui/desktop/icons/so8-printer.ico +++ b/sysui/desktop/icons/so8-printer.ico diff --git a/sysui/desktop/icons/so8-web-doc.ico b/sysui/desktop/icons/so8-web-doc.ico Binary files differindex 12eeb63cffb2..12eeb63cffb2 100644..100755 --- a/sysui/desktop/icons/so8-web-doc.ico +++ b/sysui/desktop/icons/so8-web-doc.ico diff --git a/sysui/desktop/icons/so8-writer-app.ico b/sysui/desktop/icons/so8-writer-app.ico Binary files differindex 15f7f92d4b45..15f7f92d4b45 100644..100755 --- a/sysui/desktop/icons/so8-writer-app.ico +++ b/sysui/desktop/icons/so8-writer-app.ico diff --git a/sysui/desktop/icons/so8-writer-doc.ico b/sysui/desktop/icons/so8-writer-doc.ico Binary files differindex da774be1d3ac..da774be1d3ac 100644..100755 --- a/sysui/desktop/icons/so8-writer-doc.ico +++ b/sysui/desktop/icons/so8-writer-doc.ico diff --git a/sysui/desktop/icons/so8-writer-tem.ico b/sysui/desktop/icons/so8-writer-tem.ico Binary files differindex 1bdb86c8090f..1bdb86c8090f 100644..100755 --- a/sysui/desktop/icons/so8-writer-tem.ico +++ b/sysui/desktop/icons/so8-writer-tem.ico diff --git a/sysui/desktop/icons/so9_base_doc.ico b/sysui/desktop/icons/so9_base_doc.ico Binary files differindex 8cc1d4433c2c..8cc1d4433c2c 100644..100755 --- a/sysui/desktop/icons/so9_base_doc.ico +++ b/sysui/desktop/icons/so9_base_doc.ico diff --git a/sysui/desktop/icons/so9_calc_doc.ico b/sysui/desktop/icons/so9_calc_doc.ico Binary files differindex 2b9e514cb97b..2b9e514cb97b 100644..100755 --- a/sysui/desktop/icons/so9_calc_doc.ico +++ b/sysui/desktop/icons/so9_calc_doc.ico diff --git a/sysui/desktop/icons/so9_calc_tem.ico b/sysui/desktop/icons/so9_calc_tem.ico Binary files differindex 17f4823c4374..17f4823c4374 100644..100755 --- a/sysui/desktop/icons/so9_calc_tem.ico +++ b/sysui/desktop/icons/so9_calc_tem.ico diff --git a/sysui/desktop/icons/so9_chart_doc.ico b/sysui/desktop/icons/so9_chart_doc.ico Binary files differindex b116c81903b3..b116c81903b3 100644..100755 --- a/sysui/desktop/icons/so9_chart_doc.ico +++ b/sysui/desktop/icons/so9_chart_doc.ico diff --git a/sysui/desktop/icons/so9_draw_doc.ico b/sysui/desktop/icons/so9_draw_doc.ico Binary files differindex 51f95046709a..51f95046709a 100644..100755 --- a/sysui/desktop/icons/so9_draw_doc.ico +++ b/sysui/desktop/icons/so9_draw_doc.ico diff --git a/sysui/desktop/icons/so9_draw_tem.ico b/sysui/desktop/icons/so9_draw_tem.ico Binary files differindex e4b341175bff..e4b341175bff 100644..100755 --- a/sysui/desktop/icons/so9_draw_tem.ico +++ b/sysui/desktop/icons/so9_draw_tem.ico diff --git a/sysui/desktop/icons/so9_empty_doc.ico b/sysui/desktop/icons/so9_empty_doc.ico Binary files differindex a3970775e3ed..a3970775e3ed 100644..100755 --- a/sysui/desktop/icons/so9_empty_doc.ico +++ b/sysui/desktop/icons/so9_empty_doc.ico diff --git a/sysui/desktop/icons/so9_empty_tem.ico b/sysui/desktop/icons/so9_empty_tem.ico Binary files differindex 1b0088b80277..1b0088b80277 100644..100755 --- a/sysui/desktop/icons/so9_empty_tem.ico +++ b/sysui/desktop/icons/so9_empty_tem.ico diff --git a/sysui/desktop/icons/so9_global_doc.ico b/sysui/desktop/icons/so9_global_doc.ico Binary files differindex ea4ccb383956..ea4ccb383956 100644..100755 --- a/sysui/desktop/icons/so9_global_doc.ico +++ b/sysui/desktop/icons/so9_global_doc.ico diff --git a/sysui/desktop/icons/so9_html_doc.ico b/sysui/desktop/icons/so9_html_doc.ico Binary files differindex 4e5b8bc99c07..4e5b8bc99c07 100644..100755 --- a/sysui/desktop/icons/so9_html_doc.ico +++ b/sysui/desktop/icons/so9_html_doc.ico diff --git a/sysui/desktop/icons/so9_impress_doc.ico b/sysui/desktop/icons/so9_impress_doc.ico Binary files differindex 5258a8b6aa4c..5258a8b6aa4c 100644..100755 --- a/sysui/desktop/icons/so9_impress_doc.ico +++ b/sysui/desktop/icons/so9_impress_doc.ico diff --git a/sysui/desktop/icons/so9_impress_tem.ico b/sysui/desktop/icons/so9_impress_tem.ico Binary files differindex dcdbddb3b654..dcdbddb3b654 100644..100755 --- a/sysui/desktop/icons/so9_impress_tem.ico +++ b/sysui/desktop/icons/so9_impress_tem.ico diff --git a/sysui/desktop/icons/so9_macro_doc.ico b/sysui/desktop/icons/so9_macro_doc.ico Binary files differindex cd004015e63f..cd004015e63f 100644..100755 --- a/sysui/desktop/icons/so9_macro_doc.ico +++ b/sysui/desktop/icons/so9_macro_doc.ico diff --git a/sysui/desktop/icons/so9_math_doc.ico b/sysui/desktop/icons/so9_math_doc.ico Binary files differindex 622ae939d23a..622ae939d23a 100644..100755 --- a/sysui/desktop/icons/so9_math_doc.ico +++ b/sysui/desktop/icons/so9_math_doc.ico diff --git a/sysui/desktop/icons/so9_writer_doc.ico b/sysui/desktop/icons/so9_writer_doc.ico Binary files differindex b0cf11a993c9..b0cf11a993c9 100644..100755 --- a/sysui/desktop/icons/so9_writer_doc.ico +++ b/sysui/desktop/icons/so9_writer_doc.ico diff --git a/sysui/desktop/icons/so9_writer_tem.ico b/sysui/desktop/icons/so9_writer_tem.ico Binary files differindex 2e62a1934646..2e62a1934646 100644..100755 --- a/sysui/desktop/icons/so9_writer_tem.ico +++ b/sysui/desktop/icons/so9_writer_tem.ico diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx index 5c0136fab063..5c0136fab063 100755..100644 --- a/ucb/source/core/cmdenv.cxx +++ b/ucb/source/core/cmdenv.cxx diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index c292befb1663..c292befb1663 100644..100755 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc diff --git a/uui/source/logindlg.hrc b/uui/source/logindlg.hrc index b541740bd768..b541740bd768 100644..100755 --- a/uui/source/logindlg.hrc +++ b/uui/source/logindlg.hrc diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src index 736e0f9ae1df..736e0f9ae1df 100644..100755 --- a/uui/source/logindlg.src +++ b/uui/source/logindlg.src diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx index 1622be0b38ab..1622be0b38ab 100644..100755 --- a/uui/source/masterpasscrtdlg.cxx +++ b/uui/source/masterpasscrtdlg.cxx diff --git a/uui/source/passworddlg.hrc b/uui/source/passworddlg.hrc index e9a8bb5b5b04..e9a8bb5b5b04 100644..100755 --- a/uui/source/passworddlg.hrc +++ b/uui/source/passworddlg.hrc diff --git a/uui/source/passworderrs.src b/uui/source/passworderrs.src index 3d4307ad4f80..3d4307ad4f80 100644..100755 --- a/uui/source/passworderrs.src +++ b/uui/source/passworderrs.src diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk new file mode 100755 index 000000000000..3e23c492f32b --- /dev/null +++ b/vbahelper/Library_msforms.mk @@ -0,0 +1,94 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +# MODULE is the name of the module the makefile is located in + +# declare a library +# LIB is the name of the library as it is found in Repository.mk +$(eval $(call gb_Library_Library,msforms)) + +# for platforms supporting PCH: declare the location of the pch file +# this is the name of the cxx file (without extension) +#$(eval $(call gb_Library_add_precompiled_header,msforms,$(SRCDIR)/vbahelper/PCH_FILE)) + +# in case UNO services are exported: declare location of component file +$(eval $(call gb_Library_set_componentfile,msforms,vbahelper/util/msforms)) + +# add any additional include paths for this library here +$(eval $(call gb_Library_set_include,msforms,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ +)) + +# add libraries to be linked to LIB; again these names need to be given as +# specified in Repository.mk +$(eval $(call gb_Library_add_linked_libs,msforms,\ + comphelper \ + cppu \ + cppuhelper \ + svl \ + svt \ + tl \ + sal \ + vbahelper \ + sfx \ + svx \ + vcl \ + tk \ + sb \ + stl \ + $(gb_STDLIBS) \ +)) + +# add all source files that shall be compiled with exceptions enabled +# the name is relative to $(SRCROOT) and must not contain an extension +$(eval $(call gb_Library_add_exception_objects,msforms,\ + vbahelper/source/msforms/service \ + vbahelper/source/msforms/vbabutton \ + vbahelper/source/msforms/vbacheckbox \ + vbahelper/source/msforms/vbacombobox \ + vbahelper/source/msforms/vbacontrol \ + vbahelper/source/msforms/vbacontrols \ + vbahelper/source/msforms/vbaframe \ + vbahelper/source/msforms/vbaimage \ + vbahelper/source/msforms/vbalabel \ + vbahelper/source/msforms/vbalistbox \ + vbahelper/source/msforms/vbalistcontrolhelper \ + vbahelper/source/msforms/vbamultipage \ + vbahelper/source/msforms/vbapages \ + vbahelper/source/msforms/vbaprogressbar \ + vbahelper/source/msforms/vbaradiobutton \ + vbahelper/source/msforms/vbascrollbar \ + vbahelper/source/msforms/vbaspinbutton \ + vbahelper/source/msforms/vbasystemaxcontrol \ + vbahelper/source/msforms/vbatextbox \ + vbahelper/source/msforms/vbatogglebutton \ + vbahelper/source/msforms/vbauserform \ +)) + +# vim: set noet sw=4 ts=4: + diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk new file mode 100755 index 000000000000..722b66d709a1 --- /dev/null +++ b/vbahelper/Library_vbahelper.mk @@ -0,0 +1,100 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,vbahelper)) + +$(eval $(call gb_Library_add_package_headers,vbahelper,vbahelper_inc)) + +# for platforms supporting PCH: declare the location of the pch file +# this is the name of the cxx file (without extension) +#$(eval $(call gb_Library_add_precompiled_header,vbahelper,$(SRCDIR)/vbahelper/PCH_FILE)) + +# in case UNO services are exported: declare location of component file +#$(eval $(call gb_Library_set_componentfile,vbahelper,vbahelper/COMPONENT_FILE)) + +# add any additional include paths for this library here +$(eval $(call gb_Library_set_include,vbahelper,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,vbahelper,\ + $$(DEFS) \ + -DVBAHELPER_DLLIMPLEMENTATION \ +)) + +# add libraries to be linked to vbahelper; again these names need to be given as +# specified in Repository.mk +$(eval $(call gb_Library_add_linked_libs,vbahelper,\ + cppu \ + cppuhelper \ + comphelper \ + sb \ + tl \ + sal \ + sfx \ + stl \ + svt \ + vcl \ + svl \ + msfilter \ + tk \ + $(gb_STDLIBS) \ +)) + +# add all source files that shall be compiled with exceptions enabled +# the name is relative to $(SRCROOT) and must not contain an extension +$(eval $(call gb_Library_add_exception_objects,vbahelper,\ + vbahelper/source/vbahelper/vbaapplicationbase \ + vbahelper/source/vbahelper/vbacolorformat \ + vbahelper/source/vbahelper/vbacommandbar \ + vbahelper/source/vbahelper/vbacommandbarcontrol \ + vbahelper/source/vbahelper/vbacommandbarcontrols \ + vbahelper/source/vbahelper/vbacommandbarhelper \ + vbahelper/source/vbahelper/vbacommandbars \ + vbahelper/source/vbahelper/vbadialogbase \ + vbahelper/source/vbahelper/vbadialogsbase \ + vbahelper/source/vbahelper/vbadocumentbase \ + vbahelper/source/vbahelper/vbadocumentsbase \ + vbahelper/source/vbahelper/vbaeventshelperbase \ + vbahelper/source/vbahelper/vbafillformat \ + vbahelper/source/vbahelper/vbafontbase \ + vbahelper/source/vbahelper/vbaglobalbase \ + vbahelper/source/vbahelper/vbahelper \ + vbahelper/source/vbahelper/vbalineformat \ + vbahelper/source/vbahelper/vbapagesetupbase \ + vbahelper/source/vbahelper/vbapictureformat \ + vbahelper/source/vbahelper/vbapropvalue \ + vbahelper/source/vbahelper/vbashape \ + vbahelper/source/vbahelper/vbashaperange \ + vbahelper/source/vbahelper/vbashapes \ + vbahelper/source/vbahelper/vbatextframe \ + vbahelper/source/vbahelper/vbawindowbase \ +)) + +# vim: set noet sw=4 ts=4: + diff --git a/vbahelper/Makefile b/vbahelper/Makefile new file mode 100755 index 000000000000..a79aff831024 --- /dev/null +++ b/vbahelper/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +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))) + +# vim: set noet sw=4 ts=4: diff --git a/editeng/source/xml/makefile.mk b/vbahelper/Module_vbahelper.mk index bfcfeb70f123..8fe6c15b6abf 100644..100755 --- a/editeng/source/xml/makefile.mk +++ b/vbahelper/Module_vbahelper.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.12 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -29,22 +25,22 @@ # #************************************************************************* -PRJ=..$/.. -PRJNAME=editeng -TARGET=xml - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- +$(eval $(call gb_Module_Module,vbahelper)) -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk +# the targets to be inserted are their file names without .mk extension +$(eval $(call gb_Module_add_targets,vbahelper,\ + Library_vbahelper \ + Library_msforms \ + Package_inc \ +)) -# --- Files -------------------------------------------------------- -SLOFILES = \ - $(SLO)$/xmltxtimp.obj \ - $(SLO)$/xmltxtexp.obj +# add any runtime tests (unit tests) here +# remove if no tests +#$(eval $(call gb_Module_add_check_targets,vbahelper,\ +#)) -# --- Targets -------------------------------------------------------------- +# add any subsequent checks (e.g. complex tests) here +#$(eval $(call gb_Module_add_subsequentcheck_targets,vbahelper,\ +#)) -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/vbahelper/Package_inc.mk b/vbahelper/Package_inc.mk new file mode 100755 index 000000000000..6d8033aa5b02 --- /dev/null +++ b/vbahelper/Package_inc.mk @@ -0,0 +1,51 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,vbahelper_inc,$(SRCDIR)/vbahelper/inc)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/helperdecl.hxx,vbahelper/helperdecl.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbaaccesshelper.hxx,vbahelper/vbaaccesshelper.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbaapplicationbase.hxx,vbahelper/vbaapplicationbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbacollectionimpl.hxx,vbahelper/vbacollectionimpl.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadialogbase.hxx,vbahelper/vbadialogbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadialogsbase.hxx,vbahelper/vbadialogsbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadllapi.h,vbahelper/vbadllapi.h)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadocumentbase.hxx,vbahelper/vbadocumentbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadocumentsbase.hxx,vbahelper/vbadocumentsbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbaeventshelperbase.hxx,vbahelper/vbaeventshelperbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbafontbase.hxx,vbahelper/vbafontbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbaglobalbase.hxx,vbahelper/vbaglobalbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbahelper.hxx,vbahelper/vbahelper.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbahelperinterface.hxx,vbahelper/vbahelperinterface.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbapagesetupbase.hxx,vbahelper/vbapagesetupbase.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbapropvalue.hxx,vbahelper/vbapropvalue.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbashape.hxx,vbahelper/vbashape.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbashaperange.hxx,vbahelper/vbashaperange.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbashapes.hxx,vbahelper/vbashapes.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbatextframe.hxx,vbahelper/vbatextframe.hxx)) +$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbawindowbase.hxx,vbahelper/vbawindowbase.hxx)) + +# vim: set noet sw=4 ts=4: diff --git a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx index 79bb44ce30a4..9fcfde744bbc 100644 --- a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx +++ b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx @@ -35,7 +35,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> -#define VBAHELPER_DLLIMPLEMENTATION +//#define VBAHELPER_DLLIMPLEMENTATION #include <vbahelper/vbadllapi.h> #include <memory> namespace css = ::com::sun::star; diff --git a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx index 5bd58b44adaf..601d996a5e64 100644 --- a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx +++ b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx @@ -150,7 +150,7 @@ public: typedef ::cppu::WeakImplHelper3< css::container::XNameAccess, css::container::XIndexAccess, css::container::XEnumerationAccess > XNamedCollectionHelper_BASE; template< typename Ifc1 > -class VBAHELPER_DLLPUBLIC XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE +class XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE { public: typedef std::vector< css::uno::Reference< Ifc1 > > XNamedVec; @@ -335,7 +335,7 @@ public: }; template <typename Ifc> // where Ifc must implement XCollectionTest -class VBAHELPER_DLLPUBLIC CollTestImplHelper : public ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > > +class CollTestImplHelper : public ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > > { typedef ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > > ImplBase1; diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx index 86ded7177c88..22dc9a8f6cc8 100644 --- a/vbahelper/inc/vbahelper/vbahelper.hxx +++ b/vbahelper/inc/vbahelper/vbahelper.hxx @@ -186,6 +186,7 @@ public: virtual void setHeight( double nHeight ); virtual double getWidth(); virtual void setWidth( double nWidth); + virtual ~ConcreteXShapeGeometryAttributes(); }; #define VBA_LEFT "PositionX" diff --git a/vbahelper/inc/vbahelper/vbahelperinterface.hxx b/vbahelper/inc/vbahelper/vbahelperinterface.hxx index b095b5cd2823..dcd04af3d55f 100644 --- a/vbahelper/inc/vbahelper/vbahelperinterface.hxx +++ b/vbahelper/inc/vbahelper/vbahelperinterface.hxx @@ -63,7 +63,7 @@ const ::rtl::OUString sHelperServiceName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.HelperServiceBase" ) ); template< typename Ifc1 > -class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl : public Ifc1 +class InheritedHelperInterfaceImpl : public Ifc1 { protected: css::uno::WeakReference< ov::XHelperInterface > mxParent; @@ -109,7 +109,7 @@ public: }; template< typename Ifc1 > -class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl1 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > > +class InheritedHelperInterfaceImpl1 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > > { typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > > Base; public: @@ -119,7 +119,7 @@ public: }; template< typename Ifc1, typename Ifc2 > -class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl2 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper2< Ifc1, Ifc2 > > +class InheritedHelperInterfaceImpl2 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper2< Ifc1, Ifc2 > > { typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper2< Ifc1, Ifc2 > > Base; public: @@ -129,7 +129,7 @@ public: }; template< typename Ifc1, typename Ifc2, typename Ifc3 > -class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl3 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper3< Ifc1, Ifc2, Ifc3 > > +class InheritedHelperInterfaceImpl3 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper3< Ifc1, Ifc2, Ifc3 > > { typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper3< Ifc1, Ifc2, Ifc3 > > Base; public: diff --git a/vbahelper/prj/build.lst b/vbahelper/prj/build.lst index 0fadb0c94625..312c9b062233 100644 --- a/vbahelper/prj/build.lst +++ b/vbahelper/prj/build.lst @@ -1,6 +1,3 @@ vba vbahelper : oovbaapi offuh basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal LIBXSLT:libxslt NULL vba vbahelper usr1 - all vba_mkout NULL -#vba vbahelper\inc nmake - all vba_inc NULL -vba vbahelper\source\vbahelper nmake - all vba_vbahelper NULL -vba vbahelper\source\msforms nmake - all vba_msforms NULL -vba vbahelper\util nmake - all vba_util vba_vbahelper vba_msforms NULL +vba vbahelper\prj nmake - all vba_prj NULL diff --git a/vbahelper/prj/d.lst b/vbahelper/prj/d.lst index a5457b730409..e69de29bb2d1 100644 --- a/vbahelper/prj/d.lst +++ b/vbahelper/prj/d.lst @@ -1,30 +0,0 @@ -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% -..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% -..\%__SRC%\lib\ivbahelper.lib %_DEST%\lib%_EXT%\vbahelper.lib -..\%__SRC%\lib\vbahelp*.* %_DEST%\lib%_EXT%\vba*.* -..\%__SRC%\bin\vbahelper*.* %_DEST%\bin%_EXT%\vbahelper*.* -..\%__SRC%\bin\msforms*.* %_DEST%\bin%_EXT%\msforms*.* - -mkdir: %_DEST%\inc%_EXT%\basic -..\inc\vbahelper\vbacollectionimpl.hxx %_DEST%\inc%_EXT%\vbahelper\vbacollectionimpl.hxx -..\inc\vbahelper\vbahelper.hxx %_DEST%\inc%_EXT%\vbahelper\vbahelper.hxx -..\inc\vbahelper\vbaaccesshelper.hxx %_DEST%\inc%_EXT%\vbahelper\vbaaccesshelper.hxx -..\inc\vbahelper\helperdecl.hxx %_DEST%\inc%_EXT%\vbahelper\helperdecl.hxx -..\inc\vbahelper\vbahelperinterface.hxx %_DEST%\inc%_EXT%\vbahelper\vbahelperinterface.hxx -..\inc\vbahelper\vbaapplicationbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaapplicationbase.hxx -..\inc\vbahelper\vbafontbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbafontbase.hxx -..\inc\vbahelper\vbadllapi.h %_DEST%\inc%_EXT%\vbahelper\vbadllapi.h -..\inc\vbahelper\vbawindowbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbawindowbase.hxx -..\inc\vbahelper\vbadocumentbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadocumentbase.hxx -..\inc\vbahelper\vbadocumentsbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadocumentsbase.hxx -..\inc\vbahelper\vbapropvalue.hxx %_DEST%\inc%_EXT%\vbahelper\vbapropvalue.hxx -..\inc\vbahelper\vbaglobalbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaglobalbase.hxx -..\inc\vbahelper\vbadialogbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadialogbase.hxx -..\inc\vbahelper\vbadialogsbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadialogsbase.hxx -..\inc\vbahelper\vbashape.hxx %_DEST%\inc%_EXT%\vbahelper\vbashape.hxx -..\inc\vbahelper\vbashapes.hxx %_DEST%\inc%_EXT%\vbahelper\vbashapes.hxx -..\inc\vbahelper\vbatextframe.hxx %_DEST%\inc%_EXT%\vbahelper\vbatextframe.hxx -..\inc\vbahelper\vbashaperange.hxx %_DEST%\inc%_EXT%\vbahelper\vbashaperange.hxx -..\inc\vbahelper\vbapagesetupbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbapagesetupbase.hxx -..\%__SRC%\misc\msforms.component %_DEST%\xml%_EXT%\msforms.component -..\inc\vbahelper\vbaeventshelperbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaeventshelperbase.hxx diff --git a/sfx2/util/makefile.pmk b/vbahelper/prj/makefile.mk index 03817cd477ae..e312a7ccab65 100644..100755 --- a/sfx2/util/makefile.pmk +++ b/vbahelper/prj/makefile.mk @@ -25,6 +25,16 @@ # #************************************************************************* -# Reduction of exported symbols: -CDEFS += -DSFX2_DLLIMPLEMENTATION -VISIBILITY_HIDDEN=TRUE +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/vbahelper/source/msforms/makefile.mk b/vbahelper/source/msforms/makefile.mk deleted file mode 100644 index 40a6b8350fd4..000000000000 --- a/vbahelper/source/msforms/makefile.mk +++ /dev/null @@ -1,72 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=vbahelper -TARGET=msforms - -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings ----------------------------------------------------- - -.IF "$(ENABLE_VBA)" == "NO" -dummy: - @echo "Nothing to build" -.ENDIF - -.INCLUDE : settings.mk - -SLOFILES=\ - $(SLO)$/vbacontrol.obj \ - $(SLO)$/vbacontrols.obj \ - $(SLO)$/vbabutton.obj \ - $(SLO)$/vbacombobox.obj \ - $(SLO)$/vbalabel.obj \ - $(SLO)$/vbatextbox.obj \ - $(SLO)$/vbaradiobutton.obj \ - $(SLO)$/vbalistbox.obj \ - $(SLO)$/vbatogglebutton.obj \ - $(SLO)$/vbacheckbox.obj \ - $(SLO)$/vbaframe.obj \ - $(SLO)$/vbascrollbar.obj \ - $(SLO)$/vbaprogressbar.obj \ - $(SLO)$/vbamultipage.obj \ - $(SLO)$/vbalistcontrolhelper.obj \ - $(SLO)$/vbaspinbutton.obj \ - $(SLO)$/vbasystemaxcontrol.obj \ - $(SLO)$/vbaimage.obj \ - $(SLO)$/vbapages.obj \ - $(SLO)$/vbauserform.obj \ - $(SLO)$/service.obj \ - -# #FIXME vbapropvalue needs to move to vbahelper - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx index 992fbd94a8c5..247eabfe95e8 100644 --- a/vbahelper/source/msforms/vbacontrol.hxx +++ b/vbahelper/source/msforms/vbacontrol.hxx @@ -41,6 +41,7 @@ #include <memory> //typedef ::cppu::WeakImplHelper1< ov::msforms::XControl > ControlImpl_BASE; +//template SAL_DLLPUBLIC_IMPORT InheritedHelperInterfaceImpl1< ov::msforms::XControl >; typedef InheritedHelperInterfaceImpl1< ov::msforms::XControl > ControlImpl_BASE; class ScVbaControl : public ControlImpl_BASE diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.cxx b/vbahelper/source/msforms/vbasystemaxcontrol.cxx index ed2fc70164ac..ed2fc70164ac 100644..100755 --- a/vbahelper/source/msforms/vbasystemaxcontrol.cxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.cxx diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.hxx b/vbahelper/source/msforms/vbasystemaxcontrol.hxx index bffe5b99c4f1..bffe5b99c4f1 100644..100755 --- a/vbahelper/source/msforms/vbasystemaxcontrol.hxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.hxx diff --git a/vbahelper/source/vbahelper/makefile.mk b/vbahelper/source/vbahelper/makefile.mk deleted file mode 100644 index 51fa5b449d23..000000000000 --- a/vbahelper/source/vbahelper/makefile.mk +++ /dev/null @@ -1,74 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/../ -PRJNAME=vbahelper -TARGET=vbahelperbits - -ENABLE_EXCEPTIONS := TRUE -VISIBILITY_HIDDEN=TRUE -# --- Settings ----------------------------------------------------- - -.IF "$(ENABLE_VBA)" == "NO" -dummy: - @echo "Nothing to build" -.ENDIF - -.INCLUDE : settings.mk - -SLOFILES=\ - $(SLO)$/vbahelper.obj \ - $(SLO)$/vbapropvalue.obj \ - $(SLO)$/vbacommandbars.obj \ - $(SLO)$/vbacommandbar.obj \ - $(SLO)$/vbacommandbarcontrols.obj \ - $(SLO)$/vbacommandbarcontrol.obj \ - $(SLO)$/vbacommandbarhelper.obj \ - $(SLO)$/vbaapplicationbase.obj \ - $(SLO)$/vbawindowbase.obj \ - $(SLO)$/vbadocumentbase.obj \ - $(SLO)$/vbadocumentsbase.obj \ - $(SLO)$/vbaglobalbase.obj \ - $(SLO)$/vbafontbase.obj \ - $(SLO)$/vbadialogbase.obj \ - $(SLO)$/vbadialogsbase.obj \ - $(SLO)$/vbashape.obj \ - $(SLO)$/vbacolorformat.obj \ - $(SLO)$/vbashapes.obj \ - $(SLO)$/vbalineformat.obj \ - $(SLO)$/vbafillformat.obj \ - $(SLO)$/vbapictureformat.obj \ - $(SLO)$/vbashaperange.obj \ - $(SLO)$/vbatextframe.obj \ - $(SLO)$/vbapagesetupbase.obj \ - $(SLO)$/vbaeventshelperbase.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - - diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 51f43cc01f8f..cfce8b49e3d1 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -879,6 +879,9 @@ ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::u { m_pShapeHelper.reset( new ShapeHelper( xShape ) ); } +ConcreteXShapeGeometryAttributes::~ConcreteXShapeGeometryAttributes() +{ +} sal_Int32 getPointerStyle( const uno::Reference< frame::XModel >& xModel ) { diff --git a/vbahelper/util/makefile.mk b/vbahelper/util/makefile.mk deleted file mode 100644 index 9469df473685..000000000000 --- a/vbahelper/util/makefile.mk +++ /dev/null @@ -1,112 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=vbahelper -TARGET=vbahelper - -# --- Settings --------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(ENABLE_VBA)" == "NO" -dummy: - @echo "Nothing to build" -.ENDIF - -TARGET_HELPER=vbahelper - -LIB1TARGET= $(SLB)$/$(TARGET).lib -LIB1FILES=$(SLB)$/$(TARGET)bits.lib - -SHL1TARGET= $(TARGET_HELPER)$(DLLPOSTFIX) - - -# dynamic libraries -SHL1STDLIBS= \ - $(CPPULIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(BASICLIB) \ - $(TOOLSLIB) \ - $(SALLIB)\ - $(SFXLIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(VCLLIB) \ - $(SVTOOLLIB) \ - $(MSFILTERLIB) \ - $(TKLIB) - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET_HELPER) -SHL1USE_EXPORTS=name -SHL1LIBS=$(LIB1TARGET) - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -DEFLIB1NAME=$(TARGET) - -TARGET_MSFORMS=msforms -SHL2TARGET=$(TARGET_MSFORMS)$(DLLPOSTFIX).uno -SHL2IMPLIB= i$(TARGET_MSFORMS) - -SHL2VERSIONMAP=$(SOLARENV)/src/component.map -SHL2DEF=$(MISC)$/$(SHL2TARGET).def -DEF2NAME=$(SHL2TARGET) -SHL2STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(COMPHELPERLIB) \ - $(SVLIB) \ - $(TOOLSLIB) \ - $(SALLIB)\ - $(VBAHELPERLIB) \ - $(SFXLIB) \ - $(SVXLIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(VCLLIB) \ - $(TKLIB) \ - $(BASICLIB) \ - -SHL2DEPN=$(SHL1TARGETN) -SHL2LIBS=$(SLB)$/$(TARGET_MSFORMS).lib - -# --- Targets ----------------------------------------------------------- - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/msforms.component - -$(MISC)/msforms.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - msforms.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt msforms.component diff --git a/xmloff/JunitTest_xmloff_unoapi.mk b/xmloff/JunitTest_xmloff_unoapi.mk new file mode 100755 index 000000000000..8ac3a5aedfd3 --- /dev/null +++ b/xmloff/JunitTest_xmloff_unoapi.mk @@ -0,0 +1,53 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,xmloff_unoapi)) + +$(eval $(call gb_JunitTest_set_defs,xmloff_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/xmloff/qa/unoapi/xmloff.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/xmloff/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/xmloff/qa/unoapi/testdocuments \ +)) + +$(eval $(call gb_JunitTest_add_jars,xmloff_unoapi,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,xmloff_unoapi,\ + xmloff/qa/unoapi/Test \ +)) + +$(eval $(call gb_JunitTest_add_classes,xmloff_unoapi,\ + org.openoffice.xmloff.qa.unoapi.Test \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index b8cd18a64684..9576341f0ffb 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -36,12 +36,10 @@ $(eval $(call gb_Library_add_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/prec $(eval $(call gb_Library_set_include,xo,\ $$(SOLARINC) \ -I. \ - -I$(WORKDIR)/inc/ \ -I$(SRCDIR)/xmloff/inc \ -I$(SRCDIR)/xmloff/source/inc \ -I$(SRCDIR)/xmloff/inc/pch \ -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ )) $(eval $(call gb_Library_set_defs,xo,\ @@ -61,6 +59,7 @@ $(eval $(call gb_Library_add_linked_libs,xo,\ tl \ utl \ vos3 \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,xo,\ @@ -381,37 +380,4 @@ $(eval $(call gb_Library_add_exception_objects,xo,\ xmloff/source/xforms/xformsimport \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,xo,\ - dl \ - icuuc \ - m \ - pthread \ -)) -endif - -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,xo,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else -$(eval $(call gb_Library_add_linked_libs,xo,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif -endif # vim: set noet ts=4 sw=4: diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index e809935d12ba..455daadaf6e3 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -33,9 +33,7 @@ $(eval $(call gb_Library_set_include,xof,\ -I$(SRCDIR)/xmloff/inc/pch \ -I$(SRCDIR)/xmloff/inc \ -I$(SRCDIR)/xmloff/source/inc \ - -I$(WORKDIR)/inc/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc \ -I$(OUTDIR)/inc/offuh \ )) @@ -47,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,xof,\ salhelper \ stl \ xo \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,xof,\ @@ -91,37 +90,4 @@ $(eval $(call gb_Library_add_exception_objects,xof,\ xmloff/source/transform/XMLFilterRegistration \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,xof,\ - icuuc \ - dl \ - m \ - pthread \ -)) -endif - -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,xof,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else -$(eval $(call gb_Library_add_linked_libs,xof,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif -endif # vim: set noet ts=4 sw=4: diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk index eacc83068dad..74a1aa3aaa1e 100644 --- a/xmloff/Module_xmloff.mk +++ b/xmloff/Module_xmloff.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -34,6 +34,10 @@ $(eval $(call gb_Module_add_targets,xmloff,\ Package_inc \ )) +$(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\ + JunitTest_xmloff_unoapi \ +)) + #todo: map file #todo: xmlkywd.lib - built, but never used?! diff --git a/xmloff/Package_dtd.mk b/xmloff/Package_dtd.mk index fbfbe4a1400d..7f2d5a4e0f1d 100644 --- a/xmloff/Package_dtd.mk +++ b/xmloff/Package_dtd.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # diff --git a/xmloff/Package_inc.mk b/xmloff/Package_inc.mk index ca2d0abe62e2..4e11c2b4b5d9 100644 --- a/xmloff/Package_inc.mk +++ b/xmloff/Package_inc.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # diff --git a/xmloff/prj/build.lst b/xmloff/prj/build.lst index d075f1fc6fcb..e522f8b79714 100644 --- a/xmloff/prj/build.lst +++ b/xmloff/prj/build.lst @@ -1,5 +1,2 @@ xo xmloff : LIBXSLT:libxslt offapi svl vos NULL -zxo xmloff\prj nmake - all xo_prj NULL - -xo xmloff\qa\unoapi nmake - all xo_qa_unoapi NULL - +xo xmloff\prj nmake - all xo_prj NULL diff --git a/xmloff/prj/makefile.mk b/xmloff/prj/makefile.mk index c73a3d944bbf..e312a7ccab65 100644 --- a/xmloff/prj/makefile.mk +++ b/xmloff/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/xmloff/qa/unoapi/Test.java b/xmloff/qa/unoapi/Test.java index d66144f108e7..833c2d770c9f 100644 --- a/xmloff/qa/unoapi/Test.java +++ b/xmloff/qa/unoapi/Test.java @@ -27,6 +27,7 @@ package org.openoffice.xmloff.qa.unoapi; import org.openoffice.Runner; import org.openoffice.test.OfficeConnection; +import org.openoffice.test.Argument; import static org.junit.Assert.*; public final class Test { @@ -43,8 +44,8 @@ public final class Test { @org.junit.Test public void test() { assertTrue( Runner.run( - "-sce", "xmloff.sce", "-xcl", "knownissues.xcl", "-tdoc", - "testdocuments", "-cs", connection.getDescription())); + "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc", + Argument.get("tdoc"), "-cs", connection.getDescription())); } private final OfficeConnection connection = new OfficeConnection(); diff --git a/xmloff/qa/unoapi/makefile.mk b/xmloff/qa/unoapi/makefile.mk deleted file mode 100644 index 3cbbc5f2a797..000000000000 --- a/xmloff/qa/unoapi/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -#***********************************************************************/ - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../.. -PRJNAME = xmloff -TARGET = qa_unoapi - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/xmloff/qa/unoapi -JAVATESTFILES = Test.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/xmloff/source/forms/handler/property_handler_base.cxx b/xmloff/source/forms/handler/property_handler_base.cxx index d599e0e259fe..d599e0e259fe 100644..100755 --- a/xmloff/source/forms/handler/property_handler_base.cxx +++ b/xmloff/source/forms/handler/property_handler_base.cxx diff --git a/xmloff/source/forms/handler/vcl_date_handler.cxx b/xmloff/source/forms/handler/vcl_date_handler.cxx index a8404ed04e05..a8404ed04e05 100644..100755 --- a/xmloff/source/forms/handler/vcl_date_handler.cxx +++ b/xmloff/source/forms/handler/vcl_date_handler.cxx diff --git a/xmloff/source/forms/handler/vcl_date_handler.hxx b/xmloff/source/forms/handler/vcl_date_handler.hxx index 44a7f7395ceb..44a7f7395ceb 100644..100755 --- a/xmloff/source/forms/handler/vcl_date_handler.hxx +++ b/xmloff/source/forms/handler/vcl_date_handler.hxx diff --git a/xmloff/source/forms/handler/vcl_time_handler.cxx b/xmloff/source/forms/handler/vcl_time_handler.cxx index 98ea739d04a4..98ea739d04a4 100644..100755 --- a/xmloff/source/forms/handler/vcl_time_handler.cxx +++ b/xmloff/source/forms/handler/vcl_time_handler.cxx diff --git a/xmloff/source/forms/handler/vcl_time_handler.hxx b/xmloff/source/forms/handler/vcl_time_handler.hxx index 7ed6f0aa5730..7ed6f0aa5730 100644..100755 --- a/xmloff/source/forms/handler/vcl_time_handler.hxx +++ b/xmloff/source/forms/handler/vcl_time_handler.hxx diff --git a/xmloff/source/forms/property_group.hxx b/xmloff/source/forms/property_group.hxx index bca354f14e92..bca354f14e92 100644..100755 --- a/xmloff/source/forms/property_group.hxx +++ b/xmloff/source/forms/property_group.hxx diff --git a/xmloff/source/forms/property_meta_data.hxx b/xmloff/source/forms/property_meta_data.hxx index f246a7bfd745..f246a7bfd745 100644..100755 --- a/xmloff/source/forms/property_meta_data.hxx +++ b/xmloff/source/forms/property_meta_data.hxx diff --git a/xmloff/util/makefile.pmk b/xmloff/util/makefile.pmk deleted file mode 100644 index faf070e2d5bc..000000000000 --- a/xmloff/util/makefile.pmk +++ /dev/null @@ -1,30 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# Reduction of exported symbols: -CDEFS += -DXMLOFF_DLLIMPLEMENTATION -VISIBILITY_HIDDEN=TRUE |