INTEGRATION: CWS warnings01 (1.3.6); FILE MERGED

2005/10/27 16:03:15 sb 1.3.6.2: #i53898# Made code warning-free.
2005/10/14 11:27:20 sb 1.3.6.1: #i53898# Made code warning-free.

1 files changed, 9 insertions, 32 deletions

diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 6edb9e8cebb6..729932a2d4f2 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: lex.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 17:48:50 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 10:41:35 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -46,8 +46,6 @@
 #include <tools/bigint.hxx>
 #endif
 
-#pragma hdrstop
-
 /****************** SvToken **********************************************/
 /*************************************************************************
 |*
@@ -85,6 +83,7 @@ ByteString SvToken::GetTokenAsString() const
             aStr = "RTTIBASE";//(ULONG)pComplexObj;
             break;
         case SVTOKEN_EOF:
+        case SVTOKEN_HASHID:
             break;
     }
 
@@ -135,6 +134,8 @@ ByteString SvToken::Print() const
         case SVTOKEN_EOF:
             aStr += "end of file";
             break;
+        case SVTOKEN_HASHID:
+            break;
     }
     aStr += GetTokenAsString();
 
@@ -227,9 +228,9 @@ void SvTokenStream::InitCtor()
 |*    Beschreibung
 *************************************************************************/
 SvTokenStream::SvTokenStream( const String & rFileName )
-    : aFileName( rFileName )
-    , pInStream( new SvFileStream( rFileName, STREAM_STD_READ | STREAM_NOCREATE ) )
+    : pInStream( new SvFileStream( rFileName, STREAM_STD_READ | STREAM_NOCREATE ) )
     , rInStream( *pInStream )
+    , aFileName( rFileName )
     , aTokList( 0x8000, 0x8000 )
 {
     InitCtor();
@@ -241,9 +242,9 @@ SvTokenStream::SvTokenStream( const String & rFileName )
 |*    Beschreibung
 *************************************************************************/
 SvTokenStream::SvTokenStream( SvStream & rStream, const String & rFileName )
-    : aFileName( rFileName )
-    , pInStream( NULL )
+    : pInStream( NULL )
     , rInStream( rStream )
+    , aFileName( rFileName )
     , aTokList( 0x8000, 0x8000 )
 {
     InitCtor();
@@ -359,30 +360,6 @@ BOOL SvTokenStream::Skip( char cStart, char cEnd, UINT32 * pBegin )
 }
 
 /*************************************************************************
-|*    SvTokenStream::Replace()
-|*
-|*    Beschreibung
-|*    Invariante        Range immer gueltig
-*************************************************************************/
-void SvTokenStream::Replace( const Range & rRange, SvToken * pNewTok )
-{
-    // Robuster SeekCursor
-    ULONG nSeekPos = aTokList.GetCurPos();
-    if( nSeekPos >= (ULONG)rRange.Min() )
-        if( nSeekPos <= (ULONG)rRange.Max() )
-            nSeekPos = rRange.Min();
-        else
-            nSeekPos -= rRange.Len();
-
-    long nLen = rRange.Len();
-    aTokList.Seek( (ULONG)rRange.Min() );
-    while( nLen-- )
-        delete aTokList.Remove();
-
-    Seek( nSeekPos );
-}
-
-/*************************************************************************
 |*    SvTokenStrem::SetCharSet()
 |*
 |*    Beschreibung