User: rt Date: 05/10/24 01:21:03 Modified: /dba/connectivity/source/drivers/file/ FConnection.cxx
Log: INTEGRATION: CWS dba201d (1.41.10); FILE MERGED 2005/10/10 06:43:58 fs 1.41.10.3: #i10000# previous commit was wrong 2005/10/04 10:52:45 oj 1.41.10.2: commit from dba201c 2005/09/27 08:12:33 oj 1.41.10.1: commits from dba201c File Changes: Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: FConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FConnection.cxx?r1=1.41&r2=1.42 Delta lines: +22 -15 --------------------- --- FConnection.cxx 8 Sep 2005 05:54:59 -0000 1.41 +++ FConnection.cxx 24 Oct 2005 08:21:00 -0000 1.42 @@ -93,6 +93,9 @@ #ifndef _OSL_THREAD_H_ #include <osl/thread.h> #endif +#ifndef _OSL_NLSUPPORT_H_ +#include <osl/nlsupport.h> +#endif #ifndef _CONNECTIVITY_MODULECONTEXT_HXX_ #include "ModuleContext.hxx" #endif @@ -121,6 +124,7 @@ ,m_bCheckSQL92(sal_False) { ModuleContext::AddRef(); + m_nTextEncoding = RTL_TEXTENCODING_DONTKNOW; } //----------------------------------------------------------------------------- OConnection::~OConnection() @@ -189,9 +193,6 @@ m_nTextEncoding = (*aLookup).getEncoding(); else m_nTextEncoding = RTL_TEXTENCODING_DONTKNOW; - if(m_nTextEncoding == RTL_TEXTENCODING_DONTKNOW) - m_nTextEncoding = osl_getThreadTextEncoding(); - } else if (0 == pBegin->Name.compareToAscii("ShowDeleted")) { @@ -201,6 +202,12 @@ { pBegin->Value >>= m_bCheckSQL92; } + } // for(;pBegin != pEnd;++pBegin) + + if ( m_nTextEncoding == RTL_TEXTENCODING_DONTKNOW ) + { + //m_nTextEncoding = osl_getTextEncodingFromLocale(NULL); + m_nTextEncoding = osl_getThreadTextEncoding(); } if ( aExt.getLength() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
