Tag: cws_src680_warnings01 User: pl Date: 05/11/07 11:06:51 Modified: /dba/connectivity/source/drivers/file/ FConnection.cxx
Log: RESYNC: (1.41-1.42); FILE MERGED 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.12.1&r2=1.41.12.2 Delta lines: +13 -6 -------------------- --- FConnection.cxx 7 Nov 2005 14:43:27 -0000 1.41.12.1 +++ FConnection.cxx 7 Nov 2005 19:06:48 -0000 1.41.12.2 @@ -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]
