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

9 files changed, 18 insertions, 18 deletions

diff --git a/cppuhelper/inc/cppuhelper/compbase_ex.hxx b/cppuhelper/inc/cppuhelper/compbase_ex.hxx
index 2de0d90e9a60..847fdb7483cc 100644
--- a/cppuhelper/inc/cppuhelper/compbase_ex.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase_ex.hxx
@@ -41,7 +41,7 @@ class SAL_NO_VTABLE WeakComponentImplHelperBase
     , public ::com::sun::star::lang::XComponent
 {
 protected:
-    /** boradcast helper for disposing events
+    /** broadcast helper for disposing events
     */
     ::cppu::OBroadcastHelper rBHelper;
 
diff --git a/cppuhelper/inc/cppuhelper/propshlp.hxx b/cppuhelper/inc/cppuhelper/propshlp.hxx
index 10a6d6e97045..813ca16fe465 100644
--- a/cppuhelper/inc/cppuhelper/propshlp.hxx
+++ b/cppuhelper/inc/cppuhelper/propshlp.hxx
@@ -60,7 +60,7 @@ public:
         {}
 
     /**
-       Folowing the rule, the first virtual method impies the virtual destructor.
+       Following the rule, the first virtual method impies the virtual destructor.
      */
     virtual ~IPropertyArrayHelper();
 
@@ -317,7 +317,7 @@ public:
         Method to be called by OPropertySetHelper::fire.
 
         @param bIgnoreRuntimeExceptionsWhileFiring
-                        indicates whether occuring RuntimeExceptions shall be
+                        indicates whether occurring RuntimeExceptions shall be
                         ignored when firing notifications
 
         @see OPropertySetHelper::fire
@@ -365,7 +365,7 @@ public:
                           of this object. Stored in the variable rBHelper.
 
         @param bIgnoreRuntimeExceptionsWhileFiring
-                        indicates whether occuring RuntimeExceptions will be
+                        indicates whether occurring RuntimeExceptions will be
                         ignored when firing notifications (vetoableChange((),
                         propertyChange()) to listeners.
                         PropertyVetoExceptions may still be thrown.
@@ -388,7 +388,7 @@ public:
                         additional event notifier
 
         @param bIgnoreRuntimeExceptionsWhileFiring
-                        indicates whether occuring RuntimeExceptions will be
+                        indicates whether occurring RuntimeExceptions will be
                         ignored when firing notifications (vetoableChange((),
                         propertyChange()) to listeners.
                         PropertyVetoExceptions may still be thrown.
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 07c111604c5c..3ada9e9d4a43 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -609,7 +609,7 @@ Reference< XComponentContext > SAL_CALL bootstrap()
             case osl_Process_E_NotFound:
                 throw BootstrapException( OUSTR( "image not found!" ) );
             case osl_Process_E_TimedOut:
-                throw BootstrapException( OUSTR( "timout occured!" ) );
+                throw BootstrapException( OUSTR( "timeout occurred!" ) );
             case osl_Process_E_NoPermission:
                 throw BootstrapException( OUSTR( "permission denied!" ) );
             case osl_Process_E_Unknown:
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index 16b7f7a24d31..d4e6ff9d84ec 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -175,7 +175,7 @@ void OComponentHelper::dispose()
                 EventObject aEvt;
                 aEvt.Source = xSource;
                 // inform all listeners to release this object
-                // The listener container are automaticly cleared
+                // The listener container are automatically cleared
                 rBHelper.aLC.disposeAndClear( aEvt );
                 // notify subclasses to do their dispose
                 disposing();
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 9fcca3da44ad..a2067c895308 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -581,7 +581,7 @@ Any ComponentContext::lookupMap( OUString const & rName )
 #if OSL_DEBUG_LEVEL > 0
                 ::fprintf(
                     stderr,
-                    "### omitting context for service instanciation!\n" );
+                    "### omitting context for service instantiation!\n" );
 #endif
                 xInstance = args.getLength()
                     ? xFac2->createInstanceWithArguments( args )
@@ -611,7 +611,7 @@ Any ComponentContext::lookupMap( OUString const & rName )
         Any caught( getCaughtException() );
         OUStringBuffer buf;
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-                             "exception occured raising singleton \"") );
+                             "exception occurred raising singleton \"") );
         buf.append( rName );
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\": ") );
         buf.append( exc.Message );
