[Libreoffice-commits] .: bridges/source connectivity/inc connectivity/source dbaccess/source editeng/source extensions/source jvmfwk/source qadevOOo/runner qadevOOo/tests scripting/java sc/source svtools/source unodevtools/source vcl/qa
Andras Timar
timar at kemper.freedesktop.org
Tue Jun 19 07:42:48 PDT 2012
bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx | 2 +-
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 2 +-
bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx | 2 +-
connectivity/inc/connectivity/parameters.hxx | 2 +-
connectivity/source/commontools/parameters.cxx | 2 +-
connectivity/source/drivers/file/FPreparedStatement.cxx | 2 +-
dbaccess/source/core/api/RowSet.cxx | 2 +-
editeng/source/editeng/textconv.hxx | 2 +-
extensions/source/ole/oleobjw.cxx | 2 +-
jvmfwk/source/elements.hxx | 2 +-
qadevOOo/runner/util/XMLTools.java | 3 +--
qadevOOo/tests/java/ifc/reflection/_XProxyFactory.java | 2 +-
qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java | 2 +-
sc/source/ui/optdlg/calcoptionsdlg.src | 2 +-
scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java | 2 +-
scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java | 2 +-
scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java | 2 +-
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java | 2 +-
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java | 2 +-
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java | 2 +-
svtools/source/edit/syntaxhighlight.cxx | 2 +-
unodevtools/source/skeletonmaker/skeletoncommon.cxx | 2 +-
vcl/qa/complex/memCheck/CheckMemoryUsage.java | 2 +-
24 files changed, 24 insertions(+), 25 deletions(-)
New commits:
commit 54e9a2839065daf54bd22749daa66c8c58fc7b23
Author: Andras Timar <atimar at suse.com>
Date: Tue Jun 19 16:43:41 2012 +0200
typo: paramters, paramaters -> parameters
Change-Id: If58683331c50f2a95204e8e2dea11edbef3ccb63
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
index 4507206..ef4ede9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx
@@ -113,7 +113,7 @@ namespace
fprintf(stderr,"overflow area pointer p=%p\n",p);
/* Let's figure out what is really going on here*/
- fprintf(stderr,"callVirtualMethod paramters string is %s\n",pPT);
+ fprintf(stderr,"callVirtualMethod parameters string is %s\n",pPT);
int k = nStackLongs;
long * q = (long *)pStackLongs;
while (k > 0) {
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
index f409bf7..c2af4e2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
@@ -127,7 +127,7 @@ static void callVirtualMethod(
#if 0
/* Let's figure out what is really going on here*/
- fprintf(stderr,"callVirtualMethod paramters string is %s\n",pPT);
+ fprintf(stderr,"callVirtualMethod parameters string is %s\n",pPT);
int k = nStackLongs;
long * q = (long *)pStackLongs;
while (k > 0) {
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index f3e76a6..89ab462 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -55,7 +55,7 @@ using namespace ::com::sun::star::uno;
// Perform the UNO call
//
-// We must convert the paramaters stored in gpreg, fpreg and ovrflw to UNO
+// We must convert the parameters stored in gpreg, fpreg and ovrflw to UNO
// arguments and call pThis->getUnoI()->pDispatcher.
//
// gpreg: [ret *], this, [gpr params]
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
index 8d6b54e..67f236e 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
@@ -145,7 +145,7 @@ static typelib_TypeClass cpp2uno_call(
}
}
- // now the stack has all of the paramters stored in it ready to be processed
+ // now the stack has all of the parameters stored in it ready to be processed
// so we are ready to build the uno call stack
pCppStack = (char *)ovrflw;
diff --git a/connectivity/inc/connectivity/parameters.hxx b/connectivity/inc/connectivity/parameters.hxx
index 7c91850..a4c2d97 100644
--- a/connectivity/inc/connectivity/parameters.hxx
+++ b/connectivity/inc/connectivity/parameters.hxx
@@ -273,7 +273,7 @@ namespace dbtools
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxComponent
);
- /** collects initial meta information about inner paramaters (i.e. it initially fills
+ /** collects initial meta information about inner parameters (i.e. it initially fills
<member>m_aParameterInformation</member>).
@param _bSecondRun
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index b7054ed..2428112 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -199,7 +199,7 @@ namespace dbtools
::rtl::OUString sName;
xParam->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME) ) >>= sName;
- // only append additonal paramters when they are not already in the list
+ // only append additonal parameters when they are not already in the list
ParameterInformation::iterator aExistentPos = m_aParameterInformation.find( sName );
OSL_ENSURE( !_bSecondRun || ( aExistentPos != m_aParameterInformation.end() ),
"ParameterManager::collectInnerParameters: the parameter information should already exist in the second run!" );
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index bdfed9f..0d810fc 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -415,7 +415,7 @@ Reference<XResultSet> OPreparedStatement::initResultSet()
m_pResultSet->clear();
Reference<XResultSet> xRs(m_pResultSet);
- // check if we got enough paramters
+ // check if we got enough parameters
if ( (m_aParameterRow.is() && ( m_aParameterRow->get().size() -1 ) < m_xParamColumns->get().size()) ||
(m_xParamColumns.is() && !m_aParameterRow.is() && !m_aParameterRow->get().empty()) )
m_pConnection->throwGenericSQLException(STR_INVALID_PARA_COUNT,*this);
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 58ab8bf..40da396 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -2274,7 +2274,7 @@ sal_Bool ORowSet::impl_initComposer_throw( ::rtl::OUString& _out_rCommandToExecu
if ( m_bIgnoreResult )
{ // append a "0=1" filter
// don't simply overwrite an existent filter, this would lead to problems if this existent
- // filter contains paramters (since a keyset may add parameters itself)
+ // filter contains parameters (since a keyset may add parameters itself)
m_xComposer->setElementaryQuery( m_xComposer->getQuery( ) );
m_xComposer->setFilter( ::rtl::OUString("0 = 1" ) );
}
diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx
index 440ffd8..9aaea64 100644
--- a/editeng/source/editeng/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -56,7 +56,7 @@ class TextConvWrapper : public editeng::HangulHanjaConversion
sal_Bool bStartDone;
sal_Bool bEndDone;
sal_Bool bAllowChange; // storage for _bAllowImplicitChangesForNotConvertibleText
- // paramters value of function GetNextPortion.
+ // parameters value of function GetNextPortion.
// used to transport the value to where it is needed.
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 7c79ceb..d89ae85 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -728,7 +728,7 @@ sal_Bool SAL_CALL IUnknownWrapper_Impl::hasProperty( const OUString& aName )
// we should probably just check the funckind
// basic has been modified to handle properties ( 'get' ) props at
- // least with paramaters
+ // least with parameters
// additionally you can call invoke(Get|Set)Property on the bridge
// you can determine if a property has parameter is hasMethod
// returns true for the name
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index 6efedbf..944cdbc 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -149,7 +149,7 @@ private:
/** returns the system path to the data file which is to be used. The value
depends on
- the the member m_layer and the bootstrap paramters UNO_JAVA_JFW_USER_DATA,
+ the the member m_layer and the bootstrap parameters UNO_JAVA_JFW_USER_DATA,
UNO_JAVA_JFW_SHARED_DATA and UNO_JAVA_JFW_INSTALL_DATA which this may be.
*/
::rtl::OString getSettingsPath() const;
diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java
index 0967ddd..f724c1f 100644
--- a/qadevOOo/runner/util/XMLTools.java
+++ b/qadevOOo/runner/util/XMLTools.java
@@ -343,7 +343,7 @@ public class XMLTools {
/**
* Checks if there were no errors during document handling.
* I.e. startDocument() and endDocument() must be called,
- * XML must be well formed, paramters must be valid.
+ * XML must be well formed, parameters must be valid.
*/
public boolean isWellFormed() {
if (!docEnded) {
@@ -936,4 +936,4 @@ public class XMLTools {
xImp.setTargetDocument(xDoc) ;
parseXMLFile(xMSF, fileURL, xDocHandImp) ;
}
-}
\ No newline at end of file
+}
diff --git a/qadevOOo/tests/java/ifc/reflection/_XProxyFactory.java b/qadevOOo/tests/java/ifc/reflection/_XProxyFactory.java
index 655cb59..4943a59 100644
--- a/qadevOOo/tests/java/ifc/reflection/_XProxyFactory.java
+++ b/qadevOOo/tests/java/ifc/reflection/_XProxyFactory.java
@@ -61,7 +61,7 @@ public class _XProxyFactory extends MultiMethodTest {
* called. The goal is to check if the real object method
* was called throwgh it's proxy. <p>
* Has <b>OK</b> status if the real object method was
- * called and paramters were passed correctly.
+ * called and parameters were passed correctly.
*/
public void _createProxy() {
class MyObject implements XInitialization {
diff --git a/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java b/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java
index 072071b..1fc6a6f 100644
--- a/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java
+++ b/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java
@@ -85,7 +85,7 @@ public class ConditionalParagraphStyle extends TestCase {
* Create a new instance of the conditional
* paragraph style, and insert it into the document.
* @see com.sun.star.style.ConditionalParagraphStyle
- * @param tParam The test paramters
+ * @param tParam The test parameters
* @param log The log writer.
*/
protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) {
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.src b/sc/source/ui/optdlg/calcoptionsdlg.src
index 621bc0d..58fa750 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.src
+++ b/sc/source/ui/optdlg/calcoptionsdlg.src
@@ -96,7 +96,7 @@ ModalDialog RID_SCDLG_FORMULA_CALCOPTIONS
String STR_STRING_REF_SYNTAX_DESC
{
- Text [ en-US ] = "Formula syntax to use when parsing references given in string paramters. This affects built-in functions such as INDIRECT that takes a reference as a string value.";
+ Text [ en-US ] = "Formula syntax to use when parsing references given in string parameters. This affects built-in functions such as INDIRECT that takes a reference as a string value.";
};
String STR_USE_FORMULA_SYNTAX
diff --git a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
index 974b001..d9c4176 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
@@ -195,7 +195,7 @@ public class ParcelBrowseNode extends PropertySet
com.sun.star.reflection.InvocationTargetException
{
LogUtils.DEBUG("ParcelBrowseNode invoke for " + aFunctionName );
- // Initialise the out paramters - not used but prevents error in
+ // Initialise the out parameters - not used but prevents error in
// UNO bridge
aOutParamIndex[0] = new short[0];
aOutParam[0] = new Object[0];
diff --git a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
index 99aa4e4..3c8ea7f 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
@@ -183,7 +183,7 @@ public class ProviderBrowseNode extends PropertySet
com.sun.star.script.CannotConvertException,
com.sun.star.reflection.InvocationTargetException
{
- // Initialise the out paramters - not used but prevents error in
+ // Initialise the out parameters - not used but prevents error in
// UNO bridge
aOutParamIndex[0] = new short[0];
aOutParam[0] = new Object[0];
diff --git a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
index 30c3510..7e8f39b 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
@@ -177,7 +177,7 @@ public class ScriptBrowseNode extends PropertySet
com.sun.star.script.CannotConvertException,
com.sun.star.reflection.InvocationTargetException
{
- // Initialise the out paramters - not used but prevents error in
+ // Initialise the out parameters - not used but prevents error in
// UNO bridge
aOutParamIndex[0] = new short[0];
aOutParam[0] = new Object[0];
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
index e41646c..2ed0c64 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
@@ -188,7 +188,7 @@ class ScriptImpl implements XScript
throws ScriptFrameworkErrorException,
InvocationTargetException
{
- // Initialise the out paramters - not used at the moment
+ // Initialise the out parameters - not used at the moment
aOutParamIndex[0] = new short[0];
aOutParam[0] = new Object[0];
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
index 8ee3722..af052e1 100644
--- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
@@ -197,7 +197,7 @@ class ScriptImpl implements XScript
{
LogUtils.DEBUG( "** ScriptProviderForJava::invoke: Starting..." );
- // Initialise the out paramters - not used at the moment
+ // Initialise the out parameters - not used at the moment
aOutParamIndex[0] = new short[0];
aOutParam[0] = new Object[0];
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
index aea209c..911e6b3 100644
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
@@ -186,7 +186,7 @@ class ScriptImpl implements XScript
throws ScriptFrameworkErrorException, InvocationTargetException
{
- // Initialise the out paramters - not used at the moment
+ // Initialise the out parameters - not used at the moment
aOutParamIndex[0] = new short[0];
aOutParam[0] = new Object[0];
diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx
index a366c03..3f3d1e3 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.cxx
@@ -452,7 +452,7 @@ sal_Bool SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
// only for BASIC '\'' should be a comment, otherwise it is a normal string and handled there
else if ( ( testCharFlags( c, CHAR_OPERATOR ) == sal_True ) || ( (c == '\'') && (aLanguage==HIGHLIGHT_BASIC)) )
{
- // paramters for SQL view
+ // parameters for SQL view
if ( (c==':') || (c=='?'))
{
if (c!='?')
diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
index d6ce0f9..a17487c 100644
--- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx
+++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
@@ -472,7 +472,7 @@ sal_uInt16 checkAdditionalPropertyFlags(typereg::Reader const & reader,
return flags;
}
-// This function checks if the specified types for paramters and return
+// This function checks if the specified types for parameters and return
// types are allowed add-in types, for more info see the com.sun.star.sheet.AddIn
// service description
bool checkAddinType(TypeManager const & manager,
diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
index a089a1c..40216e6 100644
--- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java
+++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
@@ -61,7 +61,7 @@ import static org.junit.Assert.*;
* command line tool 'pmap', available on Solaris or Linux. This test will not
* run on Windows.<br>Test procedure: every given document type is searched in
* the source directory
- * Needed paramters:
+ * Needed parameters:
* <ul>
* <li>"TestDocumentPath" - the path where test documents are located.</li>
* <li>"AllowMemoryIncrease" (optional) - the allowed memory increase measured in kByte per exported document. The default is 10 kByte.</li>
More information about the Libreoffice-commits
mailing list