summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorFlorian Allmann-Rahn <f.allmann-rahn@gmx.de>2012-04-15 17:50:21 +0200
committerMiklos Vajna <vmiklos@suse.cz>2012-04-17 11:32:31 +0200
commit223b99165a249d77c1658eff8ce2262875170ec9 (patch)
tree1fc0e1add230990d9db7aaaef0e905d7d5e45c04 /connectivity
parentb42ac1ffe55ad3b3445478a35453108cd639929a (diff)
translated or removed german comments in connectivity, cppuhelper and cui
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/commontools/dbconversion.cxx12
-rw-r--r--connectivity/source/drivers/calc/CTable.cxx4
-rw-r--r--connectivity/source/drivers/dbase/DIndexIter.cxx2
-rw-r--r--connectivity/source/drivers/dbase/dindexnode.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/Array.cxx2
-rw-r--r--connectivity/source/drivers/mozab/MResultSetMetaData.hxx2
-rw-r--r--connectivity/source/drivers/odbcbase/OConnection.cxx4
-rw-r--r--connectivity/source/drivers/odbcbase/OResultSet.cxx4
-rw-r--r--connectivity/source/inc/file/FTable.hxx4
-rw-r--r--connectivity/source/inc/flat/EConnection.hxx6
-rw-r--r--connectivity/source/inc/java/io/InputStream.hxx2
11 files changed, 22 insertions, 24 deletions
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index 7c6f10de28b8..2e31620029ad 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -133,7 +133,7 @@ namespace dbtools
//------------------------------------------------------------------------------
sal_Int32 DBTypeConversion::toINT32(const Time& rVal)
{
- // Zeit normalisieren
+ // normalize time
sal_Int32 nSeconds = rVal.Seconds + rVal.HundredthSeconds / 100;
sal_Int32 nHundredthSeconds = rVal.HundredthSeconds % 100;
sal_Int32 nMinutes = rVal.Minutes + nSeconds / 60;
@@ -141,14 +141,14 @@ namespace dbtools
sal_Int32 nHours = rVal.Hours + nMinutes / 60;
nMinutes = nMinutes % 60;
- // Zeit zusammenbauen
+ // assemble time
return (sal_Int32)(nHundredthSeconds + (nSeconds*100) + (nMinutes*10000) + (nHours*1000000));
}
//------------------------------------------------------------------------------
sal_Int64 DBTypeConversion::toINT64(const DateTime& rVal)
{
- // Zeit normalisieren
+ // normalize time
sal_Int32 nSeconds = rVal.Seconds + rVal.HundredthSeconds / 100;
sal_Int32 nHundredthSeconds = rVal.HundredthSeconds % 100;
sal_Int32 nMinutes = rVal.Minutes + nSeconds / 60;
@@ -156,7 +156,7 @@ namespace dbtools
sal_Int32 nHours = rVal.Hours + nMinutes / 60;
nMinutes = nMinutes % 60;
- // Zeit zusammenbauen
+ // assemble time
sal_Int32 nTime = (sal_Int32)(nHundredthSeconds + (nSeconds*100) + (nMinutes*10000) + (nHours*1000000));
sal_Int32 nDate = ((sal_Int32)(rVal.Day%100)) + (((sal_Int32)(rVal.Month%100))*100) + (((sal_Int32) rVal.Year%10000)*10000);
sal_Int64 nRet;
@@ -369,7 +369,7 @@ namespace dbtools
nSign = 1;
Time xRet;
- // Zeit normalisieren
+ // normalize time
// we have to sal_Int32 here because otherwise we get an overflow
sal_Int32 nHundredthSeconds = nMS/10;
sal_Int32 nSeconds = nHundredthSeconds / 100;
@@ -380,7 +380,7 @@ namespace dbtools
xRet.Hours = (sal_uInt16)(nMinutes / 60);
xRet.Minutes = (sal_uInt16)(nMinutes % 60);
- // Zeit zusammenbauen
+ // assemble time
sal_Int32 nTime = (sal_Int32)(xRet.HundredthSeconds + (xRet.Seconds*100) + (xRet.Minutes*10000) + (xRet.Hours*1000000)) * nSign;
if(nTime < 0)
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index b4b841a01b4d..c1bfc587ccb0 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -749,7 +749,7 @@ sal_Bool OCalcTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::seekRow" );
// ----------------------------------------------------------
- // Positionierung vorbereiten:
+ // prepare positioning:
sal_uInt32 nNumberOfRecords = m_nDataRows;
sal_uInt32 nTempPos = m_nFilePos;
@@ -808,7 +808,7 @@ Error:
m_nFilePos = 0;
break;
case IResultSetHelper::BOOKMARK:
- m_nFilePos = nTempPos; // vorherige Position
+ m_nFilePos = nTempPos; // previous position
}
// aStatus.Set(SDB_STAT_NO_DATA_FOUND);
return sal_False;
diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index 1f86d3d55e31..546daecd8299 100644
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -256,7 +256,7 @@ sal_uIntPtr OIndexIterator::GetNotNull(sal_Bool bFirst)
ONDXKey* pKey;
if (bFirst)
{
- // erst alle NULL werte abklappern
+ // go through all NULL values first
for (sal_uIntPtr nRec = GetNull(bFirst);
nRec != STRING_NOTFOUND;
nRec = GetNull(sal_False))
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index d0e9f5ae19c5..e04ec3deefce 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -75,7 +75,7 @@ ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec)
// -----------------------------------------------------------------------------
//==================================================================
-// Index Seite
+// index page
//==================================================================
ONDXPage::ONDXPage(ODbaseIndex& rInd, sal_uInt32 nPos, ONDXPage* pParent)
:nPagePos(nPos)
@@ -204,7 +204,7 @@ sal_Bool ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
--nCount; // (otherwise we might get Assertions and GPFs - 60593)
bResult = Insert(rIndex.m_nCurNode + 1, rNode);
}
- else // Position unbekannt
+ else // position unknown
{
sal_uInt16 nPos = NODE_NOTFOUND;
while (++nPos < nCount && rNode.GetKey() > ((*this)[nPos]).GetKey()) ;
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx
index 71abde00cacc..d7ccb2a277b9 100644
--- a/connectivity/source/drivers/jdbc/Array.cxx
+++ b/connectivity/source/drivers/jdbc/Array.cxx
@@ -126,7 +126,7 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc:
// initialize temporary variable
static const char * cSignature = "(Ljava/util/Map;)Ljava/sql/ResultSet;";
static const char * cMethodName = "getResultSetAtIndex";
- // Java-Call absetzen
+ // submit Java-Call
static jmethodID mID(NULL);
obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
t.pEnv->CallObjectMethod( object, mID, index,count,obj);
diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
index e04668070dfc..71ecad1074e1 100644
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
@@ -54,7 +54,7 @@ namespace connectivity
protected:
virtual ~OResultSetMetaData();
public:
- // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
+ // a constructor that is needed to return the object:
// OResultSetMetaData(OConnection* _pConnection) : m_pConnection(_pConnection){}
OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,
const ::rtl::OUString& _aTableName,OTable* _pTable,sal_Bool aReadOnly
diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx
index 323e9d2e44ee..b206ab481db8 100644
--- a/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/connectivity/source/drivers/odbcbase/OConnection.cxx
@@ -122,7 +122,6 @@ SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int
#ifndef MACOSX
N3SQLSetConnectAttr(m_aConnectionHandle,SQL_ATTR_LOGIN_TIMEOUT,(SQLPOINTER)(sal_IntPtr)nTimeOut,SQL_IS_UINTEGER);
- // Verbindung aufbauen
#endif
#ifdef LINUX
@@ -176,7 +175,7 @@ SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int
}
- // autocoomit ist immer default
+ // autocoomit is always default
if (!m_bReadOnly)
N3SQLSetConnectAttr(m_aConnectionHandle,SQL_ATTR_AUTOCOMMIT,(SQLPOINTER)SQL_AUTOCOMMIT_ON,SQL_IS_INTEGER);
@@ -190,7 +189,6 @@ SQLRETURN OConnection::Construct(const ::rtl::OUString& url,const Sequence< Prop
m_sURL = url;
setConnectionInfo(info);
- // Connection allozieren
N3SQLAllocHandle(SQL_HANDLE_DBC,m_pDriverHandleCopy,&m_aConnectionHandle);
if(m_aConnectionHandle == SQL_NULL_HANDLE)
throw SQLException();
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index a882c2140b6d..43f96161d5a8 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -285,11 +285,11 @@ TVoidPtr OResultSet::allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex)
break;
case DataType::LONGVARCHAR:
case DataType::CLOB:
- aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new char[2]),_nType); // dient nur zum auffinden
+ aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new char[2]),_nType); // only for finding
break;
case DataType::LONGVARBINARY:
case DataType::BLOB:
- aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new char[2]),_nType); // dient nur zum auffinden
+ aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new char[2]),_nType); // only for finding
break;
case DataType::DATE:
aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new DATE_STRUCT),_nType);
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index 23a1086234f9..17224fad624b 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -50,9 +50,9 @@ namespace connectivity
OConnection* m_pConnection;
SvStream* m_pFileStream;
::rtl::Reference<OSQLColumns> m_aColumns;
- sal_Int32 m_nFilePos; // aktuelle IResultSetHelper::Movement
+ sal_Int32 m_nFilePos; // current IResultSetHelper::Movement
sal_uInt8* m_pBuffer;
- sal_uInt16 m_nBufferSize; // Groesse des ReadBuffer, wenn pBuffer != NULL
+ sal_uInt16 m_nBufferSize; // size of the ReadBuffer, if pBuffer != NULL
sal_Bool m_bWriteable; // svstream cann't say if we are writeable
// so we have to
diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx
index 23c4d4006d47..986812ac8321 100644
--- a/connectivity/source/inc/flat/EConnection.hxx
+++ b/connectivity/source/inc/flat/EConnection.hxx
@@ -42,9 +42,9 @@ namespace connectivity
sal_Int32 m_nMaxRowsToScan;
sal_Bool m_bHeaderLine; // column names in first row
sal_Unicode m_cFieldDelimiter; // look at the name
- sal_Unicode m_cStringDelimiter; // delimiter for strings m_cStringDelimiter blabla m_cStringDelimiter
- sal_Unicode m_cDecimalDelimiter; // Dezimal-delimiter (Dezimalpoint)
- sal_Unicode m_cThousandDelimiter; //
+ sal_Unicode m_cStringDelimiter;
+ sal_Unicode m_cDecimalDelimiter;
+ sal_Unicode m_cThousandDelimiter;
public:
OFlatConnection(ODriver* _pDriver);
virtual ~OFlatConnection();
diff --git a/connectivity/source/inc/java/io/InputStream.hxx b/connectivity/source/inc/java/io/InputStream.hxx
index 889408f7c40d..c1f60b703142 100644
--- a/connectivity/source/inc/java/io/InputStream.hxx
+++ b/connectivity/source/inc/java/io/InputStream.hxx
@@ -42,7 +42,7 @@ namespace connectivity
public ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream>
{
protected:
- // statische Data for the class
+ // static Data for the Class
static jclass theClass;
virtual ~java_io_InputStream();
public: