[Libreoffice-commits] core.git: forms/source oox/inc svl/inc svl/source

[Tor Lillqvist]

 forms/source/component/DatabaseForm.cxx |    2 +-
 oox/inc/oox/ole/axbinaryreader.hxx      |    2 +-
 oox/inc/oox/ole/axbinarywriter.hxx      |    2 +-
 svl/inc/svl/undo.hxx                    |    2 +-
 svl/source/fsstor/fsstorage.cxx         |    4 ++--
 svl/source/misc/documentlockfile.cxx    |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 9325dca98163f8fc7cfcf6a76abddfe4e902d73b
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Mar 23 12:30:33 2013 +0200

    "atomar" is not a word
    
    SCNR
    
    Change-Id: I3aaa8d9b37423d44fe11f161cc21c0a77b466353

diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 9f40e8e..dea3797 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -2887,7 +2887,7 @@ void ODatabaseForm::load_impl(sal_Bool bCausedByParentForm, sal_Bool bMoveToFirs
     // if we're loaded as sub form we got a "rowSetChanged" from the parent rowset _before_ we got the "loaded"
     // so we don't need to execute the statement again, this was already done
     // (and there were no relevant changes between these two listener calls, the "load" of a form is quite an
-    // atomar operation.)
+    // atomic operation.)
 
     sal_Bool bSuccess = sal_False;
     if (bExecute)
diff --git a/oox/inc/oox/ole/axbinaryreader.hxx b/oox/inc/oox/ole/axbinaryreader.hxx
index d63ccb1..44003f5 100644
--- a/oox/inc/oox/ole/axbinaryreader.hxx
+++ b/oox/inc/oox/ole/axbinaryreader.hxx
@@ -68,7 +68,7 @@ public:
         position of the wrapped stream at construction time). */
     void                align( size_t nSize );
 
-    /** Aligns the stream according to the passed type and reads an atomar value. */
+    /** Aligns the stream according to the passed type and reads a value. */
     template< typename Type >
     inline Type         readAligned() { align( sizeof( Type ) ); return readValue< Type >(); }
     /** Aligns the stream according to the passed type and skips the size of the type. */
diff --git a/oox/inc/oox/ole/axbinarywriter.hxx b/oox/inc/oox/ole/axbinarywriter.hxx
index c344285..d9a9403 100644
--- a/oox/inc/oox/ole/axbinarywriter.hxx
+++ b/oox/inc/oox/ole/axbinarywriter.hxx
@@ -73,7 +73,7 @@ public:
     void                align( size_t nSize );
 
     void         pad( sal_Int32 nBytes, size_t nAtomSize = 1);
-    /** Aligns the stream according to the passed type and reads an atomar value. */
+    /** Aligns the stream according to the passed type and reads a value. */
     template< typename Type >
     inline void         writeAligned( Type nVal ) { align( sizeof( Type ) ); writeValue( nVal ); }
     /** Aligns the stream according to the passed type and skips the size of the type. */
diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx
index 7059ab8..f36cd81 100644
--- a/svl/inc/svl/undo.hxx
+++ b/svl/inc/svl/undo.hxx
@@ -258,7 +258,7 @@ namespace svl
 
             Effectively, calling this method is equivalent to <code>while ( IsInListAction() ) LeaveListAction();</code>,
             followed by <code>Clear()</code>. The only difference to this calling sequence is that Reset is an
-            atomar operation, also resulting in only one notification.
+            atomic operation, also resulting in only one notification.
         */
         virtual void            Reset() = 0;
 
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 368ebd5..6cb798d 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -602,12 +602,12 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement(
             {
                 ::utl::UCBContentHelper::Kill( aFolderURL.GetMainURL( INetURLObject::NO_DECODE ) );
                 bFolderExists =
-                    MakeFolderNoUI( aFolderURL.GetMainURL( INetURLObject::NO_DECODE ) ); // TODO: not atomar :(
+                    MakeFolderNoUI( aFolderURL.GetMainURL( INetURLObject::NO_DECODE ) ); // TODO: not atomic :(
             }
             else if ( !bFolderExists )
             {
                 bFolderExists =
-                    MakeFolderNoUI( aFolderURL.GetMainURL( INetURLObject::NO_DECODE ) ); // TODO: not atomar :(
+                    MakeFolderNoUI( aFolderURL.GetMainURL( INetURLObject::NO_DECODE ) ); // TODO: not atomic :(
             }
         }
         else if ( ( nStorageMode & embed::ElementModes::TRUNCATE ) )
diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx
index 5bb2d58..6c130a8 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -199,7 +199,7 @@ void DocumentLockFile::RemoveFile()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    // TODO/LATER: the removing is not atomar, is it possible in general to make it atomar?
+    // TODO/LATER: the removing is not atomic, is it possible in general to make it atomic?
     uno::Sequence< ::rtl::OUString > aNewEntry = GenerateOwnEntry();
     uno::Sequence< ::rtl::OUString > aFileData = GetLockData();