Merge remote-tracking branch 'origin/integration/dev300_m106'

Conflicts:
offapi/com/sun/star/awt/XCallback.idl
offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
offapi/com/sun/star/awt/XContainerWindowProvider.idl
offapi/com/sun/star/awt/XDialogEventHandler.idl
offapi/com/sun/star/awt/XDialogProvider.idl
offapi/com/sun/star/awt/XRequestCallback.idl
offapi/com/sun/star/awt/XUnitConversion.idl
offapi/com/sun/star/awt/grid/GridColumnEvent.idl
offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
offapi/com/sun/star/awt/tree/ExpandVetoException.idl
offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
offapi/com/sun/star/awt/tree/XTreeControl.idl
offapi/com/sun/star/awt/tree/XTreeDataModel.idl
offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
offapi/com/sun/star/awt/tree/XTreeEditListener.idl
offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
offapi/com/sun/star/awt/tree/XTreeNode.idl
offapi/com/sun/star/document/DocumentEvent.idl
offapi/com/sun/star/document/XDocumentEventListener.idl
offapi/com/sun/star/frame/XLayoutManagerListener.idl
offapi/com/sun/star/geometry/XMapping2D.idl
offapi/com/sun/star/inspection/XObjectInspectorUI.idl
offapi/com/sun/star/inspection/XPropertyControl.idl
offapi/com/sun/star/inspection/XPropertyControlFactory.idl
offapi/com/sun/star/inspection/XPropertyControlObserver.idl
offapi/com/sun/star/inspection/XPropertyHandler.idl
offapi/com/sun/star/inspection/XStringRepresentation.idl
offapi/com/sun/star/logging/LogRecord.idl
offapi/com/sun/star/logging/XLogFormatter.idl
offapi/com/sun/star/logging/XLogHandler.idl
offapi/com/sun/star/logging/XLogger.idl
offapi/com/sun/star/presentation/XSlideShowListener.idl
offapi/com/sun/star/presentation/XSlideShowView.idl
offapi/com/sun/star/rendering/FontInfo.idl
offapi/com/sun/star/rendering/StrokeAttributes.idl
offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
offapi/com/sun/star/rendering/XAnimatedSprite.idl
offapi/com/sun/star/rendering/XAnimation.idl
offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
offapi/com/sun/star/rendering/XBitmapCanvas.idl
offapi/com/sun/star/rendering/XBufferController.idl
offapi/com/sun/star/rendering/XCachedPrimitive.idl
offapi/com/sun/star/rendering/XCanvas.idl
offapi/com/sun/star/rendering/XCanvasFont.idl
offapi/com/sun/star/rendering/XColorSpace.idl
offapi/com/sun/star/rendering/XCustomSprite.idl
offapi/com/sun/star/rendering/XGraphicDevice.idl
offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
offapi/com/sun/star/rendering/XPolyPolygon2D.idl
offapi/com/sun/star/rendering/XSprite.idl
offapi/com/sun/star/rendering/XSpriteCanvas.idl
offapi/com/sun/star/rendering/XTextLayout.idl
offapi/com/sun/star/report/XFixedLine.idl
offapi/com/sun/star/report/XFixedText.idl
offapi/com/sun/star/report/XFormatCondition.idl
offapi/com/sun/star/report/XFormattedField.idl
offapi/com/sun/star/report/XFunction.idl
offapi/com/sun/star/report/XFunctions.idl
offapi/com/sun/star/report/XFunctionsSupplier.idl
offapi/com/sun/star/report/XGroup.idl
offapi/com/sun/star/report/XGroups.idl
offapi/com/sun/star/report/XImageControl.idl
offapi/com/sun/star/report/XReportComponent.idl
offapi/com/sun/star/report/XReportControlModel.idl
offapi/com/sun/star/report/XReportDefinition.idl
offapi/com/sun/star/report/XSection.idl
offapi/com/sun/star/report/XShape.idl
offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
offapi/com/sun/star/resource/XStringResourceResolver.idl
offapi/com/sun/star/resource/XStringResourceWithLocation.idl
offapi/com/sun/star/sdb/XDocumentDataSource.idl
offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
offapi/com/sun/star/sdb/tools/XConnectionTools.idl
offapi/com/sun/star/security/SecurityInfrastructureException.idl
offapi/com/sun/star/ui/XUIConfigurationManager.idl
offapi/com/sun/star/ui/XUIElement.idl
offapi/com/sun/star/ui/XUIElementSettings.idl
offapi/com/sun/star/util/XModifiable2.idl
offapi/com/sun/star/view/XMultiSelectionSupplier.idl
offapi/com/sun/star/xml/crypto/SEInitializer.idl
offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl

10 files changed, 240 insertions, 21 deletions

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 bc60f6808e67..b6ffcd30dbaf 100644
--- a/offapi/com/sun/star/security/CertificateContainer.idl
+++ b/offapi/com/sun/star/security/CertificateContainer.idl
@@ -36,9 +36,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 175e8bcbe8e9..fef5c4e10f7b 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__
 
@@ -41,7 +37,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
+    
+    
+    
 
 # ------------------------------------------------------------------