Index: xword/UICommons/UIActionsManagement/AbstractAddPageFormActionsManager.cs
===================================================================
--- xword/UICommons/UIActionsManagement/AbstractAddPageFormActionsManager.cs	(revision 0)
+++ xword/UICommons/UIActionsManagement/AbstractAddPageFormActionsManager.cs	(revision 0)
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace UICommons.UIActionsManagement
+{
+    /// <summary>
+    /// Abstract actions manager for <code>AddPageForm</code> instances.
+    /// </summary>
+    public abstract class AbstractAddPageFormActionsManager : IActionsManager<AddPageForm>
+    {
+        /// <summary>
+        /// Action to perform when OnAdd event is raised.
+        /// </summary>
+        /// <param name="sender">Sender object</param>
+        /// <param name="e">Event arguments</param>
+        protected abstract void ActionAdd(object sender, EventArgs e);
+
+
+        #region IActionsManager<AddPageForm> Members
+
+        /// <summary>
+        /// Enqueues all event handlers for an AddPageForm.
+        /// </summary>
+        public abstract void EnqueueAllHandlers();
+
+        #endregion IActionsManager<AddPageForm> Members
+    }
+}
Index: xword/UICommons/UIActionsManagement/IActionsManager.cs
===================================================================
--- xword/UICommons/UIActionsManagement/IActionsManager.cs	(revision 22792)
+++ xword/UICommons/UIActionsManagement/IActionsManager.cs	(working copy)
@@ -17,7 +17,6 @@
         /// <summary>
         /// Enqueues all (known) event handlers defined for a control.
         /// </summary>
-        /// <param name="control">A reference to a generic control.</param>
-        void EnqueueAllHandlers(ref T control);
+        void EnqueueAllHandlers();
     }
 }
\ No newline at end of file
Index: xword/UICommons/UICommons.csproj
===================================================================
--- xword/UICommons/UICommons.csproj	(revision 22792)
+++ xword/UICommons/UICommons.csproj	(working copy)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -55,6 +55,7 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UIActionsManagement\IActionsManager.cs" />
+    <Compile Include="UIActionsManagement\AbstractAddPageFormActionsManager.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="AddPageForm.resx">
@@ -76,4 +77,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
Index: xword/XWord/AddPageFormManager.cs
===================================================================
--- xword/XWord/AddPageFormManager.cs	(revision 22792)
+++ xword/XWord/AddPageFormManager.cs	(working copy)
@@ -4,61 +4,32 @@
 using System.Text;
 using System.Windows.Forms;
 using UICommons;
+using UICommons.UIActionsManagement;
 
 namespace XWord
 {
     /// <summary>
-    /// Manages the instances and public events handlers for AddPageForm.
+    /// Manages the public events handlers for AddPageForm.
     /// </summary>
-    public class AddPageFormManager
+    public class AddPageFormManager : AbstractAddPageFormActionsManager
     {
-        private AddPageForm addPageForm;
+        AddPageForm addPageForm;
 
         /// <summary>
-        /// Creates a new AddPageForm.
+        /// Default constructor.
         /// </summary>
-        /// <param name="wiki">A reference to <code>XWiki.WikiSructure</code>.</param>
-        /// <returns>New AddPageForm.</returns>
-        public AddPageForm NewAddPageForm(ref XWiki.WikiStructure wiki)
+        /// <param name="addPageForm">A reference to an <code>AddPageForm</code> instance.</param>
+        public AddPageFormManager(ref AddPageForm addPageForm)
         {
-            addPageForm = new AddPageForm(ref wiki);
-            addPageForm.OnAdd += new EventHandler(this.ActionAdd);
-            return addPageForm;
+            this.addPageForm = addPageForm;
         }
 
         /// <summary>
-        /// Creates a new AddPageForm.
+        /// Event trigerred when OnAdd event of the AddPageForm instance is raised.
         /// </summary>
-        /// <param name="wiki">A reference to <code>XWiki.WikiSructure</code>.</param>
-        /// <param name="spaceName">Space name.</param>
-        /// <returns>New AddPageForm.</returns>
-        public AddPageForm NewAddPageForm(ref XWiki.WikiStructure wiki, string spaceName)
-        {
-            addPageForm = new AddPageForm(ref wiki,spaceName);
-            addPageForm.OnAdd += new EventHandler(this.ActionAdd);
-            return addPageForm;
-        }
-
-        /// <summary>
-        /// Creates a new AddPageForm.
-        /// </summary>
-        /// <param name="wiki">A reference to <code>XWiki.WikiSructure</code>.</param>
-        /// <param name="newSpace">TRUE if it's a new space.</param>
-        /// <param name="exportMode">TRUE if export mode.</param>
-        /// <returns>New AddPageForm.</returns>
-        public AddPageForm NewAddPageForm(ref XWiki.WikiStructure wiki, bool newSpace,bool exportMode)
-        {
-            addPageForm = new AddPageForm(ref wiki, newSpace, exportMode);
-            addPageForm.OnAdd += new EventHandler(this.ActionAdd);
-            return addPageForm;
-        }
-
-        /// <summary>
-        /// Event trigeered when OnAdd event of the AddPageForm instance is raised.
-        /// </summary>
         /// <param name="sender">Sender object.</param>
         /// <param name="e">Event args.</param>
-        private void ActionAdd(object sender, EventArgs e)
+        protected override void ActionAdd(object sender, EventArgs e)
         {
             if (!addPageForm.ExportMode)
             {
@@ -70,5 +41,17 @@
                 Globals.XWikiAddIn.AddinActions.SaveToServer();
             }
         }
+
+        #region IActionsManager<AddPageForm> Members
+
+        /// <summary>
+        /// Enqueues all event handlers for an AddPageForm.
+        /// </summary>
+        public override void EnqueueAllHandlers()
+        {
+            addPageForm.OnAdd += new EventHandler(this.ActionAdd);
+        }
+
+        #endregion IActionsManager<AddPageForm> Members
     }
 }
