chartextensibility: merge with DEV300_m88

15 files changed, 55 insertions, 107 deletions

diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index e9a0798761b9..fc92ebb38b0c 100644
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -48,9 +48,7 @@
 #include <memory>
 #include <sys/stat.h>
 
-#if defined(MAC)
-const char sNewLine = '\015';
-#elif defined(UNX)
+#if defined(UNX)
 const char sNewLine = '\012';
 #else
 const char sNewLine[] = "\015\012"; // \015\012 and not \n
@@ -464,8 +462,10 @@ void SAL_CALL ODriver::createCatalog( const Sequence< PropertyValue >& info ) th
     {
         TDatabaseStruct aDBInfo;
         fillInfo(info,aDBInfo);
-        static char envName[] = "DBSERVICE=0";
-        putenv( envName );
+
+        ::rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("DBSERVICE"));
+        ::rtl::OUString envData(RTL_CONSTASCII_USTRINGPARAM("0"));
+        osl_setEnvironment(envVar.pData, envData.pData);
 
         m_sDbRunDir = m_sDbWorkURL + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/wrk/")) + aDBInfo.sDBName;
         String sTemp;
@@ -854,7 +854,7 @@ void ODriver::createNeededDirs(const ::rtl::OUString& sDBName)
         if(UCBContentHelper::Exists(sTemp))
             UCBContentHelper::Kill(sTemp);
 
-#if !(defined(WIN) || defined(WNT))
+#if !(defined(WNT))
         sTemp = sDBConfig;
         sTemp += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diag"));
         if(!UCBContentHelper::IsFolder(sTemp))
@@ -876,7 +876,7 @@ void ODriver::createNeededDirs(const ::rtl::OUString& sDBName)
 void ODriver::clearDatabase(const ::rtl::OUString& sDBName)
 { // stop the database
     ::rtl::OUString sCommand;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     ::rtl::OUString sStop = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stop"));
     OArgumentList aArgs(2,&sDBName,&sStop);
     sCommand =  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x_cons.exe"));
@@ -921,7 +921,7 @@ void ODriver::createDb( const TDatabaseStruct& _aInfo)
     PutParam(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KERNELTRACESIZE")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("100")));
     PutParam(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LOG_QUEUE_PAGES")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10")));
 
-#if !(defined(WIN) || defined(WNT))
+#if !defined(WNT)
     PutParam(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OPMSG1")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/dev/null")));
 #endif
 
