diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-12-17 18:18:07 +0100 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-12-17 18:18:07 +0100 |
| commit | 8e0bc401af211dfd134e8a2281bd38e3c21fc7a4 (patch) | |
| tree | 94d837ae236cccbb90ee48b3cba8d1d5df06bb70 /soldep | |
| parent | 3ea95386a5fdaedaa733db4c979c8096c8ec0148 (diff) | |
#158443# use module name as prefix to get an uniqe alias
Diffstat (limited to 'soldep')
| -rw-r--r-- | soldep/bootstrp/prj.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx index f81e03c5a7a3..c26f50ae3f7c 100644 --- a/soldep/bootstrp/prj.cxx +++ b/soldep/bootstrp/prj.cxx @@ -1639,7 +1639,8 @@ void Star::InsertToken ( char *yytext ) pStaticDepList = 0; break; case 1: - aDirName = yytext; + aDirName = yytext; + aProjectName = aDirName.GetToken ( 0, 0x5c); break; case 2: if ( !strcmp( yytext, ":" )) @@ -1674,7 +1675,6 @@ void Star::InsertToken ( char *yytext ) } if (bPrjDep) { - aProjectName = aDirName.GetToken ( 0, 0x5c); if ( HasProject( aProjectName )) { RemovePrj(GetPrj(aProjectName)); @@ -1708,7 +1708,7 @@ void Star::InsertToken ( char *yytext ) case 5: if ( !bPrjDep ) { - aLogFileName = yytext; + aLogFileName = (ByteString(aProjectName).Append("_")).Append(yytext); } break; default: @@ -1725,7 +1725,8 @@ void Star::InsertToken ( char *yytext ) // ggfs. Dependency liste anlegen und ergaenzen if ( !pStaticDepList ) pStaticDepList = new SByteStringList; - pStaticDepList->PutString( new ByteString( aItem )); + ByteString* pStr = new ByteString ((ByteString (aProjectName).Append("_")).Append(aItem)); + pStaticDepList->PutString( pStr ); } } else @@ -1748,7 +1749,6 @@ void Star::InsertToken ( char *yytext ) bHasModes = TRUE; } - aProjectName = aDirName.GetToken ( 0, 0x5c); if ( HasProject( aProjectName )) { pPrj = GetPrj( aProjectName ); @@ -1782,7 +1782,6 @@ void Star::InsertToken ( char *yytext ) der Solar-Projekte einfuegen */ if ( i == -1 ) { - aProjectName = aDirName.GetToken ( 0, 0x5c); if ( HasProject( aProjectName )) { pPrj = GetPrj( aProjectName ); |