Index: xword/XWord/XWikiNavigationPane.cs
===================================================================
--- xword/XWord/XWikiNavigationPane.cs	(revision 22792)
+++ xword/XWord/XWikiNavigationPane.cs	(working copy)
@@ -14,6 +14,7 @@
 using XWiki.Clients;
 using System.Diagnostics;
 using XWiki.Logging;
+using UICommons;
 
 namespace XWord
 {
@@ -512,7 +513,9 @@
             {
                 String spaceName = treeView.SelectedNode.Text;
                 WikiStructure wiki = Wiki;
-                new AddPageFormManager().NewAddPageForm(ref wiki, spaceName).ShowDialog();
+                AddPageForm addPageForm = new AddPageForm(ref wiki, spaceName);
+                new AddPageFormManager(ref addPageForm).EnqueueAllHandlers();
+                addPageForm.ShowDialog();
             }
         }
 
@@ -611,8 +614,9 @@
         /// </summary>
         private void btnAddSpace_Click(object sender, EventArgs e)
         {
-            //new AddPageForm(ref Globals.XWikiAddIn.wiki, true, false).ShowDialog();
-            new AddPageFormManager().NewAddPageForm(ref Globals.XWikiAddIn.wiki, true, false).ShowDialog();
+            AddPageForm addPageForm = new AddPageForm(ref Globals.XWikiAddIn.wiki, true, false);
+            new AddPageFormManager(ref addPageForm).EnqueueAllHandlers();
+            addPageForm.ShowDialog();
         }
 
         /// <summary>
Index: xword/XWord/XWikiRibbon.cs
===================================================================
--- xword/XWord/XWikiRibbon.cs	(revision 22792)
+++ xword/XWord/XWikiRibbon.cs	(working copy)
@@ -9,6 +9,7 @@
 using XWord.VstoExtensions;
 using XWiki.Logging;
 using XWiki;
+using UICommons;
 
 namespace XWord
 {
@@ -138,7 +139,9 @@
 
         private void btnNewPage_Click(object sender, RibbonControlEventArgs e)
         {
-            new AddPageFormManager().NewAddPageForm(ref Globals.XWikiAddIn.wiki).ShowDialog();
+            AddPageForm addPageForm = new AddPageForm(ref Globals.XWikiAddIn.wiki);
+            new AddPageFormManager(ref addPageForm).EnqueueAllHandlers();
+            addPageForm.ShowDialog();
         }
 
         private void btnSavePage_Click(object sender, RibbonControlEventArgs e)
@@ -147,7 +150,9 @@
             {
                 if (Addin.currentPageFullName == "" || Addin.currentPageFullName == null)
                 {
-                    new AddPageFormManager().NewAddPageForm(ref Addin.wiki, false, true).ShowDialog();
+                    AddPageForm addPageForm = new AddPageForm(ref Addin.wiki, false, true);
+                    new AddPageFormManager(ref addPageForm).EnqueueAllHandlers();
+                    addPageForm.ShowDialog();
                 }
                 else
                 {
@@ -167,13 +172,17 @@
             if (treeView.SelectedNode != null)
             {
                 String spaceName = treeView.SelectedNode.Text;
-                new AddPageFormManager().NewAddPageForm(ref Globals.XWikiAddIn.wiki, spaceName).ShowDialog();
+                AddPageForm addPageForm = new AddPageForm(ref Globals.XWikiAddIn.wiki, spaceName);
+                new AddPageFormManager(ref addPageForm).EnqueueAllHandlers();
+                addPageForm.ShowDialog();
             }
             else
             {
                 //see XOFFICE-20
                 //MessageBox.Show("You need to select a space in the wiki explorer.","XWord");
-                new AddPageFormManager().NewAddPageForm(ref Globals.XWikiAddIn.wiki, true, false).ShowDialog();
+                AddPageForm addPageForm = new AddPageForm(ref Globals.XWikiAddIn.wiki, true, false);
+                new AddPageFormManager(ref addPageForm).EnqueueAllHandlers();
+                addPageForm.ShowDialog();
             }
         }