1.1 --- a/src/java/isac/wsdialog/WorksheetDialog.java	Thu Jul 27 18:38:26 2006 +0200
     1.2 +++ b/src/java/isac/wsdialog/WorksheetDialog.java	Thu Jul 27 18:38:26 2006 +0200
     1.3 @@ -517,15 +517,6 @@
     1.4  			throws RemoteException {
     1.5  		ui_control_listener_ = listener;
     1.6  		buildUIElementsContextCalcElements();
     1.7 -		switch( phase_ ) {
     1.8 -		case DIALOGPHASE_SOLVE:
     1.9 -			startSolving();
    1.10 -			break;
    1.11 -		case DIALOGPHASE_SPECIFY:
    1.12 -			startSpecifying( this.calc_tree_.resetCalcHead() );
    1.13 -			break;
    1.14 -		}
    1.15 -
    1.16  		return true;
    1.17  	}
    1.18  
    1.19 @@ -768,8 +759,10 @@
    1.20  		case UI_SOLVE_CHANGE_CONTEXT_FORMULA: {
    1.21  			UserActionOnPosition uaop 	= (UserActionOnPosition) action;
    1.22  			Position activePosition 	= uaop.getPosition();
    1.23 -			context_formula_ = new CalcIterator( calc_tree_, activePosition );
    1.24 -			notifyContextPresenter();
    1.25 +			if( activePosition != null ) {
    1.26 +				context_formula_ = new CalcIterator( calc_tree_, activePosition );	
    1.27 +				notifyContextPresenter();
    1.28 +			}
    1.29  		}
    1.30  		break;
    1.31