Index: xword/ContentFiltering/ContentFiltering.csproj
===================================================================
--- xword/ContentFiltering/ContentFiltering.csproj	(revision 21744)
+++ xword/ContentFiltering/ContentFiltering.csproj	(working copy)
@@ -68,10 +68,12 @@
     <Compile Include="Office\Word\Cleaners\EmptyParagraphsCleaner.cs" />
     <Compile Include="Office\Word\Cleaners\HeadSectionRemover.cs" />
     <Compile Include="Office\Word\Cleaners\ListCharsCleaner.cs" />
+    <Compile Include="Office\Word\Cleaners\LocalToWebHTMLCleaner.cs" />
     <Compile Include="Office\Word\Cleaners\NbspBetweenTagsRemover.cs" />
     <Compile Include="Office\Word\Cleaners\NbspReplacer.cs" />
     <Compile Include="Office\Word\Cleaners\OfficeNameSpacesTagsRemover.cs" />
     <Compile Include="Office\Word\Cleaners\TidyHTMLCleaner.cs" />
+    <Compile Include="Office\Word\Cleaners\WebToLocalHTMLCleaner.cs" />
     <Compile Include="Office\Word\Cleaners\XmlNamespaceDefinitionsReplacer.cs" />
     <Compile Include="Office\Word\ConversionManager.cs" />
     <Compile Include="Office\Word\ConverterActionState.cs" />
@@ -98,9 +100,11 @@
     <Compile Include="Test\Office\Word\Cleaners\EmptyParagraphsCleanerTest.cs" />
     <Compile Include="Test\Office\Word\Cleaners\HeadSectionRemoverTest.cs" />
     <Compile Include="Test\Office\Word\Cleaners\ListCharsCleanerTest.cs" />
+    <Compile Include="Test\Office\Word\Cleaners\LocalToWebHTMLCleanerTest.cs" />
     <Compile Include="Test\Office\Word\Cleaners\NbspBetweenTagsRemoverTest.cs" />
     <Compile Include="Test\Office\Word\Cleaners\NbspReplacerTest.cs" />
     <Compile Include="Test\Office\Word\Cleaners\OfficeNameSpacesTagsRemoverTest.cs" />
+    <Compile Include="Test\Office\Word\Cleaners\WebToLocalHTMLCleanerTest.cs" />
     <Compile Include="Test\Office\Word\Cleaners\XmlNamespaceDefinitionsReplacerTest.cs" />
     <Compile Include="Test\Office\Word\Filters\GrammarAndSpellingErrorsFilterTest.cs" />
     <Compile Include="Test\Office\Word\Filters\LocalImageAdaptorFilterTest.cs" />
@@ -125,6 +129,11 @@
       <Name>XWikiLib</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Test\Office\Word\Cleaners\TestsResources\PreDomFiltersTestPage.htm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: xword/ContentFiltering/Office/Word/Cleaners/LocalToWebHTMLCleaner.cs
