--- a/calendarui/commonutils/src/calenentryutil.cpp	Wed Sep 15 12:11:35 2010 +0300
+++ b/calendarui/commonutils/src/calenentryutil.cpp	Wed Oct 13 14:30:35 2010 +0300
@@ -30,8 +30,6 @@
 #include <calentry.h>
 #include <calrrule.h>
 #include <calattachment.h>
-#include <bldvariant.hrh> // for feature definitions
-#include <featmgr.h>
 
 
 // Utility functions 
@@ -141,15 +139,6 @@
     delete iSummary;
     delete iLocation;
     delete iDescription;
-    
-    // Do not call UnInitializeLib() if InitalizeLib() leaves.
-    if ( iFeatMgrInitialized )
-        {
-        // Frees the TLS. Must be done after FeatureManager is used.
-        FeatureManager::UnInitializeLib();  
-        }  
-    
-
 
     TRACE_EXIT_POINT;
     }
@@ -703,12 +692,6 @@
                                    const TCalTime& aInstanceDateTime )
     {
     TRACE_ENTRY_POINT;
-    // Sets up TLS, must be done before FeatureManager is used.
-    FeatureManager::InitializeLibL();
-    // Used in destructor. 
-    iFeatMgrInitialized = ETrue;
-     
-
     iEntryType = aEntry.EntryTypeL();
     iEntryStatus = aEntry.StatusL();
     CopyDataFromEntryL( aEntry, aInstanceDateTime );
@@ -769,10 +752,6 @@
             {
             TTime event = aInstanceDateTime.TimeLocalL();
             SetEventDateL( event );
-            if ( FeatureManager::FeatureSupported( KFeatureIdKorean ) )
-                {
-				SetCalendarTypeL( ( TLunarCalendarType )aEntry.UserInt32L() );
-                }
             }
             break;
 
@@ -937,25 +916,13 @@
         		{
         		// If the instance matches one of the RDates
         		if( (aInstanceDateTime.TimeLocalL()) == (rdates[ index ].TimeLocalL()) )
-                    {
-                    // instanceAlarmDay = actualAlarmDay + (alarmOffsetStart - alarmOffsetInstance)
-                    deltaDays =  alarmDateTime.DaysFrom( aEntry.StartTimeL().TimeLocalL() ).Int()
-                    - alarmDateTime.DaysFrom( aInstanceDateTime.TimeLocalL() ).Int();
-                    alarmDateTime += deltaDays;
-                    if ( FeatureManager::FeatureSupported( KFeatureIdKorean ) )
-                        {
-                        if ( aEntry.EntryTypeL() == CCalEntry::EAnniv && CalendarType() != ESolar )
-                            {
-                            alarmDateTime = aEntry.StartTimeL().TimeLocalL(); 
-                            CCalAlarm* alarm = aEntry.AlarmL();
-                            if(alarm)
-                                {
-                                alarmDateTime = aInstanceDateTime.TimeLocalL() - alarm->TimeOffset();
-                                }
-                            }
-                        }
-                    break;
-                    }
+        			{
+        			// instanceAlarmDay = actualAlarmDay + (alarmOffsetStart - alarmOffsetInstance)
+        			deltaDays =  alarmDateTime.DaysFrom( aEntry.StartTimeL().TimeLocalL() ).Int()
+								- alarmDateTime.DaysFrom( aInstanceDateTime.TimeLocalL() ).Int();
+        			alarmDateTime += deltaDays;
+        			break;
+        			}
         		}
         	}        	
         SetAlarmOnL( alarmDateTime );
@@ -1073,31 +1040,4 @@
     TRACE_EXIT_POINT;
     }
 
-// ---------------------------------------------------------------------------
-// CalenViewUtils::CalendarType
-// (other items were commented in a header)
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TLunarCalendarType CCalenEntryUtil::CalendarType() const
-    { 
-	TRACE_ENTRY_POINT;
-	TRACE_EXIT_POINT;
-
-    return iCalendarType;
-    }
-
-// ---------------------------------------------------------------------------
-// CalenViewUtils::SetCalendarTypeL
-// (other items were commented in a header)
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CCalenEntryUtil::SetCalendarTypeL(TLunarCalendarType aCalendarType)
-    {
-	TRACE_ENTRY_POINT;
-
-    iCalendarType = aCalendarType;
-	TRACE_EXIT_POINT;
-
-    }
-
 // End of file