Merge branch 'master' into feature/gnumake4

Conflicts:
	xmlreader/prj/d.lst

25 files changed, 32 insertions, 43 deletions

diff --git a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
index 9d3042cd6..ebb07a3f5 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 c8b1df18d..70e9c1fe0 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 e8660a500..475065719 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 3e76d28b5..2f302830a 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 26ea5e8c6..6ea35087a 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 33fd496a5..619c78ebb 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 4293e91fd..6bfa76610 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 e831223b6..1a9ed354b 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 c8d6d08ea..654a1b9e7 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 4cc581120..82f55f566 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 3e1a4c80e..00dcdf34e 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 2a561a33c..8f46a3454 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 bb4d0803e..61e25f536 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 483d055e9..b4ca64630 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 550df9cdf..c0bab5775 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 1d53b81eb..1cd5dcbba 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 228455614..380da18e4 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 4c4ab83c1..e532ec539 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 4b274afe6..e136f8453 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 75535b21d..b0dfe8a18 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 bd09fcd34..fd27b0dd4 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 4c30f160e..a77785569 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 3094e53ff..4ebe6207b 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 41b0c7903..571030894 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 77424201d..cbfb54c77 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 -- **/