[Libreoffice-commits] .: connectivity/source

[Christina Rossmanith]

 connectivity/source/drivers/adabas/BDriver.cxx   |   10 +++++-----
 connectivity/source/drivers/adabas/Bservices.cxx |    9 ++-------
 connectivity/source/drivers/ado/ADriver.cxx      |    2 +-
 connectivity/source/drivers/ado/Aservices.cxx    |    9 ++-------
 connectivity/source/drivers/ado/Awrapado.cxx     |    4 ++--
 5 files changed, 12 insertions(+), 22 deletions(-)

New commits:
commit 65a46ab7f944507aafa956c89ea305426f5894ce
Author: Rob Snelders <programming at ertai.nl>
Date:   Sat Feb 12 21:59:31 2011 +0100

    translated comments (5-9/54)

diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index 25f554f..8c35b17 100644
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -525,23 +525,23 @@ void SAL_CALL ODriver::dropCatalog( const ::rtl::OUString& /*catalogName*/, cons
     ::dbtools::throwFeatureNotImplementedException( "!XDropCatalog::dropCatalog", *this );
 }
 //-----------------------------------------------------------------------------
-// ODBC Environment (gemeinsam fuer alle Connections):
+// ODBC Environment (common for all Connections):
 SQLHANDLE ODriver::EnvironmentHandle(::rtl::OUString &_rPath)
 {
-    // Ist (fuer diese Instanz) bereits ein Environment erzeugt worden?
+    // Has an Environment already been created (for this Instance)?
     if (!m_pDriverHandle)
     {
         SQLHANDLE h = SQL_NULL_HANDLE;
-        // Environment allozieren
+        // allocate Environment
 
-        // ODBC-DLL jetzt laden:
+        // load ODBC-DLL now:
         if (! LoadLibrary_ADABAS(_rPath))
             return SQL_NULL_HANDLE;
 
         if (N3SQLAllocHandle(SQL_HANDLE_ENV,SQL_NULL_HANDLE,&h) != SQL_SUCCESS)
             return SQL_NULL_HANDLE;
 
-        // In globaler Struktur merken ...
+        // Save in global Structure...
         m_pDriverHandle = h;
         SQLRETURN nError = N3SQLSetEnvAttr(h, SQL_ATTR_ODBC_VERSION,(SQLPOINTER) SQL_OV_ODBC3, SQL_IS_INTEGER);
         OSL_UNUSED( nError );
diff --git a/connectivity/source/drivers/adabas/Bservices.cxx b/connectivity/source/drivers/adabas/Bservices.cxx
index 2857166..2c7cf7f 100644
--- a/connectivity/source/drivers/adabas/Bservices.cxx
+++ b/connectivity/source/drivers/adabas/Bservices.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/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index d87baa5..8562195 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -236,7 +236,7 @@ void ADOS::ThrowException(ADOConnection* _pAdoCon,const Reference< XInterface >&
 
     pErrors->AddRef( );
 
-    // alle aufgelaufenen Fehler auslesen und ausgeben
+    // read all noted errors and issue them
     sal_Int32 nLen;
     pErrors->get_Count(&nLen);
     if (nLen)
diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx
index 5ae486b..206c9c2 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.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, that must be exported by the module.
 //---------------------------------------------------------------------------------------
 void REGISTER_PROVIDER(
         const OUString& aServiceImplName,
@@ -72,7 +69,6 @@ void REGISTER_PROVIDER(
         xNewKey->createKey(Services[i]);
 }
 
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -112,7 +108,6 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-
 extern "C" void SAL_CALL component_getImplementationEnvironment(
                 const sal_Char	**ppEnvTypeName,
                 uno_Environment	** /*ppEnv*/
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index aec997e..4788699 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -409,7 +409,7 @@ CommandTypeEnum WpADOCommand::get_CommandType( ) const
     return eNum;
 }
 
-// gibt den Namen des Feldes zur"ueck
+// returns the name of the field
 ::rtl::OUString WpADOCommand::GetName() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
@@ -514,7 +514,7 @@ sal_Int32 WpADOField::GetDefinedSize() const
     return nDefinedSize;
 }
 
-// gibt den Namen des Feldes zur"ueck
+// returns the name of the field
 ::rtl::OUString WpADOField::GetName() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");