summaryrefslogtreecommitdiff
path: root/offapi/com/sun/star/xml
diff options
context:
space:
mode:
Diffstat (limited to 'offapi/com/sun/star/xml')
-rw-r--r--offapi/com/sun/star/xml/AttributeContainer.idl4
-rw-r--r--offapi/com/sun/star/xml/ExportFilter.idl4
-rw-r--r--offapi/com/sun/star/xml/ImportFilter.idl2
-rw-r--r--offapi/com/sun/star/xml/NamespaceContainer.idl2
-rw-r--r--offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl2
-rw-r--r--offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl2
-rw-r--r--offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl2
-rw-r--r--offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl2
-rw-r--r--offapi/com/sun/star/xml/XExportFilter.idl5
-rw-r--r--offapi/com/sun/star/xml/XImportFilter.idl5
-rw-r--r--offapi/com/sun/star/xml/XMLExportFilter.idl2
-rw-r--r--offapi/com/sun/star/xml/XMLImportFilter.idl5
-rw-r--r--offapi/com/sun/star/xml/crypto/SEInitializer.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLEncryption.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLSignature.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLSignatureException.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl5
-rw-r--r--offapi/com/sun/star/xml/crypto/XUriBinding.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLEncryption.idl14
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl19
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl5
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl7
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLSignature.idl9
-rw-r--r--offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl9
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/Decryptor.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/Encryptor.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl6
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl7
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl4
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl2
-rw-r--r--offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl2
-rw-r--r--offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/DOMException.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/DocumentBuilder.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XAttr.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XCDATASection.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XCharacterData.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XComment.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XDOMImplementation.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XDocument.idl18
-rw-r--r--offapi/com/sun/star/xml/dom/XDocumentBuilder.idl19
-rw-r--r--offapi/com/sun/star/xml/dom/XDocumentFragment.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XDocumentType.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XElement.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XEntity.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XEntityReference.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XNamedNodeMap.idl8
-rw-r--r--offapi/com/sun/star/xml/dom/XNode.idl8
-rw-r--r--offapi/com/sun/star/xml/dom/XNodeList.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/XNotation.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XProcessingInstruction.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl9
-rw-r--r--offapi/com/sun/star/xml/dom/XText.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/events/EventException.idl2
-rw-r--r--offapi/com/sun/star/xml/dom/events/EventType.idl4
-rw-r--r--offapi/com/sun/star/xml/dom/events/XMutationEvent.idl1
-rw-r--r--offapi/com/sun/star/xml/input/XAttributes.idl14
-rw-r--r--offapi/com/sun/star/xml/input/XElement.idl8
-rw-r--r--offapi/com/sun/star/xml/input/XRoot.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/FastToken.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/InputSource.idl8
-rw-r--r--offapi/com/sun/star/xml/sax/SAXException.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl4
-rw-r--r--offapi/com/sun/star/xml/sax/SAXParseException.idl4
-rw-r--r--offapi/com/sun/star/xml/sax/XAttributeList.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/XDTDHandler.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/XDocumentHandler.idl8
-rw-r--r--offapi/com/sun/star/xml/sax/XEntityResolver.idl12
-rw-r--r--offapi/com/sun/star/xml/sax/XErrorHandler.idl4
-rw-r--r--offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl4
-rw-r--r--offapi/com/sun/star/xml/sax/XFastAttributeList.idl15
-rw-r--r--offapi/com/sun/star/xml/sax/XFastContextHandler.idl10
-rw-r--r--offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl16
-rw-r--r--offapi/com/sun/star/xml/sax/XFastParser.idl45
-rw-r--r--offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl11
-rw-r--r--offapi/com/sun/star/xml/sax/XFastSerializer.idl19
-rw-r--r--offapi/com/sun/star/xml/sax/XFastTokenHandler.idl10
-rw-r--r--offapi/com/sun/star/xml/sax/XLocator.idl2
-rw-r--r--offapi/com/sun/star/xml/sax/XParser.idl18
-rw-r--r--offapi/com/sun/star/xml/sax/XSAXSerializable.idl5
-rw-r--r--offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl4
-rw-r--r--offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl4
-rw-r--r--offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl10
-rw-r--r--offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl4
-rw-r--r--offapi/com/sun/star/xml/xpath/XPathAPI.idl2
-rw-r--r--offapi/com/sun/star/xml/xpath/XPathException.idl2
-rw-r--r--offapi/com/sun/star/xml/xpath/XPathExtension.idl2
-rw-r--r--offapi/com/sun/star/xml/xpath/XXPathAPI.idl16
-rw-r--r--offapi/com/sun/star/xml/xpath/XXPathExtension.idl4
-rw-r--r--offapi/com/sun/star/xml/xpath/XXPathObject.idl10
116 files changed, 140 insertions, 484 deletions
diff --git a/offapi/com/sun/star/xml/AttributeContainer.idl b/offapi/com/sun/star/xml/AttributeContainer.idl
index 74f34e7f5ac7..d47fdc266d3b 100644
--- a/offapi/com/sun/star/xml/AttributeContainer.idl
+++ b/offapi/com/sun/star/xml/AttributeContainer.idl
@@ -27,16 +27,14 @@
#ifndef __com_sun_star_drawing_NamespaceContainer_idl__
#define __com_sun_star_drawing_NamespaceContainer_idl__
-#ifndef __com_sun_star_container_xnamecontainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
module com { module sun { module star { module xml {
//=============================================================================
-/** This service describes a container for xml attributes.
+/** This service describes a container for XML attributes.
<p>Each attribute is accessed with its local name, or optionally, its local
name with its namespace prefix. The type and value of an attribute is stored
diff --git a/offapi/com/sun/star/xml/ExportFilter.idl b/offapi/com/sun/star/xml/ExportFilter.idl
index aae508180607..3531b649df97 100644
--- a/offapi/com/sun/star/xml/ExportFilter.idl
+++ b/offapi/com/sun/star/xml/ExportFilter.idl
@@ -28,9 +28,7 @@
#ifndef _COM_SUN_STAR_XML_EXPORTFILTER_IDL__
#define _COM_SUN_STAR_XML_EXPORTFILTER_IDL__
-#ifndef _COM_SUN_STAR_XML_XEXPORTFILTER_IDL__
#include <com/sun/star/xml/XExportFilter.idl>
-#endif
module com { module sun { module star { module xml {
@@ -42,7 +40,7 @@ module com { module sun { module star { module xml {
which the data should be exported. Then, the source document's XML
representation will be generated by calling the appropriate methods
of the <type scope="com::sun::star::xml::sax">XDocumentHandler</type>
- interface. Error conditions must be signalled by throwing
+ interface. Error conditions must be signaled by throwing
a <type scope="com::sun::star::xml::sax">SAXException</type> in the
<type scope="com::sun::star::xml::sax">XDocumentHandler</type> calls.
diff --git a/offapi/com/sun/star/xml/ImportFilter.idl b/offapi/com/sun/star/xml/ImportFilter.idl
index d95c7c099bf3..82b6f1a91cf6 100644
--- a/offapi/com/sun/star/xml/ImportFilter.idl
+++ b/offapi/com/sun/star/xml/ImportFilter.idl
@@ -28,9 +28,7 @@
#ifndef _COM_SUN_STAR_XML_IMPORTFILTER_IDL__
#define _COM_SUN_STAR_XML_IMPORTFILTER_IDL__
-#ifndef _COM_SUN_STAR_XML_XIMPORTFILTER_IDL__
#include <com/sun/star/xml/XImportFilter.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/NamespaceContainer.idl b/offapi/com/sun/star/xml/NamespaceContainer.idl
index 03319c029fa4..77d6224cd6ce 100644
--- a/offapi/com/sun/star/xml/NamespaceContainer.idl
+++ b/offapi/com/sun/star/xml/NamespaceContainer.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_drawing_NamespaceContainer_idl__
#define __com_sun_star_drawing_NamespaceContainer_idl__
-#ifndef __com_sun_star_container_xnamecontainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
index 9d85e30bb255..eb230ecbba6a 100644
--- a/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/ParaUserDefinedAttributesSupplier.idl
@@ -27,9 +27,7 @@
#ifndef _com_sun_star_xml_ParaUserDefinedAttributesSupplier_idl_
#define _com_sun_star_xml_ParaUserDefinedAttributesSupplier_idl_
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
index cde995ba8872..f0022b1a0d96 100644
--- a/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/TextUserDefinedAttributesSupplier.idl
@@ -27,9 +27,7 @@
#ifndef _com_sun_star_xml_TextUserDefinedAttributesSupplier_idl_
#define _com_sun_star_xml_TextUserDefinedAttributesSupplier_idl_
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl b/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
index 515ed93f7b07..105867aecf1f 100644
--- a/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
+++ b/offapi/com/sun/star/xml/UserDefinedAttributeSupplier.idl
@@ -27,9 +27,7 @@
#ifndef _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
#define _com_sun_star_xml_UserDefinedAttributeSupplier_idl_
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl b/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
index 9a90a0f06609..24224119b645 100644
--- a/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
+++ b/offapi/com/sun/star/xml/UserDefinedAttributesSupplier.idl
@@ -27,9 +27,7 @@
#ifndef _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
#define _com_sun_star_xml_UserDefinedAttributesSupplier_idl_
-#ifndef __com_sun_star_container_XNameContainer_idl__
#include <com/sun/star/container/XNameContainer.idl>
-#endif
module com { module sun { module star { module xml {
diff --git a/offapi/com/sun/star/xml/XExportFilter.idl b/offapi/com/sun/star/xml/XExportFilter.idl
index 47051f579e2d..caa0364ab750 100644
--- a/offapi/com/sun/star/xml/XExportFilter.idl
+++ b/offapi/com/sun/star/xml/XExportFilter.idl
@@ -28,10 +28,7 @@
#ifndef _COM_SUN_STAR_XML_XEXPORTFILTER_IDL__
#define _COM_SUN_STAR_XML_XEXPORTFILTER_IDL__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/beans/PropertyValue.idl>
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
@@ -61,7 +58,7 @@ published interface XExportFilter: com::sun::star::uno::XInterface
which defines the data source
@param msUserData
- Sequence of strings which contains the userdata defined in the
+ Sequence of strings which contains the user data defined in the
TypeDetection.xml (???)
@returns
diff --git a/offapi/com/sun/star/xml/XImportFilter.idl b/offapi/com/sun/star/xml/XImportFilter.idl
index 650a24d8b05c..f952a01b91b4 100644
--- a/offapi/com/sun/star/xml/XImportFilter.idl
+++ b/offapi/com/sun/star/xml/XImportFilter.idl
@@ -28,10 +28,7 @@
#ifndef _COM_SUN_STAR_XML_XIMPORTFILTER_IDL__
#define _COM_SUN_STAR_XML_XIMPORTFILTER_IDL__
-#ifndef __com_sun_star_uno_RuntimeException_idl__
#include <com/sun/star/uno/RuntimeException.idl>
-#endif
-
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/beans/PropertyValue.idl>
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
@@ -61,7 +58,7 @@ published interface XImportFilter: com::sun::star::uno::XInterface
which defines the data source
@param msUserData
- Sequence of strings which contains the userdata defined in the
+ Sequence of strings which contains the user data defined in the
TypeDetection.xml
@param xDocHandler
diff --git a/offapi/com/sun/star/xml/XMLExportFilter.idl b/offapi/com/sun/star/xml/XMLExportFilter.idl
index c66b6cb3bc60..81b94a27ce44 100644
--- a/offapi/com/sun/star/xml/XMLExportFilter.idl
+++ b/offapi/com/sun/star/xml/XMLExportFilter.idl
@@ -29,9 +29,7 @@
#define __com_sun_star_xml_XMLExportFilter_idl__
-#ifndef __com_sun_star_document_ExportFilter_idl__
#include <com/sun/star/document/ExportFilter.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/XMLImportFilter.idl b/offapi/com/sun/star/xml/XMLImportFilter.idl
index 6e551859f720..05cf2718e264 100644
--- a/offapi/com/sun/star/xml/XMLImportFilter.idl
+++ b/offapi/com/sun/star/xml/XMLImportFilter.idl
@@ -29,13 +29,8 @@
#define __com_sun_star_xml_XMLImportFilter_idl__
-#ifndef __com_sun_star_document_ImportFilter_idl__
#include <com/sun/star/document/ImportFilter.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/crypto/SEInitializer.idl b/offapi/com/sun/star/xml/crypto/SEInitializer.idl
index 239ef92c9693..fb415bd9b164 100644
--- a/offapi/com/sun/star/xml/crypto/SEInitializer.idl
+++ b/offapi/com/sun/star/xml/crypto/SEInitializer.idl
@@ -29,8 +29,8 @@
#define __com_sun_star_xml_crypto_seinitializer_idl_
#include <com/sun/star/xml/crypto/XSEInitializer.idl>
-#include <com/sun/star/xml/crypto/XDigestContextSupplier.idl>
#include <com/sun/star/xml/crypto/XCipherContextSupplier.idl>
+#include <com/sun/star/xml/crypto/XDigestContextSupplier.idl>
module com { module sun { module star { module xml { module crypto {
diff --git a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
index 395ef0fb9201..4cefdc02a94e 100644
--- a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XSecurityEnvironment.idl>
-
#include <com/sun/star/lang/XUnoTunnel.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl b/offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl
index f7f07658d6f5..98ff594af23a 100644
--- a/offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl
+++ b/offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -43,7 +43,7 @@ enum SecurityOperationStatus
OPERATION_SUCCEEDED,
RUNTIMEERROR_FAILED,
/**
- * The following constants are derived from xmlsec error definations, as following:
+ * The following constants are derived from XMLSec error definitions, as following:
*
* XMLSEC_ERRORS_R_XMLSEC_FAILED
* XMLSEC_ERRORS_R_MALLOC_FAILED
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
index 7dc93ed7497d..c48c87ddf84f 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XXMLEncryption.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
index 21b5b9beb618..292bf71db8e9 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl
@@ -25,16 +25,14 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
#ifndef __com_sun_star_xml_crypto_XMLEncryptionException_idl__
#define __com_sun_star_xml_crypto_XMLEncryptionException_idl__
-#ifndef __com_sun_star_security_EncryptionException_idl__
#include <com/sun/star/security/EncryptionException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
index 694e4ed56f9b..2b4922678795 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
index c047e8ae45be..dc9a7665ab27 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignature.idl b/offapi/com/sun/star/xml/crypto/XMLSignature.idl
index 1153b7bb9c8f..dddccae400d0 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignature.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignature.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XXMLSignature.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
index 87d2d0ba05a4..ab0613f56026 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignatureException.idl
@@ -25,16 +25,14 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
#ifndef __com_sun_star_xml_crypto_XMLSignatureException_idl__
#define __com_sun_star_xml_crypto_XMLSignatureException_idl__
-#ifndef __com_sun_star_security_SignatureException_idl__
#include <com/sun/star/security/SignatureException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
index 3a4971e12ba1..18379a0c58a5 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
index d2a3e99a36ba..1e8575c00df0 100644
--- a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
@@ -28,10 +28,7 @@
#ifndef __com_sun_star_xml_crypto_xsecurityenvironment_idl_
#define __com_sun_star_xml_crypto_xsecurityenvironment_idl_
-#ifndef __com_sun_star_uno_SecurityException_idl__
#include <com/sun/star/uno/SecurityException.idl>
-#endif
-
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/security/XCertificate.idl>
@@ -66,7 +63,7 @@ published interface XSecurityEnvironment : com::sun::star::uno::XInterface
com::sun::star::security::XCertificate createCertificateFromRaw( [in] sequence< byte > rawCertificate ) raises( com::sun::star::uno::SecurityException ) ;
/**
- * Create certificate interface from a BASE64 encoded certificate.
+ * Create certificate interface from a Base64 encoded certificate.
*/
com::sun::star::security::XCertificate createCertificateFromAscii( [in] string asciiCertificate ) raises( com::sun::star::uno::SecurityException ) ;
diff --git a/offapi/com/sun/star/xml/crypto/XUriBinding.idl b/offapi/com/sun/star/xml/crypto/XUriBinding.idl
index 8d1609ff80e7..7208d4ac15d7 100644
--- a/offapi/com/sun/star/xml/crypto/XUriBinding.idl
+++ b/offapi/com/sun/star/xml/crypto/XUriBinding.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
index 5788b0482349..26ef95f118b9 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLEncryption.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -35,25 +35,23 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/uno/SecurityException.idl>
-
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl>
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
#include <com/sun/star/xml/crypto/XMLEncryptionException.idl>
-
module com { module sun { module star { module xml { module crypto {
/**
* Interface of XML encryption
*
- * <p>This interface represents a xml encrypter or decrypter.</p>
+ * <p>This interface represents a XML encryptor or decryptor.</p>
*
- * <p>The encrypter or decrypter concrete a key by retrieve security context
+ * <p>The encryptor or decryptor concrete a key by retrieve security context
* and encryption template.</p>
*
- * <p>In some cases, the encrypter or decrypter can dertermine and locate the
- * EncrytedKey from the encryption template by dereference the RetrievalMethod
+ * <p>In some cases, the encryptor or decryptor can determine and locate the
+ * EncryptedKey from the encryption template by dereference the RetrievalMethod
* inside EncryptedData.</p>
*
* <p>In some cases, the EncryptedKey need to be clearly pointed out by the
@@ -71,7 +69,7 @@ interface XXMLEncryption : com::sun::star::uno::XInterface
com::sun::star::uno::SecurityException ) ;
/**
- * Perform decryption in the environment of encrytpion template and context.
+ * Perform decryption in the environment of encryption template and context.
*/
com::sun::star::xml::crypto::XXMLEncryptionTemplate decrypt(
[in] com::sun::star::xml::crypto::XXMLEncryptionTemplate aTemplate ,
diff --git a/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
index c2ec51908fb6..459104e357df 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -34,7 +34,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
-
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
#include <com/sun/star/xml/crypto/XXMLSecurityTemplate.idl>
@@ -44,19 +43,19 @@ module com { module sun { module star { module xml { module crypto {
* Interface of XML encryption template
*
* <p>This interface represents a encryption template, which is the same as the
- * desired xml encryption element[ EncryptedType ] but some of the nodes may be
+ * desired XML encryption element[ EncryptedType ] but some of the nodes may be
* empty. The empty entities include CipherValue, which is a subset of
* EncryptedData or EncryptedKey. Empty entities are not allowed in a encryption
* template when performing decryption.</p>
*
- * <p>In some cases, the encrypter or decrypter can dertermine and locate the
- * EncrytedKey from the encryption template by dereference the RetrievalMethod
+ * <p>In some cases, the encryptor or decryptor can determine and locate the
+ * EncryptedKey from the encryption template by dereference the RetrievalMethod
* inside EncryptedData.</p>
*
* <p>In some cases, the EncryptedKey need to be clearly pointed out by the
* encryption template.</p>
*
- * <p>With the help of encryption context, the encrypter or decrypter specifies
+ * <p>With the help of encryption context, the encryptor or decryptor specifies
* the key from the KeyInfo in the encryption template.</p>
*
*
@@ -67,12 +66,12 @@ module com { module sun { module star { module xml { module crypto {
* except that the high level application tell the mechanism and parameters.
*
* So I think it will be more simple that the application set the encrypted key
- * information. In this case, the application only need to know the xml schema
+ * information. In this case, the application only need to know the XML schema
* or DTD and the encryption device. If so, the high level application takes the
* action of build the EncryptedKey template and references it in the element of
* EncryptedData. And in this case, the calling to set up EncryptedKey template
- * and target is not necessary, because the encrypter or decrypter can determine
- * and locate the EncrypedKet from the encryption template of EncryptedData by
+ * and target is not necessary, because the encryptor or decryptor can determine
+ * and locate the EncryptedKey from the encryption template of EncryptedData by
* dereference the RetrievalMethod.
*
* In some situation, the high level applications do not want to know anything
@@ -83,7 +82,7 @@ module com { module sun { module star { module xml { module crypto {
interface XXMLEncryptionTemplate : XXMLSecurityTemplate
{
/**
- * Get the target xml element, i.e. the element to be encrypted
+ * Get the target XML element, i.e. the element to be encrypted
*/
com::sun::star::xml::wrapper::XXMLElementWrapper getTarget(
) ;
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
index f61ae4d802ae..a96057107d16 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
@@ -30,7 +30,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/security/SecurityInfrastructureException.idl>
-
#include <com/sun/star/xml/crypto/XSecurityEnvironment.idl>
module com { module sun { module star { module xml { module crypto {
@@ -44,7 +43,7 @@ module com { module sun { module star { module xml { module crypto {
published interface XXMLSecurityContext : com::sun::star::uno::XInterface
{
/**
- * Add personal security environment , and return the index of the added env.
+ * Add personal security environment , and return the index of the added environment.
*/
long addSecurityEnvironment( [in] XSecurityEnvironment aSecurityEnvironment
) raises( com::sun::star::security::SecurityInfrastructureException ) ;
@@ -61,7 +60,7 @@ published interface XXMLSecurityContext : com::sun::star::uno::XInterface
/**
* An handy method to get the first personal security environment.
- * In xmlsec/nss, the first personal security environment should be the "internal slot"
+ * In XMLSec/NSS, the first personal security environment should be the "internal slot"
*/
com::sun::star::xml::crypto::XSecurityEnvironment getSecurityEnvironment( ) ;
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
index bff443796200..66f4a1b4d2a6 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -34,7 +34,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
-
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
#include <com/sun/star/xml/crypto/XUriBinding.idl>
#include <com/sun/star/xml/crypto/SecurityOperationStatus.idl>
@@ -50,7 +49,7 @@ module com { module sun { module star { module xml { module crypto {
interface XXMLSecurityTemplate : com::sun::star::uno::XInterface
{
/**
- * Load a XML signature template from xml signature element
+ * Load a XML signature template from XML signature element
*/
void setTemplate(
[in] com::sun::star::xml::wrapper::XXMLElementWrapper aXmlElement
@@ -63,7 +62,7 @@ interface XXMLSecurityTemplate : com::sun::star::uno::XInterface
) ;
/**
- * Load the target xml element, i.e. the element to be signed
+ * Load the target XML element, i.e. the element to be signed
*/
void setTarget(
[in] com::sun::star::xml::wrapper::XXMLElementWrapper aXmlElement
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSignature.idl b/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
index fc61c07d17d3..325531fadab1 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSignature.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -34,7 +34,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/SecurityException.idl>
-
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.idl>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
#include <com/sun/star/xml/crypto/XMLSignatureException.idl>
@@ -44,12 +43,12 @@ module com { module sun { module star { module xml { module crypto {
/**
* Interface of XML signature
*
- * <p>This interface represents a xml signer or vertifier.</p>
+ * <p>This interface represents a XML signer or verifier.</p>
*
- * <p>The signer or vertifier concrete a key by retrieve signature context and
+ * <p>The signer or verifier concrete a key by retrieve signature context and
* signature template.</p>
*
- * <p>In some cases, the signer or vertifier can dertermine and locate the
+ * <p>In some cases, the signer or verifier can determine and locate the
* contents to be signed from the signature template by dereference the URI.</p>
*
* <p>In some cases, the contents to be signed need to be clearly pointed out by
diff --git a/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
index 08098a8d590d..c5ad60db790a 100644
--- a/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -34,7 +34,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/lang/IllegalArgumentException.idl>
-
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
#include <com/sun/star/xml/crypto/XUriBinding.idl>
#include <com/sun/star/xml/crypto/XXMLSecurityTemplate.idl>
@@ -45,11 +44,11 @@ module com { module sun { module star { module xml { module crypto {
* Interface of XML signature template
*
* <p>This interface represents a signature template, which is the same as the
- * desired xml signature element but some of the nodes may be empty. The empty
+ * desired XML signature element but some of the nodes may be empty. The empty
* entities include digest value and signature value. Empty entities are not
* allowed in a signature template when performing validation.</p>
*
- * <p>In some cases, the signer or vertifier can dertermine and locate the
+ * <p>In some cases, the signer or verifier can determine and locate the
* contents to be signed from the template by dereference the URI.</p>
*
* <p>With the help of signature context, the signer or verifier specifies the
@@ -60,7 +59,7 @@ module com { module sun { module star { module xml { module crypto {
interface XXMLSignatureTemplate : XXMLSecurityTemplate
{
/**
- * Get the target xml element, i.e. the element to be signed
+ * Get the target XML element, i.e. the element to be signed
*/
sequence< com::sun::star::xml::wrapper::XXMLElementWrapper > getTargets(
) ;
diff --git a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
index 6b8323b19893..1e51568d0628 100644
--- a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -34,10 +34,8 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include "XReferenceResolvedListener.idl"
#include "XBlockerMonitor.idl"
#include "XDecryptionResultBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
index 82d32ebfbae1..536efe61c831 100644
--- a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -34,10 +34,8 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include "XReferenceResolvedListener.idl"
#include "XReferenceCollector.idl"
#include "XBlockerMonitor.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
index 0a70aac82c80..a85d9dcc0af9 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -34,11 +34,9 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include "XSecuritySAXEventKeeper.idl"
#include "XReferenceResolvedBroadcaster.idl"
#include "XSAXEventKeeperStatusChangeBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
index 6660008a6d04..0cf2cc075a13 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
- //i20156 - new file for xmlsecurity module
+ //i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -35,9 +35,7 @@
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include <com/sun/star/xml/crypto/XUriBinding.idl>
-
#include "XReferenceResolvedListener.idl"
#include "XReferenceCollector.idl"
#include "XSignatureCreationResultBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
index b3355e2e98b4..2b06ae7b07f1 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -36,9 +36,7 @@
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
-
#include <com/sun/star/xml/crypto/XUriBinding.idl>
-
#include "XReferenceResolvedListener.idl"
#include "XReferenceCollector.idl"
#include "XSignatureVerifyResultBroadcaster.idl"
diff --git a/offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl b/offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl
index 07cec12ad824..da489aad1af4 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl
index be29d4ee49fd..848e9257f7af 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl b/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl
index e8a420b21f27..493d86720e68 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
index 7b3e1a1039bc..69b808991bc1 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -62,7 +62,7 @@ struct ElementStackItem
/**
* Manipulate the "key SAX events" in a SAX event stream.
*
- * @see XSecController
+ * @see XSecurityController
*/
interface XElementStackKeeper : com::sun::star::uno::XInterface
{
@@ -77,7 +77,7 @@ interface XElementStackKeeper : com::sun::star::uno::XInterface
void stop();
/**
- * Transfers the bufferred key SAX events to a document handler.
+ * Transfers the buffered key SAX events to a document handler.
* <p>
* All transferred events are removed from the buffer.
*
diff --git a/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl
index 7d77439ed710..17c4fae37729 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl b/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl
index 0eca5a84d413..046b7dfe36dc 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl b/offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl
index a7bc3c5c807f..178ef7b8da3d 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl b/offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl
index 6f902a867b65..426cbcc4efd0 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -40,7 +40,7 @@ module com { module sun { module star { module xml { module crypto { module sax
/**
* Interface of Mission Taker.
* <p>
- * This interface is used to controll a mission.
+ * This interface is used to control a mission.
*/
interface XMissionTaker : com::sun::star::uno::XInterface
{
diff --git a/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl b/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl
index 10e79fbcb58d..c7e98e794e88 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -53,7 +53,7 @@ interface XReferenceCollector : com::sun::star::uno::XInterface
raises( com::sun::star::uno::Exception );
/**
- * Set the keeper id of the element colllector of the
+ * Set the keeper id of the element collector of the
* referenced element.
*
* @param id the keeper id of the element collector,
diff --git a/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl
index dba649deea7c..53fec9b363f1 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl b/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl
index 485f6090725b..cf06fd8c0add 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
index 20f8a0289f5c..d59e037934ab 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -35,7 +35,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-
#include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl>
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
@@ -124,9 +123,9 @@ interface XSAXEventKeeper : com::sun::star::uno::XInterface
[in] com::sun::star::xml::sax::XDocumentHandler nextHandler);
/**
- * Prints information about all bufferred elements.
+ * Prints information about all buffered elements.
*
- * @return a tree-style string including all buffer informtion
+ * @return a tree-style string including all buffer information
*/
string printBufferNodeTree();
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl
index 87991d07c7f9..a30bf9f0fa30 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl
index 9d04a0ba1757..75c0fb56a689 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl b/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl
index 872f27d2a78f..0a77210becc2 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
index 16b52279a556..65bfabc22920 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -56,7 +56,7 @@ constants ConstOfSecurityId
* The PRI_AFTERMODIFY priority represents the notification will be
* sent after any internal modification has finished.
* <p>
- * The PRI_BEFOREMODIFY proirity represents the notification will be
+ * The PRI_BEFOREMODIFY priority represents the notification will be
* sent before any internal modification happens.
* <p>
* So an element mark with PRI_BEFOREMODIFY will be handled first,
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl
index ff65155a6491..1eaf2c8d5d25 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl b/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl
index 7d488ef640bf..ce6184be1475 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultListener.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for xml security module
/** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl b/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl
index de557f356f44..e3ff0d2c0709 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for xml security module
/** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl b/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl
index a9de2fb7ef90..ddc54cba908c 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSignatureVerifyResultListener.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for xml security module
/** -- idl definition -- **/
diff --git a/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl b/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
index bcab642f7155..ad314f4b60ff 100644
--- a/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
#ifndef __com_sun_star_xml_csax_XCompressedDocumentHandler_idl__
#define __com_sun_star_xml_csax_XCompressedDocumentHandler_idl__
diff --git a/offapi/com/sun/star/xml/dom/DOMException.idl b/offapi/com/sun/star/xml/dom/DOMException.idl
index d344af889bbe..3e5857c32f19 100644
--- a/offapi/com/sun/star/xml/dom/DOMException.idl
+++ b/offapi/com/sun/star/xml/dom/DOMException.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xml_dom_DOMException_idl__
#define __com_sun_star_xml_dom_DOMException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_DOMExceptionType_idl__
#include <com/sun/star/xml/dom/DOMExceptionType.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/DocumentBuilder.idl b/offapi/com/sun/star/xml/dom/DocumentBuilder.idl
index 0804dc6df201..d280f01833ab 100644
--- a/offapi/com/sun/star/xml/dom/DocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/DocumentBuilder.idl
@@ -1,8 +1,6 @@
#ifndef __com_sun_star_xml_dom_documentbuilder_idl
#define __com_sun_star_xml_dom_documentbuilder_idl
-#ifndef __com_sun_star_xml_dom_xdocumentbuilder_idl
#include <com/sun/star/xml/dom/XDocumentBuilder.idl>
-#endif
module com { module sun { module star { module xml { module dom {
service DocumentBuilder
diff --git a/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
index 4c9dffd36dda..c530d479ead2 100644
--- a/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
@@ -1,11 +1,7 @@
#ifndef __com_sun_star_xml_dom_documentbuilder_idl
#define __com_sun_star_xml_dom_documentbuilder_idl
-#ifndef __com_sun_star_xml_sax_xdocumenthandler_idl
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XSAXDocumentBuilder_idl
#include <com/sun/star/xml/dom/XSAXDocumentBuilder.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XAttr.idl b/offapi/com/sun/star/xml/dom/XAttr.idl
index 7d4a010e3723..6737645e0ac7 100644
--- a/offapi/com/sun/star/xml/dom/XAttr.idl
+++ b/offapi/com/sun/star/xml/dom/XAttr.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XAttr_idl__
#define __com_sun_star_xml_sax_XAttr_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XCDATASection.idl b/offapi/com/sun/star/xml/dom/XCDATASection.idl
index a484ccabca34..dae54a750922 100644
--- a/offapi/com/sun/star/xml/dom/XCDATASection.idl
+++ b/offapi/com/sun/star/xml/dom/XCDATASection.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XCDATASection_idl__
#define __com_sun_star_xml_dom_XCDATASection_idl__
-#ifndef __com_sun_star_xml_dom_XText_idl__
#include <com/sun/star/xml/dom/XText.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XCharacterData.idl b/offapi/com/sun/star/xml/dom/XCharacterData.idl
index 380c705d6359..af2767faa3d6 100644
--- a/offapi/com/sun/star/xml/dom/XCharacterData.idl
+++ b/offapi/com/sun/star/xml/dom/XCharacterData.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XCharacterData_idl__
#define __com_sun_star_xml_dom_XCharacterData_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XComment.idl b/offapi/com/sun/star/xml/dom/XComment.idl
index 36a6a6e6afe7..95fd6ebeb199 100644
--- a/offapi/com/sun/star/xml/dom/XComment.idl
+++ b/offapi/com/sun/star/xml/dom/XComment.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XComment_idl__
#define __com_sun_star_xml_dom_XCComment_idl__
-#ifndef __com_sun_star_xml_dom_XCharacterData_idl__
#include <com/sun/star/xml/dom/XCharacterData.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDOMImplementation.idl b/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
index f8003fce26e2..56f7ceda68e6 100644
--- a/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
+++ b/offapi/com/sun/star/xml/dom/XDOMImplementation.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__
#define __com_sun_star_xml_dom_XDOMImplementation_idl__
-#ifndef __com_sun_star_uno__XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_DOMException_idl__
#include <com/sun/star/xml/dom/DOMException.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDocument.idl b/offapi/com/sun/star/xml/dom/XDocument.idl
index 6bd105d8e06c..d64eb18fc290 100644
--- a/offapi/com/sun/star/xml/dom/XDocument.idl
+++ b/offapi/com/sun/star/xml/dom/XDocument.idl
@@ -28,33 +28,15 @@
#ifndef __com_sun_star_xml_dom_XDocument_idl__
#define __com_sun_star_xml_dom_XDocument_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XAttr_idl__
#include <com/sun/star/xml/dom/XAttr.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XCDATASection_idl__
#include <com/sun/star/xml/dom/XCDATASection.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XComment_idl__
#include <com/sun/star/xml/dom/XComment.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDocumentFragemnt_idl__
#include <com/sun/star/xml/dom/XDocumentFragment.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XEntityReference_idl__
#include <com/sun/star/xml/dom/XEntityReference.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XProcessingInstruction_idl__
#include <com/sun/star/xml/dom/XProcessingInstruction.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDocumentType_idl__
#include <com/sun/star/xml/dom/XDocumentType.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__
#include <com/sun/star/xml/dom/XDOMImplementation.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
index e2245e9d3153..a72625c6cfd6 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentBuilder.idl
@@ -28,35 +28,16 @@
#ifndef __com_sun_star_xml_dom_XDocumentBuilder_idl__
#define __com_sun_star_xml_dom_XDocumentBuilder_idl__
-#ifndef __com_sun_star_uno__XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
#include <com/sun/star/xml/dom/XDocumentType.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDOMImplementation_idl__
#include <com/sun/star/xml/dom/XDOMImplementation.idl>
-#endif
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
#include <com/sun/star/xml/sax/XErrorHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
#include <com/sun/star/xml/sax/XEntityResolver.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDocumentFragment.idl b/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
index cbc8af63b923..5a48224e4b23 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentFragment.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XDocumentFragment_idl__
#define __com_sun_star_xml_dom_XDocumentFragment_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XDocumentType.idl b/offapi/com/sun/star/xml/dom/XDocumentType.idl
index ce6495214bcf..cd4c46573ce5 100644
--- a/offapi/com/sun/star/xml/dom/XDocumentType.idl
+++ b/offapi/com/sun/star/xml/dom/XDocumentType.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xml_dom_XDocumentType_idl__
#define __com_sun_star_xml_dom_XDocumentType_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__
#include <com/sun/star/xml/dom/XNamedNodeMap.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XElement.idl b/offapi/com/sun/star/xml/dom/XElement.idl
index dc0373467a53..f0869b708124 100644
--- a/offapi/com/sun/star/xml/dom/XElement.idl
+++ b/offapi/com/sun/star/xml/dom/XElement.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xml_dom_XElement_idl__
#define __com_sun_star_xml_dom_XElement_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XAttr_idl__
#include <com/sun/star/xml/dom/XAttr.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XEntity.idl b/offapi/com/sun/star/xml/dom/XEntity.idl
index 7396a42aa190..3352ae002a49 100644
--- a/offapi/com/sun/star/xml/dom/XEntity.idl
+++ b/offapi/com/sun/star/xml/dom/XEntity.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XEntety_idl__
#define __com_sun_star_xml_dom_XEntety_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XEntityReference.idl b/offapi/com/sun/star/xml/dom/XEntityReference.idl
index cec97fdf0219..9650fbe55854 100644
--- a/offapi/com/sun/star/xml/dom/XEntityReference.idl
+++ b/offapi/com/sun/star/xml/dom/XEntityReference.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XEntetyReference_idl__
#define __com_sun_star_xml_dom_XEntetyReference_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl b/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
index d5ea97e1ef69..c09a63e0c83b 100644
--- a/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
+++ b/offapi/com/sun/star/xml/dom/XNamedNodeMap.idl
@@ -28,12 +28,8 @@
#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__
#define __com_sun_star_xml_dom_XNamedNodeMap_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_DOMException_idl__
#include <com/sun/star/xml/dom/DOMException.idl>
-#endif
module com { module sun { module star { module xml { module dom {
@@ -48,7 +44,7 @@ interface XNamedNodeMap : com::sun::star::uno::XInterface
long getLength();
/**
- Retrieves a node specified by local name
+ Retrieves a node specified by local name.
*/
XNode getNamedItem([in] string name);
@@ -58,7 +54,7 @@ interface XNamedNodeMap : com::sun::star::uno::XInterface
XNode getNamedItemNS([in] string namespaceURI,[in] string localName);
/**
- Returns the indexth item in the map.
+ Returns a node specified by index.
*/
XNode item([in] long index);
diff --git a/offapi/com/sun/star/xml/dom/XNode.idl b/offapi/com/sun/star/xml/dom/XNode.idl
index 7f7ffc14aa0e..b60a24796f52 100644
--- a/offapi/com/sun/star/xml/dom/XNode.idl
+++ b/offapi/com/sun/star/xml/dom/XNode.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_xml_dom_XNode_idl__
#define __com_sun_star_xml_dom_XNode_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_NodeType_idl__
#include <com/sun/star/xml/dom/NodeType.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__
#include <com/sun/star/xml/dom/XNodeList.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNamedNodeMap_idl__
#include <com/sun/star/xml/dom/XNamedNodeMap.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XNodeList.idl b/offapi/com/sun/star/xml/dom/XNodeList.idl
index a59d2aa7a70a..13ae64f35628 100644
--- a/offapi/com/sun/star/xml/dom/XNodeList.idl
+++ b/offapi/com/sun/star/xml/dom/XNodeList.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XNodeList_idl__
#define __com_sun_star_xml_dom_XNodeList_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
module com { module sun { module star { module xml { module dom {
@@ -44,7 +42,7 @@ interface XNodeList : com::sun::star::uno::XInterface
*/
long getLength();
/**
- Returns the indexth item in the collection.
+ Returns a node specified by index in the collection.
*/
XNode item([in] long index);
};
diff --git a/offapi/com/sun/star/xml/dom/XNotation.idl b/offapi/com/sun/star/xml/dom/XNotation.idl
index 6198cdd491e9..415e7da0d5d6 100644
--- a/offapi/com/sun/star/xml/dom/XNotation.idl
+++ b/offapi/com/sun/star/xml/dom/XNotation.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XNotation_idl__
#define __com_sun_star_xml_dom_XNotation_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl b/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
index 48277fc4a5c8..cf329f8c3988 100644
--- a/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
+++ b/offapi/com/sun/star/xml/dom/XProcessingInstruction.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XProcessingInstruction_idl__
#define __com_sun_star_xml_dom_XProcessingInstruction_idl__
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
index 05fafa20fc9f..7b84712eb06e 100644
--- a/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.idl
@@ -28,19 +28,10 @@
#ifndef __com_sun_star_xml_dom_XSAXDocumentBuilder_idl__
#define __com_sun_star_xml_dom_XSAXDocumentBuilder_idl__
-#ifndef __com_sun_star_uno__XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_dom_XDocument_idl__
#include <com/sun/star/xml/dom/XDocument.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XDocumentFragment_idl__
#include <com/sun/star/xml/dom/XDocumentFragment.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_SAXDocumentBuilderState_idl__
#include <com/sun/star/xml/dom/SAXDocumentBuilderState.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/XText.idl b/offapi/com/sun/star/xml/dom/XText.idl
index 8d12d1466cdd..bc009f2f65cd 100644
--- a/offapi/com/sun/star/xml/dom/XText.idl
+++ b/offapi/com/sun/star/xml/dom/XText.idl
@@ -28,9 +28,7 @@
#ifndef __com_sun_star_xml_dom_XText_idl__
#define __com_sun_star_xml_dom_XText_idl__
-#ifndef __com_sun_star_xml_dom_XCharacterData_idl__
#include <com/sun/star/xml/dom/XCharacterData.idl>
-#endif
module com { module sun { module star { module xml { module dom {
diff --git a/offapi/com/sun/star/xml/dom/events/EventException.idl b/offapi/com/sun/star/xml/dom/events/EventException.idl
index e05e7c7623d2..e1a04208037c 100644
--- a/offapi/com/sun/star/xml/dom/events/EventException.idl
+++ b/offapi/com/sun/star/xml/dom/events/EventException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_dom_events_EventException_idl__
#define __com_sun_star_xml_dom_events_EventException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module xml { module dom { module events {
diff --git a/offapi/com/sun/star/xml/dom/events/EventType.idl b/offapi/com/sun/star/xml/dom/events/EventType.idl
index d0b10c05765e..1a1226c08063 100644
--- a/offapi/com/sun/star/xml/dom/events/EventType.idl
+++ b/offapi/com/sun/star/xml/dom/events/EventType.idl
@@ -50,7 +50,7 @@ enum EventType
DOMActivate,
/*
- The activate event occurs when an element is activated, for instance, thru a mouse click or a keypress. A numerical argument is provided to give an indication of the type of activation that occurs: 1 for a simple activation (e.g. a simple click or Enter), 2 for hyperactivation (for instance a double click or Shift Enter).
+ The activate event occurs when an element is activated, for instance, through a mouse click or a key press. A numerical argument is provided to give an indication of the type of activation that occurs: 1 for a simple activation (e.g. a simple click or Enter), 2 for hyper activation (for instance a double click or Shift Enter).
* Bubbles: Yes
* Cancelable: Yes
* Context Info: detail (the numerical value)
@@ -115,7 +115,7 @@ enum EventType
DOMSubtreeModified,
/*
- This is a general event for notification of all changes to the document. It can be used instead of the more specific events listed below. It may be fired after a single modification to the document or, at the implementation's discretion, after multiple changes have occurred. The latter use should generally be used to accomodate multiple changes which occur either simultaneously or in rapid succession. The target of this event is the lowest common parent of the changes which have taken place. This event is dispatched after any other events caused by the mutation have fired.
+ This is a general event for notification of all changes to the document. It can be used instead of the more specific events listed below. It may be fired after a single modification to the document or, at the implementation's discretion, after multiple changes have occurred. The latter use should generally be used to accommodate multiple changes which occur either simultaneously or in rapid succession. The target of this event is the lowest common parent of the changes which have taken place. This event is dispatched after any other events caused by the mutation have fired.
* Bubbles: Yes
* Cancelable: No
* Context Info: None
diff --git a/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl b/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
index 724ea388fd75..f1ccdde43798 100644
--- a/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
+++ b/offapi/com/sun/star/xml/dom/events/XMutationEvent.idl
@@ -32,7 +32,6 @@
#include <com/sun/star/xml/dom/events/XEvent.idl>
#include <com/sun/star/xml/dom/events/XEventTarget.idl>
#include <com/sun/star/xml/dom/events/XEventListener.idl>
-
#include <com/sun/star/xml/dom/XNode.idl>
module com { module sun { module star { module xml { module dom { module events {
diff --git a/offapi/com/sun/star/xml/input/XAttributes.idl b/offapi/com/sun/star/xml/input/XAttributes.idl
index 2e026da99662..4008f32adfd5 100644
--- a/offapi/com/sun/star/xml/input/XAttributes.idl
+++ b/offapi/com/sun/star/xml/input/XAttributes.idl
@@ -54,12 +54,12 @@ interface XAttributes : com::sun::star::uno::XInterface
*/
long getIndexByQName( [in] string qName );
- /** Gets attribute index passing a namespace uid and a localname.
+ /** Gets attribute index passing a namespace uid and a local name.
@param uid
namespace uid
@param localName
- localname
+ local name
@return
attribute index or -1, if not found
*/
@@ -83,12 +83,12 @@ interface XAttributes : com::sun::star::uno::XInterface
*/
long getUidByIndex( [in] long nIndex );
- /** Gets the localname of an attribute.
+ /** Gets the local name of an attribute.
@param nIndex
index
@return
- localname of attribute or empty string, if invalid index
+ local name of attribute or empty string, if invalid index
*/
string getLocalNameByIndex( [in] long nIndex );
@@ -101,14 +101,14 @@ interface XAttributes : com::sun::star::uno::XInterface
*/
string getValueByIndex( [in] long nIndex );
- /** For convenience: Gets the value of an attribute passing uid, localname.
+ /** For convenience: Gets the value of an attribute passing uid, local name.
@param uid
namespace uid
@param localName
- localname
+ local name
@return
- value string or empty string, if invalid uid/localname
+ value string or empty string, if invalid uid/local name
*/
string getValueByUidName( [in] long uid, [in] string localName );
diff --git a/offapi/com/sun/star/xml/input/XElement.idl b/offapi/com/sun/star/xml/input/XElement.idl
index 3c151cf4eed3..c0806d078182 100644
--- a/offapi/com/sun/star/xml/input/XElement.idl
+++ b/offapi/com/sun/star/xml/input/XElement.idl
@@ -46,10 +46,10 @@ interface XElement : com::sun::star::uno::XInterface
*/
XElement getParent();
- /** Gets the localname of this element.
+ /** Gets the local name of this element.
@return
- localname of this element
+ local name of this element
*/
string getLocalName();
@@ -67,12 +67,12 @@ interface XElement : com::sun::star::uno::XInterface
*/
XAttributes getAttributes();
- /** Called upon each occuring child element.
+ /** Called upon each occurring child element.
@param uid
namespace uid of element
@param localName
- localname of element
+ local name of element
@param xAttributes
attributes of element
@return
diff --git a/offapi/com/sun/star/xml/input/XRoot.idl b/offapi/com/sun/star/xml/input/XRoot.idl
index 41bfefc2a76f..626a0301e09a 100644
--- a/offapi/com/sun/star/xml/input/XRoot.idl
+++ b/offapi/com/sun/star/xml/input/XRoot.idl
@@ -83,7 +83,7 @@ interface XRoot : com::sun::star::uno::XInterface
@param uid
namespace uid of element
@param localName
- localname of element
+ local name of element
@param xAattributes
attributes of element
*/
diff --git a/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl b/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
index fae70b3c84c0..c5d1b7ab4b7b 100644
--- a/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
+++ b/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_FastShapeContextHandler_idl__
#define __com_sun_star_xml_sax_FastShapeContextHandler_idl__
-#ifndef __com_sun_star_xml_sax_XFastShapeContextHandler_idl__
#include <com/sun/star/xml/sax/XFastShapeContextHandler.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/FastToken.idl b/offapi/com/sun/star/xml/sax/FastToken.idl
index baec31bb7fb9..9a1d74bf4da8 100644
--- a/offapi/com/sun/star/xml/sax/FastToken.idl
+++ b/offapi/com/sun/star/xml/sax/FastToken.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_XFastToken_idl__
#define __com_sun_star_xml_sax_XFastToken_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/InputSource.idl b/offapi/com/sun/star/xml/sax/InputSource.idl
index dafffbd31695..5445d6dfb294 100644
--- a/offapi/com/sun/star/xml/sax/InputSource.idl
+++ b/offapi/com/sun/star/xml/sax/InputSource.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_InputSource_idl__
#define __com_sun_star_xml_sax_InputSource_idl__
-#ifndef __com_sun_star_io_XInputStream_idl__
#include <com/sun/star/io/XInputStream.idl>
-#endif
//=============================================================================
@@ -58,7 +56,7 @@ published struct InputSource
//-------------------------------------------------------------------------
/** contains the encoding of the data stream. This is used by the parser
- to do unicode conversions.
+ to do Unicode conversions.
<p>Note that in general you do not need to specify an encoding.
Either it is UTF-8 or UTF-16 which is recognized by the parser
@@ -69,14 +67,14 @@ published struct InputSource
//-------------------------------------------------------------------------
- /** constains the public Id of the document, for example, needed in
+ /** contains the public Id of the document, for example, needed in
exception-message strings.
*/
string sPublicId;
//-------------------------------------------------------------------------
- /** contains the sytemID of the document.
+ /** contains the system ID of the document.
*/
string sSystemId;
};
diff --git a/offapi/com/sun/star/xml/sax/SAXException.idl b/offapi/com/sun/star/xml/sax/SAXException.idl
index e7257352fa45..649403ff0d29 100644
--- a/offapi/com/sun/star/xml/sax/SAXException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_SAXException_idl__
#define __com_sun_star_xml_sax_SAXException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl b/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
index 162d8b3cbb83..3f1c6f2a052d 100644
--- a/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_SAXInvalidCharacterException_idl__
#define __com_sun_star_xml_sax_SAXInvalidCharacterException_idl__
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
//=============================================================================
@@ -40,7 +38,7 @@ module com { module sun { module star { module xml { module sax {
/** stores information for locating the error in the original XML document.
- @see XLocater
+ @see XLocator
*/
published exception SAXInvalidCharacterException: com::sun::star::xml::sax::SAXException
{
diff --git a/offapi/com/sun/star/xml/sax/SAXParseException.idl b/offapi/com/sun/star/xml/sax/SAXParseException.idl
index 9c7993fb854c..c306472f69ac 100644
--- a/offapi/com/sun/star/xml/sax/SAXParseException.idl
+++ b/offapi/com/sun/star/xml/sax/SAXParseException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_SAXParseException_idl__
#define __com_sun_star_xml_sax_SAXParseException_idl__
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
//=============================================================================
@@ -40,7 +38,7 @@ module com { module sun { module star { module xml { module sax {
/** stores information for locating the error in the original XML document.
- @see XLocater
+ @see XLocator
*/
published exception SAXParseException: com::sun::star::xml::sax::SAXException
{
diff --git a/offapi/com/sun/star/xml/sax/XAttributeList.idl b/offapi/com/sun/star/xml/sax/XAttributeList.idl
index f7b24418410d..e671c6eb997f 100644
--- a/offapi/com/sun/star/xml/sax/XAttributeList.idl
+++ b/offapi/com/sun/star/xml/sax/XAttributeList.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_XAttributeList_idl__
#define __com_sun_star_xml_sax_XAttributeList_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XDTDHandler.idl b/offapi/com/sun/star/xml/sax/XDTDHandler.idl
index 184850386f11..44168ac406fc 100644
--- a/offapi/com/sun/star/xml/sax/XDTDHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XDTDHandler.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__
#define __com_sun_star_xml_sax_XDTDHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
index 6586ba99a66b..210b8c6ec557 100644
--- a/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XDocumentHandler.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#define __com_sun_star_xml_sax_XDocumentHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XAttributeList_idl__
#include <com/sun/star/xml/sax/XAttributeList.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XLocator_idl__
#include <com/sun/star/xml/sax/XLocator.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XEntityResolver.idl b/offapi/com/sun/star/xml/sax/XEntityResolver.idl
index 0638f72ba94c..c850f3e702e1 100644
--- a/offapi/com/sun/star/xml/sax/XEntityResolver.idl
+++ b/offapi/com/sun/star/xml/sax/XEntityResolver.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
#define __com_sun_star_xml_sax_XEntityResolver_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
#include <com/sun/star/xml/sax/InputSource.idl>
-#endif
//=============================================================================
@@ -42,12 +38,12 @@ module com { module sun { module star { module xml { module sax {
//=============================================================================
-/** makes it possible to modify the behaviour of resolving external
+/** makes it possible to modify the behavior of resolving external
preferences.
- <p>Usually, the parser has a default behaviour of resolving external
+ <p>Usually, the parser has a default behavior of resolving external
references (See documentation of the parser implementation).
- Use this interface to modify or reimplement this behaviour.</p>
+ Use this interface to modify or reimplement this behavior.</p>
*/
published interface XEntityResolver: com::sun::star::uno::XInterface
{
@@ -58,7 +54,7 @@ published interface XEntityResolver: com::sun::star::uno::XInterface
<p>If <var>aInputStream</var> is a valid reference to an input stream,
the parser uses this <type>InputSource</type>. Otherwise the
- parser seeks for the entity using its default behaviour.
+ parser seeks for the entity using its default behavior.
*/
InputSource resolveEntity( [in] string sPublicId, [in] string sSystemId );
diff --git a/offapi/com/sun/star/xml/sax/XErrorHandler.idl b/offapi/com/sun/star/xml/sax/XErrorHandler.idl
index 2d799fc6afdc..87a4b33dfe8f 100644
--- a/offapi/com/sun/star/xml/sax/XErrorHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XErrorHandler.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
#define __com_sun_star_xml_sax_XErrorHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
index 5801a22a2517..d1f04f801b4a 100644
--- a/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl
@@ -27,13 +27,9 @@
#ifndef __com_sun_star_xml_sax_XExtendedDocumentHandler_idl__
#define __com_sun_star_xml_sax_XExtendedDocumentHandler_idl__
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XFastAttributeList.idl b/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
index 5fa78b81d393..baafcc24e435 100644
--- a/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
+++ b/offapi/com/sun/star/xml/sax/XFastAttributeList.idl
@@ -27,21 +27,10 @@
#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__
#define __com_sun_star_xml_sax_XFastAttributeList_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_Attribute_idl__
#include <com/sun/star/xml/Attribute.idl>
-#endif
-
-#ifndef __com_sun_star_xml_FastAttribute_idl__
#include <com/sun/star/xml/FastAttribute.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
//=============================================================================
@@ -49,9 +38,9 @@ module com { module sun { module star { module xml { module sax {
//=============================================================================
-/** a container for the attributes of an xml element.
+/** a container for the attributes of an XML element.
- <br>Attributes are seperated into known attributes and unknown attributes.
+ <br>Attributes are separated into known attributes and unknown attributes.
<p>Known attributes have a local name that is known to the <type>XFastTokenHandler</token>
registered at the <type>XFastParser</type> which created the sax event containing
this attributes. If an attribute also has a namespace, that must be registered
diff --git a/offapi/com/sun/star/xml/sax/XFastContextHandler.idl b/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
index 22feebe6f5a0..19c71e696d1a 100644
--- a/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastContextHandler.idl
@@ -27,21 +27,13 @@
#ifndef __com_sun_star_xml_sax_XFastContextHandler_idl__
#define __com_sun_star_xml_sax_XFastContextHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__
#include <com/sun/star/xml/sax/XFastAttributeList.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XLocator_idl__
#include <com/sun/star/xml/sax/XLocator.idl>
-#endif
//=============================================================================
@@ -104,7 +96,7 @@ interface XFastContextHandler: com::sun::star::uno::XInterface
//-------------------------------------------------------------------------
- /** receives notification of the end of an kown element.
+ /** receives notification of the end of an known element.
@see startUnknownElement
*/
void endUnknownElement( [in] string Namespace, [in] string Name )
diff --git a/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl b/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
index a4b5c94b8142..a9e2e74dcced 100644
--- a/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastDocumentHandler.idl
@@ -27,25 +27,13 @@
#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__
#define __com_sun_star_xml_sax_XFastDocumentHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XFastAttributeList_idl__
#include <com/sun/star/xml/sax/XFastAttributeList.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastContextHandler_idl__
#include <com/sun/star/xml/sax/XFastContextHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XLocator_idl__
#include <com/sun/star/xml/sax/XLocator.idl>
-#endif
//=============================================================================
@@ -61,14 +49,14 @@ interface XFastDocumentHandler: XFastContextHandler
{
//-------------------------------------------------------------------------
- /** called by the parser when parsing of an xml stream is started.
+ /** called by the parser when parsing of an XML stream is started.
*/
void startDocument()
raises( com::sun::star::xml::sax::SAXException );
//-------------------------------------------------------------------------
- /** called by the parser after the last xml element of a stream is processed.
+ /** called by the parser after the last XML element of a stream is processed.
*/
void endDocument()
raises( com::sun::star::xml::sax::SAXException );
diff --git a/offapi/com/sun/star/xml/sax/XFastParser.idl b/offapi/com/sun/star/xml/sax/XFastParser.idl
index 037aa01f913b..07a0a24c2d62 100644
--- a/offapi/com/sun/star/xml/sax/XFastParser.idl
+++ b/offapi/com/sun/star/xml/sax/XFastParser.idl
@@ -27,49 +27,25 @@
#ifndef __com_sun_star_xml_sax_XFastParser_idl__
#define __com_sun_star_xml_sax_XFastParser_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
#include <com/sun/star/xml/sax/InputSource.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__
#include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
#include <com/sun/star/xml/sax/XFastTokenHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
#include <com/sun/star/xml/sax/XErrorHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__
#include <com/sun/star/xml/sax/XDTDHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
#include <com/sun/star/xml/sax/XEntityResolver.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
//=============================================================================
@@ -77,19 +53,19 @@ module com { module sun { module star { module xml { module sax {
//=============================================================================
-/** specifies a SAX parser that uses integer values for known xml names
+/** specifies a SAX parser that uses integer values for known XML names
(elements, attributes and attribute values). The parser also handles
- namespaces and allows to have individual contexts for each xml element.
+ namespaces and allows to have individual contexts for each XML element.
<p>Before parsing is possible you have to set your
<type>XFastDocumentHandler</type> using <member>setFastDocumentHandler</member>.
<p>Parsing starts with calling <member>parseStream</member>. If the parser
- finds a valid xml file with the given <type>InputSource</type>, it calls
+ finds a valid XML file with the given <type>InputSource</type>, it calls
<member>XFastDocumentHandler::startDocument</member> first.
- <p>This parser generates either 'fast' events that use integer token
- values for namespaces, elements and attributes or 'unknown' events for
+ <p>This parser generates either "fast" events that use integer token
+ values for namespaces, elements and attributes or "unknown" events for
elements that are unknown.
<p>A namespace is unknown if the namespace URL was not registered with
@@ -102,7 +78,7 @@ module com { module sun { module star { module xml { module sax {
<p>Setting a <type>XFastTokenHandler</type> with <member>setTokenHandler</member>
is optional, but without a <type>XFastTokenHandler</type> you will only
- get unknown sax events. This can be usefull if you are only interested
+ get unknown sax events. This can be useful if you are only interested
in the namespace handling and/or the context feature.
<p>For each element the parser sends a create child element event to the
@@ -114,7 +90,7 @@ module com { module sun { module star { module xml { module sax {
itself.
<p>If the parent context returns an empty reference, no further events for
- the element and all of its childs are created.
+ the element and all of its children are created.
<p>If a valid context is returned this context gets a start event by a call to
<member>XFastContextHandler::startFastElement</member> for known elements or
@@ -153,7 +129,7 @@ interface XFastParser: com::sun::star::uno::XInterface
//-------------------------------------------------------------------------
- /** must be registered to translate known xml names to integer tokens.
+ /** must be registered to translate known XML names to integer tokens.
*/
void setTokenHandler( [in] XFastTokenHandler Handler );
@@ -187,6 +163,11 @@ interface XFastParser: com::sun::star::uno::XInterface
errors will be presented to the user.</p>
*/
void setLocale( [in] com::sun::star::lang::Locale locale );
+
+ /** Gets the namespace url string.
+ */
+ string getNamespaceURL( [in] string prefix )
+ raises( com::sun::star::lang::IllegalArgumentException );
};
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
index 949d8ef2386b..aa35a92a9896 100644
--- a/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
+++ b/offapi/com/sun/star/xml/sax/XFastSAXSerializable.idl
@@ -28,21 +28,10 @@
#ifndef __com_sun_star_xml_sax_XFastSAXSerializable_idl__
#define __com_sun_star_xml_sax_XFastSAXSerializable_idl__
-#ifndef __com_sun_star_xml_sax_XFastDocumentHandler_idl__
#include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
#include <com/sun/star/xml/sax/XFastTokenHandler.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__
#include <com/sun/star/beans/StringPair.idl>
-#endif
-
-#ifndef __com_sun_star_beans_Pair_idl__
#include <com/sun/star/beans/Pair.idl>
-#endif
module com { module sun { module star { module xml { module sax {
diff --git a/offapi/com/sun/star/xml/sax/XFastSerializer.idl b/offapi/com/sun/star/xml/sax/XFastSerializer.idl
index 3c61d0ffcbf4..fa747d3d8474 100644
--- a/offapi/com/sun/star/xml/sax/XFastSerializer.idl
+++ b/offapi/com/sun/star/xml/sax/XFastSerializer.idl
@@ -27,26 +27,11 @@
#ifndef __com_sun_star_xml_sax_XFastSerializer_idl__
#define __com_sun_star_xml_sax_XFastSerializer_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastDocumentHanlder_idl__
#include <com/sun/star/xml/sax/XFastDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_io_XOutputStream_idl__
#include <com/sun/star/io/XOutputStream.idl>
-#endif
-
-#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
#include <com/sun/star/xml/sax/XFastTokenHandler.idl>
-#endif
-
//=============================================================================
@@ -60,14 +45,14 @@ interface XFastSerializer: com::sun::star::uno::XInterface
{
//-------------------------------------------------------------------------
- /** called by the parser when parsing of an xml stream is started.
+ /** called by the parser when parsing of an XML stream is started.
*/
void startDocument()
raises( com::sun::star::xml::sax::SAXException );
//-------------------------------------------------------------------------
- /** called by the parser after the last xml element of a stream is processed.
+ /** called by the parser after the last XML element of a stream is processed.
*/
void endDocument()
raises( com::sun::star::xml::sax::SAXException );
diff --git a/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl b/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
index e4af64500b6c..68fe416663c8 100644
--- a/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_XFastTokenHandler_idl__
#define __com_sun_star_xml_sax_XFastTokenHandler_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
@@ -37,10 +35,10 @@ module com { module sun { module star { module xml { module sax {
//============================================================================
-/** interface to translate xml strings to integer tokens.
+/** interface to translate XML strings to integer tokens.
<p>An instance of this interface can be registered at a <type>XFastParser</type>.
- It should be able to translate all xml names (element local names,
+ It should be able to translate all XML names (element local names,
attribute local names and constant attribute values) to integer tokens.
A token value must be greater or equal to zero and less than
@@ -70,7 +68,7 @@ interface XFastTokenHandler: com::sun::star::uno::XInterface
/** returns a integer token for the given string
@param Identifier
- the string given as a byte sequence encoded in UTF8
+ the string given as a byte sequence encoded in UTF-8
@returns
a unique integer token for the given String or <const>FastToken::DONTKNOW</const>
@@ -81,7 +79,7 @@ interface XFastTokenHandler: com::sun::star::uno::XInterface
//-------------------------------------------------------------------------
/** returns a identifier for the given integer token as a byte
- sequence encoded in UTF8.
+ sequence encoded in UTF-8.
*/
sequence< byte > getUTF8Identifier( [in] long Token );
};
diff --git a/offapi/com/sun/star/xml/sax/XLocator.idl b/offapi/com/sun/star/xml/sax/XLocator.idl
index e77d83000f8a..81139a153b1c 100644
--- a/offapi/com/sun/star/xml/sax/XLocator.idl
+++ b/offapi/com/sun/star/xml/sax/XLocator.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_sax_XLocator_idl__
#define __com_sun_star_xml_sax_XLocator_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XParser.idl b/offapi/com/sun/star/xml/sax/XParser.idl
index 0d29af5d6562..bab4475f1229 100644
--- a/offapi/com/sun/star/xml/sax/XParser.idl
+++ b/offapi/com/sun/star/xml/sax/XParser.idl
@@ -27,41 +27,23 @@
#ifndef __com_sun_star_xml_sax_XParser_idl__
#define __com_sun_star_xml_sax_XParser_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_InputSource_idl__
#include <com/sun/star/xml/sax/InputSource.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_SAXException_idl__
#include <com/sun/star/xml/sax/SAXException.idl>
-#endif
-#ifndef __com_sun_star_io_IOException_idl__
#include <com/sun/star/io/IOException.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XErrorHandler_idl__
#include <com/sun/star/xml/sax/XErrorHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XDTDHandler_idl__
#include <com/sun/star/xml/sax/XDTDHandler.idl>
-#endif
-#ifndef __com_sun_star_xml_sax_XEntityResolver_idl__
#include <com/sun/star/xml/sax/XEntityResolver.idl>
-#endif
-#ifndef __com_sun_star_lang_Locale_idl__
#include <com/sun/star/lang/Locale.idl>
-#endif
//=============================================================================
diff --git a/offapi/com/sun/star/xml/sax/XSAXSerializable.idl b/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
index 94af79fc1444..065fec06668b 100644
--- a/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
+++ b/offapi/com/sun/star/xml/sax/XSAXSerializable.idl
@@ -28,13 +28,8 @@
#ifndef __com_sun_star_xml_sax_XSAXSerializable_idl__
#define __com_sun_star_xml_sax_XSAXSerializable_idl__
-#ifndef __com_sun_star_xml_sax_XDocumentHandler_idl__
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#endif
-
-#ifndef __com_sun_star_beans_StringPair_idl__
#include <com/sun/star/beans/StringPair.idl>
-#endif
module com { module sun { module star { module xml { module sax {
diff --git a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
index 8fb0ed67d17a..e5aa2075e232 100644
--- a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl>
-
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
index 3a5edca4325e..9f457bff5ac1 100644
--- a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -34,9 +34,7 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
-
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
-
#include <com/sun/star/lang/XUnoTunnel.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XServiceInfo.idl>
diff --git a/offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl b/offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl
index 2145c23a941b..996e76a6fefa 100644
--- a/offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -46,11 +46,11 @@ interface XXMLElementWrapper;
* When converting SAX events into a DOM tree, this interface is
* used to manipulate the DOM data in UNO perspective.
* <p>
- * Every lauguage has its own methods to manipulate its native DOM
+ * Every language has its own methods to manipulate its native DOM
* data structure, this interface provides a common method set which
- * each lauguage have to implement.
+ * each language have to implement.
* <p>
- * In another word, this interface wraps language dependant methods,
+ * In another word, this interface wraps language dependent methods,
* then other component can manipulate DOM data through UNO methods.
*/
interface XXMLDocumentWrapper : com::sun::star::uno::XInterface
@@ -153,7 +153,7 @@ interface XXMLDocumentWrapper : com::sun::star::uno::XInterface
/**
* Converts the whole DOM tree into a SAX event stream.
*
- * @param handler the document handelr which will receive the SAX event
+ * @param handler the document handler which will receive the SAX event
* stream
*/
void getTree([in] com::sun::star::xml::sax::XDocumentHandler handler)
diff --git a/offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl b/offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl
index ef19b64826c7..95f536abf8ef 100644
--- a/offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XXMLElementWrapper.idl
@@ -25,7 +25,7 @@
*
************************************************************************/
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -41,7 +41,7 @@ module com { module sun { module star { module xml { module wrapper {
* Interface of XML Element Wrapper.
* <p>
* This interface is used to wrap a element information, which
- * make it enable to tranfer the element information between
+ * make it enable to transfer the element information between
* different languages, such as C++/Java.
*/
interface XXMLElementWrapper : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/xml/xpath/XPathAPI.idl b/offapi/com/sun/star/xml/xpath/XPathAPI.idl
index 67d771b3ea66..99842d95492f 100644
--- a/offapi/com/sun/star/xml/xpath/XPathAPI.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathAPI.idl
@@ -1,8 +1,6 @@
#ifndef __com_sun_star_xml_xpath_XPathExtension_idl__
#define __com_sun_star_xml_xpath_XPathExtension_idl__
-#ifndef __com_sun_star_xml_xpath_XXPathAPI_idl
#include <com/sun/star/xml/xpath/XXPathAPI.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
service XPathExtension
diff --git a/offapi/com/sun/star/xml/xpath/XPathException.idl b/offapi/com/sun/star/xml/xpath/XPathException.idl
index 37ee4eb789bb..2c36d2668745 100644
--- a/offapi/com/sun/star/xml/xpath/XPathException.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathException.idl
@@ -27,9 +27,7 @@
#ifndef __com_sun_star_xml_XPath_XPathException_idl__
#define __com_sun_star_xml_XPath_XPathException_idl__
-#ifndef __com_sun_star_uno_Exception_idl__
#include <com/sun/star/uno/Exception.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
diff --git a/offapi/com/sun/star/xml/xpath/XPathExtension.idl b/offapi/com/sun/star/xml/xpath/XPathExtension.idl
index d286cc0a817e..e5c827b84b2f 100644
--- a/offapi/com/sun/star/xml/xpath/XPathExtension.idl
+++ b/offapi/com/sun/star/xml/xpath/XPathExtension.idl
@@ -1,8 +1,6 @@
#ifndef __com_sun_star_xml_xpath_XPathExtension_idl__
#define __com_sun_star_xml_xpath_XPathExtension_idl__
-#ifndef __com_sun_star_xml_xpath_XXPathExtension_idl
#include <com/sun/star/xml/xpath/XXPathExtension.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
service XPathExtension
diff --git a/offapi/com/sun/star/xml/xpath/XXPathAPI.idl b/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
index e3501947cb4c..6a19b545c2da 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathAPI.idl
@@ -28,24 +28,12 @@
#ifndef __com_sun_star_xml_XPath_XXPathAPI_idl__
#define __com_sun_star_xml_XPath_XXPathAPI_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__
#include <com/sun/star/xml/dom/XNodeList.idl>
-#endif
-#ifndef __com_sun_star_xml_xpath_XXPathObject_idl__
#include <com/sun/star/xml/xpath/XXPathObject.idl>
-#endif
-#ifndef __com_sun_star_xml_xpath_XXPathExtension_idl__
#include <com/sun/star/xml/xpath/XXPathExtension.idl>
-#endif
-#ifndef __com_sun_star_xml_XPath_XPathException_idl__
#include <com/sun/star/xml/xpath/XPathException.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
@@ -66,7 +54,7 @@ interface XXPathAPI : com::sun::star::uno::XInterface
void registerExtensionInstance(
[in] com::sun::star::xml::xpath::XXPathExtension aExtension);
- /** Eval XPath Expression.
+ /** Evaluate XPath Expression.
@param contextNode
the context node (expression is relative to this node)
@@ -87,7 +75,7 @@ interface XXPathAPI : com::sun::star::uno::XInterface
[in] string expr)
raises( com::sun::star::xml::xpath::XPathException );
- /** Eval XPath Expression.
+ /** Evaluate XPath Expression.
@param contextNode
the context node (expression is relative to this node)
diff --git a/offapi/com/sun/star/xml/xpath/XXPathExtension.idl b/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
index 527c37ba46f3..016439e6c78e 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathExtension.idl
@@ -27,12 +27,8 @@
#ifndef __com_sun_star_xml_XPath_XXPathExtension_idl__
#define __com_sun_star_xml_XPath_XXPathExtension_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com__sun_star_xml_xpath_Libxml2ExtensionHandle_idl__
#include <com/sun/star/xml/xpath/Libxml2ExtensionHandle.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
diff --git a/offapi/com/sun/star/xml/xpath/XXPathObject.idl b/offapi/com/sun/star/xml/xpath/XXPathObject.idl
index 3371a17fe93c..a1ef71ff8762 100644
--- a/offapi/com/sun/star/xml/xpath/XXPathObject.idl
+++ b/offapi/com/sun/star/xml/xpath/XXPathObject.idl
@@ -28,18 +28,10 @@
#ifndef __com_sun_star_xml_XPath_XXPathObject_idl__
#define __com_sun_star_xml_XPath_XXPathObject_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNode_idl__
#include <com/sun/star/xml/dom/XNode.idl>
-#endif
-#ifndef __com_sun_star_xml_dom_XNodeList_idl__
#include <com/sun/star/xml/dom/XNodeList.idl>
-#endif
-#ifndef __com_sun_star_xml_XPath_XObjectType_idl__
#include <com/sun/star/xml/xpath/XPathObjectType.idl>
-#endif
module com { module sun { module star { module xml { module xpath {
@@ -52,7 +44,7 @@ interface XXPathObject : com::sun::star::uno::XInterface
XPathObjectType getObjectType();
/**
- get the nodes from a nodelist type object
+ get the nodes from a node list type object
*/
com::sun::star::xml::dom::XNodeList getNodeList();