refactor UnoApi class

5 files changed, 51 insertions, 115 deletions

diff --git a/udkapi/Module_udkapi.mk b/udkapi/Module_udkapi.mk
index d25344355f66..e8bafe8308fe 100644
--- a/udkapi/Module_udkapi.mk
+++ b/udkapi/Module_udkapi.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Module_Module,udkapi))
 
 $(eval $(call gb_Module_add_targets,udkapi,\
 	UnoApi_udkapi \
-	UnoApi_uretypes \
-	Package_udkapi_inc \
-	Package_udkapi_idl \
+	UnoApiMerge_uretypes \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/udkapi/Package_udkapi_idl.mk b/udkapi/Package_udkapi_idl.mk
deleted file mode 100644
index 4c6591fb944a..000000000000
--- a/udkapi/Package_udkapi_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,udkapi))
-
-# vim: set noet sw=4 ts=4:
diff --git a/udkapi/Package_udkapi_inc.mk b/udkapi/Package_udkapi_inc.mk
deleted file mode 100644
index 3fc8a1b609d8..000000000000
--- a/udkapi/Package_udkapi_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,udkapi))
-
-# vim: set noet sw=4 ts=4:
diff --git a/udkapi/UnoApi_uretypes.mk b/udkapi/UnoApiMerge_uretypes.mk
index d61d07912ec2..3b01834f9c3a 100644
--- a/udkapi/UnoApi_uretypes.mk
+++ b/udkapi/UnoApiMerge_uretypes.mk
@@ -26,9 +26,9 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types))
+$(eval $(call gb_UnoApiMerge_UnoApiMerge,ure/types))
 
-$(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,ure/types,\
+$(eval $(call gb_UnoApiMerge_add_rdbfiles,ure/types,\
     udkapi \
 ))
 
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index fb1ac947187e..9bef9ca19e5a 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -26,24 +26,24 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi))
+$(eval $(call gb_UnoApi_UnoApi,udkapi))
 
-$(eval $(call gb_UnoApiTarget_set_include,udkapi,\
+$(eval $(call gb_UnoApi_set_include,udkapi,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/udkapi \
 	-I$(OUTDIR)/idl \
 ))
 
 
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star,\
 	udk-modules \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\
 	Introspection \
 	PropertyBag \
 	PropertySet \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge,\
 	Bridge \
 	BridgeFactory \
 	IiopBridge \
@@ -54,24 +54,24 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/b
 	OleObjectFactory \
 	UrpBridge \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge/oleautomation,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge/oleautomation,\
 	ApplicationRegistration \
 	BridgeSupplier \
 	Factory \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba,\
 	corba \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/giop,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/giop,\
 	giop \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/iiop,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/iiop,\
 	iiop \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/iop,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/iop,\
 	iop \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\
 	DataInputStream \
 	DataOutputStream \
 	MarkableInputStream \
@@ -83,33 +83,33 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/i
 	TextInputStream \
 	TextOutputStream \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/java,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/java,\
 	JavaVirtualMachine \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/lang,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/lang,\
 	MultiServiceFactory \
 	RegistryServiceManager \
 	ServiceManager \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/loader,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/loader,\
 	Dynamic \
 	Java \
 	Java2 \
 	SharedLibrary \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/reflection,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/reflection,\
 	CoreReflection \
 	ProxyFactory \
 	TypeDescriptionManager \
 	TypeDescriptionProvider \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/registry,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/registry,\
 	DefaultRegistry \
 	ImplementationRegistration \
 	NestedRegistry \
 	SimpleRegistry \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,\
 	AllListenerAdapter \
 	Converter \
 	Engine \
@@ -117,43 +117,43 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/s
 	InvocationAdapterFactory \
 	JavaScript \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/security,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/security,\
 	AccessController \
 	Policy \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/test,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/test,\
 	TestFactory \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/uno,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/uno,\
 	NamingService \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\
 	BootstrapMacroExpander \
 	MacroExpander \
 	theMacroExpander \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util/logging,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util/logging,\
 	Logger \
 	LoggerRemote \
 ))
 
 
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/bridge,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/bridge,\
 	UnoUrlResolver \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/connection,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/connection,\
 	Acceptor \
 	Connector \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/container,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/container,\
 	EnumerableMap \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\
 	SequenceInputStream \
 	SequenceOutputStream \
 	TempFile \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri,\
 	ExternalUriReferenceTranslator \
 	UriReferenceFactory \
 	UriSchemeParser_vndDOTsunDOTstarDOTexpand \
