diff options
| author | Sander Vesik <svesik@openoffice.org> | 2001-06-04 22:04:45 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2001-06-04 22:04:45 +0000 |
| commit | 44d1e99bd2376dedd57fd6540b9f489a700750ac (patch) | |
| tree | 25aa02f5c101d7a4ffccf206f19503bd5653bbe4 /tools/bootstrp | |
| parent | c5a91d5e7a1f5cc9de055563a2b584aa01c62973 (diff) | |
Merge fix from OO627B to trunk
Diffstat (limited to 'tools/bootstrp')
| -rw-r--r-- | tools/bootstrp/mkcreate.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/tools/bootstrp/mkcreate.cxx b/tools/bootstrp/mkcreate.cxx index b9ebc6c81f43..a01452b6ca88 100644 --- a/tools/bootstrp/mkcreate.cxx +++ b/tools/bootstrp/mkcreate.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mkcreate.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: nf $ $Date: 2001-05-21 14:52:23 $ + * last change: $Author: svesik $ $Date: 2001-06-04 23:04:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -130,7 +130,7 @@ CodedDependency *SourceDirectory::AddCodedDependency( } else { ULONG nPos = - pCodedDependencies->IsString( & ( ByteString ) rCodedIdentifier ); + pCodedDependencies->IsString( (ByteString *) (& rCodedIdentifier) ); if ( nPos == NOT_THERE ) { pReturn = new CodedDependency( rCodedIdentifier, nOperatingSystems ); @@ -159,7 +159,7 @@ CodedDependency *SourceDirectory::AddCodedIdentifier( } else { ULONG nPos = - pCodedIdentifier->IsString( & ( ByteString ) rCodedIdentifier ); + pCodedIdentifier->IsString( ( ByteString *) (& rCodedIdentifier) ); if ( nPos == NOT_THERE ) { pReturn = new CodedDependency( rCodedIdentifier, nOperatingSystems ); @@ -625,11 +625,12 @@ SourceDirectory *SourceDirectory::CreateRootDirectory( ByteString sDefLst( GetDefStandList()); ByteString sStandLst( aIniManager.ToLocal( sDefLst )); + String s = String( sStandLst, gsl_getSystemTextEncoding()); InformationParser aParser; fprintf( stderr, "Reading database %s ...\n", sStandLst.GetBuffer()); GenericInformationList *pVerList = aParser.Execute( - String( sStandLst, gsl_getSystemTextEncoding())); + s ); /* ByteString sPath( rVersion ); @@ -800,9 +801,9 @@ BOOL SourceDirectory::CreateRecursiveMakefile( BOOL bAllChilds ) "#\n" "# $RCSfile: mkcreate.cxx,v $\n" "#\n" - "# $Revision: 1.8 $\n" + "# $Revision: 1.9 $\n" "#\n" - "# last change: $Author: nf $ $Date: 2001-05-21 14:52:23 $\n" + "# last change: $Author: svesik $ $Date: 2001-06-04 23:04:45 $\n" "#\n" "# The Contents of this file are made available subject to the terms of\n" "# either of the following licenses\n" @@ -1060,7 +1061,7 @@ SourceDirectory *SourceDirectoryList::Search( const ByteString &rDirectoryName ) /*****************************************************************************/ { - ULONG nPos = IsString( & ( ByteString ) rDirectoryName ); + ULONG nPos = IsString( ( ByteString * ) (&rDirectoryName) ); if ( nPos != LIST_ENTRY_NOTFOUND ) return ( SourceDirectory * ) GetObject( nPos ); |