# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1282200983 -10800
# Node ID 0f21a5ec0db797fb3b01c853cc255d8ca0932611
# Parent  a7d8840c0b8cdc4e399004cee7605e01d604f03f
Revision: 201031
Kit: 201033

diff -r a7d8840c0b8c -r 0f21a5ec0db7 extras/calcsoft/inc/CalcEnv.inl
--- a/extras/calcsoft/inc/CalcEnv.inl	Thu Jul 15 18:40:36 2010 +0300
+++ b/extras/calcsoft/inc/CalcEnv.inl	Thu Aug 19 09:56:23 2010 +0300
@@ -39,10 +39,12 @@
 inline const TPtrC CCalcAppEnv::EditorOperator(
             const TCalcEditLine::TCalcOperatorType aType ) const
     {
-    if ( ( aType == TCalcEditLine::ECalcMultiply ||
-        aType == TCalcEditLine::ECalcDivide ) &&
+    //'r_calc_editor_operator_array' is operator array for Editor Operator. 
+    if ( ( aType == TCalcEditLine::ECalcDivide ) &&
         AknLayoutUtils::PenEnabled() )
         {
+        //show operator '/' instead of division operator 
+        //division move 6 is '/' in Editor Operator array
         return ( *iEditorOperArray )[( TInt ) aType + 6];
         }
     return ( *iEditorOperArray )[(TInt) aType];
@@ -57,10 +59,12 @@
 inline const TPtrC CCalcAppEnv::OutSheetOperator(
             const TCalcEditLine::TCalcOperatorType aType ) const
     {
-    if ( ( aType == TCalcEditLine::ECalcMultiply ||
-        aType == TCalcEditLine::ECalcDivide ) &&
+    //'r_calc_outsheet_operator_array' is operator array for OutSheet Operator. 
+    if ( ( aType == TCalcEditLine::ECalcDivide ) &&
         AknLayoutUtils::PenEnabled() )
         {
+        //show operator '/' instead of division operator
+        //division move 6 is '/' in OutSheet Operator array
         return (*iOutSheetOperArray)[( TInt ) aType + 6];
         }
     return (*iOutSheetOperArray)[( TInt ) aType];
diff -r a7d8840c0b8c -r 0f21a5ec0db7 extras/calcsoft/src/CalcView.cpp
--- a/extras/calcsoft/src/CalcView.cpp	Thu Jul 15 18:40:36 2010 +0300
+++ b/extras/calcsoft/src/CalcView.cpp	Thu Aug 19 09:56:23 2010 +0300
@@ -75,7 +75,7 @@
     iCalcDocument = STATIC_CAST(CCalcDocument*, AppUi()->Document());
 
     iCalcDocument->SetCalcView( this );
-    CreateContainerL();
+
     iCalcDocument->LoadStateL();
    
     /******** Initialize the ServiceHandler in the ConstructL *****/
@@ -92,12 +92,17 @@
 // Destructor
 CCalcView::~CCalcView()
     {
-    delete iContainer;
-      if(iServiceHandler)
-      {
-            delete iServiceHandler;
-            iServiceHandler = NULL;
-      }
+    if ( iContainer )
+        {
+        delete iContainer;
+        iContainer = NULL;
+        }
+
+    if( iServiceHandler )
+        {
+        delete iServiceHandler;
+        iServiceHandler = NULL;
+        }
      
      }
 
@@ -1039,8 +1044,13 @@
                  TUid /* aCustomMessageId */,
                  const TDesC8& /* aCustomMessage */)
     {
-    AppUi()->AddToStackL(*this, iContainer);
-    iContainer->ActivateL();
+    if ( iContainer == NULL )
+        {
+        CreateContainerL();
+        AppUi()->AddToStackL( *this, iContainer );
+        iContainer->ActivateL();
+        } 
+    
     }
 
 // ----------------------------------------------------
@@ -1051,9 +1061,11 @@
 //
 void CCalcView::DoDeactivate()
     {
-    if (iContainer)
+    if ( iContainer )
         {
-        AppUi()->RemoveFromStack(iContainer);
+        AppUi()->RemoveFromStack( iContainer );
+        delete iContainer;
+        iContainer = NULL;
         }
     }