@@ -162,7 +162,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri,
 ))
 
 
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\
 	Ambiguous \
 	Defaulted \
 	GetDirectPropertyTolerantResult \
@@ -218,7 +218,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\
 	XTolerantMultiPropertySet \
 	XVetoableChangeListener \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\
 	BridgeExistsException \
 	InvalidProtocolChangeException \
 	ModelDependent \
@@ -231,7 +231,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\
 	XProtocolProperties \
 	XUnoUrlResolver \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/oleautomation,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/oleautomation,\
 	Currency \
 	Date \
 	Decimal \
@@ -240,7 +240,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/ole
 	SCode \
 	XAutomationObject \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/connection,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/connection,\
 	AlreadyAcceptingException \
 	ConnectionSetupException \
 	NoConnectException \
@@ -251,7 +251,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/connection
 	XConnectionBroadcaster \
 	XConnector \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/container,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/container,\
 	ContainerEvent \
 	ElementExistException \
 	NoSuchElementException \
@@ -290,7 +290,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/container,
 	XStringKeyMap \
 	XUniqueIDAccess \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/io,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/io,\
 	AlreadyConnectedException \
 	BufferSizeExceededException \
 	ConnectException \
@@ -333,7 +333,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/io,\
 	XTruncate \
 	XXMLExtractor \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/java,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/java,\
 	InvalidJavaSettingsException \
 	JavaDisabledException \
 	JavaInitializationException \
@@ -346,7 +346,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/java,\
 	XJavaThreadRegister_11 \
 	XJavaVM \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\
 	ArrayIndexOutOfBoundsException \
 	ClassNotFoundException \
 	DisposedException \
@@ -383,11 +383,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\
 	XTypeProvider \
 	XUnoTunnel \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/loader,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/loader,\
 	CannotActivateFactoryException \
 	XImplementationLoader \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/reflection,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/reflection,\
 	FieldAccessMode \
 	InvalidTypeNameException \
 	InvocationTargetException \
@@ -433,7 +433,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/reflection
 	XTypeDescriptionEnumerationAccess \
 	XUnionTypeDescription \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\
 	CannotRegisterImplementationException \
 	InvalidRegistryException \
 	InvalidValueException \
@@ -445,7 +445,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\
 	XRegistryKey \
 	XSimpleRegistry \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/script,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/script,\
 	AllEventObject \
 	ArrayWrapper \
 	BasicErrorException \
@@ -489,7 +489,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/script,\
 	XStarBasicModuleInfo \
 	XTypeConverter \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/security,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/security,\
 	AccessControlException \
 	AllPermission \
 	RuntimePermission \
@@ -498,7 +498,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/security,\
 	XAction \
 	XPolicy \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/task,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/task,\
 	XInteractionAbort \
 	XInteractionContinuation \
 	XInteractionHandler \
@@ -506,19 +506,19 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/task,\
 	XInteractionRequest \
 	XInteractionRetry \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/test,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/test,\
 	TestEvent \
 	XSimpleTest \
 	XTest \
 	XTestListener \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/test/bridge,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/test/bridge,\
 	XBridgeTest \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/test/performance,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/test/performance,\
 	XPerformanceTest \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\
 	DeploymentException \
 	Exception \
 	RuntimeException \
@@ -535,7 +535,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\
 	XUnloadingPreference \
 	XWeak \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\
 	RelativeUriExcessParentSegments \
 	XExternalUriReferenceTranslator \
 	XUriReference \
@@ -547,11 +547,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\
 	XVndSunStarScriptUrl \
 	XVndSunStarScriptUrlReference \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/util,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/util,\
 	XMacroExpander \
 	XVeto \
 ))
-$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/util/logging,\
+$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/util/logging,\
 	LogLevel \
 	XLogger \
 	XLoggerRemote \