#100000# some catch-up fixes for bserver48

2 files changed, 16 insertions, 28 deletions

diff --git a/soldep/bootstrp/makefile.mk b/soldep/bootstrp/makefile.mk
index f65a2ff88836..d38b25982b86 100644
--- a/soldep/bootstrp/makefile.mk
+++ b/soldep/bootstrp/makefile.mk
@@ -50,8 +50,7 @@ all:
 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES= \
-          $(SLO)$/prj.obj	\
-          $(SLO)$/XmlBuildList.obj
+          $(SLO)$/prj.obj	
 
 SLOFILES=\
           $(SLO)$/dep.obj \
@@ -61,10 +60,6 @@ SLOFILES=\
            $(SLO)$/hashtbl.obj		\
           $(SLO)$/prj.obj \
 
-          
-#          $(SLO)$/XmlBuildList.obj
-
-
 SHL1TARGET	=$(TARGET)$(DLLPOSTFIX)
 SHL1IMPLIB	=$(TARGET)
 SHL1LIBS	=$(SLB)$/$(TARGET).lib
@@ -74,8 +69,7 @@ SHL1STDLIBS=\
             $(TOOLSLIB) \
             $(BTSTRPLIB)		\
             $(VOSLIB)			\
-            $(SALLIB)   \
-               $(PERL_LIB)
+            $(SALLIB)
 
 DEF1NAME    =$(SHL1TARGET)
 DEF1DEPN	=$(MISC)$/$(SHL1TARGET).flt
diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx
index 14f966469e6f..f81e03c5a7a3 100644
--- a/soldep/bootstrp/prj.cxx
+++ b/soldep/bootstrp/prj.cxx
@@ -37,8 +37,6 @@
 #include <tools/geninfo.hxx>
 #include <soldep/prj.hxx>
 #include <bootstrp/inimgr.hxx>
-#include <soldep/XmlBuildList.hxx>
-#include "XmlBuildListDef.hxx"
 
 #ifndef MACOSX
 #pragma hdrstop
@@ -1105,46 +1103,42 @@ Prj& Prj::operator<<  ( SvStream& rStream )
 //
 
 /*****************************************************************************/
-Star::Star(XmlBuildList* pXmlBuildListObj)
+Star::Star()
 /*****************************************************************************/
                 : pDepMode (NULL),
-                pAllDepMode (NULL),
-                mpXmlBuildList (pXmlBuildListObj)
+                pAllDepMode (NULL)
 {
     // this ctor is only used by StarWriter
 }
 
 /*****************************************************************************/
-Star::Star(XmlBuildList* pXmlBuildListObj, String aFileName, USHORT nMode )
+Star::Star(String aFileName, USHORT nMode )
 /*****************************************************************************/
                 : nStarMode( nMode ),
                 sFileName( aFileName ),
                 pDepMode (NULL),
-                pAllDepMode (NULL),
-                mpXmlBuildList (pXmlBuildListObj)
+                pAllDepMode (NULL)
 {
     Read( aFileName );
 }
 
 /*****************************************************************************/
-Star::Star(XmlBuildList* pXmlBuildListObj, SolarFileList *pSolarFiles )
+Star::Star(SolarFileList *pSolarFiles )
 /*****************************************************************************/
                 : nStarMode( STAR_MODE_MULTIPLE_PARSE ),
                 pDepMode (NULL),
-                pAllDepMode (NULL),
-                mpXmlBuildList (pXmlBuildListObj)
+                pAllDepMode (NULL)
 {
     // this ctor is used by StarBuilder to get the information for the whole workspace
     Read( pSolarFiles );
 }
 
 /*****************************************************************************/
-Star::Star(XmlBuildList* pXmlBuildListObj, GenericInformationList *pStandLst, ByteString &rVersion,
+Star::Star(GenericInformationList *pStandLst, ByteString &rVersion,
     BOOL bLocal, const char *pSourceRoot )
 /*****************************************************************************/
                 : pDepMode (NULL),
-                pAllDepMode (NULL),
-                mpXmlBuildList (pXmlBuildListObj)
+                pAllDepMode (NULL)
 {
     UpdateFileList (pStandLst, rVersion, TRUE, bLocal, pSourceRoot);
 }
@@ -2299,27 +2293,27 @@ Star& Star::operator<<  ( SvStream& rStream )
 //
 
 /*****************************************************************************/
-StarWriter::StarWriter( XmlBuildList* pXmlBuildListObj, String aFileName, BOOL bReadComments, USHORT nMode )
+StarWriter::StarWriter( String aFileName, BOOL bReadComments, USHORT nMode )
 /*****************************************************************************/
-                : Star (pXmlBuildListObj)
+                : Star ()
 {
     sFileName = aFileName;
     Read ( aFileName, bReadComments, nMode );
 }
 
 /*****************************************************************************/
-StarWriter::StarWriter( XmlBuildList* pXmlBuildListObj, SolarFileList *pSolarFiles, BOOL bReadComments )
+StarWriter::StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments )
 /*****************************************************************************/
-                : Star (pXmlBuildListObj)
+                : Star ()
 {
     Read( pSolarFiles, bReadComments );
 }
 
 /*****************************************************************************/
-StarWriter::StarWriter( XmlBuildList* pXmlBuildListObj, GenericInformationList *pStandLst, ByteString &rVersion,
+StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,
     ByteString &rMinor, BOOL bReadComments, BOOL bLocal, const char *pSourceRoot )
 /*****************************************************************************/
-                : Star (pXmlBuildListObj)
+                : Star ()
 {
     ByteString sPath( rVersion );
     if ( pSourceRoot )