Change-Id: Id4b79ae8576acaaf9d5ee1c9c030b6ffda3059a5
This commit is contained in:
Julien Nabet 2014-05-08 18:46:04 +02:00
parent 56e36f2e36
commit 88db0ab698
5 changed files with 8 additions and 8 deletions

View File

@ -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 )) );

View File

@ -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>

View File

@ -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">

View File

@ -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

View File

@ -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;
}