===================================================================
--- xword/ContentFiltering/Office/Word/Cleaners/LocalToWebHTMLCleaner.cs	(revision 0)
+++ xword/ContentFiltering/Office/Word/Cleaners/LocalToWebHTMLCleaner.cs	(revision 0)
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using XWiki.Office.Word;
+
+namespace ContentFiltering.Office.Word.Cleaners
+{
+    /// <summary>
+    /// Main cleaner for <code>LocalToWeb</code>.
+    /// </summary>
+    public class LocalToWebHTMLCleaner:IHTMLCleaner
+    {
+        private string htmlOpeningTag;
+
+        public LocalToWebHTMLCleaner(string htmlOpeningTag)
+        {
+            this.htmlOpeningTag = htmlOpeningTag;
+        }
+
+        #region IHTMLCleaner Members
+
+        /// <summary>
+        /// Main HTML cleaner for <code>LocalToWeb</code>. It calls other HTML cleaners in a certain order
+        /// and returns the cleaned HTML.
+        /// </summary>
+        /// <param name="content">HTML content.</param>
+        /// <returns>Cleaned HTML content.</returns>
+        public string Clean(string content)
+        {
+            String uncleanedContent = new CorrectAttributesCleaner().Clean(content);
+            uncleanedContent = new CorrectTagsClosingCleaner("img").Clean(uncleanedContent);
+            uncleanedContent = new CorrectTagsClosingCleaner("br").Clean(uncleanedContent);
+            content = new TidyHTMLCleaner(true).Clean(uncleanedContent);
+
+            if (content.Length == 0)
+            {
+                content = uncleanedContent;
+            }
+
+            content = new XmlNamespaceDefinitionsReplacer(htmlOpeningTag).Clean(content);
+            content = new ListCharsCleaner().Clean(content);
+            content = new EmptyParagraphsCleaner().Clean(content);
+            content = new NbspBetweenTagsRemover().Clean(content);
+            content = new OfficeNameSpacesTagsRemover().Clean(content);
+            content = new NbspReplacer().Clean(content);
+
+            return content;
+        }
+
+        #endregion IHTMLCleaner Members
+    }
+}
Index: xword/ContentFiltering/Office/Word/Cleaners/WebToLocalHTMLCleaner.cs
===================================================================
--- xword/ContentFiltering/Office/Word/Cleaners/WebToLocalHTMLCleaner.cs	(revision 0)
+++ xword/ContentFiltering/Office/Word/Cleaners/WebToLocalHTMLCleaner.cs	(revision 0)
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ContentFiltering.Office.Word.Cleaners
+{
+    /// <summary>
+    /// Main HTML cleaner for <code>WebToLocal</code>.
+    /// </summary>
+    public class WebToLocalHTMLCleaner:IHTMLCleaner
+    {
+        private string htmlOpeningTag;
+
+        public WebToLocalHTMLCleaner(string htmlOpeningTag)
+        {
+            this.htmlOpeningTag = htmlOpeningTag;
+        }
+
+
+        #region IHTMLCleaner Members
+
+        public string Clean(string content)
+        {
+            content = new OfficeNameSpacesTagsRemover().Clean(content);
+            content = new TidyHTMLCleaner(false).Clean(content);
+            content = new XmlNamespaceDefinitionsReplacer(htmlOpeningTag).Clean(content);
+            content = new EmptyParagraphsCleaner().Clean(content);
+            content = new NbspBetweenTagsRemover().Clean(content);
+            content = new NbspReplacer().Clean(content);
+
+            return content;
+        }
+
+        #endregion IHTMLCleaner Members
+    }
+}
Index: xword/ContentFiltering/Office/Word/LocalToWebHTML.cs
===================================================================
--- xword/ContentFiltering/Office/Word/LocalToWebHTML.cs	(revision 21744)
+++ xword/ContentFiltering/Office/Word/LocalToWebHTML.cs	(working copy)
@@ -31,23 +31,8 @@
             XmlDocument xmlDoc = new XmlDocument();
             //xmlDoc.XmlResolver = null;
 
-            String uncleanedContent = new CorrectAttributesCleaner().Clean(content);
-            uncleanedContent = new CorrectTagsClosingCleaner("img").Clean(uncleanedContent);
-            uncleanedContent = new CorrectTagsClosingCleaner("br").Clean(uncleanedContent);
-            content = new TidyHTMLCleaner(true).Clean(uncleanedContent);
+            content = new LocalToWebHTMLCleaner(HTML_OPENING_TAG).Clean(content);
 
-            if (content.Length == 0)
-            {
-                content = uncleanedContent;
-            }
-            
-            content = new XmlNamespaceDefinitionsReplacer(HTML_OPENING_TAG).Clean(content);
-            content = new ListCharsCleaner().Clean(content);
-            content = new EmptyParagraphsCleaner().Clean(content);
-            content = new NbspBetweenTagsRemover().Clean(content);
-            content = new OfficeNameSpacesTagsRemover().Clean(content);
-            content = new NbspReplacer().Clean(content);
-
             xmlDoc.LoadXml(content);
 
             List<IDOMFilter> contentFilters = new List<IDOMFilter>()
