[Libreoffice-commits] .: connectivity/source
Christina Rossmanith
crossmanith at kemper.freedesktop.org
Tue Feb 15 12:46:36 PST 2011
connectivity/source/drivers/evoab/LFolderList.cxx | 27 +++-----
connectivity/source/drivers/evoab/LFolderList.hxx | 6 -
connectivity/source/drivers/evoab/LNoException.cxx | 54 +++++++---------
connectivity/source/drivers/evoab/LServices.cxx | 9 --
connectivity/source/drivers/evoab/LTable.cxx | 31 ++++-----
connectivity/source/drivers/evoab2/NServices.cxx | 9 --
connectivity/source/drivers/file/FNoException.cxx | 13 ---
connectivity/source/drivers/file/FPreparedStatement.cxx | 27 +++-----
8 files changed, 77 insertions(+), 99 deletions(-)
New commits:
commit ffa5f51c7c91914c4344db5eed3308c5e55debb9
Author: Rob Snelders <programming at ertai.nl>
Date: Tue Feb 15 21:45:45 2011 +0100
translated comments (17-24/54)
diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx
index 0017406..d9f58f2 100644
--- a/connectivity/source/drivers/evoab/LFolderList.cxx
+++ b/connectivity/source/drivers/evoab/LFolderList.cxx
@@ -157,7 +157,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
for (xub_StrLen j = 0; j < aField2.Len(); j++)
{
sal_Unicode c = aField2.GetChar(j);
- // nur Ziffern und Dezimalpunkt und Tausender-Trennzeichen?
+ // Only digits and decimalpoint and thousands delimiter?
if ((!cDecimalDelimiter || c != cDecimalDelimiter) &&
(!cThousandDelimiter || c != cThousandDelimiter) &&
!aCharClass.isDigit(aField2,j))
@@ -177,12 +177,12 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
bNumeric = FALSE;
if (bNumeric && cThousandDelimiter)
{
- // Ist der Trenner richtig angegeben?
+ // Is the delimiter given correctly?
String aValue = aField2.GetToken(0,cDecimalDelimiter);
for (sal_Int32 j = aValue.Len() - 4; j >= 0; j -= 4)
{
sal_Unicode c = aValue.GetChar(j);
- // nur Ziffern und Dezimalpunkt und Tausender-Trennzeichen?
+ // Only digits, decimalpoint and thousands delimiter?
if (c == cThousandDelimiter && j)
continue;
else
@@ -193,7 +193,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
}
}
- // jetzt koennte es noch ein Datumsfeld sein
+ // now it might still be a date-field
if (!bNumeric)
{
try
@@ -246,7 +246,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
break;
default:
eType = DataType::VARCHAR;
- nPrecision = 0; // nyi: Daten koennen aber laenger sein!
+ nPrecision = 0; // nyi: Data can be longer!
nScale = 0;
aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
};
@@ -322,7 +322,7 @@ void OEvoabFolderList::construct()
sal_Int32 nSize = m_pFileStream->Tell();
m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
- // Buffersize abhaengig von der Filegroesse
+ // Buffersize dependent on the file-size
m_pFileStream->SetBufferSize(nSize > 1000000 ? 32768 :
nSize > 100000 ? 16384 :
nSize > 10000 ? 4096 : 1024);
@@ -339,7 +339,7 @@ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols)
(_rRow->get())[0] = m_nFilePos; // the "bookmark"
OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
- // Felder:
+ // Fields:
xub_StrLen nStartPos = 0;
String aStr;
OSQLColumns::Vector::const_iterator aIter = _rCols.get().begin();
@@ -387,7 +387,7 @@ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols)
} break;
case DataType::DOUBLE:
case DataType::INTEGER:
- case DataType::DECIMAL: // #99178# OJ
+ case DataType::DECIMAL:
case DataType::NUMERIC:
{
sal_Unicode cDecimalDelimiter = pConnection->getDecimalDelimiter();
@@ -398,23 +398,22 @@ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols)
!cDecimalDelimiter && nType == DataType::INTEGER,
"FalscherTyp");
- // In Standard-Notation (DezimalPUNKT ohne Tausender-Komma) umwandeln:
+ // Convert to standard notation (DecimalPOINT without Thousands-comma):
for (xub_StrLen j = 0; j < aStr.Len(); ++j)
{
if (cDecimalDelimiter && aStr.GetChar(j) == cDecimalDelimiter)
aStrConverted += '.';
else if ( aStr.GetChar(j) == '.' ) // special case, if decimal seperator isn't '.' we have to vut the string after it
- break; // #99189# OJ
+ break;
else if (cThousandDelimiter && aStr.GetChar(j) == cThousandDelimiter)
{
- // weglassen
+ // leave out
}
else
aStrConverted += aStr.GetChar(j) ;
}
double nVal = ::rtl::math::stringToDouble(aStrConverted.GetBuffer(),',','.',NULL,NULL);
- // #99178# OJ
if ( DataType::DECIMAL == nType || DataType::NUMERIC == nType )
(_rRow->get())[i+1] = String::CreateFromDouble(nVal);
else
@@ -423,7 +422,7 @@ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols)
default:
{
- // Wert als String in Variable der Row uebernehmen
+ // put value as string in Row variable
(_rRow->get())[i+1] = aStr;
}
break;
@@ -443,7 +442,7 @@ sal_Bool OEvoabFolderList::seekRow(IResultSetHelper::Movement eCursorPosition)
return sal_False;
OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
// ----------------------------------------------------------
- // Positionierung vorbereiten:
+ // Prepare positioning:
//OSL_TRACE("OEvoabFolderList::seekRow()::(before SeekRow,m_pFileStriam Exist)m_aCurrentLine = %d\n", ((OUtoCStr(::rtl::OUString(m_aCurrentLine))) ? (OUtoCStr(::rtl::OUString(m_aCurrentLine))):("NULL")) );
switch(eCursorPosition)
diff --git a/connectivity/source/drivers/evoab/LFolderList.hxx b/connectivity/source/drivers/evoab/LFolderList.hxx
index a7eb508..e91068c 100644
--- a/connectivity/source/drivers/evoab/LFolderList.hxx
+++ b/connectivity/source/drivers/evoab/LFolderList.hxx
@@ -41,8 +41,8 @@ namespace connectivity
namespace evoab
{
//==================================================================
- // Ableitung von String mit ueberladenen GetToken/GetTokenCount-Methoden
- // Speziell fuer FLAT FILE-Format: Strings koennen gequotet sein
+ // Derivation of String with overloaded GetToken/GetTokenCount methods
+ // Especially for FLAT FILE-Format: Strings can be quoted
//==================================================================
class OEvoabConnection;
@@ -55,7 +55,7 @@ namespace connectivity
::std::vector<sal_Int32> m_aScales;
QuotedTokenizedString m_aCurrentLine;
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xNumberFormatter;
- sal_Int32 m_nFilePos; // aktuelle IResultSetHelper::Movement
+ sal_Int32 m_nFilePos; // current IResultSetHelper::Movement
SvStream* m_pFileStream;
OEvoabConnection* m_pConnection;
::rtl::Reference<OSQLColumns> m_aColumns;
diff --git a/connectivity/source/drivers/evoab/LNoException.cxx b/connectivity/source/drivers/evoab/LNoException.cxx
index c8578fe..58f0e15 100644
--- a/connectivity/source/drivers/evoab/LNoException.cxx
+++ b/connectivity/source/drivers/evoab/LNoException.cxx
@@ -41,40 +41,40 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel )
return 0;
xub_StrLen nTokCount = 1;
- BOOL bStart = TRUE; // Stehen wir auf dem ersten Zeichen im Token?
- BOOL bInString = FALSE; // Befinden wir uns INNERHALB eines (cStrDel delimited) String?
+ BOOL bStart = TRUE; // Are we on the fist character of the token?
+ BOOL bInString = FALSE; // Are we within a (cStrDel delimited) string?
- // Suche bis Stringende nach dem ersten nicht uebereinstimmenden Zeichen
+ // Search for the first not-matching character (search ends at the end of string)
for( xub_StrLen i = 0; i < Len(); i++ )
{
if (bStart)
{
bStart = FALSE;
- // Erstes Zeichen ein String-Delimiter?
+ // First character a string delimiter?
if ((*this).GetChar(i) == cStrDel)
{
- bInString = TRUE; // dann sind wir jetzt INNERHALB des Strings!
- continue; // dieses Zeichen ueberlesen!
+ bInString = TRUE; // then we are within a string!
+ continue; // read next character!
}
}
if (bInString) {
- // Wenn jetzt das String-Delimiter-Zeichen auftritt ...
+ // If we see the string delimiter ...
if ( (*this).GetChar(i) == cStrDel )
{
if ((i+1 < Len()) && ((*this).GetChar(i+1) == cStrDel))
{
- // Verdoppeltes String-Delimiter-Zeichen:
- i++; // kein String-Ende, naechstes Zeichen ueberlesen.
+ // doubled string-delimiter:
+ i++; // no end of string, skip next character.
}
else
{
- // String-Ende
+ // end of String
bInString = FALSE;
}
}
} else {
- // Stimmt das Tokenzeichen ueberein, dann erhoehe TokCount
+ // if the token character matches, then raise TokCount
if ( (*this).GetChar(i) == cTok )
{
nTokCount++;
@@ -94,51 +94,49 @@ void OEvoabString::GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Uni
xub_StrLen nLen = Len();
if ( nLen )
{
- BOOL bInString = (nStartPos < nLen) && ((*this).GetChar(nStartPos) == cStrDel); // Befinden wir uns INNERHALB eines (cStrDel delimited) String?
+ BOOL bInString = (nStartPos < nLen) && ((*this).GetChar(nStartPos) == cStrDel); // are we within a (cStrDel delimited) String?
- // Erstes Zeichen ein String-Delimiter?
+ // Is the first character a String-Delimiter?
if (bInString )
- ++nStartPos; // dieses Zeichen ueberlesen!
- // Suche bis Stringende nach dem ersten nicht uebereinstimmenden Zeichen
+ ++nStartPos; // skip the character!
+ // Search until end of string for the first not-matching character
for( xub_StrLen i = nStartPos; i < nLen; ++i )
{
if (bInString)
{
- // Wenn jetzt das String-Delimiter-Zeichen auftritt ...
+ // If we see the String-Delimiter ...
if ( (*this).GetChar(i) == cStrDel )
{
if ((i+1 < nLen) && ((*this).GetChar(i+1) == cStrDel))
{
- // Verdoppeltes String-Delimiter-Zeichen:
- ++i; // kein String-Ende, naechstes Zeichen ueberlesen.
-
- _rStr += (*this).GetChar(i); // Zeichen gehoert zum Resultat-String
+ // doubled String-Delimiter:
+ ++i; // no end of String, skip next character
+ _rStr += (*this).GetChar(i); // Character belongs to Result-String
}
else
{
- // String-Ende
+ // end of String
bInString = FALSE;
}
}
else
{
- _rStr += (*this).GetChar(i); // Zeichen gehoert zum Resultat-String
+ _rStr += (*this).GetChar(i); // Character belongs to Result-String
}
}
else
{
- // Stimmt das Tokenzeichen ueberein, dann erhoehe nTok
+ // Does the Token-character match, then raise nTok
if ( (*this).GetChar(i) == cTok )
{
- // Vorzeitiger Abbruch der Schleife moeglich, denn
- // wir haben, was wir wollten.
+ // Early termination of loop possible, because we found what we were looking for.
nStartPos = i+1;
break;
}
else
{
- _rStr += (*this).GetChar(i); // Zeichen gehoert zum Resultat-String
+ _rStr += (*this).GetChar(i); // Character belongs to Result-String
}
}
}
@@ -175,7 +173,7 @@ sal_Bool OEvoabTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In
return sal_False;
OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
// ----------------------------------------------------------
- // Positionierung vorbereiten:
+ // prepare positioning:
//OSL_TRACE("OEvoabTable::(before SeekRow,m_pFileStriam Exist)m_aCurrentLine = %d\n", ((OUtoCStr(::rtl::OUString(m_aCurrentLine))) ? (OUtoCStr(::rtl::OUString(m_aCurrentLine))):("NULL")) );
m_nFilePos = nCurPos;
@@ -310,7 +308,7 @@ sal_Bool OEvoabTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In
if (m_pFileStream->IsEof())
return sal_False;
- m_nFilePos = m_pFileStream->Tell(); // Byte-Position in der Datei merken (am ZeilenANFANG)
+ m_nFilePos = m_pFileStream->Tell(); // save Byte-Position in the file (at start of line)
m_pFileStream->ReadByteStringLine(m_aCurrentLine,pConnection->getTextEncoding());
if (m_pFileStream->IsEof())
return sal_False;
diff --git a/connectivity/source/drivers/evoab/LServices.cxx b/connectivity/source/drivers/evoab/LServices.cxx
index c8207d5..45c10f7 100644
--- a/connectivity/source/drivers/evoab/LServices.cxx
+++ b/connectivity/source/drivers/evoab/LServices.cxx
@@ -50,11 +50,8 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
);
//***************************************************************************************
-//
-// Die vorgeschriebene C-Api muss erfuellt werden!
-// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
-//
-
+// The prescribed C-Api must be met!
+// It consists of three functions, which must be exported by the module.
//---------------------------------------------------------------------------------------
void REGISTER_PROVIDER(
const OUString& aServiceImplName,
@@ -73,7 +70,6 @@ void REGISTER_PROVIDER(
xNewKey->createKey(Services[i]);
}
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -113,7 +109,6 @@ struct ProviderRequest
};
//---------------------------------------------------------------------------------------
-
extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment(
const sal_Char **ppEnvTypeName,
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx
index 7110533..32fbf11 100644
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -178,7 +178,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
for (xub_StrLen j = 0; j < aField2.Len(); j++)
{
sal_Unicode c = aField2.GetChar(j);
- // nur Ziffern und Dezimalpunkt und Tausender-Trennzeichen?
+ // only digits, decimalpoint and thousands-delimiter
if ((!cDecimalDelimiter || c != cDecimalDelimiter) &&
(!cThousandDelimiter || c != cThousandDelimiter) &&
!aCharClass.isDigit(aField2,j))
@@ -198,12 +198,12 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
bNumeric = FALSE;
if (bNumeric && cThousandDelimiter)
{
- // Ist der Trenner richtig angegeben?
+ // is the delimiter given correctly
String aValue = aField2.GetToken(0,cDecimalDelimiter);
for (sal_Int32 j = aValue.Len() - 4; j >= 0; j -= 4)
{
sal_Unicode c = aValue.GetChar(j);
- // nur Ziffern und Dezimalpunkt und Tausender-Trennzeichen?
+ // only digits, decimalpoint and thousands-delimiter?
if (c == cThousandDelimiter && j)
continue;
else
@@ -214,7 +214,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
}
}
- // jetzt koennte es noch ein Datumsfeld sein
+ // Now it might still be a Date-field
if (!bNumeric)
{
try
@@ -267,7 +267,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
break;
default:
eType = DataType::VARCHAR;
- nPrecision = 0; // nyi: Daten koennen aber laenger sein!
+ nPrecision = 0; // nyi: Data can be longer
nScale = 0;
aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
};
@@ -362,7 +362,7 @@ void OEvoabTable::construct()
sal_Int32 nSize = m_pFileStream->Tell();
m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
- // Buffersize abhaengig von der Filegroesse
+ // Buffer size is dependent on the file-size
m_pFileStream->SetBufferSize(nSize > 1000000 ? 32768 :
nSize > 100000 ? 16384 :
nSize > 10000 ? 4096 : 1024);
@@ -513,7 +513,7 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa
return TRUE;
OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
- // Felder:
+ // Fields:
xub_StrLen nStartPos = 0;
String aStr;
OSQLColumns::Vector::const_iterator aIter = _rCols.get().begin();
@@ -526,7 +526,7 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa
(_rRow->get())[i+1]->setNull();
else
{
- // Laengen je nach Datentyp:
+ // Lengths for each data-type:
sal_Int32 nLen,
nType = 0;
if(bIsTable)
@@ -573,7 +573,7 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa
} break;
case DataType::DOUBLE:
case DataType::INTEGER:
- case DataType::DECIMAL: // #99178# OJ
+ case DataType::DECIMAL:
case DataType::NUMERIC:
{
sal_Unicode cDecimalDelimiter = pConnection->getDecimalDelimiter();
@@ -584,23 +584,22 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa
!cDecimalDelimiter && nType == DataType::INTEGER,
"FalscherTyp");
- // In Standard-Notation (DezimalPUNKT ohne Tausender-Komma) umwandeln:
+ // Convert to standard-notation (DecimalPOINT without Thousands-comma):
for (xub_StrLen j = 0; j < aStr.Len(); ++j)
{
if (cDecimalDelimiter && aStr.GetChar(j) == cDecimalDelimiter)
aStrConverted += '.';
else if ( aStr.GetChar(j) == '.' ) // special case, if decimal seperator isn't '.' we have to vut the string after it
- break; // #99189# OJ
+ break;
else if (cThousandDelimiter && aStr.GetChar(j) == cThousandDelimiter)
{
- // weglassen
+ // leave out
}
else
aStrConverted += aStr.GetChar(j) ;
}
double nVal = ::rtl::math::stringToDouble(aStrConverted.GetBuffer(),',','.',NULL,NULL);
- // #99178# OJ
if ( DataType::DECIMAL == nType || DataType::NUMERIC == nType )
*(_rRow->get())[i+1] = ORowSetValue(String::CreateFromDouble(nVal));
else
@@ -609,7 +608,7 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa
default:
{
- // Wert als String in Variable der Row uebernehmen
+ // Copy Value as String in Row-variable
*(_rRow->get())[i+1] = ORowSetValue(aStr);
}
break;
@@ -718,7 +717,7 @@ sal_Bool OEvoabTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In
return sal_False;
OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
// ----------------------------------------------------------
- // Positionierung vorbereiten:
+ // prepare positioning:
//OSL_TRACE("OEvoabTable::(before SeekRow,m_pFileStriam Exist)m_aCurrentLine = %d\n", ((OUtoCStr(::rtl::OUString(m_aCurrentLine))) ? (OUtoCStr(::rtl::OUString(m_aCurrentLine))):("NULL")) );
m_nFilePos = nCurPos;
@@ -851,7 +850,7 @@ sal_Bool OEvoabTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In
if (m_pFileStream->IsEof())
return sal_False;
- m_nFilePos = m_pFileStream->Tell(); // Byte-Position in der Datei merken (am ZeilenANFANG)
+ m_nFilePos = m_pFileStream->Tell(); // save Byte-Position in the file (at start of line)
m_pFileStream->ReadByteStringLine(m_aCurrentLine,pConnection->getTextEncoding());
if (m_pFileStream->IsEof())
return sal_False;
diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx
index 4af1c03..75b2beb 100644
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -50,11 +50,8 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
);
//***************************************************************************************
-//
-// Die vorgeschriebene C-Api muss erfuellt werden!
-// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
-//
-
+// The prescribed C-Api must be met!
+// It consists of three functions, which must be exported by the module.
//---------------------------------------------------------------------------------------
void REGISTER_PROVIDER(
const OUString& aServiceImplName,
@@ -73,7 +70,6 @@ void REGISTER_PROVIDER(
xNewKey->createKey(Services[i]);
}
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -114,7 +110,6 @@ struct ProviderRequest
};
//---------------------------------------------------------------------------------------
-
extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char **ppEnvTypeName,
uno_Environment ** /*ppEnv*/
diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx
index e092fb5..3431708 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -89,18 +89,18 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OPreparedStatement::scanParameter" );
DBG_ASSERT(pParseNode != NULL,"OResultSet: interner Fehler: ungueltiger ParseNode");
- // Parameter Name-Regel gefunden?
+ // found parameter Name-Rule?
if (SQL_ISRULE(pParseNode,parameter))
{
DBG_ASSERT(pParseNode->count() >= 1,"OResultSet: Parse Tree fehlerhaft");
DBG_ASSERT(pParseNode->getChild(0)->getNodeType() == SQL_NODE_PUNCTUATION,"OResultSet: Parse Tree fehlerhaft");
_rParaNodes.push_back(pParseNode);
- // Weiterer Abstieg nicht erforderlich
+ // Further descend not nessesary
return;
}
- // Weiter absteigen im Parse Tree
+ // Further descend in Parse Tree
for (UINT32 i = 0; i < pParseNode->count(); i++)
scanParameter(pParseNode->getChild(i),_rParaNodes);
}
@@ -123,11 +123,4 @@ OKeyValue* OResultSet::GetOrderbyKeyValue(OValueRefRow& _rRow)
}
// -----------------------------------------------------------------------------
-
-
-
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 700a8b9..1d507cd 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -491,7 +491,7 @@ UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere
#endif
::rtl::OUString sParameterName;
- // Parameter-Column aufsetzen:
+ // set up Parameter-Column:
sal_Int32 eType = DataType::VARCHAR;
UINT32 nPrecision = 255;
sal_Int32 nScale = 0;
@@ -499,9 +499,9 @@ UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere
if (_xCol.is())
{
- // Typ, Precision, Scale ... der angegebenen Column verwenden,
- // denn dieser Column wird der Wert zugewiesen bzw. mit dieser
- // Column wird der Wert verglichen.
+ // Use type, precision, scale ... from the given column,
+ // because this Column will get a value assigned or
+ // with this Column the value will be compared.
_xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= eType;
_xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nPrecision;
_xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)) >>= nScale;
@@ -573,23 +573,22 @@ void OPreparedStatement::initializeResultSet(OResultSet* _pResult)
m_pResultSet->setParameterColumns(m_xParamColumns);
m_pResultSet->setParameterRow(m_aParameterRow);
- // Parameter substituieren (AssignValues und Kriterien):
+ // Substitute parameter (AssignValues and criteria):
if (!m_xParamColumns->get().empty())
{
- // Zunaechst AssignValues
- USHORT nParaCount=0; // gibt die aktuelle Anzahl der bisher gesetzen Parameter an
+ // begin with AssignValues
+ USHORT nParaCount=0; // gives the current number of previously set Parameters
- // Nach zu substituierenden Parametern suchen:
- size_t nCount = m_aAssignValues.is() ? m_aAssignValues->get().size() : 1; // 1 ist wichtig fuer die Kriterien
+ // search for parameters to be substituted:
+ size_t nCount = m_aAssignValues.is() ? m_aAssignValues->get().size() : 1; // 1 is important for the Criteria
for (size_t j = 1; j < nCount; j++)
{
UINT32 nParameter = (*m_aAssignValues).getParameterIndex(j);
if (nParameter == SQL_NO_PARAMETER)
- continue; // dieser AssignValue ist kein Parameter
+ continue; // this AssignValue is no Parameter
- ++nParaCount; // ab hier ist der Parameter gueltig
- // Parameter ersetzen. Wenn Parameter nicht verfuegbar,
- // Value auf NULL setzen.
+ ++nParaCount; // now the Parameter is valid
+ // Replace Parameter. If the Parameter isn't available, set value to NULL
// (*m_aAssignValues)[j] = (*m_aParameterRow)[(UINT16)nParameter];
}
@@ -627,7 +626,7 @@ void OPreparedStatement::parseParamterElem(const String& _sColumnName,OSQLParseN
}
if(nParameter == -1)
nParameter = AddParameter(pRow_Value_Constructor_Elem,xCol);
- // Nr. des Parameters in der Variablen merken:
+ // Save number of parameter in the variable:
SetAssignValue(_sColumnName, String(), TRUE, nParameter);
}
// -----------------------------------------------------------------------------
More information about the Libreoffice-commits
mailing list