merge origin/master

14 files changed, 23 insertions, 88 deletions

diff --git a/udkapi/Makefile b/udkapi/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/udkapi/Makefile
+++ b/udkapi/Makefile
@@ -1,40 +1,7 @@
 # -*- 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.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/udkapi/README b/udkapi/README
new file mode 100644
index 000000000000..3510fddc9150
--- /dev/null
+++ b/udkapi/README
@@ -0,0 +1,6 @@
+Low level UNO stuff API IDL files
+
+i.e. those that are part of the standalone URE.
+
+See also:
+[[offapi]]
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 9bef9ca19e5a..17e37b6902c1 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -111,7 +111,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/registr
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,\
 	AllListenerAdapter \
-	Converter \
 	Engine \
 	Invocation \
 	InvocationAdapterFactory \
@@ -153,6 +152,9 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\
 	SequenceOutputStream \
 	TempFile \
 ))
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/script,\
+	Converter \
+))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri,\
 	ExternalUriReferenceTranslator \
 	UriReferenceFactory \
diff --git a/udkapi/com/sun/star/beans/Introspection.idl b/udkapi/com/sun/star/beans/Introspection.idl
index 0e93138eb646..1f6d011d992f 100644
--- a/udkapi/com/sun/star/beans/Introspection.idl
+++ b/udkapi/com/sun/star/beans/Introspection.idl
@@ -45,12 +45,7 @@
     <p>For details see method <member>XIntrospection::inspect
     </member>.</p>
  */
