[Libreoffice-commits] .: 2 commits - connectivity/source
Philipp Weissenbacher
p.weissenbacher at kemper.freedesktop.org
Mon Mar 5 14:15:34 PST 2012
connectivity/source/drivers/mozab/MPreparedStatement.cxx | 12 ++++++------
connectivity/source/inc/dbase/DTable.hxx | 2 +-
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 3dcf3c07aaff2eec0379135ec605396b7002f6a7
Author: Philipp Weissenbacher <p.weissenbacher at gmail.com>
Date: Mon Mar 5 23:13:54 2012 +0100
Translate German comments
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
index e21ec2f..bc19e36 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
@@ -416,11 +416,11 @@ ORowSetValue& x)
sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
{
OSL_UNUSED( pParameter );
- // Nr. of the new added Parameters
+ // Count of the newly added Parameters
sal_uInt32 nParameter = m_xParamColumns->get().size()+1;
- OSL_ENSURE(SQL_ISRULE(pParameter,parameter),"OResultSet::AddParameter: Argument ist kein Parameter");
- OSL_ENSURE(pParameter->count() > 0,"OResultSet: Fehler im Parse Tree");
+ OSL_ENSURE(SQL_ISRULE(pParameter,parameter),"OResultSet::AddParameter: Argument is not a Parameter");
+ OSL_ENSURE(pParameter->count() > 0,"OResultSet: error in parse tree");
#if OSL_DEBUG_LEVEL > 0
OSQLParseNode * pMark = pParameter->getChild(0);
OSL_UNUSED( pMark );
@@ -506,13 +506,13 @@ aParseNodes.begin();
// -----------------------------------------------------------------------------
void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes)
{
- OSL_ENSURE(pParseNode != NULL,"OResultSet: interner Fehler: ungueltiger ParseNode");
+ OSL_ENSURE(pParseNode != NULL,"OResultSet: internal error: invalid ParseNode");
// Parameter Name-Row found?
if (SQL_ISRULE(pParseNode,parameter))
{
- OSL_ENSURE(pParseNode->count() >= 1,"OResultSet: Parse Tree fehlerhaft");
- OSL_ENSURE(pParseNode->getChild(0)->getNodeType() == SQL_NODE_PUNCTUATION,"OResultSet: Parse Tree fehlerhaft");
+ OSL_ENSURE(pParseNode->count() >= 1,"OResultSet: Faulty Parse Tree");
+ OSL_ENSURE(pParseNode->getChild(0)->getNodeType() == SQL_NODE_PUNCTUATION,"OResultSet: Faulty Parse Tree");
_rParaNodes.push_back(pParseNode);
// further search isn't necessary
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 7a17249..66b077f 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -128,7 +128,7 @@ namespace connectivity
template < typename T, SQLSMALLINT sqlTypeId > T getInteger ( sal_Int32 columnIndex );
public:
- // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
+ // A ctor needed for returning the object
ODatabaseMetaDataResultSet(OConnection* _pConnection);
commit 2b5327a9b6c3e730cc79db4546f82f9467f80e1a
Author: Philipp Weissenbacher <p.weissenbacher at gmail.com>
Date: Thu Mar 1 12:26:51 2012 +0100
Missed two chars
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index b28392a..6ee8364 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -70,7 +70,7 @@ namespace connectivity
struct DBFHeader { /* Header struct */
DBFType db_typ; /* File type */
sal_uInt8 db_aedat[3]; /* Date of last change */
- /* JJ MM DD */
+ /* YY MM DD */
sal_uInt32 db_anz; /* Data set count */
sal_uInt16 db_kopf; /* Header length */
sal_uInt16 db_slng; /* Data set length */
More information about the Libreoffice-commits
mailing list