INTEGRATION: CWS dr33 (1.87.32); FILE MERGED

2005/02/14 16:34:51 dr 1.87.32.1: #i42367# remove non-ASCII characters from C++ sources

1 files changed, 46 insertions, 46 deletions

diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index dcf2eb4082..c17cfb8784 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DTable.cxx,v $
  *
- *  $Revision: 1.87 $
+ *  $Revision: 1.88 $
  *
- *  last change: $Author: obo $ $Date: 2004-11-17 14:05:48 $
+ *  last change: $Author: vg $ $Date: 2005-02-16 17:24:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -124,7 +124,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #endif
 #ifndef _COMPHELPER_PROPERTY_HXX_
-#include <comphelper/property.hxx>	
+#include <comphelper/property.hxx>
 #endif
 #ifndef _UNOTOOLS_TEMPIFILE_HXX
 #include <unotools/tempfile.hxx>
@@ -376,7 +376,7 @@ void ODbaseTable::construct()
     m_aHeader.db_anz	= 0;
     m_aHeader.db_kopf	= 0;
     m_aHeader.db_slng	= 0;
-    
+
     String sFileName(getEntry(m_pConnection,m_Name));
 
     INetURLObject aURL;
@@ -452,7 +452,7 @@ BOOL ODbaseTable::ReadMemoHeader()
     (*m_pMemoStream) >> m_aMemoHeader.db_next;
     switch (m_aHeader.db_typ)
     {
-        case dBaseIIIMemo:  // dBase III: feste Blockgröße
+        case dBaseIIIMemo:  // dBase III: feste Blockgroesse
         case dBaseIVMemo:
             // manchmal wird aber auch dBase3 dBase4 Memo zugeordnet
             m_pMemoStream->Seek(20L);
@@ -461,7 +461,7 @@ BOOL ODbaseTable::ReadMemoHeader()
                 m_aMemoHeader.db_typ  = MemodBaseIV;
             else if (m_aMemoHeader.db_size > 1 && m_aMemoHeader.db_size == 512)
             {
-                // nun gibt es noch manche Dateien, die verwenden eine Gößenangabe,
+                // nun gibt es noch manche Dateien, die verwenden eine Groessenangabe,
                 // sind aber dennoch dBase Dateien
                 char sHeader[4];
                 m_pMemoStream->Seek(m_aMemoHeader.db_size);
@@ -514,7 +514,7 @@ String ODbaseTable::getEntry(OConnection* _pConnection,const ::rtl::OUString& _s
             {
                 sName = sName.replaceAt(sName.getLength()-(sExt.getLength()+1),sExt.getLength()+1,::rtl::OUString());
                 if ( sName == _sName )
-                {				
+                {
                     Reference< XContentAccess > xContentAccess( xDir, UNO_QUERY );
                     sURL = xContentAccess->queryContentIdentifierString();
                     break;
@@ -602,7 +602,7 @@ Sequence< Type > SAL_CALL ODbaseTable::getTypes(  ) throw(RuntimeException)
 {
     Sequence< Type > aTypes = OTable_TYPEDEF::getTypes();
     ::std::vector<Type> aOwnTypes;
-    aOwnTypes.reserve(aTypes.getLength());	
+    aOwnTypes.reserve(aTypes.getLength());
 
     const Type* pBegin = aTypes.getConstArray();
     const Type* pEnd = pBegin + aTypes.getLength();
@@ -651,10 +651,10 @@ Sequence< sal_Int8 > ODbaseTable::getUnoTunnelImplementationId()
 //------------------------------------------------------------------
 sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
 {
-    return (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) ) 
+    return (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ?
             (sal_Int64)this
-                : 
+                :
             ODbaseTable_BASE::getSomething(rId);
 }
 //------------------------------------------------------------------
@@ -964,7 +964,7 @@ void ODbaseTable::throwInvalidColumnType(const ::rtl::OUString& _sError,const ::
     throw SQLException(sMsg,*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any());
 }
 //------------------------------------------------------------------
-// erzeugt grundsätzlich dBase IV Datei Format
+// erzeugt grundsaetzlich dBase IV Datei Format
 BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
 {
     bCreateMemo = sal_False;
@@ -985,13 +985,13 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
 
     (*m_pFileStream) << (BYTE) aDate.GetMonth();
     (*m_pFileStream) << (BYTE) aDate.GetDay();
-    (*m_pFileStream) << 0L;                                                                                                     // Anzahl der Datensätze
+    (*m_pFileStream) << 0L;                                                                                                     // Anzahl der Datensaetze
     (*m_pFileStream) << (USHORT)((m_pColumns->getCount()+1) * 32 + 1);                // Kopfinformationen,
-                                                                        // pColumns erhält immer eine Spalte mehr
-    (*m_pFileStream) << (USHORT) 0;                                                                                     // Satzlänge wird später bestimmt
+                                                                        // pColumns erhaelt immer eine Spalte mehr
+    (*m_pFileStream) << (USHORT) 0;                                                                                     // Satzlaenge wird spaeter bestimmt
     m_pFileStream->Write(aBuffer, 20);
 
-    USHORT nRecLength = 1;                                                                                          // Länge 1 für deleted flag
+    USHORT nRecLength = 1;                                                                                          // Laenge 1 fuer deleted flag
     sal_Int32  nMaxFieldLength = m_pConnection->getMetaData()->getMaxColumnNameLength();
     Reference<XIndexAccess> xColumns(getColumns(),UNO_QUERY);
 
@@ -1074,14 +1074,14 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
                 {
                     throwInvalidColumnType(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid precision for column: ")), aName);
                 }
-                (*m_pFileStream) << (BYTE) Min((ULONG)nPrecision, 255UL);      //Feldlänge
+                (*m_pFileStream) << (BYTE) Min((ULONG)nPrecision, 255UL);      //Feldlaenge
                 nRecLength += (USHORT)Min((ULONG)nPrecision, 255UL);
                 (*m_pFileStream) << (BYTE)0;                                                                //Nachkommastellen
                 break;
             case 'F':
             case 'N':
                 OSL_ENSURE(nPrecision >=  nScale,
-                           "ODbaseTable::Create: Feldlänge muß größer Nachkommastellen sein!");
+                           "ODbaseTable::Create: Feldlaenge muss groesser Nachkommastellen sein!");
                 if (nPrecision <  nScale)
                 {
                     throwInvalidColumnType(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Precision is less than scale for column: ")), aName);
@@ -1127,7 +1127,7 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
 
     (*m_pFileStream) << (BYTE)0x0d;                                     // kopf ende
     m_pFileStream->Seek(10L);
-    (*m_pFileStream) << nRecLength;                                     // satzlänge nachträglich eintragen
+    (*m_pFileStream) << nRecLength;                                     // Satzlaenge nachtraeglich eintragen
 
     if (bCreateMemo)
     {
@@ -1138,12 +1138,12 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
 }
 
 //------------------------------------------------------------------
-// erzeugt grundsätzlich dBase III Datei Format
+// erzeugt grundsaetzlich dBase III Datei Format
 BOOL ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
 {
-    // Makro zum Filehandling fürs Erzeugen von Tabellen
+    // Makro zum Filehandling fuers Erzeugen von Tabellen
     m_pMemoStream = createStream_simpleError( aFile.GetMainURL(INetURLObject::NO_DECODE),STREAM_READWRITE | STREAM_SHARE_DENYWRITE);
-    
+
     if (!m_pMemoStream)
         return sal_False;
 
@@ -1239,7 +1239,7 @@ BOOL ODbaseTable::DropImpl()
 //------------------------------------------------------------------
 BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<XIndexAccess>& _xCols)
 {
-    // Buffer mit Leerzeichen füllen
+    // Buffer mit Leerzeichen fuellen
     AllocBuffer();
     memset(m_pBuffer, ' ', m_aHeader.db_slng);
 
@@ -1264,10 +1264,10 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X
 
         if (!WriteBuffer())
         {
-            m_pFileStream->SetStreamSize(nFileSize);				// alte Größe restaurieren
+            m_pFileStream->SetStreamSize(nFileSize);                // alte Groesse restaurieren
 
             if (HasMemoFields() && m_pMemoStream)
-                m_pMemoStream->SetStreamSize(nMemoFileSize);	// alte Größe restaurieren
+                m_pMemoStream->SetStreamSize(nMemoFileSize);    // alte Groesse restaurieren
             m_nFilePos = nTempPos;								// Fileposition restaurieren
         }
         else
@@ -1280,7 +1280,7 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X
             if (bFlush)
                 m_pFileStream->Flush();
 
-            // bei Erfolg # erhöhen
+            // bei Erfolg # erhoehen
             m_aHeader.db_anz++;
             *rRow[0] = m_nFilePos;							    // BOOKmark setzen
             m_nFilePos = nTempPos;
@@ -1295,7 +1295,7 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X
 //------------------------------------------------------------------
 BOOL ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const Reference<XIndexAccess>& _xCols)
 {
-    // Buffer mit Leerzeichen füllen
+    // Buffer mit Leerzeichen fuellen
     AllocBuffer();
 
     // Auf gewuenschten Record positionieren:
@@ -1312,7 +1312,7 @@ BOOL ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const R
     if (!UpdateBuffer(rRow, pOrgRow,_xCols) || !WriteBuffer())
     {
         if (HasMemoFields() && m_pMemoStream)
-            m_pMemoStream->SetStreamSize(nMemoFileSize);	// alte Größe restaurieren
+            m_pMemoStream->SetStreamSize(nMemoFileSize);    // alte Groesse restaurieren
     }
     else
     {
@@ -1539,7 +1539,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const
             }
         }
 
-        
+
 
         ++nPos; // the row values start at 1
         // Ist die Variable ueberhaupt gebunden?
@@ -1562,7 +1562,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const
                 pIndex->Insert(m_nFilePos,*rRow[nPos]);
         }
 
-        
+
 
         char* pData = (char *)(m_pBuffer + nByteOffset);
         if (rRow[nPos]->getValue().isNull())
@@ -1589,7 +1589,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const
                     char s[9];
                     snprintf(s,
                         sizeof(s),
-                        "%04d%02d%02d",						
+                        "%04d%02d%02d",
                         (int)aDate.Year,
                         (int)aDate.Month,
                         (int)aDate.Day);
@@ -1840,7 +1840,7 @@ void SAL_CALL ODbaseTable::alterColumnByName( const ::rtl::OUString& colName, co
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
-        
+
 
     Reference<XDataDescriptorFactory> xOldColumn;
     m_pColumns->getByName(colName) >>= xOldColumn;
@@ -1852,7 +1852,7 @@ void SAL_CALL ODbaseTable::alterColumnByIndex( sal_Int32 index, const Reference<
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
-        
+
     if(index < 0 || index >= m_pColumns->getCount())
         throw IndexOutOfBoundsException(::rtl::OUString::valueOf(index),*this);
 
@@ -1878,11 +1878,11 @@ void ODbaseTable::alterColumn(sal_Int32 index,
             xCopyColumn = xOldColumn->createDataDescriptor();
         else
             xCopyColumn = new OColumn(getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
-         
+
         ::comphelper::copyProperties(descriptor,xCopyColumn);
 
         // creates a temp file
-        
+
         String sTempName = createTempFile();
 
         pNewTable = new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection));
@@ -1890,7 +1890,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
         pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName)));
         Reference<XAppend> xAppend(pNewTable->getColumns(),UNO_QUERY);
         OSL_ENSURE(xAppend.is(),"ODbaseTable::alterColumn: No XAppend interface!");
-        
+
         // copy the structure
         sal_Int32 i=0;
         for(;i < index;++i)
@@ -1936,12 +1936,12 @@ void ODbaseTable::alterColumn(sal_Int32 index,
 
         // copy the data
         copyData(pNewTable,0);
-                         
+
         // now drop the old one
         if( DropImpl() ) // we don't want to delete the memo columns too
         {
             // rename the new one to the old one
-            pNewTable->renameImpl(m_Name); 
+            pNewTable->renameImpl(m_Name);
             // release the temp file
             pNewTable = NULL;
             ::comphelper::disposeComponent(xHoldTable);
@@ -1954,7 +1954,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
         construct();
         if(m_pColumns)
             m_pColumns->refresh();
-        
+
     }
     catch(const SQLException&)
     {
@@ -1967,8 +1967,8 @@ void ODbaseTable::alterColumn(sal_Int32 index,
     }
 }
 // -----------------------------------------------------------------------------
-Reference< XDatabaseMetaData> ODbaseTable::getMetaData() const 
-{ 
+Reference< XDatabaseMetaData> ODbaseTable::getMetaData() const
+{
     return getConnection()->getMetaData();
 }
 // -------------------------------------------------------------------------
@@ -1978,7 +1978,7 @@ void SAL_CALL ODbaseTable::rename( const ::rtl::OUString& newName ) throw(::com:
     checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
     if(m_pTables && m_pTables->hasByName(newName))
         throw ElementExistException(newName,*this);
-        
+
 
     renameImpl(newName);
 
@@ -1987,7 +1987,7 @@ void SAL_CALL ODbaseTable::rename( const ::rtl::OUString& newName ) throw(::com:
     construct();
     if(m_pColumns)
         m_pColumns->refresh();
-}								   
+}
 namespace
 {
     void renameFile(OConnection* _pConenction,const ::rtl::OUString& oldName,
@@ -2038,7 +2038,7 @@ void SAL_CALL ODbaseTable::renameImpl( const ::rtl::OUString& newName ) throw(::
 
 
     renameFile(m_pConnection,m_Name,newName,m_pConnection->getExtension());
-    if ( HasMemoFields() )			
+    if ( HasMemoFields() )
     {  // delete the memo fields
         String sExt = String::CreateFromAscii("dbt");
         renameFile(m_pConnection,m_Name,newName,sExt);
@@ -2179,7 +2179,7 @@ String ODbaseTable::createTempFile()
     String sExt;
     sExt.AssignAscii(".");
     sExt += m_pConnection->getExtension();
-    
+
     String sName(m_Name);
     TempFile aTempFile(sName,&sExt,&sTempName);
     if(!aTempFile.IsValid())
@@ -2212,7 +2212,7 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
     if(_nPos && (_nPos < (sal_Int32)aRow->size()))
         (*aRow)[nPos]->setBound(sal_False);
 
-    
+
     sal_Bool bOk = sal_True;
     sal_Int32 nCurPos;
     OValueRefVector::iterator aIter;
@@ -2256,7 +2256,7 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
     }
 }
 // -----------------------------------------------------------------------------
-void ODbaseTable::throwInvalidDbaseFormat() 
+void ODbaseTable::throwInvalidDbaseFormat()
 {
     FileClose();
     // no dbase file