diff -r a3a1ae9acec6 -r da5135c61bad meetingrequest/mrgui/mrfieldbuilderplugin/inc/cesmrdescriptionfield.h
--- a/meetingrequest/mrgui/mrfieldbuilderplugin/inc/cesmrdescriptionfield.h	Mon Mar 15 12:39:10 2010 +0200
+++ b/meetingrequest/mrgui/mrfieldbuilderplugin/inc/cesmrdescriptionfield.h	Wed Mar 31 21:08:33 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description:  ESMR Description field for CESMRListComponent
+* Description:  ESMR Description field.
  *
 */
 
@@ -19,119 +19,120 @@
 #ifndef CESMRDESCRIPTIONFIELD_H
 #define CESMRDESCRIPTIONFIELD_H
 
+#include <e32base.h>
 #include <eikedwob.h>
 #include <frmtlay.h>
 #include "cesmrfield.h"
 
 class CESMREditor;
 class CCalEntry;
-class CAknsFrameBackgroundControlContext;
 class CESMRRichTextLink;
 class CESMRFeatureSettings;
+class CAknsBasicBackgroundControlContext;
+class CESMRUrlParserPlugin;
 
 /**
  * This class is a custom field control that shows the description of calendar events
  */
-NONSHARABLE_CLASS( CESMRDescriptionField ): public CESMRField, 
-											public MEikEdwinSizeObserver,
-											public MEikEdwinObserver
+NONSHARABLE_CLASS( CESMRDescriptionField ): public CESMRField,
+                                            public MEikEdwinSizeObserver,
+                                            public MEikEdwinObserver
     {
-public:
-    /**
-     * Creates new CESMRDescriptionField object. Ownership
-     * is transferred to caller.
-     * @return Pointer to created object,
-     */
-    static CESMRDescriptionField* NewL();
+    public:
+        /**
+         * Creates new CESMRDescriptionField object. Ownership
+         * is transferred to caller.
+         * @return Pointer to created object,
+         */
+        static CESMRDescriptionField* NewL();
 
-    /**
-     * C++ Destructor.
-     */
-    ~CESMRDescriptionField();
+        /**
+         * C++ Destructor.
+         */
+        ~CESMRDescriptionField();
 
-public: // From CESMRField
-    void InitializeL();
-    void InternalizeL( MESMRCalEntry& aEntry );
-    void ExternalizeL( MESMRCalEntry& aEntry );
-    void SetOutlineFocusL( TBool aFocus );
-    TInt ExpandedHeight() const;
-    TInt GetVerticalFocusPosition();
-    void GetMinimumVisibleVerticalArea(TInt& aUpper, TInt& aLower);
-    void ListObserverSet();
-    void ExecuteGenericCommandL( TInt aCommand );
-public: // From CCoeControl
-    TKeyResponse OfferKeyEventL(const TKeyEvent& aEvent, TEventCode aType);
-    void ActivateL();
-    void PositionChanged();
+    public: // From CESMRField
+        void InitializeL();
+        void InternalizeL( MESMRCalEntry& aEntry );
+        void ExternalizeL( MESMRCalEntry& aEntry );
+        void SetOutlineFocusL( TBool aFocus );
+        TInt GetVerticalFocusPosition();
+        void GetCursorLineVerticalPos(TInt& aUpper, TInt& aLower);
+        void ListObserverSet();
+        TBool ExecuteGenericCommandL( TInt aCommand );
 
-public: // From MEikEdwinSizeObserver
-    TBool HandleEdwinSizeEventL( CEikEdwin* aEdwin, TEdwinSizeEvent aType, TSize aSize );
+    public: // From CCoeControl
+        TKeyResponse OfferKeyEventL(const TKeyEvent& aEvent, TEventCode aType);
+        TInt CountComponentControls() const;
+        CCoeControl* ComponentControl( TInt aInd ) const;
+        void SizeChanged();
+        TSize MinimumSize();
+        void SetContainerWindowL(
+                const CCoeControl& aContainer );
 
-public: // From MEikEdwinObserver
-	void HandleEdwinEventL(CEikEdwin* aEdwin,TEdwinEvent aEventType);
-    
-private:
-    /**
-     * Constructor.
-     */
-    CESMRDescriptionField();
+    public: // From MEikEdwinSizeObserver
+        TBool HandleEdwinSizeEventL( CEikEdwin* aEdwin, TEdwinSizeEvent aType, TSize aSize );
+
+    public: // From MEikEdwinObserver
+        void HandleEdwinEventL(CEikEdwin* aEdwin,TEdwinEvent aEventType);
 
-    /**
-     * Second phase constructor.
-     */
-    void ConstructL();
+    private:
+        /**
+         * Constructor.
+         */
+        CESMRDescriptionField();
 
-    /**
-     * Converts raw URL text to a link in description editor field
-     *  
-     * @param aEntry Calendar entry from which the description text is received
-     */ 
-    void StoreLinkL( MESMRCalEntry& aEntry );
+        /**
+         * Second phase constructor.
+         */
+        void ConstructL();
+
+        /**
+         * Converts raw URL text to a link in description editor field
+         *
+         * @param aEntry Calendar entry from which the description text is received
+         */
+        void StoreLinkL( MESMRCalEntry& aEntry );
+
+        /**
+         * Adds link to the beginning of text from editor field
+         *
+         * @param abuf initial description text buffer before addition
+         *
+         * @return The description text buffer with link added
+         */
+        HBufC* AddLinkToTextL( const TDesC& aBuf );
+
+        /**
+         * Gets feature settings
+         */
+        CESMRFeatureSettings& FeaturesL();
 
-    /**
-     * Adds link to the beginning of text from editor field
-     * 
-     * @param abuf initial description text buffer before addition
-     * 
-     * @return The description text buffer with link added
-     */ 
-    HBufC* AddLinkToTextL( const TDesC& aBuf );
-    
-    /**
-     * Gets feature settings
-     */
-    CESMRFeatureSettings& FeaturesL();
-        
-private:
-    /**
-     * Not owned. Description editor object.
-     */
-    CESMREditor* iDescription;
+        /**
+         * Converts location URL to vCal GEO value in calendar entry
+         */
+        void StoreGeoValueL( CCalEntry& aCalEntry,
+                             const TDesC& aLocationUrl );
+
+        CESMRUrlParserPlugin& UrlParserL();
 
-    /**
-     * Field size.
-     */
-    TSize iSize;
-
-    /**
-     * Background control context
-     */
-    MAknsControlContext* iBackground;
-
-    /**
-     * Actual background for the editor
-     */
-    CAknsFrameBackgroundControlContext* iFrameBgContext;
-    
-    /**
-     * Own: Location Url link
-     */ 
-    CESMRRichTextLink* iLocationLink;
-    
-    /**
-     * Own: Feature settings.
-     */
-    CESMRFeatureSettings* iFeatures;
+    private:
+        // Not owned. Description editor object.
+        CESMREditor* iDescription;
+        // Field size.
+        TSize iSize;
+        // Own: Location Url link
+       CESMRRichTextLink* iLocationLink;
+        // Own: Feature settings.
+       CESMRFeatureSettings* iFeatures;
+        // Field editor line count
+        TInt iLineCount;
+        // Own: Background for the editor when it is focused
+        CAknsBasicBackgroundControlContext* iBgControlContext;
+        // Field rect for comparison purposes
+        TRect iFieldRect;
+        // Own: URL parser plugin
+        CESMRUrlParserPlugin* iUrlParser;
     };
 
 #endif  // CESMRDESCRIPTIONFIELD_H