diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-21 11:21:23 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-21 11:21:23 +0000 |
| commit | a70311b5f1e53614063d353c2aaa57c1a311bf34 (patch) | |
| tree | f17f97d9349f61cea8a93b1ced97279fab3252f0 /soldep | |
| parent | 914da9d546de5b4ffac0327ccfa4e583902a349d (diff) | |
INTEGRATION: CWS soldep2 (1.2.2); FILE MERGED
2006/11/21 16:27:52 obo 1.2.2.1: #143484# dialog for workspace has to support minors
Diffstat (limited to 'soldep')
| -rw-r--r-- | soldep/bootstrp/prj.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx index c50f6ea2fe75..83eb9417fe9c 100644 --- a/soldep/bootstrp/prj.cxx +++ b/soldep/bootstrp/prj.cxx @@ -4,9 +4,9 @@ * * $RCSfile: prj.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: kz $ $Date: 2006-12-12 16:32:39 $ + * last change: $Author: ihi $ $Date: 2006-12-21 12:21:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2269,7 +2269,7 @@ StarWriter::StarWriter( XmlBuildList* pXmlBuildListObj, SolarFileList *pSolarFil /*****************************************************************************/ StarWriter::StarWriter( XmlBuildList* pXmlBuildListObj, GenericInformationList *pStandLst, ByteString &rVersion, - BOOL bReadComments, BOOL bLocal, const char *pSourceRoot ) + ByteString &rMinor, BOOL bReadComments, BOOL bLocal, const char *pSourceRoot ) /*****************************************************************************/ : Star (pXmlBuildListObj) { @@ -2343,7 +2343,13 @@ StarWriter::StarWriter( XmlBuildList* pXmlBuildListObj, GenericInformationList * #else sAddPath.SearchAndReplaceAll( "/", "\\" ); #endif + //If Minor has been set add it to path + if (rMinor.Len()>0) { + sAddPath += "."; + sAddPath += rMinor; + } String ssAddPath( sAddPath, RTL_TEXTENCODING_ASCII_US ); + aEntry += DirEntry( ssAddPath ); } } |