Index: xword/ContentFiltering/ContentFiltering.csproj
===================================================================
--- xword/ContentFiltering/ContentFiltering.csproj	(revision 21847)
+++ xword/ContentFiltering/ContentFiltering.csproj	(working copy)
@@ -81,6 +81,7 @@
     <Compile Include="Office\Word\Filters\IDOMFilter.cs" />
     <Compile Include="Office\Word\Cleaners\IHTMLCleaner.cs" />
     <Compile Include="Office\Word\Filters\LocalImageAdaptorFilter.cs" />
+    <Compile Include="Office\Word\Filters\LocalToWebStyleFilter.cs" />
     <Compile Include="Office\Word\Filters\WebImageAdaptorFilter.cs" />
     <Compile Include="Office\Word\Filters\WebListsAdaptorFilter.cs" />
     <Compile Include="Office\Word\Filters\WebMacrosAdaptorFilter.cs" />
@@ -109,6 +110,7 @@
     <Compile Include="Test\Office\Word\Filters\GrammarAndSpellingErrorsFilterTest.cs" />
     <Compile Include="Test\Office\Word\Filters\LocalImageAdaptorFilterTest.cs" />
     <Compile Include="Test\Office\Word\Filters\LocalMacrosAdaptorFilterTest.cs" />
+    <Compile Include="Test\Office\Word\Filters\LocalToWebStyleFilterTest.cs" />
     <Compile Include="Test\Office\Word\Filters\OfficeAttributesRemoverFilterTest.cs" />
     <Compile Include="Test\Office\Word\Filters\StyleRemoverFilterTest.cs" />
     <Compile Include="Test\Office\Word\Filters\WebImageAdaptorFilterTest.cs" />
