Index: xword/ContentFiltering/ContentFiltering.csproj
===================================================================
--- xword/ContentFiltering/ContentFiltering.csproj	(revision 22315)
+++ xword/ContentFiltering/ContentFiltering.csproj	(working copy)
@@ -61,6 +61,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Html\CSSUtil.cs" />
     <Compile Include="Html\HtmlUtil.cs" />
     <Compile Include="Office\Word\AbstractConverter.cs" />
     <Compile Include="Office\Word\BidirectionalConversionStates.cs" />
@@ -98,6 +99,7 @@
     <Compile Include="Office\Word\WebToLocalHTML.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StyleSheetExtensions\SSXManager.cs" />
+    <Compile Include="Test\Html\CSSUtilTest.cs" />
     <Compile Include="Test\Office\Word\Cleaners\BodyContentExtractorTest.cs" />
     <Compile Include="Test\Office\Word\Cleaners\CommentsRemoverTest.cs" />
     <Compile Include="Test\Office\Word\Cleaners\CorrectAttributesCleanerTest.cs" />
Index: xword/ContentFiltering/Html/CSSUtil.cs
===================================================================
--- xword/ContentFiltering/Html/CSSUtil.cs	(revision 0)
+++ xword/ContentFiltering/Html/CSSUtil.cs	(revision 0)
@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using System.Collections;
+
+namespace ContentFiltering.Html
+{
+    /// <summary>
+    /// Provides static methods for working with CSS.
+    /// </summary>
+    public class CSSUtil
+    {
+        /// <summary>
+        /// Inlines CSS for nodes with an id and/or class attribute.
+        /// </summary>
+        /// <param name="xmlDoc">A reference to an <code>XmlDocument</code>.</param>
+        public static void InlineCSS(ref XmlDocument xmlDoc)
+        {
+            XmlNodeList styleNodes = xmlDoc.GetElementsByTagName("style");
+            XmlNodeList allElements = xmlDoc.GetElementsByTagName("*");
+            Hashtable identifiedCSSClassesAndIDs = ExtractCSSClassesAndIDs(styleNodes);
+
+            foreach (XmlNode element in allElements)
+            {
+                XmlAttribute classAttribute = element.Attributes["class"];
+                XmlAttribute idAttribute = element.Attributes["id"];
+
+                if (classAttribute != null)
+                {
+                    string cssClassName = classAttribute.Value;
+
+                    if (identifiedCSSClassesAndIDs.ContainsKey(cssClassName))
+                    {
+                        XmlAttribute styleAttribute = null;
+                        styleAttribute = element.Attributes["style"];
+                        if (styleAttribute == null)
+                        {
+                            styleAttribute = element.Attributes.Append(xmlDoc.CreateAttribute("style"));
+                            styleAttribute.Value = "";
+                        }
+                        styleAttribute.Value += identifiedCSSClassesAndIDs[cssClassName];
+                    }
+                }
+
+                if (idAttribute != null)
+                {
+                    string cssIdName = idAttribute.Value;
+                    if (identifiedCSSClassesAndIDs.ContainsKey(cssIdName))
+                    {
+                        XmlAttribute styleAttribute = null;
+                        styleAttribute = element.Attributes["style"];
+                        if (styleAttribute == null)
+                        {
+                            styleAttribute = element.Attributes.Append(xmlDoc.CreateAttribute("style"));
+                            styleAttribute.Value = "";
+                        }
+                        styleAttribute.Value += identifiedCSSClassesAndIDs[cssIdName];
+                    }
+                }
+
+            }
+        }
+
+
+        /// <summary>
+        /// Extracts the CSS classes and ids from the 'style' nodes.
+        /// </summary>
+        /// <param name="styleNodes">A list of style nodes from the document.</param>
+        /// <returns>A hashtable with CSS classes names (and CSS ids names) and their properties.</returns>
+        private static Hashtable ExtractCSSClassesAndIDs(XmlNodeList styleNodes)
+        {
+            Hashtable identifiedCSSClassesAndIDs = new Hashtable();
+            foreach (XmlNode styleNode in styleNodes)
+            {
+                char[] separator = { '}' };
+                string[] css = styleNode.InnerText.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+                foreach (string cssClass in css)
+                {
+                    //several CSS classes can have same properties
+                    string properties = "";
+                    List<string> classesNames = new List<string>();
+
+                    int firstBrace = cssClass.IndexOf('{');
+                    if (firstBrace < 0)
+                    {
+                        continue;
+                    }
+                    properties = cssClass.Substring(firstBrace + 1).Replace('"', '\'');
+                    char[] comma = { ',' };
+                    string[] cssNames = cssClass.Substring(0, firstBrace).Split(comma);
+                    foreach (string className in cssNames)
+                    {
+                        //do not include the dot in the CSS class name or the pound in CSS id
+                        classesNames.Add(className.Trim().Substring(1));
+                    }
+
+                    foreach (string identifiedClassName in classesNames)
+                    {
+                        identifiedCSSClassesAndIDs.Add(identifiedClassName, properties);
+                    }
+                }
+            }
+            return identifiedCSSClassesAndIDs;
+        }
+
+
+
+    }
+}
Index: xword/ContentFiltering/Test/Html/CSSUtilTest.cs
===================================================================
--- xword/ContentFiltering/Test/Html/CSSUtilTest.cs	(revision 0)
+++ xword/ContentFiltering/Test/Html/CSSUtilTest.cs	(revision 0)
@@ -0,0 +1,176 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using System.Xml;
+using ContentFiltering.Html;
+using ContentFiltering.Test.Util;
+
+namespace ContentFiltering.Test.Html
+{
+    /// <summary>
+    /// Test class for <code>CSSUtil</code>.
+    /// </summary>
+    [TestFixture]
+    public class CSSUtilTest
+    {
+        private string initialHTML;
+        private string expectedHTML;
+        private XmlDocument initialXmlDoc;
+        private XmlDocument expectedXmlDoc;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public CSSUtilTest()
+        {
+            initialHTML = "";
+            expectedHTML = "";
+            initialXmlDoc = new XmlDocument();
+            expectedXmlDoc = new XmlDocument();
+        }
+
+        /// <summary>
+        /// Global test setup.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void GlobalSetup()
+        {
+            initialHTML = "";
+            expectedHTML = "";
+            initialXmlDoc = new XmlDocument();
+            expectedXmlDoc = new XmlDocument();
+        }
+
+        /// <summary>
+        /// Tests the InlineCSS method.
+        /// </summary>
+        [Test]
+        public void TestInlineCSS()
+        {
+            initialHTML = "<html><head><title>TITLE</title>"
+                + "<style type=\"text/css\">"
+                + Environment.NewLine
+                + ".oneClass {font-family:sans-serif;font-size:90%;}"
+                + "#oneId {color:red;}"
+                + Environment.NewLine
+                + "</style></head><body><h1>HEADER 1</h1>"
+                + "<p class=\"oneClass\">Text 1</p>"
+                + "<p><span id=\"oneId\">Text 2</span></p>"
+                + "<p>Text 3 <span class=\"oneClass\" id=\"oneId\">Text 4</span> Text 5</p>"
+                + "</body></html>";
+
+            expectedHTML = "<html><head><title>TITLE</title>"
+                + "<style type=\"text/css\">"
+                + Environment.NewLine
+                + ".oneClass {font-family:sans-serif;font-size:90%;}"
+                + "#oneId {color:red;}"
+                + Environment.NewLine
+                + "</style></head><body><h1>HEADER 1</h1>"
+                + "<p class=\"oneClass\" style=\"font-family:sans-serif;font-size:90%;\">Text 1</p>"
+                + "<p><span id=\"oneId\" style=\"color:red;\">Text 2</span></p>"
+                + "<p>Text 3 <span class=\"oneClass\" id=\"oneId\" style=\"font-family:sans-serif;font-size:90%;color:red;\">Text 4</span> Text 5</p>"
+                + "</body></html>";
+
+            initialXmlDoc.LoadXml(initialHTML);
+            expectedXmlDoc.LoadXml(expectedHTML);
+
+            CSSUtil.InlineCSS(ref initialXmlDoc);
+            Assert.IsTrue(XmlDocComparator.AreIdentical(initialXmlDoc, expectedXmlDoc));
+        }
+
+        /// <summary>
+        /// Performs a stress test for InlineCSS method: 15000 CSS classes and 15000 CSS ids for 30000 nodes.
+        /// </summary>
+        [Test]
+        public void StressTestInlineCSS()
+        {
+            initialHTML = "<html><head><title>TITLE</title><style>{0}</style></head>"
+                + Environment.NewLine
+                + "<body>"
+                + Environment.NewLine
+                + "<div>{1}</div>"
+                + "</body></html>";
+            initialHTML = String.Format(initialHTML, GenerateStressTestStyle(), GenerateInitialElementsForStressTest());
+
+            initialXmlDoc = new XmlDocument();
+            initialXmlDoc.LoadXml(initialHTML);
+
+            long startTicks = DateTime.Now.Ticks;
+            CSSUtil.InlineCSS(ref initialXmlDoc);
+            long stopTicks = DateTime.Now.Ticks;
+
+            //inline operation duration, in miliseconds
+            double inlineTimeMS = (1.0*stopTicks - startTicks) / 10000;
+
+
+            //inline operation should take less than 500 miliseconds
+            Assert.IsTrue(inlineTimeMS < 500.00);
+        }
+
+        /// <summary>
+        /// Generates 15000 CSS classes and 15000 CSS ids for the stress test.
+        /// </summary>
+        /// <returns>The CSS to be inserted in the 'style' section.</returns>
+        private string GenerateStressTestStyle()
+        {
+            StringBuilder sb = new StringBuilder();
+            for (int i = 1; i <= 15000; i++)
+            {
+                int r = i % 50;
+                if (r == 0)
+                {
+                    sb.Append("{font-size:12px;color:#303030;}");
+                    sb.Append(Environment.NewLine);
+                }
+                else
+                {
+                    sb.Append(".cssClass").Append(i);
+                    if (r != 49)
+                    {
+                        sb.Append(", ");
+                    }
+                }
+            }
+            sb.Append(Environment.NewLine);
+
+            for (int i = 1; i <= 15000; i++)
+            {
+                int r = i % 50;
+
+                if (r == 0)
+                {
+                    sb.Append("{padding:4px;background-color:#FEFEFE;}");
+                    sb.Append(Environment.NewLine);
+                }
+                else
+                {
+                    sb.Append("#cssID").Append(i);
+                    if (r != 49)
+                    {
+                        sb.Append(", ");
+                    }
+                }
+            }
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Generates a string contaning 30000 HTML paragraphs for the stress test.
+        /// </summary>
+        /// <returns>The HTML to be inserted in the 'body' section.</returns>
+        private string GenerateInitialElementsForStressTest()
+        {
+            StringBuilder sb = new StringBuilder();
+            for (int i = 1; i <= 15000; i++)
+            {
+                sb.Append("<p class=\"cssClass").Append(i).Append("\">Text with CSS CLASS ").Append(i).Append("</p>");
+                sb.Append("<p id=\"cssID").Append(i).Append("\">Text with CSS ID ").Append(i).Append("</p>");
+            }
+            return sb.ToString();
+        }
+
+        
+    }
+}