@@ -989,7 +989,7 @@ int ODriver::X_PARAM(const ::rtl::OUString& _DBNAME,
         ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
         pFileStream->Seek(STREAM_SEEK_TO_END);
         (*pFileStream)  << "x_param"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                         << ".exe"
 #endif
                         << " -d "
@@ -1000,7 +1000,7 @@ int ODriver::X_PARAM(const ::rtl::OUString& _DBNAME,
                         << ::rtl::OString(_PWD,_PWD.getLength(),gsl_getSystemTextEncoding())
                         << " "
                         << ::rtl::OString(_CMD,_CMD.getLength(),gsl_getSystemTextEncoding())
-#if (defined(WIN) || defined(WNT))
+#if defined(WNT)
 #if (OSL_DEBUG_LEVEL > 1) || defined(DBG_UTIL)
                         << " >> %DBWORK%\\create.log 2>&1"
 #endif
@@ -1050,7 +1050,7 @@ void ODriver::PutParam(const ::rtl::OUString& sDBName,
 {
     OArgumentList aArgs(3,&sDBName,&rWhat,&rHow);
     ::rtl::OUString sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("putparam"));
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     sCommand += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".exe"));
 #endif
 
@@ -1112,7 +1112,7 @@ OSL_TRACE("CreateFile %d",_nSize);
 int ODriver::X_START(const ::rtl::OUString& sDBName)
 {
     ::rtl::OUString sCommand;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 
     ::rtl::OUString sArg1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-d"));
     ::rtl::OUString sArg3 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBService"));
@@ -1150,7 +1150,7 @@ int ODriver::X_START(const ::rtl::OUString& sDBName)
 int ODriver::X_STOP(const ::rtl::OUString& sDBName)
 {
     ::rtl::OUString sCommand;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 
     ::rtl::OUString sArg1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-d"));
     ::rtl::OUString sArg2 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBService"));
@@ -1195,7 +1195,7 @@ void ODriver::XUTIL(const ::rtl::OUString& _rParam,
         ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
         pFileStream->Seek(STREAM_SEEK_TO_END);
         (*pFileStream)  <<
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                             "xutil.exe"
 #else
                             "utility"
@@ -1248,7 +1248,7 @@ void ODriver::LoadBatch(const ::rtl::OUString& sDBName,
         ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
         pFileStream->Seek(STREAM_SEEK_TO_END);
         (*pFileStream)  << "xload"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                         << ".exe"
 #endif
                         << " -d "
@@ -1317,7 +1317,7 @@ void ODriver::fillEnvironmentVariables()
 ::rtl::OUString ODriver::generateInitFile() const
 {
     String sExt;
-#if !(defined(WIN) || defined(WNT))
+#if !defined(WNT)
     sExt = String::CreateFromAscii(".sh");
 #else
     sExt = String::CreateFromAscii(".bat");
@@ -1325,13 +1325,13 @@ void ODriver::fillEnvironmentVariables()
 
     String sWorkUrl(m_sDbWorkURL);
     ::utl::TempFile aCmdFile(String::CreateFromAscii("Init"),&sExt,&sWorkUrl);
-#if !(defined(WIN) || defined(WNT))
+#if !defined(WNT)
     String sPhysicalPath;
     LocalFileHelper::ConvertURLToPhysicalName(aCmdFile.GetURL(),sPhysicalPath);
     chmod(ByteString(sPhysicalPath,gsl_getSystemTextEncoding()).GetBuffer(),S_IRUSR|S_IWUSR|S_IXUSR);
 #endif
 
-#if !(defined(WIN) || defined(WNT))
+#if !defined(WNT)
     SvStream* pFileStream = aCmdFile.GetStream(STREAM_WRITE);
     (*pFileStream)  << "#!/bin/sh"
                     << sNewLine
@@ -1441,7 +1441,7 @@ void ODriver::X_CONS(const ::rtl::OUString& sDBName,const ::rtl::OString& _ACTIO
         pFileStream->Seek(STREAM_SEEK_TO_END);
 
         (*pFileStream)  << "x_cons"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                         << ".exe"
 #endif
                         << " "
@@ -1524,7 +1524,7 @@ sal_Bool ODriver::isVersion(const ::rtl::OUString& sDBName, const char* _pVersio
         pFileStream->Seek(STREAM_SEEK_TO_END);
 
         (*pFileStream)  << "getparam"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                         << ".exe"
 #endif
                         << " "
@@ -1574,7 +1574,7 @@ void ODriver::checkAndInsertNewDevSpace(const ::rtl::OUString& sDBName,
         pFileStream->Seek(STREAM_SEEK_TO_END);
 
         (*pFileStream)  << "getparam"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                         << ".exe"
 #endif
                         << " "
@@ -1654,7 +1654,7 @@ sal_Bool ODriver::isKernelVersion(const char* _pVersion)
 // -----------------------------------------------------------------------------
 void ODriver::installSystemTables(  const TDatabaseStruct& _aInfo)
 {
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     //  xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% -b %m_sDbRoot%\env\TERMCHAR.ind
     ::rtl::OUString aBatch =  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-b "));
     ::rtl::OUString sTemp2 = m_sDbRootURL   + m_sDelimit
diff --git a/connectivity/source/drivers/adabas/BFunctions.cxx b/connectivity/source/drivers/adabas/BFunctions.cxx
index 3a57e4818e88..6d58c030a578 100644
--- a/connectivity/source/drivers/adabas/BFunctions.cxx
+++ b/connectivity/source/drivers/adabas/BFunctions.cxx
@@ -129,7 +129,7 @@ sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath)
     }
     const sal_Char* pLibraryAsciiName = NULL;
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     pLibraryAsciiName = "SQLOD32.DLL";
 #elif ( defined(SOLARIS) && defined(SPARC)) || defined(LINUX)
     pLibraryAsciiName = "odbclib.so";
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index c71d620d527c..0c5db12c3355 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -692,6 +692,10 @@ void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeExcept
 
 void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
 {
+ //   ::osl::MutexGuard aGuard( m_aMutex );
+    //checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
+ //   if ( getResultSetConcurrency() == ResultSetConcurrency::READ_ONLY )
+ //       throw SQLException();
 }
 // -------------------------------------------------------------------------
 
@@ -977,7 +981,7 @@ Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& ro
 sal_Int32 OResultSet::getResultSetConcurrency() const
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
-    sal_Int32 nValue=0;
+    sal_Int32 nValue=ResultSetConcurrency::READ_ONLY;
     LockTypeEnum eRet;
     if(!SUCCEEDED(m_pRecordSet->get_LockType(&eRet)))
     {
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 8544e4affda7..011d0e89ce7a 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -1432,16 +1432,8 @@ BOOL ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
     char aBuffer[512];              // write buffer
     memset(aBuffer,0,sizeof(aBuffer));
 
-#ifdef WIN
-    m_pMemoStream->Seek(0L);
-    for (UINT16 i = 0; i < 512; i++)
-    {
-        (*m_pMemoStream) << BYTE(0);
-    }
-#else
     m_pMemoStream->SetFiller('\0');
     m_pMemoStream->SetStreamSize(512);
-#endif
 
     m_pMemoStream->Seek(0L);
     (*m_pMemoStream) << long(1);                  // Zeiger auf ersten freien Block
@@ -2607,7 +2599,7 @@ void ODbaseTable::throwInvalidDbaseFormat()
     // no dbase file
 
     const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
-                STR_SQL_NAME_ERROR,
+                STR_INVALID_DBASE_FILE,
                 "$filename$", getEntry(m_pConnection,m_Name)
              ) );
     ::dbtools::throwGenericSQLException( sError, *this );
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 265084be697f..305e26d386e0 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -75,12 +75,7 @@ using namespace com::sun::star::sdbcx;
 using namespace com::sun::star::container;
 
 // Maximale Anzahl von Rows, die mit ORDER BY sortiert durchlaufen werden koennen:
-#if defined (WIN)
-#define MAX_KEYSET_SIZE 0x3ff0  // Etwas weniger als ein Segment, damit
-                                    // noch Platz fuer Memory Debug-Informationen
-#else
 #define MAX_KEYSET_SIZE 0x40000 // 256K
-#endif
 
 namespace
 {
@@ -1049,7 +1044,7 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
 //
     INT32 nTempPos = m_nRowPos;
     // exclusiver zugriff auf die Tabelle
-    //  NAMESPACE_VOS(OGuard)* pGuard = m_pTable->Lock();
+    //  vos::OGuard* pGuard = m_pTable->Lock();
 
     if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT &&
         !isCount())
@@ -1200,7 +1195,9 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
                 break;
         }
 
-        if (m_nRowPos == 0)
+        if ( m_nRowPos < 0 )
+            goto Error;
+        else if (m_nRowPos == 0)
         {
             // COUNT(*) in Ergebnisrow packen
             // (muss die erste und einzige Variable in der Row sein)
@@ -1407,7 +1404,7 @@ BOOL OResultSet::OpenImpl()
     m_nRowCountResult = -1;
 
     // exclusiver zugriff auf die Tabelle
-    //  NAMESPACE_VOS(OGuard)* pGuard = pTable->Lock();
+    //  vos::OGuard* pGuard = pTable->Lock();
     m_nLastVisitedPos = m_pTable->getCurrentLastPos();
 
     switch(m_aSQLIterator.getStatementType())
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index eff2464ce533..70be592405eb 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -159,7 +159,10 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
             (m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0)))
         {
             bNumeric = FALSE;
-            nStartPosFirstLine2 = nStartPosFirstLine;
+            if ( m_cStringDelimiter != '\0' )
+                aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
+            else
+                nStartPosFirstLine2 = nStartPosFirstLine;
         }
         else
         {
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index 1452df992a74..e7fab6acb6c0 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -234,7 +234,7 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js
     if ( xIn.is() )
     {
         jsize nLen = env->GetArrayLength(buffer);
-        if ( nLen < len )
+        if ( nLen < len || len <= 0 )
         {
             ThrowException( env,
                     "java/io/IOException",
@@ -439,21 +439,17 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst
         if ( xOut.is() )
         {
             jbyte *buf = env->GetByteArrayElements(buffer,NULL);
-#ifdef HSQLDB_DBG
-            OSL_ENSURE(len <= env->GetArrayLength(buffer),"Length is greater than the buffer!");
-#endif
-
             if (JNI_FALSE != env->ExceptionCheck())
             {
                 env->ExceptionClear();
                 OSL_ENSURE(0,"ExceptionClear");
             }
             OSL_ENSURE(buf,"buf is NULL");
-            if ( buf )
+            if ( buf && len > 0 && len <= env->GetArrayLength(buffer))
             {
                 Sequence< ::sal_Int8 > aData(buf + off,len);
-                xOut->writeBytes(aData);
                 env->ReleaseByteArrayElements(buffer, buf, JNI_ABORT);
+                xOut->writeBytes(aData);
 #ifdef HSQLDB_DBG
                 if ( logger )
                     logger->write( aData.getConstArray(), len );
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index afb4d0da2640..91626906a906 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -61,14 +61,15 @@ namespace connectivity
         {
             try
             {
-               m_xStream.clear();
-            m_xSeek.clear();
+                m_xStream.clear();
+                m_xSeek.clear();
                 if ( m_xInputStream.is() )
                 {
                     m_xInputStream->closeInput();
-                m_xInputStream.clear();
+                    m_xInputStream.clear();
                 }
-                if ( m_xOutputStream.is() )
+                // this is done implicity by the closing of the input stream
+                else if ( m_xOutputStream.is() )
                 {
                     m_xOutputStream->closeOutput();
                     try
@@ -83,11 +84,12 @@ namespace connectivity
                         OSL_UNUSED( e );
                         OSL_ENSURE(0,"Could not dispose OutputStream");
                     }
-                m_xOutputStream.clear();
+                    m_xOutputStream.clear();
                 }
             }
-            catch(Exception& )
+            catch(Exception& ex)
             {
+                OSL_UNUSED( ex );
                 OSL_ENSURE(0,"Exception catched!");
             }
         }
@@ -133,7 +135,7 @@ namespace connectivity
         ::rtl::OUString StorageContainer::removeOldURLPrefix(const ::rtl::OUString& _sURL)
         {
             ::rtl::OUString sRet = _sURL;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
             sal_Int32 nIndex = sRet.lastIndexOf('\\');
 #else
             sal_Int32 nIndex = sRet.lastIndexOf('/');
diff --git a/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx
index 2df75283a14b..fd52f3092c0e 100644
--- a/connectivity/source/drivers/jdbc/Boolean.cxx
+++ b/connectivity/source/drivers/jdbc/Boolean.cxx
@@ -49,20 +49,3 @@ jclass java_lang_Boolean::getMyClass() const
 {
     return st_getMyClass();
 }
-
-java_lang_Boolean::java_lang_Boolean( sal_Bool _par0 ): java_lang_Object( NULL, (jobject)NULL )
-{
-    SDBThreadAttach t;
-    // Java-Call fuer den Konstruktor absetzen
-    // temporaere Variable initialisieren
-    static const char * cSignature = "(Z)V";
-    jobject tempObj;
-    static jmethodID mID(NULL);
-    obtainMethodId(t.pEnv, "<init>",cSignature, mID);
-    tempObj = t.pEnv->NewObject( getMyClass(), mID, _par0 );
-    saveRef( t.pEnv, tempObj );
-    t.pEnv->DeleteLocalRef( tempObj );
-    // und aufraeumen
-}
-
-
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index 4866781d23dd..4f5670ace8aa 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -166,14 +166,6 @@ void java_lang_Object::saveRef( JNIEnv * pXEnv, jobject myObj )
 }
 
 
-java_lang_Class * java_lang_Object::getClass()
-{
-    SDBThreadAttach t;
-    static jmethodID mID(NULL);
-    jobject out = callObjectMethod(t.pEnv,"getClass","()Ljava/lang/Class;", mID);
-    return out ? new java_lang_Class( t.pEnv, out ) : NULL;
-}
-
 ::rtl::OUString java_lang_Object::toString() const
 {
     static jmethodID mID(NULL);
diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx
index e6102fc3a471..f32b0cce4325 100644
--- a/connectivity/source/drivers/jdbc/String.cxx
+++ b/connectivity/source/drivers/jdbc/String.cxx
@@ -52,26 +52,6 @@ jclass java_lang_String::st_getMyClass()
 }
 
 //--------------------------------------------------------------------------
-java_lang_String::java_lang_String( const ::rtl::OUString& _par0 ): java_lang_Object( NULL, (jobject)NULL )
-{
-    SDBThreadAttach t;
-    if( !t.pEnv )
-        return;
-    jvalue args[1];
-    // Parameter konvertieren
-    args[0].l = convertwchar_tToJavaString(t.pEnv,_par0);
-    // Java-Call fuer den Konstruktor absetzen
-    // temporaere Variable initialisieren
-    static const char * cSignature = "(Ljava/lang/String;)V";
-    jobject tempObj;
-    static jmethodID mID(NULL);
-    obtainMethodId(t.pEnv, "<init>",cSignature, mID);
-    tempObj = t.pEnv->NewObjectA( getMyClass(), mID, args );
-    saveRef( t.pEnv, tempObj );
-    t.pEnv->DeleteLocalRef( tempObj );
-    t.pEnv->DeleteLocalRef((jstring)args[0].l);
-}
-//--------------------------------------------------------------------------
 java_lang_String::operator ::rtl::OUString()
 {
     SDBThreadAttach t;
diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk
index 2a0dc5cd8999..219bdd6cd020 100644
--- a/connectivity/source/drivers/kab/makefile.mk
+++ b/connectivity/source/drivers/kab/makefile.mk
@@ -46,6 +46,9 @@ CFLAGS+=$(KDE_CFLAGS)
 
 .IF "$(KDE_ROOT)"!=""
 EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib
+.IF "$(OS)$(CPU)" == "LINUXX"
+EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib64
+.ENDIF
 .ENDIF
 
 # === KAB base library ==========================
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index b0757a201844..37562fa57d57 100644
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -249,7 +249,7 @@ EDriverType MozabDriver::impl_classifyURL( const ::rtl::OUString& url )
         const sal_Char* pScheme;
     } aSchemeMap[] =
     {
-#if defined(WNT) || defined(WIN)
+#if defined(WNT)
         { Outlook,          "outlook" },
         { OutlookExpress,   "outlookexp" },
 #endif
diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx
index d84c55787635..148c79ebadd4 100644
--- a/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -109,10 +109,6 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath)
 
     if (bLoaded)
         return sal_True;
-#ifdef WIN
-    _rPath = ::rtl::OUString::createFromAscii("ODBC.DLL");
-
-#endif
 #ifdef WNT
     _rPath = ::rtl::OUString::createFromAscii("ODBC32.DLL");
 #endif
diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx b/connectivity/source/drivers/odbcbase/OTools.cxx
index 43de55e3505c..d598de8bc12d 100644
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
@@ -578,7 +578,7 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
             // StarView zu lang ist oder der Treiber kann die Laenge der
             // Daten nicht im voraus bestimmen - also als MemoryStream
             // speichern.
-            while ((pcbValue == SQL_NO_TOTAL ) || pcbValue > nMaxLen)
+            while ((pcbValue == SQL_NO_TOTAL ) || nLen > nMaxLen)
             {
                 // Bei Strings wird der Puffer nie ganz ausgenutzt
                 // (das letzte Byte ist immer ein NULL-Byte, das