Translate German comments, fix some whitespace

connectivity/source/inc/odbc/OFunctiondefs.hxx

@@ -65,16 +65,15 @@
 
 #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 binding to the DLL at runtime.
+// odbcstub defines the NSQL... methods used in the sources
+// as indirect function calls.
+// odbcimp uses preos2, odbc and postos2 itself.
 //  #include "odbc3imp.hxx"
 
 #else
 
-// Zur Zeit verwenden wir die ODBC-DLL von Watcom-SQL direkt (ueber die
-// mitgelieferte Lib).
+// Currently, we directly use the ODBC DLL from Watcom SQL (via the supplied lib)
 
 #ifndef ODBC_OS2
 #define ODBC_OS2
@@ -101,8 +100,7 @@
 
 #endif
 
-// In der ODBC.H von Watcom werden Strings als char * erwartet
-// (nicht, wie sonst bei ODBC ueblich, als UCHAR *).
+// The ODBC.h from Watcom expects char*, not UCHAR* usually used with ODBC
 #if defined( ICC )
 #define SDB_ODBC_CHAR unsigned char
 #else
@@ -115,8 +113,7 @@
 
 #ifdef UNX
 
-// Zur Zeit verwenden wir die ODBC-shared library von Q+E direkt (ueber die
-// mitgelieferte Lib).
+// Currently, we directly use the ODBC shared library from Q+E (via the supplied lib)
 
 #ifndef ODBC_UNX
 #define ODBC_UNX
@@ -128,8 +125,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 // Is defined in qeodbc.h, but gets redefined by solar.h
 
 #define SDB_ODBC_CHAR UCHAR
 #define SQL_WCHAR           (-8)

connectivity/source/inc/odbc/OPreparedStatement.hxx

@@ -71,16 +71,11 @@ namespace connectivity
             //====================================================================
             // Data attributes
             //====================================================================
-            SQLSMALLINT     numParams;      // Number of parameter markers
-                                            //  for the prepared statement
+            SQLSMALLINT     numParams;      // Number of parameter markers for the prepared statement
 
             OBoundParam*    boundParams;
-                            // Array of bound parameter
-                            //  objects.  Each parameter
-                            //  marker will have a
-                            //  corresponding object to
-                            //  hold bind information, and
-                            //  resulting data.
+                            // Array of bound parameter objects. Each parameter marker will have a
+                            // corresponding object to hold bind information, and resulting data.
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData >  m_xMetaData;
             sal_Bool                                                                        m_bPrepared;
 
@@ -109,7 +104,7 @@ namespace connectivity
                                                                         throw (::com::sun::star::uno::Exception);
         public:
             DECLARE_SERVICE_INFO();
-            // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
+            // A ctor, needed to return the object
             OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString& sql);
 
             //XInterface

connectivity/source/inc/odbc/OResultSet.hxx

@@ -200,7 +200,7 @@ namespace connectivity
                                          ) const;
         public:
             DECLARE_SERVICE_INFO();
-            // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
+            // A ctor that is needed for returning the object
             OResultSet( SQLHANDLE _pStatementHandle,OStatement_Base* pStmt);
             virtual ~OResultSet();
 

connectivity/source/inc/odbc/OResultSetMetaData.hxx

@@ -62,7 +62,7 @@ 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:
+            // A ctor that is needed for returning the object
             OResultSetMetaData(OConnection* _pConnection, SQLHANDLE _pStmt )
                 :m_aStatementHandle( _pStmt )
                 ,m_pConnection(_pConnection)
@@ -95,7 +95,7 @@ namespace connectivity
             {
                 return m_pConnection->getOdbcFunction(_nIndex);
             }
-            /// Avoid ambigous cast error from the compiler.
+            // Avoid ambigous cast error from the compiler.
             inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw()
             { return this; }
 

connectivity/source/inc/odbc/OStatement.hxx

@@ -232,7 +232,7 @@ namespace connectivity
         protected:
             virtual ~OStatement(){}
         public:
-            // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
+            // A ctor that is needed for returning the object
             OStatement( OConnection* _pConnection) : OStatement_BASE2( _pConnection){}
             DECLARE_SERVICE_INFO();
 

connectivity/source/parse/sqliterator.cxx

@@ -808,7 +808,7 @@ sal_Bool OSQLParseTreeIterator::getColumnTableRange(const OSQLParseNode* pNode,
     {
         ::rtl::OUString aColName, aTableRange;
         getColumnRange(pNode, aColName, aTableRange);
-        if (aTableRange.isEmpty())   // keinen gefunden
+        if (aTableRange.isEmpty())   // None found
         {
             // Look for the columns in the tables
             for (ConstOSQLTablesIterator aIter = m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end(); ++aIter)
@@ -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:
+    // If it is an order_by, it must not be empty
     if(pGroupClause->count() != 3)
         pGroupClause = NULL;
     return pGroupClause;