Index: xword/ContentFiltering/Office/Word/Filters/LocalToWebStyleFilter.cs
===================================================================
--- xword/ContentFiltering/Office/Word/Filters/LocalToWebStyleFilter.cs	(revision 0)
+++ xword/ContentFiltering/Office/Word/Filters/LocalToWebStyleFilter.cs	(revision 0)
@@ -0,0 +1,227 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using XWiki.Office.Word;
+using System.Xml;
+using System.Collections;
+using System.Text.RegularExpressions;
+
+namespace ContentFiltering.Office.Word.Filters
+{
+    /// <summary>
+    /// Extracts the CSS inline styles, optimizes CSS and adds CSS classes in the head section for current page.
+    /// </summary>
+    public class LocalToWebStyleFilter : IDOMFilter
+    {
+        private int counter = 0;
+        private Hashtable cssClasses;
+        private ConversionManager manager;
+
+        public LocalToWebStyleFilter(ConversionManager manager)
+        {
+            this.manager = manager;
+            this.cssClasses = new Hashtable();
+            this.counter = 0;
+        }
+
+        #region IDOMFilter Members
+
+        /// <summary>
+        /// Extracts the CSS inline styles, optimizes CSS and adds CSS classes in the head section for current page
+        /// </summary>
+        /// <param name="xmlDoc"></param>
+        public void Filter(ref System.Xml.XmlDocument xmlDoc)
+        {
+            XmlNode body = xmlDoc.GetElementsByTagName("body")[0];
+            XmlNode head = xmlDoc.GetElementsByTagName("head")[0];
+            if (head == null)
+            {
+                head = xmlDoc.CreateNode(XmlNodeType.Element, "head", xmlDoc.NamespaceURI);
+                body.ParentNode.InsertBefore(head, body);
+            }
+            ConvertCSSClassesToInlineStyles(ref head, ref body, ref xmlDoc);
+            body = ConvertInlineStylesToCssClasses(body, ref xmlDoc);
+            OptimizeCssClasses();
+            InsertCssClassesInHeader(ref head, ref xmlDoc);
+        }
+
+        #endregion IDOMFilter Members
+
+
+        private void ConvertCSSClassesToInlineStyles(ref XmlNode head, ref XmlNode body, ref XmlDocument xmlDoc)
+        {
+
+        }
+
+        /// <summary>
+        /// Extracts inline styles and replaces them with CSS classes.
+        /// </summary>
+        /// <param name="xnode">Node to filter</param>
+        /// <param name="xmlDoc">A reference to the XmlDocument.</param>
+        /// <returns>Filtered node: 'class' attribute instead of 'style'.</returns>
+        private XmlNode ConvertInlineStylesToCssClasses(XmlNode xnode, ref XmlDocument xmlDoc)
+        {
+            XmlNode node = xnode;
+            if (node.ChildNodes.Count > 0)
+            {
+                RemoveXOfficeCSSClasses(ref node);
+                ExtractStyle(ref node, ref xmlDoc);
+                for (int i = 0; i < node.ChildNodes.Count; i++)
+                {
+                    XmlNode childNode = node.ChildNodes[i];
+                    childNode = ConvertInlineStylesToCssClasses(childNode, ref xmlDoc);
+                }
+            }
+            return node;
+        }
+
+        /// <summary>
+        /// Removes previous XOffice CSS classes.
+        /// </summary>
+        /// <param name="node">A reference to an XmlNode to filter.</param>
+        private void RemoveXOfficeCSSClasses(ref XmlNode node)
+        {
+            XmlAttribute classAttribute = node.Attributes["class"];
+            if (classAttribute != null)
+            {
+                if (classAttribute.Value.IndexOf("xoffice") >= 0)
+                {
+                    classAttribute.Value = Regex.Replace(classAttribute.Value, "xoffice[0-9]+", "", RegexOptions.IgnoreCase | RegexOptions.Multiline);
+                }
+                node.Attributes.Remove(node.Attributes["class"]);
+                if (("" + classAttribute.Value).Length > 0)
+                {
+                    node.Attributes.Append(classAttribute);
+                }
+            }
+        }
+
+        private void ExtractStyle(ref XmlNode node, ref XmlDocument xmlDoc)
+        {
+            if (node.Attributes.Count > 0)
+            {
+                if (node.Attributes["style"] != null)
+                {
+                    if (node.ChildNodes.Count > 0 && ("" + node.Attributes["style"].Value).Length > 0)
+                    {
+                        string className = "xoffice" + counter;
+                        string classValue = CleanCSSProperties(node.Attributes["style"].Value);
+                        if (classValue.Length > 0)
+                        {
+
+                            cssClasses.Add("." + className, classValue);
+                            node.Attributes.Remove(node.Attributes["style"]);
+                            XmlAttribute classAttribute = node.Attributes["class"];
+                            if (classAttribute == null)
+                            {
+                                classAttribute = xmlDoc.CreateAttribute("class");
+                            }
+                            else
+                            {
+                                classAttribute.Value += " ";
+                            }
+                            classAttribute.Value += className;
+                            node.Attributes.Remove(node.Attributes["class"]);
+                            node.Attributes.Append(classAttribute);
+                            counter++;
+
+                        }
+                    }
+                    else
+                    {
+                        //An empty node, so delete it's attributes 
+                        //This way the node could be safely removed by other DOM filters
+                        node.Attributes.RemoveAll();
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Cleans CSS properties by removing the ones specific to MS Office.
+        /// </summary>
+        /// <param name="style"></param>
+        /// <returns></returns>
+        private string CleanCSSProperties(string style)
+        {
+            StringBuilder acceptedProperties = new StringBuilder();
+
+            string[] separator = new string[1];
+            separator[0] = ";";
+            string[] props = style.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+            foreach (string property in props)
+            {
+                string propName = property.Substring(0, property.IndexOf(':'));
+                if (ValidCSSProperties.GetList().Contains(propName.ToLower().Trim()))
+                {
+                    acceptedProperties.Append(property);
+                    acceptedProperties.Append(";");
+                }
+            }
+            return acceptedProperties.ToString();
+        }
+
+        private void OptimizeCssClasses()
+        {
+
+        }
+
+        private void InsertCssClassesInHeader(ref XmlNode headNode, ref XmlDocument xmlDoc)
+        {
+            XmlNode styleNode = xmlDoc.CreateNode(XmlNodeType.Element, "style", xmlDoc.NamespaceURI);
+
+            string value = "";
+
+            foreach (Object key in cssClasses.Keys)
+            {
+                value += Environment.NewLine;
+                value += (string)key;
+                value += "{";
+                value += cssClasses[key];
+                value += "}";
+            }
+
+            XmlNode styleNodeContent = xmlDoc.CreateNode(XmlNodeType.Text, "#text", xmlDoc.NamespaceURI);
+            styleNodeContent.Value = value;
+
+            styleNode.AppendChild(styleNodeContent);
+            headNode.AppendChild(styleNode);
+        }
+    }
+
+
+    class ValidCSSProperties
+    {
+        private static List<string> validCSSProperties = new List<string>()
+        {
+            "accelerator", "azimuth", "background", "background-attachment", "background-color", "background-image", 
+            "background-position", "background-position-x", "background-position-y", "background-repeat", "behavior", "border", 
+            "border-bottom", "border-bottom-color", "border-bottom-style", "border-bottom-width", "border-collapse", "border-color", 
+            "border-left", "border-left-color", "border-left-style", "border-left-width", "border-right", "border-right-color", 
+            "border-right-style", "border-right-width", "border-spacing", "border-style", "border-top", "border-top-color", 
+            "border-top-style", "border-top-width", "border-width", "bottom", "caption-side", "clear", 
+            "clip", "color", "content", "counter-increment", "counter-reset", "cue", 
+            "cue-after", "cue-before", "cursor", "direction", "display", "elevation", 
+            "empty-cells", "filter", "float", "font", "font-family", "font-size", 
+            "font-size-adjust", "font-stretch", "font-style", "font-variant", "font-weight", "height", 
+            "ime-mode", "include-source", "layer-background-color", "layer-background-image", "layout-flow", "layout-grid", 
+            "layout-grid-char", "layout-grid-char-spacing", "layout-grid-line", "layout-grid-mode", "layout-grid-type", "left", 
+            "letter-spacing", "line-break", "line-height", "list-style", "list-style-image", "list-style-position", 
+            "list-style-type", "margin", "margin-bottom", "margin-left", "margin-right", "margin-top", 
+            "marker-offset", "marks", "max-height", "max-width", "min-height", "min-width", 
+            "orphans", "outline", "outline-color", "outline-style", "outline-width", "overflow", 
+            "overflow-X", "overflow-Y", "padding", "padding-bottom", "padding-left", "padding-right", 
+            "padding-top", "page", "page-break-after", "page-break-before", "page-break-inside", "pause", 
+            "pause-after", "pause-before", "pitch", "pitch-range", "play-during", "position", 
+            "size", "table-layout", "text-align", "text-decoration", "text-indent", "text-transform", 
+            "text-shadow", "top", "vertical-align", "visibility", "white-space", "width", 
+            "word-break", "word-spacing", "z-index"
+        };
+
+        public static List<string> GetList()
+        {
+            return validCSSProperties;
+        }
+    }
+}
Index: xword/ContentFiltering/Office/Word/LocalToWebHTML.cs
===================================================================
--- xword/ContentFiltering/Office/Word/LocalToWebHTML.cs	(revision 21847)
+++ xword/ContentFiltering/Office/Word/LocalToWebHTML.cs	(working copy)
@@ -37,6 +37,7 @@
 
             List<IDOMFilter> contentFilters = new List<IDOMFilter>()
             {
+                new LocalToWebStyleFilter(manager),
                 new StyleRemoverFilter(manager),
                 new GrammarAndSpellingErrorsFilter(manager),
                 new LocalImageAdaptorFilter(manager),
Index: xword/ContentFiltering/Test/Office/Word/Filters/LocalToWebStyleFilterTest.cs
===================================================================
--- xword/ContentFiltering/Test/Office/Word/Filters/LocalToWebStyleFilterTest.cs	(revision 0)
+++ xword/ContentFiltering/Test/Office/Word/Filters/LocalToWebStyleFilterTest.cs	(revision 0)
@@ -0,0 +1,165 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using System.Xml;
+using ContentFiltering.Test.Util;
+using ContentFiltering.Office.Word.Filters;
+using XWiki.Office.Word;
+
+namespace ContentFiltering.Test.Office.Word.Filters
+{
+    /// <summary>
+    /// Test class for <code>LocalToWebStyleFilter</code>.
+    /// </summary>
+    [TestFixture]
+    public class LocalToWebStyleFilterTest
+    {
+        private ConversionManager manager;
+        private string initialHTML;
+        private string expectedHTML;
+        private XmlDocument initialXmlDoc;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public LocalToWebStyleFilterTest()
+        {
+            manager = ConversionManagerTestUtil.DummyConversionManager();
+            initialHTML = "";
+            expectedHTML = "";
+            initialXmlDoc = new XmlDocument();
+        }
+
+        /// <summary>
+        /// Test setup.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void TestSetup()
+        {
+            initialHTML = "<html><head><style>.xoffice0 {font-family:monospace;}</style></head>"
+                + "<body><p style=\"font-family:Verdana,sans-serif;font-size:10pt;\">Some content</p>"
+                + "<p class=\"xoffice0\">some code</p>"
+                + "<p style=\"font-family:Verdana,sans-serif;font-size:10pt;\">More content</p>"
+                + "<p class=\"xoffice0\">more code</p>"
+                + "</body></html>";
+
+            expectedHTML = "<html><head><style>"
+                + " .xoffice0, .xoffice2 {font-family:Verdana,sans-serif;font-size:10pt;} "
+                + " .xoffice1 .xoffice3 {font-family:monospace;}"
+                + " </style></head>"
+                + "<body>"
+                + "<p class=\"xoffice0\">Some content</p>"
+                + "<p class=\"xoffice1\">some code</p>"
+                + "<p class=\"xoffice2\">More content</p>"
+                + "<p class=\"xoffice3\">more code</p>"
+                + "</body></html>";
+
+            initialXmlDoc.LoadXml(initialHTML);
+        }
+
+        /// <summary>
+        /// Tests the LocalToWebStyle filter:
+        ///  - No inline styles.
+        ///  - Only 'xoffice[0-9]+' CSS classes.
+        ///  - Exactly 4 'xoffice[0-9]+' CSS classes, grouped in 2 parts (optimized).
+        /// </summary>
+        [Test]
+        public void TestLocalToWebStyleFilter()
+        {
+            bool foundInlineStyles = false;
+            bool foundNonXOfficeClasses = false;
+
+            new LocalToWebStyleFilter(manager).Filter(ref initialXmlDoc);
+
+            XmlNodeList allNodes = initialXmlDoc.GetElementsByTagName("*");
+
+            foreach (XmlNode node in allNodes)
+            {
+                //searching for inline styles
+                if (node.Attributes["style"] != null)
+                {
+                    if (("" + node.Attributes["style"].Value).Length > 0)
+                    {
+                        foundInlineStyles = true;
+                        break; //no need to continue searching other problems
+                    }
+                }
+
+                //searching for non-XOffice CSS classes in nodes
+                if (node.Attributes["class"] != null)
+                {
+                    if (("" + node.Attributes["class"].Value).Length > 0)
+                    {
+                        if (node.Attributes["class"].Value.ToLower().IndexOf("xoffice") < 0)
+                        {
+                            foundNonXOfficeClasses = true;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            XmlNode styleNode = initialXmlDoc.GetElementsByTagName("style")[0];
+            string cssContent = ExtractStyleContent(styleNode);
+
+            Assert.IsFalse(foundInlineStyles);
+            Assert.IsFalse(foundNonXOfficeClasses);
+            Assert.IsNotNull(styleNode);
+            Assert.IsTrue(CountCSSClasses(cssContent) == 4);
+            Assert.IsTrue(OptimizedCSSClasses(cssContent));
+        }
+
+        private string ExtractStyleContent(XmlNode styleNode)
+        {
+            string cssContent = "";
+            if (styleNode != null)
+            {
+                if (("" + styleNode.InnerText).Length > 0)
+                {
+                    cssContent = styleNode.InnerText;
+                }
+            }
+            return cssContent;
+        }
+
+        /// <summary>
+        /// Counts the CSS classes from a CSS content.
+        /// </summary>
+        /// <param name="cssContent">The CSS content.</param>
+        /// <returns>Number of CSS classes found.</returns>
+        private int CountCSSClasses(string cssContent)
+        {
+            int count = 0;
+            int startIndex = 0;
+            while (startIndex != -1)
+            {
+                while (startIndex >= 0)
+                {
+                    startIndex = cssContent.IndexOf(".xoffice", startIndex);
+                    count++;
+                }
+            }
+            return count;
+        }
+
+        /// <summary>
+        /// Verifies the CSS content four classes grouped in 2 parts.
+        /// </summary>
+        /// <param name="cssContent">The CSS content.</param>
+        /// <returns>TRUE if CSS seems to be optimized.</returns>
+        private bool OptimizedCSSClasses(string cssContent)
+        {
+            bool foundOptimizedCSS = false;
+            char[] separator = new char[] { '}' };
+            string[] groups = cssContent.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+            if (groups.Length == 2)
+            {
+                Console.WriteLine("Counting..");
+                foundOptimizedCSS = (CountCSSClasses(groups[0]) == 2) && (CountCSSClasses(groups[1]) == 2);
+            }
+            return foundOptimizedCSS;
+        }
+    }
+}