diff -r 641f389e9157 -r a71299154b21 contentmgmt/contentaccessfwfordrm/source/caf/manager.cpp
--- a/contentmgmt/contentaccessfwfordrm/source/caf/manager.cpp	Tue Aug 31 17:00:08 2010 +0300
+++ b/contentmgmt/contentaccessfwfordrm/source/caf/manager.cpp	Wed Sep 01 12:40:57 2010 +0100
@@ -703,63 +703,4 @@
 	}
 #endif // REMOVE_CAF1
 
-#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
 
-EXPORT_C TInt CManager::GetAttribute(const TDesC8& aHeaderData, TInt aAttribute, TInt& aValue) const
-	{
-	TRAPD(err, DoGetAttributeL(aHeaderData, aAttribute, aValue));
-	return err;
-	}
-
-void CManager::DoGetAttributeL(const TDesC8& aHeaderData, TInt aAttribute, TInt& aValue) const
-	{
-	// Find the agent who handles the file 
-	CAgentInfo& agentInfo = iResolver->ResolveFileL(aHeaderData);
-	User::LeaveIfError(agentInfo.AgentManagerL().GetAttribute(aHeaderData, aAttribute, aValue));
-	}
-	
-EXPORT_C TInt CManager::GetAttributeSet(const TDesC8& aHeaderData, RAttributeSet& aAttributeSet) const
-	{
-	TRAPD(err, DoGetAttributeSetL(aHeaderData, aAttributeSet));
-	return err;
-	}
-
-void CManager::DoGetAttributeSetL(const TDesC8& aHeaderData, RAttributeSet& aAttributeSet) const	
-	{
-	// Find the agent who handles the file 
-	CAgentInfo& agentInfo = iResolver->ResolveFileL(aHeaderData);
-	
-	User::LeaveIfError(agentInfo.AgentManagerL().GetAttributeSet(aHeaderData, aAttributeSet));
-	}
-	
-EXPORT_C TInt CManager::GetStringAttribute(const TDesC8& aHeaderData, TInt aAttribute, TDes& aValue) const
-	{
-	TRAPD(err, DoGetStringAttributeL(aHeaderData, aAttribute, aValue));
-	return err;
-	}
-	
-void CManager::DoGetStringAttributeL(const TDesC8& aHeaderData, TInt aAttribute, TDes& aValue) const
-	{
-	// Find the agent who handles the file 
-	CAgentInfo& agentInfo = iResolver->ResolveFileL(aHeaderData);
-	
-	// find out the attribute
-	User::LeaveIfError(agentInfo.AgentManagerL().GetStringAttribute(aHeaderData, aAttribute, aValue));
-	}
-	
-EXPORT_C TInt CManager::GetStringAttributeSet(const TDesC8& aHeaderData, RStringAttributeSet& aStringAttributeSet) const
-	{
-	TRAPD(err, DoGetStringAttributeSetL(aHeaderData, aStringAttributeSet));
-	return err;
-	}
-
-void CManager::DoGetStringAttributeSetL(const TDesC8& aHeaderData, RStringAttributeSet& aStringAttributeSet) const
-	{
-	// Find the agent who handles the file 
-	CAgentInfo& agentInfo = iResolver->ResolveFileL(aHeaderData);
-
-	// find out the array of attributes
-	User::LeaveIfError(agentInfo.AgentManagerL().GetStringAttributeSet(aHeaderData, aStringAttributeSet));
-	}
-	
-#endif //SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT