Kaydet (Commit) 37244723 authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien

INTEGRATION: CWS warnings01 (1.7.30); FILE MERGED

2006/05/23 23:32:27 sb 1.7.30.4: RESYNC: (1.8-1.9); FILE MERGED
2006/01/25 20:49:00 sb 1.7.30.3: RESYNC: (1.7-1.8); FILE MERGED
2005/11/16 12:58:57 fs 1.7.30.2: #i57457# warning free code
2005/11/07 14:43:23 fs 1.7.30.1: #i57457# warning-free code
üst dbce3558
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: LFolderList.cxx,v $ * $RCSfile: LFolderList.cxx,v $
* *
* $Revision: 1.9 $ * $Revision: 1.10 $
* *
* last change: $Author: vg $ $Date: 2006-04-07 13:09:45 $ * last change: $Author: hr $ $Date: 2006-06-20 01:22:58 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -136,12 +136,11 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal ...@@ -136,12 +136,11 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
{ {
BOOL bRead = TRUE; BOOL bRead = TRUE;
OEvoabString aHeaderLine; QuotedTokenizedString aHeaderLine;
OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection; OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
// read first row // read first row
OEvoabString aFirstLine; QuotedTokenizedString aFirstLine;
bRead = m_pFileStream->ReadByteStringLine(aFirstLine,pConnection->getTextEncoding()); bRead = m_pFileStream->ReadByteStringLine(aFirstLine,pConnection->getTextEncoding());
while(bRead && !aFirstLine.Len()) while(bRead && !aFirstLine.Len())
...@@ -176,7 +175,6 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal ...@@ -176,7 +175,6 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
String aColumnName; String aColumnName;
::rtl::OUString aTypeName; ::rtl::OUString aTypeName;
::comphelper::UStringMixEqual aCase(bCase); ::comphelper::UStringMixEqual aCase(bCase);
xub_StrLen nStartPosHeaderLine = 0; // use for eficient way to get the tokens
xub_StrLen nStartPosFirstLine = 0; // use for eficient way to get the tokens xub_StrLen nStartPosFirstLine = 0; // use for eficient way to get the tokens
xub_StrLen nStartPosFirstLine2 = 0; xub_StrLen nStartPosFirstLine2 = 0;
for (xub_StrLen i = 0; i < nFieldCount; i++) for (xub_StrLen i = 0; i < nFieldCount; i++)
...@@ -191,7 +189,6 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal ...@@ -191,7 +189,6 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
UINT16 nScale = 0; UINT16 nScale = 0;
BOOL bNumeric = FALSE; BOOL bNumeric = FALSE;
double nRes=0.0;
ULONG nIndex = 0; ULONG nIndex = 0;
// first without fielddelimiter // first without fielddelimiter
...@@ -343,28 +340,18 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal ...@@ -343,28 +340,18 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
m_aScales.push_back(nScale); m_aScales.push_back(nScale);
} }
m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN); m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
}
// -------------------------------------------------------------------------
OEvoabFolderList::OEvoabFolderList(OEvoabConnection* _pConnection)
{
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
DBG_NAME( OEvoabFolderList ); DBG_NAME( OEvoabFolderList );
OEvoabFolderList::OEvoabFolderList( OEvoabConnection* _pConnection, OEvoabFolderList::OEvoabFolderList(OEvoabConnection* _pConnection)
const ::rtl::OUString& _Name, :m_nFilePos(0)
const ::rtl::OUString& _Type
)
:m_pConnection(_pConnection)
,m_nFilePos(0)
,m_pFileStream(NULL) ,m_pFileStream(NULL)
,m_pConnection(_pConnection)
,m_bIsNull(sal_False) ,m_bIsNull(sal_False)
{ {
DBG_CTOR( OEvoabFolderList, NULL ); DBG_CTOR( OEvoabFolderList, NULL );
m_aColumns = new OSQLColumns(); m_aColumns = new OSQLColumns();
EVO_TRACE_STRING("OEvoabFolderList::constructor::_Name = %s\n", _Name );
EVO_TRACE_STRING("OEvoabFolderList::constructor::_Type = %s\n", _Type );
construct(); construct();
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
...@@ -412,13 +399,9 @@ void OEvoabFolderList::construct() ...@@ -412,13 +399,9 @@ void OEvoabFolderList::construct()
//------------------------------------------------------------------ //------------------------------------------------------------------
sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols) sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols)
{ {
//OSL_TRACE("OEvoabFolderList::fetchRow()::entered in" );
(*_rRow)[0] = m_nFilePos; // the "bookmark" (*_rRow)[0] = m_nFilePos; // the "bookmark"
//OSL_TRACE("OEvoabFolderList::fetchRow()::after *_rRow" );
OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection; OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
sal_Int32 nByteOffset = 1;
// Felder: // Felder:
xub_StrLen nStartPos = 0; xub_StrLen nStartPos = 0;
String aStr; String aStr;
...@@ -433,7 +416,6 @@ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols) ...@@ -433,7 +416,6 @@ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols)
else else
{ {
// length depending on the data type // length depending on the data type
sal_Int32 nLen = m_aPrecisions[i];
sal_Int32 nType = m_aTypes[i]; sal_Int32 nType = m_aTypes[i];
switch(nType) switch(nType)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment