diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:45:03 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:45:03 +0000 |
| commit | 7b90a792944206491d2e88b426d3f861bad509dc (patch) | |
| tree | 60c7686b5520be63e948ec61512aac4ace5f93ad /rsc | |
| parent | 73849ccc28090d975ad8d68c8a77f6d4cdac6b16 (diff) | |
INTEGRATION: CWS warnings01 (1.5.8); FILE MERGED
2005/10/27 13:55:54 pl 1.5.8.1: #i55991# removed warnings for solaris platform
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/inc/rscdef.hxx | 6 | ||||
| -rw-r--r-- | rsc/inc/rsctools.hxx | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx index 4e2732d34dac..d28112395601 100644 --- a/rsc/inc/rscdef.hxx +++ b/rsc/inc/rscdef.hxx @@ -4,9 +4,9 @@ * * $RCSfile: rscdef.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 13:31:07 $ + * last change: $Author: hr $ $Date: 2006-06-20 05:44:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -153,6 +153,8 @@ protected: void SetName( const ByteString & rNewName ){ aName = rNewName; } void ChangeMacro( RscExpression * pExpression ); void ChangeMacro( INT32 lIdentifier ); + + using StringNode::Search; public: RscDefine * Search( const char * ); ULONG GetFileKey() const { return lFileKey; } diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx index 36da13513a68..f608df5652a5 100644 --- a/rsc/inc/rsctools.hxx +++ b/rsc/inc/rsctools.hxx @@ -4,9 +4,9 @@ * * $RCSfile: rsctools.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 13:34:34 $ + * last change: $Author: hr $ $Date: 2006-06-20 05:45:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -64,8 +64,8 @@ enum RSCBYTEORDER_TYPE { RSC_BIGENDIAN, RSC_LITTLEENDIAN, RSC_SYSTEMENDIAN }; ByteString GetTmpFileName(); BOOL Append( ByteString aDestFile, ByteString aSourceFile ); BOOL Append( FILE * fDest, ByteString aSourceFile ); -ByteString InputFile ( char * pInput, char * pExt ); -ByteString OutputFile( ByteString aInput, char * ext ); +ByteString InputFile ( const char * pInput, const char * pExt ); +ByteString OutputFile( ByteString aInput, const char * ext ); char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, sal_uInt32 nArgc ); void RscExit( sal_uInt32 nExit ); |