Resync to trunk, windows non-pro build aoo/aw080

9 files changed, 40 insertions, 40 deletions

diff --git a/ucbhelper/inc/ucbhelper/content.hxx b/ucbhelper/inc/ucbhelper/content.hxx
index 00f78ba3df88..024d9932a59a 100644
--- a/ucbhelper/inc/ucbhelper/content.hxx
+++ b/ucbhelper/inc/ucbhelper/content.hxx
@@ -246,7 +246,7 @@ public:
 
     /**
       * This method provides access to the "native" UCB content interface(s).
-      * This is usefull in case the convenience methods provided by this
+      * This is useful in case the convenience methods provided by this
       * class are insufficient for your needs. You may obtain all interfaces
       * supported by the underlying UCB content by calling this method and
       * after that doing a queryInterface call.
@@ -842,11 +842,11 @@ public:
       *        objects (See queryCreatableContentsInfo()).
       * @param rPropertyNames is a sequence of names of properties for that
       *        values are to set at the new content before it will be inserted
-      *        ( commited ).
+      *        ( committed ).
       *        The order of the names must correspond to the order of the
       *        property values.
       * @param rPropertyValues is a sequence of property values that are to
-      *        set at the new content before it will be inserted ( commited ).
+      *        set at the new content before it will be inserted ( committed ).
       *        The order of the values must correspond to the order of the
       *        property names.
       * @param rNewContent will be filled by the implementation of this method
@@ -875,11 +875,11 @@ public:
       *        objects (See queryCreatableContentsInfo()).
       * @param nPropertyHandes is a sequence of handles of properties for that
       *        values are to set at the new content before it will be inserted
-      *        ( commited ).
+      *        ( committed ).
       *        The order of the handles must correspond to the order of the
       *        property values.
       * @param rPropertyValues is a sequence of property values that are to
-      *        set at the new content before it will be inserted ( commited ).
+      *        set at the new content before it will be inserted ( committed ).
       *        The order of the values must correspond to the order of the
       *        property handles.
       * @param rNewContent will be filled by the implementation of this method
@@ -909,11 +909,11 @@ public:
       *        objects (See queryCreatableContentsInfo()).
       * @param rPropertyNames is a sequence of names of properties for that
       *        values are to set at the new content before it will be inserted
-      *        ( commited ).
+      *        ( committed ).
       *        The order of the names must correspond to the order of the
       *        property values.
       * @param rPropertyValues is a sequence of property values that are to
-      *        set at the new content before it will be inserted ( commited ).
+      *        set at the new content before it will be inserted ( committed ).
       *        The order of the values must correspond to the order of the
       *        property names.
       * @param rStream is a stream containing the content data for the new
@@ -947,11 +947,11 @@ public:
       *        objects (See queryCreatableContentsInfo()).
       * @param nPropertyHandes is a sequence of handles of properties for that
       *        values are to set at the new content before it will be inserted
-      *        ( commited ).
+      *        ( committed ).
       *        The order of the handles must correspond to the order of the
       *        property values.
       * @param rPropertyValues is a sequence of property values that are to
-      *        set at the new content before it will be inserted ( commited ).
+      *        set at the new content before it will be inserted ( committed ).
       *        The order of the values must correspond to the order of the
       *        property handles.
       * @param rStream is a stream containing the content data for the new
diff --git a/ucbhelper/inc/ucbhelper/interactionrequest.hxx b/ucbhelper/inc/ucbhelper/interactionrequest.hxx
index 7bfb5d37f4d2..12268edb659b 100644
--- a/ucbhelper/inc/ucbhelper/interactionrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/interactionrequest.hxx
@@ -50,7 +50,7 @@ struct InteractionRequest_Impl;
   * request contains an exception describing the error and a number of
   * interaction continuations describing the possible "answers" for the request.
   * After the request was passed to XInteractionHandler::handle(...) the method
-  * getSelection() returns the continuation choosen by the interaction handler.
+  * getSelection() returns the continuation chosen by the interaction handler.
   *
   * The typical usage of this class would be:
   *
@@ -125,9 +125,9 @@ public:
 
     /**
       * After passing this request to XInteractionHandler::handle, this method
-      * returns the continuation that was choosen by the interaction handler.
+      * returns the continuation that was chosen by the interaction handler.
       *
-      * @return the continuation choosen by an interaction handler or an empty
+      * @return the continuation chosen by an interaction handler or an empty
       *         reference, if the request was not (yet) handled.
       */
     rtl::Reference< InteractionContinuation > getSelection() const;
@@ -181,7 +181,7 @@ public:
 /**
   * This class implements a standard interaction continuation, namely the
   * interface XInteractionAbort. Instances of this class can be passed
-  * along with an interaction request to indicate the possiblity to abort
+  * along with an interaction request to indicate the possibility to abort
   * the operation that caused the request.
   */
 class UCBHELPER_DLLPUBLIC InteractionAbort : public InteractionContinuation,
