tdf#39468 Translate German comments

Translate German comments and terms in connectivity/

Change-Id: Id32217529e02d3efd070bc226b0078dcab73a602
Reviewed-on: https://gerrit.libreoffice.org/35820Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

connectivity/source/drivers/dbase/dindexnode.cxx

@@ -496,7 +496,7 @@ void ONDXPage::Merge(sal_uInt16 nParentNodePos, const ONDXPagePtr& xPage)
             sal_uInt16 nLastNode = bRight ? Count() - 1 : xPage->Count() - 1;
             if (bRight)
             {
-                DBG_ASSERT(xPage != this,"xPage und THIS duerfen nicht gleich sein: Endlosschleife");
+                DBG_ASSERT(xPage != this,"xPage and THIS must not be the same: infinite loop");
                 // shift all nodes from xPage to the left node (append)
                 while (xPage->Count())
                 {
@@ -506,7 +506,7 @@ void ONDXPage::Merge(sal_uInt16 nParentNodePos, const ONDXPagePtr& xPage)
             }
             else
             {
-                DBG_ASSERT(xPage != this,"xPage und THIS duerfen nicht gleich sein: Endlosschleife");
+                DBG_ASSERT(xPage != this,"xPage and THIS must not be the same: infinite loop");
                 // xPage is the left page and THIS the right one
                 while (xPage->Count())
                 {
@@ -576,7 +576,7 @@ void ONDXPage::Merge(sal_uInt16 nParentNodePos, const ONDXPagePtr& xPage)
         {
             if (bRight)
             {
-                DBG_ASSERT(xPage != this,"xPage und THIS duerfen nicht gleich sein: Endlosschleife");
+                DBG_ASSERT(xPage != this,"xPage and THIS must not be the same: infinite loop");
                 // Parent node will be integrated; is initialized with Child from xPage
                 (*aParent)[nParentNodePos].SetChild(xPage->GetChild(),aParent);
                 Append((*aParent)[nParentNodePos]);
@@ -585,7 +585,7 @@ void ONDXPage::Merge(sal_uInt16 nParentNodePos, const ONDXPagePtr& xPage)
             }
             else
             {
-                DBG_ASSERT(xPage != this,"xPage und THIS duerfen nicht gleich sein: Endlosschleife");
+                DBG_ASSERT(xPage != this,"xPage and THIS must not be the same: infinite loop");
                 // Parent-node will be integrated; is initialized with child
                 (*aParent)[nParentNodePos].SetChild(GetChild(),aParent); // Parent memorizes my child
                 Insert(0,(*aParent)[nParentNodePos]); // insert parent node into myself

connectivity/source/drivers/file/FPreparedStatement.cxx

@@ -421,8 +421,8 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const ORowSetVal
 
 sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
 {
-    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");
 
     OUString sParameterName;
     // set up Parameter-Column:

connectivity/source/drivers/file/FResultSet.cxx

@@ -1145,7 +1145,7 @@ void OResultSet::sortRows()
         // Other types aren't implemented (so they are always FALSE)
             default:
                 eKeyType[i] = OKeyType::NONE;
-                SAL_WARN( "connectivity.drivers","OFILECursor::Execute: Datentyp nicht implementiert");
+                SAL_WARN( "connectivity.drivers","OFILECursor::Execute: Data type not implemented");
                 break;
         }
         (m_aSelectRow->get())[*aOrderByIter]->setBound(true);

connectivity/source/drivers/file/FStatement.cxx

@@ -319,13 +319,13 @@ void OStatement_Base::anylizeSQL()
     if(pOrderbyClause)
     {
         OSQLParseNode * pOrderingSpecCommalist = pOrderbyClause->getChild(2);
-        OSL_ENSURE(SQL_ISRULE(pOrderingSpecCommalist,ordering_spec_commalist),"OResultSet: Fehler im Parse Tree");
+        OSL_ENSURE(SQL_ISRULE(pOrderingSpecCommalist,ordering_spec_commalist),"OResultSet: Error in Parse Tree");
 
         for (size_t m = 0; m < pOrderingSpecCommalist->count(); m++)
         {
             OSQLParseNode * pOrderingSpec = pOrderingSpecCommalist->getChild(m);
-            OSL_ENSURE(SQL_ISRULE(pOrderingSpec,ordering_spec),"OResultSet: Fehler im Parse Tree");
-            OSL_ENSURE(pOrderingSpec->count() == 2,"OResultSet: Fehler im Parse Tree");
+            OSL_ENSURE(SQL_ISRULE(pOrderingSpec,ordering_spec),"OResultSet: Error in Parse Tree");
+            OSL_ENSURE(pOrderingSpec->count() == 2,"OResultSet: Error in Parse Tree");
 
             OSQLParseNode * pColumnRef = pOrderingSpec->getChild(0);
             if(!SQL_ISRULE(pColumnRef,column_ref))
@@ -499,11 +499,11 @@ void OStatement_Base::GetAssignValues()
         // List of Column-Names, that exist in the column_commalist (separated by ;):
         std::vector<OUString> aColumnNameList;
 
-        OSL_ENSURE(m_pParseTree->count() >= 4,"OResultSet: Fehler im Parse Tree");
+        OSL_ENSURE(m_pParseTree->count() >= 4,"OResultSet: Error in Parse Tree");
 
         OSQLParseNode * pOptColumnCommalist = m_pParseTree->getChild(3);
-        OSL_ENSURE(pOptColumnCommalist != nullptr,"OResultSet: Fehler im Parse Tree");
-        OSL_ENSURE(SQL_ISRULE(pOptColumnCommalist,opt_column_commalist),"OResultSet: Fehler im Parse Tree");
+        OSL_ENSURE(pOptColumnCommalist != nullptr,"OResultSet: Error in Parse Tree");
+        OSL_ENSURE(SQL_ISRULE(pOptColumnCommalist,opt_column_commalist),"OResultSet: Error in Parse Tree");
         if (pOptColumnCommalist->count() == 0)
         {
             const Sequence< OUString>& aNames = m_xColNames->getElementNames();
@@ -514,18 +514,18 @@ void OStatement_Base::GetAssignValues()
         }
         else
         {
-            OSL_ENSURE(pOptColumnCommalist->count() == 3,"OResultSet: Fehler im Parse Tree");
+            OSL_ENSURE(pOptColumnCommalist->count() == 3,"OResultSet: Error in Parse Tree");
 
             OSQLParseNode * pColumnCommalist = pOptColumnCommalist->getChild(1);
-            OSL_ENSURE(pColumnCommalist != nullptr,"OResultSet: Fehler im Parse Tree");
-            OSL_ENSURE(SQL_ISRULE(pColumnCommalist,column_commalist),"OResultSet: Fehler im Parse Tree");
-            OSL_ENSURE(pColumnCommalist->count() > 0,"OResultSet: Fehler im Parse Tree");
+            OSL_ENSURE(pColumnCommalist != nullptr,"OResultSet: Error in Parse Tree");
+            OSL_ENSURE(SQL_ISRULE(pColumnCommalist,column_commalist),"OResultSet: Error in Parse Tree");
+            OSL_ENSURE(pColumnCommalist->count() > 0,"OResultSet: Error in Parse Tree");
 
             // All Columns in the column_commalist ...
             for (size_t i = 0; i < pColumnCommalist->count(); i++)
             {
                 OSQLParseNode * pCol = pColumnCommalist->getChild(i);
-                OSL_ENSURE(pCol != nullptr,"OResultSet: Fehler im Parse Tree");
+                OSL_ENSURE(pCol != nullptr,"OResultSet: Error in Parse Tree");
                 aColumnNameList.push_back(pCol->getTokenValue());
             }
         }
@@ -534,7 +534,7 @@ void OStatement_Base::GetAssignValues()
 
         // Values ...
         OSQLParseNode * pValuesOrQuerySpec = m_pParseTree->getChild(4);
-        OSL_ENSURE(pValuesOrQuerySpec != nullptr,"OResultSet: pValuesOrQuerySpec darf nicht NULL sein!");
+        OSL_ENSURE(pValuesOrQuerySpec != nullptr,"OResultSet: pValuesOrQuerySpec must not be NULL!");
         OSL_ENSURE(SQL_ISRULE(pValuesOrQuerySpec,values_or_query_spec),"OResultSet: ! SQL_ISRULE(pValuesOrQuerySpec,values_or_query_spec)");
         OSL_ENSURE(pValuesOrQuerySpec->count() > 0,"OResultSet: pValuesOrQuerySpec->count() <= 0");
 
@@ -546,14 +546,14 @@ void OStatement_Base::GetAssignValues()
 
         // List of values
         OSQLParseNode * pInsertAtomCommalist = pValuesOrQuerySpec->getChild(2);
-        OSL_ENSURE(pInsertAtomCommalist != nullptr,"OResultSet: pInsertAtomCommalist darf nicht NULL sein!");
+        OSL_ENSURE(pInsertAtomCommalist != nullptr,"OResultSet: pInsertAtomCommalist must not be NULL!");
         OSL_ENSURE(pInsertAtomCommalist->count() > 0,"OResultSet: pInsertAtomCommalist <= 0");
 
         sal_Int32 nIndex=0;
         for (size_t i = 0; i < pInsertAtomCommalist->count(); i++)
         {
             OSQLParseNode * pRow_Value_Const = pInsertAtomCommalist->getChild(i); // row_value_constructor
-            OSL_ENSURE(pRow_Value_Const != nullptr,"OResultSet: pRow_Value_Const darf nicht NULL sein!");
+            OSL_ENSURE(pRow_Value_Const != nullptr,"OResultSet: pRow_Value_Const must not be NULL!");
             if(SQL_ISRULE(pRow_Value_Const,parameter))
             {
                 ParseAssignValues(aColumnNameList,pRow_Value_Const,nIndex++); // only one Columnname allowed per loop
@@ -583,11 +583,11 @@ void OStatement_Base::GetAssignValues()
 
         m_aParameterIndexes.resize(nCount+1,SQL_NO_PARAMETER);
 
-        OSL_ENSURE(m_pParseTree->count() >= 4,"OResultSet: Fehler im Parse Tree");
+        OSL_ENSURE(m_pParseTree->count() >= 4,"OResultSet: Error in Parse Tree");
 
         OSQLParseNode * pAssignmentCommalist = m_pParseTree->getChild(3);
         OSL_ENSURE(pAssignmentCommalist != nullptr,"OResultSet: pAssignmentCommalist == NULL");
-        OSL_ENSURE(SQL_ISRULE(pAssignmentCommalist,assignment_commalist),"OResultSet: Fehler im Parse Tree");
+        OSL_ENSURE(SQL_ISRULE(pAssignmentCommalist,assignment_commalist),"OResultSet: Error in Parse Tree");
         OSL_ENSURE(pAssignmentCommalist->count() > 0,"OResultSet: pAssignmentCommalist->count() <= 0");
 
         // work on all assignments (commalist) ...
@@ -596,7 +596,7 @@ void OStatement_Base::GetAssignValues()
         {
             OSQLParseNode * pAssignment = pAssignmentCommalist->getChild(i);
             OSL_ENSURE(pAssignment != nullptr,"OResultSet: pAssignment == NULL");
-            OSL_ENSURE(SQL_ISRULE(pAssignment,assignment),"OResultSet: Fehler im Parse Tree");
+            OSL_ENSURE(SQL_ISRULE(pAssignment,assignment),"OResultSet: Error in Parse Tree");
             OSL_ENSURE(pAssignment->count() == 3,"OResultSet: pAssignment->count() != 3");
 
             OSQLParseNode * pCol = pAssignment->getChild(0);
@@ -623,8 +623,8 @@ void OStatement_Base::ParseAssignValues(const std::vector< OUString>& aColumnNam
 {
     OSL_ENSURE(size_t(nIndex) <= aColumnNameList.size(),"SdbFileCursor::ParseAssignValues: nIndex > aColumnNameList.GetTokenCount()");
     OUString aColumnName(aColumnNameList[nIndex]);
-    OSL_ENSURE(aColumnName.getLength() > 0,"OResultSet: Column-Name nicht gefunden");
-    OSL_ENSURE(pRow_Value_Constructor_Elem != nullptr,"OResultSet: pRow_Value_Constructor_Elem darf nicht NULL sein!");
+    OSL_ENSURE(aColumnName.getLength() > 0,"OResultSet: Column-Name not found");
+    OSL_ENSURE(pRow_Value_Constructor_Elem != nullptr,"OResultSet: pRow_Value_Constructor_Elem must not be NULL!");
 
     if (pRow_Value_Constructor_Elem->getNodeType() == SQLNodeType::String ||
         pRow_Value_Constructor_Elem->getNodeType() == SQLNodeType::IntNum ||

connectivity/source/drivers/file/fanalyzer.cxx

@@ -58,7 +58,7 @@ void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode)
 {
     if (SQL_ISRULE(pSQLParseNode,select_statement))
     {
-        DBG_ASSERT(pSQLParseNode->count() >= 4,"OFILECursor: Fehler im Parse Tree");
+        DBG_ASSERT(pSQLParseNode->count() >= 4,"OFILECursor: Error in Parse Tree");
 
         // check that we don't use anything other than count(*) as function
         OSQLParseNode* pSelection = pSQLParseNode->getChild(2);

connectivity/source/drivers/file/fcode.cxx

@@ -68,8 +68,8 @@ void OOperandValue::setValue(const ORowSetValue& _rVal)
 OOperandParam::OOperandParam(OSQLParseNode* pNode, sal_Int32 _nPos)
     : OOperandRow(static_cast<sal_uInt16>(_nPos), DataType::VARCHAR)         // Standard-Type
 {
-    OSL_ENSURE(SQL_ISRULE(pNode,parameter),"Argument ist kein Parameter");
-    OSL_ENSURE(pNode->count() > 0,"Fehler im Parse Tree");
+    OSL_ENSURE(SQL_ISRULE(pNode,parameter),"Argument is not a parameter");
+    OSL_ENSURE(pNode->count() > 0,"Error in Parse Tree");
     OSQLParseNode *pMark = pNode->getChild(0);
 
     OUString aParameterName;
@@ -79,7 +79,7 @@ OOperandParam::OOperandParam(OSQLParseNode* pNode, sal_Int32 _nPos)
         aParameterName = pNode->getChild(1)->getTokenValue();
     else
     {
-        SAL_WARN( "connectivity.drivers","Fehler im Parse Tree");
+        SAL_WARN( "connectivity.drivers","Error in Parse Tree");
     }
 
     // set up Parameter-Column with default type, can be specified more precisely later using Describe-Parameter

connectivity/source/drivers/file/fcomp.cxx

@@ -77,12 +77,12 @@ void OPredicateCompiler::start(OSQLParseNode* pSQLParseNode)
     if (SQL_ISRULE(pSQLParseNode,select_statement))
     {
         OSQLParseNode * pOrderbyClause = nullptr;
-        DBG_ASSERT(pSQLParseNode->count() >= 4,"OFILECursor: Fehler im Parse Tree");
+        DBG_ASSERT(pSQLParseNode->count() >= 4,"OFILECursor: Error in Parse Tree");
 
         OSQLParseNode * pTableExp = pSQLParseNode->getChild(3);
-        DBG_ASSERT(pTableExp != nullptr,"Fehler im Parse Tree");
-        DBG_ASSERT(SQL_ISRULE(pTableExp,table_exp)," Fehler im Parse Tree");
-        DBG_ASSERT(pTableExp->count() == TABLE_EXPRESSION_CHILD_COUNT,"Fehler im Parse Tree");
+        DBG_ASSERT(pTableExp != nullptr,"Error in Parse Tree");
+        DBG_ASSERT(SQL_ISRULE(pTableExp,table_exp)," Error in Parse Tree");
+        DBG_ASSERT(pTableExp->count() == TABLE_EXPRESSION_CHILD_COUNT,"Error in Parse Tree");
 
         // check that we don't use anything other than count(*) as function
         OSQLParseNode* pSelection = pSQLParseNode->getChild(2);
@@ -105,12 +105,12 @@ void OPredicateCompiler::start(OSQLParseNode* pSQLParseNode)
     }
     else if (SQL_ISRULE(pSQLParseNode,update_statement_searched))
     {
-        DBG_ASSERT(pSQLParseNode->count() == 5,"OFILECursor: Fehler im Parse Tree");
+        DBG_ASSERT(pSQLParseNode->count() == 5,"OFILECursor: Error in Parse Tree");
         pWhereClause = pSQLParseNode->getChild(4);
     }
     else if (SQL_ISRULE(pSQLParseNode,delete_statement_searched))
     {
-        DBG_ASSERT(pSQLParseNode->count() == 4,"Fehler im Parse Tree");
+        DBG_ASSERT(pSQLParseNode->count() == 4,"Error in Parse Tree");
         pWhereClause = pSQLParseNode->getChild(3);
     }
     else
@@ -120,17 +120,17 @@ void OPredicateCompiler::start(OSQLParseNode* pSQLParseNode)
     if (SQL_ISRULE(pWhereClause,where_clause))
     {
         // a where-clause is not allowed to be empty:
-        DBG_ASSERT(pWhereClause->count() == 2,"OFILECursor: Fehler im Parse Tree");
+        DBG_ASSERT(pWhereClause->count() == 2,"OFILECursor: Error in Parse Tree");
 
         OSQLParseNode * pComparisonPredicate = pWhereClause->getChild(1);
-        DBG_ASSERT(pComparisonPredicate != nullptr,"OFILECursor: Fehler im Parse Tree");
+        DBG_ASSERT(pComparisonPredicate != nullptr,"OFILECursor: Error in Parse Tree");
 
         execute( pComparisonPredicate );
     }
     else
     {
         // The where-clause is optionally in the majority of cases, i.e. it might be an "optional-where-clause".
-        DBG_ASSERT(SQL_ISRULE(pWhereClause,opt_where_clause),"OPredicateCompiler: Fehler im Parse Tree");
+        DBG_ASSERT(SQL_ISRULE(pWhereClause,opt_where_clause),"OPredicateCompiler: Error in Parse Tree");
     }
 }
 
@@ -160,7 +160,7 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode)
             m_aCodeList.push_back(new OOp_AND);
         else
         {
-            OSL_FAIL("OPredicateCompiler: Fehler im Parse Tree");
+            OSL_FAIL("OPredicateCompiler: Error in Parse Tree");
         }
     }
     else if (SQL_ISRULE(pPredicateNode,boolean_factor))
@@ -196,7 +196,7 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode)
             m_aCodeList.push_back(new OOp_SUB);
         else
         {
-            OSL_FAIL("OPredicateCompiler: Fehler im Parse Tree num_value_exp");
+            OSL_FAIL("OPredicateCompiler: Error in Parse Tree num_value_exp");
         }
     }
     else if(SQL_ISRULE(pPredicateNode,term))
@@ -211,7 +211,7 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode)
             m_aCodeList.push_back(new OOp_DIV);
         else
         {
-            OSL_FAIL("OPredicateCompiler: Fehler im Parse Tree num_value_exp");
+            OSL_FAIL("OPredicateCompiler: Error in Parse Tree num_value_exp");
         }
     }
     else
@@ -223,7 +223,7 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode)
 
 void OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode)
 {
-    DBG_ASSERT(pPredicateNode->count() == 3,"OFILECursor: Fehler im Parse Tree");
+    DBG_ASSERT(pPredicateNode->count() == 3,"OFILECursor: Error in Parse Tree");
 
     if ( !(SQL_ISRULE(pPredicateNode->getChild(0),column_ref)               ||
           pPredicateNode->getChild(2)->getNodeType() == SQLNodeType::String     ||
@@ -269,7 +269,7 @@ void OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode)
 
 void OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode)
 {
-    DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree");
+    DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Error in Parse Tree");
     const OSQLParseNode* pPart2 = pPredicateNode->getChild(1);
 
     sal_Unicode cEscape = L'\0';
@@ -317,7 +317,7 @@ void OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode)
 
 void OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode)
 {
-    DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree");
+    DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Error in Parse Tree");
 
     OSQLParseNode* pColumn = pPredicateNode->getChild(0);
     const OSQLParseNode* pPart2 = pPredicateNode->getChild(1);
@@ -394,9 +394,9 @@ void OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode)
 
 void OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode)
 {
-    DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree");
+    DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Error in Parse Tree");
     const OSQLParseNode* pPart2 = pPredicateNode->getChild(1);
-    DBG_ASSERT(SQL_ISTOKEN(pPart2->getChild(0),IS),"OFILECursor: Fehler im Parse Tree");
+    DBG_ASSERT(SQL_ISTOKEN(pPart2->getChild(0),IS),"OFILECursor: Error in Parse Tree");
 
     sal_Int32 ePredicateType;
     if (SQL_ISTOKEN(pPart2->getChild(1),NOT))
@@ -591,7 +591,7 @@ void OPredicateInterpreter::evaluateSelection(OCodeList& rCodeList,ORowSetValueD
 
 void OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode)
 {
-    DBG_ASSERT(pPredicateNode->count() >= 4,"OFILECursor: Fehler im Parse Tree");
+    DBG_ASSERT(pPredicateNode->count() >= 4,"OFILECursor: Error in Parse Tree");
 
     bool bUpper = SQL_ISTOKEN(pPredicateNode->getChild(0),UPPER);
 

connectivity/source/drivers/jdbc/Object.cxx

@@ -468,7 +468,7 @@ jclass java_lang_Object::findMyClass(const char* _pClassName)
 {
     // the class must be fetched only once, therefore static
     SDBThreadAttach t;
-    jclass tempClass = t.pEnv->FindClass(_pClassName); OSL_ENSURE(tempClass,"Java : FindClass nicht erfolgreich!");
+    jclass tempClass = t.pEnv->FindClass(_pClassName); OSL_ENSURE(tempClass,"Java : FindClass not successful!");
     if(!tempClass)
     {
         t.pEnv->ExceptionDescribe();

connectivity/source/drivers/mork/MStatement.cxx

@@ -426,13 +426,13 @@ void OCommonStatement::analyseSQL()
     if(pOrderbyClause)
     {
         OSQLParseNode * pOrderingSpecCommalist = pOrderbyClause->getChild(2);
-        OSL_ENSURE(SQL_ISRULE(pOrderingSpecCommalist,ordering_spec_commalist),"OResultSet: Fehler im Parse Tree");
+        OSL_ENSURE(SQL_ISRULE(pOrderingSpecCommalist,ordering_spec_commalist),"OResultSet: Error in Parse Tree");
 
         for (size_t m = 0; m < pOrderingSpecCommalist->count(); m++)
         {
             OSQLParseNode * pOrderingSpec = pOrderingSpecCommalist->getChild(m);
-            OSL_ENSURE(SQL_ISRULE(pOrderingSpec,ordering_spec),"OResultSet: Fehler im Parse Tree");
-            OSL_ENSURE(pOrderingSpec->count() == 2,"OResultSet: Fehler im Parse Tree");
+            OSL_ENSURE(SQL_ISRULE(pOrderingSpec,ordering_spec),"OResultSet: Error in Parse Tree");
+            OSL_ENSURE(pOrderingSpec->count() == 2,"OResultSet: Error in Parse Tree");
 
             OSQLParseNode * pColumnRef = pOrderingSpec->getChild(0);
             if(!SQL_ISRULE(pColumnRef,column_ref))

connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx

@@ -43,8 +43,7 @@ namespace connectivity
     protected:
         virtual ~ODatabaseMetaDataResultSetMetaData() override;
     public:
-        // a Constructor, that is needed for when Returning the Object is needed:
-        // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
+        // a Constructor, that is needed for when returning the object is needed:
         ODatabaseMetaDataResultSetMetaData( )
         {
         }

connectivity/source/parse/sqlbison.y

@@ -211,7 +211,7 @@ using namespace connectivity;
 %type <pParseNode> all_or_any_predicate any_all_some existence_test subquery quantified_comparison_predicate_part_2
 %type <pParseNode> scalar_exp_commalist parameter_ref literal parenthesized_boolean_value_expression
 %type <pParseNode> column_ref data_type column cursor parameter range_variable user /*like_check*/
-/* neue Regeln bei OJ */
+/* new rules at OJ */
 %type <pParseNode> derived_column as_clause table_name num_primary term num_value_exp
 %type <pParseNode> value_exp_primary num_value_fct unsigned_value_spec cast_spec set_fct_spec  scalar_subquery
 %type <pParseNode> position_exp extract_exp length_exp general_value_spec
@@ -255,8 +255,8 @@ using namespace connectivity;
 %type <pParseNode> opt_limit_offset_clause limit_offset_clause opt_fetch_first_clause
 %%
 
-/* Parse Tree an OSQLParser zurueckliefern
- * (der Zugriff ueber yyval nach Aufruf des Parsers scheitert,
+/* Return Parse Tree to OSQLParser
+ * (the access over yyval after calling the parser fails,
  *
  */
 sql_single_statement:
@@ -2611,7 +2611,7 @@ cross_union:
 	;
 
 qualified_join:
-		/* wenn SQL_TOKEN_NATURAL, dann keine join_spec */
+		/* when SQL_TOKEN_NATURAL, then no join_spec */
 		table_ref SQL_TOKEN_NATURAL join_type SQL_TOKEN_JOIN table_ref
 		{
 			$$ = SQL_NEW_RULE;
@@ -4408,11 +4408,11 @@ const Locale& OParseContext::getDefaultLocale()
 	return impl_getLocaleInstance();
 }
 
-// Der (leider globale) yylval fuer die Uebergabe von
-// Werten vom Scanner an den Parser. Die globale Variable
-// wird nur kurzzeitig verwendet, der Parser liest die Variable
-// sofort nach dem Scanner-Aufruf in eine gleichnamige eigene
-// Member-Variable.
+// The (unfortunately global) yylval for the handing over of
+// values from the Scanner to the Parser. The global variable
+// is only used for a short term, the Parser reads the variable
+// immediately after the call of the Scanner into a same named own
+// member variable.
 
 
 OUString ConvertLikeToken(const OSQLParseNode* pTokenNode, const OSQLParseNode* pEscapeNode, bool bInternational)
@@ -4424,7 +4424,7 @@ OUString ConvertLikeToken(const OSQLParseNode* pTokenNode, const OSQLParseNode*
 		if (pEscapeNode->count())
 			cEscape = pEscapeNode->getChild(1)->getTokenValue().toChar();
 
-		// Platzhalter austauschen
+		// Change place holder
 		aMatchStr = pTokenNode->getTokenValue();
 		const sal_Int32 nLen = aMatchStr.getLength();
 		OUStringBuffer sSearch,sReplace;

connectivity/source/parse/sqlflex.l

@@ -59,8 +59,8 @@
 
 using namespace connectivity;
 
-// Erzeugung der Blaetter fuer die Token
-// Blaetter werden generell vom Lexer erzeugt
+// Creation of the pages for the tokens
+// Pages generally are created from the Lexer
 
 static sal_Int32    gatherString(int delim, sal_Int32 nTyp);
 static sal_Int32    gatherName(const sal_Char*);

connectivity/source/parse/sqliterator.cxx

@@ -937,7 +937,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele
     }
     else if (SQL_ISRULE(pSelectNode->getChild(2),scalar_exp_commalist))
     {
-        // SELECT column[,column] oder SELECT COUNT(*) ...
+        // SELECT column[,column] or SELECT COUNT(*) ...
         OSQLParseNode * pSelection = pSelectNode->getChild(2);
 
         for (size_t i = 0; i < pSelection->count(); i++)
@@ -1527,7 +1527,7 @@ void OSQLParseTreeIterator::traverseOnePredicate(
 
     /*if (SQL_ISRULE(pParseNode,parameter))
         traverseParameter( pParseNode, pColumnRef, aColumnName, aTableRange, sColumnAlias );
-    else */if (SQL_ISRULE(pParseNode,column_ref))// Column-Name (und TableRange):
+    else */if (SQL_ISRULE(pParseNode,column_ref))// Column-Name (and TableRange):
         getColumnRange(pParseNode,aName,rValue);
     else
     {