Merge commit 'ooo/DEV300_m106' into libreoffice-3-4

Conflicts: offapi/com/sun/star/animations/XAnimationNode.idl offapi/com/sun/star/awt/grid/XGridColumn.idl offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl offapi/com/sun/star/frame/ModuleManager.idl offapi/com/sun/star/frame/XLayoutManager.idl offapi/com/sun/star/frame/XLayoutManagerListener.idl offapi/com/sun/star/rendering/FontInfo.idl offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl offapi/com/sun/star/rendering/XCanvas.idl offapi/com/sun/star/rendering/XSprite.idl offapi/com/sun/star/report/ForceNewPage.idl offapi/com/sun/star/report/ReportPrintOption.idl offapi/com/sun/star/report/XFunctionsSupplier.idl offapi/com/sun/star/report/XReportControlFormat.idl offapi/com/sun/star/resource/StringResourceWithLocation.idl offapi/com/sun/star/resource/XStringResourceResolver.idl offapi/com/sun/star/resource/XStringResourceWithLocation.idl offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl offapi/com/sun/star/security/XCertificateContainer.idl offapi/com/sun/star/ui/UIElementFactory.idl offapi/com/sun/star/ui/XImageManager.idl offapi/com/sun/star/ui/XUIConfigurationManager.idl offapi/com/sun/star/ui/XUIElementFactory.idl offapi/com/sun/star/ui/XUIElementSettings.idl offapi/com/sun/star/xml/crypto/SEInitializer.idl offapi/com/sun/star/xml/crypto/XSEInitializer.idl offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl sal/rtl/source/alloc_arena.c udkapi/com/sun/star/task/XInteractionHandler2.idl
author: Jan Holesovsky <kendy@suse.cz> 2011-04-22 15:10:13 +0200
committer: Jan Holesovsky <kendy@suse.cz> 2011-04-22 15:10:13 +0200
commit: bef8909ce175f728d43501cfec4368eebd69cabf (patch)
tree: f5ea9873e1af554d82c351acdf85619c17f01de7
parent: 83e8a2bbe468b5439cc8e59cc04abf001677a8e6 (diff)
parent: 013fa416d39f1c219722e6736b7234f944fe774f (diff)
327 files changed, 1786 insertions, 543 deletions
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index a5ee3002a797..b564b12f01d8 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -172,10 +172,10 @@ OUString OTextInputStream::readLine(  )
     return implReadString( aDummySeq, sal_True, sal_True );
 }
 
-OUString OTextInputStream::readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool )
+OUString OTextInputStream::readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool bRemoveDelimiter )
         throw(IOException, RuntimeException)
 {
-    return implReadString( Delimiters, sal_True, sal_False );
+    return implReadString( Delimiters, bRemoveDelimiter, sal_False );
 }
 
 sal_Bool OTextInputStream::isEOF()
