diff options
Diffstat (limited to 'oovbaapi')
| -rw-r--r-- | oovbaapi/Module_oovbaapi.mk | 2 | ||||
| -rw-r--r-- | oovbaapi/Package_oovbaapi_idl.mk | 31 | ||||
| -rw-r--r-- | oovbaapi/Package_oovbaapi_inc.mk | 31 | ||||
| -rw-r--r-- | oovbaapi/UnoApi_oovbaapi.mk | 34 |
4 files changed, 17 insertions, 81 deletions
diff --git a/oovbaapi/Module_oovbaapi.mk b/oovbaapi/Module_oovbaapi.mk index 7d35c00a68b5..dd1f94b27a40 100644 --- a/oovbaapi/Module_oovbaapi.mk +++ b/oovbaapi/Module_oovbaapi.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Module_Module,oovbaapi)) $(eval $(call gb_Module_add_targets,oovbaapi,\ UnoApi_oovbaapi \ - Package_oovbaapi_inc \ - Package_oovbaapi_idl \ )) # vim: set noet sw=4 ts=4: diff --git a/oovbaapi/Package_oovbaapi_idl.mk b/oovbaapi/Package_oovbaapi_idl.mk deleted file mode 100644 index 891f15a43198..000000000000 --- a/oovbaapi/Package_oovbaapi_idl.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_UnoApiTarget_autopackage_idl,oovbaapi)) - -# vim: set noet sw=4 ts=4: diff --git a/oovbaapi/Package_oovbaapi_inc.mk b/oovbaapi/Package_oovbaapi_inc.mk deleted file mode 100644 index bb8b5e661532..000000000000 --- a/oovbaapi/Package_oovbaapi_inc.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_UnoApiTarget_autopackage_inc,oovbaapi)) - -# vim: set noet sw=4 ts=4: diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk index 57a0c1161497..b3d8e20ffe1f 100644 --- a/oovbaapi/UnoApi_oovbaapi.mk +++ b/oovbaapi/UnoApi_oovbaapi.mk @@ -26,20 +26,20 @@ # #************************************************************************* -$(eval $(call gb_UnoApiTarget_UnoApiTarget,oovbaapi)) +$(eval $(call gb_UnoApi_UnoApi,oovbaapi)) -$(eval $(call gb_UnoApiTarget_add_rdbfiles,oovbaapi,\ +$(eval $(call gb_UnoApi_add_api,oovbaapi,\ udkapi \ offapi \ )) -$(eval $(call gb_UnoApiTarget_set_include,oovbaapi,\ +$(eval $(call gb_UnoApi_set_include,oovbaapi,\ $$(INCLUDE) \ -I$(SRCDIR)/oovbaapi \ -I$(OUTDIR)/idl \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,oovbaapi,oovbaapi/ooo/vba/excel,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,oovbaapi,oovbaapi/ooo/vba/excel,\ Globals \ Hyperlink \ Range \ @@ -49,18 +49,18 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,oovbaapi,oovbaapi/ooo/vba/excel Worksheet \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba,\ ControlProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/msforms,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/msforms,\ MSFormReturnTypes \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/excel,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/excel,\ Button \ SheetObjects \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\ FormShowConstants \ VbAppWinStyle \ VbCalendar \ @@ -110,7 +110,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\ XVBAToOOEventDescGen \ XWindowBase \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/access,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/access,\ AcCloseSave \ AcColorIndex \ AcCommand \ @@ -165,7 +165,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/access,\ ProcKind \ RefKind \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/adodb,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/adodb,\ ADCPROP_ASYNCTHREADPRIORITY_ENUM \ ADCPROP_AUTORECALC_ENUM \ ADCPROP_UPDATECRITERIA_ENUM \ @@ -200,7 +200,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/adodb,\ StringFormatEnum \ XactAttributeEnum \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/dao,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/dao,\ CollatingOrderEnum \ CommitTransOptionsEnum \ CursorDriverEnum \ @@ -227,7 +227,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/dao,\ UpdateTypeEnum \ WorkspaceTypeEnum \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\ Constants \ XApplication \ XAxes \ @@ -492,7 +492,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\ XWorksheetFunction \ XWorksheets \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\ fmAction \ fmAlignment \ fmBackStyle \ @@ -565,7 +565,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\ XToggleButton \ XUserForm \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/office,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/office,\ DocProperties \ MailFormat \ MsoAlertButtonType \ @@ -689,7 +689,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/office,\ MsoWizardMsgType \ MsoZOrderCmd \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/powerpoint,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/powerpoint,\ MsoAnimAccumulate \ MsoAnimAdditive \ MsoAnimAfterEffect \ @@ -760,11 +760,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/powerpoint, PpViewType \ PpWindowState \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/stdole,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/stdole,\ LoadPictureConstants \ OLE_TRISTATE \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/word,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/word,\ WdAlertLevel \ WdAnimation \ WdArabicNumeral \ |