-published service Introspection
-{
-    /// The only interface of this service
-    interface com::sun::star::beans::XIntrospection;
-
-};
+published service Introspection : com::sun::star::beans::XIntrospection;
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl b/udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl
index d8657d0a067c..ca8c9275294f 100644
--- a/udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl
@@ -63,7 +63,7 @@ module com {  module sun {  module star {  module beans {
         used to access the elements of the hierarchy,
         are formed.  </p>
 
-    <p> Commonly a notation similar to filesystem pathes
+    <p> Commonly a notation similar to filesystem paths
         (separated by '/' slashes) or nested module names
         (separated by dots '.' or '::') is used.  </p>
 
diff --git a/udkapi/com/sun/star/registry/ImplementationRegistration.idl b/udkapi/com/sun/star/registry/ImplementationRegistration.idl
index 03a365e7d54c..f925a2a10141 100644
--- a/udkapi/com/sun/star/registry/ImplementationRegistration.idl
+++ b/udkapi/com/sun/star/registry/ImplementationRegistration.idl
@@ -49,11 +49,7 @@
     </ul>
  */
 published service ImplementationRegistration
-{
-    // DocMerge: empty anyway
-    interface com::sun::star::registry::XImplementationRegistration;
-
-};
+  : com::sun::star::registry::XImplementationRegistration;
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/registry/SimpleRegistry.idl b/udkapi/com/sun/star/registry/SimpleRegistry.idl
index b4b8e5ab87b3..fbe06d99a0f3 100644
--- a/udkapi/com/sun/star/registry/SimpleRegistry.idl
+++ b/udkapi/com/sun/star/registry/SimpleRegistry.idl
@@ -46,12 +46,7 @@
     <li>-thread safe</li>
     </ul>
  */
-published service SimpleRegistry
-{
-    // DocMerge: empty anyway
-    interface com::sun::star::registry::XSimpleRegistry;
-
-};
+published service SimpleRegistry : com::sun::star::registry::XSimpleRegistry;
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/script/AllListenerAdapter.idl b/udkapi/com/sun/star/script/AllListenerAdapter.idl
index b98db50ea244..f454c1247ad8 100644
--- a/udkapi/com/sun/star/script/AllListenerAdapter.idl
+++ b/udkapi/com/sun/star/script/AllListenerAdapter.idl
@@ -40,10 +40,7 @@
     interfaces to the interface <type>XAllListener</type>.
  */
 published service AllListenerAdapter
-{
-    /// interface to create adapters for listener types
-    interface com::sun::star::script::XAllListenerAdapterService;
-};
+    : com::sun::star::script::XAllListenerAdapterService;
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/script/ContextInformation.idl b/udkapi/com/sun/star/script/ContextInformation.idl
index 11ea503ff545..62a4002c3b36 100644
--- a/udkapi/com/sun/star/script/ContextInformation.idl
+++ b/udkapi/com/sun/star/script/ContextInformation.idl
@@ -40,8 +40,8 @@
  */
 published struct ContextInformation
 {
-    /** Full qualified name to adress the module or function associated with the context.
-        If the module or function can't be adressed by name, e.g., in case that a runtime
+    /** Full qualified name to address the module or function associated with the context.
+        If the module or function can't be addressed by name, e.g., in case that a runtime
         generated eval-module is executed, this string is empty
      */
     string Name;
diff --git a/udkapi/com/sun/star/script/Converter.idl b/udkapi/com/sun/star/script/Converter.idl
index a98b49b74c33..7e3b7e050cc5 100644
--- a/udkapi/com/sun/star/script/Converter.idl
+++ b/udkapi/com/sun/star/script/Converter.idl
@@ -85,13 +85,7 @@
     of the destination sequence.</li>
     </ul>
 */
-published service Converter
-{
-    /** Conversion interface.
-    */
-    interface com::sun::star::script::XTypeConverter;
-
-};
+published service Converter: XTypeConverter;
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/script/Invocation.idl b/udkapi/com/sun/star/script/Invocation.idl
index 92ef143a833b..a72f7a6e4f49 100644
--- a/udkapi/com/sun/star/script/Invocation.idl
+++ b/udkapi/com/sun/star/script/Invocation.idl
@@ -46,12 +46,7 @@
     The adapter may also support <type scope="com::sun::star::script">XInvocation2</type>.
     </p>
  */
-published service Invocation
-{
-    /// Interface to specify the object to be mapped by the invocation service.
-    interface com::sun::star::lang::XSingleServiceFactory;
-
-};
+published service Invocation : com::sun::star::lang::XSingleServiceFactory;
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/security/AccessController.idl b/udkapi/com/sun/star/security/AccessController.idl
index 7748489f01b9..3ee1b8b06e13 100644
--- a/udkapi/com/sun/star/security/AccessController.idl
+++ b/udkapi/com/sun/star/security/AccessController.idl
@@ -51,10 +51,7 @@ module com {  module sun {  module star {  module security {
 
     @since OOo 1.1.2
 */
-published service AccessController
-{
-    interface XAccessController;
-};
+published service AccessController : XAccessController;
 
 }; }; }; };
 
diff --git a/udkapi/com/sun/star/security/Policy.idl b/udkapi/com/sun/star/security/Policy.idl
index e0894f09aace..045d2dbb3fe2 100644
--- a/udkapi/com/sun/star/security/Policy.idl
+++ b/udkapi/com/sun/star/security/Policy.idl
@@ -37,10 +37,7 @@ module com {  module sun {  module star {  module security {
 
     @since OOo 1.1.2
 */
-published service Policy
-{
-    interface XPolicy;
-};
+published service Policy : XPolicy;
 
 }; }; }; };
 
diff --git a/udkapi/com/sun/star/uno/NamingService.idl b/udkapi/com/sun/star/uno/NamingService.idl
index fd0390405db4..a67bdd1f4623 100644
--- a/udkapi/com/sun/star/uno/NamingService.idl
+++ b/udkapi/com/sun/star/uno/NamingService.idl
@@ -34,14 +34,8 @@
 
 //=============================================================================
 /** a simple named object container.
-
  */
-published service NamingService
-{
-    /** through this interface the objects are registered and accessed.
-     */
-    interface com::sun::star::uno::XNamingService;
-};
+published service NamingService : com::sun::star::uno::XNamingService;
 
 //=============================================================================