diff --git a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
index 1c4819326268..b0c093ffa2bb 100644
--- a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
+++ b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
@@ -108,7 +108,7 @@ public class BridgeFactory implements XBridgeFactory/*, XEventListener*/ {
         com.sun.star.uno.RuntimeException
     {
         boolean hasName = sName.length() != 0;
-        Object context = hasName ? (Object) sName : (Object) new UniqueToken();
+        Object context = hasName ? sName : new UniqueToken();
             // UnoRuntime.getBridgeByName internally uses context.toString() to
             // distinguish bridges, so the result of
             // new UniqueToken().toString() might clash with an explicit
@@ -128,7 +128,7 @@ public class BridgeFactory implements XBridgeFactory/*, XEventListener*/ {
             }
         }
 
-        XBridge xBridge = null;
+        XBridge xBridge;
 
         try {
             IBridge iBridge = UnoRuntime.getBridgeByName("java", context, "remote", context, hasName ? new Object[]{sProtocol, aConnection, anInstanceProvider, sName} : new Object[]{sProtocol, aConnection, anInstanceProvider});
diff --git a/jurt/com/sun/star/comp/connections/PipedConnection.java b/jurt/com/sun/star/comp/connections/PipedConnection.java
index f5a839ea78c5..aefc2eec3a7a 100644
--- a/jurt/com/sun/star/comp/connections/PipedConnection.java
+++ b/jurt/com/sun/star/comp/connections/PipedConnection.java
@@ -139,7 +139,7 @@ public class PipedConnection implements XConnection {
 
             if(_closed) throw new com.sun.star.io.IOException("connection has been closed");
 
-            int bytes = 0;
+            int bytes  ;
 
             if(_out < _in) {
                 bytes = Math.min(aData.length - bytesWritten, _in - _out - 1);
diff --git a/jurt/com/sun/star/comp/loader/FactoryHelper.java b/jurt/com/sun/star/comp/loader/FactoryHelper.java
index 29b484631670..ef0dda4e3f23 100644
--- a/jurt/com/sun/star/comp/loader/FactoryHelper.java
+++ b/jurt/com/sun/star/comp/loader/FactoryHelper.java
@@ -413,10 +413,7 @@ public class FactoryHelper {
                     _implementationId[2]= (byte)((hash >>> 16) & 0xff);
                     _implementationId[3]= (byte)((hash >>>24) & 0xff);
 
-                    for (int i= 0; i < nNameLength; i++)
-                    {
-                        _implementationId[4 + i]= arName[i];
-                    }
+                    System.arraycopy(arName, 0, _implementationId, 4, nNameLength);
                 }
             }
             return _implementationId;
@@ -453,7 +450,7 @@ public class FactoryHelper {
         XSingleServiceFactory xSingleServiceFactory = null;
 
         try {
-            Field serviceName = null;
+            Field serviceName  ;
 
             try {
                 serviceName = implClass.getField("__serviceName");
diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java b/jurt/com/sun/star/comp/loader/JavaLoader.java
index 47723b208497..25fc90b47676 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoader.java
+++ b/jurt/com/sun/star/comp/loader/JavaLoader.java
@@ -265,7 +265,7 @@ public class JavaLoader implements XImplementationLoader,
         locationUrl = expand_url( locationUrl );
 
         Object returnObject  = null;
-        Class clazz = null;
+        Class clazz  ;
 
         DEBUG("try to get factory for " + implementationName);
 
diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
index 6914ee5228e0..ab15529fc16b 100644
--- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
+++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
@@ -187,7 +187,7 @@ public class ServiceManager implements XMultiServiceFactory,
                     Class clazz = Class.forName( newImpls[i] );
 
                     Class[] methodClassParam = { String.class, XMultiServiceFactory.class, XRegistryKey.class };
-                    java.lang.reflect.Method getFactoryMeth = null;
+                    java.lang.reflect.Method getFactoryMeth  ;
                     try {
                         getFactoryMeth = clazz.getMethod("__getServiceFactory", methodClassParam);
                     }
@@ -233,7 +233,7 @@ public class ServiceManager implements XMultiServiceFactory,
     public void initialize( Object args[] )
                 throws  com.sun.star.uno.Exception,
                         com.sun.star.uno.RuntimeException {
-        XSimpleRegistry xSimpleRegistry = null;
+        XSimpleRegistry xSimpleRegistry  ;
         try {
             xSimpleRegistry = (XSimpleRegistry) args[0];
             if (xSimpleRegistry != null)
@@ -462,9 +462,9 @@ public class ServiceManager implements XMultiServiceFactory,
                 XEventListener listener = (XEventListener) enumer.nextElement();
                 listener.disposing(new com.sun.star.lang.EventObject(this));
             }
+            eventListener.removeAllElements();
         }
 
-        eventListener.removeAllElements();
         factoriesByServiceNames.clear();
         factoriesByImplNames.clear();
     }
@@ -527,12 +527,9 @@ public class ServiceManager implements XMultiServiceFactory,
 
             XServiceInfo xServiceInfo = UnoRuntime.queryInterface(XServiceInfo.class, object);
 
-            if (xServiceInfo != null) {
-                return UnoRuntime.areSame(factoriesByImplNames.get(xServiceInfo.getImplementationName()), object);
-            }
+        return xServiceInfo != null && UnoRuntime.areSame(factoriesByImplNames.get(xServiceInfo.getImplementationName()), object);
 
-        return false;
-    }
+        }
 
     /**
      * Adds a <code>SingleServiceFactory</code> to the <code>ServiceManager</code>.
@@ -567,7 +564,7 @@ public class ServiceManager implements XMultiServiceFactory,
 
 
         String[] serviceNames = xServiceInfo.getSupportedServiceNames();
-        java.util.Vector vec = null;
+        java.util.Vector vec  ;
 
         for (int i=0; i<serviceNames.length; i++) {
             if ( !factoriesByServiceNames.containsKey( serviceNames[i] ) ) {
@@ -688,7 +685,7 @@ public class ServiceManager implements XMultiServiceFactory,
     public XEnumeration createContentEnumeration( String serviceName )
                 throws com.sun.star.uno.RuntimeException
     {
-        XEnumeration enumer = null;
+        XEnumeration enumer  ;
 
         java.util.Vector serviceList = (java.util.Vector) factoriesByServiceNames.get(serviceName);
 
@@ -725,10 +722,9 @@ public class ServiceManager implements XMultiServiceFactory,
         for (int i=0; i<supportedServiceNames.length; i++)
             if (supportedServiceNames[i].equals( serviceName )) return true;
 
-        if (getImplementationName().equals( serviceName )) return true;
+        return getImplementationName().equals(serviceName);
 
-        return false;
-    }
+        }
 
     /**
      * Supplies list of all supported services.
@@ -781,11 +777,9 @@ public class ServiceManager implements XMultiServiceFactory,
         public boolean hasMoreElements()
                 throws com.sun.star.uno.RuntimeException
         {
-            if (enumeration != null)
-                return enumeration.hasMoreElements();
+            return enumeration != null && enumeration.hasMoreElements();
 
-            return false;
-        }
+            }
 
         /**
          * Returns the next element of the enumeration. If no further elements
@@ -859,10 +853,9 @@ class ServiceManagerFactory implements  XServiceInfo, XSingleComponentFactory, X
         for ( int i=0; i<ServiceManager.supportedServiceNames.length; i++ )
             if ( ServiceManager.supportedServiceNames[i].equals(serviceName) ) return true;
 
-        if ( getImplementationName().equals(serviceName) ) return true;
+        return getImplementationName().equals(serviceName);
 
-        return false;
-    }
+        }
 
     /**
      * Returns all service names which are supported by <code>ServiceManager</code>.
diff --git a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
index 538315638553..2a7bddcb01d9 100644
--- a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
+++ b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
@@ -71,9 +71,9 @@ public class UrlResolver {
         }
 
         public Object resolve(/*IN*/String dcp) throws NoConnectException, ConnectionSetupException, IllegalArgumentException, com.sun.star.uno.RuntimeException {
-            String conDcp = null;
-            String protDcp = null;
-            String rootOid = null;
+            String conDcp  ;
+            String protDcp  ;
+            String rootOid  ;
 
             if(dcp.indexOf(';') == -1) {// use old style
                 conDcp = dcp;
@@ -96,8 +96,8 @@ public class UrlResolver {
                 rootOid = dcp.trim().trim();
             }
 
-            Object rootObject = null;
-            XBridgeFactory xBridgeFactory= null;
+            Object rootObject  ;
+            XBridgeFactory xBridgeFactory ;
             try {
                 xBridgeFactory = UnoRuntime.queryInterface(XBridgeFactory.class,
                                                                           _xMultiServiceFactory.createInstance("com.sun.star.bridge.BridgeFactory"));
@@ -107,7 +107,7 @@ public class UrlResolver {
             XBridge xBridge = xBridgeFactory.getBridge(conDcp + ";" + protDcp);
 
             if(xBridge == null) {
-                Object connector= null;
+                Object connector ;
                 try {
                     connector = _xMultiServiceFactory.createInstance("com.sun.star.connection.Connector");
                 } catch (com.sun.star.uno.Exception e) {
diff --git a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
index 455e3aab6502..f18cafb29c3e 100644
--- a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
+++ b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
@@ -82,7 +82,7 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
         _bFirstRead = true;
 
         // get pipe name from pipe descriptor
-        String aPipeName = null;
+        String aPipeName  ;
         StringTokenizer aTokenizer = new StringTokenizer( description, "," );
         if ( aTokenizer.hasMoreTokens() )
         {
diff --git a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
index 8512bdb49fe1..13da9d5cbea9 100644
--- a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
+++ b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
@@ -149,7 +149,7 @@ public class SocketConnection implements XConnection, XConnectionBroadcaster {
         bytes[0] = new byte[nBytesToRead];
 
         try {
-            int count = 0;
+            int count  ;
 
             do {
                 count = _inputStream.read(bytes[0], read_bytes, nBytesToRead - read_bytes);
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
index ae2719f1c07d..c29be0c9558d 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
@@ -113,9 +113,8 @@ final class ProxyFactory {
             throws Throwable
         {
             if (method.equals(METHOD_EQUALS) || method.equals(METHOD_IS_SAME)) {
-                return new Boolean(
-                    args[0] != null
-                    && oid.equals(UnoRuntime.generateOid(args[0])));
+                return Boolean.valueOf(args[0] != null
+                        && oid.equals(UnoRuntime.generateOid(args[0])));
             } else if (method.equals(METHOD_HASH_CODE)) {
                 return new Integer(oid.hashCode());
             } else if (method.equals(METHOD_TO_STRING)) {
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
index e663a96d1ea7..274d9389bcf0 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
@@ -50,7 +50,7 @@ class XConnectionInputStream_Adapter extends InputStream {
 
     public int read() throws IOException {
 
-        int len = 0;
+        int len  ;
 
         try {
             len = _xConnection.read(_bytes, 1);
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
index 51f3594330ee..51e4b6d0182c 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
@@ -60,7 +60,7 @@ class XConnectionOutputStream_Adapter extends OutputStream {
     }
 
     public void write(byte[] b, int off, int len) throws IOException {
-        byte bytes[] = null;
+        byte bytes[]  ;
 
         if(off == 0 && len == b.length)
             bytes = b;
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
index 221870b0b035..37f53629cc63 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
@@ -623,8 +623,6 @@ public class java_remote_bridge
 
         checkDisposed();
 
-        boolean goThroughThreadPool = false;
-
         ThreadId threadId = _iThreadPool.getThreadId();
         Object handle = _iThreadPool.attach(threadId);
         try {
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java b/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
index 5a500ad3a0c1..fe7ea2231589 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
+++ b/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
@@ -91,7 +91,7 @@ final class Unmarshal {
 
     public ThreadId readThreadId() {
         int len = readCompressedNumber();
-        byte[] data = null;
+        byte[] data  ;
         ThreadId id = null;
         if (len != 0) {
             data = new byte[len];
diff --git a/jurt/com/sun/star/lib/util/UrlToFileMapper.java b/jurt/com/sun/star/lib/util/UrlToFileMapper.java
index 22b6ccf0a745..9de0a199880f 100644
--- a/jurt/com/sun/star/lib/util/UrlToFileMapper.java
+++ b/jurt/com/sun/star/lib/util/UrlToFileMapper.java
@@ -145,7 +145,7 @@ public final class UrlToFileMapper {
                 try {
                     enc = (String) urlEncoderEncode.invoke(
                         null,
-                        new Object[] { new Character(c).toString(), "UTF-8" });
+                        new Object[] {Character.toString(c), "UTF-8" });
                 } catch (IllegalAccessException e) {
                     throw new RuntimeException("This cannot happen: " + e);
                 } catch (InvocationTargetException e) {
diff --git a/offapi/com/sun/star/animations/XAnimationListener.idl b/offapi/com/sun/star/animations/XAnimationListener.idl
index d1f4f453ee60..c0582d229f8f 100644
--- a/offapi/com/sun/star/animations/XAnimationListener.idl
+++ b/offapi/com/sun/star/animations/XAnimationListener.idl
@@ -45,7 +45,7 @@
 
     @since OOo 3.0
  */
-interface XAnimationListener : ::com::sun::star::lang::XEventListener
+published interface XAnimationListener : ::com::sun::star::lang::XEventListener
 {
     /** This event is raised when the element local timeline begins to play.
         <p>It will be raised each time the element begins the active duration (i.e. when it restarts, but not when it repeats).</p>
diff --git a/offapi/com/sun/star/animations/XAnimationNode.idl b/offapi/com/sun/star/animations/XAnimationNode.idl
index f2d5d859ce5f..d5d5a8e4c271 100644
--- a/offapi/com/sun/star/animations/XAnimationNode.idl
+++ b/offapi/com/sun/star/animations/XAnimationNode.idl
@@ -43,7 +43,7 @@
 
 /**
 */
-interface XAnimationNode : ::com::sun::star::container::XChild
+published interface XAnimationNode : ::com::sun::star::container::XChild
 {
     /**  a value from <const>AnimationNodeType</const>.
 
diff --git a/offapi/com/sun/star/awt/AnimatedImagesControlModel.idl b/offapi/com/sun/star/awt/AnimatedImagesControlModel.idl
index 2bc1260775c9..5d8aecdc07d8 100644
--- a/offapi/com/sun/star/awt/AnimatedImagesControlModel.idl
+++ b/offapi/com/sun/star/awt/AnimatedImagesControlModel.idl
@@ -33,7 +33,7 @@
 
 module com { module sun { module star { module awt {
 
-interface XAnimatedImages;
+published interface XAnimatedImages;
 
 //======================================================================================================================
 
@@ -41,7 +41,7 @@ interface XAnimatedImages;
 
     @since OOo 3.4
  */
-service AnimatedImagesControlModel
+published service AnimatedImagesControlModel
 {
     service com::sun::star::awt::UnoControlModel;
 
diff --git a/offapi/com/sun/star/awt/AsyncCallback.idl b/offapi/com/sun/star/awt/AsyncCallback.idl
index 6c1d9feef993..4d7c3048ba1a 100644
--- a/offapi/com/sun/star/awt/AsyncCallback.idl
+++ b/offapi/com/sun/star/awt/AsyncCallback.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module awt {
 
     @see XRequestCallback
  */
-service AsyncCallback: XRequestCallback;
+published service AsyncCallback: XRequestCallback;
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/awt/ContainerWindowProvider.idl b/offapi/com/sun/star/awt/ContainerWindowProvider.idl
index 74bc62d11b56..f19d08a8e1bd 100644
--- a/offapi/com/sun/star/awt/ContainerWindowProvider.idl
+++ b/offapi/com/sun/star/awt/ContainerWindowProvider.idl
@@ -46,7 +46,7 @@ module com { module sun { module star { module awt {
 /** specifies a provider for container windows implementing the
     <type scope="com::sun::star::awt">XWindow</type> interface.
  */
-service ContainerWindowProvider : com::sun::star::awt::XContainerWindowProvider;
+published service ContainerWindowProvider : com::sun::star::awt::XContainerWindowProvider;
 
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/DialogProvider.idl b/offapi/com/sun/star/awt/DialogProvider.idl
index 863a107755d6..06768493d680 100644
--- a/offapi/com/sun/star/awt/DialogProvider.idl
+++ b/offapi/com/sun/star/awt/DialogProvider.idl
@@ -46,7 +46,7 @@ module com { module sun { module star { module awt {
 /** specifies a provider for dialogs implementing the
     <type scope="com::sun::star::awt">XDialog</type> interface.
  */
-service DialogProvider : com::sun::star::awt::XDialogProvider;
+published service DialogProvider : com::sun::star::awt::XDialogProvider;
 
 // service DialogProvider {
     // interface com::sun::star::awt::XDialogProvider;
diff --git a/offapi/com/sun/star/awt/DialogProvider2.idl b/offapi/com/sun/star/awt/DialogProvider2.idl
index be0db00bf859..8299db6ae7e4 100644
--- a/offapi/com/sun/star/awt/DialogProvider2.idl
+++ b/offapi/com/sun/star/awt/DialogProvider2.idl
@@ -46,7 +46,7 @@ module com { module sun { module star { module awt {
 /** specifies a provider for dialogs implementing the
     <type scope="com::sun::star::awt">XDialog</type> interface.
  */
-service DialogProvider2 : com::sun::star::awt::XDialogProvider2;
+published service DialogProvider2 : com::sun::star::awt::XDialogProvider2;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/awt/ItemListEvent.idl b/offapi/com/sun/star/awt/ItemListEvent.idl
index f9d2658bd5bd..bcd072062ddc 100644
--- a/offapi/com/sun/star/awt/ItemListEvent.idl
+++ b/offapi/com/sun/star/awt/ItemListEvent.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module awt {
 /** is the event broadcasted by a <type>XListItems</type> implementation for changes
     in its item list.
  */
-struct ItemListEvent : ::com::sun::star::lang::EventObject
+published struct ItemListEvent : ::com::sun::star::lang::EventObject
 {
     /** specifies the position of the item which is affected by the event
 
diff --git a/offapi/com/sun/star/awt/MenuItemType.idl b/offapi/com/sun/star/awt/MenuItemType.idl
index af05e84f67f0..8f4606aa14cc 100644
--- a/offapi/com/sun/star/awt/MenuItemType.idl
+++ b/offapi/com/sun/star/awt/MenuItemType.idl
@@ -37,7 +37,7 @@
 /** specifies the type of a menu item, as returned by
     <member scope="com::sun::star::awt">XMenuExtended2::getItemType()</member>.
  */
-enum MenuItemType
+published enum MenuItemType
 {
     /** specifies that the menu item type is unknown.
     */
diff --git a/offapi/com/sun/star/awt/MenuLogo.idl b/offapi/com/sun/star/awt/MenuLogo.idl
index a84f6be2f04a..4e558a5364c3 100644
--- a/offapi/com/sun/star/awt/MenuLogo.idl
+++ b/offapi/com/sun/star/awt/MenuLogo.idl
@@ -43,7 +43,7 @@
 
 /** specifies a logo to be displayed on a menu, with a background gradient.
  */
-struct MenuLogo
+published struct MenuLogo
 {
     /** specifies the logo image.
      */
diff --git a/offapi/com/sun/star/awt/SpinningProgressControlModel.idl b/offapi/com/sun/star/awt/SpinningProgressControlModel.idl
index a75417d41cc3..c6c273bce26d 100644
--- a/offapi/com/sun/star/awt/SpinningProgressControlModel.idl
+++ b/offapi/com/sun/star/awt/SpinningProgressControlModel.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module awt {
 
     <p>Three image sets are provided, of size 16x16, 32x32, and 64x64 pixels.</p>
  */
-service SpinningProgressControlModel
+published service SpinningProgressControlModel
 {
     service AnimatedImagesControlModel;
 };
diff --git a/offapi/com/sun/star/awt/XAnimatedImages.idl b/offapi/com/sun/star/awt/XAnimatedImages.idl
index a03d08c965f1..6a470882ed44 100644
--- a/offapi/com/sun/star/awt/XAnimatedImages.idl
+++ b/offapi/com/sun/star/awt/XAnimatedImages.idl
@@ -46,7 +46,7 @@ module com { module sun { module star { module awt {
 
     @since OOo 3.4
  */
-interface XAnimatedImages
+published interface XAnimatedImages
 {
     /** specifies the time in milliseconds between two animation steps.
 
diff --git a/offapi/com/sun/star/awt/XAnimation.idl b/offapi/com/sun/star/awt/XAnimation.idl
index e1e8f6023a7d..28947b87d5a4 100644
--- a/offapi/com/sun/star/awt/XAnimation.idl
+++ b/offapi/com/sun/star/awt/XAnimation.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module awt {
 
     @since OOo 3.4
  */
-interface XAnimation
+published interface XAnimation
 {
     /** starts the animation
     */
diff --git a/offapi/com/sun/star/awt/XCallback.idl b/offapi/com/sun/star/awt/XCallback.idl
index 25cc9bd522bb..f82b94212182 100644
--- a/offapi/com/sun/star/awt/XCallback.idl
+++ b/offapi/com/sun/star/awt/XCallback.idl
@@ -41,7 +41,7 @@ module com { module sun { module star { module awt {
 /** specifies an interface which can be used to call back
     an implementation
  */
-interface XCallback
+published interface XCallback
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl b/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
index d1e2d725c02e..21711d918ac9 100644
--- a/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
+++ b/offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
@@ -48,7 +48,7 @@ module com { module sun { module star { module awt {
 /** Handles events fired by windows represented by a
     <type scope="com::sun::star::awt">XWindow</type> interface.
  */
-interface XContainerWindowEventHandler : ::com::sun::star::uno::XInterface {
+published interface XContainerWindowEventHandler : ::com::sun::star::uno::XInterface {
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/awt/XContainerWindowProvider.idl b/offapi/com/sun/star/awt/XContainerWindowProvider.idl
index 1cea42d99a80..6435c80d5025 100644
--- a/offapi/com/sun/star/awt/XContainerWindowProvider.idl
+++ b/offapi/com/sun/star/awt/XContainerWindowProvider.idl
@@ -47,7 +47,7 @@ module com { module sun { module star { module awt {
 /** provides container windows implementing the
     <type scope="com::sun::star::awt">XWindow</type> interface.
  */
-interface XContainerWindowProvider : ::com::sun::star::uno::XInterface {
+published interface XContainerWindowProvider : ::com::sun::star::uno::XInterface {
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/awt/XDialogEventHandler.idl b/offapi/com/sun/star/awt/XDialogEventHandler.idl
index 206d71bb5dee..57348bdb6eb2 100644
--- a/offapi/com/sun/star/awt/XDialogEventHandler.idl
+++ b/offapi/com/sun/star/awt/XDialogEventHandler.idl
@@ -48,7 +48,7 @@ module com { module sun { module star { module awt {
 /** Handles events fired by dialogs represented by a
     <type scope="com::sun::star::awt">XDialog</type> interface.
  */
-interface XDialogEventHandler : ::com::sun::star::uno::XInterface {
+published interface XDialogEventHandler : ::com::sun::star::uno::XInterface {
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/awt/XDialogProvider.idl b/offapi/com/sun/star/awt/XDialogProvider.idl
index 2ab873df16b6..625483c01909 100644
--- a/offapi/com/sun/star/awt/XDialogProvider.idl
+++ b/offapi/com/sun/star/awt/XDialogProvider.idl
@@ -48,7 +48,7 @@ module com { module sun { module star { module awt {
 /** provides dialogs implementing the
     <type scope="com::sun::star::awt">XDialog</type> interface.
  */
-interface XDialogProvider : ::com::sun::star::uno::XInterface {
+published interface XDialogProvider : ::com::sun::star::uno::XInterface {
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/awt/XDialogProvider2.idl b/offapi/com/sun/star/awt/XDialogProvider2.idl
index f24a783cb7fc..29d0915017eb 100644
--- a/offapi/com/sun/star/awt/XDialogProvider2.idl
+++ b/offapi/com/sun/star/awt/XDialogProvider2.idl
@@ -45,7 +45,7 @@ module com { module sun { module star { module awt {
 /** provides dialogs implementing the
     <type scope="com::sun::star::awt">XDialog</type> interface.
  */
-interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
+published interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
 
     //-------------------------------------------------------------------------
 
@@ -107,7 +107,7 @@ interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
         @see <type scope="com::sun::star::awt">XDialogEventHandler</type>
 
      */
-    com::sun::star::awt::XDialog createDialogWithHandler
+    XDialog createDialogWithHandler
         ( [in] string URL, [in] com::sun::star::uno::XInterface xHandler )
             raises ( com::sun::star::lang::IllegalArgumentException );
 
@@ -123,12 +123,10 @@ interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
         </p>
     */
 
-    XDialog createDialogWithArguments(
-        [in] string URL,
-        [in] sequence< ::com::sun::star::beans::NamedValue > Arguments
-    )
-    raises  (   com::sun::star::lang::IllegalArgumentException
-            );
+    XDialog createDialogWithArguments
+        ( [in] string URL,
+          [in] sequence< ::com::sun::star::beans::NamedValue > Arguments )
+        raises  ( com::sun::star::lang::IllegalArgumentException );
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XFixedHyperlink.idl b/offapi/com/sun/star/awt/XFixedHyperlink.idl
index 9fb6965b6e4a..978549828779 100644
--- a/offapi/com/sun/star/awt/XFixedHyperlink.idl
+++ b/offapi/com/sun/star/awt/XFixedHyperlink.idl
@@ -43,7 +43,7 @@
 
 /** gives access to the text and formatting of a fixed hyperlink field.
  */
-interface XFixedHyperlink: com::sun::star::uno::XInterface
+published interface XFixedHyperlink: com::sun::star::uno::XInterface
 {
         //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/awt/XItemEventBroadcaster.idl b/offapi/com/sun/star/awt/XItemEventBroadcaster.idl
index ca4bb0727f91..8eb95215eb68 100644
--- a/offapi/com/sun/star/awt/XItemEventBroadcaster.idl
+++ b/offapi/com/sun/star/awt/XItemEventBroadcaster.idl
@@ -46,7 +46,7 @@
 /**  registers item listeners at controls like the com::sun::star::awt::Roadmap
  */
 
-interface XItemEventBroadcaster: com::sun::star::uno::XInterface
+published interface XItemEventBroadcaster: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/awt/XItemList.idl b/offapi/com/sun/star/awt/XItemList.idl
index 17b6835261b2..aefb739d78ef 100644
--- a/offapi/com/sun/star/awt/XItemList.idl
+++ b/offapi/com/sun/star/awt/XItemList.idl
@@ -34,13 +34,13 @@
 
 module com { module sun { module star { module awt {
 
-interface XItemListListener;
+published interface XItemListListener;
 
 //==================================================================================================================
 
 /** provides convenient access to the list of items in a list box
  */
-interface XItemList
+published interface XItemList
 {
     /** is the number of items in the list
     */
diff --git a/offapi/com/sun/star/awt/XItemListListener.idl b/offapi/com/sun/star/awt/XItemListListener.idl
index a7ec6fee830a..27ef1831aba6 100644
--- a/offapi/com/sun/star/awt/XItemListListener.idl
+++ b/offapi/com/sun/star/awt/XItemListListener.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module awt {
 /** describes a listener for changes in a item list
     @see XListItems
  */
-interface XItemListListener : ::com::sun::star::lang::XEventListener
+published interface XItemListListener : ::com::sun::star::lang::XEventListener
 {
     /** is called when an item is inserted into the list
     */
diff --git a/offapi/com/sun/star/awt/XMenuExtended.idl b/offapi/com/sun/star/awt/XMenuExtended.idl
index ba850ca5d416..3efa60eeafe1 100644
--- a/offapi/com/sun/star/awt/XMenuExtended.idl
+++ b/offapi/com/sun/star/awt/XMenuExtended.idl
@@ -38,7 +38,7 @@ module com {  module sun {  module star {  module awt {
 /** specifies extended menu functions.
  */
 
-interface XMenuExtended: com::sun::star::uno::XInterface
+published interface XMenuExtended: com::sun::star::uno::XInterface
 {
     /** sets the command string for the menu item.
 
diff --git a/offapi/com/sun/star/awt/XMenuExtended2.idl b/offapi/com/sun/star/awt/XMenuExtended2.idl
index d1b97254194e..7f0ab1794634 100644
--- a/offapi/com/sun/star/awt/XMenuExtended2.idl
+++ b/offapi/com/sun/star/awt/XMenuExtended2.idl
@@ -50,7 +50,7 @@ module com {  module sun {  module star {  module awt {
 /** specifies extended menu functions.
  */
 
-interface XMenuExtended2
+published interface XMenuExtended2
 {
     /** specifies some extended menu functions, like setting a command URL and a help command for a menu item.<br>
         These functions are available for both menu bar and pop-up menu.
diff --git a/offapi/com/sun/star/awt/XPopupMenuExtended.idl b/offapi/com/sun/star/awt/XPopupMenuExtended.idl
index 69c8753290e7..e45326540790 100644
--- a/offapi/com/sun/star/awt/XPopupMenuExtended.idl
+++ b/offapi/com/sun/star/awt/XPopupMenuExtended.idl
@@ -63,7 +63,7 @@ module com {  module sun {  module star {  module awt {
 
     @since OOo 3.1
  */
-interface XPopupMenuExtended
+published interface XPopupMenuExtended
 {
     /** specifies basic functions for a pop-up menu.
     */
diff --git a/offapi/com/sun/star/awt/XRequestCallback.idl b/offapi/com/sun/star/awt/XRequestCallback.idl
index 8c047312ccb7..87e03b099375 100644
--- a/offapi/com/sun/star/awt/XRequestCallback.idl
+++ b/offapi/com/sun/star/awt/XRequestCallback.idl
@@ -41,7 +41,7 @@ module com { module sun { module star { module awt {
 /** specifies an interface which can be used to call back
     an implementation
  */
-interface XRequestCallback
+published interface XRequestCallback
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/awt/XSimpleTabController.idl b/offapi/com/sun/star/awt/XSimpleTabController.idl
index 10309ad70a80..e31cf945a918 100644
--- a/offapi/com/sun/star/awt/XSimpleTabController.idl
+++ b/offapi/com/sun/star/awt/XSimpleTabController.idl
@@ -52,7 +52,7 @@
 /** specifies the basic operations for a tab controller,
     but does not require XControl as type of tabs.
  */
-interface XSimpleTabController : com::sun::star::uno::XInterface
+published interface XSimpleTabController : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** create a new tab and return an unique ID,
diff --git a/offapi/com/sun/star/awt/XStyleChangeListener.idl b/offapi/com/sun/star/awt/XStyleChangeListener.idl
index 819f211a737f..97ef47bfaf23 100644
--- a/offapi/com/sun/star/awt/XStyleChangeListener.idl
+++ b/offapi/com/sun/star/awt/XStyleChangeListener.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module awt {
 
     @see XStyleSettings
  */
-interface XStyleChangeListener : ::com::sun::star::lang::XEventListener
+published interface XStyleChangeListener : ::com::sun::star::lang::XEventListener
 {
     /// called when the style settings of the observed component changed
     void    styleSettingsChanged( [in] com::sun::star::lang::EventObject Event );
diff --git a/offapi/com/sun/star/awt/XStyleSettings.idl b/offapi/com/sun/star/awt/XStyleSettings.idl
index 67c3bba7d8f1..bb9525f23703 100644
--- a/offapi/com/sun/star/awt/XStyleSettings.idl
+++ b/offapi/com/sun/star/awt/XStyleSettings.idl
@@ -35,7 +35,7 @@
 
 module com { module sun { module star { module awt {
 
-interface XStyleChangeListener;
+published interface XStyleChangeListener;
 
 //==================================================================================================================
 
@@ -53,7 +53,7 @@ interface XStyleChangeListener;
     while the text is drawn by OpenOffice.org. In this case, the button respects the
     <code>ButtonRolloverTextColor</code> when painting its text.</p>
  */
-interface XStyleSettings
+published interface XStyleSettings
 {
     /// specifies the color of the border of active windows
     [attribute] ::com::sun::star::util::Color ActiveBorderColor;
diff --git a/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl b/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl
index cb60994ff894..d3622bbc2015 100644
--- a/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl
+++ b/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl
@@ -32,13 +32,13 @@
 
 module com { module sun { module star { module awt {
 
-    interface XStyleSettings;
+    published interface XStyleSettings;
 
 //==================================================================================================================
 
 /** provides access to the style settings of a component
  */
-interface XStyleSettingsSupplier
+published interface XStyleSettingsSupplier
 {
     [attribute, readonly] XStyleSettings StyleSettings;
 };
diff --git a/offapi/com/sun/star/awt/XTabListener.idl b/offapi/com/sun/star/awt/XTabListener.idl
index 709f0f2c388c..d5efc637c608 100644
--- a/offapi/com/sun/star/awt/XTabListener.idl
+++ b/offapi/com/sun/star/awt/XTabListener.idl
@@ -48,7 +48,7 @@
 /** such listener will be informed if tab's was inserted/removed from
     an XSimpleTabController instance or if the properties of a tab was changed.
  */
-interface XTabListener : com::sun::star::lang::XEventListener
+published interface XTabListener : com::sun::star::lang::XEventListener
 {
     //-------------------------------------------------------------------------
     /** a new tab was inserted.
diff --git a/offapi/com/sun/star/awt/XUnitConversion.idl b/offapi/com/sun/star/awt/XUnitConversion.idl
index b04802ee0728..aed9b4cbeee2 100644
--- a/offapi/com/sun/star/awt/XUnitConversion.idl
+++ b/offapi/com/sun/star/awt/XUnitConversion.idl
@@ -53,7 +53,7 @@
 
     @since OOo 3.0
  */
-interface XUnitConversion: com::sun::star::uno::XInterface
+published interface XUnitConversion: com::sun::star::uno::XInterface
 {
     /** converts the given <type>Point</type>, which is specified in pixels, into the given logical unit
 
diff --git a/offapi/com/sun/star/awt/XWindowListener2.idl b/offapi/com/sun/star/awt/XWindowListener2.idl
index 1313246664ef..bfb0dbab86fe 100644
--- a/offapi/com/sun/star/awt/XWindowListener2.idl
+++ b/offapi/com/sun/star/awt/XWindowListener2.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module awt {
 
 /** allows receive window-related events, additional to the ones received by an <type>XWindowListener</type>
  */
-interface XWindowListener2: XWindowListener
+published interface XWindowListener2: XWindowListener
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
index 22380b944a83..0fe19dfea71a 100644
--- a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module awt { module grid {
 
     @since OOo 3.3
  */
-struct GridColumnEvent: com::sun::star::lang::EventObject
+published struct GridColumnEvent: com::sun::star::lang::EventObject
 {
     /** Contains the name of the attributes whose value changed. **/
     string AttributeName;
diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl
index 1fa52dcae706..3a359c451ff4 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl
@@ -42,7 +42,7 @@ module com {  module sun {  module star {  module awt {  module grid {
 /** The <type>XGridColumn</types> defines the properties and behavior of a column in a grid control
     @since OOo 3.3
  */
-interface XGridColumn
+published interface XGridColumn
 {
     /** implements life time control for the component
     */
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
index 09ac590ba3f2..be1b0b1714a1 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
@@ -41,7 +41,7 @@ module com {  module sun {  module star {  module awt { module grid {
 
     @since OOo 3.3
  */
-interface XGridColumnListener : ::com::sun::star::lang::XEventListener
+published interface XGridColumnListener : ::com::sun::star::lang::XEventListener
 {
     /** Invoked after a column was modified.
     */
diff --git a/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl b/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
index ef678395fe06..e3fd0c46b1db 100644
--- a/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
+++ b/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
@@ -41,7 +41,7 @@ module com {  module sun {  module star {  module awt { module tab {
 
     @since OOo 3.4
  */
-struct TabPageActivatedEvent: com::sun::star::lang::EventObject
+published struct TabPageActivatedEvent: com::sun::star::lang::EventObject
 {
     /** Contains the ID of the tab page
     */
diff --git a/offapi/com/sun/star/awt/tab/UnoControlTabPageContainerModel.idl b/offapi/com/sun/star/awt/tab/UnoControlTabPageContainerModel.idl
index b97b7881b416..bb9a8456a330 100644
--- a/offapi/com/sun/star/awt/tab/UnoControlTabPageContainerModel.idl
+++ b/offapi/com/sun/star/awt/tab/UnoControlTabPageContainerModel.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module awt {  module tab {
 
     @since OOo 3.4
  */
-service UnoControlTabPageContainerModel
+published service UnoControlTabPageContainerModel
 {
     service com::sun::star::awt::UnoControlModel;
 
diff --git a/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl b/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
index 3508e33260c7..266f6a56119a 100644
--- a/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
+++ b/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
@@ -38,13 +38,13 @@ module com {  module sun {  module star {  module awt { module tab {
 /** specifies the standard model of a XTabPageModel.
     @since OOo 3.4
  */
-service UnoControlTabPageModel : XTabPageModel
+published service UnoControlTabPageModel : XTabPageModel
 {
     /** Creates a new XTabPageModel with a given ID.
     */
     create([in] short tabPageID);
 
-    /** Creates a new XTabPageModel with a given ID and a url which is used to load teh tab page model.
+    /** Creates a new XTabPageModel with a given ID and a url which is used to load the tab page model.
     */
     load([in] short tabPageID,[in] string url);
 };
diff --git a/offapi/com/sun/star/awt/tab/XTabPage.idl b/offapi/com/sun/star/awt/tab/XTabPage.idl
index 616820071f5b..0c79d34075d5 100644
--- a/offapi/com/sun/star/awt/tab/XTabPage.idl
+++ b/offapi/com/sun/star/awt/tab/XTabPage.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module awt { module tab {
 
     @since OOo 3.4
  */
-interface XTabPage
+published interface XTabPage
 {
 
 };
diff --git a/offapi/com/sun/star/awt/tab/XTabPageContainer.idl b/offapi/com/sun/star/awt/tab/XTabPageContainer.idl
index e62cf4c365c1..0349b04cc637 100644
--- a/offapi/com/sun/star/awt/tab/XTabPageContainer.idl
+++ b/offapi/com/sun/star/awt/tab/XTabPageContainer.idl
@@ -41,7 +41,7 @@ module com {  module sun {  module star {  module awt { module tab {
 
     @since OOo 3.4
  */
-interface XTabPageContainer
+published interface XTabPageContainer
 {
     /** Returns the number of tab pages.
         @returns
diff --git a/offapi/com/sun/star/awt/tab/XTabPageContainerListener.idl b/offapi/com/sun/star/awt/tab/XTabPageContainerListener.idl
index f46951231513..6bfe04e5babe 100644
--- a/offapi/com/sun/star/awt/tab/XTabPageContainerListener.idl
+++ b/offapi/com/sun/star/awt/tab/XTabPageContainerListener.idl
@@ -41,7 +41,7 @@ module com {  module sun {  module star {  module awt { module tab {
 
     @since OOo 3.4
  */
-interface XTabPageContainerListener: com::sun::star::lang::XEventListener
+published interface XTabPageContainerListener: com::sun::star::lang::XEventListener
 {
     //-------------------------------------------------------------------------
     /** Invoked after a tab page was activated.
diff --git a/offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl b/offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl
index cc815209a01d..8b3bf2d9afbd 100644
--- a/offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl
+++ b/offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module awt {  module tab {
 
     @since OOo 3.4
  */
-interface XTabPageContainerModel
+published interface XTabPageContainerModel
 {
     interface com::sun::star::container::XIndexContainer;
     interface com::sun::star::container::XContainer;
diff --git a/offapi/com/sun/star/awt/tab/XTabPageModel.idl b/offapi/com/sun/star/awt/tab/XTabPageModel.idl
index 15fae422bb17..b07c3ea4ec6d 100644
--- a/offapi/com/sun/star/awt/tab/XTabPageModel.idl
+++ b/offapi/com/sun/star/awt/tab/XTabPageModel.idl
@@ -43,7 +43,7 @@ module com {  module sun {  module star {  module awt {  module tab {
     @since OOo 3.4
 */
 
-interface XTabPageModel
+published interface XTabPageModel
 {
     //interface com::sun::star::lang::XMultiServiceFactory;
 
diff --git a/offapi/com/sun/star/awt/tree/ExpandVetoException.idl b/offapi/com/sun/star/awt/tree/ExpandVetoException.idl
index cbee77879859..b3675f334336 100644
--- a/offapi/com/sun/star/awt/tree/ExpandVetoException.idl
+++ b/offapi/com/sun/star/awt/tree/ExpandVetoException.idl
@@ -45,7 +45,7 @@ module com {  module sun {  module star {  module awt { module tree {
     @see XTreeExpansionListener
     @see XTreeControl
  */
-exception ExpandVetoException : com::sun::star::util::VetoException
+published exception ExpandVetoException : com::sun::star::util::VetoException
 {
     /** The event that the exception was created for. */
     TreeExpansionEvent Event;
diff --git a/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl b/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl
index adad5cf63830..c708f1570d18 100644
--- a/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl
+++ b/offapi/com/sun/star/awt/tree/MutableTreeDataModel.idl
@@ -44,7 +44,7 @@ module com {  module sun {  module star {  module awt {  module tree {
 /** If you do not want to implement the <type>XTreeDataModel</type> yourself, use this service.
     This implementation uses <type>MutableTreeNode</type> for its nodes.
  */
-service MutableTreeDataModel : XMutableTreeDataModel
+published service MutableTreeDataModel : XMutableTreeDataModel
 {
 };
 
diff --git a/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl b/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
index 380848950e6e..c0210870788f 100644
--- a/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
+++ b/offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
@@ -50,7 +50,7 @@ module com {  module sun {  module star {  module awt { module tree {
     @see XTreeControl
     @see XTreeDataModelListener
  */
-struct TreeDataModelEvent : ::com::sun::star::lang::EventObject
+published struct TreeDataModelEvent : ::com::sun::star::lang::EventObject
 {
     /** contains the changed, added or removed nodes.
         <p> All nodes must have <member>ParentNode</member> as parent. */
diff --git a/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl b/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
index 20ee645d56e8..524b43dd3e6b 100644
--- a/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
+++ b/offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
@@ -46,7 +46,7 @@ module com {  module sun {  module star {  module awt { module tree {
     @see XTreeExpansionListener
     @see XTreeControl
  */
-struct TreeExpansionEvent : ::com::sun::star::lang::EventObject
+published struct TreeExpansionEvent : ::com::sun::star::lang::EventObject
 {
     /* The node that has been expanded/collapsed.*/
     com::sun::star::awt::tree::XTreeNode Node;
diff --git a/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl b/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
index cbea855eec6d..348e91cebbd6 100644
--- a/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
+++ b/offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
@@ -46,7 +46,7 @@ module com {  module sun {  module star {  module awt {  module tree {
     <p>Note that only <type>XTreeNode</type> created from the same instance with <member>createNode</member>
     are valid nodes for this instance.</p>
  */
-interface XMutableTreeDataModel : XTreeDataModel
+published interface XMutableTreeDataModel : XTreeDataModel
 {
     /** creates a new tree node with the given value and given settings.
 
diff --git a/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl b/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
index 5ec6c1e13f6b..6aa9b4d6ccfb 100644
--- a/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
+++ b/offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
@@ -47,7 +47,7 @@ module com {  module sun {  module star {  module awt { module tree {
 
 /** Represents a mutable tree node as used by the <type>MutableTreeDataModel</type>
  */
-interface XMutableTreeNode : XTreeNode
+published interface XMutableTreeNode : XTreeNode
 {
     /** appends <var>ChildNode</var> to this instance.
 
diff --git a/offapi/com/sun/star/awt/tree/XTreeControl.idl b/offapi/com/sun/star/awt/tree/XTreeControl.idl
index edc135021fc4..f03b5a066082 100644
--- a/offapi/com/sun/star/awt/tree/XTreeControl.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeControl.idl
@@ -53,7 +53,7 @@ module com {  module sun {  module star {  module awt { module tree {
 
     @see TreeControl
  */
-interface XTreeControl
+published interface XTreeControl
 {
     /** This interfaces provides access to the selection of tree nodes for this control.
 
diff --git a/offapi/com/sun/star/awt/tree/XTreeDataModel.idl b/offapi/com/sun/star/awt/tree/XTreeDataModel.idl
index 50f6dcae2151..f6eac6b115a3 100644
--- a/offapi/com/sun/star/awt/tree/XTreeDataModel.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeDataModel.idl
@@ -58,7 +58,7 @@ module com {  module sun {  module star {  module awt {  module tree {
 
     If you do not need your own model implementation, you can also use the <type>MutableTreeDataModel</type>.
 */
-interface XTreeDataModel : ::com::sun::star::lang::XComponent
+published interface XTreeDataModel : ::com::sun::star::lang::XComponent
 {
     /** Returns the root of the tree.
         <p>Returns null only if the tree has no nodes.
diff --git a/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl b/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
index 5110dac3623e..5925eeab3f5d 100644
--- a/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
@@ -49,7 +49,7 @@ module com {  module sun {  module star {  module awt {  module tree {
     by the <type>TreeControl</type>, but you must notify it correctly if
     you implement the <type>XTreeDataModel</type> yourself</p>.
  */
-interface XTreeDataModelListener: com::sun::star::lang::XEventListener
+published interface XTreeDataModelListener: com::sun::star::lang::XEventListener
 {
     /** Invoked after a node (or a set of siblings) has changed in some way.
         The node(s) have not changed locations in the tree or altered their
diff --git a/offapi/com/sun/star/awt/tree/XTreeEditListener.idl b/offapi/com/sun/star/awt/tree/XTreeEditListener.idl
index 2df5fcdcd438..28f5452ab9e9 100644
--- a/offapi/com/sun/star/awt/tree/XTreeEditListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeEditListener.idl
@@ -51,7 +51,7 @@ module com {  module sun {  module star {  module awt {  module tree {
     <p>You have to set the <member>TreeControlModel::Editable</member> property to
     <TRUE/> before a tree supports editing.</p>
  */
-interface XTreeEditListener : ::com::sun::star::lang::XEventListener
+published interface XTreeEditListener : ::com::sun::star::lang::XEventListener
 {
     /** This method is called from the <type>TreeControl</type> implementation when editing of
         <var>Node</var> is requested by calling <member>XTreeControl::startEditingAtNode()</member>.
diff --git a/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl b/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
index 144825d532f4..0fedbf3e013b 100644
--- a/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
@@ -51,7 +51,7 @@ module com {  module sun {  module star {  module awt {  module tree {
     @see XTreeControl::addTreeExpansionListener
     @see XTreeControl::removeTreeExpansionListener
  */
-interface XTreeExpansionListener: com::sun::star::lang::XEventListener
+published interface XTreeExpansionListener: com::sun::star::lang::XEventListener
 {
     /** Invoked when a node with children on demand is about to be expanded.
 
diff --git a/offapi/com/sun/star/awt/tree/XTreeNode.idl b/offapi/com/sun/star/awt/tree/XTreeNode.idl
index b19af432f5d2..e867f40d2bc4 100644
--- a/offapi/com/sun/star/awt/tree/XTreeNode.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeNode.idl
@@ -47,7 +47,7 @@ module com {  module sun {  module star {  module awt { module tree {
     information needed to display a hierarchical outline</p>
     <p>Each XTreeNode in a <type>XTreeDataModel</type> must be unique.
  */
-interface XTreeNode
+published interface XTreeNode
 {
     /** Returns the child tree node at <var>Index</var>.
 
diff --git a/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl b/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl
index 2cf5c4967597..db5e6520614a 100644
--- a/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferableSupplier.idl
@@ -40,7 +40,7 @@
 
 module com { module sun { module star { module datatransfer {
 
-interface XTransferableSupplier
+published interface XTransferableSupplier
 {
     //-------------------------------------------------------------------------
     /** To get access to a transferable representation of a selected part of an object.
diff --git a/offapi/com/sun/star/deployment/DeploymentException.idl b/offapi/com/sun/star/deployment/DeploymentException.idl
index fd40cf0e8aec..2b82c4621068 100644
--- a/offapi/com/sun/star/deployment/DeploymentException.idl
+++ b/offapi/com/sun/star/deployment/DeploymentException.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module deployment {
 
     @since OOo 2.0
  */
-exception DeploymentException : com::sun::star::uno::Exception
+published exception DeploymentException : com::sun::star::uno::Exception
 {
     /** reflects the cause of the error.  Commonly an exception.
     */
diff --git a/offapi/com/sun/star/deployment/PackageInformationProvider.idl b/offapi/com/sun/star/deployment/PackageInformationProvider.idl
index ae1731365e32..8f86fd4e1507 100644
--- a/offapi/com/sun/star/deployment/PackageInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/PackageInformationProvider.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module deployment {
 
     @since OOo 2.3
 */
-singleton PackageInformationProvider : XPackageInformationProvider;
+published singleton PackageInformationProvider : XPackageInformationProvider;
 
 }; }; }; };
 #endif
diff --git a/offapi/com/sun/star/deployment/XPackageInformationProvider.idl b/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
index 46d304d691f8..8885fd1ccee2 100644
--- a/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module deployment {
 
     @since OOo 2.3
 */
-interface XPackageInformationProvider
+published interface XPackageInformationProvider
 {
     /** get Package information for a specific extension.
 
diff --git a/offapi/com/sun/star/document/DocumentEvent.idl b/offapi/com/sun/star/document/DocumentEvent.idl
index caa717a8217a..bd22f6fef522 100644
--- a/offapi/com/sun/star/document/DocumentEvent.idl
+++ b/offapi/com/sun/star/document/DocumentEvent.idl
@@ -51,7 +51,7 @@ module com { module sun { module star { module document {
     @see XDocumentEventBroadcaster
     @since OOo 3.1
  */
-struct DocumentEvent : ::com::sun::star::lang::EventObject
+published struct DocumentEvent : ::com::sun::star::lang::EventObject
 {
     /** specifies the name of the event.
 
diff --git a/offapi/com/sun/star/document/EmptyUndoStackException.idl b/offapi/com/sun/star/document/EmptyUndoStackException.idl
index e003d6af71b9..476a82bbe705 100644
--- a/offapi/com/sun/star/document/EmptyUndoStackException.idl
+++ b/offapi/com/sun/star/document/EmptyUndoStackException.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module document {
 /** is raised when an operation is attemption at an XUndoManager which requires a non-empty stack
     of undo actions, and this requirement is not fullfilled.
  */
-exception EmptyUndoStackException : ::com::sun::star::util::InvalidStateException
+published exception EmptyUndoStackException : ::com::sun::star::util::InvalidStateException
 {
 };
 
diff --git a/offapi/com/sun/star/document/UndoContextNotClosedException.idl b/offapi/com/sun/star/document/UndoContextNotClosedException.idl
index 4f7d746bad1a..81eeca83c7ac 100644
--- a/offapi/com/sun/star/document/UndoContextNotClosedException.idl
+++ b/offapi/com/sun/star/document/UndoContextNotClosedException.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module document {
 /** is thrown when an operation is attempted at an <type>XUndoManager</type> which requires all undo
     contexts to be closed, but this requirement is not fullfilled.
  */
-exception UndoContextNotClosedException : ::com::sun::star::util::InvalidStateException
+published exception UndoContextNotClosedException : ::com::sun::star::util::InvalidStateException
 {
 };
 
diff --git a/offapi/com/sun/star/document/UndoFailedException.idl b/offapi/com/sun/star/document/UndoFailedException.idl
index 4489ac5a0e0d..65b23148ad37 100644
--- a/offapi/com/sun/star/document/UndoFailedException.idl
+++ b/offapi/com/sun/star/document/UndoFailedException.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module document {
     @see XUndoAction::undo
     @see XUndoManager::undo
  */
-exception UndoFailedException : ::com::sun::star::uno::Exception
+published exception UndoFailedException : ::com::sun::star::uno::Exception
 {
     /** describes the reason why the operation failed. Usually, this member will carry an exception.
     */
diff --git a/offapi/com/sun/star/document/UndoManagerEvent.idl b/offapi/com/sun/star/document/UndoManagerEvent.idl
index e587669e4fbd..163b9c6dd33d 100644
--- a/offapi/com/sun/star/document/UndoManagerEvent.idl
+++ b/offapi/com/sun/star/document/UndoManagerEvent.idl
@@ -41,7 +41,7 @@ module com { module sun { module star { module document {
     @see XUndoManagerListener
     @see XUndoAction
  */
-struct UndoManagerEvent : ::com::sun::star::lang::EventObject
+published struct UndoManagerEvent : ::com::sun::star::lang::EventObject
 {
     /** the title of the undo action which is described by the event
         @see XUndoAction::Title
diff --git a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
index 7885f9cde7da..39a3993bfbeb 100644
--- a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
+++ b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
@@ -47,7 +47,7 @@
 
 module com { module sun { module star { module document {
 
-interface XDocumentEventListener;
+published interface XDocumentEventListener;
 
 //=============================================================================
 
@@ -60,7 +60,7 @@ interface XDocumentEventListener;
     @see DocumentEvent
     @since OOo 3.1
 */
-interface XDocumentEventBroadcaster
+published interface XDocumentEventBroadcaster
 {
     /** registers a listener which is notified about document events
 
diff --git a/offapi/com/sun/star/document/XDocumentEventListener.idl b/offapi/com/sun/star/document/XDocumentEventListener.idl
index bcaa6ecd8321..4b89e33d313a 100644
--- a/offapi/com/sun/star/document/XDocumentEventListener.idl
+++ b/offapi/com/sun/star/document/XDocumentEventListener.idl
@@ -49,7 +49,7 @@ module com { module sun { module star { module document {
     @see XDocumentEventBroadcaster
     @since OOo 3.1
  */
-interface XDocumentEventListener : ::com::sun::star::lang::XEventListener
+published interface XDocumentEventListener : ::com::sun::star::lang::XEventListener
 {
     /** is called whenever a document event occurred
     */
diff --git a/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl b/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
index be5121bf2e2a..69cbe1bbfb2e 100644
--- a/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
+++ b/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
@@ -50,7 +50,7 @@ module com {   module sun {   module star {   module document {
     @see DocumentInfo
     @see StandaloneDocumentInfo
  */
-interface XDocumentSubStorageSupplier: com::sun::star::uno::XInterface
+published interface XDocumentSubStorageSupplier: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** provides the access to a substorage with specified name
diff --git a/offapi/com/sun/star/document/XStorageBasedDocument.idl b/offapi/com/sun/star/document/XStorageBasedDocument.idl
index 047320b43df4..a352d36110a2 100644
--- a/offapi/com/sun/star/document/XStorageBasedDocument.idl
+++ b/offapi/com/sun/star/document/XStorageBasedDocument.idl
@@ -63,7 +63,7 @@
 /** allows to initialize document with a storage, to store document to
     a storage, and to set document to be based on provided storage.
  */
-interface XStorageBasedDocument: com::sun::star::uno::XInterface
+published interface XStorageBasedDocument: com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
     /** lets the document load itself using provided storage.
diff --git a/offapi/com/sun/star/document/XStorageChangeListener.idl b/offapi/com/sun/star/document/XStorageChangeListener.idl
index 2272132f8db2..6ed36735a1c1 100644
--- a/offapi/com/sun/star/document/XStorageChangeListener.idl
+++ b/offapi/com/sun/star/document/XStorageChangeListener.idl
@@ -46,7 +46,7 @@ module com {  module sun {  module star {  module document {
 //=============================================================================
 /** allows to be notified when a document is switched to a new storage.
  */
-interface XStorageChangeListener: com::sun::star::lang::XEventListener
+published interface XStorageChangeListener: com::sun::star::lang::XEventListener
 {
     //-------------------------------------------------------------------------
     /** is called when document switches to another storage.
diff --git a/offapi/com/sun/star/document/XUndoAction.idl b/offapi/com/sun/star/document/XUndoAction.idl
index b47550a3f52f..e65354013499 100644
--- a/offapi/com/sun/star/document/XUndoAction.idl
+++ b/offapi/com/sun/star/document/XUndoAction.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module document {
 
 /** represents a single (undoable) action on a document
  */
-interface XUndoAction
+published interface XUndoAction
 {
     /** reverts the action represented by the instance
 
diff --git a/offapi/com/sun/star/document/XUndoManager.idl b/offapi/com/sun/star/document/XUndoManager.idl
index be43ca899b94..74aa4de0cf70 100644
--- a/offapi/com/sun/star/document/XUndoManager.idl
+++ b/offapi/com/sun/star/document/XUndoManager.idl
@@ -40,8 +40,8 @@
 
 module com { module sun { module star { module document {
 
-interface XUndoAction;
-interface XUndoManagerListener;
+published interface XUndoAction;
+published interface XUndoManagerListener;
 
 //==================================================================================================================
 
@@ -76,7 +76,7 @@ interface XUndoManagerListener;
     <member>XLockable::unlock</member> methods. When it is locked, then every attempt to add an undo action, or to
     enter or leave an Undo context, will be silently ignored.</p>
  */
-interface XUndoManager
+published interface XUndoManager
 {
     /** allows <a href="#locking">locking</a> the undo manager.
     */
diff --git a/offapi/com/sun/star/document/XUndoManagerListener.idl b/offapi/com/sun/star/document/XUndoManagerListener.idl
index 783e8e7014d8..045e74761794 100644
--- a/offapi/com/sun/star/document/XUndoManagerListener.idl
+++ b/offapi/com/sun/star/document/XUndoManagerListener.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module document {
 
     @see XUndoManager
  */
-interface XUndoManagerListener : ::com::sun::star::lang::XEventListener
+published interface XUndoManagerListener : ::com::sun::star::lang::XEventListener
 {
     /** is called when an undo action is added to the undo stack.
 
diff --git a/offapi/com/sun/star/document/XUndoManagerSupplier.idl b/offapi/com/sun/star/document/XUndoManagerSupplier.idl
index 88a082259413..211dd151ecad 100644
--- a/offapi/com/sun/star/document/XUndoManagerSupplier.idl
+++ b/offapi/com/sun/star/document/XUndoManagerSupplier.idl
@@ -33,13 +33,13 @@
 
 module com { module sun { module star { module document {
 
-interface XUndoManager;
+published interface XUndoManager;
 
 //==================================================================================================================
 
 /** provides access to an XUndoManager.
  */
-interface XUndoManagerSupplier
+published interface XUndoManagerSupplier
 {
     /** returns the Undo manager associated with the component.
     */
diff --git a/offapi/com/sun/star/drawing/DrawingDocument.idl b/offapi/com/sun/star/drawing/DrawingDocument.idl
index f0335dbd4c10..5fdca8fa5d00 100644
--- a/offapi/com/sun/star/drawing/DrawingDocument.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocument.idl
@@ -40,7 +40,7 @@
 /** specifies a document which consists of multiple pages
     with drawings.
  */
-service DrawingDocument
+published service DrawingDocument
 {
     /** this base service describes the whole functionality of such DrawingDocument. */
     service GenericDrawingDocument;
diff --git a/offapi/com/sun/star/drawing/GenericDrawingDocument.idl b/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
index b500adb9ca97..282c042cb6f5 100644
--- a/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
+++ b/offapi/com/sun/star/drawing/GenericDrawingDocument.idl
@@ -82,7 +82,7 @@
 
     <p>Because its function is needed more then once, its defined as generic one.</p>
  */
-service GenericDrawingDocument
+published service GenericDrawingDocument
 {
     /** this base service describes storing and printing */
     service com::sun::star::document::OfficeDocument;
diff --git a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
index ee40c5f34fa6..eb1cecb7abb9 100644
--- a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
+++ b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
@@ -44,7 +44,6 @@
 #include <com/sun/star/rendering/XCanvas.idl>
 #endif
 
-
 module com { module sun { module star { module drawing {
 
 /** Listener for asynchronous preview creations.  Called when a slide
@@ -53,7 +52,7 @@ module com { module sun { module star { module drawing {
     implementor may then call <method>getSlidePreview()</method> a second
     time to get the up-to-date version of the preview.
 */
-interface XSlidePreviewCacheListener
+published interface XSlidePreviewCacheListener
 {
     /** Called by a <interface>XSlidePreviewCache</interface> object when a
         preview has been created for the slide with the given index.
@@ -77,7 +76,7 @@ interface XSlidePreviewCacheListener
     order to allow multiple references to a single slide (custom
     presentations).
 */
-interface XSlidePreviewCache
+published interface XSlidePreviewCache
 {
     /** Set the set of slides for which the cache will provide the
         previews.  All slides in the given XIndexAccess are required to come
diff --git a/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl b/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
index afcea77be685..9a65144514ca 100644
--- a/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
+++ b/offapi/com/sun/star/drawing/framework/AnchorBindingMode.idl
@@ -43,7 +43,7 @@ module com { module sun { module star { module drawing { module framework {
     anchor a1:a2 which itself is a resource a1 bound to anchor a2.
     Then r:a1:a2 is bound directly to a1:a2 and indirectly to a2.</p>
 */
-enum AnchorBindingMode
+published enum AnchorBindingMode
 {
     DIRECT,
     INDIRECT
diff --git a/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl b/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
index f5d37a917383..ac4db617ee12 100644
--- a/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
+++ b/offapi/com/sun/star/drawing/framework/ConfigurationChangeEvent.idl
@@ -36,9 +36,8 @@ module com { module sun { module star { module uno { interface XInterface; }; };
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XConfiguration;
-interface XConfigurationController;
-interface XResourceId;
+published interface XConfiguration;
+published interface XResourceId;
 
 /** Objects of this class are used for notifying changes of the
     configuration.
@@ -53,7 +52,7 @@ interface XResourceId;
     general guidelines.   See <type>XConfigurationController</type> for a
     list of event types used by the basic drawing framework.</p>
 */
-struct ConfigurationChangeEvent
+published struct ConfigurationChangeEvent
      : ::com::sun::star::lang::EventObject
 {
     /** The type of configuration change is a free-form string.  This is the
diff --git a/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl b/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl
index a62e47d01302..162d94f2408d 100644
--- a/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl
+++ b/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module drawing { module framework {
     whether a requested resource is to replace an existing resource of the
     same class or is to be activated additionally.
 */
-enum ResourceActivationMode
+published enum ResourceActivationMode
 {
     /** A resource is requested in addition to already existing ones.  This
         is used for example for panes.
diff --git a/offapi/com/sun/star/drawing/framework/XConfiguration.idl b/offapi/com/sun/star/drawing/framework/XConfiguration.idl
index a062fcea141f..87766f8500a6 100644
--- a/offapi/com/sun/star/drawing/framework/XConfiguration.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfiguration.idl
@@ -40,7 +40,7 @@
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XResourceId;
+published interface XResourceId;
 
 /** A configuration describes the resources of an application like panes,
     views, and tool bars and their relationships that are currently active
@@ -54,7 +54,7 @@ interface XResourceId;
 
     @see XConfigurationController
 */
-interface XConfiguration
+published interface XConfiguration
     : ::com::sun::star::util::XCloneable
 {
     /** Returns the list of resources that are bound directly and/or
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl b/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
index d487786387b5..742a3141350b 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationChangeListener.idl
@@ -41,7 +41,7 @@ module com { module sun { module star { module drawing { module framework {
     registered at the configuration controller and a configuration change
     occurs.
 */
-interface XConfigurationChangeListener
+published interface XConfigurationChangeListener
     : ::com::sun::star::lang::XEventListener
 {
     /** The exact time of when a listener is called (before the change takes
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl b/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
index 8fff19cd27ad..7a37f8e5652d 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationChangeRequest.idl
@@ -37,7 +37,7 @@
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XConfiguration;
+published interface XConfiguration;
 
 /** A single explicit request for a configuration change.
 
@@ -53,7 +53,7 @@ interface XConfiguration;
     <p>This interface is typically used internally by the
     <type>XConfigurationController</type></p> @see XConfigurationController
 */
-interface XConfigurationChangeRequest
+published interface XConfigurationChangeRequest
 {
     /** Commit the configuration change request represented by the called
         object to the given configuration.
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
index d9dbeaa77295..3acfa35fc0d7 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
@@ -46,10 +46,10 @@
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XConfigurationChangeListener;
-interface XConfigurationChangeRequest;
-interface XResourceId;
-interface XResource;
+published interface XConfigurationChangeListener;
+published interface XConfigurationChangeRequest;
+published interface XResourceId;
+published interface XResource;
 
 /** The configuration controller is responsible for the management of the
     set of active resources.
@@ -157,7 +157,7 @@ interface XResource;
     deactivated resource.</p></li>
     </ul></p>
 */
-interface XConfigurationController
+published interface XConfigurationController
 {
     interface XConfigurationControllerRequestQueue;
     interface XConfigurationControllerBroadcaster;
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl b/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
index f46aa79587d5..052f4f9753df 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.idl
@@ -37,13 +37,13 @@
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XConfigurationChangeListener;
+published interface XConfigurationChangeListener;
 
 /** Manage the set of registered event listeners and the event notification for a configuration
     controller.
     <p>The listeners are called in the order in which they are registered.</p>
 */
-interface XConfigurationControllerBroadcaster
+published interface XConfigurationControllerBroadcaster
 {
     /** Add a new listener for configuration changes.
         <p>The listener is notified only for the specified type of
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl b/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
index 0dde513a6c20..3b41d57ca514 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
@@ -34,7 +34,7 @@
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XConfigurationChangeRequest;
+published interface XConfigurationChangeRequest;
 
 /** The request queue of the configuration controller handles requests for
     changes to the current configuration.
@@ -44,7 +44,7 @@ interface XConfigurationChangeRequest;
     should normally not be necessary for anyone else than the
     <type>XConfigurationController</type>.  It may be removed in the future.</p>
 */
-interface XConfigurationControllerRequestQueue
+published interface XConfigurationControllerRequestQueue
 {
     /** Return whether there are pending requests for configuration changes.
         @return
diff --git a/offapi/com/sun/star/drawing/framework/XPane.idl b/offapi/com/sun/star/drawing/framework/XPane.idl
index ad0bc7dbb791..1126b69bef31 100644
--- a/offapi/com/sun/star/drawing/framework/XPane.idl
+++ b/offapi/com/sun/star/drawing/framework/XPane.idl
@@ -49,7 +49,7 @@ module com { module sun { module star { module drawing { module framework {
     parts like title, menu, closer button.</p>
     <p>The URL prefix of panes is <code>private:resource/floater</code></p>
 */
-interface XPane
+published interface XPane
 {
     interface XResource;
 
diff --git a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
index 2bcf06ac32f7..19c50bb409ec 100644
--- a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
+++ b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
@@ -43,7 +43,7 @@ module com { module sun { module star { module drawing { module framework {
 /** See XPaneBorderPainter and its addBorder() and removeBorder() methods
     for an explanation of the border type and its values.
 */
-enum BorderType
+published enum BorderType
 {
     INNER_BORDER,
     OUTER_BORDER,
@@ -65,7 +65,7 @@ enum BorderType
     left corner bitmap is painted with its lower right at the upper left of
     the center box.</p>
 */
-interface XPaneBorderPainter
+published interface XPaneBorderPainter
 {
     /** Enlarge the given rectangle by the size of the specified part of the
         border.  This method can be used to convert an inner bounding box
diff --git a/offapi/com/sun/star/drawing/framework/XResource.idl b/offapi/com/sun/star/drawing/framework/XResource.idl
index 492249d4005c..1d4396cf9516 100644
--- a/offapi/com/sun/star/drawing/framework/XResource.idl
+++ b/offapi/com/sun/star/drawing/framework/XResource.idl
@@ -34,12 +34,12 @@
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XResourceId;
+published interface XResourceId;
 
 /** Base interface that provides functionality shared by all resource types
     of the drawing framework.
 */
-interface XResource
+published interface XResource
 {
     /** Return an <type>XResourceId</type> object for the called resource.
         The returned id unambiguously identifies the resource.
diff --git a/offapi/com/sun/star/drawing/framework/XResourceFactory.idl b/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
index 4df12470fb64..1930ab0dda52 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceFactory.idl
@@ -40,8 +40,8 @@
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XResource;
-interface XResourceId;
+published interface XResource;
+published interface XResourceId;
 
 /** Factory and possibly cache for creating and releasing resources.
     <p>A resource factory is created and used by the
@@ -49,7 +49,7 @@ interface XResourceId;
     <p>A factory may want to implement a cache to reuse previously released
     resources.</p>
 */
-interface XResourceFactory
+published interface XResourceFactory
 {
     /** Create a resource for the given <type>XResourceId</type> object.
         @param xResourceId
diff --git a/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl b/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
index 1926c38c2774..5865d46257eb 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceFactoryManager.idl
@@ -34,8 +34,8 @@
 
 module com { module sun { module star { module drawing { module framework {
 
-interface XResourceId;
-interface XResourceFactory;
+published interface XResourceId;
+published interface XResourceFactory;
 
 /** The XResourceFactoryManager is part of the configuration controller and
     manages the set of registered resource factories.
@@ -43,7 +43,7 @@ interface XResourceFactory;
     @see XConfigurationController
     @see XResourceFactory
 */
-interface XResourceFactoryManager
+published interface XResourceFactoryManager
 {
     /** Register a new resource factory for the given URL.
         <p>When one factory is responsible for more than one type of resource
diff --git a/offapi/com/sun/star/drawing/framework/XResourceId.idl b/offapi/com/sun/star/drawing/framework/XResourceId.idl
index 6d24fbed092f..1f5871f3a8ba 100644
--- a/offapi/com/sun/star/drawing/framework/XResourceId.idl
+++ b/offapi/com/sun/star/drawing/framework/XResourceId.idl
@@ -55,7 +55,7 @@ module com { module sun { module star { module drawing { module framework {
     method on its creation.  Arguments are only available through the
     getFullResourceURL().  The getResourceURL() method strips them away.</p>
 */
-interface XResourceId
+published interface XResourceId
 {
     /** Return the URL of the resource.  Arguments supplied on creation are
         stripped away.  Use getFullResourceURL() to access them.
diff --git a/offapi/com/sun/star/drawing/framework/XView.idl b/offapi/com/sun/star/drawing/framework/XView.idl
index c773cd903a00..3a45919fb316 100644
--- a/offapi/com/sun/star/drawing/framework/XView.idl
+++ b/offapi/com/sun/star/drawing/framework/XView.idl
@@ -46,7 +46,7 @@ module com { module sun { module star { module drawing { module framework {
     reference them.</p>
     <p>The URL prefix of views is <code>private:resource/view</code></p>
 */
-interface XView
+published interface XView
 {
     interface XResource;
 };
diff --git a/offapi/com/sun/star/embed/Storage.idl b/offapi/com/sun/star/embed/Storage.idl
index 01afee9271fb..1353c011a205 100644
--- a/offapi/com/sun/star/embed/Storage.idl
+++ b/offapi/com/sun/star/embed/Storage.idl
@@ -356,7 +356,6 @@ published service Storage
         </p>
      */
     [property, optional, readonly] boolean HasNonEncryptedEntries;
-
 };
 
 //============================================================================
diff --git a/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl b/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
index e590a5764178..5930e8490678 100644
--- a/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
+++ b/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
@@ -41,17 +41,19 @@ module com {  module sun {  module star {  module embed {
 
 //============================================================================
 /** This interface allows to set a password for an object.
+
+    @since OOo 3.4
  */
-published interface XEncryptionProtectedSource2: XEncryptionProtectedSource
+interface XEncryptionProtectedSource2: XEncryptionProtectedSource
 {
     // -----------------------------------------------------------------------
     /** sets an encryption data for the object.
 
-    @param aEncryptionData
-        the new encryption data
+        @param aEncryptionData
+            the new encryption data
 
-    @throws ::com::sun::star::io::IOException
-        in case the data could not be set
+        @throws ::com::sun::star::io::IOException
+            in case the data could not be set
      */
     void setEncryptionData( [in] sequence< ::com::sun::star::beans::NamedValue > aEncryptionData )
         raises( ::com::sun::star::io::IOException );
diff --git a/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl b/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl
new file mode 100644
index 000000000000..30ec5621f669
--- /dev/null
+++ b/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl
@@ -0,0 +1,120 @@
+/*************************************************************************
+ *
+ * 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 __com_sun_star_embed_XEncryptionProtectedStorage_idl__
+#define __com_sun_star_embed_XEncryptionProtectedStorage_idl__
+
+#ifndef __com_sun_star_embed_XEncryptionProtectedSource2_idl__
+#include <com/sun/star/embed/XEncryptionProtectedSource2.idl>
+#endif
+
+#ifndef __com_sun_star_beans_NamedValue_idl__
+#include <com/sun/star/beans/NamedValue.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+
+#ifndef __com_sun_star_xml_crypto_DigestID_idl__
+#include <com/sun/star/xml/crypto/DigestID.idl>
+#endif
+
+#ifndef __com_sun_star_xml_crypto_CipherID_idl__
+#include <com/sun/star/xml/crypto/CipherID.idl>
+#endif
+
+//============================================================================
+
+module com {  module sun {  module star {  module embed {
+
+//============================================================================
+/** This interface allows to set a password for an object.
+
+    @since OOo 3.4
+ */
+interface XEncryptionProtectedStorage: XEncryptionProtectedSource2
+{
+    // -----------------------------------------------------------------------
+    /** allows to set the encryption algorithms for the object.
+        <p>
+        The algorithms will of course be used only for streams that have been
+        marked to be encrypted. If no stream in the storage is marked to be
+        encrypted, the algorithms-related information may have no effect to
+        the result package.
+        </p>
+
+        <p>
+        The following values could be part of the provided sequence:
+        </p>
+        <dl>
+            <dt>StartKeyGenerationAlgorithm</dt>
+            <dd>
+                    specifies the algorithm that was used to generate
+                    the EncryptionKey from the original password; in case
+                    the contents should be decrypted, the algorithm might
+                    be already known by the object; if a different one is
+                    set an exception should be thrown to indicate the
+                    error; it should take values from
+                    <type scope="com::sun::star::xml:crypto">DigestID</type>.
+            </dd>
+            <dt>EncryptionAlgorithm</dt>
+            <dd>
+                    specifies the algorithm that should be used to
+                    encrypt/decrypt the contents; in case the contents
+                    should be decrypted, the algorithm might be already
+                    known by the object; if a different one is set
+                    an exception should be thrown to indicate the error;
+                    it should take values from
+                    <type scope="com::sun::star::xml:crypto">CipherID</type>.
+            </dd>
+            <dt>ChecksumAlgorithm</dt>
+            <dd>
+                    specifies the algorithm that was used to generate
+                    the checksum of the encrypted data; in case
+                    the contents should be decrypted, the algorithm might
+                    be already known by the object; if a different one is
+                    set an exception should be thrown to indicate the
+                    error; it should take values from
+                    <type scope="com::sun::star::xml:crypto">DigestID</type>.
+            </dd>
+        </dl>
+     */
+    void setEncryptionAlgorithms( [in] sequence< ::com::sun::star::beans::NamedValue > aAlgorithms )
+        raises( ::com::sun::star::lang::IllegalArgumentException );
+
+    // -----------------------------------------------------------------------
+    /** allows to get the encryption algorithms of the object.
+     */
+    sequence< ::com::sun::star::beans::NamedValue > getEncryptionAlgorithms();
+};
+
+//============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/embed/makefile.mk b/offapi/com/sun/star/embed/makefile.mk
index 8ee156af48ba..c142086cdbf8 100644
--- a/offapi/com/sun/star/embed/makefile.mk
+++ b/offapi/com/sun/star/embed/makefile.mk
@@ -78,6 +78,7 @@ IDLFILES=\
     XLinkFactory.idl\
     XEncryptionProtectedSource.idl\
     XEncryptionProtectedSource2.idl\
+    XEncryptionProtectedStorage.idl\
     XInplaceClient.idl\
     XInsertObjectDialog.idl\
     XWindowSupplier.idl\
diff --git a/offapi/com/sun/star/frame/ModuleManager.idl b/offapi/com/sun/star/frame/ModuleManager.idl
index ab8bff22d72e..36ab785b0d36 100644
--- a/offapi/com/sun/star/frame/ModuleManager.idl
+++ b/offapi/com/sun/star/frame/ModuleManager.idl
@@ -51,7 +51,7 @@ module com { module sun { module star { module frame {
     @since OOo 2.0
  */
 
-service ModuleManager
+published service ModuleManager
 {
     //-------------------------------------------
     /** provides functions to identify office modules.
diff --git a/offapi/com/sun/star/frame/UnknownModuleException.idl b/offapi/com/sun/star/frame/UnknownModuleException.idl
index 9b3169c1dcbe..510cc08203e0 100644
--- a/offapi/com/sun/star/frame/UnknownModuleException.idl
+++ b/offapi/com/sun/star/frame/UnknownModuleException.idl
@@ -42,7 +42,7 @@ module com {  module sun {  module star {  module frame {
 
     @since OOo 2.0
  */
-exception UnknownModuleException : ::com::sun::star::uno::Exception
+published exception UnknownModuleException : ::com::sun::star::uno::Exception
 {
 };
 
diff --git a/offapi/com/sun/star/frame/XController2.idl b/offapi/com/sun/star/frame/XController2.idl
index 095b8840aa67..f3d7f07abd78 100644
--- a/offapi/com/sun/star/frame/XController2.idl
+++ b/offapi/com/sun/star/frame/XController2.idl
@@ -41,7 +41,7 @@ module com {  module sun {  module star {  module frame {
 
     @since OOo 3.0
 */
-interface XController2 : XController
+published interface XController2 : XController
 {
     /** denotes the &quot;root window&quot; of the controller.
 
diff --git a/offapi/com/sun/star/frame/XLayoutManager.idl b/offapi/com/sun/star/frame/XLayoutManager.idl
index b0902aa4c0e9..7043afcfaa9d 100644
--- a/offapi/com/sun/star/frame/XLayoutManager.idl
+++ b/offapi/com/sun/star/frame/XLayoutManager.idl
@@ -98,7 +98,7 @@ module com { module sun { module star { module frame {
     @since OOo 2.0
 */
 
-interface XLayoutManager : com::sun::star::uno::XInterface
+published interface XLayoutManager : com::sun::star::uno::XInterface
 {
     /** attaches a <type scope="com::sun::star::frame">XFrame</type> to a layout manager.
 
diff --git a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
index fc7636e21e56..48d077815ca4 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
@@ -43,7 +43,7 @@
     @since OOo 2.0
  */
 
-interface XLayoutManagerEventBroadcaster : com::sun::star::uno::XInterface
+published interface XLayoutManagerEventBroadcaster : com::sun::star::uno::XInterface
 {
     /** adds a layout manager event listener to the object's listener list.
 
diff --git a/offapi/com/sun/star/frame/XLayoutManagerListener.idl b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
index 12b9af7ffb9f..b50cafa82a17 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerListener.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
@@ -49,7 +49,7 @@ module com {  module sun {  module star {  module frame {
 
     @since OOo 2.0
  */
-interface XLayoutManagerListener : com::sun::star::lang::XEventListener
+published interface XLayoutManagerListener : com::sun::star::lang::XEventListener
 {
     //=============================================================================
     /** is invoked when a layout manager has made a certain operation.
diff --git a/offapi/com/sun/star/frame/XModuleManager.idl b/offapi/com/sun/star/frame/XModuleManager.idl
index cdc9bba41b6e..5494449ce933 100644
--- a/offapi/com/sun/star/frame/XModuleManager.idl
+++ b/offapi/com/sun/star/frame/XModuleManager.idl
@@ -49,7 +49,7 @@ module com { module sun { module star { module frame {
 
     @since OOo 2.0
  */
-interface XModuleManager : com::sun::star::uno::XInterface
+published interface XModuleManager : com::sun::star::uno::XInterface
 {
     //-------------------------------------------
     /**
diff --git a/offapi/com/sun/star/frame/XTitle.idl b/offapi/com/sun/star/frame/XTitle.idl
index 0ce06aecb8f0..2bc71111f932 100644
--- a/offapi/com/sun/star/frame/XTitle.idl
+++ b/offapi/com/sun/star/frame/XTitle.idl
@@ -40,17 +40,23 @@
  module com {  module sun {  module star {  module frame {
 
 //=============================================================================
-/** todo document me
+/** an interface representing an entity with a modifyable title.
  */
-interface XTitle : com::sun::star::uno::XInterface
+published interface XTitle : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** todo document me
+    /** Returns the title of the object.
+     *
+     *  @returns
+     *  The title.
      */
     string getTitle ();
 
     //-------------------------------------------------------------------------
-    /** todo document me
+    /** Sets the title of the object.
+     *
+     *  @param sTitle
+     *  The title.
      */
     void setTitle ( [in] string sTitle );
 };
diff --git a/offapi/com/sun/star/geometry/AffineMatrix2D.idl b/offapi/com/sun/star/geometry/AffineMatrix2D.idl
index 55d8c14473b8..919ee070b65f 100644
--- a/offapi/com/sun/star/geometry/AffineMatrix2D.idl
+++ b/offapi/com/sun/star/geometry/AffineMatrix2D.idl
@@ -67,7 +67,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct AffineMatrix2D
+published struct AffineMatrix2D
 {
     /// The top, left matrix entry.
     double m00;
diff --git a/offapi/com/sun/star/geometry/IntegerSize2D.idl b/offapi/com/sun/star/geometry/IntegerSize2D.idl
index cf3e1a215adb..0f41d2d6a147 100644
--- a/offapi/com/sun/star/geometry/IntegerSize2D.idl
+++ b/offapi/com/sun/star/geometry/IntegerSize2D.idl
@@ -35,7 +35,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct IntegerSize2D
+published struct IntegerSize2D
 {
     /// Amount of space occupied in the x direction.
     long Width;
diff --git a/offapi/com/sun/star/geometry/Matrix2D.idl b/offapi/com/sun/star/geometry/Matrix2D.idl
index d0e8bf357f2a..7d96b7d2af0b 100644
--- a/offapi/com/sun/star/geometry/Matrix2D.idl
+++ b/offapi/com/sun/star/geometry/Matrix2D.idl
@@ -70,7 +70,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct Matrix2D
+published struct Matrix2D
 {
     /// The top, left matrix entry.
     double m00;
diff --git a/offapi/com/sun/star/geometry/RealBezierSegment2D.idl b/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
index 6ec7e1b8b83d..83180b1ae4ee 100644
--- a/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
+++ b/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
@@ -43,7 +43,7 @@ module com {  module sun {  module star {  module geometry {
     @see com.sun.star.rendering.XBezierPolyPolygon2D
     @since OOo 2.0
  */
-struct RealBezierSegment2D
+published struct RealBezierSegment2D
 {
     /// The x coordinate of the start point.
     double Px;
diff --git a/offapi/com/sun/star/geometry/RealPoint2D.idl b/offapi/com/sun/star/geometry/RealPoint2D.idl
index 1ac34b7a380e..4f9b0fbc8e9f 100644
--- a/offapi/com/sun/star/geometry/RealPoint2D.idl
+++ b/offapi/com/sun/star/geometry/RealPoint2D.idl
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct RealPoint2D
+published struct RealPoint2D
 {
     /// The x coordinate of the point.
     double X;
diff --git a/offapi/com/sun/star/geometry/RealRectangle2D.idl b/offapi/com/sun/star/geometry/RealRectangle2D.idl
index 39cd783f3c08..52e113046e50 100644
--- a/offapi/com/sun/star/geometry/RealRectangle2D.idl
+++ b/offapi/com/sun/star/geometry/RealRectangle2D.idl
@@ -47,7 +47,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct RealRectangle2D
+published struct RealRectangle2D
 {
     /// X coordinate of upper left corner .
     double X1;
diff --git a/offapi/com/sun/star/geometry/RealSize2D.idl b/offapi/com/sun/star/geometry/RealSize2D.idl
index dab80a5c7deb..a01fa5bd96db 100644
--- a/offapi/com/sun/star/geometry/RealSize2D.idl
+++ b/offapi/com/sun/star/geometry/RealSize2D.idl
@@ -35,7 +35,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct RealSize2D
+published struct RealSize2D
 {
     /// Amount of space occupied in the x direction.
     double Width;
diff --git a/offapi/com/sun/star/geometry/XMapping2D.idl b/offapi/com/sun/star/geometry/XMapping2D.idl
index 1d2465d91f8e..a9a458579ab9 100644
--- a/offapi/com/sun/star/geometry/XMapping2D.idl
+++ b/offapi/com/sun/star/geometry/XMapping2D.idl
@@ -50,7 +50,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-interface XMapping2D : ::com::sun::star::uno::XInterface
+published interface XMapping2D : ::com::sun::star::uno::XInterface
 {
     /** Forward 2D mapping function
      */
diff --git a/offapi/com/sun/star/graphic/GraphicRasterizer.idl b/offapi/com/sun/star/graphic/GraphicRasterizer.idl
new file mode 100644
index 000000000000..ee1214f39055
--- /dev/null
+++ b/offapi/com/sun/star/graphic/GraphicRasterizer.idl
@@ -0,0 +1,52 @@
+/*************************************************************************
+ *
+ * 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 com_sun_star_graphic_GraphicRasterizer_idl
+#define com_sun_star_graphic_GraphicRasterizer_idl
+
+#include <com/sun/star/graphic/XGraphicRasterizer.idl>
+
+module com { module sun { module star { module graphic
+{
+
+/** Service that describes the necessary interfaces and properties
+    to convert arbitrary graphic data to a <type>XGraphic</type>
+    interface containing a pixel graphic, that can be rendered the usual
+    ways.
+ */
+
+service GraphicRasterizer
+{
+    /** Interface to initiate the rasterizing process
+    */
+    interface ::com::sun::star::graphic::XGraphicRasterizer;
+
+};
+
+} ; } ; } ; } ;
+
+#endif
diff --git a/offapi/com/sun/star/graphic/XGraphic.idl b/offapi/com/sun/star/graphic/XGraphic.idl
index 999d815be2ae..9cb351da156b 100644
--- a/offapi/com/sun/star/graphic/XGraphic.idl
+++ b/offapi/com/sun/star/graphic/XGraphic.idl
@@ -63,3 +63,5 @@ published interface XGraphic : ::com::sun::star::uno::XInterface
 } ; } ; } ; } ;
 
 #endif
+
+
diff --git a/offapi/com/sun/star/graphic/XGraphicRasterizer.idl b/offapi/com/sun/star/graphic/XGraphicRasterizer.idl
new file mode 100644
index 000000000000..097c4fdfa31e
--- /dev/null
+++ b/offapi/com/sun/star/graphic/XGraphicRasterizer.idl
@@ -0,0 +1,150 @@
+/*/*************************************************************************
+ *
+ * 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 com_sun_star_graphic_XGraphicRasterizer_idl
+#define com_sun_star_graphic_XGraphicRasterizer_idl
+
+#include <com/sun/star/io/XInputStream.idl>
+#include <com/sun/star/graphic/XGraphic.idl>
+#include <com/sun/star/beans/PropertyValues.idl>
+#include <com/sun/star/beans/XPropertySet.idl>
+#include <com/sun/star/awt/Size.idl>
+
+module com { module sun { module star { module graphic
+{
+
+/** This interfaces exposes the initialize and a rasterize method to
+    rasterize a given data stream to a pixel graphic
+  */
+interface XGraphicRasterizer : ::com::sun::star::uno::XInterface
+{
+    /** Initializing the rasterizer
+
+        <p>This method could also be used to determine, if
+        the provided data is able to be rasterized by the
+        implementation. The implementation should take care of
+        this feature as well as setting the default image size in
+        pixel within the given output parameter.</p>
+
+        @param DataStream
+            The input stream of data that should be rasterized
+
+        @param DPI_X
+            The horizontal resolution of the callers device in pixel per inch. This
+            value is needed to calculate the correct dimensions of the graphic to be
+            rasterized. If a value of <value>0</value> is given, a horizontal default
+            resolution of 72 DPI is used.
+
+        @param DPI_Y
+            The vertical resolution of the callers device in pixel per inch. This
+            value is needed to calculate the correct dimensions of the graphic to be
+            rasterized. If a value of <value>0</value> is given, a vertical default
+            resolution of 72 DPI is used.
+
+        @param DefaultSizePixel
+            The default rendering size in pixel of the underlying graphics
+            data may be available after the call via this output parameter.
+
+            In case no default size can be determined during initialization,
+            a default pixel size of 0,0 is returned. In this case, the caller
+            needs to assume a default pixel size, appropriate for the calling
+            context.
+
+        @returns
+            A boolean value indicating if rasterizing of the given data is
+            possible at all and if the initialization process happened
+            successfully.
+
+        @see com::sun::star::io::XInputStream
+        @see com::sun::star::awt::Size
+    */
+    boolean initializeData( [in] com::sun::star::io::XInputStream DataStream,
+                            [in] unsigned long DPI_X,
+                            [in] unsigned long DPI_Y,
+                            [out] com::sun::star::awt::Size DefaultSizePixel );
+
+    /** Rasterizing the initialized data into a <type>XGraphic</type> container.
+
+        <p>The <type>XGraphic</type> container will contain a pixel
+        type graphic after a successful rasterization process</p>
+
+        <p>In case of any fault during the rasterization process,
+        the <type>XGraphic</type> container will be empty afterwards and
+        the method will return false</p>
+
+        @param Width
+            The width in pixel of the graphic to be rasterized.
+            This parameter is used without taking other transformation
+            values into account.
+
+        @param Height
+            The height in pixel of the graphic to be rasterized.
+            This parameter is used without taking other transformation
+            values into account.
+
+        @param RotateAngle
+            The rotation angle of the graphic to be rasterized.
+            This parameter is used without taking other transformation
+            values into account. The rotation is applied after scaling
+            and shearing the original image.
+
+        @param ShearXAngle
+            The horizontal shear angle of the graphic to be rasterized.
+            This parameter is used without taking other transformation
+            values into account. The shearing is applied after scaling
+            and before rotation of the image.
+
+        @param ShearYAngle
+            The vertical shear angle of the graphic to be rasterized.
+            This parameter is used without taking other transformation
+            values into account. The shearing is applied after scaling
+            and before rotation of the image.
+
+        @param RasterizeProperties
+            Additional properties for special needs (undefined by now)
+
+        @param Graphic
+            An interface to a graphic container into which the given data
+            should be rasterized.
+
+        @returns com::sun::star::graphic::XGraphic
+            An interface to a graphic container that holds the rasterized pixel data
+
+        @see com::sun::star::beans::PropertyValues
+        @see com::sun::star::graphic::XGraphic
+    */
+    com::sun::star::graphic::XGraphic rasterize( [in] unsigned long Width,
+                                                 [in] unsigned long Height,
+                                                 [in] double RotateAngle,
+                                                 [in] double ShearAngle_X,
+                                                 [in] double ShearAngle_Y,
+                                                 [in] com::sun::star::beans::PropertyValues RasterizeProperties );
+};
+
+} ; } ; } ; } ;
+
+#endif
diff --git a/offapi/com/sun/star/graphic/makefile.mk b/offapi/com/sun/star/graphic/makefile.mk
index 4ee0031ab5db..6e4a0187c15c 100644
--- a/offapi/com/sun/star/graphic/makefile.mk
+++ b/offapi/com/sun/star/graphic/makefile.mk
@@ -42,7 +42,9 @@ IDLFILES= \
     Graphic.idl \
     GraphicColorMode.idl \
     GraphicDescriptor.idl \
+    GraphicObject.idl \
     GraphicProvider.idl \
+    GraphicRasterizer.idl \
     GraphicRendererVCL.idl \
     GraphicType.idl \
     MediaProperties.idl \
@@ -51,9 +53,9 @@ IDLFILES= \
     XPrimitiveFactory2D.idl \
     XGraphic.idl \
     XGraphicProvider.idl \
+    XGraphicRasterizer.idl \
     XGraphicRenderer.idl \
     XGraphicObject.idl \
-    GraphicObject.idl \
     XGraphicTransformer.idl
     
 # --- Targets ------------------------------------------------------
diff --git a/offapi/com/sun/star/inspection/DefaultHelpProvider.idl b/offapi/com/sun/star/inspection/DefaultHelpProvider.idl
index 900610538b35..b5847f918191 100644
--- a/offapi/com/sun/star/inspection/DefaultHelpProvider.idl
+++ b/offapi/com/sun/star/inspection/DefaultHelpProvider.idl
@@ -35,7 +35,7 @@
 
 module com { module sun { module star { module inspection {
 
-interface XObjectInspectorUI;
+published interface XObjectInspectorUI;
 
 //=============================================================================
 
@@ -48,7 +48,7 @@ interface XObjectInspectorUI;
     the extended help text of this control's window, and set this help text at the
     object inspector's help section.</p>
  */
-service DefaultHelpProvider : com::sun::star::uno::XInterface
+published service DefaultHelpProvider : com::sun::star::uno::XInterface
 {
     /** creates a help provider instance
         @param InspectorUI
diff --git a/offapi/com/sun/star/inspection/GenericPropertyHandler.idl b/offapi/com/sun/star/inspection/GenericPropertyHandler.idl
index c93f7a958ba5..f8e0e69a3499 100644
--- a/offapi/com/sun/star/inspection/GenericPropertyHandler.idl
+++ b/offapi/com/sun/star/inspection/GenericPropertyHandler.idl
@@ -52,7 +52,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-service GenericPropertyHandler : XPropertyHandler;
+published service GenericPropertyHandler : XPropertyHandler;
 
 //=============================================================================
 
diff --git a/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl b/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl
index 0e76f724247f..0d00b86e8bd8 100644
--- a/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl
+++ b/offapi/com/sun/star/inspection/InteractiveSelectionResult.idl
@@ -38,7 +38,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-enum InteractiveSelectionResult
+published enum InteractiveSelectionResult
 {
     /** The interactive selection of a property value was canceled.
     */
diff --git a/offapi/com/sun/star/inspection/LineDescriptor.idl b/offapi/com/sun/star/inspection/LineDescriptor.idl
index ac532045a070..3880a14537f9 100644
--- a/offapi/com/sun/star/inspection/LineDescriptor.idl
+++ b/offapi/com/sun/star/inspection/LineDescriptor.idl
@@ -35,7 +35,7 @@
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
 
-interface XPropertyControl;
+published interface XPropertyControl;
 
 //-----------------------------------------------------------------------------
 /** describes the appearance of a line representing a single property in an <type>ObjectInspector</type>.
@@ -55,7 +55,7 @@ interface XPropertyControl;
 
     @since OOo 2.0.3
 */
-struct LineDescriptor
+published struct LineDescriptor
 {
     /** denotes the human-readable display name used to present a property to the user
     */
diff --git a/offapi/com/sun/star/inspection/ObjectInspector.idl b/offapi/com/sun/star/inspection/ObjectInspector.idl
index 9a0386bee9f0..fb42d3342e7a 100644
--- a/offapi/com/sun/star/inspection/ObjectInspector.idl
+++ b/offapi/com/sun/star/inspection/ObjectInspector.idl
@@ -82,7 +82,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-service ObjectInspector : XObjectInspector
+published service ObjectInspector : XObjectInspector
 {
     /** creates a default instance of the ObjectInspector
 
diff --git a/offapi/com/sun/star/inspection/ObjectInspectorModel.idl b/offapi/com/sun/star/inspection/ObjectInspectorModel.idl
index 00a55a0b43c3..073ea4d5f10c 100644
--- a/offapi/com/sun/star/inspection/ObjectInspectorModel.idl
+++ b/offapi/com/sun/star/inspection/ObjectInspectorModel.idl
@@ -54,7 +54,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-service ObjectInspectorModel : XObjectInspectorModel
+published service ObjectInspectorModel : XObjectInspectorModel
 {
     /** creates a default ObjectInspectorModel, whose one and only handler factory
         creates a <type>GenericPropertyHandler</type>.
diff --git a/offapi/com/sun/star/inspection/PropertyCategoryDescriptor.idl b/offapi/com/sun/star/inspection/PropertyCategoryDescriptor.idl
index 5e58701e3c03..1d0c18d06363 100644
--- a/offapi/com/sun/star/inspection/PropertyCategoryDescriptor.idl
+++ b/offapi/com/sun/star/inspection/PropertyCategoryDescriptor.idl
@@ -38,7 +38,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-struct PropertyCategoryDescriptor
+published struct PropertyCategoryDescriptor
 {
     /** contains the programmatic name of the category.
 
diff --git a/offapi/com/sun/star/inspection/PropertyControlType.idl b/offapi/com/sun/star/inspection/PropertyControlType.idl
index 33c52a66fe95..d2bec8ec0c97 100644
--- a/offapi/com/sun/star/inspection/PropertyControlType.idl
+++ b/offapi/com/sun/star/inspection/PropertyControlType.idl
@@ -45,7 +45,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-constants PropertyControlType
+published constants PropertyControlType
 {
     /** denotes a control which allows the user to choose from a list of
         possible property values
diff --git a/offapi/com/sun/star/inspection/PropertyLineElement.idl b/offapi/com/sun/star/inspection/PropertyLineElement.idl
index 35d7c47e7a17..9979169a2773 100644
--- a/offapi/com/sun/star/inspection/PropertyLineElement.idl
+++ b/offapi/com/sun/star/inspection/PropertyLineElement.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-constants PropertyLineElement
+published constants PropertyLineElement
 {
     /// specifies the input control in a group of controls related to a single property
     const short InputControl    = 0x01;
diff --git a/offapi/com/sun/star/inspection/XHyperlinkControl.idl b/offapi/com/sun/star/inspection/XHyperlinkControl.idl
index f6daa5f8c179..6537da25a966 100644
--- a/offapi/com/sun/star/inspection/XHyperlinkControl.idl
+++ b/offapi/com/sun/star/inspection/XHyperlinkControl.idl
@@ -46,7 +46,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-interface XHyperlinkControl : XPropertyControl
+published interface XHyperlinkControl : XPropertyControl
 {
     /** adds a listener which will be notified when the user clicked the hyperlink text in the control
         @param listener
diff --git a/offapi/com/sun/star/inspection/XNumericControl.idl b/offapi/com/sun/star/inspection/XNumericControl.idl
index 2309d1e830f1..28d2865aec80 100644
--- a/offapi/com/sun/star/inspection/XNumericControl.idl
+++ b/offapi/com/sun/star/inspection/XNumericControl.idl
@@ -47,7 +47,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-interface XNumericControl : XPropertyControl
+published interface XNumericControl : XPropertyControl
 {
     /** describes the number of decimal digits to use for the value
     */
diff --git a/offapi/com/sun/star/inspection/XObjectInspector.idl b/offapi/com/sun/star/inspection/XObjectInspector.idl
index 664221ff03fd..12d656692b74 100644
--- a/offapi/com/sun/star/inspection/XObjectInspector.idl
+++ b/offapi/com/sun/star/inspection/XObjectInspector.idl
@@ -41,8 +41,8 @@
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
 
-interface XObjectInspectorModel;
-interface XObjectInspectorUI;
+published interface XObjectInspectorModel;
+published interface XObjectInspectorUI;
 
 //-----------------------------------------------------------------------------
 /** describes the main interface of an <type>ObjectInspector</type>.
@@ -51,7 +51,7 @@ interface XObjectInspectorUI;
 
     @since OOo 2.0.3
 */
-interface XObjectInspector
+published interface XObjectInspector
 {
     /** allows to plug the inspector into an <type scope="com::sun::star::frame">XFrame</type>
 
diff --git a/offapi/com/sun/star/inspection/XObjectInspectorModel.idl b/offapi/com/sun/star/inspection/XObjectInspectorModel.idl
index 39352ab2a9e7..66aa7ba151a9 100644
--- a/offapi/com/sun/star/inspection/XObjectInspectorModel.idl
+++ b/offapi/com/sun/star/inspection/XObjectInspectorModel.idl
@@ -47,7 +47,7 @@ interface XPropertyHandler;
 
     @since OOo 2.0.3
 */
-interface XObjectInspectorModel
+published interface XObjectInspectorModel
 {
     /** describes a set of factories for creating <type>XPropertyHandler</type>s
 
diff --git a/offapi/com/sun/star/inspection/XObjectInspectorUI.idl b/offapi/com/sun/star/inspection/XObjectInspectorUI.idl
index f6a90c824426..81b4836c4c36 100644
--- a/offapi/com/sun/star/inspection/XObjectInspectorUI.idl
+++ b/offapi/com/sun/star/inspection/XObjectInspectorUI.idl
@@ -43,7 +43,7 @@
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
 
-interface XPropertyControlObserver;
+published interface XPropertyControlObserver;
 
 //-----------------------------------------------------------------------------
 /** grants access to certain aspects of the user interface of an object
@@ -59,7 +59,7 @@ interface XPropertyControlObserver;
 
     @since OOo 2.0.3
 */
-interface XObjectInspectorUI
+published interface XObjectInspectorUI
 {
     /** enables or disables all components belonging to the UI representation of a property
 
diff --git a/offapi/com/sun/star/inspection/XPropertyControl.idl b/offapi/com/sun/star/inspection/XPropertyControl.idl
index b48f730fa7d9..5f414ccdcd28 100644
--- a/offapi/com/sun/star/inspection/XPropertyControl.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControl.idl
@@ -38,14 +38,14 @@
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
 
-interface XPropertyControlContext;
+published interface XPropertyControlContext;
 
 //-----------------------------------------------------------------------------
 /** defines the interface for a single control in an <type>ObjectInspector</type>
 
     @since OOo 2.0.3
 */
-interface XPropertyControl
+published interface XPropertyControl
 {
     /** denotes the type of the control, as one of the <type>PropertyControlType</type>
         constants
diff --git a/offapi/com/sun/star/inspection/XPropertyControlContext.idl b/offapi/com/sun/star/inspection/XPropertyControlContext.idl
index 457ef549652d..e2f4b0224ccb 100644
--- a/offapi/com/sun/star/inspection/XPropertyControlContext.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControlContext.idl
@@ -42,7 +42,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-interface XPropertyControlContext : XPropertyControlObserver
+published interface XPropertyControlContext : XPropertyControlObserver
 {
     /** instructs the <type>XPropertyControlContext</type> to active the next control
 
diff --git a/offapi/com/sun/star/inspection/XPropertyControlFactory.idl b/offapi/com/sun/star/inspection/XPropertyControlFactory.idl
index 964a2c4fb3e8..c4ff4dd875d1 100644
--- a/offapi/com/sun/star/inspection/XPropertyControlFactory.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControlFactory.idl
@@ -35,14 +35,14 @@
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
 
-interface XPropertyControl;
+published interface XPropertyControl;
 
 //-----------------------------------------------------------------------------
 /** a factory for <type>XPropertyControl</type>s
 
     @since OOo 2.0.3
 */
-interface XPropertyControlFactory
+published interface XPropertyControlFactory
 {
     /** creates a <type>XPropertyControl</type>
 
diff --git a/offapi/com/sun/star/inspection/XPropertyControlObserver.idl b/offapi/com/sun/star/inspection/XPropertyControlObserver.idl
index 51263e6824a5..90b1337b5d08 100644
--- a/offapi/com/sun/star/inspection/XPropertyControlObserver.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControlObserver.idl
@@ -36,7 +36,7 @@
 
 module com { module sun { module star { module inspection {
 
-interface XPropertyControl;
+published interface XPropertyControl;
 
 //=============================================================================
 
@@ -45,7 +45,7 @@ interface XPropertyControl;
 
     @since OOo 2.2
 */
-interface XPropertyControlObserver
+published interface XPropertyControlObserver
 {
     /** notifies the observer that a certain <type>XPropertyControl</type>'s UI
         representation gained the focus.
diff --git a/offapi/com/sun/star/inspection/XPropertyHandler.idl b/offapi/com/sun/star/inspection/XPropertyHandler.idl
index ed8b80195a73..e624d7748610 100644
--- a/offapi/com/sun/star/inspection/XPropertyHandler.idl
+++ b/offapi/com/sun/star/inspection/XPropertyHandler.idl
@@ -55,8 +55,8 @@
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
 
-interface XObjectInspectorUI;
-interface XPropertyControlFactory;
+published interface XObjectInspectorUI;
+published interface XPropertyControlFactory;
 
 //-----------------------------------------------------------------------------
 /** is the basic interface for object inspection.
@@ -72,7 +72,7 @@ interface XPropertyControlFactory;
 
     @since OOo 2.0.3
 */
-interface XPropertyHandler
+published interface XPropertyHandler
 {
     /** used for controlling resources acquired by the handler
 
diff --git a/offapi/com/sun/star/inspection/XStringListControl.idl b/offapi/com/sun/star/inspection/XStringListControl.idl
index 0e5fcb5e111e..ecf1d5bf5890 100644
--- a/offapi/com/sun/star/inspection/XStringListControl.idl
+++ b/offapi/com/sun/star/inspection/XStringListControl.idl
@@ -46,7 +46,7 @@ module com {  module sun {  module star {  module inspection {
 
     @since OOo 2.0.3
 */
-interface XStringListControl : XPropertyControl
+published interface XStringListControl : XPropertyControl
 {
     /** clears the whole list
     */
diff --git a/offapi/com/sun/star/inspection/XStringRepresentation.idl b/offapi/com/sun/star/inspection/XStringRepresentation.idl
index b0a4f66d9773..871f3142a111 100644
--- a/offapi/com/sun/star/inspection/XStringRepresentation.idl
+++ b/offapi/com/sun/star/inspection/XStringRepresentation.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module inspection {
 /** handles string representations of property values.
     @see
 */
-interface XStringRepresentation
+published interface XStringRepresentation
 {
     /** converts a  into a string.
         @param PropertyValue
diff --git a/offapi/com/sun/star/logging/LogRecord.idl b/offapi/com/sun/star/logging/LogRecord.idl
index 9d35f351de04..f7a299503322 100644
--- a/offapi/com/sun/star/logging/LogRecord.idl
+++ b/offapi/com/sun/star/logging/LogRecord.idl
@@ -44,7 +44,7 @@ module com { module sun { module star { module logging {
 
     @since OOo 2.3
  */
-struct LogRecord
+published struct LogRecord
 {
     /// specifies the name of the logger at which the record is logged
     string  LoggerName;
diff --git a/offapi/com/sun/star/logging/XLogFormatter.idl b/offapi/com/sun/star/logging/XLogFormatter.idl
index 4a0e5c68b6ef..a6a3fc9ccf1d 100644
--- a/offapi/com/sun/star/logging/XLogFormatter.idl
+++ b/offapi/com/sun/star/logging/XLogFormatter.idl
@@ -48,7 +48,7 @@ module com { module sun { module star { module logging {
 
     @since OOo 2.3
 */
-interface XLogFormatter
+published interface XLogFormatter
 {
     /** returns the header string for the log
 
diff --git a/offapi/com/sun/star/logging/XLogHandler.idl b/offapi/com/sun/star/logging/XLogHandler.idl
index b74ed1c24291..ad93a1114681 100644
--- a/offapi/com/sun/star/logging/XLogHandler.idl
+++ b/offapi/com/sun/star/logging/XLogHandler.idl
@@ -53,7 +53,7 @@ module com { module sun { module star { module logging {
 
     @since OOo 2.3
  */
-interface XLogHandler
+published interface XLogHandler
 {
     /** allows life time control for the handler
 
diff --git a/offapi/com/sun/star/logging/XLogger.idl b/offapi/com/sun/star/logging/XLogger.idl
index e0f34108643a..9c3f546650e1 100644
--- a/offapi/com/sun/star/logging/XLogger.idl
+++ b/offapi/com/sun/star/logging/XLogger.idl
@@ -36,7 +36,7 @@
 
 module com { module sun { module star { module logging {
 
-interface XLogHandler;
+published interface XLogHandler;
 
 //=============================================================================
 
@@ -53,7 +53,7 @@ interface XLogHandler;
 
     @since OOo 2.3
  */
-interface XLogger
+published interface XLogger
 {
     /** denotes the name of the logger.
     */
diff --git a/offapi/com/sun/star/presentation/PresentationDocument.idl b/offapi/com/sun/star/presentation/PresentationDocument.idl
index 401090dd09c2..97129cb9f060 100644
--- a/offapi/com/sun/star/presentation/PresentationDocument.idl
+++ b/offapi/com/sun/star/presentation/PresentationDocument.idl
@@ -52,7 +52,7 @@
 
 /** This is the service provided by a presentation document.
  */
-service PresentationDocument
+published service PresentationDocument
 {
     /** This is a basic service for a drawing document.
 
diff --git a/offapi/com/sun/star/presentation/XSlideShowListener.idl b/offapi/com/sun/star/presentation/XSlideShowListener.idl
index 17d7cd7b5370..6882734f687a 100644
--- a/offapi/com/sun/star/presentation/XSlideShowListener.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowListener.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module presentation {
 
     @since OOo 3.0
  */
-interface XSlideShowListener : ::com::sun::star::animations::XAnimationListener
+published interface XSlideShowListener : ::com::sun::star::animations::XAnimationListener
 {
     /** Notify that the slide show is paused
     */
diff --git a/offapi/com/sun/star/presentation/XSlideShowView.idl b/offapi/com/sun/star/presentation/XSlideShowView.idl
index f4873a5e6865..10f1171d5d08 100644
--- a/offapi/com/sun/star/presentation/XSlideShowView.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowView.idl
@@ -59,7 +59,7 @@ module com {  module sun {  module star {  module presentation {
 
     @since OOo 2.4
  */
-interface XSlideShowView : ::com::sun::star::uno::XInterface
+published interface XSlideShowView : ::com::sun::star::uno::XInterface
 {
     /** Get view canvas.<p>
 
@@ -81,9 +81,9 @@ interface XSlideShowView : ::com::sun::star::uno::XInterface
 
     /** Query the current transformation matrix for this view.<p>
 
-           This method returns the transformation matrix of the
-           view. When notified via the transformation change listener,
-           the show will be displayed using the new transformation.<p>
+            This method returns the transformation matrix of the
+            view. When notified via the transformation change listener,
+            the show will be displayed using the new transformation.<p>
 
         @return the view transformation matrix. Note that the slide
         show itself will paint all slides as one-by-one boxes, one
diff --git a/offapi/com/sun/star/rdf/XMetadatable.idl b/offapi/com/sun/star/rdf/XMetadatable.idl
index e7f01d9c05ba..256d74e48549 100644
--- a/offapi/com/sun/star/rdf/XMetadatable.idl
+++ b/offapi/com/sun/star/rdf/XMetadatable.idl
@@ -67,7 +67,7 @@ module com {   module sun {   module star {   module rdf {
     @see XRepository
     @see XDocumentMetadataAccess
  */
-interface XMetadatable : XURI
+published interface XMetadatable : XURI
 {
     //-------------------------------------------------------------------------
     /** a metadata reference, comprising the stream name and the XML ID.
diff --git a/offapi/com/sun/star/rdf/XNode.idl b/offapi/com/sun/star/rdf/XNode.idl
index 0c7f70d5e4f7..9ed8e614fd03 100644
--- a/offapi/com/sun/star/rdf/XNode.idl
+++ b/offapi/com/sun/star/rdf/XNode.idl
@@ -66,7 +66,7 @@ module com {   module sun {   module star {   module rdf {
     @see XURI
     @see XLiteral
  */
-interface XNode
+published interface XNode
 {
     /// the string value of the node.
     [readonly, attribute] string StringValue;
diff --git a/offapi/com/sun/star/rdf/XResource.idl b/offapi/com/sun/star/rdf/XResource.idl
index 3c10b586fd78..b0ce3c505de8 100644
--- a/offapi/com/sun/star/rdf/XResource.idl
+++ b/offapi/com/sun/star/rdf/XResource.idl
@@ -50,7 +50,7 @@ module com {   module sun {   module star {   module rdf {
     @see XBlankNode
     @see XURI
  */
-interface XResource : XNode
+published interface XResource : XNode
 {
 };
 
diff --git a/offapi/com/sun/star/rdf/XURI.idl b/offapi/com/sun/star/rdf/XURI.idl
index 6ba59cec0dd6..d869d4e80c54 100644
--- a/offapi/com/sun/star/rdf/XURI.idl
+++ b/offapi/com/sun/star/rdf/XURI.idl
@@ -62,7 +62,7 @@ module com {   module sun {   module star {   module rdf {
 
     @see XRepository
  */
-interface XURI : XResource
+published interface XURI : XResource
 {
     /// prefix
     [readonly, attribute] string Namespace;
diff --git a/offapi/com/sun/star/rendering/AnimationAttributes.idl b/offapi/com/sun/star/rendering/AnimationAttributes.idl
index a208aff1ee0f..d60ad6e0792c 100644
--- a/offapi/com/sun/star/rendering/AnimationAttributes.idl
+++ b/offapi/com/sun/star/rendering/AnimationAttributes.idl
@@ -37,10 +37,10 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-struct AnimationAttributes
+published struct AnimationAttributes
 {
     /// Preferred duration of the animation sequence in seconds.
-    double                                      Duration;
+    double                                          Duration;
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/Caret.idl b/offapi/com/sun/star/rendering/Caret.idl
index 8d8999160ac2..7eea3b6dc79f 100644
--- a/offapi/com/sun/star/rendering/Caret.idl
+++ b/offapi/com/sun/star/rendering/Caret.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-struct Caret
+published struct Caret
 {
     /** This contains the main caret index.<p>
 
diff --git a/offapi/com/sun/star/rendering/FillRule.idl b/offapi/com/sun/star/rendering/FillRule.idl
index 58d76ffcfd58..3ad5c819491e 100644
--- a/offapi/com/sun/star/rendering/FillRule.idl
+++ b/offapi/com/sun/star/rendering/FillRule.idl
@@ -34,7 +34,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-enum FillRule
+published enum FillRule
 {
     /** Fill every area, where, when traveling along a line, the
         summed winding number (that is, -1 for a
diff --git a/offapi/com/sun/star/rendering/FontInfo.idl b/offapi/com/sun/star/rendering/FontInfo.idl
index 6c00c2c2ff93..2bc5d1cae032 100644
--- a/offapi/com/sun/star/rendering/FontInfo.idl
+++ b/offapi/com/sun/star/rendering/FontInfo.idl
@@ -42,7 +42,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-struct FontInfo
+published struct FontInfo
 {
     /** The PANOSE font classification.<p>
 
@@ -73,7 +73,7 @@ struct FontInfo
     //-------------------------------------------------------------------------
 
     /** This value specifies which Unicode ranges are supported by
-         this font.<p>
+        this font.<p>
 
         This is to be interpreted as a split-up 128-bit value, see <a
         href=http://partners.adobe.com/asn/tech/type/opentype/os2.jsp#ur>Adobe's
diff --git a/offapi/com/sun/star/rendering/FontMetrics.idl b/offapi/com/sun/star/rendering/FontMetrics.idl
index 2b66bb5e0f8c..657ddb261161 100644
--- a/offapi/com/sun/star/rendering/FontMetrics.idl
+++ b/offapi/com/sun/star/rendering/FontMetrics.idl
@@ -51,7 +51,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-struct FontMetrics
+published struct FontMetrics
 {
     /// Ascent (above the baseline) part of the font.
     double      Ascent;
@@ -84,14 +84,14 @@ struct FontMetrics
         characters, and if one needs a font with double character
         width, the referenceCharSize should be doubled.<p>
      */
-    double      ReferenceCharSize;
+    double          ReferenceCharSize;
 
     //-------------------------------------------------------------------------
 
     /** Specifies the offset to be added to the baseline when drawing
         underlined text.
      */
-    double      UnderlineOffset;
+    double          UnderlineOffset;
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/FontRequest.idl b/offapi/com/sun/star/rendering/FontRequest.idl
index 0a5caa06ee18..60c0d859bf64 100644
--- a/offapi/com/sun/star/rendering/FontRequest.idl
+++ b/offapi/com/sun/star/rendering/FontRequest.idl
@@ -50,7 +50,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-struct FontRequest
+published struct FontRequest
 {
     /** The description of the font.<p>
 
@@ -85,7 +85,7 @@ struct FontRequest
         query methods, for both <type>XCanvasFont</type> and
         <type>XTextLayout</type>.<p>
     */
-    double                          CellSize;
+    double                              CellSize;
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/Panose.idl b/offapi/com/sun/star/rendering/Panose.idl
index aaf3d3f8da4e..2239f05c8ac0 100644
--- a/offapi/com/sun/star/rendering/Panose.idl
+++ b/offapi/com/sun/star/rendering/Panose.idl
@@ -29,7 +29,7 @@
 
 module com { module sun { module star { module rendering {
 
-struct Panose
+published struct Panose
 {
     /// <type>PanoseFamilyTypes</type>
     byte    FamilyType;
diff --git a/offapi/com/sun/star/rendering/RenderState.idl b/offapi/com/sun/star/rendering/RenderState.idl
index ecb5b169d3a3..1f0cef7843aa 100644
--- a/offapi/com/sun/star/rendering/RenderState.idl
+++ b/offapi/com/sun/star/rendering/RenderState.idl
@@ -36,7 +36,7 @@
 
 module com { module sun { module star { module rendering {
 
-interface XPolyPolygon2D;
+published interface XPolyPolygon2D;
 
 /** This structure contains information passed to each
     <type>XCanvas</type> render operation.<p>
@@ -47,7 +47,7 @@ interface XPolyPolygon2D;
 
     @since OOo 2.0
  */
-struct RenderState
+published struct RenderState
 {
     /** The affine transform associated with this render
         operation.<p>
diff --git a/offapi/com/sun/star/rendering/StringContext.idl b/offapi/com/sun/star/rendering/StringContext.idl
index 3f9c833ceb74..28a7e5f50907 100644
--- a/offapi/com/sun/star/rendering/StringContext.idl
+++ b/offapi/com/sun/star/rendering/StringContext.idl
@@ -38,12 +38,12 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-struct StringContext
+published struct StringContext
 {
     /** The complete text, from which a subset is selected by the
         parameters below.
      */
-    string  Text;
+    string      Text;
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/StrokeAttributes.idl b/offapi/com/sun/star/rendering/StrokeAttributes.idl
index 22c9e7b341b3..a5c714e22cad 100644
--- a/offapi/com/sun/star/rendering/StrokeAttributes.idl
+++ b/offapi/com/sun/star/rendering/StrokeAttributes.idl
@@ -27,14 +27,6 @@
 #ifndef __com_sun_star_rendering_StrokeAttributes_idl__
 #define __com_sun_star_rendering_StrokeAttributes_idl__
 
-#ifndef __com_sun_star_rendering_PathCapType_idl__
-#include <com/sun/star/rendering/PathCapType.idl>
-#endif
-#ifndef __com_sun_star_rendering_PathJoinType_idl__
-#include <com/sun/star/rendering/PathJoinType.idl>
-#endif
-
-
 module com { module sun { module star { module rendering {
 
 /** This structure contains all attributes required for path stroking.<p>
@@ -45,14 +37,14 @@ module com { module sun { module star { module rendering {
 
     @single #110496#
  */
-struct StrokeAttributes
+published struct StrokeAttributes
 {
     /** Defines the width of the stroke, measured in user
         coordinate space.
 
         This value must be positive (or 0.0)
      */
-    double              StrokeWidth;
+    double                  StrokeWidth;
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/TextHit.idl b/offapi/com/sun/star/rendering/TextHit.idl
index 88c689e34557..ce4c79b94225 100644
--- a/offapi/com/sun/star/rendering/TextHit.idl
+++ b/offapi/com/sun/star/rendering/TextHit.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-struct TextHit
+published struct TextHit
 {
     /** This contains the entry index.<p>
 
diff --git a/offapi/com/sun/star/rendering/Texture.idl b/offapi/com/sun/star/rendering/Texture.idl
index ea033b3e21a8..43addb55e769 100644
--- a/offapi/com/sun/star/rendering/Texture.idl
+++ b/offapi/com/sun/star/rendering/Texture.idl
@@ -36,8 +36,8 @@
 
 module com { module sun { module star { module rendering {
 
-interface XBitmap;
-interface XParametricPolyPolygon2D;
+published interface XBitmap;
+published interface XParametricPolyPolygon2D;
 
 /** Contains all information needed to define a texture.<p>
 
@@ -53,7 +53,7 @@ interface XParametricPolyPolygon2D;
 
     @since OOo 2.0
  */
-struct Texture
+published struct Texture
 {
     /** Texture transformation from texture to primitive space.<p>
 
diff --git a/offapi/com/sun/star/rendering/ViewState.idl b/offapi/com/sun/star/rendering/ViewState.idl
index fe4de1fc17bf..4791232f5ae4 100644
--- a/offapi/com/sun/star/rendering/ViewState.idl
+++ b/offapi/com/sun/star/rendering/ViewState.idl
@@ -33,7 +33,7 @@
 
 module com { module sun { module star { module rendering {
 
-interface XPolyPolygon2D;
+published interface XPolyPolygon2D;
 
 /** This structure contains information considered the view state.<p>
 
@@ -43,7 +43,7 @@ interface XPolyPolygon2D;
 
     @since OOo 2.0
  */
-struct ViewState
+published struct ViewState
 {
     /** The affine transform associated with the view.<p>
 
diff --git a/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl b/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
index 718444f91a25..90517a596c13 100644
--- a/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
+++ b/offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module rendering {
 
         @since OOo 2.0
     */
-    exception VolatileContentDestroyedException : ::com::sun::star::uno::Exception
+    published exception VolatileContentDestroyedException : ::com::sun::star::uno::Exception
     {
     };
 
diff --git a/offapi/com/sun/star/rendering/XAnimatedSprite.idl b/offapi/com/sun/star/rendering/XAnimatedSprite.idl
index 9db5b0e6d6f5..19a9f5121475 100644
--- a/offapi/com/sun/star/rendering/XAnimatedSprite.idl
+++ b/offapi/com/sun/star/rendering/XAnimatedSprite.idl
@@ -56,7 +56,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-interface XAnimatedSprite : XSprite
+published interface XAnimatedSprite : XSprite
 {
     /** Start animation sequence of this sprite.<p>
 
diff --git a/offapi/com/sun/star/rendering/XAnimation.idl b/offapi/com/sun/star/rendering/XAnimation.idl
index 26ee03e3cb87..1a9ca01f7e13 100644
--- a/offapi/com/sun/star/rendering/XAnimation.idl
+++ b/offapi/com/sun/star/rendering/XAnimation.idl
@@ -60,7 +60,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-interface XAnimation : ::com::sun::star::uno::XInterface
+published interface XAnimation : ::com::sun::star::uno::XInterface
 {
     /** Render the animation content at time t into the specified
         canvas.<p>
diff --git a/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl b/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
index 1d57ccea9e8a..bdb9bd2db2ed 100644
--- a/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
@@ -43,7 +43,7 @@
 module com { module sun { module star { module rendering {
 
 /** This is a specialized interface for a 2D poly-polygon containing
-     straight line and Bezier segments.<p>
+    straight line and Bezier segments.<p>
 
     This poly-polygon can contain polygons consisting of a mixture of
     cubic Bezier curves and straight lines. As the straight line is a
@@ -56,7 +56,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-interface XBezierPolyPolygon2D : XPolyPolygon2D
+published interface XBezierPolyPolygon2D : XPolyPolygon2D
 {
     /** Query subset of this poly-polygon.<p>
 
diff --git a/offapi/com/sun/star/rendering/XBitmap.idl b/offapi/com/sun/star/rendering/XBitmap.idl
index c061d2908f2e..7ba4471118bf 100644
--- a/offapi/com/sun/star/rendering/XBitmap.idl
+++ b/offapi/com/sun/star/rendering/XBitmap.idl
@@ -45,8 +45,6 @@
 
 module com { module sun { module star { module rendering {
 
-interface XBitmapCanvas;
-
 /** This is a generic interface to a bitmap.<p>
 
     This interface contains the generic functionality to be used on
@@ -57,14 +55,14 @@ interface XBitmapCanvas;
 
     @since OOo 2.0
  */
-interface XBitmap : ::com::sun::star::uno::XInterface
+published interface XBitmap : ::com::sun::star::uno::XInterface
 {
     /** Query the size of the bitmap.<p>
 
         This method queries the bitmap size in pixel.<p>
 
         @return the bitmap size in pixel.
-      */
+     */
     ::com::sun::star::geometry::IntegerSize2D   getSize();
 
     //-------------------------------------------------------------------------
@@ -80,7 +78,7 @@ interface XBitmap : ::com::sun::star::uno::XInterface
 
         @return <TRUE/>, if the bitmap has alpha data, or <FALSE/> if
         not.
-      */
+     */
     boolean                                     hasAlpha();
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/rendering/XBitmapCanvas.idl b/offapi/com/sun/star/rendering/XBitmapCanvas.idl
index fed3cd4238dc..5931741248d6 100644
--- a/offapi/com/sun/star/rendering/XBitmapCanvas.idl
+++ b/offapi/com/sun/star/rendering/XBitmapCanvas.idl
@@ -61,7 +61,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-interface XBitmapCanvas : XCanvas
+published interface XBitmapCanvas : XCanvas
 {
     /** This method copies a rectangular area from a place of one
         canvas to a place on another.<p>
diff --git a/offapi/com/sun/star/rendering/XBufferController.idl b/offapi/com/sun/star/rendering/XBufferController.idl
index f90f6b8a31c7..d9833fdb91cd 100644
--- a/offapi/com/sun/star/rendering/XBufferController.idl
+++ b/offapi/com/sun/star/rendering/XBufferController.idl
@@ -44,7 +44,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-interface XBufferController : ::com::sun::star::uno::XInterface
+published interface XBufferController : ::com::sun::star::uno::XInterface
 {
     /** Create the given number of background buffers.<p>
 
@@ -61,7 +61,7 @@ interface XBufferController : ::com::sun::star::uno::XInterface
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if nBuffers is smaller than one.
-      */
+     */
     long    createBuffers( [in] long nBuffers )
         raises (com::sun::star::lang::IllegalArgumentException);
 
diff --git a/offapi/com/sun/star/rendering/XCachedPrimitive.idl b/offapi/com/sun/star/rendering/XCachedPrimitive.idl
index 9793374ad913..18b18c7133a6 100644
--- a/offapi/com/sun/star/rendering/XCachedPrimitive.idl
+++ b/offapi/com/sun/star/rendering/XCachedPrimitive.idl
@@ -47,7 +47,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-interface XCachedPrimitive : ::com::sun::star::uno::XInterface
+published interface XCachedPrimitive : ::com::sun::star::uno::XInterface
 {
     /** Redraw the cached primitive.<p>
 
diff --git a/offapi/com/sun/star/rendering/XCanvas.idl b/offapi/com/sun/star/rendering/XCanvas.idl
index 78658a11f0f8..57f1d80b6126 100644
--- a/offapi/com/sun/star/rendering/XCanvas.idl
+++ b/offapi/com/sun/star/rendering/XCanvas.idl
@@ -76,17 +76,17 @@
 
 
 module com {  module sun {  module star {  module geometry {
-    interface XMapping2D;
+    published interface XMapping2D;
 }; }; }; };
 
 module com { module sun { module star { module rendering {
 
-interface XCanvasFont;
-interface XPolyPolygon2D;
-interface XCachedPrimitive;
-interface XBitmap;
-interface XGraphicDevice;
-interface XTextLayout;
+published interface XCanvasFont;
+published interface XPolyPolygon2D;
+published interface XCachedPrimitive;
+published interface XBitmap;
+published interface XGraphicDevice;
+published interface XTextLayout;
 
 /** Central interface for rendering.<p>
 
@@ -150,7 +150,7 @@ interface XTextLayout;
 
     @since OOo 2.0
  */
-interface XCanvas : ::com::sun::star::uno::XInterface
+published interface XCanvas : ::com::sun::star::uno::XInterface
 {
     /** Clear the whole canvas area.<p>
 
@@ -162,7 +162,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
      /** Draw a point in device resolution on the device.
 
-         @param aPoint
+        @param aPoint
         The point to draw.
 
         @param aViewState
@@ -183,10 +183,10 @@ interface XCanvas : ::com::sun::star::uno::XInterface
     /** Draw a line in device resolution width (i.e. one device pixel
         wide).
 
-         @param aStartPoint
+        @param aStartPoint
         The start point of the line to draw.
 
-         @param aEndPoint
+        @param aEndPoint
         The end point of the line to draw.
 
         @param aViewState
@@ -402,7 +402,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
         if one of the view and render state parameters are outside the
         specified range.
      */
-    XPolyPolygon2D      queryStrokeShapes( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] StrokeAttributes aStrokeAttributes )
+    XPolyPolygon2D          queryStrokeShapes( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] StrokeAttributes aStrokeAttributes )
         raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/rendering/XCanvasFont.idl b/offapi/com/sun/star/rendering/XCanvasFont.idl
index face4c16cee9..a761c604b18d 100644
--- a/offapi/com/sun/star/rendering/XCanvasFont.idl
+++ b/offapi/com/sun/star/rendering/XCanvasFont.idl
@@ -59,15 +59,15 @@
 
 module com { module sun { module star { module rendering {
 
-interface XCanvas;
-interface XTextLayout;
-interface XPolyPolygon2D;
+published interface XCanvas;
+published interface XTextLayout;
+published interface XPolyPolygon2D;
 
 /** This interface provides access to a specific, XCanvas-dependent
     font incarnation. This font is not universally usable, but belongs
     to the XCanvas it was queried from.
  */
-interface XCanvasFont : ::com::sun::star::uno::XInterface
+published interface XCanvasFont : ::com::sun::star::uno::XInterface
 {
     /** Create a text layout interface.<p>
 
@@ -122,7 +122,7 @@ interface XCanvasFont : ::com::sun::star::uno::XInterface
         contained in the list returned by this method can lead to
         visible disturbances.<p>
      */
-    sequence< double >                                  getAvailableSizes();
+    sequence< double >                                      getAvailableSizes();
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/XColorSpace.idl b/offapi/com/sun/star/rendering/XColorSpace.idl
index bb20e50e8fdd..30e4b8b3431e 100644
--- a/offapi/com/sun/star/rendering/XColorSpace.idl
+++ b/offapi/com/sun/star/rendering/XColorSpace.idl
@@ -43,13 +43,13 @@
 module com { module sun { module star { module rendering {
 
 /// Shorthand for the device-dependent color components, and easier to read
-typedef double ColorComponent;
-typedef sequence<ColorComponent> Color;
+published typedef double ColorComponent;
+published typedef sequence<ColorComponent> Color;
 
 //=============================================================================
 
 /// RGB color triplet
-struct RGBColor
+published struct RGBColor
 {
     /// Red component. Valid range is [0,1.0]
     ColorComponent Red;
@@ -62,7 +62,7 @@ struct RGBColor
 //=============================================================================
 
 /// ARGB color quad
-struct ARGBColor
+published struct ARGBColor
 {
     /** Alpha component.<p>
 
@@ -95,7 +95,7 @@ struct ARGBColor
     e.g. <type>XIntegerBitmapColorSpace</type>, which use sequences of
     integers for color representation.<p>
  */
-interface XColorSpace
+published interface XColorSpace
 {
     /** Query type of this color space.<p>
 
diff --git a/offapi/com/sun/star/rendering/XCustomSprite.idl b/offapi/com/sun/star/rendering/XCustomSprite.idl
index e02f3c62df84..3b6dd45644f4 100644
--- a/offapi/com/sun/star/rendering/XCustomSprite.idl
+++ b/offapi/com/sun/star/rendering/XCustomSprite.idl
@@ -42,7 +42,7 @@
 
 module com { module sun { module star { module rendering {
 
-interface XCanvas;
+published interface XCanvas;
 
 /** Interface to control a custom sprite object on a XSpriteCanvas.<p>
 
@@ -53,7 +53,7 @@ interface XCanvas;
     TODO: Maybe more than alpha has to be overridden from render state.
     TODO: Provide means to change the output area
  */
-interface XCustomSprite : XSprite
+published interface XCustomSprite : XSprite
 {
 
     /** Query a render canvas for this sprite's content.<p>
diff --git a/offapi/com/sun/star/rendering/XGraphicDevice.idl b/offapi/com/sun/star/rendering/XGraphicDevice.idl
index 411ae6d5cb40..a7ad2b6ae10d 100644
--- a/offapi/com/sun/star/rendering/XGraphicDevice.idl
+++ b/offapi/com/sun/star/rendering/XGraphicDevice.idl
@@ -54,9 +54,9 @@
 
 module com { module sun { module star { module rendering {
 
-interface XBitmap;
-interface XVolatileBitmap;
-interface XBufferController;
+published interface XBitmap;
+published interface XVolatileBitmap;
+published interface XBufferController;
 
 /* TODO: There's obviously a concept called window missing here, where
    methods such as bufferController, fullscreen mode etc . belong
@@ -78,7 +78,7 @@ interface XBufferController;
     have this state, it might even be that all windows on the screen
     share a common graphic device.
  */
-interface XGraphicDevice : ::com::sun::star::uno::XInterface
+published interface XGraphicDevice : ::com::sun::star::uno::XInterface
 {
     /** Query the controller for multi buffering functionality on this
         graphic device.
@@ -130,7 +130,7 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         @param points
         The points of the poly-polygon, in a separate array for every polygon.
      */
-    XLinePolyPolygon2D              createCompatibleLinePolyPolygon( [in] sequence< sequence< ::com::sun::star::geometry::RealPoint2D > > points );
+    XLinePolyPolygon2D                  createCompatibleLinePolyPolygon( [in] sequence< sequence< ::com::sun::star::geometry::RealPoint2D > > points );
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl b/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
index bbd2606297ba..865faec60b9e 100644
--- a/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
@@ -46,7 +46,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-interface XLinePolyPolygon2D : XPolyPolygon2D
+published interface XLinePolyPolygon2D : XPolyPolygon2D
 {
     /** Query subset of this poly-polygon, starting at the given
         polygon and the given point within that polygon, and
diff --git a/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl b/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
index 4f29186be31e..774a1d04ade2 100644
--- a/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
@@ -52,7 +52,7 @@ module com { module sun { module star { module rendering {
     [0,1]x[0,1] rectangle. At least that is the dimension expected at
     other places. e.g. <type>Texture</type>.
  */
-interface XParametricPolyPolygon2D : ::com::sun::star::uno::XInterface
+published interface XParametricPolyPolygon2D : ::com::sun::star::uno::XInterface
 {
     /** Query the polygonal outline at the specified value.
 
@@ -67,7 +67,7 @@ interface XParametricPolyPolygon2D : ::com::sun::star::uno::XInterface
         with t (unless singularities in e.g. the resulting gradient
         are desired).
      */
-    XPolyPolygon2D              getOutline( [in] double t )
+    XPolyPolygon2D                  getOutline( [in] double t )
         raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/rendering/XPolyPolygon2D.idl b/offapi/com/sun/star/rendering/XPolyPolygon2D.idl
index 97319e9ce8d9..e5755a3df808 100644
--- a/offapi/com/sun/star/rendering/XPolyPolygon2D.idl
+++ b/offapi/com/sun/star/rendering/XPolyPolygon2D.idl
@@ -49,7 +49,7 @@ module com { module sun { module star { module rendering {
 
     @since OOo 2.0
  */
-interface XPolyPolygon2D : ::com::sun::star::uno::XInterface
+published interface XPolyPolygon2D : ::com::sun::star::uno::XInterface
 {
     /** Add the specified poly-polygon at the given position.
 
diff --git a/offapi/com/sun/star/rendering/XSprite.idl b/offapi/com/sun/star/rendering/XSprite.idl
index ea33cbdbab76..05ec0b590e01 100644
--- a/offapi/com/sun/star/rendering/XSprite.idl
+++ b/offapi/com/sun/star/rendering/XSprite.idl
@@ -54,7 +54,7 @@ module com { module sun { module star { module rendering {
     <type>XSpriteCanvas</type>. Sprites are moving, back-buffered
     objects.<p>
  */
-interface XSprite : ::com::sun::star::uno::XInterface
+published interface XSprite : ::com::sun::star::uno::XInterface
 {
     /** Set overall transparency of the sprite.<p>
 
diff --git a/offapi/com/sun/star/rendering/XSpriteCanvas.idl b/offapi/com/sun/star/rendering/XSpriteCanvas.idl
index cc534013861a..97d2feaee6c5 100644
--- a/offapi/com/sun/star/rendering/XSpriteCanvas.idl
+++ b/offapi/com/sun/star/rendering/XSpriteCanvas.idl
@@ -42,9 +42,9 @@
 
 module com { module sun { module star { module rendering {
 
-interface XSprite;
-interface XAnimatedSprite;
-interface XCustomSprite;
+published interface XSprite;
+published interface XAnimatedSprite;
+published interface XCustomSprite;
 
 /** Specialization of a XBitmapCanvas, where moving, animated objects
     (called sprites) are supported.<p>
@@ -62,7 +62,7 @@ interface XCustomSprite;
     you don't need sprite functionality, and don't want the
     updateScreen hassle, simply use the XBitmapCanvas.
  */
-interface XSpriteCanvas : XBitmapCanvas
+published interface XSpriteCanvas : XBitmapCanvas
 {
     /** Create a sprite object from the specified animation
         sequence. A sprite is a back-buffered object with its own,
@@ -130,7 +130,7 @@ interface XSpriteCanvas : XBitmapCanvas
         raises (com::sun::star::lang::IllegalArgumentException);
 
     /** Tells the sprite canvas to now update the screen
-         representation.
+        representation.
 
         Required to display rendered changes to the canvas, and
         updates to stopped animations and XCustomSprites in
diff --git a/offapi/com/sun/star/rendering/XTextLayout.idl b/offapi/com/sun/star/rendering/XTextLayout.idl
index 0861d547bf13..c1e0c70a021b 100644
--- a/offapi/com/sun/star/rendering/XTextLayout.idl
+++ b/offapi/com/sun/star/rendering/XTextLayout.idl
@@ -64,9 +64,9 @@
 
 module com { module sun { module star { module rendering {
 
-interface XCanvas;
-interface XCanvasFont;
-interface XPolyPolygon2D;
+published interface XCanvas;
+published interface XCanvasFont;
+published interface XPolyPolygon2D;
 
 /** This is the central interface for text layouting.<p>
 
@@ -92,7 +92,7 @@ interface XPolyPolygon2D;
 
     @since OOo 2.0
  */
-interface XTextLayout : ::com::sun::star::uno::XInterface
+published interface XTextLayout : ::com::sun::star::uno::XInterface
 {
     /** Extract the polygonal shapes of the layouted text.<p>
 
@@ -107,7 +107,7 @@ interface XTextLayout : ::com::sun::star::uno::XInterface
     //-------------------------------------------------------------------------
 
     /** Query the ink bounding boxes for every glyph in the layouted
-         text.<p>
+        text.<p>
 
         Ink, or tight bounding boxes in this case means that for
         e.g. an "a", the bounding box for the
diff --git a/offapi/com/sun/star/rendering/XVolatileBitmap.idl b/offapi/com/sun/star/rendering/XVolatileBitmap.idl
index 2597243f5505..e8a30d6f86cd 100644
--- a/offapi/com/sun/star/rendering/XVolatileBitmap.idl
+++ b/offapi/com/sun/star/rendering/XVolatileBitmap.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module rendering {
 /** This is a specialized interface to a volatile bitmap (which can
     become invalid at any point in time).
  */
-interface XVolatileBitmap : XBitmap
+published interface XVolatileBitmap : XBitmap
 {
     /** Query whether this volatile bitmap still has valid content.
 
diff --git a/offapi/com/sun/star/report/Calculation.idl b/offapi/com/sun/star/report/Calculation.idl
index 228f7291c086..3e4611345f4c 100644
--- a/offapi/com/sun/star/report/Calculation.idl
+++ b/offapi/com/sun/star/report/Calculation.idl
@@ -37,7 +37,7 @@
 /** Specifies how to calculate a value.
     @see XFormattedField
  */
-constants Calculation
+published constants Calculation
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/report/ForceNewPage.idl b/offapi/com/sun/star/report/ForceNewPage.idl
index 68ea39c00f53..3be6d1aeb4fd 100644
--- a/offapi/com/sun/star/report/ForceNewPage.idl
+++ b/offapi/com/sun/star/report/ForceNewPage.idl
@@ -38,7 +38,7 @@
     <p>This does not apply to page header or page footer.</p>
     @see XSection
  */
-constants ForceNewPage
+published constants ForceNewPage
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/report/GroupKeepTogether.idl b/offapi/com/sun/star/report/GroupKeepTogether.idl
index 8c3a7110c2e4..1a6adbca5bab 100644
--- a/offapi/com/sun/star/report/GroupKeepTogether.idl
+++ b/offapi/com/sun/star/report/GroupKeepTogether.idl
@@ -38,7 +38,7 @@
     <member scope="XGroup">KeepTogether</member> set to WHOLE_GROUP or WITH_FIRST_DETAIL will keep together by page or column.
     @see XGroup
  */
-constants GroupKeepTogether
+published constants GroupKeepTogether
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/report/GroupOn.idl b/offapi/com/sun/star/report/GroupOn.idl
index e3959e8885c7..8a9cbecc13ce 100644
--- a/offapi/com/sun/star/report/GroupOn.idl
+++ b/offapi/com/sun/star/report/GroupOn.idl
@@ -37,7 +37,7 @@
 /** Specifies how to group data.
     @see XGroup
  */
-constants GroupOn
+published constants GroupOn
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/report/KeepTogether.idl b/offapi/com/sun/star/report/KeepTogether.idl
index 0a5ccbc70d26..f004c3f17993 100644
--- a/offapi/com/sun/star/report/KeepTogether.idl
+++ b/offapi/com/sun/star/report/KeepTogether.idl
@@ -37,7 +37,7 @@
 /** Specifies that a group header, detail, and footer section is printed on the same page.
     @see XGroup
  */
-constants KeepTogether
+published constants KeepTogether
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/report/ReportPrintOption.idl b/offapi/com/sun/star/report/ReportPrintOption.idl
index 2396c16b5b40..a73db543672c 100644
--- a/offapi/com/sun/star/report/ReportPrintOption.idl
+++ b/offapi/com/sun/star/report/ReportPrintOption.idl
@@ -36,7 +36,7 @@
 
 /** Specifies whether a page header or footer is printed on the same page as the report header or report footer.
  */
-constants ReportPrintOption
+published constants ReportPrintOption
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/report/SectionPageBreak.idl b/offapi/com/sun/star/report/SectionPageBreak.idl
index 04af47ae1609..abf9352013ea 100644
--- a/offapi/com/sun/star/report/SectionPageBreak.idl
+++ b/offapi/com/sun/star/report/SectionPageBreak.idl
@@ -37,7 +37,7 @@
 /** Specifies that page breaks are allowed inside this section.
     @see XSection
  */
-constants SectionPageBreak
+published constants SectionPageBreak
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/report/XFixedLine.idl b/offapi/com/sun/star/report/XFixedLine.idl
index f1f44f5fcf1a..7dcd6d7208d8 100644
--- a/offapi/com/sun/star/report/XFixedLine.idl
+++ b/offapi/com/sun/star/report/XFixedLine.idl
@@ -49,7 +49,7 @@
  module com {  module sun {  module star {  module report {
 
 //=============================================================================
-interface XFixedLine
+published interface XFixedLine
 {
     interface XReportControlModel;
 
@@ -97,7 +97,7 @@ interface XFixedLine
     //-------------------------------------------------------------------------
 };
 
-service FixedLine : XFixedLine;
+published service FixedLine : XFixedLine;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XFixedText.idl b/offapi/com/sun/star/report/XFixedText.idl
index 8c10e1935548..3444aa8d7c5d 100644
--- a/offapi/com/sun/star/report/XFixedText.idl
+++ b/offapi/com/sun/star/report/XFixedText.idl
@@ -35,7 +35,7 @@
  module com {  module sun {  module star {  module report {
 
 //=============================================================================
-interface XFixedText
+published interface XFixedText
 {
     interface XReportControlModel;
 
@@ -44,7 +44,7 @@ interface XFixedText
     [attribute,bound] string Label;
 };
 
-service FixedText : XFixedText;
+published service FixedText : XFixedText;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XFormatCondition.idl b/offapi/com/sun/star/report/XFormatCondition.idl
index 187c1b524af2..340f3a828a80 100644
--- a/offapi/com/sun/star/report/XFormatCondition.idl
+++ b/offapi/com/sun/star/report/XFormatCondition.idl
@@ -36,7 +36,7 @@
 //=============================================================================
 /** specifies a format condition for a control.
 */
-interface XFormatCondition
+published interface XFormatCondition
 {
     interface XReportControlFormat;
 
diff --git a/offapi/com/sun/star/report/XFormattedField.idl b/offapi/com/sun/star/report/XFormattedField.idl
index 5de71ec50b64..3dc102752572 100644
--- a/offapi/com/sun/star/report/XFormattedField.idl
+++ b/offapi/com/sun/star/report/XFormattedField.idl
@@ -44,7 +44,7 @@
     @see com::sun::star::report::XReportControlModel
     @see com::sun::star::util::XNumberFormatsSupplier
 */
-interface XFormattedField
+published interface XFormattedField
 {
     interface XReportControlModel;
 
@@ -61,7 +61,7 @@ interface XFormattedField
     [attribute,bound] com::sun::star::util::XNumberFormatsSupplier FormatsSupplier;
 };
 
-service FormattedField : XFormattedField;
+published service FormattedField : XFormattedField;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XFunction.idl b/offapi/com/sun/star/report/XFunction.idl
index deddd0d905dc..5bdbaa91155c 100644
--- a/offapi/com/sun/star/report/XFunction.idl
+++ b/offapi/com/sun/star/report/XFunction.idl
@@ -44,7 +44,7 @@
 //=============================================================================
 /** specifies a format condition for a control.
 */
-interface XFunction
+published interface XFunction
 {
     /** gives access to the properties.
     */
diff --git a/offapi/com/sun/star/report/XFunctions.idl b/offapi/com/sun/star/report/XFunctions.idl
index 5a6ab1e8930f..4b23b61b962c 100644
--- a/offapi/com/sun/star/report/XFunctions.idl
+++ b/offapi/com/sun/star/report/XFunctions.idl
@@ -42,15 +42,15 @@
 //=============================================================================
 
  module com {  module sun {  module star {  module report {
-interface XReportDefinition;
-interface XFunction;
+published interface XReportDefinition;
+published interface XFunction;
 //=============================================================================
 
 /** This interface specifies the functions collections of the report definition or a group.
     @see XFunction
     @see XReportDefinition
  */
-interface XFunctions
+published interface XFunctions
 {
     /** allows to register listeners to be notified of changes in the container.
     */
diff --git a/offapi/com/sun/star/report/XFunctionsSupplier.idl b/offapi/com/sun/star/report/XFunctionsSupplier.idl
index 63d5cda66e97..3d8c728d1f7c 100644
--- a/offapi/com/sun/star/report/XFunctionsSupplier.idl
+++ b/offapi/com/sun/star/report/XFunctionsSupplier.idl
@@ -36,10 +36,10 @@
 //=============================================================================
  module com {  module sun {  module star {  module report {
 //=============================================================================
-     interface XFunctions;
+published interface XFunctions;
 /** specifies the functions supplier which are located in a report definition or a group.
 */
-interface XFunctionsSupplier
+published interface XFunctionsSupplier
 {
     /** access to the functions
     */
diff --git a/offapi/com/sun/star/report/XGroup.idl b/offapi/com/sun/star/report/XGroup.idl
index 469889ff6c7a..ac55066fdbf8 100644
--- a/offapi/com/sun/star/report/XGroup.idl
+++ b/offapi/com/sun/star/report/XGroup.idl
@@ -48,7 +48,7 @@
     @see XReportDefinition
     @see XGroups
  */
-interface XGroup
+published interface XGroup
 {
     /** allows access to the groups collection of the report.
     */
diff --git a/offapi/com/sun/star/report/XGroups.idl b/offapi/com/sun/star/report/XGroups.idl
index ee2324f10855..a166425104ae 100644
--- a/offapi/com/sun/star/report/XGroups.idl
+++ b/offapi/com/sun/star/report/XGroups.idl
@@ -42,15 +42,15 @@
 //=============================================================================
 
  module com {  module sun {  module star {  module report {
-interface XReportDefinition;
-interface XGroup;
+published interface XReportDefinition;
+published interface XGroup;
 //=============================================================================
 
 /** This interface specifies the groups collections of the report definition.
     @see XGroup
     @see XReportDefinition
  */
-interface XGroups
+published interface XGroups
 {
     /** allows to register listeners to be notified of changes in the container.
     */
diff --git a/offapi/com/sun/star/report/XImageControl.idl b/offapi/com/sun/star/report/XImageControl.idl
index 48c18cb0b864..ea0641455d10 100644
--- a/offapi/com/sun/star/report/XImageControl.idl
+++ b/offapi/com/sun/star/report/XImageControl.idl
@@ -39,7 +39,7 @@
  module com {  module sun {  module star {  module report {
 
 //=============================================================================
-interface XImageControl
+published interface XImageControl
 {
     interface XReportControlModel;
 
@@ -81,7 +81,7 @@ interface XImageControl
     [attribute,bound] boolean PreserveIRI;
 };
 
-service ImageControl : XImageControl;
+published service ImageControl : XImageControl;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XReportComponent.idl b/offapi/com/sun/star/report/XReportComponent.idl
index 11e6582d8bdd..da8f0078cb38 100644
--- a/offapi/com/sun/star/report/XReportComponent.idl
+++ b/offapi/com/sun/star/report/XReportComponent.idl
@@ -55,13 +55,15 @@
 //=============================================================================
 
  module com {  module sun {  module star {  module report {
- interface XSection;
+
+published interface XSection;
+
 //=============================================================================
 /** describes a component which may be part of a report.
 
     @see XReportDefinition
  */
-interface XReportComponent
+published interface XReportComponent
 {
     interface com::sun::star::util::XCloneable;
     /** identifies the component as a candidate for being part of a report.
diff --git a/offapi/com/sun/star/report/XReportControlFormat.idl b/offapi/com/sun/star/report/XReportControlFormat.idl
index da9ee7ef4414..dba485f01625 100644
--- a/offapi/com/sun/star/report/XReportControlFormat.idl
+++ b/offapi/com/sun/star/report/XReportControlFormat.idl
@@ -42,7 +42,7 @@
 //=============================================================================
 /** specifies a format condition for a control.
 */
-interface XReportControlFormat
+published interface XReportControlFormat
 {
     /** specifies the background color (RGB) of the control.
      */
@@ -374,7 +374,7 @@ interface XReportControlFormat
     };
 
     /** determines the rotation of a character in degree.
-         <p>Depending on the implementation only certain values may be allowed.
+        <p>Depending on the implementation only certain values may be allowed.
         </p>
      */
     [attribute,bound] short CharRotation
diff --git a/offapi/com/sun/star/report/XReportControlModel.idl b/offapi/com/sun/star/report/XReportControlModel.idl
index 2c28f5fcc570..3f65afd84964 100644
--- a/offapi/com/sun/star/report/XReportControlModel.idl
+++ b/offapi/com/sun/star/report/XReportControlModel.idl
@@ -47,7 +47,7 @@
  module com {  module sun {  module star {  module report {
 
 //=============================================================================
-interface XReportControlModel
+published interface XReportControlModel
 {
     /** allows the creation of sub reports.
     */
diff --git a/offapi/com/sun/star/report/XReportDefinition.idl b/offapi/com/sun/star/report/XReportDefinition.idl
index d56b8a106e89..9afebe1753c5 100644
--- a/offapi/com/sun/star/report/XReportDefinition.idl
+++ b/offapi/com/sun/star/report/XReportDefinition.idl
@@ -92,8 +92,8 @@ published interface XConnection;
 
  module com {  module sun {  module star {  module report {
 
-     interface XSection;
-     interface XGroups;
+     published interface XSection;
+     published interface XGroups;
 //=============================================================================
 
 /** identifies a <type>XReportComponent</type> as being a (sub-) report.
@@ -107,7 +107,7 @@ published interface XConnection;
 
     @see XReportComponent
  */
-interface XReportDefinition
+published interface XReportDefinition
 {
     /** allows the access to the model embedded in the database storage.
     */
@@ -351,7 +351,7 @@ interface XReportDefinition
     };
 };
 
-service ReportDefinition : XReportDefinition;
+published service ReportDefinition : XReportDefinition;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XReportEngine.idl b/offapi/com/sun/star/report/XReportEngine.idl
index 7c18a0e2a4e7..6dddc19a7fef 100644
--- a/offapi/com/sun/star/report/XReportEngine.idl
+++ b/offapi/com/sun/star/report/XReportEngine.idl
@@ -76,7 +76,7 @@ module com {  module sun {  module star {  module report {
     @see com.sun.star.document.OfficeDocument
 */
 
-interface XReportEngine
+published interface XReportEngine
 {
     /** allows life-time control of report engine.
      */
diff --git a/offapi/com/sun/star/report/XSection.idl b/offapi/com/sun/star/report/XSection.idl
index 606b05eded44..1f7246b715cc 100644
--- a/offapi/com/sun/star/report/XSection.idl
+++ b/offapi/com/sun/star/report/XSection.idl
@@ -54,7 +54,7 @@
 //=============================================================================
 
  module com {  module sun {  module star {  module report {
- interface XGroup;
+ published interface XGroup;
 //=============================================================================
 
 /** identifies a <type>XSection</type> inside a report.
@@ -66,7 +66,7 @@
     @see XReportDefinition
     @see XGroup
  */
-interface XSection
+published interface XSection
 {
     /** allows to navigate to group or report definition.
     */
diff --git a/offapi/com/sun/star/report/XShape.idl b/offapi/com/sun/star/report/XShape.idl
index cd2f6f12c3cf..09a0627a7a91 100644
--- a/offapi/com/sun/star/report/XShape.idl
+++ b/offapi/com/sun/star/report/XShape.idl
@@ -44,7 +44,7 @@
  module com {  module sun {  module star {  module report {
 
 //=============================================================================
-interface XShape
+published interface XShape
 {
     interface XReportControlModel;
 
diff --git a/offapi/com/sun/star/report/inspection/DataProviderHandler.idl b/offapi/com/sun/star/report/inspection/DataProviderHandler.idl
index a7348b5aca9d..0f410efe3aeb 100644
--- a/offapi/com/sun/star/report/inspection/DataProviderHandler.idl
+++ b/offapi/com/sun/star/report/inspection/DataProviderHandler.idl
@@ -42,7 +42,7 @@ module com {  module sun {  module star {  module report { module inspection {
 
     @see com::sun::star::inspection::XPropertyHandler
 */
-service DataProviderHandler
+published service DataProviderHandler
 {
     interface com::sun::star::inspection::XPropertyHandler;
 };
diff --git a/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl b/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
index 0595f4b8e224..77d639ed7770 100644
--- a/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
+++ b/offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
@@ -52,7 +52,7 @@ module com {  module sun {  module star {  module report { module inspection {
 
     @see com::sun::star::inspection::XObjectInspectorModel::HandlerFactories
 */
-service DefaultComponentInspectorModel : com::sun::star::inspection::XObjectInspectorModel
+published service DefaultComponentInspectorModel : com::sun::star::inspection::XObjectInspectorModel
 {
     /** creates a default DefaultComponentInspectorModel, providing factories for all
         handlers listed above.
diff --git a/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl b/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl
index 132cbab1eccb..cda25345607e 100644
--- a/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl
+++ b/offapi/com/sun/star/report/inspection/ReportComponentHandler.idl
@@ -42,7 +42,7 @@ module com {  module sun {  module star {  module report { module inspection {
 
     @see com::sun::star::inspection::XPropertyHandler
 */
-service ReportComponentHandler
+published service ReportComponentHandler
 {
     interface com::sun::star::inspection::XPropertyHandler;
 };
diff --git a/offapi/com/sun/star/report/meta/XFormulaParser.idl b/offapi/com/sun/star/report/meta/XFormulaParser.idl
index 96ae63f4c5e8..61bbba184baa 100644
--- a/offapi/com/sun/star/report/meta/XFormulaParser.idl
+++ b/offapi/com/sun/star/report/meta/XFormulaParser.idl
@@ -38,7 +38,7 @@ module com {  module sun {  module star {  module report { module meta {
 /** identifies a <type>XFormulaParser</type> which allows to retrieve the meta data of all supported functions.
 
 */
-interface XFormulaParser
+published interface XFormulaParser
 {
     /** allows life-time control of report engine.
      */
diff --git a/offapi/com/sun/star/report/meta/XFunctionCategory.idl b/offapi/com/sun/star/report/meta/XFunctionCategory.idl
index 2163a0028ea9..d60af9d707ae 100644
--- a/offapi/com/sun/star/report/meta/XFunctionCategory.idl
+++ b/offapi/com/sun/star/report/meta/XFunctionCategory.idl
@@ -34,12 +34,12 @@
 //=============================================================================
 module com {  module sun {  module star {  module report { module meta {
 
-interface XFunctionDescription;
+published interface XFunctionDescription;
 /** identifies a <type>XFunctionCategory</type> which allows to retrieve the meta data of all supported functions.
 
 */
 
-interface XFunctionCategory
+published interface XFunctionCategory
 {
     /** gives access to the properties.
     */
diff --git a/offapi/com/sun/star/report/meta/XFunctionDescription.idl b/offapi/com/sun/star/report/meta/XFunctionDescription.idl
index 9ed060bcaa85..ac92a69481e5 100644
--- a/offapi/com/sun/star/report/meta/XFunctionDescription.idl
+++ b/offapi/com/sun/star/report/meta/XFunctionDescription.idl
@@ -34,12 +34,12 @@
 //=============================================================================
 module com {  module sun {  module star {  module report { module meta {
 
-interface XFunctionCategory;
+published interface XFunctionCategory;
 
 /** identifies a <type>XFunctionDescription</type> which allows to retrieve the meta data of all supported functions.
 
 */
-interface XFunctionDescription
+published interface XFunctionDescription
 {
     /** gives access to the properties.
     */
diff --git a/offapi/com/sun/star/report/meta/XFunctionManager.idl b/offapi/com/sun/star/report/meta/XFunctionManager.idl
index 78075c96808f..312313e4edd5 100644
--- a/offapi/com/sun/star/report/meta/XFunctionManager.idl
+++ b/offapi/com/sun/star/report/meta/XFunctionManager.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module report { module meta {
 /** identifies a <type>XFunctionManager</type> which allows to retrieve the meta data of all supported functions.
 
 */
-interface XFunctionManager
+published interface XFunctionManager
 {
     /** allows life-time control of report engine.
      */
diff --git a/offapi/com/sun/star/resource/StringResourceWithLocation.idl b/offapi/com/sun/star/resource/StringResourceWithLocation.idl
index 3cdf3d7c8b76..0b5adda4ba7d 100644
--- a/offapi/com/sun/star/resource/StringResourceWithLocation.idl
+++ b/offapi/com/sun/star/resource/StringResourceWithLocation.idl
@@ -42,7 +42,7 @@ module com { module sun { module star { module resource {
 /** specifies a service providing access to a resource string table implementing the
     <type scope="com::sun::star::resource">XStringResourceWithLocation</type> interface.
  */
-service StringResourceWithLocation : com::sun::star::resource::XStringResourceWithLocation
+published service StringResourceWithLocation : com::sun::star::resource::XStringResourceWithLocation
 {
     /** is used to initialize the object on its creation.
 
diff --git a/offapi/com/sun/star/resource/XStringResourceManager.idl b/offapi/com/sun/star/resource/XStringResourceManager.idl
index 140c6e832a59..d367e499be36 100644
--- a/offapi/com/sun/star/resource/XStringResourceManager.idl
+++ b/offapi/com/sun/star/resource/XStringResourceManager.idl
@@ -71,7 +71,7 @@ module com { module sun { module star { module resource {
     localized dialogs.
 
 */
-interface XStringResourceManager: com::sun::star::resource::XStringResourceResolver
+published interface XStringResourceManager: com::sun::star::resource::XStringResourceResolver
 {
     /**
         Returns the resource's read only state
diff --git a/offapi/com/sun/star/resource/XStringResourcePersistence.idl b/offapi/com/sun/star/resource/XStringResourcePersistence.idl
index bb5c4a10b2a0..ce2f47848a2e 100644
--- a/offapi/com/sun/star/resource/XStringResourcePersistence.idl
+++ b/offapi/com/sun/star/resource/XStringResourcePersistence.idl
@@ -52,7 +52,7 @@ module com { module sun { module star { module resource {
 
     @see <type>XStringResourceManager</type>.
 */
-interface XStringResourcePersistence: com::sun::star::resource::XStringResourceManager
+published interface XStringResourcePersistence: com::sun::star::resource::XStringResourceManager
 {
     /**
         Stores all string table data respectively all data modified since
diff --git a/offapi/com/sun/star/resource/XStringResourceResolver.idl b/offapi/com/sun/star/resource/XStringResourceResolver.idl
index 5c6747e6ea3d..856f321d04f9 100644
--- a/offapi/com/sun/star/resource/XStringResourceResolver.idl
+++ b/offapi/com/sun/star/resource/XStringResourceResolver.idl
@@ -60,7 +60,7 @@ module com { module sun { module star { module resource {
     But also changing the locale at runtime can be supported in this way.
 
 */
-interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
+published interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
 {
     /**
         Resolves the passed ResoureID for the current locale. This
diff --git a/offapi/com/sun/star/resource/XStringResourceWithLocation.idl b/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
index a537c57234ac..46b14999a3ee 100644
--- a/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
+++ b/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
@@ -43,7 +43,7 @@ module com { module sun { module star { module resource {
 
     @see <type>XStringResourcePersistence</type>.
 */
-interface XStringResourceWithLocation: com::sun::star::resource::XStringResourcePersistence
+published interface XStringResourceWithLocation: com::sun::star::resource::XStringResourcePersistence
 {
     /**
         Stores all string table data to a location and associates this location
diff --git a/offapi/com/sun/star/script/vba/VBAEventId.idl b/offapi/com/sun/star/script/vba/VBAEventId.idl
index fda83a18d495..18b84b5ef14d 100644
--- a/offapi/com/sun/star/script/vba/VBAEventId.idl
+++ b/offapi/com/sun/star/script/vba/VBAEventId.idl
@@ -97,11 +97,11 @@ constants VBAEventId
     const long WORKBOOK_AFTERSAVE                   = 2007;
     /** New sheet inserted. Arguments: short nSheet. */
     const long WORKBOOK_NEWSHEET                    = 2008;
-    /** Document window has been activated. No arguments. */
+    /** Document window has been activated. Arguments: XController aController. */
     const long WORKBOOK_WINDOWACTIVATE              = 2009;
-    /** Document window has been deactivated. No arguments. */
+    /** Document window has been deactivated. Arguments: XController aController. */
     const long WORKBOOK_WINDOWDEACTIVATE            = 2010;
-    /** Document window has been resized. No arguments. */
+    /** Document window has been resized. Arguments: XController aController. */
     const long WORKBOOK_WINDOWRESIZE                = 2011;
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/script/vba/VBAScriptEvent.idl b/offapi/com/sun/star/script/vba/VBAScriptEvent.idl
new file mode 100755
index 000000000000..c1fc7096bcee
--- /dev/null
+++ b/offapi/com/sun/star/script/vba/VBAScriptEvent.idl
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *
+ * 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 __com_sun_star_script_vba_VBAScriptEvent_idl__
+#define __com_sun_star_script_vba_VBAScriptEvent_idl__
+
+#include <com/sun/star/lang/EventObject.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star { module script { module vba {
+
+//=============================================================================
+
+/** Describes a VBA script event fired via <member>XVBACompatibility::
+    broadcastVBAScriptEvent</member>, and received by <member>
+    XVBAScriptListener::notifyVBAScriptEvent</member>.
+
+    @see XVBACompatibility
+    @see XVBAScriptListener
+ */
+struct VBAScriptEvent : ::com::sun::star::lang::EventObject
+{
+    //-------------------------------------------------------------------------
+
+    /** Identifies the type of the event.
+
+        @see VBAScriptEventId
+     */
+    long Identifier;
+
+    //-------------------------------------------------------------------------
+
+    /** Contains the name of the involved VBA module.
+
+        @see VBAScriptEventId
+     */
+    string ModuleName;
+
+    //-------------------------------------------------------------------------
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/script/vba/VBAScriptEventId.idl b/offapi/com/sun/star/script/vba/VBAScriptEventId.idl
new file mode 100755
index 000000000000..cc66a3fc098c
--- /dev/null
+++ b/offapi/com/sun/star/script/vba/VBAScriptEventId.idl
@@ -0,0 +1,100 @@
+/*************************************************************************
+ *
+ * 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 __com_sun_star_script_vba_VBAScriptEventId_idl__
+#define __com_sun_star_script_vba_VBAScriptEventId_idl__
+
+//=============================================================================
+
+module com {  module sun {  module star { module script { module vba {
+
+//=============================================================================
+
+/** Identifies a VBA script event fired via <member>XVBACompatibility::
+    broadcastVBAScriptEvent</member>, and received by <member>
+    XVBAScriptListener::notifyVBAScriptEvent</member>.
+
+    @see VBAScriptEvent
+    @see XVBACompatibility
+    @see XVBAScriptListener
+ */
+constants VBAScriptEventId
+{
+    //-------------------------------------------------------------------------
+    /** This event is fired when a VBA script in the current document has been
+        started.
+
+        <p>Several scripts may run simultaneously, e.g. when a running script
+        triggers a document event that starts another script.</p>
+
+        <p>The number of running scripts can be obtained via <member>
+        XVBACompatibility::RunningVBAScripts</member>. The number returned
+        there will already contain the new script notified with this event.</p>
+
+        <p>The member <member>VBAScriptEvent::ModuleName</member> of the event
+        object will contain the name of the code module that contains the
+        started script.</p>
+     */
+    const long SCRIPT_STARTED = 0;
+
+    //-------------------------------------------------------------------------
+    /** This event is fired when a VBA script in the current document stops
+        running.
+
+        <p>Several scripts may run simultaneously, e.g. when a running script
+        triggers a document event that starts another script.</p>
+
+        <p>The number of scripts still running can be obtained via <member>
+        XVBACompatibility::RunningVBAScripts</member>. The number returned
+        there will not contain the stopped script notified with this event
+        anymore.</p>
+
+        <p>The member <member>VBAScriptEvent::ModuleName</member> of the event
+        object will contain the name of the code module that contains the
+        script that has been stopped.</p>
+     */
+    const long SCRIPT_STOPPED = 1;
+
+    //-------------------------------------------------------------------------
+    /** This event is fired when a VBA script in the current document tries to
+        instanciate a userform.
+
+        <p>The member <member>VBAScriptEvent::ModuleName</member> of the event
+        object will contain the name of the userform module.</p>
+     */
+    const long INITIALIZE_USERFORM = 2;
+
+    //-------------------------------------------------------------------------
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/script/vba/XVBACompatibility.idl b/offapi/com/sun/star/script/vba/XVBACompatibility.idl
index 0b23021efd42..194f54d5452a 100644
--- a/offapi/com/sun/star/script/vba/XVBACompatibility.idl
+++ b/offapi/com/sun/star/script/vba/XVBACompatibility.idl
@@ -28,7 +28,8 @@
 #ifndef __com_sun_star_script_vba_XVBACompatibility_idl__
 #define __com_sun_star_script_vba_XVBACompatibility_idl__
 
-#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/frame/XModel.idl>
+#include <com/sun/star/script/vba/XVBAScriptListener.idl>
 
 //=============================================================================
 
@@ -42,6 +43,22 @@ interface XVBACompatibility
     [attribute ] string  ProjectName;
 
     //-------------------------------------------------------------------------
+
+    [attribute, readonly] long RunningVBAScripts;
+
+    //-------------------------------------------------------------------------
+
+    [oneway] void addVBAScriptListener( [in] XVBAScriptListener Listener );
+
+    //-------------------------------------------------------------------------
+
+    [oneway] void removeVBAScriptListener( [in] XVBAScriptListener Listener );
+
+    //-------------------------------------------------------------------------
+
+    void broadcastVBAScriptEvent( [in] long Identifier, [in] string ModuleName );
+
+    //-------------------------------------------------------------------------
 };
 
 }; }; }; }; };
diff --git a/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl b/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
index 4a3534de8412..1bc139243493 100644
--- a/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
+++ b/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
@@ -30,7 +30,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#include <com/sun/star/script/provider/ScriptFrameworkErrorException.idl>
 #include <com/sun/star/util/VetoException.idl>
 
 //=============================================================================
@@ -75,23 +74,20 @@ interface XVBAEventProcessor
             The input arguments needed to create the argument list of the VBA
             event handler.
 
+        @return
+            <TRUE/>, if event handing is enabled, and the event handler macro
+            exists and has been invoked.
+
         @throws <type scope="::com::sun::star::lang">IllegalArgumentException</type>
             if the passed event identifier is not supported, or if the passed
             arguments do not conform to the arguments expected by the specified
             event.
 
-        @throws <type scope="::com::sun::star::script::provider">ScriptFrameworkErrorException</type>
-            if the VBA event handler could not be invoked. Reasons may be, that
-            handling of VBA events is not enabled, that the VBA event handler
-            macro has not been found, or that the execution of the macro has
-            been aborted with an error.
-
         @throws <type scope="::com::sun::star::util">VetoException</type>
             if the VBA event handler has indicated to veto the event.
     **/
-    void processVbaEvent( [in] long nEventId, [in] sequence< any > aArgs )
+    boolean processVbaEvent( [in] long nEventId, [in] sequence< any > aArgs )
         raises (::com::sun::star::lang::IllegalArgumentException,
-                ::com::sun::star::script::provider::ScriptFrameworkErrorException,
                 ::com::sun::star::util::VetoException);
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/script/vba/XVBAScriptListener.idl b/offapi/com/sun/star/script/vba/XVBAScriptListener.idl
new file mode 100755
index 000000000000..2f5594d3b416
--- /dev/null
+++ b/offapi/com/sun/star/script/vba/XVBAScriptListener.idl
@@ -0,0 +1,51 @@
+/*************************************************************************
+ *
+ * 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 __com_sun_star_script_vba_XVBAScriptListener_idl__
+#define __com_sun_star_script_vba_XVBAScriptListener_idl__
+
+#include <com/sun/star/lang/XEventListener.idl>
+#include <com/sun/star/script/vba/VBAScriptEvent.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star { module script { module vba {
+
+//=============================================================================
+
+interface XVBAScriptListener : ::com::sun::star::lang::XEventListener
+{
+    void notifyVBAScriptEvent( [in] VBAScriptEvent Event );
+};
+
+//=============================================================================
+
+}; }; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/script/vba/makefile.mk b/offapi/com/sun/star/script/vba/makefile.mk
index 336be1b5e7a6..6f13245f7d1e 100644
--- a/offapi/com/sun/star/script/vba/makefile.mk
+++ b/offapi/com/sun/star/script/vba/makefile.mk
@@ -41,12 +41,15 @@ IDLFILES=\
     VBAEventId.idl \
     VBAEventProcessor.idl \
     VBAMacroResolver.idl \
+    VBAScriptEvent.idl \
+    VBAScriptEventId.idl \
     VBASpreadsheetEventProcessor.idl \
     VBATextEventProcessor.idl \
     XVBACompatibility.idl \
     XVBAEventProcessor.idl \
     XVBAMacroResolver.idl \
-    XVBAModuleInfo.idl
+    XVBAModuleInfo.idl \
+    XVBAScriptListener.idl
 
 # ------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sdb/XDocumentDataSource.idl b/offapi/com/sun/star/sdb/XDocumentDataSource.idl
index b0e891b0a084..6acb441bd7a5 100644
--- a/offapi/com/sun/star/sdb/XDocumentDataSource.idl
+++ b/offapi/com/sun/star/sdb/XDocumentDataSource.idl
@@ -43,7 +43,7 @@
     </p>
     @see OfficeDatabaseDocument
  */
-interface XDocumentDataSource
+published interface XDocumentDataSource
 {
     /** provides access to the one and only <type>OfficeDatabaseDocument</type>
         which the data source is based on.
diff --git a/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl b/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
index 672505bc12ad..fa28e15ebc75 100644
--- a/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
@@ -41,7 +41,7 @@
 /** provides the access to a container of database forms.
     @see Forms
  */
-interface XFormDocumentsSupplier: com::sun::star::uno::XInterface
+published interface XFormDocumentsSupplier: com::sun::star::uno::XInterface
 {
 
     /** returns the container of forms.
diff --git a/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl b/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
index b2640704537c..d0f79a4ab348 100644
--- a/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
@@ -47,7 +47,7 @@ module com {  module sun {  module star {  module sdb {
 //=============================================================================
 /** simplifies the accessing of data sources, and it's corresponding database document and forms, and reports.
 */
-interface XOfficeDatabaseDocument
+published interface XOfficeDatabaseDocument
 {
     /** allows to access the supplier for forms.
         @see com::sun::star::sdb::Forms
diff --git a/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl b/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
index d7b15fbc0018..691c745160e3 100644
--- a/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
@@ -41,7 +41,7 @@
 /** provides the access to a container of database reports.
     @see Reports
  */
-interface XReportDocumentsSupplier: com::sun::star::uno::XInterface
+published interface XReportDocumentsSupplier: com::sun::star::uno::XInterface
 {
 
     /** returns the container of reports.
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
index 8c377e2f0693..813c4065e9bd 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
@@ -40,7 +40,7 @@
 #endif
 
 module com {  module sun {  module star {  module container {
-interface XIndexAccess;
+published interface XIndexAccess;
 };};};};
 //=============================================================================
 
@@ -55,7 +55,7 @@ interface XIndexAccess;
     structure of the used query.
     </p>
  */
-interface XSingleSelectQueryAnalyzer : com::sun::star::uno::XInterface
+published interface XSingleSelectQueryAnalyzer : com::sun::star::uno::XInterface
 {
 
     /** returns the query.
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
index 2bd5270adee8..323b1d7836d1 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
@@ -58,7 +58,7 @@
 
     @see com::sun::star::sdb::SingleSelectQueryComposer
  */
-interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
+published interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
 {
     //-------------------------------------------------------------------------
     // FILTER
@@ -211,7 +211,7 @@ interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
             if a database access error occurs.
      */
     void appendOrderByColumn([in] com::sun::star::beans::XPropertySet column,
-                              [in] boolean ascending)
+                             [in] boolean ascending)
             raises (com::sun::star::sdbc::SQLException);
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/sdb/XSubDocument.idl b/offapi/com/sun/star/sdb/XSubDocument.idl
index 120280fd7ef3..2f9e86b10df6 100644
--- a/offapi/com/sun/star/sdb/XSubDocument.idl
+++ b/offapi/com/sun/star/sdb/XSubDocument.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module sdb {
 
     @since OOo 3.1
  */
-interface XSubDocument
+published interface XSubDocument
 {
     /** opens the sub document
 
diff --git a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
index aef6d49dff40..527186f4046b 100644
--- a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
+++ b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
@@ -54,7 +54,7 @@ module com { module sun { module star { module sdb { module application {
 
     @since OOo 2.2
  */
-interface XDatabaseDocumentUI
+published interface XDatabaseDocumentUI
 {
     /** provides access to the data source belong to the database document
     */
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
index fadfe541a165..8b1b4ed61a8f 100644
--- a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
+++ b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
@@ -37,21 +37,21 @@
 
 module com {  module sun {  module star {
     module container {
-        interface XNameAccess;
+        published interface XNameAccess;
     };
     module lang {
-        interface XComponent;
+        published interface XComponent;
     };
 };};};
 //=============================================================================
 module com {  module sun {  module star {  module sdb {
-    interface XSingleSelectQueryComposer;
+    published interface XSingleSelectQueryComposer;
     module tools {
 //=============================================================================
 
-interface XTableName;
-interface XObjectNames;
-interface XDataSourceMetaData;
+published interface XTableName;
+published interface XObjectNames;
+published interface XDataSourceMetaData;
 
 //-----------------------------------------------------------------------------
 /** encapsulates various useful functionality around a
@@ -68,7 +68,7 @@ interface XDataSourceMetaData;
 
     @since OOo 2.0.4
 */
-interface XConnectionTools
+published interface XConnectionTools
 {
     /** creates an instance supporting the <type>XTableName</type> interface,
         which can be used to manipulate table names for various purposes.
diff --git a/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl b/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
index b2b00c758250..726b7d712771 100644
--- a/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
+++ b/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
@@ -36,7 +36,7 @@
 module com {  module sun {  module star {  module sdb { module tools {
 //=============================================================================
 
-interface XDataSourceMetaData
+published interface XDataSourceMetaData
 {
     /** determines whether the data source supports queries in the <code>FROM</code>
         part of a <code>SELECT</code> statement.
diff --git a/offapi/com/sun/star/sdb/tools/XObjectNames.idl b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
index e636631339af..e3e5bea34d47 100644
--- a/offapi/com/sun/star/sdb/tools/XObjectNames.idl
+++ b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
@@ -70,7 +70,7 @@ module com {  module sun {  module star {  module sdb { module tools {
 
     @since OOo 2.0.4
 */
-interface XObjectNames
+published interface XObjectNames
 {
     /** suggests a (unique) table or query name
 
diff --git a/offapi/com/sun/star/sdb/tools/XTableName.idl b/offapi/com/sun/star/sdb/tools/XTableName.idl
index 3e776214985e..a67f9810de68 100644
--- a/offapi/com/sun/star/sdb/tools/XTableName.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableName.idl
@@ -72,7 +72,7 @@ module com {  module sun {  module star {  module sdb { module tools {
 
     @since OOo 2.0.4
 */
-interface XTableName
+published interface XTableName
 {
     /** denotes the name of the catalog which the table is a part of
     */
diff --git a/offapi/com/sun/star/security/CertAltNameEntry.idl b/offapi/com/sun/star/security/CertAltNameEntry.idl
new file mode 100644
index 000000000000..1ef827b77f89
--- /dev/null
+++ b/offapi/com/sun/star/security/CertAltNameEntry.idl
@@ -0,0 +1,59 @@
+/*************************************************************************
+ *
+ * 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 __com_sun_star_security_CertAltNameEntry_idl__
+#define __com_sun_star_security_CertAltNameEntry_idl__
+
+#include <com/sun/star/security/ExtAltNameType.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module security {
+
+//=============================================================================
+/**
+ * struct contains a single entry within a Subject Alternative Name Extension of a
+ * X509 certificate.
+ */
+struct CertAltNameEntry
+{
+    /**
+     * defines the type of the value . With this information you can determine how to interprete the Any value.
+     * @see com::sun::star::security::ExtAltNameType
+     */
+    com::sun::star::security::ExtAltNameType Type;
+
+    /**
+     * stores the value of entry.
+     */
+    any     Value;
+};
+
+
+}; }; }; };
+#endif
diff --git a/offapi/com/sun/star/security/CertificateContainer.idl b/offapi/com/sun/star/security/CertificateContainer.idl
index ca6573c9c13b..5974aefa3a7f 100644
--- a/offapi/com/sun/star/security/CertificateContainer.idl
+++ b/offapi/com/sun/star/security/CertificateContainer.idl
@@ -37,9 +37,10 @@
 module com { module sun { module star { module security {
 
 /**  the service to be used for <type>XCertificateContainer</type>.
+
     @since OOo 2.3.1
 */
-service CertificateContainer: XCertificateContainer;
+published service CertificateContainer: XCertificateContainer;
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/security/CertificateContainerStatus.idl b/offapi/com/sun/star/security/CertificateContainerStatus.idl
index 2cfa3f6ada41..f1765e5f8002 100644
--- a/offapi/com/sun/star/security/CertificateContainerStatus.idl
+++ b/offapi/com/sun/star/security/CertificateContainerStatus.idl
@@ -25,8 +25,6 @@
  *
  ************************************************************************/
 
-/** -- idl definition -- **/
-
 #ifndef __com_sun_star_security_CertificateContainerStatus_idl_
 #define __com_sun_star_security_CertificateContainerStatus_idl_
 
@@ -39,7 +37,7 @@ module com { module sun { module star { module security {
  * Constant definition of a certificate container status.
  *
  */
-enum CertificateContainerStatus
+published enum CertificateContainerStatus
 {
     /**
      * The certificate was not found.
diff --git a/offapi/com/sun/star/security/ExtAltNameType.idl b/offapi/com/sun/star/security/ExtAltNameType.idl
new file mode 100644
index 000000000000..3910772c28c8
--- /dev/null
+++ b/offapi/com/sun/star/security/ExtAltNameType.idl
@@ -0,0 +1,110 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+/** -- idl definition -- **/
+
+#ifndef __com_sun_star_security_ExtAltNameType_idl_
+#define __com_sun_star_security_ExtAltNameType_idl_
+
+#include <com/sun/star/uno/XInterface.idl>
+
+module com { module sun { module star { module security {
+
+/**
+ * Constant definiton of a certificate container status.
+ */
+enum ExtAltNameType
+{
+    /**
+     * Cutomize name/value pair
+     * The value of CertAltNameEntry contains a NamedValue.
+     *
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    OTHER_NAME,
+
+    /**
+     * The entry contains rfc822 name.
+     * The value of CertAltNameEntry contains a OUString.
+     *
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    RFC822_NAME,
+
+    /**
+     * The entry contains a dns name.
+     * The value of CertAltNameEntry contains a OUString.
+     *
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    DNS_NAME,
+
+    /**
+     * Currently unsupported.
+     */
+    DIRECTORY_NAME,
+
+    /**
+     * The entry contains an url.
+     * The value of CertAltNameEntry contains a OUString.
+     *
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    URL,
+
+    /**
+     * The entry contains a ip address.
+     * The value of CertAltNameEntry contains a Sequence of sal_Int8.
+     *
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    IP_ADDRESS,
+
+    /**
+     * The entry contains a registered id.
+     * The value of CertAltNameEntry contains a OUString.
+     *
+     * @see com::sun::star::security::CertAltNameEntry
+     */
+    REGISTERED_ID,
+
+    /**
+     * Currently unsupported.
+     */
+    EDI_PARTY_NAME,
+
+    /**
+     * Currently unsupported.
+     */
+    X400_ADDRESS
+
+};
+
+} ; } ; } ; } ;
+
+#endif
+
diff --git a/offapi/com/sun/star/security/SecurityInfrastructureException.idl b/offapi/com/sun/star/security/SecurityInfrastructureException.idl
index 2b68c42b52ec..71cb0e18aa8b 100644
--- a/offapi/com/sun/star/security/SecurityInfrastructureException.idl
+++ b/offapi/com/sun/star/security/SecurityInfrastructureException.idl
@@ -25,10 +25,6 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
-
-/** -- idl definition -- **/
-
 #ifndef __com_sun_star_security_SecurityInfrastructureException_idl__
 #define __com_sun_star_security_SecurityInfrastructureException_idl__
 
@@ -43,7 +39,7 @@ module com { module sun { module star { module security {
 
 //=============================================================================
 
-exception SecurityInfrastructureException : com::sun::star::uno::SecurityException
+published exception SecurityInfrastructureException : com::sun::star::uno::SecurityException
 {
 };
 
diff --git a/offapi/com/sun/star/security/XCertificate.idl b/offapi/com/sun/star/security/XCertificate.idl
index 2064a3498ef7..d9bfe0c896a2 100644
--- a/offapi/com/sun/star/security/XCertificate.idl
+++ b/offapi/com/sun/star/security/XCertificate.idl
@@ -25,10 +25,6 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
-
-/** -- idl definition -- **/
-
 #ifndef __com_sun_star_security_XCertificate_idl_
 #define __com_sun_star_security_XCertificate_idl_
 
@@ -43,7 +39,7 @@ module com { module sun { module star { module security {
  *
  * <p>This interface represents a x509 certificate.</p>
  */
-interface XCertificate : com::sun::star::uno::XInterface
+published interface XCertificate : com::sun::star::uno::XInterface
 {
     /**
      * the version number attribute of the certificate.
diff --git a/offapi/com/sun/star/security/XCertificateContainer.idl b/offapi/com/sun/star/security/XCertificateContainer.idl
index e076a29a2abc..21eec4c97763 100644
--- a/offapi/com/sun/star/security/XCertificateContainer.idl
+++ b/offapi/com/sun/star/security/XCertificateContainer.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module security {
     @see CertificateContainer
     @since OOo 2.3.1
 */
-interface XCertificateContainer
+published interface XCertificateContainer
 {
     /** Store the certificate in memory.
         @param url
diff --git a/offapi/com/sun/star/security/XCertificateExtension.idl b/offapi/com/sun/star/security/XCertificateExtension.idl
index 93148a74ac48..5c8c9549c4dc 100644
--- a/offapi/com/sun/star/security/XCertificateExtension.idl
+++ b/offapi/com/sun/star/security/XCertificateExtension.idl
@@ -25,10 +25,6 @@
  *
  ************************************************************************/
 
-//i20156 - new file for xmlsecurity module
-
-/** -- idl definition -- **/
-
 #ifndef __com_sun_star_security_XCertificateExtension_idl_
 #define __com_sun_star_security_XCertificateExtension_idl_
 
@@ -41,7 +37,7 @@ module com { module sun { module star { module security {
  *
  * <p>This interface represents a x509 certificate.</p>
  */
-interface XCertificateExtension : com::sun::star::uno::XInterface
+published interface XCertificateExtension : com::sun::star::uno::XInterface
 {
     /**
      * Check whether it is a critical extension
diff --git a/offapi/com/sun/star/security/XSanExtension.idl b/offapi/com/sun/star/security/XSanExtension.idl
new file mode 100644
index 000000000000..e378e1b0817e
--- /dev/null
+++ b/offapi/com/sun/star/security/XSanExtension.idl
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+//i20156 - new file for xmlsecurity module
+
+/** -- idl definition -- **/
+
+#ifndef __com_sun_star_security_XSanExtension_idl_
+#define __com_sun_star_security_XSanExtension_idl_
+
+#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/security/XCertificateExtension.idl>
+#include <com/sun/star/security/CertAltNameEntry.idl>
+
+module com { module sun { module star { module security {
+
+/**
+ * Interface of a X509 Subject Alternative Name Certificate Extension
+ *
+ * <p>This interface represents a x509 certificate extension.</p>
+ */
+interface XSanExtension : com::sun::star::security::XCertificateExtension
+{
+        /**
+         * Contains the alternative names of a certificate
+         */
+        [attribute, readonly] sequence< com::sun::star::security::CertAltNameEntry >  AlternativeNames;
+};
+
+} ; } ; } ; } ;
+
+#endif
+
diff --git a/offapi/com/sun/star/security/makefile.mk b/offapi/com/sun/star/security/makefile.mk
index 21667da10972..2064e9fb4bea 100644
--- a/offapi/com/sun/star/security/makefile.mk
+++ b/offapi/com/sun/star/security/makefile.mk
@@ -59,7 +59,13 @@ IDLFILES=\
     XSerialNumberAdapter.idl		\
     SerialNumberAdapter.idl		\
     CertificateContainer.idl \
-    CertificateContainerStatus.idl
+    CertificateContainerStatus.idl \
+    ExtAltNameType.idl \
+    XSanExtension.idl \
+    CertAltNameEntry.idl
+    
+    
+    
 
 # ------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sheet/ComplexReference.idl b/offapi/com/sun/star/sheet/ComplexReference.idl
index 12a8fd5db8e1..22cb225bab73 100644
--- a/offapi/com/sun/star/sheet/ComplexReference.idl
+++ b/offapi/com/sun/star/sheet/ComplexReference.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module sheet {
 
 /** contains a reference to a cell range.
  */
-struct ComplexReference
+published struct ComplexReference
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
index 939ff469b674..c01f450676dc 100644
--- a/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
+++ b/offapi/com/sun/star/sheet/DataPilotDescriptor.idl
@@ -107,25 +107,26 @@ published service DataPilotDescriptor
 
     //-------------------------------------------------------------------------
 
-    /** specifies the orientation of the field.
+    /** specifies if empty rows in the source data are ignored.
      */
     [optional, property] boolean IgnoreEmptyRows;
 
     //-------------------------------------------------------------------------
 
-    /** specifies the orientation of the field.
+    /** specifies if empty category cells in the source data should be treated
+        as repetition of the content from the previous row.
      */
     [optional, property] boolean RepeatIfEmpty;
 
     //-------------------------------------------------------------------------
 
-    /** specifies the orientation of the field.
+    /** specifies if columns for grand total results are created.
      */
     [optional, property] boolean ColumnGrand;
 
     //-------------------------------------------------------------------------
 
-    /** specifies the orientation of the field.
+    /** specifies if rows for grand total results are created.
      */
     [optional, property] boolean RowGrand;
 
@@ -142,6 +143,14 @@ published service DataPilotDescriptor
     [optional, property] boolean DrillDownOnDoubleClick;
 
     //-------------------------------------------------------------------------
+
+    /** specifies a label for grand total results.
+
+    @since OOo 3.4
+     */
+    [optional, property] string GrandTotalName;
+
+    //-------------------------------------------------------------------------
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl b/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
index 0c80854db357..e49a9185fc62 100644
--- a/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
+++ b/offapi/com/sun/star/sheet/FormulaOpCodeMapEntry.idl
@@ -41,7 +41,7 @@ module com {  module sun {  module star {  module sheet {
 /** contains a mapping from a formula name (function name, operator,
     ...) to the OpCode used by the formula compiler.
  */
-struct FormulaOpCodeMapEntry
+published struct FormulaOpCodeMapEntry
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sheet/FormulaToken.idl b/offapi/com/sun/star/sheet/FormulaToken.idl
index b9558fa164fb..96eaefcc52e3 100644
--- a/offapi/com/sun/star/sheet/FormulaToken.idl
+++ b/offapi/com/sun/star/sheet/FormulaToken.idl
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module sheet {
 
 /** contains a single token within a formula.
  */
-struct FormulaToken
+published struct FormulaToken
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sheet/SingleReference.idl b/offapi/com/sun/star/sheet/SingleReference.idl
index a4e191d08280..b49bf326fb40 100644
--- a/offapi/com/sun/star/sheet/SingleReference.idl
+++ b/offapi/com/sun/star/sheet/SingleReference.idl
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module sheet {
 
 /** contains a reference to a single cell.
  */
-struct SingleReference
+published struct SingleReference
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
index b20fdf4e2889..b86bb5902539 100644
--- a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
+++ b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
@@ -44,7 +44,7 @@ module com {  module sun {  module star {  module sheet {
 
 /** gives access to spreadsheet compiler token interns.
  */
-interface XFormulaOpCodeMapper
+published interface XFormulaOpCodeMapper
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sheet/XFormulaParser.idl b/offapi/com/sun/star/sheet/XFormulaParser.idl
index 73b317e7f848..b7bbab984ce1 100644
--- a/offapi/com/sun/star/sheet/XFormulaParser.idl
+++ b/offapi/com/sun/star/sheet/XFormulaParser.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module sheet {
 
 /** converts between text and token representations of formulas.
  */
-interface XFormulaParser
+published interface XFormulaParser
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/sheet/XFormulaTokens.idl b/offapi/com/sun/star/sheet/XFormulaTokens.idl
index 5edfe0b9840d..0e7cb93482f1 100644
--- a/offapi/com/sun/star/sheet/XFormulaTokens.idl
+++ b/offapi/com/sun/star/sheet/XFormulaTokens.idl
@@ -44,7 +44,7 @@ module com {  module sun {  module star {  module sheet {
 
 /** gives access to a formula as token sequence.
  */
-interface XFormulaTokens
+published interface XFormulaTokens
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/task/ErrorCodeIOException.idl b/offapi/com/sun/star/task/ErrorCodeIOException.idl
index 93b8aaa67d1a..9600483fcf32 100644
--- a/offapi/com/sun/star/task/ErrorCodeIOException.idl
+++ b/offapi/com/sun/star/task/ErrorCodeIOException.idl
@@ -40,7 +40,7 @@
 /** IOException that can carry error codes ( not only io related ).
     It can be used to transport the error code information.
  */
-exception ErrorCodeIOException : com::sun::star::io::IOException
+published exception ErrorCodeIOException : com::sun::star::io::IOException
 {
     //------------------------------------------------------------------------
     /** specifies the error code.
diff --git a/offapi/com/sun/star/task/XUrlContainer.idl b/offapi/com/sun/star/task/XUrlContainer.idl
index 84b926569dac..6e0f93d4ecd1 100644
--- a/offapi/com/sun/star/task/XUrlContainer.idl
+++ b/offapi/com/sun/star/task/XUrlContainer.idl
@@ -46,7 +46,7 @@ module com { module sun { module star { module task {
 
     @since OOo 3.2
 */
-/*published*/ interface XUrlContainer : com::sun::star::uno::XInterface
+published interface XUrlContainer : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** Add a URL to the container.
diff --git a/offapi/com/sun/star/text/GlobalDocument.idl b/offapi/com/sun/star/text/GlobalDocument.idl
index 2e71c7ad3736..480887d64b0f 100644
--- a/offapi/com/sun/star/text/GlobalDocument.idl
+++ b/offapi/com/sun/star/text/GlobalDocument.idl
@@ -38,8 +38,10 @@
 //=============================================================================
 
 /** Specify the document service of the global text module.
+
+    @deprecated
  */
-service GlobalDocument
+published service GlobalDocument
 {
     /** Provides the functionality of such global document. */
     service GenericTextDocument;
diff --git a/offapi/com/sun/star/text/WebDocument.idl b/offapi/com/sun/star/text/WebDocument.idl
index 62b6294ff5ac..fd4f1b66aef6 100644
--- a/offapi/com/sun/star/text/WebDocument.idl
+++ b/offapi/com/sun/star/text/WebDocument.idl
@@ -38,8 +38,10 @@
 //=============================================================================
 
 /** Specify the document service of the web module.
+
+    @deprecated
  */
-service WebDocument
+published service WebDocument
 {
     /** Provides the functionality of such web document. */
     service GenericTextDocument;
diff --git a/offapi/com/sun/star/text/textfield/MetadataField.idl b/offapi/com/sun/star/text/textfield/MetadataField.idl
index d98c4be39e96..b3d585c0d32c 100644
--- a/offapi/com/sun/star/text/textfield/MetadataField.idl
+++ b/offapi/com/sun/star/text/textfield/MetadataField.idl
@@ -61,7 +61,7 @@ module com { module sun { module star { module text { module textfield {
 
     @see com::sun::star::rdf
 */
-service MetadataField
+published service MetadataField
 {
     //-------------------------------------------------------------------------
     /** None of the properties of
diff --git a/offapi/com/sun/star/ucb/CertificateValidationRequest.idl b/offapi/com/sun/star/ucb/CertificateValidationRequest.idl
index 182fe5f8e641..11c0d4416229 100644
--- a/offapi/com/sun/star/ucb/CertificateValidationRequest.idl
+++ b/offapi/com/sun/star/ucb/CertificateValidationRequest.idl
@@ -42,7 +42,7 @@ module com { module sun { module star { module ucb {
 //=============================================================================
 /** An error specifying an invalid certificate.
 */
-exception CertificateValidationRequest: com::sun::star::task::ClassifiedInteractionRequest
+published exception CertificateValidationRequest: com::sun::star::task::ClassifiedInteractionRequest
 {
     //-------------------------------------------------------------------------
     /** This value describes the validity of the certificate.
@@ -54,6 +54,9 @@ exception CertificateValidationRequest: com::sun::star::task::ClassifiedInteract
      */
     com::sun::star::security::XCertificate Certificate;
 
+    //-------------------------------------------------------------------------
+    /** The host name.
+     */
     string HostName;
 
 };
diff --git a/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl b/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
index 01d19a268a89..d04c1f0e113b 100644
--- a/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
+++ b/offapi/com/sun/star/ucb/URLAuthenticationRequest.idl
@@ -42,7 +42,7 @@ module com { module sun { module star { module ucb {
 
     @since OOo 3.2
 */
-/*published*/ exception URLAuthenticationRequest : AuthenticationRequest
+published exception URLAuthenticationRequest : AuthenticationRequest
 {
     //-------------------------------------------------------------------------
     /** The URL for which authentication is requested.
diff --git a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
index 2cd425492bde..aac69289d066 100644
--- a/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
+++ b/offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl
@@ -45,7 +45,7 @@ module com { module sun { module star { module ucb {
 
     @since OOo 3.2
 */
-/*published*/ interface XInteractionSupplyAuthentication2 : XInteractionSupplyAuthentication
+published interface XInteractionSupplyAuthentication2 : XInteractionSupplyAuthentication
 {
     //-------------------------------------------------------------------------
     /** Specifies if "system credentials" can be obtained and used by the issuer
diff --git a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
index 98d72c25e8ad..561da63ee8c8 100644
--- a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
+++ b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl
@@ -46,8 +46,7 @@ module com { module sun { module star { module ucb {
     <type>XCommandEnvironment</type> implementation, when executing a command
     using <type>XCommandProcessor</type>.
 */
-/* published */
-interface XWebDAVCommandEnvironment : com::sun::star::uno::XInterface
+published interface XWebDAVCommandEnvironment : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** This method gets called while assembling an WebDAV/HTTP request.
@@ -66,8 +65,8 @@ interface XWebDAVCommandEnvironment : com::sun::star::uno::XInterface
         The header value must be an Any containing a string.
     */
     sequence<com::sun::star::beans::NamedValue> getUserRequestHeaders(
-    [in] string aURI,
-    [in] string aMethod);
+        [in] string aURI,
+        [in] string aMethod);
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/ui/DockingArea.idl b/offapi/com/sun/star/ui/DockingArea.idl
index f376581e0c7e..7880efb8ebd8 100644
--- a/offapi/com/sun/star/ui/DockingArea.idl
+++ b/offapi/com/sun/star/ui/DockingArea.idl
@@ -47,7 +47,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-enum DockingArea
+published enum DockingArea
 {
     /** the top docking area below the menu bar.
     */
diff --git a/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
index 0a405a1ac64b..33bd1ae4a922 100644
--- a/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
@@ -43,7 +43,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-service ModuleUIConfigurationManagerSupplier
+published service ModuleUIConfigurationManagerSupplier
 {
     /** controls module based user interface configuration managers.
 
diff --git a/offapi/com/sun/star/ui/UIElementFactory.idl b/offapi/com/sun/star/ui/UIElementFactory.idl
index 1c07575e65fc..2caba7493964 100644
--- a/offapi/com/sun/star/ui/UIElementFactory.idl
+++ b/offapi/com/sun/star/ui/UIElementFactory.idl
@@ -52,7 +52,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-service UIElementFactory
+published service UIElementFactory
 {
     /** this interface provides a function to create and initialize new
         instances of user interface elements.
diff --git a/offapi/com/sun/star/ui/WindowStateConfiguration.idl b/offapi/com/sun/star/ui/WindowStateConfiguration.idl
index 531b1fe777f6..5a64d3c1b33a 100644
--- a/offapi/com/sun/star/ui/WindowStateConfiguration.idl
+++ b/offapi/com/sun/star/ui/WindowStateConfiguration.idl
@@ -51,7 +51,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-service WindowStateConfiguration
+published service WindowStateConfiguration
 {
     /** provides access to window based information about user interface elements
         of all installed application modules.
diff --git a/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl b/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
index f3912a12c1a6..576c1d00268b 100644
--- a/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
+++ b/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
@@ -63,7 +63,7 @@ module com { module sun { module star { module ui {
 */
 
 
-interface XDockingAreaAcceptor : com::sun::star::uno::XInterface
+published interface XDockingAreaAcceptor : com::sun::star::uno::XInterface
 {
     /** provide the container window where the layout manager can request border
         space for docking windows.
diff --git a/offapi/com/sun/star/ui/XImageManager.idl b/offapi/com/sun/star/ui/XImageManager.idl
index e367d1184efb..5e09519700b0 100644
--- a/offapi/com/sun/star/ui/XImageManager.idl
+++ b/offapi/com/sun/star/ui/XImageManager.idl
@@ -75,7 +75,7 @@ module com { module sun { module star { module ui {
     </p>
 */
 
-interface XImageManager
+published interface XImageManager
 {
     /** resets the image manager to default data.
 
diff --git a/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
index f1eb20a785e0..583c5e076a80 100644
--- a/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
@@ -44,7 +44,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XModuleUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
+published interface XModuleUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
 {
     //----------------------------------------------------------------------
     /** returns the requested module based user interface configuration manager.
diff --git a/offapi/com/sun/star/ui/XToolPanel.idl b/offapi/com/sun/star/ui/XToolPanel.idl
index 261f4c20413d..6b485d1b8b51 100644
--- a/offapi/com/sun/star/ui/XToolPanel.idl
+++ b/offapi/com/sun/star/ui/XToolPanel.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module ui {
 
 /** describes the basic interface to be implemented by a tool panel
  */
-interface XToolPanel
+published interface XToolPanel
 {
     /** provides access to the tool panel's main window.
 
diff --git a/offapi/com/sun/star/ui/XUIConfiguration.idl b/offapi/com/sun/star/ui/XUIConfiguration.idl
index 95ec91a65f5b..12c1891da376 100644
--- a/offapi/com/sun/star/ui/XUIConfiguration.idl
+++ b/offapi/com/sun/star/ui/XUIConfiguration.idl
@@ -50,7 +50,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XUIConfiguration : ::com::sun::star::uno::XInterface
+published interface XUIConfiguration : ::com::sun::star::uno::XInterface
 {
     /** adds the specified listener to receive events when elements are
         changed, inserted or removed.
diff --git a/offapi/com/sun/star/ui/XUIConfigurationListener.idl b/offapi/com/sun/star/ui/XUIConfigurationListener.idl
index 2e89eee6bea0..a44e2b947512 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationListener.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationListener.idl
@@ -48,7 +48,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XUIConfigurationListener : com::sun::star::lang::XEventListener
+published interface XUIConfigurationListener : com::sun::star::lang::XEventListener
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/ui/XUIConfigurationManager.idl b/offapi/com/sun/star/ui/XUIConfigurationManager.idl
index f62e1ce87a21..1764b50cc132 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationManager.idl
@@ -73,7 +73,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
+published interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
 {
     /** resets the configuration manager to the default user interface
         configuration data.
diff --git a/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
index a1f091623a30..ee2ae174d8d1 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
+published interface XUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
 {
     //----------------------------------------------------------------------
     /** returns the user interface configuration manager related to the
diff --git a/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl b/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
index aae269b58c26..a102edac1fc0 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
@@ -41,7 +41,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XUIConfigurationPersistence : ::com::sun::star::uno::XInterface
+published interface XUIConfigurationPersistence : ::com::sun::star::uno::XInterface
 {
     /** reloads the configuration data from the storage and reinitialize
         the user interface configuration manager instance with this data.
diff --git a/offapi/com/sun/star/ui/XUIElement.idl b/offapi/com/sun/star/ui/XUIElement.idl
index 26536a85f29f..ba835b2ab7d7 100644
--- a/offapi/com/sun/star/ui/XUIElement.idl
+++ b/offapi/com/sun/star/ui/XUIElement.idl
@@ -60,7 +60,7 @@ module com { module sun { module star { module ui {
     </p>
 */
 
-interface XUIElement : com::sun::star::uno::XInterface
+published interface XUIElement : com::sun::star::uno::XInterface
 {
     /** returns an interface to get access to user interface type specific functions.
 
diff --git a/offapi/com/sun/star/ui/XUIElementFactory.idl b/offapi/com/sun/star/ui/XUIElementFactory.idl
index 05fe8746d387..606280fadb75 100644
--- a/offapi/com/sun/star/ui/XUIElementFactory.idl
+++ b/offapi/com/sun/star/ui/XUIElementFactory.idl
@@ -70,7 +70,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XUIElementFactory : ::com::sun::star::uno::XInterface
+published interface XUIElementFactory : ::com::sun::star::uno::XInterface
 {
     /** creates a new instances of a specific user interface element.
 
diff --git a/offapi/com/sun/star/ui/XUIElementSettings.idl b/offapi/com/sun/star/ui/XUIElementSettings.idl
index 87681ec508cd..2bcdda1f2eec 100644
--- a/offapi/com/sun/star/ui/XUIElementSettings.idl
+++ b/offapi/com/sun/star/ui/XUIElementSettings.idl
@@ -48,7 +48,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XUIElementSettings : com::sun::star::uno::XInterface
+published interface XUIElementSettings : com::sun::star::uno::XInterface
 {
     /** forces the user interface element to retrieve new settings from its
         configuration source.
diff --git a/offapi/com/sun/star/ui/dialogs/Wizard.idl b/offapi/com/sun/star/ui/dialogs/Wizard.idl
index 4e6b13f44ca2..d15819a73281 100644
--- a/offapi/com/sun/star/ui/dialogs/Wizard.idl
+++ b/offapi/com/sun/star/ui/dialogs/Wizard.idl
@@ -34,13 +34,13 @@
 
 module com { module sun { module star { module ui { module dialogs {
 
-interface XWizardController;
+published interface XWizardController;
 
 //==================================================================================================================
 
 /** provides a framework for implementing a wizard dialog.
  */
-service Wizard : XWizard
+published service Wizard : XWizard
 {
     /** creates a wizard with a single execution path
         @param PageIds
diff --git a/offapi/com/sun/star/ui/dialogs/XWizard.idl b/offapi/com/sun/star/ui/dialogs/XWizard.idl
index 445f7bbf2a44..debe91072ba4 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizard.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizard.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module ui { module dialogs {
 
 //==================================================================================================================
 
-interface XWizardPage;
+published interface XWizardPage;
 
 /** is the main interface implemented by the <type>Wizard</type> services.
 
@@ -79,7 +79,7 @@ interface XWizardPage;
     @see XWizardController
     @see XWizardPage
  */
-interface XWizard
+published interface XWizard
 {
     interface   XExecutableDialog;
 
diff --git a/offapi/com/sun/star/ui/dialogs/XWizardController.idl b/offapi/com/sun/star/ui/dialogs/XWizardController.idl
index db26d3d281c4..063873aa541f 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizardController.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizardController.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module ui { module dialogs {
 
 /** is the interface of a client-provided controller of a custom <type>Wizard</type>.
  */
-interface XWizardController
+published interface XWizardController
 {
     /** creates a page
 
diff --git a/offapi/com/sun/star/ui/dialogs/XWizardPage.idl b/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
index 5e99ca2ada95..aa872a454d48 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module ui { module dialogs {
 
 /** is a single page of a <type>Wizard</type>
  */
-interface XWizardPage : ::com::sun::star::lang::XComponent
+published interface XWizardPage : ::com::sun::star::lang::XComponent
 {
     /** provides read-only access to the window of the page
     */
diff --git a/offapi/com/sun/star/util/InvalidStateException.idl b/offapi/com/sun/star/util/InvalidStateException.idl
index 7d59abbcbac6..3f4b28dbd479 100644
--- a/offapi/com/sun/star/util/InvalidStateException.idl
+++ b/offapi/com/sun/star/util/InvalidStateException.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module util {
 
 /** is thrown when an object's state does not allow to call requested functionality.
  */
-exception InvalidStateException : com::sun::star::uno::Exception
+published exception InvalidStateException : com::sun::star::uno::Exception
 {
 };
 
diff --git a/offapi/com/sun/star/util/NotLockedException.idl b/offapi/com/sun/star/util/NotLockedException.idl
index b0917e0bdca6..9819fde69afd 100644
--- a/offapi/com/sun/star/util/NotLockedException.idl
+++ b/offapi/com/sun/star/util/NotLockedException.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module util {
 
 /** is raised when attempt is made to unlock a lockable component which actually is not locked.
  */
-exception NotLockedException : ::com::sun::star::util::InvalidStateException
+published exception NotLockedException : ::com::sun::star::util::InvalidStateException
 {
 };
 
diff --git a/offapi/com/sun/star/util/TriState.idl b/offapi/com/sun/star/util/TriState.idl
index 8b3c0f684e40..322174216f0a 100644
--- a/offapi/com/sun/star/util/TriState.idl
+++ b/offapi/com/sun/star/util/TriState.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module util {
     This enumeration defines three values, <TRUE/>, <FALSE/> and a don't know
     value.<p>
  */
-enum TriState
+published enum TriState
 {
     /** The value is equivalent to <FALSE/>.
      */
diff --git a/offapi/com/sun/star/util/XLockable.idl b/offapi/com/sun/star/util/XLockable.idl
index e3da8025a034..0e52cc96cb8b 100644
--- a/offapi/com/sun/star/util/XLockable.idl
+++ b/offapi/com/sun/star/util/XLockable.idl
@@ -41,7 +41,7 @@ module com { module sun { module star { module util {
     pairs. As long as there has been one more call to <code>lock</code> than to <code>unlock</code>, the
     component is considered locked, which is reflected by <member>isLocked</member> returning <TRUE/>.</p>
  */
-interface XLockable
+published interface XLockable
 {
     /** locks</a> the component
 
diff --git a/offapi/com/sun/star/util/XModifiable2.idl b/offapi/com/sun/star/util/XModifiable2.idl
index a2f7287a4a83..ecbe5e2be3b5 100644
--- a/offapi/com/sun/star/util/XModifiable2.idl
+++ b/offapi/com/sun/star/util/XModifiable2.idl
@@ -51,7 +51,7 @@ module com {  module sun {  module star {  module util {
     Please use this interface very carefully.
     </p>
  */
-interface XModifiable2: com::sun::star::util::XModifiable
+published interface XModifiable2: com::sun::star::util::XModifiable
 {
     //-------------------------------------------------------------------------
     /** disable possibility to change modified state of the document
diff --git a/offapi/com/sun/star/view/SelectionType.idl b/offapi/com/sun/star/view/SelectionType.idl
index c8aa07d27393..56fe2b036131 100644
--- a/offapi/com/sun/star/view/SelectionType.idl
+++ b/offapi/com/sun/star/view/SelectionType.idl
@@ -35,7 +35,7 @@ module com {  module sun {  module star {  module view {
 
 /** Specifies a selection type for a view that supports a selection model.
  */
-enum SelectionType
+published enum SelectionType
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/view/XMultiSelectionSupplier.idl b/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
index 3557b3c47fae..249cc53072ec 100644
--- a/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
+++ b/offapi/com/sun/star/view/XMultiSelectionSupplier.idl
@@ -50,7 +50,7 @@ module com {  module sun {  module star {  module view {
     <p>Adding an object more than once to a selection should not toggle the
     selection for that object but only select it once</p>
  */
-interface XMultiSelectionSupplier: XSelectionSupplier
+published interface XMultiSelectionSupplier: XSelectionSupplier
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/xml/crypto/CipherID.idl b/offapi/com/sun/star/xml/crypto/CipherID.idl
new file mode 100644
index 000000000000..10b058167244
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/CipherID.idl
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * 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 __com_sun_star_xml_crypto_CipherID_idl__
+#define __com_sun_star_xml_crypto_CipherID_idl__
+
+
+//============================================================================
+
+module com { module sun { module star { module xml { module crypto {
+
+//============================================================================
+/** The constant set contains identifiers of supported cipher-creation
+    algorithms.
+
+    @see <type>XCipherContextSupplier</type>
+    @since OOo 3.4
+*/
+constants CipherID
+{
+    //------------------------------------------------------------------------
+    /** identifier of AES algorithm in CBC mode with W3C padding
+     */
+    const long AES_CBC_W3C_PADDING = 1;
+
+    //------------------------------------------------------------------------
+    /** identifier of the Blowfish algorithm in 8-bit CFB mode
+     */
+    const long BLOWFISH_CFB_8 = 2;
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/DigestID.idl b/offapi/com/sun/star/xml/crypto/DigestID.idl
new file mode 100644
index 000000000000..14eb822de2fd
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/DigestID.idl
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * 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 __com_sun_star_xml_crypto_DigestID_idl__
+#define __com_sun_star_xml_crypto_DigestID_idl__
+
+
+//============================================================================
+
+module com { module sun { module star { module xml { module crypto {
+
+//============================================================================
+/** The constant set contains identifiers of supported digest-creation
+    algorithms.
+
+    @see <type>XDigestContextSupplier</type>
+    @since OOo 3.4
+*/
+constants DigestID
+{
+    //------------------------------------------------------------------------
+    /** identifier of SHA-1 algorithm
+     */
+    const long SHA1 = 1;
+
+    //------------------------------------------------------------------------
+    /** identifier of SHA-256 algorithm
+     */
+    const long SHA256 = 2;
+
+    //------------------------------------------------------------------------
+    /** identifier of SHA-1 algorithm that is applied to the first kilobyte
+        of data.
+     */
+    const long SHA1_1K = 3;
+
+    //------------------------------------------------------------------------
+    /** identifier of SHA-256 algorithm that is applied to the first kilobyte
+        of data.
+     */
+    const long SHA256_1K = 4;
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/SEInitializer.idl b/offapi/com/sun/star/xml/crypto/SEInitializer.idl
index 1f914194f45e..239ef92c9693 100644
--- a/offapi/com/sun/star/xml/crypto/SEInitializer.idl
+++ b/offapi/com/sun/star/xml/crypto/SEInitializer.idl
@@ -25,19 +25,12 @@
  *
  ************************************************************************/
 
-//i20156 - new file for XML security module
-
-/** -- idl definition -- **/
-
 #ifndef __com_sun_star_xml_crypto_seinitializer_idl_
 #define __com_sun_star_xml_crypto_seinitializer_idl_
 
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/uno/Exception.idl>
-
 #include <com/sun/star/xml/crypto/XSEInitializer.idl>
-
-#include <com/sun/star/lang/XServiceInfo.idl>
+#include <com/sun/star/xml/crypto/XDigestContextSupplier.idl>
+#include <com/sun/star/xml/crypto/XCipherContextSupplier.idl>
 
 module com { module sun { module star { module xml { module crypto {
 
@@ -45,8 +38,9 @@ module com { module sun { module star { module xml { module crypto {
  * Service of SEInitializer
  */
 service SEInitializer {
-    interface com::sun::star::xml::crypto::XSEInitializer ;
-    interface com::sun::star::lang::XServiceInfo ;
+    interface ::com::sun::star::xml::crypto::XSEInitializer;
+    interface ::com::sun::star::xml::crypto::XDigestContextSupplier;
+    interface ::com::sun::star::xml::crypto::XCipherContextSupplier;
 };
 
 } ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/crypto/XCipherContext.idl b/offapi/com/sun/star/xml/crypto/XCipherContext.idl
new file mode 100644
index 000000000000..d2c086163f93
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/XCipherContext.idl
@@ -0,0 +1,89 @@
+/*************************************************************************
+ *
+ * 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 __com_sun_star_xml_crypto_xciphercontext_idl_
+#define __com_sun_star_xml_crypto_xciphercontext_idl_
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+
+#ifndef __com_sun_star_lang_DisposedException_idl__
+#include <com/sun/star/lang/DisposedException.idl>
+#endif
+
+//============================================================================
+
+ module com {  module sun {  module star {  module xml { module crypto {
+
+//============================================================================
+/** This interface allows to encrypt/decrypt data using the cipher context.
+    <p>
+    The algorithm as well as encryption data are specified on object creation.
+    </p>
+
+    @see <type>XCipherContextSupplier</type>
+    @since OOo 3.4
+ */
+interface XCipherContext : com::sun::star::uno::XInterface
+{
+    //------------------------------------------------------------------------
+    /** encrypts/decrypts the data using the cipher.
+        <p>
+        Please have in mind, the cipher object state might depend from the
+        already encrypted/decrypted data ( it depends from the used
+        algorithm ).
+        </p>
+
+        <p>
+        Whether the object does encryption or decryption is specified by
+        creation of the object.
+        </p>
+
+        @param aData
+            data that should be encrypted/decrypted
+     */
+    sequence<byte> convertWithCipherContext( [in] sequence< byte > aData )
+        raises( ::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::lang::DisposedException );
+
+    //------------------------------------------------------------------------
+    /** finalizes cipher and disposes context.
+     */
+    sequence<byte> finalizeCipherContextAndDispose()
+        raises( ::com::sun::star::lang::DisposedException );
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl b/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl
new file mode 100644
index 000000000000..115cf7b0ee0f
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * 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 __com_sun_star_xml_crypto_xciphercontextsupplier_idl_
+#define __com_sun_star_xml_crypto_xciphercontextsupplier_idl_
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_beans_NamedValue_idl__
+#include <com/sun/star/beans/NamedValue.idl>
+#endif
+
+#ifndef __com_sun_star_xml_crypto_XCipherContext_idl__
+#include <com/sun/star/xml/crypto/XCipherContext.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+
+//============================================================================
+
+ module com {  module sun {  module star {  module xml { module crypto {
+
+//============================================================================
+/** This interface allows to get an object that allows to encrypt/decrypt data
+    using the specified algorithm.
+
+    @since OOo 3.4
+ */
+interface XCipherContextSupplier : com::sun::star::uno::XInterface
+{
+    //------------------------------------------------------------------------
+    /** returns an object that allows to encrypt/decrypt data.
+
+        @param nCipherID
+            the internal ID specifying the algorithm,
+            should take value from <type>CipherID</type>
+
+        @param aKey
+            the key that should be used for the encryption
+
+        @param aInitializationVector
+            the initialization vector that should be used for the encryption
+
+        @param bEncryption
+            whether an encryption or decryption cipher should be created
+            <TRUE/> - Encryption
+            <FALSE/> - Decryption
+
+        @param aParams
+            optional parameters that could be used to initialize the cipher,
+
+        @throws ::com::sun::star::lang::IllegalArgumentException
+            one of provided arguments is illegal
+     */
+
+    XCipherContext getCipherContext( [in] long nCipherID, [in] sequence< byte > aKey, [in] sequence< byte > aInitializationVector, [in] boolean bEncryption, [in] sequence< ::com::sun::star::beans::NamedValue > aParams )
+        raises( ::com::sun::star::lang::IllegalArgumentException );
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/xml/crypto/XDigestContext.idl b/offapi/com/sun/star/xml/crypto/XDigestContext.idl
new file mode 100644
index 000000000000..f6218d9b6eda
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/XDigestContext.idl
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
+ * 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 __com_sun_star_xml_crypto_xdigestcontext_idl_
+#define __com_sun_star_xml_crypto_xdigestcontext_idl_
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_lang_DisposedException_idl__
+#include <com/sun/star/lang/DisposedException.idl>
+#endif
+
+//============================================================================
+
+ module com {  module sun {  module star {  module xml { module crypto {
+
+//============================================================================
+/** This interface allows to generate the digest.
+    <p>
+    The algorithm to generate the digest is specified on object creation.
+    </p>
+
+    @see <type>XDigestContextSupplier</type>
+    @since OOo 3.4
+ */
+interface XDigestContext : com::sun::star::uno::XInterface
+{
+    //------------------------------------------------------------------------
+    /** update the digest with the given data.
+
+        @param aData
+            data that should be used to update the digest
+     */
+    void updateDigest( [in] sequence< byte > aData )
+        raises( ::com::sun::star::lang::DisposedException );
+
+    //------------------------------------------------------------------------
+    /** finalizes digest and disposes context.
+     */
+    sequence<byte> finalizeDigestAndDispose()
+        raises( ::com::sun::star::lang::DisposedException );
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl b/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl
new file mode 100644
index 000000000000..f421d8ff9c96
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * 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 __com_sun_star_xml_crypto_xdigestcontextsupplier_idl_
+#define __com_sun_star_xml_crypto_xdigestcontextsupplier_idl_
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_beans_NamedValue_idl__
+#include <com/sun/star/beans/NamedValue.idl>
+#endif
+
+#ifndef __com_sun_star_xml_crypto_XDigestContext_idl__
+#include <com/sun/star/xml/crypto/XDigestContext.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+
+//============================================================================
+
+ module com {  module sun {  module star {  module xml { module crypto {
+
+//============================================================================
+/** This interface allows to get an object to generate a digest of a specified
+    format.
+
+    @since OOo 3.4
+ */
+interface XDigestContextSupplier : com::sun::star::uno::XInterface
+{
+    //------------------------------------------------------------------------
+    /** returns an object that allows to generate the specified digest.
+
+        @param nDigestID
+            the internal ID specifying the algorithm,
+            should take value from <type>DigestID</type>
+
+        @param aParams
+            optional parameters that could be used to initialize the digest,
+            for example, it could contain a key and etc.
+
+        @throws ::com::sun::star::lang::IllegalArgumentException
+            one of provided arguments is illegal
+     */
+    XDigestContext getDigestContext(
+                [in] long nDigestID,
+                [in] sequence< ::com::sun::star::beans::NamedValue > aParams )
+        raises( ::com::sun::star::lang::IllegalArgumentException );
+};
+
+//============================================================================
+
+}; }; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/XSEInitializer.idl b/offapi/com/sun/star/xml/crypto/XSEInitializer.idl
index 1e3a0d8db141..bb0422148f57 100644
--- a/offapi/com/sun/star/xml/crypto/XSEInitializer.idl
+++ b/offapi/com/sun/star/xml/crypto/XSEInitializer.idl
@@ -25,10 +25,6 @@
  *
  ************************************************************************/
 
-//i20156 - new file for XML security module
-
-/** -- idl definition -- **/
-
 #ifndef __com_sun_star_xml_crypto_xseinitializer_idl_
 #define __com_sun_star_xml_crypto_xseinitializer_idl_
 
@@ -37,21 +33,22 @@
 
 module com { module sun { module star { module xml { module crypto {
 
-interface XXMLSecurityContext;
+published interface XXMLSecurityContext;
 
 /**
  * Interface to manipulate Security Environment
  */
-interface XSEInitializer : com::sun::star::uno::XInterface
+published interface XSEInitializer : com::sun::star::uno::XInterface
 {
     /**
-     * Creates a security context.
-     *
-     * @param certificateDatabase      the file or directory of the key materials
-     * @return            the security context created
+       Creates a security context.
+
+       @param aString
+            reserved for internal use.
+
+       @return            the security context created
      */
-    com::sun::star::xml::crypto::XXMLSecurityContext createSecurityContext(
-        [in] string certificateDatabase);
+    ::com::sun::star::xml::crypto::XXMLSecurityContext createSecurityContext( [in] string aString );
 
     /**
      * Frees a security context.
diff --git a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
index 25d7264c22d3..fbe985d1a00c 100644
--- a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
@@ -25,10 +25,6 @@
  *
  ************************************************************************/
 
-//i20156 - new file for XML security module
-
-/** -- idl definition -- **/
-
 #ifndef __com_sun_star_xml_crypto_xsecurityenvironment_idl_
 #define __com_sun_star_xml_crypto_xsecurityenvironment_idl_
 
@@ -47,7 +43,7 @@ module com { module sun { module star { module xml { module crypto {
 /**
  * Interface of Security Environment
  */
-interface XSecurityEnvironment : com::sun::star::uno::XInterface
+published interface XSecurityEnvironment : com::sun::star::uno::XInterface
 {
     /**
      * Get personal certificate from the environment
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
index 7ab002c21e1d..837869efa3ae 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
@@ -25,10 +25,6 @@
  *
  ************************************************************************/
 
-//i20156 - new file for XML security module
-
-/** -- idl definition -- **/
-
 #ifndef __com_sun_star_xml_crypto_xxmlsecuritycontext_idl_
 #define __com_sun_star_xml_crypto_xxmlsecuritycontext_idl_
 
@@ -45,7 +41,7 @@ module com { module sun { module star { module xml { module crypto {
  * <p>This interface specifies a certain signature context. By signature
  * context, the signer or verifier retrieves key specification.</p>
  */
-interface XXMLSecurityContext : com::sun::star::uno::XInterface
+published interface XXMLSecurityContext : com::sun::star::uno::XInterface
 {
     /**
      * Add personal security environment , and return the index of the added environment.
diff --git a/offapi/com/sun/star/xml/crypto/makefile.mk b/offapi/com/sun/star/xml/crypto/makefile.mk
index 4aa3957ac418..c03b2a76daf7 100644
--- a/offapi/com/sun/star/xml/crypto/makefile.mk
+++ b/offapi/com/sun/star/xml/crypto/makefile.mk
@@ -58,6 +58,12 @@ IDLFILES=\
     XMLSignatureException.idl     \
     XMLEncryptionException.idl     \
     XUriBinding.idl    \
+    CipherID.idl \
+    DigestID.idl \
+    XCipherContext.idl \
+    XCipherContextSupplier.idl \
+    XDigestContext.idl \
+    XDigestContextSupplier.idl \
     SecurityOperationStatus.idl
 
 # ------------------------------------------------------------------
diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c
index cea560d44ef9..923b14bea32c 100644
--- a/sal/osl/unx/util.c
+++ b/sal/osl/unx/util.c
@@ -162,7 +162,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
      *  And now, the real thing: the get address
      */
 
-#ifdef SIOCGIFHWADDR
+#if defined(SIOCGIFHWADDR) && !defined(SOLARIS)
     ret=ioctl(so, SIOCGIFHWADDR, &ifr);
 #else
     ret=ioctl(so, SIOCGIFADDR, &ifr);
@@ -177,7 +177,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
 
     close(so);
 
-#ifdef SIOCGIFHWADDR
+#if defined(SIOCGIFHWADDR) && !defined(SOLARIS)
     memcpy(hard_addr,ifr.ifr_hwaddr.sa_data,8);
 #else
     memcpy(hard_addr,ifr.ifr_ifru.ifru_addr.sa_data,8);
diff --git a/udkapi/com/sun/star/beans/Ambiguous.idl b/udkapi/com/sun/star/beans/Ambiguous.idl
index 919c7250f462..ec443e7cb5d5 100644
--- a/udkapi/com/sun/star/beans/Ambiguous.idl
+++ b/udkapi/com/sun/star/beans/Ambiguous.idl
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module beans {
    have the <const
    scope="com::sun::star::beans">PropertyAttribute::MAYBEAMBIGUOUS</const>.</p>
  */
-struct Ambiguous<T> {
+published struct Ambiguous<T> {
     /**
        The underlying value of this structure instance.
 
diff --git a/udkapi/com/sun/star/beans/Defaulted.idl b/udkapi/com/sun/star/beans/Defaulted.idl
index d67f1aacf055..7b0b09318611 100644
--- a/udkapi/com/sun/star/beans/Defaulted.idl
+++ b/udkapi/com/sun/star/beans/Defaulted.idl
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module beans {
    have the <const
    scope="com::sun::star::beans">PropertyAttribute::MAYBEDEFAULT</const>.</p>
  */
-struct Defaulted<T> {
+published struct Defaulted<T> {
     /**
        The underlying value of this structure instance.
 
diff --git a/udkapi/com/sun/star/beans/Optional.idl b/udkapi/com/sun/star/beans/Optional.idl
index fbf58b667c16..a2786e5190c1 100644
--- a/udkapi/com/sun/star/beans/Optional.idl
+++ b/udkapi/com/sun/star/beans/Optional.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module beans {
    also be useful in other situations, for example as the return type of an
    interface method.</p>
  */
-struct Optional<T> {
+published struct Optional<T> {
     /**
        Marks this structure instance as having an actual value.
      */
diff --git a/udkapi/com/sun/star/beans/Pair.idl b/udkapi/com/sun/star/beans/Pair.idl
index 0bb214fb87bb..4089300a5a44 100644
--- a/udkapi/com/sun/star/beans/Pair.idl
+++ b/udkapi/com/sun/star/beans/Pair.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module beans {
 
     @since OOo 3.0
  */
-struct Pair<T, U> {
+published struct Pair<T, U> {
 
     /// first object.
     T First;
diff --git a/udkapi/com/sun/star/io/TempFile.idl b/udkapi/com/sun/star/io/TempFile.idl
index b00bb5099e70..06b77e2b5c20 100644
--- a/udkapi/com/sun/star/io/TempFile.idl
+++ b/udkapi/com/sun/star/io/TempFile.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module io {
 //========================================================================
 /** This service allows to get access to temp files.
  */
-service TempFile : XTempFile;
+published service TempFile : XTempFile;
 
 //=========================================================================
 
diff --git a/udkapi/com/sun/star/io/XTempFile.idl b/udkapi/com/sun/star/io/XTempFile.idl
index b1e8f158944f..bda47cffa887 100644
--- a/udkapi/com/sun/star/io/XTempFile.idl
+++ b/udkapi/com/sun/star/io/XTempFile.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module io {
 //========================================================================
 /** This interface offers access to temp files.
  */
-interface XTempFile
+published interface XTempFile
 {
     // INTERFACES
     //
diff --git a/udkapi/com/sun/star/script/ArrayWrapper.idl b/udkapi/com/sun/star/script/ArrayWrapper.idl
index 54d4b23ec7ac..47193e1f5603 100644
--- a/udkapi/com/sun/star/script/ArrayWrapper.idl
+++ b/udkapi/com/sun/star/script/ArrayWrapper.idl
@@ -46,7 +46,7 @@ module com {  module sun {  module star { module script {
     preference for a Multi-Dimensional array representation to be specified.</p>
 */
 
-struct ArrayWrapper
+published struct ArrayWrapper
 {
     /** Indicates whether the Array should be have 1 or 0 based indexing.
     */
diff --git a/udkapi/com/sun/star/task/XInteractionHandler2.idl b/udkapi/com/sun/star/task/XInteractionHandler2.idl
index ef2ab140074a..80c7bb67bc59 100644
--- a/udkapi/com/sun/star/task/XInteractionHandler2.idl
+++ b/udkapi/com/sun/star/task/XInteractionHandler2.idl
@@ -41,8 +41,10 @@
    <p>This interface extends the interface <type>XInteractionHandler</type>
       the way that a caller can determine whether an interaction request was
       actually handled by the interaction handler.</p>
+
+      @since OOo 3.2
  */
-/* published */ interface XInteractionHandler2 : com::sun::star::task::XInteractionHandler
+published interface XInteractionHandler2 : com::sun::star::task::XInteractionHandler
 {
     //-------------------------------------------------------------------------
     /** Handle an interaction request.
author	Jan Holesovsky <kendy@suse.cz>	2011-04-22 15:10:13 +0200
committer	Jan Holesovsky <kendy@suse.cz>	2011-04-22 15:10:13 +0200
commit	bef8909ce175f728d43501cfec4368eebd69cabf (patch)
tree	f5ea9873e1af554d82c351acdf85619c17f01de7
parent	83e8a2bbe468b5439cc8e59cc04abf001677a8e6 (diff)
parent	013fa416d39f1c219722e6736b7234f944fe774f (diff)