diff -r b1ea1642412e -r ac7e4d1d9209 fep/aknfep/src/AknFepLanguageManager.cpp --- a/fep/aknfep/src/AknFepLanguageManager.cpp Thu Jul 15 19:01:13 2010 +0300 +++ b/fep/aknfep/src/AknFepLanguageManager.cpp Thu Aug 19 10:15:25 2010 +0300 @@ -38,6 +38,7 @@ #include "AknFepUiManagerWestern.h" // CAknFepUIManagerWestern #include "AknFepUiManagerChinese.h" // CAknFepUIManagerChinese #include "AknFepLanguageManager.h" // this class +#include "AknFepSharedDataInterface.h" // CAknFepSharedDataInterface #include "AknFepUiManagerKorean.h" // CAknFepUIManagerKorean #include // TAknEditorNumericKeymap @@ -47,6 +48,7 @@ #include "AknFepPluginManager.h" #include #include +#include void Cleanup( TAny* aAny ) { @@ -67,10 +69,11 @@ // first phase construction. // ----------------------------------------------------------------------------- // -CAknFepLanguageManager* CAknFepLanguageManager::NewL(MAknFepManagerUIInterface* aFepMan, - CAknFepCaseManager* aCaseMan) +CAknFepLanguageManager* CAknFepLanguageManager::NewL( MAknFepManagerUIInterface* aFepMan, + CAknFepCaseManager* aCaseMan, + CAknFepSharedDataInterface* aSharedData ) { - CAknFepLanguageManager* self = new(ELeave) CAknFepLanguageManager(aFepMan, aCaseMan); + CAknFepLanguageManager* self = new(ELeave) CAknFepLanguageManager(aFepMan, aCaseMan, aSharedData); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(); // self @@ -199,12 +202,14 @@ // ----------------------------------------------------------------------------- // CAknFepLanguageManager::CAknFepLanguageManager(MAknFepManagerUIInterface* aFepManager, - CAknFepCaseManager* aCaseManager) + CAknFepCaseManager* aCaseManager, + CAknFepSharedDataInterface* aSharedData ) :iInputLanguage(ELangEnglish), iFepManager(aFepManager), iCaseManager(aCaseManager), - iPluginManager(NULL) + iPluginManager(NULL), + iSharedData(aSharedData) { } @@ -310,7 +315,8 @@ } else // Portrait { - secondMode = EPluginInputModeItut; + secondMode = ( iSharedData ) + ? iSharedData->PluginPortraitInputMode() : EPluginInputModeItut; } TPluginInputMode curMode = aPreferedMode; TInt language = aPenInputLang;