Index: xword/ContentFiltering/Office/Word/WebToLocalHTML.cs
===================================================================
--- xword/ContentFiltering/Office/Word/WebToLocalHTML.cs	(revision 21744)
+++ xword/ContentFiltering/Office/Word/WebToLocalHTML.cs	(working copy)
@@ -93,13 +93,8 @@
         public String AdaptSource(String content)
         {
             XmlDocument xmlDoc = new XmlDocument();
-            content = new OfficeNameSpacesTagsRemover().Clean(content);
-            
-            content = new TidyHTMLCleaner(false).Clean(content);
-            content = new XmlNamespaceDefinitionsReplacer(HTML_OPENING_TAG).Clean(content);
-            content = new EmptyParagraphsCleaner().Clean(content);
-            content = new NbspBetweenTagsRemover().Clean(content);
-            content = new NbspReplacer().Clean(content);
+            content = new WebToLocalHTMLCleaner(HTML_OPENING_TAG).Clean(content);
+
             //content = content.Insert(0, DOCTYPE);
             try
             {
Index: xword/ContentFiltering/Test/Office/Word/Cleaners/LocalToWebHTMLCleanerTest.cs
===================================================================
--- xword/ContentFiltering/Test/Office/Word/Cleaners/LocalToWebHTMLCleanerTest.cs	(revision 0)
+++ xword/ContentFiltering/Test/Office/Word/Cleaners/LocalToWebHTMLCleanerTest.cs	(revision 0)
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using System.Xml;
+using ContentFiltering.Office.Word.Cleaners;
+using System.IO;
+
+namespace ContentFiltering.Test.Office.Word.Cleaners
+{
+    /// <summary>
+    /// Test class for <code>LocalToWebHTMLCleaner</code>.
+    /// </summary>
+    [TestFixture]
+    public class LocalToWebHTMLCleanerTest
+    {
+        private string htmlContent;
+        private string htmlOpeningTag;
+        private XmlDocument xmlDoc;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public LocalToWebHTMLCleanerTest()
+        {
+            htmlContent = "";
+            htmlOpeningTag = "";
+            xmlDoc = new XmlDocument();
+        }
+
+
+        [TestFixtureSetUp]
+        public void TestSetup()
+        {
+            string path = @"Test\Office\Word\Cleaners\TestsResources\PreDomFiltersTestPage.htm";
+            htmlContent = "";
+            try
+            {
+                TextReader tr = new StreamReader(path);
+                htmlContent = tr.ReadToEnd();
+                tr.Close();
+            }
+            catch
+            {
+            }
+
+            htmlOpeningTag = "<html xmlns:v=\"urn:schemas-microsoft-com:vml\"" +
+                        " xmlns:o=\"urn:schemas-microsoft-com:office:office\"" +
+                        " xmlns:w=\"urn:schemas-microsoft-com:office:word\"" +
+                        " xmlns:m=\"http://schemas.microsoft.com/office/2004/12/omml\"" +
+                        " xmlns=\"http://www.w3.org/1999/xhtml\">";
+        }
+
+        /// <summary>
+        /// Loads an HTML file from disk, cleans the content with LocalToWebHTMLCleaner and then it
+        /// tries to load the cleaned HTML into an XmlDocument.
+        /// </summary>
+        [Test]
+        public void TestCleaner()
+        {
+            bool noException = true;
+
+            try
+            {
+                htmlContent = new LocalToWebHTMLCleaner(htmlOpeningTag).Clean(htmlContent);
+                xmlDoc.LoadXml(htmlContent);
+            }
+            catch (Exception e)
+            {
+                noException = false;
+                Console.Error.WriteLine(e);
+            }
+
+            Assert.IsTrue(noException);
+        }
+    }
+}
Index: xword/ContentFiltering/Test/Office/Word/Cleaners/WebToLocalHTMLCleanerTest.cs
===================================================================
--- xword/ContentFiltering/Test/Office/Word/Cleaners/WebToLocalHTMLCleanerTest.cs	(revision 0)
+++ xword/ContentFiltering/Test/Office/Word/Cleaners/WebToLocalHTMLCleanerTest.cs	(revision 0)
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using System.Xml;
+using ContentFiltering.Office.Word.Cleaners;
+using System.IO;
+
+namespace ContentFiltering.Test.Office.Word.Cleaners
+{
+    /// <summary>
+    /// Test class for <code>WebToLocalHTMLCleaner</code>.
+    /// </summary>
+    [TestFixture]
+    public class WebToLocalHTMLCleanerTest
+    {
+        private string htmlContent;
+        private string htmlOpeningTag;
+        private XmlDocument xmlDoc;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public WebToLocalHTMLCleanerTest()
+        {
+            htmlContent = "";
+            htmlOpeningTag = "";
+            xmlDoc = new XmlDocument();
+        }
+
+        [TestFixtureSetUp]
+        public void TestSetup()
+        {
+            htmlContent = LoadTextFromFile(@"Test\Office\Word\Cleaners\TestsResources\PreDomFiltersTestPage.htm");
+            htmlOpeningTag = "<html xmlns:v=\"urn:schemas-microsoft-com:vml\"" +
+                        " xmlns:o=\"urn:schemas-microsoft-com:office:office\"" +
+                        " xmlns:w=\"urn:schemas-microsoft-com:office:word\"" +
+                        " xmlns:m=\"http://schemas.microsoft.com/office/2004/12/omml\"" +
+                        " xmlns=\"http://www.w3.org/1999/xhtml\">";
+        }
+
+        // <summary>
+        /// Loads an HTML file from disk, cleans the content with WebToLocalHTMLCleaner and then it
+        /// tries to load the cleaned HTML into an XmlDocument.
+        /// </summary>
+        [Test]
+        public void TestCleaner()
+        {
+            bool noException = true;
+            try
+            {
+                htmlContent = new WebToLocalHTMLCleaner(htmlOpeningTag).Clean(htmlContent);
+                xmlDoc.LoadXml(htmlContent);
+            }
+            catch(Exception e)
+            {
+                Console.Error.WriteLine(e);
+                noException = false;
+            }
+
+            Assert.IsTrue(noException);
+        }
+
+
+        private string LoadTextFromFile(string path)
+        {
+            string content = "";
+            try
+            {
+                TextReader tr = new StreamReader(path);
+                content = tr.ReadToEnd();
+                tr.Close();
+            }
+            catch
+            {
+            }
+            return content;
+        }
+    }
+}