Fix svace issue, DEREF_AFTER_NULL case

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-controller.cpp

diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp
index e273f01..9b1295e 100644 (file)
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
@@ -68,7 +68,7 @@ ControllerPtr Controller::New( ControlInterface& controlInterface )
 
 void Controller::EnableTextInput( DecoratorPtr decorator )
 {
 
 void Controller::EnableTextInput( DecoratorPtr decorator )
 {

-  if( !mImpl->mEventData )
+  if( NULL == mImpl->mEventData )

   {
     mImpl->mEventData = new EventData( decorator );
   }
   {
     mImpl->mEventData = new EventData( decorator );
   }


@@ -99,7 +99,7 @@ void Controller::SetText( const std::string& text )
 
   CharacterIndex lastCursorIndex = 0u;
 
 
   CharacterIndex lastCursorIndex = 0u;
 

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     // If popup shown then hide it by switching to Editing state
     if( ( EventData::SELECTING == mImpl->mEventData->mState )          ||
   {
     // If popup shown then hide it by switching to Editing state
     if( ( EventData::SELECTING == mImpl->mEventData->mState )          ||


@@ -170,7 +170,7 @@ void Controller::SetText( const std::string& text )
 
   mImpl->RequestRelayout();
 
 
   mImpl->RequestRelayout();
 

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     // Cancel previously queued events
     mImpl->mEventData->mEventQueue.clear();
   {
     // Cancel previously queued events
     mImpl->mEventData->mEventQueue.clear();


@@ -185,7 +185,7 @@ void Controller::SetText( const std::string& text )
 
 void Controller::GetText( std::string& text ) const
 {
 
 void Controller::GetText( std::string& text ) const
 {

-  if( ! mImpl->IsShowingPlaceholderText() )
+  if( !mImpl->IsShowingPlaceholderText() )

   {
     Vector<Character>& utf32Characters = mImpl->mLogicalModel->mText;
 
   {
     Vector<Character>& utf32Characters = mImpl->mLogicalModel->mText;
 


@@ -202,7 +202,7 @@ void Controller::GetText( std::string& text ) const
 
 unsigned int Controller::GetLogicalCursorPosition() const
 {
 
 unsigned int Controller::GetLogicalCursorPosition() const
 {

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     return mImpl->mEventData->mPrimaryCursorPosition;
   }
   {
     return mImpl->mEventData->mPrimaryCursorPosition;
   }


@@ -212,7 +212,7 @@ unsigned int Controller::GetLogicalCursorPosition() const
 
 void Controller::SetPlaceholderText( PlaceholderType type, const std::string& text )
 {
 
 void Controller::SetPlaceholderText( PlaceholderType type, const std::string& text )
 {

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     if( PLACEHOLDER_TYPE_INACTIVE == type )
     {
   {
     if( PLACEHOLDER_TYPE_INACTIVE == type )
     {


@@ -225,7 +225,7 @@ void Controller::SetPlaceholderText( PlaceholderType type, const std::string& te
 
     // Update placeholder if there is no text
     if( mImpl->IsShowingPlaceholderText() ||
 
     // Update placeholder if there is no text
     if( mImpl->IsShowingPlaceholderText() ||

-        0u == mImpl->mLogicalModel->mText.Count() )
+        ( 0u == mImpl->mLogicalModel->mText.Count() ) )

     {
       ShowPlaceholderText();
     }
     {
       ShowPlaceholderText();
     }


@@ -234,7 +234,7 @@ void Controller::SetPlaceholderText( PlaceholderType type, const std::string& te
 
 void Controller::GetPlaceholderText( PlaceholderType type, std::string& text ) const
 {
 
 void Controller::GetPlaceholderText( PlaceholderType type, std::string& text ) const
 {

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     if( PLACEHOLDER_TYPE_INACTIVE == type )
     {
   {
     if( PLACEHOLDER_TYPE_INACTIVE == type )
     {


@@ -249,7 +249,7 @@ void Controller::GetPlaceholderText( PlaceholderType type, std::string& text ) c
 
 void Controller::SetMaximumNumberOfCharacters( int maxCharacters )
 {
 
 void Controller::SetMaximumNumberOfCharacters( int maxCharacters )
 {

-  if ( maxCharacters >= 0 )
+  if( maxCharacters >= 0 )

   {
     mImpl->mMaximumNumberOfCharacters = maxCharacters;
   }
   {
     mImpl->mMaximumNumberOfCharacters = maxCharacters;
   }


@@ -262,7 +262,7 @@ int Controller::GetMaximumNumberOfCharacters()
 
 void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily )
 {
 
 void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily )
 {

-  if( !mImpl->mFontDefaults )
+  if( NULL == mImpl->mFontDefaults )

   {
     mImpl->mFontDefaults = new FontDefaults();
   }
   {
     mImpl->mFontDefaults = new FontDefaults();
   }


@@ -282,7 +282,7 @@ void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily )
 
 const std::string& Controller::GetDefaultFontFamily() const
 {
 
 const std::string& Controller::GetDefaultFontFamily() const
 {

-  if( mImpl->mFontDefaults )
+  if( NULL != mImpl->mFontDefaults )

   {
     return mImpl->mFontDefaults->mFontDescription.family;
   }
   {
     return mImpl->mFontDefaults->mFontDescription.family;
   }


@@ -292,7 +292,7 @@ const std::string& Controller::GetDefaultFontFamily() const
 
 void Controller::SetDefaultFontStyle( const std::string& style )
 {
 
 void Controller::SetDefaultFontStyle( const std::string& style )
 {

-  if( !mImpl->mFontDefaults )
+  if( NULL == mImpl->mFontDefaults )

   {
     mImpl->mFontDefaults = new FontDefaults();
   }
   {
     mImpl->mFontDefaults = new FontDefaults();
   }


@@ -302,7 +302,7 @@ void Controller::SetDefaultFontStyle( const std::string& style )
 
 const std::string& Controller::GetDefaultFontStyle() const
 {
 
 const std::string& Controller::GetDefaultFontStyle() const
 {

-  if( mImpl->mFontDefaults )
+  if( NULL != mImpl->mFontDefaults )

   {
     return mImpl->mFontDefaults->mFontStyle;
   }
   {
     return mImpl->mFontDefaults->mFontStyle;
   }


@@ -312,7 +312,7 @@ const std::string& Controller::GetDefaultFontStyle() const
 
 void Controller::SetDefaultFontWidth( FontWidth width )
 {
 
 void Controller::SetDefaultFontWidth( FontWidth width )
 {

-  if( !mImpl->mFontDefaults )
+  if( NULL == mImpl->mFontDefaults )

   {
     mImpl->mFontDefaults = new FontDefaults();
   }
   {
     mImpl->mFontDefaults = new FontDefaults();
   }


@@ -330,7 +330,7 @@ void Controller::SetDefaultFontWidth( FontWidth width )
 
 FontWidth Controller::GetDefaultFontWidth() const
 {
 
 FontWidth Controller::GetDefaultFontWidth() const
 {

-  if( mImpl->mFontDefaults )
+  if( NULL != mImpl->mFontDefaults )

   {
     return mImpl->mFontDefaults->mFontDescription.width;
   }
   {
     return mImpl->mFontDefaults->mFontDescription.width;
   }


@@ -340,7 +340,7 @@ FontWidth Controller::GetDefaultFontWidth() const
 
 void Controller::SetDefaultFontWeight( FontWeight weight )
 {
 
 void Controller::SetDefaultFontWeight( FontWeight weight )
 {

-  if( !mImpl->mFontDefaults )
+  if( NULL == mImpl->mFontDefaults )

   {
     mImpl->mFontDefaults = new FontDefaults();
   }
   {
     mImpl->mFontDefaults = new FontDefaults();
   }


@@ -358,7 +358,7 @@ void Controller::SetDefaultFontWeight( FontWeight weight )
 
 FontWeight Controller::GetDefaultFontWeight() const
 {
 
 FontWeight Controller::GetDefaultFontWeight() const
 {

-  if( mImpl->mFontDefaults )
+  if( NULL != mImpl->mFontDefaults )

   {
     return mImpl->mFontDefaults->mFontDescription.weight;
   }
   {
     return mImpl->mFontDefaults->mFontDescription.weight;
   }


@@ -368,7 +368,7 @@ FontWeight Controller::GetDefaultFontWeight() const
 
 void Controller::SetDefaultFontSlant( FontSlant slant )
 {
 
 void Controller::SetDefaultFontSlant( FontSlant slant )
 {

-  if( !mImpl->mFontDefaults )
+  if( NULL == mImpl->mFontDefaults )

   {
     mImpl->mFontDefaults = new FontDefaults();
   }
   {
     mImpl->mFontDefaults = new FontDefaults();
   }


@@ -386,7 +386,7 @@ void Controller::SetDefaultFontSlant( FontSlant slant )
 
 FontSlant Controller::GetDefaultFontSlant() const
 {
 
 FontSlant Controller::GetDefaultFontSlant() const
 {

-  if( mImpl->mFontDefaults )
+  if( NULL != mImpl->mFontDefaults )

   {
     return mImpl->mFontDefaults->mFontDescription.slant;
   }
   {
     return mImpl->mFontDefaults->mFontDescription.slant;
   }


@@ -396,7 +396,7 @@ FontSlant Controller::GetDefaultFontSlant() const
 
 void Controller::SetDefaultPointSize( float pointSize )
 {
 
 void Controller::SetDefaultPointSize( float pointSize )
 {

-  if( !mImpl->mFontDefaults )
+  if( NULL == mImpl->mFontDefaults )

   {
     mImpl->mFontDefaults = new FontDefaults();
   }
   {
     mImpl->mFontDefaults = new FontDefaults();
   }


@@ -423,7 +423,7 @@ void Controller::SetDefaultPointSize( float pointSize )
 
 float Controller::GetDefaultPointSize() const
 {
 
 float Controller::GetDefaultPointSize() const
 {

-  if( mImpl->mFontDefaults )
+  if( NULL != mImpl->mFontDefaults )

   {
     return mImpl->mFontDefaults->mDefaultPointSize;
   }
   {
     return mImpl->mFontDefaults->mDefaultPointSize;
   }


@@ -435,7 +435,7 @@ void Controller::UpdateAfterFontChange( std::string& newDefaultFont )
 {
   DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange");
 
 {
   DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange");
 

-  if ( !mImpl->mUserDefinedFontFamily ) // If user defined font then should not update when system font changes
+  if( !mImpl->mUserDefinedFontFamily ) // If user defined font then should not update when system font changes

   {
     DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange newDefaultFont(%s)\n", newDefaultFont.c_str() );
     ClearFontData();
   {
     DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange newDefaultFont(%s)\n", newDefaultFont.c_str() );
     ClearFontData();


@@ -466,7 +466,12 @@ const Vector4& Controller::GetTextColor() const
 
 bool Controller::RemoveText( int cursorOffset, int numberOfChars )
 {
 
 bool Controller::RemoveText( int cursorOffset, int numberOfChars )
 {

-  bool removed( false );
+  bool removed = false;
+
+  if( NULL == mImpl->mEventData )
+  {
+    return removed;
+  }

 
   DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p mText.Count() %d cursor %d cursorOffset %d numberOfChars %d\n",
                  this, mImpl->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition, cursorOffset, numberOfChars );
 
   DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p mText.Count() %d cursor %d cursorOffset %d numberOfChars %d\n",
                  this, mImpl->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition, cursorOffset, numberOfChars );


@@ -493,17 +498,15 @@ bool Controller::RemoveText( int cursorOffset, int numberOfChars )
     if( ( cursorIndex + numberOfChars ) <= currentText.Count() )
     {
       // Update the input style and remove the text's style before removing the text.
     if( ( cursorIndex + numberOfChars ) <= currentText.Count() )
     {
       // Update the input style and remove the text's style before removing the text.

-      if( mImpl->mEventData )
-      {
-        // Set first the default input style.
-        mImpl->RetrieveDefaultInputStyle( mImpl->mEventData->mInputStyle );

 
 

-        // Update the input style.
-        mImpl->mLogicalModel->RetrieveStyle( cursorIndex, mImpl->mEventData->mInputStyle );
+      // Set first the default input style.
+      mImpl->RetrieveDefaultInputStyle( mImpl->mEventData->mInputStyle );

 
 

-        // Remove the text's style before removing the text.
-        mImpl->mLogicalModel->UpdateTextStyleRuns( cursorIndex, -numberOfChars );
-      }
+      // Update the input style.
+      mImpl->mLogicalModel->RetrieveStyle( cursorIndex, mImpl->mEventData->mInputStyle );
+
+      // Remove the text's style before removing the text.
+      mImpl->mLogicalModel->UpdateTextStyleRuns( cursorIndex, -numberOfChars );

 
       // Remove the characters.
       Vector<Character>::Iterator first = currentText.Begin() + cursorIndex;
 
       // Remove the characters.
       Vector<Character>::Iterator first = currentText.Begin() + cursorIndex;


@@ -524,7 +527,7 @@ bool Controller::RemoveText( int cursorOffset, int numberOfChars )
 
 void Controller::SetPlaceholderTextColor( const Vector4& textColor )
 {
 
 void Controller::SetPlaceholderTextColor( const Vector4& textColor )
 {

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     mImpl->mEventData->mPlaceholderTextColor = textColor;
   }
   {
     mImpl->mEventData->mPlaceholderTextColor = textColor;
   }


@@ -538,7 +541,7 @@ void Controller::SetPlaceholderTextColor( const Vector4& textColor )
 
 const Vector4& Controller::GetPlaceholderTextColor() const
 {
 
 const Vector4& Controller::GetPlaceholderTextColor() const
 {

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     return mImpl->mEventData->mPlaceholderTextColor;
   }
   {
     return mImpl->mEventData->mPlaceholderTextColor;
   }


@@ -608,7 +611,7 @@ float Controller::GetUnderlineHeight() const
 
 void Controller::SetInputColor( const Vector4& color )
 {
 
 void Controller::SetInputColor( const Vector4& color )
 {

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     mImpl->mEventData->mInputStyle.textColor = color;
 
   {
     mImpl->mEventData->mInputStyle.textColor = color;
 


@@ -638,7 +641,7 @@ void Controller::SetInputColor( const Vector4& color )
 
 const Vector4& Controller::GetInputColor() const
 {
 
 const Vector4& Controller::GetInputColor() const
 {

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     return mImpl->mEventData->mInputStyle.textColor;
   }
   {
     return mImpl->mEventData->mInputStyle.textColor;
   }


@@ -652,7 +655,7 @@ void Controller::SetEnableCursorBlink( bool enable )
 {
   DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "TextInput disabled" );
 
 {
   DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "TextInput disabled" );
 

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     mImpl->mEventData->mCursorBlinkEnabled = enable;
 
   {
     mImpl->mEventData->mCursorBlinkEnabled = enable;
 


@@ -666,7 +669,7 @@ void Controller::SetEnableCursorBlink( bool enable )
 
 bool Controller::GetEnableCursorBlink() const
 {
 
 bool Controller::GetEnableCursorBlink() const
 {

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     return mImpl->mEventData->mCursorBlinkEnabled;
   }
   {
     return mImpl->mEventData->mCursorBlinkEnabled;
   }


@@ -676,7 +679,7 @@ bool Controller::GetEnableCursorBlink() const
 
 const Vector2& Controller::GetScrollPosition() const
 {
 
 const Vector2& Controller::GetScrollPosition() const
 {

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     return mImpl->mEventData->mScrollPosition;
   }
   {
     return mImpl->mEventData->mScrollPosition;
   }


@@ -854,9 +857,12 @@ bool Controller::Relayout( const Size& size )
   // Do not re-do any operation until something changes.
   mImpl->mOperationsPending = NO_OPERATION;
 
   // Do not re-do any operation until something changes.
   mImpl->mOperationsPending = NO_OPERATION;
 

+  // Whether the text control is editable
+  const bool isEditable = NULL != mImpl->mEventData;
+

   // Keep the current offset and alignment as it will be used to update the decorator's positions (if the size changes).
   Vector2 offset;
   // Keep the current offset and alignment as it will be used to update the decorator's positions (if the size changes).
   Vector2 offset;

-  if( newSize && mImpl->mEventData )
+  if( newSize && isEditable )

   {
     offset = mImpl->mAlignmentOffset + mImpl->mEventData->mScrollPosition;
   }
   {
     offset = mImpl->mAlignmentOffset + mImpl->mEventData->mScrollPosition;
   }


@@ -864,7 +870,7 @@ bool Controller::Relayout( const Size& size )
   // After doing the text layout, the alignment offset to place the actor in the desired position can be calculated.
   CalculateTextAlignment( size );
 
   // After doing the text layout, the alignment offset to place the actor in the desired position can be calculated.
   CalculateTextAlignment( size );
 

-  if( mImpl->mEventData )
+  if( isEditable )

   {
     if( newSize )
     {
   {
     if( newSize )
     {


@@ -921,7 +927,7 @@ void Controller::ProcessModifyEvents()
     }
   }
 
     }
   }
 

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     // When the text is being modified, delay cursor blinking
     mImpl->mEventData->mDecorator->DelayCursorBlink();
   {
     // When the text is being modified, delay cursor blinking
     mImpl->mEventData->mDecorator->DelayCursorBlink();


@@ -955,7 +961,7 @@ void Controller::ResetCursorPosition( CharacterIndex cursorIndex )
     mImpl->mEventData->mPrimaryCursorPosition = cursorIndex;
 
     // Update the cursor if it's in editing mode.
     mImpl->mEventData->mPrimaryCursorPosition = cursorIndex;
 
     // Update the cursor if it's in editing mode.

-    if ( EventData::IsEditingState( mImpl->mEventData->mState )  )
+    if( EventData::IsEditingState( mImpl->mEventData->mState )  )

     {
       mImpl->mEventData->mUpdateCursorPosition = true;
     }
     {
       mImpl->mEventData->mUpdateCursorPosition = true;
     }


@@ -993,6 +999,11 @@ void Controller::TextInsertedEvent()
 {
   DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextInsertedEvent" );
 
 {
   DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextInsertedEvent" );
 

+  if( NULL == mImpl->mEventData )
+  {
+    return;
+  }
+

   // TODO - Optimize this
   ClearModelData();
 
   // TODO - Optimize this
   ClearModelData();
 


@@ -1008,7 +1019,7 @@ void Controller::TextInsertedEvent()
                                                            REORDER );
 
   // Queue a cursor reposition event; this must wait until after DoRelayout()
                                                            REORDER );
 
   // Queue a cursor reposition event; this must wait until after DoRelayout()

-  if ( EventData::IsEditingState( mImpl->mEventData->mState )  )
+  if( EventData::IsEditingState( mImpl->mEventData->mState ) )

   {
     mImpl->mEventData->mUpdateCursorPosition = true;
     mImpl->mEventData->mScrollAfterUpdatePosition = true;
   {
     mImpl->mEventData->mUpdateCursorPosition = true;
     mImpl->mEventData->mScrollAfterUpdatePosition = true;


@@ -1019,6 +1030,11 @@ void Controller::TextDeletedEvent()
 {
   DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextDeletedEvent" );
 
 {
   DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextDeletedEvent" );
 

+  if( NULL == mImpl->mEventData )
+  {
+    return;
+  }
+

   // TODO - Optimize this
   ClearModelData();
 
   // TODO - Optimize this
   ClearModelData();
 


@@ -1333,7 +1349,7 @@ void Controller::KeyboardFocusGainEvent()
 {
   DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusGainEvent" );
 
 {
   DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusGainEvent" );
 

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     if( ( EventData::INACTIVE == mImpl->mEventData->mState ) ||
         ( EventData::INTERRUPTED == mImpl->mEventData->mState ) )
   {
     if( ( EventData::INACTIVE == mImpl->mEventData->mState ) ||
         ( EventData::INTERRUPTED == mImpl->mEventData->mState ) )


@@ -1356,9 +1372,9 @@ void Controller::KeyboardFocusLostEvent()
 {
   DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusLostEvent" );
 
 {
   DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusLostEvent" );
 

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
   {

-    if ( EventData::INTERRUPTED != mImpl->mEventData->mState )
+    if( EventData::INTERRUPTED != mImpl->mEventData->mState )

     {
       mImpl->ChangeState( EventData::INACTIVE );
 
     {
       mImpl->ChangeState( EventData::INACTIVE );
 


@@ -1378,8 +1394,8 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent )
 
   bool textChanged( false );
 
 
   bool textChanged( false );
 

-  if( mImpl->mEventData &&
-      keyEvent.state == KeyEvent::Down )
+  if( ( NULL != mImpl->mEventData ) &&
+      ( keyEvent.state == KeyEvent::Down ) )

   {
     int keyCode = keyEvent.keyCode;
     const std::string& keyString = keyEvent.keyPressed;
   {
     int keyCode = keyEvent.keyCode;
     const std::string& keyString = keyEvent.keyPressed;


@@ -1390,10 +1406,10 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent )
       // Escape key is a special case which causes focus loss
       KeyboardFocusLostEvent();
     }
       // Escape key is a special case which causes focus loss
       KeyboardFocusLostEvent();
     }

-    else if( Dali::DALI_KEY_CURSOR_LEFT  == keyCode ||
-             Dali::DALI_KEY_CURSOR_RIGHT == keyCode ||
-             Dali::DALI_KEY_CURSOR_UP    == keyCode ||
-             Dali::DALI_KEY_CURSOR_DOWN  == keyCode )
+    else if( ( Dali::DALI_KEY_CURSOR_LEFT  == keyCode ) ||
+             ( Dali::DALI_KEY_CURSOR_RIGHT == keyCode ) ||
+             ( Dali::DALI_KEY_CURSOR_UP    == keyCode ) ||
+             ( Dali::DALI_KEY_CURSOR_DOWN  == keyCode ) )

     {
       Event event( Event::CURSOR_KEY_EVENT );
       event.p1.mInt = keyCode;
     {
       Event event( Event::CURSOR_KEY_EVENT );
       event.p1.mInt = keyCode;


@@ -1403,13 +1419,13 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent )
     {
       textChanged = BackspaceKeyEvent();
     }
     {
       textChanged = BackspaceKeyEvent();
     }

-    else if ( IsKey( keyEvent,  Dali::DALI_KEY_POWER ) )
+    else if( IsKey( keyEvent,  Dali::DALI_KEY_POWER ) )

     {
       mImpl->ChangeState( EventData::INTERRUPTED ); // State is not INACTIVE as expect to return to edit mode.
       // Avoids calling the InsertText() method which can delete selected text
     }
     {
       mImpl->ChangeState( EventData::INTERRUPTED ); // State is not INACTIVE as expect to return to edit mode.
       // Avoids calling the InsertText() method which can delete selected text
     }

-    else if ( IsKey( keyEvent, Dali::DALI_KEY_MENU ) ||
-              IsKey( keyEvent, Dali::DALI_KEY_HOME ) )
+    else if( IsKey( keyEvent, Dali::DALI_KEY_MENU ) ||
+             IsKey( keyEvent, Dali::DALI_KEY_HOME ) )

     {
       mImpl->ChangeState( EventData::INACTIVE );
       // Menu/Home key behaviour does not allow edit mode to resume like Power key
     {
       mImpl->ChangeState( EventData::INACTIVE );
       // Menu/Home key behaviour does not allow edit mode to resume like Power key


@@ -1433,8 +1449,8 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent )
       textChanged = true;
     }
 
       textChanged = true;
     }
 

-    if ( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) &&
-         ( mImpl->mEventData->mState != EventData::INACTIVE ) )
+    if( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) &&
+        ( mImpl->mEventData->mState != EventData::INACTIVE ) )

     {
       mImpl->ChangeState( EventData::EDITING );
     }
     {
       mImpl->ChangeState( EventData::EDITING );
     }


@@ -1457,6 +1473,12 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ
   bool maxLengthReached( false );
 
   DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected InsertText" )
   bool maxLengthReached( false );
 
   DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected InsertText" )

+
+  if( NULL == mImpl->mEventData )
+  {
+    return;
+  }
+

   DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::InsertText %p %s (%s) mPrimaryCursorPosition %d mPreEditFlag %d mPreEditStartPosition %d mPreEditLength %d\n",
                  this, text.c_str(), (COMMIT == type ? "COMMIT" : "PRE_EDIT"),
                  mImpl->mEventData->mPrimaryCursorPosition, mImpl->mEventData->mPreEditFlag, mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength );
   DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::InsertText %p %s (%s) mPrimaryCursorPosition %d mPreEditFlag %d mPreEditStartPosition %d mPreEditLength %d\n",
                  this, text.c_str(), (COMMIT == type ? "COMMIT" : "PRE_EDIT"),
                  mImpl->mEventData->mPrimaryCursorPosition, mImpl->mEventData->mPreEditFlag, mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength );


@@ -1468,9 +1490,8 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ
   Length characterCount( 0u );
 
   // Remove the previous IMF pre-edit (predicitive text)
   Length characterCount( 0u );
 
   // Remove the previous IMF pre-edit (predicitive text)

-  if( mImpl->mEventData &&
-      mImpl->mEventData->mPreEditFlag &&
-      0 != mImpl->mEventData->mPreEditLength )
+  if( mImpl->mEventData->mPreEditFlag &&
+      ( 0 != mImpl->mEventData->mPreEditLength ) )

   {
     CharacterIndex offset = mImpl->mEventData->mPrimaryCursorPosition - mImpl->mEventData->mPreEditStartPosition;
 
   {
     CharacterIndex offset = mImpl->mEventData->mPrimaryCursorPosition - mImpl->mEventData->mPreEditStartPosition;
 


@@ -1513,28 +1534,25 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ
     mImpl->ChangeState( EventData::EDITING );
 
     // Handle the IMF (predicitive text) state changes
     mImpl->ChangeState( EventData::EDITING );
 
     // Handle the IMF (predicitive text) state changes

-    if( mImpl->mEventData )
+    if( COMMIT == type )

     {
     {

-      if( COMMIT == type )
-      {
-        // IMF manager is no longer handling key-events
-        mImpl->ClearPreEditFlag();
-      }
-      else // PRE_EDIT
+      // IMF manager is no longer handling key-events
+      mImpl->ClearPreEditFlag();
+    }
+    else // PRE_EDIT
+    {
+      if( !mImpl->mEventData->mPreEditFlag )

       {
       {

-        if( !mImpl->mEventData->mPreEditFlag )
-        {
-          DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Entered PreEdit state" );
+        DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Entered PreEdit state" );

 
 

-          // Record the start of the pre-edit text
-          mImpl->mEventData->mPreEditStartPosition = mImpl->mEventData->mPrimaryCursorPosition;
-        }
+        // Record the start of the pre-edit text
+        mImpl->mEventData->mPreEditStartPosition = mImpl->mEventData->mPrimaryCursorPosition;
+      }

 
 

-        mImpl->mEventData->mPreEditLength = utf32Characters.Count();
-        mImpl->mEventData->mPreEditFlag = true;
+      mImpl->mEventData->mPreEditLength = utf32Characters.Count();
+      mImpl->mEventData->mPreEditFlag = true;

 
 

-        DALI_LOG_INFO( gLogFilter, Debug::Verbose, "mPreEditStartPosition %d mPreEditLength %d\n", mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength );
-      }
+      DALI_LOG_INFO( gLogFilter, Debug::Verbose, "mPreEditStartPosition %d mPreEditLength %d\n", mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength );

     }
 
     const Length numberOfCharactersInModel = mImpl->mLogicalModel->mText.Count();
     }
 
     const Length numberOfCharactersInModel = mImpl->mLogicalModel->mText.Count();


@@ -1546,33 +1564,29 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ
     // The cursor position.
     CharacterIndex& cursorIndex = mImpl->mEventData->mPrimaryCursorPosition;
 
     // The cursor position.
     CharacterIndex& cursorIndex = mImpl->mEventData->mPrimaryCursorPosition;
 

-    // Update the text's style.
-    if( mImpl->mEventData )
-    {
-      // Updates the text style runs.
-      mImpl->mLogicalModel->UpdateTextStyleRuns( cursorIndex, maxSizeOfNewText );
+    // Updates the text style runs.
+    mImpl->mLogicalModel->UpdateTextStyleRuns( cursorIndex, maxSizeOfNewText );

 
 

-      // Get the character index from the cursor index.
-      const CharacterIndex styleIndex = ( cursorIndex > 0u ) ? cursorIndex - 1u : 0u;
+    // Get the character index from the cursor index.
+    const CharacterIndex styleIndex = ( cursorIndex > 0u ) ? cursorIndex - 1u : 0u;

 
 

-      // Retrieve the text's style for the given index.
-      InputStyle style;
-      mImpl->mLogicalModel->RetrieveStyle( styleIndex, style );
+    // Retrieve the text's style for the given index.
+    InputStyle style;
+    mImpl->mLogicalModel->RetrieveStyle( styleIndex, style );

 
 

-      // Whether to add a new text color run.
-      const bool addColorRun = style.textColor != mImpl->mEventData->mInputStyle.textColor;
+    // Whether to add a new text color run.
+    const bool addColorRun = style.textColor != mImpl->mEventData->mInputStyle.textColor;

 
 

-      // Add style runs.
-      if( addColorRun )
-      {
-        const VectorBase::SizeType numberOfRuns = mImpl->mLogicalModel->mColorRuns.Count();
-        mImpl->mLogicalModel->mColorRuns.Resize( numberOfRuns + 1u );
+    // Add style runs.
+    if( addColorRun )
+    {
+      const VectorBase::SizeType numberOfRuns = mImpl->mLogicalModel->mColorRuns.Count();
+      mImpl->mLogicalModel->mColorRuns.Resize( numberOfRuns + 1u );

 
 

-        ColorRun& colorRun = *( mImpl->mLogicalModel->mColorRuns.Begin() + numberOfRuns );
-        colorRun.color = mImpl->mEventData->mInputStyle.textColor;
-        colorRun.characterRun.characterIndex = cursorIndex;
-        colorRun.characterRun.numberOfCharacters = maxSizeOfNewText;
-      }
+      ColorRun& colorRun = *( mImpl->mLogicalModel->mColorRuns.Begin() + numberOfRuns );
+      colorRun.color = mImpl->mEventData->mInputStyle.textColor;
+      colorRun.characterRun.characterIndex = cursorIndex;
+      colorRun.characterRun.numberOfCharacters = maxSizeOfNewText;

     }
 
     // Insert at current cursor position.
     }
 
     // Insert at current cursor position.


@@ -1592,7 +1606,7 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ
     DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Inserted %d characters, new size %d new cursor %d\n", maxSizeOfNewText, mImpl->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition );
   }
 
     DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Inserted %d characters, new size %d new cursor %d\n", maxSizeOfNewText, mImpl->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition );
   }
 

-  if( 0u == mImpl->mLogicalModel->mText.Count() &&
+  if( ( 0u == mImpl->mLogicalModel->mText.Count() ) &&

       mImpl->IsPlaceholderAvailable() )
   {
     // Show place-holder if empty after removing the pre-edit text
       mImpl->IsPlaceholderAvailable() )
   {
     // Show place-holder if empty after removing the pre-edit text


@@ -1601,7 +1615,7 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ
     mImpl->ClearPreEditFlag();
   }
   else if( removedPrevious ||
     mImpl->ClearPreEditFlag();
   }
   else if( removedPrevious ||

-           0 != utf32Characters.Count() )
+           ( 0 != utf32Characters.Count() ) )

   {
     // Queue an inserted event
     mImpl->QueueModifyEvent( ModifyEvent::TEXT_INSERTED );
   {
     // Queue an inserted event
     mImpl->QueueModifyEvent( ModifyEvent::TEXT_INSERTED );


@@ -1650,15 +1664,16 @@ void Controller::TapEvent( unsigned int tapCount, float x, float y )
       // This is to avoid unnecessary relayouts when tapping an empty text-field
       bool relayoutNeeded( false );
 
       // This is to avoid unnecessary relayouts when tapping an empty text-field
       bool relayoutNeeded( false );
 

-      if ( EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState || EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState )
+      if( ( EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState ) ||
+          ( EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState ) )

       {
         mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE);  // If Popup shown hide it here so can be shown again if required.
       }
 
       {
         mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE);  // If Popup shown hide it here so can be shown again if required.
       }
 

-      if( mImpl->IsShowingRealText() && ( EventData::INACTIVE !=  mImpl->mEventData->mState ) )
+      if( mImpl->IsShowingRealText() && ( EventData::INACTIVE != mImpl->mEventData->mState ) )

       {
         // Already in an active state so show a popup
       {
         // Already in an active state so show a popup

-        if ( !mImpl->IsClipboardEmpty() )
+        if( !mImpl->IsClipboardEmpty() )

         {
           // Shows Paste popup but could show full popup with Selection options. ( EDITING_WITH_POPUP )
           mImpl->ChangeState( EventData::EDITING_WITH_PASTE_POPUP );
         {
           // Shows Paste popup but could show full popup with Selection options. ( EDITING_WITH_POPUP )
           mImpl->ChangeState( EventData::EDITING_WITH_PASTE_POPUP );


@@ -1671,17 +1686,17 @@ void Controller::TapEvent( unsigned int tapCount, float x, float y )
       }
       else
       {
       }
       else
       {

-        if( mImpl->IsShowingPlaceholderText() &&  !mImpl->IsFocusedPlaceholderAvailable() )
+        if( mImpl->IsShowingPlaceholderText() && !mImpl->IsFocusedPlaceholderAvailable() )

         {
           // Hide placeholder text
           ResetText();
         }
 
         {
           // Hide placeholder text
           ResetText();
         }
 

-        if ( EventData::INACTIVE == mImpl->mEventData->mState )
+        if( EventData::INACTIVE == mImpl->mEventData->mState )

         {
           mImpl->ChangeState( EventData::EDITING );
         }
         {
           mImpl->ChangeState( EventData::EDITING );
         }

-        else if ( !mImpl->IsClipboardEmpty() )
+        else if( !mImpl->IsClipboardEmpty() )

         {
           mImpl->ChangeState( EventData::EDITING_WITH_POPUP );
         }
         {
           mImpl->ChangeState( EventData::EDITING_WITH_POPUP );
         }


@@ -1719,7 +1734,7 @@ void Controller::PanEvent( Gesture::State state, const Vector2& displacement )
 {
   DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected PanEvent" );
 
 {
   DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected PanEvent" );
 

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     Event event( Event::PAN_EVENT );
     event.p1.mInt = state;
   {
     Event event( Event::PAN_EVENT );
     event.p1.mInt = state;


@@ -1735,10 +1750,10 @@ void Controller::LongPressEvent( Gesture::State state, float x, float y  )
 {
   DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected LongPressEvent" );
 
 {
   DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected LongPressEvent" );
 

-  if( state == Gesture::Started &&
-      mImpl->mEventData )
+  if( ( state == Gesture::Started ) &&
+      ( NULL != mImpl->mEventData ) )

   {
   {

-    if( ! mImpl->IsShowingRealText() )
+    if( !mImpl->IsShowingRealText() )

     {
       Event event( Event::LONG_PRESS_EVENT );
       event.p1.mInt = state;
     {
       Event event( Event::LONG_PRESS_EVENT );
       event.p1.mInt = state;


@@ -1775,7 +1790,7 @@ void Controller::SelectEvent( float x, float y, bool selectAll )
 {
   DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SelectEvent\n" );
 
 {
   DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SelectEvent\n" );
 

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     mImpl->ChangeState( EventData::SELECTING );
 
   {
     mImpl->ChangeState( EventData::SELECTING );
 


@@ -1810,7 +1825,7 @@ void Controller::DecorationEvent( HandleType handleType, HandleState state, floa
 {
   DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected DecorationEvent" );
 
 {
   DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected DecorationEvent" );
 

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     switch( handleType )
     {
   {
     switch( handleType )
     {


@@ -1903,7 +1918,7 @@ void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Butt
         NotifyImfManager();
       }
 
         NotifyImfManager();
       }
 

-      if( 0u != mImpl->mLogicalModel->mText.Count() ||
+      if( ( 0u != mImpl->mLogicalModel->mText.Count() ) ||

           !mImpl->IsPlaceholderAvailable() )
       {
         mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED );
           !mImpl->IsPlaceholderAvailable() )
       {
         mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED );


@@ -1934,7 +1949,7 @@ void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Butt
     {
       const Vector2& currentCursorPosition = mImpl->mEventData->mDecorator->GetPosition( PRIMARY_CURSOR );
 
     {
       const Vector2& currentCursorPosition = mImpl->mEventData->mDecorator->GetPosition( PRIMARY_CURSOR );
 

-      if( mImpl->mEventData->mSelectionEnabled  )
+      if( mImpl->mEventData->mSelectionEnabled )

       {
         // Creates a SELECT event.
         SelectEvent( currentCursorPosition.x, currentCursorPosition.y, false );
       {
         // Creates a SELECT event.
         SelectEvent( currentCursorPosition.x, currentCursorPosition.y, false );


@@ -1966,14 +1981,14 @@ ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, cons
   bool requestRelayout = false;
 
   std::string text;
   bool requestRelayout = false;
 
   std::string text;

-  unsigned int cursorPosition( 0 );
+  unsigned int cursorPosition = 0u;

 
 

-  switch ( imfEvent.eventName )
+  switch( imfEvent.eventName )

   {
     case ImfManager::COMMIT:
     {
       InsertText( imfEvent.predictiveString, Text::Controller::COMMIT );
   {
     case ImfManager::COMMIT:
     {
       InsertText( imfEvent.predictiveString, Text::Controller::COMMIT );

-      update=true;
+      update = true;

       requestRelayout = true;
       break;
     }
       requestRelayout = true;
       break;
     }


@@ -1990,7 +2005,7 @@ ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, cons
 
       if( update )
       {
 
       if( update )
       {

-        if( 0u != mImpl->mLogicalModel->mText.Count() ||
+        if( ( 0u != mImpl->mLogicalModel->mText.Count() ) ||

             !mImpl->IsPlaceholderAvailable() )
         {
           mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED );
             !mImpl->IsPlaceholderAvailable() )
         {
           mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED );


@@ -2049,11 +2064,16 @@ bool Controller::BackspaceKeyEvent()
 {
   DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p DALI_KEY_BACKSPACE\n", this );
 
 {
   DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p DALI_KEY_BACKSPACE\n", this );
 

+  bool removed = false;
+
+  if( NULL == mImpl->mEventData )
+  {
+    return removed;
+  }
+

   // IMF manager is no longer handling key-events
   mImpl->ClearPreEditFlag();
 
   // IMF manager is no longer handling key-events
   mImpl->ClearPreEditFlag();
 

-  bool removed( false );
-

   if( EventData::SELECTING == mImpl->mEventData->mState )
   {
     removed = RemoveSelectedText();
   if( EventData::SELECTING == mImpl->mEventData->mState )
   {
     removed = RemoveSelectedText();


@@ -2071,7 +2091,7 @@ bool Controller::BackspaceKeyEvent()
     // Automatic  Upper-case and restarting prediction on an existing word require this.
     NotifyImfManager();
 
     // Automatic  Upper-case and restarting prediction on an existing word require this.
     NotifyImfManager();
 

-    if( 0u != mImpl->mLogicalModel->mText.Count() ||
+    if( ( 0u != mImpl->mLogicalModel->mText.Count() ) ||

         !mImpl->IsPlaceholderAvailable() )
     {
       mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED );
         !mImpl->IsPlaceholderAvailable() )
     {
       mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED );


@@ -2088,7 +2108,7 @@ bool Controller::BackspaceKeyEvent()
 
 void Controller::NotifyImfManager()
 {
 
 void Controller::NotifyImfManager()
 {

-  if( mImpl->mEventData )
+  if( NULL != mImpl->mEventData )

   {
     if( mImpl->mEventData->mImfManager )
     {
   {
     if( mImpl->mEventData->mImfManager )
     {


@@ -2109,6 +2129,11 @@ void Controller::ShowPlaceholderText()
   {
     DALI_ASSERT_DEBUG( mImpl->mEventData && "No placeholder text available" );
 
   {
     DALI_ASSERT_DEBUG( mImpl->mEventData && "No placeholder text available" );
 

+    if( NULL == mImpl->mEventData )
+    {
+      return;
+    }
+

     mImpl->mEventData->mIsShowingPlaceholderText = true;
 
     // Disable handles when showing place-holder text
     mImpl->mEventData->mIsShowingPlaceholderText = true;
 
     // Disable handles when showing place-holder text


@@ -2120,8 +2145,8 @@ void Controller::ShowPlaceholderText()
     size_t size( 0 );
 
     // TODO - Switch placeholder text styles when changing state
     size_t size( 0 );
 
     // TODO - Switch placeholder text styles when changing state

-    if( EventData::INACTIVE != mImpl->mEventData->mState &&
-        0u != mImpl->mEventData->mPlaceholderTextActive.c_str() )
+    if( ( EventData::INACTIVE != mImpl->mEventData->mState ) &&
+        ( 0u != mImpl->mEventData->mPlaceholderTextActive.c_str() ) )

     {
       text = mImpl->mEventData->mPlaceholderTextActive.c_str();
       size = mImpl->mEventData->mPlaceholderTextActive.size();
     {
       text = mImpl->mEventData->mPlaceholderTextActive.c_str();
       size = mImpl->mEventData->mPlaceholderTextActive.size();