diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-21 11:22:46 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-21 11:22:46 +0000 |
| commit | e63ebce60b5b57627db5928cd538f0684efde81e (patch) | |
| tree | 3366c357bc4845315d36e5650f51c31fe9c7729f | |
| parent | 9e8f79c1203d1f765a2634a6c8973c90ce4c41c8 (diff) | |
INTEGRATION: CWS soldep2 (1.3.2); FILE MERGED
2006/12/08 08:19:11 obo 1.3.2.2: temp debug code removed
2006/11/21 16:27:54 obo 1.3.2.1: #143484# dialog for workspace has to support minors
| -rw-r--r-- | soldep/source/soldep.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/soldep/source/soldep.cxx b/soldep/source/soldep.cxx index ed9661c22bff..13b93cdcdebf 100644 --- a/soldep/source/soldep.cxx +++ b/soldep/source/soldep.cxx @@ -4,9 +4,9 @@ * * $RCSfile: soldep.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: obo $ $Date: 2006-04-24 11:18:48 $ + * last change: $Author: ihi $ $Date: 2006-12-21 12:22:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -140,7 +140,7 @@ void SolDep::Init( ByteString &rVersion, GenericInformationList *pVersionList ) mpStandLst = aParser.Execute( sStandLst ); } if ( mpStandLst ) { - msVersion = rVersion; + msVersionMajor = ByteString( rVersion ); ReadSource(TRUE); //call from build server set UPDATER to TRUE } } @@ -275,6 +275,7 @@ IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox) break; case TID_SOLDEP_BACK: maToolBox.HideItem(TID_SOLDEP_BACK); + maToolBox.ShowItem(TID_SOLDEP_SELECT_WORKSPACE); //disabled for prj view (doubleclick ObjWin) maToolBox.ShowItem(TID_SOLDEP_HIDE_INDEPENDEND); //disabled for prj view (doubleclick ObjWin) maToolBox.ShowItem(TID_SOLDEP_FIND); //disabled for prj view (doubleclick ObjWin) maToolBox.Resize(); @@ -300,7 +301,8 @@ BOOL SolDep::GetVersion() { SolSelectVersionDlg aVersionDlg( GetDepWin(), mpStandLst ); if ( aVersionDlg.Execute() == RET_OK ) { - msVersion = aVersionDlg.GetVersion(); + msVersionMajor = aVersionDlg.GetVersionMajor(); + msVersionMinor = aVersionDlg.GetVersionMinor(); return TRUE; } return FALSE; @@ -523,7 +525,7 @@ USHORT SolDep::ReadSource(BOOL bUpdater) mpSolIdMapper = new SolIdMapper( 63997 ); if (mpStandLst && bUpdater) { - mpStarWriter = new StarWriter( mpXmlBuildList, mpStandLst, msVersion, TRUE ); + mpStarWriter = new StarWriter( mpXmlBuildList, mpStandLst, msVersionMajor, msVersionMinor, TRUE ); } else { SolarFileList* pSolarFileList; @@ -734,7 +736,7 @@ BOOL SolDep::InitPrj( ByteString& rListName ) ByteString *pFlagName; Prj* pPrj; ObjectWin *pStartWin, *pEndWin; - + maToolBox.HideItem(TID_SOLDEP_SELECT_WORKSPACE); maToolBox.HideItem(TID_SOLDEP_HIDE_INDEPENDEND); maToolBox.HideItem(TID_SOLDEP_FIND); maToolBox.ShowItem(TID_SOLDEP_BACK); |