--- a/contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpliwmap.h	Mon Mar 15 12:41:53 2010 +0200
+++ b/contentpublishingsrv/contentpublishingutils/contentpublishingmap/inc/cpliwmap.h	Wed Mar 31 22:04:35 2010 +0300
@@ -24,6 +24,7 @@
 
 class RDesReadStream;
 class CCPSecurityPolicy;
+class TLiwGenericParam;
 
 // CLASS DECLARATION
 /**
@@ -74,6 +75,11 @@
     IMPORT_C static CCPLiwMap* NewL( const CLiwGenericParamList& aList );
 
     /**
+     * Two-phased constructor.
+     */    
+    IMPORT_C static CCPLiwMap* NewL( const CLiwMap& aMap );
+    
+    /**
      * Used by client to serialize this object 
      *
      * @return object serialized to binary
@@ -133,7 +139,16 @@
     IMPORT_C TBool GetProperty( const TDesC8& aProperty,
     		TInt32& aResult ) const;
 
-    
+
+    /**
+     * Return list of action triggers from main map
+     * Note that these are not triggers from action map
+     *
+     * @return list of action triggers, NULL if main map 
+     * doesn't have action trigger
+     */
+    IMPORT_C CLiwDefaultList* GetActionTriggersLC( ) const;
+
     /**
      * Setter for security policy 
      *
@@ -379,6 +394,18 @@
     void SetL( const CLiwGenericParamList& aInParamList );
 
     /**
+     * Sets all parameters according to provided list
+     * @param aMap map with parameters
+     */
+    void SetL( const CLiwMap& aMap );
+
+    /**
+     * Extracts a param and appends it to the internal list
+     * @param aParam a param to extract
+     */
+    void ExtractParamL(const TLiwGenericParam& aParam);
+    
+    /**
      * Check Get properties
      *
      * @return logical sum of TCPProperties of the object
@@ -438,7 +465,6 @@
      *
      */
     TBool PropertyExists( const TDesC8& aProperty ) const;
-
     
     /**
      * Fetches entries from database
@@ -607,6 +633,14 @@
      * Perform the second phase construction of a CCPLiwMap object.
      */       
     void ConstructL();
+    
+    /**
+     * Checks a type a map 
+     * @param aVariant variant containing a map type
+     * @return ETrue if a type is Publisher and EFalse if Content
+     * in other cases method leaves
+     */  
+    static TBool IsTypePublisherL(const TLiwVariant& aVariant);
 
 protected:
     // data