Translate German comments in core/connectivity
patch attached.
-Tom Thorogood
From ae999e6851ae2969335211737bbce428a2097dcd Mon Sep 17 00:00:00 2001
From: Tom Thorogood <tom@tomthorogood.com>
Date: Fri, 9 Mar 2012 22:35:32 -0500
Subject: [PATCH] Translate german comments in core/connectivity
---
.../source/drivers/mozab/MPreparedStatement.hxx | 1 -
.../source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 1 -
connectivity/source/inc/odbc/OFunctiondefs.hxx | 23 ++++++++-----------
.../source/inc/odbc/OPreparedStatement.hxx | 1 -
connectivity/source/inc/odbc/OResultSet.hxx | 1 -
.../source/inc/odbc/OResultSetMetaData.hxx | 1 -
connectivity/source/inc/odbc/OStatement.hxx | 1 -
connectivity/source/parse/sqliterator.cxx | 4 +-
8 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
index 31cfa97..ce2344f 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
@@ -109,7 +109,6 @@ namespace connectivity
public:
DECLARE_SERVICE_INFO();
- // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString& sql);
void lateInit();
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 7a17249..ee2af9e 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -128,7 +128,6 @@ namespace connectivity
template < typename T, SQLSMALLINT sqlTypeId > T getInteger ( sal_Int32 columnIndex );
public:
- // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
ODatabaseMetaDataResultSet(OConnection* _pConnection);
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx
b/connectivity/source/inc/odbc/OFunctiondefs.hxx
index a53f072..e356b64 100644
--- a/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx
@@ -64,17 +64,16 @@
#ifdef OS2__00
#ifdef ODBCIMP
-
-// Stub-Version: dynamische Bindung an die DLL zur Laufzeit.
-// odbcstub definiert die in den Quellen benutzten NSQL...-Methoden
-// als indirekte Funktionsaufrufe.
-// odbcimp zieht sich selbst preos2, odbc und postos2 an.
+// Stub version: dynamic bindings of DLLs at runtime.
+// odbcstup defines them in the NSQL[...] methods as
+// indirect function calls.
+// odbcimp is extended by preo2, odbc, and postos2.
// #include "odbc3imp.hxx"
#else
-// Zur Zeit verwenden wir die ODBC-DLL von Watcom-SQL direkt (ueber die
-// mitgelieferte Lib).
+// Currently we use the ODBC dll from Watcom-SQL directly
+// (from the supplied lib)
#ifndef ODBC_OS2
#define ODBC_OS2
@@ -101,8 +100,8 @@
#endif
-// In der ODBC.H von Watcom werden Strings als char * erwartet
-// (nicht, wie sonst bei ODBC ueblich, als UCHAR *).
+// ODBC.H from Watcom will expect strings as 'char *'
+// (not the case elsewhere in ODBC, where it's 'UCHAR *')
#if defined( ICC )
#define SDB_ODBC_CHAR unsigned char
#else
@@ -115,8 +114,7 @@
#ifdef UNX
-// Zur Zeit verwenden wir die ODBC-shared library von Q+E direkt (ueber die
-// mitgelieferte Lib).
+// Currently we use the supplied ODBC shared library from Q&E directly.
#ifndef ODBC_UNX
#define ODBC_UNX
@@ -128,8 +126,7 @@
#else
#include <odbc/sqlext.h>
#endif
-#undef sal_Bool // Ist in qeodbc.h definiert, wird aber von solar.h noch einmal
- // definiert.
+#undef sal_Bool // Defined in qeodbc.h, and is also defined in solar.h
#define SDB_ODBC_CHAR UCHAR
#define SQL_WCHAR (-8)
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx
b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index 076c9e05..bd05ea2 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -109,7 +109,6 @@ namespace connectivity
throw
(::com::sun::star::uno::Exception);
public:
DECLARE_SERVICE_INFO();
- // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString& sql);
//XInterface
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx
b/connectivity/source/inc/odbc/OResultSet.hxx
index e0362251..a128f7d 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -200,7 +200,6 @@ namespace connectivity
) const;
public:
DECLARE_SERVICE_INFO();
- // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
OResultSet( SQLHANDLE _pStatementHandle,OStatement_Base* pStmt);
virtual ~OResultSet();
diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index 213db25..226f23f 100644
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
@@ -62,7 +62,6 @@ namespace connectivity
::rtl::OUString getCharColAttrib(sal_Int32 column,sal_Int32 ident)
throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
sal_Int32 getNumColAttrib(sal_Int32 column,sal_Int32 ident)
throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
public:
- // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
OResultSetMetaData(OConnection* _pConnection, SQLHANDLE _pStmt )
:m_aStatementHandle( _pStmt )
,m_pConnection(_pConnection)
diff --git a/connectivity/source/inc/odbc/OStatement.hxx
b/connectivity/source/inc/odbc/OStatement.hxx
index 4768f70..0bfddf6 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -232,7 +232,6 @@ namespace connectivity
protected:
virtual ~OStatement(){}
public:
- // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
OStatement( OConnection* _pConnection) : OStatement_BASE2( _pConnection){}
DECLARE_SERVICE_INFO();
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 6a3b157..f2caaec 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1993,7 +1993,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getOrderTree() const
OSL_ENSURE(pTableExp->count() == TABLE_EXPRESSION_CHILD_COUNT,"OSQLParseTreeIterator: error in
parse tree!");
pOrderClause = pTableExp->getChild(ORDER_BY_CHILD_POS);
- // Wenn es aber eine order_by ist, dann darf sie nicht leer sein:
+ // However, if there is an 'order_by' clause, it cannot be empty
if(pOrderClause->count() != 3)
pOrderClause = NULL;
return pOrderClause;
@@ -2015,7 +2015,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getGroupByTree() const
OSL_ENSURE(pTableExp->count() == TABLE_EXPRESSION_CHILD_COUNT,"OSQLParseTreeIterator: error in
parse tree!");
pGroupClause = pTableExp->getChild(2);
- // Wenn es aber eine order_by ist, dann darf sie nicht leer sein:
+ // However, if there is an 'order_by' clause, it cannot be empty
if(pGroupClause->count() != 3)
pGroupClause = NULL;
return pGroupClause;
--
1.7.4.1
Context
- [PATCH] Translate German comments in core/connectivity · Tom Thorogood
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.