diff options
| author | Joseph Powers <jpowers27@cox.net> | 2011-04-29 09:06:51 -0700 |
|---|---|---|
| committer | Joseph Powers <jpowers27@cox.net> | 2011-04-29 15:08:33 -0700 |
| commit | fe4b4f71bbd256bb76abfa3391df02c7190b0aa0 (patch) | |
| tree | 7b481d7be0c1104bc34d41b4e382d5e7898e7ed8 /rsc | |
| parent | b78698e14fe1afc4c210ae749d0a4e855826b113 (diff) | |
Convert some more LIST_APPENDs into ULONG_MAX.
Also remove references to tools/list.hxx
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/parser/rsclex.cxx | 4 | ||||
| -rw-r--r-- | rsc/source/parser/rscyacc.cxx | 1 | ||||
| -rw-r--r-- | rsc/source/parser/rscyacc.y | 8 |
3 files changed, 6 insertions, 7 deletions
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx index 0f59c7ab4cdf..348bfd2aa0fb 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 efef5f3b42ff..c795abcc1fc9 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 329884e498b6..24240d184236 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; } |