[Libreoffice-commits] core.git: connectivity/source officecfg/registry ucb/workben

[Julien Nabet]

 connectivity/source/drivers/postgresql/pq_xcolumns.cxx         |    2 +-
 officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs |    4 ++--
 officecfg/registry/schema/org/openoffice/Setup.xcs             |    2 +-
 ucb/workben/ucb/srcharg.cxx                                    |    4 ++--
 ucb/workben/ucb/ucbdemo.cxx                                    |    4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 88db0ab698055ce1ea37a3b200a425eee5b9f2f8
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu May 8 18:46:04 2014 +0200

    Typos
    
    Change-Id: Id4b79ae8576acaaf9d5ee1c9c030b6ffda3059a5

diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index 90d9c6e..1176248 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -222,7 +222,7 @@ OUString columnMetaData2SDBCX(
             st.DESCRIPTION, makeAny( xRow->getString( DESCRIPTION ) ) );
 
 
-    // maybe a better criterium than the type name can be found in future
+    // maybe a better criterion than the type name can be found in future
     pBase->setPropertyValue_NoBroadcast_public(
         st.IS_AUTO_INCREMENT, isAutoIncrement(xRow->getString( DEFAULT_VALUE )) );
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
index ddcd452..1edab99 100644
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
@@ -104,7 +104,7 @@
       </prop>
       <set oor:name="Fields" oor:node-type="FieldAssignment">
         <info>
-          <desc>Specifies the column name mapping between the programatic column name and the logical column name.</desc>
+          <desc>Specifies the column name mapping between the programmatic column name and the logical column name.</desc>
         </info>
       </set>
     </group>
@@ -334,7 +334,7 @@
       </prop>
       <set oor:name="Fields" oor:node-type="FieldAssignment">
         <info>
-          <desc>Specifies the column name mapping between the programatic column name and the logical column name.</desc>
+          <desc>Specifies the column name mapping between the programmatic column name and the logical column name.</desc>
         </info>
       </set>
     </group>
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs
index df6e1f3..0b3ee4e 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -118,7 +118,7 @@
         <info>
           <desc>It's the "most actual" filter, which is able to import/export
           ALL currently implemented features of this office module. It has to be
-          the programatic name of the filter.</desc>
+          the programmatic name of the filter.</desc>
         </info>
       </prop>
       <prop oor:name="ooSetupFactoryActualTemplateFilter" oor:type="xs:string">
diff --git a/ucb/workben/ucb/srcharg.cxx b/ucb/workben/ucb/srcharg.cxx
index f63587b..781f168 100644
--- a/ucb/workben/ucb/srcharg.cxx
+++ b/ucb/workben/ucb/srcharg.cxx
@@ -105,14 +105,14 @@ bool parseSearchArgument(String const & rInput, ucb::SearchInfo & rInfo)
 {
     /* Format of rInput:
 
-       argument = *option [criterium *("OR" criterium)]
+       argument = *option [criterion *("OR" criterion)]
 
        option = ("--RECURSE" "=" ("NONE" / "ONE" / "DEEP"))
                     / (("--BASE" / "--FOLDERVIEW" / "--DOCVIEW"
                                 / "--INDIRECT")
                            "=" bool)
 
-       criterium = "EMPTY" / (term *("AND" term))
+       criterion = "EMPTY" / (term *("AND" term))
 
        term = text-term / date-term / numeric-term / bool-term
 
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index d4cf14c..0be3ecf 100644
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
@@ -949,10 +949,10 @@ void UcbContent::open( const OUString & rName, const OUString& rInput,
             {
                 // Sort criteria... Note that column numbering starts with 1!
                 aOpenArg.SortingInfo.realloc(2);
-                // primary sort criterium: column 4 --> IsFolder
+                // primary sort criterion: column 4 --> IsFolder
                 aOpenArg.SortingInfo[ 0 ].ColumnIndex = 4;
                 aOpenArg.SortingInfo[ 0 ].Ascending   = sal_False;
-                // secondary sort criterium: column 1 --> Title
+                // secondary sort criterion: column 1 --> Title
                 aOpenArg.SortingInfo[ 1 ].ColumnIndex = 1;
                 aOpenArg.SortingInfo[ 1 ].Ascending   = sal_True;
             }