[Libreoffice-commits] .: rsc/source

[Joseph Powers]

 rsc/source/parser/rsclex.cxx  |    4 ++--
 rsc/source/parser/rscyacc.cxx |    1 -
 rsc/source/parser/rscyacc.y   |    8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 555254468bf22841fcb096e5a08a8ebbd0be1801
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Fri Apr 29 09:06:51 2011 -0700

    Convert some more LIST_APPENDs into ULONG_MAX.
    
    Also remove references to tools/list.hxx

diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index f6eae33..2ca98e3 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -380,12 +380,12 @@ void IncludeParser( RscFileInst * pFileInst )
                 if( STRING == (nToken = MakeToken( &aYYSType )) ){
                     lKey = pTypCon->aFileTab.NewIncFile( aYYSType.string,
                                                          aYYSType.string );
-                    pFName->InsertDependFile( lKey, LIST_APPEND );
+                    pFName->InsertDependFile( lKey, ULONG_MAX );
                 }
                 else if( INCLUDE_STRING == nToken ){
                     lKey = pTypCon->aFileTab.NewIncFile( aYYSType.string,
                                                          ByteString() );
-                    pFName->InsertDependFile( lKey, LIST_APPEND );
+                    pFName->InsertDependFile( lKey, ULONG_MAX );
                 };
             };
         };
diff --git a/rsc/source/parser/rscyacc.cxx b/rsc/source/parser/rscyacc.cxx
index 3c5bea5..f70f207 100644
--- a/rsc/source/parser/rscyacc.cxx
+++ b/rsc/source/parser/rscyacc.cxx
@@ -33,7 +33,6 @@
 #include <string.h>
 
 #include <tools/rc.h>
-#include <tools/list.hxx>
 #include <rscerror.h>
 #include <rsctools.hxx>
 #include <rscclass.hxx>
diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y
index 329884e..24240d1 100644
--- a/rsc/source/parser/rscyacc.y
+++ b/rsc/source/parser/rscyacc.y
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -148,7 +148,7 @@ resource_definition
 		if( $4.IsNumber() ){
 			if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(),
 									   ByteString( $3 ),
-									   $4.GetLong(), LIST_APPEND ) )
+									   $4.GetLong(), ULONG_MAX ) )
 				bError = sal_True;
 		}
 		else if( $4.IsDefinition() ){
@@ -161,13 +161,13 @@ resource_definition
 			pExpr = new RscExpression( aExpType, '+', $4 );
 
 			if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(),
-									   ByteString( $3 ), pExpr, LIST_APPEND ) )
+									   ByteString( $3 ), pExpr, ULONG_MAX ) )
 				bError = sal_True;
 		}
 		else if( $4.IsExpression() ){
 			if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(),
 									   ByteString( $3 ), $4.aExp.pExp,
-									   LIST_APPEND ) )
+									   ULONG_MAX ) )
 				bError = sal_True;
 		}