Fix for NSE_51438

Change-Id: I934ce526950e7bb77ff8a8420dac6e376ba25bf3
Signed-off-by: Saravana Balaji S <saravana.bs@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index a32cde5..cc6e500 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -2515,14 +2515,7 @@ _EditPresenter::Draw(Canvas& canvas)
                DrawText(canvas);
        }
 
-       if (__rotated && !__clipboardConnected) // Command button should be relocated after rotation in case of no keypad.
-       {
-               if (__isCopyPasteManagerExist)
-               {
-                       PostInternalEvent(String(L"ShowCopyPaste"));
-               }
-               __rotated = false;
-       }
+       RestoreCopyPasteManager();
 
        InitializeCursor();
 
@@ -2541,6 +2534,19 @@ _EditPresenter::Draw(Canvas& canvas)
        return r;
 }
 
+void
+_EditPresenter::RestoreCopyPasteManager(void)
+{
+       if (__rotated && !__clipboardConnected) // Command button should be relocated after rotation in case of no keypad.
+       {
+               if (__isCopyPasteManagerExist)
+               {
+                       PostInternalEvent(String(L"ShowCopyPaste"));
+               }
+               __rotated = false;
+       }
+}
+
 result
 _EditPresenter::ConvertLinkType(void)
 {

diff --git a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
index 7c3a0aa..c30ae77 100644 (file)
--- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
@@ -776,6 +776,8 @@ _TokenEditPresenter::Draw(Canvas& canvas)
                __isTokenEditingFinished = false;
        }
 
+       RestoreCopyPasteManager();
+
        return E_SUCCESS;
 }
 

diff --git a/src/ui/inc/FUiCtrl_EditPresenter.h b/src/ui/inc/FUiCtrl_EditPresenter.h
index c317a04..b11c8f1 100755 (executable)
--- a/src/ui/inc/FUiCtrl_EditPresenter.h
+++ b/src/ui/inc/FUiCtrl_EditPresenter.h
@@ -382,6 +382,7 @@ protected:
        _Scroll* GetScrollBar(void) const;
        _Edit* GetEditView(void) const;
        bool AdjustRTLTextAlignment(const _EditTextType textType);
+       void RestoreCopyPasteManager(void);
 
 private:
        virtual void OnEditCopyPasteStatusChanged(CoreCopyPasteStatus status, CoreCopyPasteAction action);