@@ -218,7 +218,7 @@ public:
 /**
   * This class implements a standard interaction continuation, namely the
   * interface XInteractionRetry. Instances of this class can be passed
-  * along with an interaction request to indicate the possiblity to retry
+  * along with an interaction request to indicate the possibility to retry
   * the operation that caused the request.
   */
 class UCBHELPER_DLLPUBLIC InteractionRetry : public InteractionContinuation,
@@ -255,7 +255,7 @@ public:
 /**
   * This class implements a standard interaction continuation, namely the
   * interface XInteractionApprove. Instances of this class can be passed
-  * along with an interaction request to indicate the possiblity to approve
+  * along with an interaction request to indicate the possibility to approve
   * the request.
   */
 class UCBHELPER_DLLPUBLIC InteractionApprove : public InteractionContinuation,
@@ -292,7 +292,7 @@ public:
 /**
   * This class implements a standard interaction continuation, namely the
   * interface XInteractionDisapprove. Instances of this class can be passed
-  * along with an interaction request to indicate the possiblity to disapprove
+  * along with an interaction request to indicate the possibility to disapprove
   * the request.
   */
 class UCBHELPER_DLLPUBLIC InteractionDisapprove : public InteractionContinuation,
@@ -631,7 +631,7 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication(
 /**
   * This class implements a standard interaction continuation, namely the
   * interface XInteractionSupplyName. Instances of this class can be passed
-  * along with an interaction request to indicate the possiblity to
+  * along with an interaction request to indicate the possibility to
   * supply a new name.
   */
 class InteractionSupplyName : public InteractionContinuation,
@@ -684,7 +684,7 @@ public:
 /**
   * This class implements a standard interaction continuation, namely the
   * interface XInteractionReplaceExistingData. Instances of this class can be
-  * passed along with an interaction request to indicate the possiblity to
+  * passed along with an interaction request to indicate the possibility to
   * replace existing data.
   */
 class InteractionReplaceExistingData :
diff --git a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx b/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
index 5f2e9fd953b0..ab6ad740725e 100644
--- a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
+++ b/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
@@ -51,7 +51,7 @@ namespace ucbhelper{
             its handle() requests.
 
     @descr  This class can be used as:
-            - instance if special interactions must be supressed
+            - instance if special interactions must be suppressed
               only
             - or as base class if interactions must be modified.
  */
@@ -107,7 +107,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
             //-----------------------------------
             /** @short  default ctor.
 
-                @descr  Such constructed object cant be used realy.
+                @descr  Such constructed object can't be used really.
                         Might it will crash if its used!
                         Dont forget to initialize all(!) members ...
              */
@@ -149,7 +149,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
         };
 
         //---------------------------------------
-        /** @short  represent the different states, which can occure
+        /** @short  represent the different states, which can occur
                     as result of an interception.
 
             @see    impl_interceptRequest()
@@ -211,7 +211,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
         /** @short  initialize a new instance with the interaction handler,
                     which should be intercepted.
 
-            @attention  If such interaction handler isnt set here,
+            @attention  If such interaction handler isn't set here,
                         all incoming requests will be aborted ...
                         if the right continuation is available!
 
@@ -226,7 +226,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
 
             @attention  If the interface method handle() will be overwritten by
                         a derived class, the functionality behind these static list
-                        cant be used.
+                        can't be used.
 
             @param  lInterceptions
                     the list of intercepted requests.
@@ -261,10 +261,10 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
             @descr  This base implementation checks, if the request could be intercepted
                     successfully. Then this method intercepted() is called.
                     The default implementation returns "NOT_INTERCEPTED" everytimes.
-                    So the method impl_interceptRequest() uses the right continuation automaticly.
+                    So the method impl_interceptRequest() uses the right continuation automatically.
 
                     If this method was overwritten and something different "NO_INTERCEPTED"
-                    is returned, the method impl_interceptRequest() will return immediatly with
+                    is returned, the method impl_interceptRequest() will return immediately with
                     the result, which is returned by this intercepted() method.
                     Then the continuations must be selected inside the intercepted() call!
 
@@ -281,7 +281,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
 
             @return The result of this operation.
                     Note: If E_NOT_INTERCEPTED is returned the default handling of the base class
-                    will be used automaticly for this request!
+                    will be used automatically for this request!
          */
         virtual EInterceptionState intercepted(const InterceptedRequest&                                                             rRequest   ,
                                                const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xOrgRequest);
@@ -297,13 +297,13 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
             @descr  If no further class is derived from this one
                     -> the default implementation is used. Then the
                     internal list of requests is used to handle different
-                    interactions automaticly.
+                    interactions automatically.
                     (see impl_interceptRequest())
 
                     If this method was overwritten by a derived implementation
                     -> the new implementation has to do everything by itself.
                     Of course it can access all members/helpers and work with it.
-                    But the default implementation isnt used automaticly then.
+                    But the default implementation isn't used automatically then.
 
             @param  xRequest
                     the interaction request, which should be intercepted.
@@ -330,7 +330,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
                     searched and selected.
 
                     The method return the state of that operation.
-                    But it doesnt call the intercepted and here set
+                    But it doesn't call the intercepted and here set
                     interaction handler. That has to be done in the outside method.
 
             @param  xRequest
diff --git a/ucbhelper/inc/ucbhelper/resultset.hxx b/ucbhelper/inc/ucbhelper/resultset.hxx
index 57f148e50318..aca445ee4805 100644
--- a/ucbhelper/inc/ucbhelper/resultset.hxx
+++ b/ucbhelper/inc/ucbhelper/resultset.hxx
@@ -501,7 +501,7 @@ public:
      * all data on demand.
      *
      * The implementation should call m_pResultSet->rowCountChanged(...)
-     * everytime it has inserted a new entry in its logical result array.
+     * every time it has inserted a new entry in its logical result array.
      *
      * @return the count of objects obtained so far; will always be
      * non-negative.
@@ -552,7 +552,7 @@ public:
 
     /**
      * This method will be called by the resultset implementation in order
-     * check, whether an error has occured while collecting data. The
+     * check, whether an error has occurred while collecting data. The
      * implementation of this method must throw an exception in that case.
      *
      * Note: An exception thrown to indicate an error must always be thrown
@@ -564,7 +564,7 @@ public:
      * In case data are obtained synchronously, the ResultSetException can
      * be thrown directly.
      *
-     * @exception ResultSetException thrown, if an error has occured
+     * @exception ResultSetException thrown, if an error has occurred
      */
     virtual void validate()
         throw( com::sun::star::ucb::ResultSetException ) = 0;
diff --git a/ucbhelper/inc/ucbhelper/resultsethelper.hxx b/ucbhelper/inc/ucbhelper/resultsethelper.hxx
index dd3f5841e74a..30c7b74178b1 100644
--- a/ucbhelper/inc/ucbhelper/resultsethelper.hxx
+++ b/ucbhelper/inc/ucbhelper/resultsethelper.hxx
@@ -135,7 +135,7 @@ public:
       * Construtor.
       *
       * @param rxSMgr is a Service Manager.
-      * @param rCommand is the paramter for the open command that produces
+      * @param rCommand is the parameter for the open command that produces
       *        this resultset.
       */
     ResultSetImplHelper(
diff --git a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
index f8044a76ac27..67793a8ba995 100644
--- a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
@@ -61,9 +61,9 @@ public:
 
     /**
       * After passing this request to XInteractionHandler::handle, this method
-      * returns the continuation that was choosen by the interaction handler.
+      * returns the continuation that was chosen by the interaction handler.
       *
-      * @return the continuation choosen by an interaction handler or
+      * @return the continuation chosen by an interaction handler or
       *         CONTINUATION_UNKNOWN, if the request was not (yet) handled.
       */
     sal_Int32 getResponse() const;
diff --git a/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx b/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx
index c7b3f15f11a9..3074d47b9449 100644
--- a/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx
@@ -79,9 +79,9 @@ public:
 
     /**
       * After passing this request to XInteractionHandler::handle, this method
-      * returns the continuation that was choosen by the interaction handler.
+      * returns the continuation that was chosen by the interaction handler.
       *
-      * @return the continuation choosen by an interaction handler or
+      * @return the continuation chosen by an interaction handler or
       *         CONTINUATION_UNKNOWN, if the request was not (yet) handled.
       */
     sal_Int32 getResponse() const;
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 9318e02744cc..9ee46e5c90ca 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -1597,7 +1597,7 @@ sal_Bool Content::isFolder()
      ucbhelper::cancelCommandExecution(
          makeAny( UnknownPropertyException(
                     rtl::OUString::createFromAscii(
-                        "Unable to retreive value of property 'IsFolder'!" ),
+                        "Unable to retrieve value of property 'IsFolder'!" ),
                     get() ) ),
          m_xImpl->getEnvironment() );
 
@@ -1618,7 +1618,7 @@ sal_Bool Content::isDocument()
      ucbhelper::cancelCommandExecution(
          makeAny( UnknownPropertyException(
                     rtl::OUString::createFromAscii(
-                        "Unable to retreive value of property 'IsDocument'!" ),
+                        "Unable to retrieve value of property 'IsDocument'!" ),
                     get() ) ),
          m_xImpl->getEnvironment() );
 
diff --git a/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx
index c01d2fd298c8..e5909fdaa013 100644
--- a/ucbhelper/source/client/interceptedinteraction.cxx
+++ b/ucbhelper/source/client/interceptedinteraction.cxx
@@ -125,7 +125,7 @@ void InterceptedInteraction::impl_handleDefault(const ::com::sun::star::uno::Ref
             // Runtime error! The defined continuation could not be located
             // inside the set of available containuations of the incoming request.
             // Whats wrong - the interception list or the request?
-            OSL_ENSURE(sal_False, "InterceptedInteraction::handle()\nCould intercept this interaction request - but cant locate the right continuation!");
+            OSL_ENSURE(sal_False, "InterceptedInteraction::handle()\nCould intercept this interaction request - but can't locate the right continuation!");
         }
         break;