diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-10-24 07:21:00 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-10-24 07:21:00 +0000 |
| commit | f4a2c2d566bac768be0c421dfa280528e0daec37 (patch) | |
| tree | bd4a3c7634dd85dfd84d15c0d3d938e8a6a9e349 /connectivity | |
| parent | bc695a139afdcc0507d8c404b33129340db52fd1 (diff) | |
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
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/file/FConnection.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index c98833467898..6d29d9a32d4c 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -4,9 +4,9 @@ * * $RCSfile: FConnection.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: rt $ $Date: 2005-09-08 05:54:59 $ + * last change: $Author: rt $ $Date: 2005-10-24 08:21:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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 @@ OConnection::OConnection(OFileDriver* _pDriver) ,m_bCheckSQL92(sal_False) { ModuleContext::AddRef(); + m_nTextEncoding = RTL_TEXTENCODING_DONTKNOW; } //----------------------------------------------------------------------------- OConnection::~OConnection() @@ -189,9 +193,6 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV 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 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV { 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() ) |