diff --git a/cppuhelper/source/findsofficepath.c b/cppuhelper/source/findsofficepath.c
index 1600a359525e..d915bec3df6a 100644
--- a/cppuhelper/source/findsofficepath.c
+++ b/cppuhelper/source/findsofficepath.c
@@ -40,7 +40,7 @@
  * @param subKeyName  name of the subkey to open
  *
  * @return the installation path or NULL, if no installation was found or
- *         if an error occured
+ *         if an error occurred
  */
 static char* getPathFromRegistryKey( HKEY hroot, const char* subKeyName )
 {
@@ -82,7 +82,7 @@ static char* getPathFromRegistryKey( HKEY hroot, const char* subKeyName )
  * Gets the installation path from the Windows Registry.
  *
  * @return the installation path or NULL, if no installation was found or
- *         if an error occured
+ *         if an error occurred
  */
 static char* platformSpecific()
 {
@@ -125,7 +125,7 @@ static char* platformSpecific()
  * is in one of the directories listed in the PATH environment variable.</p>
  *
  * @return the installation path or NULL, if no installation was found or
- *         if an error occured
+ *         if an error occurred
  */
 static char* platformSpecific()
 {
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 3863207e50d3..cb050797f4ca 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -234,7 +234,7 @@ void OPropertySetHelper::disposing() SAL_THROW( () )
     aEvt.Source = rSource;
 
     // inform all listeners to reelease this object
-    // The listener container are automaticly cleared
+    // The listener container are automatically cleared
     aBoundLC.disposeAndClear( aEvt );
     aVetoableLC.disposeAndClear( aEvt );
 }
@@ -329,7 +329,7 @@ void OPropertySetHelper::removePropertyChangeListener(
 {
     MutexGuard aGuard( rBHelper.rMutex );
     OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
-    // all listeners are automaticly released in a dispose call
+    // all listeners are automatically released in a dispose call
     if( !rBHelper.bInDispose && !rBHelper.bDisposed )
     {
         if( rPropertyName.getLength() )
@@ -409,7 +409,7 @@ void OPropertySetHelper::removeVetoableChangeListener(
 {
     MutexGuard aGuard( rBHelper.rMutex );
     OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
-    // all listeners are automaticly released in a dispose call
+    // all listeners are automatically released in a dispose call
     if( !rBHelper.bInDispose && !rBHelper.bDisposed )
     {
         if( rPropertyName.getLength() )
diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx
index 02339c1e9054..ed30ad88dee4 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -125,7 +125,7 @@ Reference< registry::XSimpleRegistry > SAL_CALL createSimpleRegistry(
 #if OSL_DEBUG_LEVEL > 0
         OString cstr_msg(
             OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( !"### exception occured:", cstr_msg.getStr() );
+        OSL_ENSURE( !"### exception occurred:", cstr_msg.getStr() );
 #else
         (void) exc; // avoid warning about unused variable
 #endif
@@ -156,7 +156,7 @@ Reference< registry::XSimpleRegistry > SAL_CALL createNestedRegistry(
 #if OSL_DEBUG_LEVEL > 0
         OString cstr_msg(
             OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( !"### exception occured:", cstr_msg.getStr() );
+        OSL_ENSURE( !"### exception occurred:", cstr_msg.getStr() );
 #else
         (void) exc; // avoid warning about unused variable
 #endif
diff --git a/cppuhelper/test/testhelper.cxx b/cppuhelper/test/testhelper.cxx
index 09694ad9b318..4f0131873b4b 100644
--- a/cppuhelper/test/testhelper.cxx
+++ b/cppuhelper/test/testhelper.cxx
@@ -92,7 +92,7 @@ SAL_IMPLEMENT_MAIN()
     catch (Exception & exc)
     {
         OString cstr_msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_ENSURE( ! "exception occured: ", cstr_msg.getStr() );
+        OSL_ENSURE( ! "exception occurred: ", cstr_msg.getStr() );
     }
 
     printf( "Test finished\n" );