121420: merge sidebar feature from branch into trunk

9 files changed, 1279 insertions, 82 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index 85d1d5f8f6e8..e8f03d7a49d7 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -46,11 +46,6 @@
                 <value>private:resource/pane/LeftDrawPane</value>
               </prop>
             </node>
-            <node oor:name="R3" oor:op="replace">
-              <prop oor:name="URL">
-                <value>private:resource/pane/RightPane</value>
-              </prop>
-            </node>
           </node>
         </node>
         <node oor:name="F1" oor:op="replace">
@@ -90,11 +85,6 @@
             </node>
             <node oor:name="R6" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/view/TaskPane</value>
-              </prop>
-            </node>
-            <node oor:name="R7" oor:op="replace">
-              <prop oor:name="URL">
                 <value>private:resource/view/PresentationView</value>
               </prop>
             </node>
@@ -114,43 +104,53 @@
         </node>
         <node oor:name="F3" oor:op="replace">
           <prop oor:name="ServiceName">
-            <value>com.sun.star.drawing.framework.TaskPanelFactory</value>
+            <value>com.sun.star.comp.Draw.framework.TaskPanelFactory</value>
           </prop>
           <node oor:name="ResourceList">
-            <node oor:name="R0" oor:op="replace">
+            <node oor:name="R0a" oor:op="replace">
+              <prop oor:name="URL">
+                <value>private:resource/toolpanel/AllMasterPages</value>
+              </prop>
+            </node>
+            <node oor:name="R0b" oor:op="replace">
+              <prop oor:name="URL">
+                <value>private:resource/toolpanel/RecentMasterPages</value>
+              </prop>
+            </node>
+            <node oor:name="R0c" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/toolpanel/DrawingFramework/MasterPages</value>
+                <value>private:resource/toolpanel/UsedMasterPages</value>
               </prop>
             </node>
             <node oor:name="R1" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/toolpanel/DrawingFramework/Layouts</value>
+                <value>private:resource/toolpanel/Layouts</value>
               </prop>
             </node>
             <node oor:name="R2" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/toolpanel/DrawingFramework/TableDesign</value>
+                <value>private:resource/toolpanel/TableDesign</value>
               </prop>
             </node>
             <node oor:name="R3" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/toolpanel/DrawingFramework/CustomAnimations</value>
+                <value>private:resource/toolpanel/CustomAnimations</value>
               </prop>
             </node>
             <node oor:name="R4" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/toolpanel/DrawingFramework/SlideTransitions</value>
+                <value>private:resource/toolpanel/SlideTransitions</value>
               </prop>
             </node>
           </node>
         </node>
       </node>
       <node oor:name="StartupServices">
-        <node oor:name="S0" oor:op="replace">
-          <prop oor:name="ServiceName">
-            <value>com.sun.star.drawing.framework.PresentationFactoryProvider</value>
-          </prop>
-        </node>
+    <node oor:name="S0" oor:op="replace">
+      <prop oor:name="ServiceName">
+        <value>com.sun.star.drawing.framework.PresentationFactoryProvider</value>
+      </prop>
+    </node>
       </node>
     </node>
   </node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
index be557f388ce5..9ca2ee0bdeda 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
@@ -81,18 +81,60 @@
           <value>com.sun.star.comp.framework.StatusBarFactory</value>
         </prop>
       </node>
-      <node oor:name="org.openoffice.Office.Impress.ImpressToolPanelFactory" oor:op="replace">
+      <node oor:name="SvxPanelFactory" oor:op="replace">
         <prop oor:name="Type">
           <value>toolpanel</value>
         </prop>
         <prop oor:name="Name">
-          <value>DrawingFramework</value>
+          <value>SvxPanelFactory</value>
         </prop>
         <prop oor:name="Module">
-          <value>com.sun.star.presentation.PresentationDocument</value>
+          <value/>
+        </prop>
+        <prop oor:name="FactoryImplementation">
+          <value>org.apache.openoffice.comp.svx.sidebar.PanelFactory</value>
+        </prop>
+      </node>
+      <node oor:name="SdPanelFactory" oor:op="replace">
+        <prop oor:name="Type">
+          <value>toolpanel</value>
+        </prop>
+        <prop oor:name="Name">
+          <value>SdPanelFactory</value>
+        </prop>
+        <prop oor:name="Module">
+          <value></value>
+        </prop>
+        <prop oor:name="FactoryImplementation">
+          <value>org.openoffice.comp.Draw.framework.PanelFactory</value>
+        </prop>
+      </node>
+      <node oor:name="ScPanelFactory" oor:op="replace">
+        <prop oor:name="Type">
+          <value>toolpanel</value>
+        </prop>
+        <prop oor:name="Name">
+          <value>ScPanelFactory</value>
+        </prop>
+        <prop oor:name="Module">
+          <value></value>
+        </prop>
+        <prop oor:name="FactoryImplementation">
+          <value>org.apache.openoffice.comp.sc.sidebar.ScPanelFactory</value>
+        </prop>
+      </node>
+      <node oor:name="SwPanelFactory" oor:op="replace">
+        <prop oor:name="Type">
+          <value>toolpanel</value>
+        </prop>
+        <prop oor:name="Name">
+          <value>SwPanelFactory</value>
+        </prop>
+        <prop oor:name="Module">
+          <value></value>
         </prop>
         <prop oor:name="FactoryImplementation">
-          <value>com.sun.star.drawing.DefaultToolPanelFactory</value>
+          <value>org.apache.openoffice.comp.sw.sidebar.SwPanelFactory</value>
         </prop>
       </node>
     </node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 93e453e576ec..2ca3d11ae59f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5332,6 +5332,11 @@
                     <value xml:lang="en-US">Task Pane</value>
                 </prop>
             </node>
+            <node oor:name=".uno:Sidebar" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Sidebar</value>
+                </prop>
+            </node>
             <node oor:name=".uno:TestMode" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Test Mode On/Off</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index 635e745061c0..06a220164296 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -797,61 +797,6 @@
           <value>true</value>
         </prop>
       </node>
-      <node oor:name="private:resource/toolpanel/DrawingFramework/MasterPages" oor:op="replace">
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Master Pages</value>
-        </prop>
-        <prop oor:name="ImageURL" oor:type="xs:string">
-          <value>private:commandimage/PresentationLayout</value>
-        </prop>
-      </node>
-      <node oor:name="private:resource/toolpanel/DrawingFramework/Layouts" oor:op="replace">
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Layouts</value>
-        </prop>
-        <prop oor:name="ImageURL" oor:type="xs:string">
-          <value>private:commandimage/ModifyPage</value>
-        </prop>
-      </node>
-      <node oor:name="private:resource/toolpanel/DrawingFramework/TableDesign" oor:op="replace">
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Table Design</value>
-        </prop>
-        <prop oor:name="ImageURL" oor:type="xs:string">
-          <value>private:commandimage/InsertTable</value>
-        </prop>
-      </node>
-      <node oor:name="private:resource/toolpanel/DrawingFramework/CustomAnimations" oor:op="replace">
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Custom Animation</value>
-        </prop>
-        <prop oor:name="ImageURL" oor:type="xs:string">
-          <value>private:commandimage/CustomAnimation</value>
-        </prop>
-      </node>
-      <node oor:name="private:resource/toolpanel/DrawingFramework/SlideTransitions" oor:op="replace">
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Slide Transition</value>
-        </prop>
-        <prop oor:name="ImageURL" oor:type="xs:string">
-          <value>private:commandimage/RehearseTimings</value>
-        </prop>
-      </node>
       <node oor:name="private:resource/toolbar/optimizetablebar" oor:op="replace">
         <prop oor:name="Docked" oor:type="xs:boolean">
           <value>false</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
new file mode 100644
index 000000000000..423ac13853aa
--- /dev/null
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -0,0 +1,987 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+<!DOCTYPE oor:component-data SYSTEM "../../../../../component-update.dtd">
+<oor:component-data oor:name="Sidebar" oor:package="org.openoffice.Office.UI" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <node oor:name="Content">
+    <node oor:name="DeckList">
+
+      <node oor:name="PropertyDeck" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Properties</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="IconURL" oor:type="xs:string">
+          <value>private:graphicrepository/sfx2/res/symphony/sidebar-property-large.png</value>
+        </prop>
+        <prop oor:name="HighContrastIconURL" oor:type="xs:string">
+          <value>private:graphicrepository/sfx2/res/symphony/sidebar-property-large-hc.png</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            any, any, visible ;
+          </value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>100</value>
+        </prop>
+      </node>
+
+      <node oor:name="GalleryDeck" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Gallery</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>GalleryDeck</value>
+        </prop>
+        <prop oor:name="IconURL" oor:type="xs:string">
+          <value>private:graphicrepository/sfx2/res/symphony/sidebar-gallery-large.png</value>
+        </prop>
+        <prop oor:name="HighContrastIconURL" oor:type="xs:string">
+          <value>private:graphicrepository/sfx2/res/symphony/sidebar-gallery-large-hc.png</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            any, any, visible ;
+          </value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>300</value>
+        </prop>
+      </node>
+
+      <node oor:name="ImpressMasterPagesDeck" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Master Pages</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>MasterPagesDeck</value>
+        </prop>
+        <prop oor:name="IconURL" oor:type="xs:string">
+          <value>private:graphicrepository/sfx2/res/symphony/sidebar-template-large.png</value>
+        </prop>
+        <prop oor:name="HighContrastIconURL" oor:type="xs:string">
+          <value>private:graphicrepository/sfx2/res/symphony/sidebar-template-large-hc.png</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Impress, any, visible ;
+          </value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>120</value>
+        </prop>
+      </node>
+
+      <node oor:name="ImpressAnimationEffects" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Custom Animation</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>CustomAnimationDeck</value>
+        </prop>
+        <prop oor:name="IconURL" oor:type="xs:string">
+          <value>private:graphicrepository/sfx2/res/symphony/sidebar-animation-large.png</value>
+        </prop>
+        <prop oor:name="HighContrastIconURL" oor:type="xs:string">
+          <value>private:graphicrepository/sfx2/res/symphony/sidebar-animation-large-hc.png</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Impress, any, visible ;
+          </value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>140</value>
+        </prop>
+      </node>
+
+      <node oor:name="SlideTransitionDeck" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Slide Transition</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>SlideTransitionDeck</value>
+        </prop>
+        <prop oor:name="IconURL" oor:type="xs:string">
+          <value>private:graphicrepository/sfx2/res/symphony/sidebar-transition-large.png</value>
+        </prop>
+        <prop oor:name="HighContrastIconURL" oor:type="xs:string">
+          <value>private:graphicrepository/sfx2/res/symphony/sidebar-transition-large-hc.png</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Impress, any, visible ;
+          </value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>160</value>
+        </prop>
+      </node>
+
+      <node oor:name="NavigatorDeck" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Navigator</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>NavigatorDeck</value>
+        </prop>
+        <prop oor:name="IconURL" oor:type="xs:string">
+          <value>private:graphicrepository/sfx2/res/symphony/sidebar-navigator-large.png</value>
+        </prop>
+        <prop oor:name="HighContrastIconURL" oor:type="xs:string">
+          <value>private:graphicrepository/sfx2/res/symphony/sidebar-navigator-large-hc.png</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            any, any, visible ;
+          </value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>400</value>
+        </prop>
+      </node>
+
+      <node oor:name="StyleListDeck" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Styles and Formatting</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>StyleListDeck</value>
+        </prop>
+        <prop oor:name="IconURL" oor:type="xs:string">
+          <value>private:graphicrepository/sfx2/res/symphony/sidebar-style-large.png</value>
+        </prop>
+        <prop oor:name="HighContrastIconURL" oor:type="xs:string">
+          <value>private:graphicrepository/sfx2/res/symphony/sidebar-style-large-hc.png</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            any, any, visible ;
+          </value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>200</value>
+        </prop>
+      </node>
+
+      <node oor:name="FunctionsDeck" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Functions</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>FunctionsDeck</value>
+        </prop>
+        <prop oor:name="IconURL" oor:type="xs:string">
+          <value>private:graphicrepository/sfx2/res/symphony/sidebar-functions-large.png</value>
+        </prop>
+        <prop oor:name="HighContrastIconURL" oor:type="xs:string">
+          <value>private:graphicrepository/sfx2/res/symphony/sidebar-functions-large-hc.png</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Calc, any, visible ;
+          </value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>500</value>
+        </prop>
+      </node>
+
+    </node>
+    <node oor:name="PanelList">
+
+      <node oor:name="TextPropertyPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Text</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>TextPropertyPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="DefaultMenuCommand">
+          <value>.uno:FontDialog</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Calc,             Auditing,           visible,  .uno:CellTextDlg ;
+            Calc,             Cell,               visible,  .uno:CellTextDlg ;
+            Calc,             default,            visible,  .uno:CellTextDlg ;
+            Calc,             DrawText,           visible                    ;
+            Calc,             EditCell,           visible                    ;
+            Calc,             Pivot,              visible,  .uno:CellTextDlg ;
+            DrawImpress,      3DObject,           visible                    ;
+            DrawImpress,      Draw,               hidden                     ;
+            DrawImpress,      DrawText,           visible                    ;
+            DrawImpress,      Graphic,            hidden                     ;
+            DrawImpress,      OutlineText,        visible                    ;
+            DrawImpress,      Table,              visible                    ;
+            DrawImpress,      TextObject,         visible                    ;
+            WriterAndWeb,     Annotation,         visible                    ;
+            WriterAndWeb,     DrawText,           visible                    ;
+            WriterAndWeb,     Table,              visible                    ;
+            WriterAndWeb,     Text,               visible                    ;
+            WriterAndWeb,     default,            visible                    ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SvxPanelFactory/TextPropertyPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>100</value>
+        </prop>
+      </node>
+
+      <node oor:name="ContextPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Current Context (only for debugging)</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>Context</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            none, none, visible ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SvxPanelFactory/Debug_ContextPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>10</value>
+        </prop>
+      </node>
+
+      <node oor:name="PagePropertyPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Page</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>PagePropertyPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="DefaultMenuCommand">
+          <value>.uno:PageDialog</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Writer, Table,    hidden ;
+            Writer, Text,     hidden ;
+            Writer, default,  hidden ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SwPanelFactory/PagePropertyPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>300</value>
+        </prop>
+      </node>
+
+      <node oor:name="ColorPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Colors (only for debugging)</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>ColorPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            none, any, visible ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SvxPanelFactory/Debug_ColorPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>110</value>
+        </prop>
+      </node>
+
+      <node oor:name="AreaPropertyPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Area</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>AreaPropertyPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="DefaultMenuCommand">
+          <value>.uno:FormatArea</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Calc,         Draw,       visible ;
+            DrawImpress,  3DObject,   visible ;
+            DrawImpress,  Draw,       visible ;
+            DrawImpress,  TextObject, hidden  ;
+            WriterAndWeb, Draw,       visible ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SvxPanelFactory/AreaPropertyPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>300</value>
+        </prop>
+      </node>
+
+      <node oor:name="LinePropertyPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Line</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>LinePropertyPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="DefaultMenuCommand">
+          <value>.uno:FormatLine</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Calc,         Draw,       visible ;
+            Calc,         Graphic,    visible ;
+            DrawImpress,  3DObject,   visible ;
+            DrawImpress,  Draw,       visible ;
+            DrawImpress,  Graphic,    visible ;
+            DrawImpress,  TextObject, hidden  ;
+            WriterAndWeb, Draw,       visible ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SvxPanelFactory/LinePropertyPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>400</value>
+        </prop>
+      </node>
+
+      <node oor:name="GalleryPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Gallery</value>
+        </prop>
+        <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>GalleryPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>GalleryDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            any, any, visible ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SvxPanelFactory/GalleryPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>100</value>
+        </prop>
+      </node>
+
+      <node oor:name="PosSizePropertyPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Position and Size</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>PosSizePropertyPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="DefaultMenuCommand">
+          <value>.uno:TransformDialog</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Calc,         Chart,       visible                       ;
+            Calc,         Draw,        hidden                        ;
+            Calc,         Form,        visible                       ;
+            Calc,         Graphic,     hidden                        ;
+            Calc,         Media,       visible                       ;
+            Calc,         MultiObject, visible                       ;
+            Calc,         OLE,         visible                       ;
+            DrawImpress,  3DObject,    visible                       ;
+            DrawImpress,  Draw,        hidden                        ;
+            DrawImpress,  Form,        visible                       ;
+            DrawImpress,  Graphic,     hidden                        ;
+            DrawImpress,  Media,       visible                       ;
+            DrawImpress,  MultiObject, visible                       ;
+            DrawImpress,  OLE,         visible                       ;
+            DrawImpress,  TextObject,  hidden                        ;
+            WriterAndWeb, Draw,        hidden                        ;
+            WriterAndWeb, Form,        visible                       ;
+            WriterAndWeb, Graphic,     visible, .uno:GraphicDialog   ;
+            WriterAndWeb, Media,       visible                       ;
+            WriterAndWeb, OLE,         visible, .uno:FrameDialog     ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SvxPanelFactory/PosSizePropertyPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>500</value>
+        </prop>
+      </node>
+
+      <node oor:name="GraphicPropertyPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Graphic</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>GraphicPropertyPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Calc,         Graphic,     visible   ;
+            DrawImpress,  Graphic,     visible   ;
+            WriterAndWeb, Graphic,     visible   ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SvxPanelFactory/GraphicPropertyPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>300</value>
+        </prop>
+      </node>
+
+      <node oor:name="Impress1" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Layouts</value>
+        </prop>
+        <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>ImpressLayoutsPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Impress, DrawPage,        visible   ;
+            Impress, default,         visible   ;
+            Impress, HandoutPage,     visible   ;
+            Impress, NotesPage,       visible   ;
+            Impress, SlidesorterPage, visible   ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SdPanelFactory/Layouts</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>100</value>
+        </prop>
+      </node>
+
+      <node oor:name="Impress2" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Used in This Presentation</value>
+        </prop>
+        <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>UsedMasterPagesPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>MasterPagesDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Impress, any, visible   ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SdPanelFactory/UsedMasterPages</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>100</value>
+        </prop>
+      </node>
+
+      <node oor:name="Impress3" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Recently Used</value>
+        </prop>
+        <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>RecentMasterPagesPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>MasterPagesDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Impress, any, visible   ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SdPanelFactory/RecentMasterPages</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>200</value>
+        </prop>
+      </node>
+
+      <node oor:name="Impress4" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Available for Use</value>
+        </prop>
+        <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>AllMasterPagesPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>MasterPagesDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Impress, any, visible   ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SdPanelFactory/AllMasterPages</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>300</value>
+        </prop>
+      </node>
+
+      <node oor:name="Impress5" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Custom Animation</value>
+        </prop>
+        <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>CustomAnimationPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>CustomAnimationDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Impress, any, visible   ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SdPanelFactory/CustomAnimations</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>100</value>
+        </prop>
+      </node>
+
+      <node oor:name="Impress6" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Slide Transition</value>
+        </prop>
+        <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>SlideTransitionPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>SlideTransitionDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Impress, any, visible   ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SdPanelFactory/SlideTransitions</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>100</value>
+        </prop>
+      </node>
+
+      <node oor:name="Impress7" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Table Design</value>
+        </prop>
+        <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>ImpressTableDesignPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Impress, Table, visible   ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SdPanelFactory/TableDesign</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>300</value>
+        </prop>
+      </node>
+
+      <node oor:name="EmptyPanel" oor:op="replace">
+        <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Empty</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>EmptyPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            any, empty, visible ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SvxPanelFactory/EmptyPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>100</value>
+        </prop>
+      </node>
+
+      <node oor:name="AlignmentPropertyPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Alignment</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>AlignmentPropertyPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="DefaultMenuCommand">
+          <value>.uno:Hyphenate</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Calc,  Auditing, visible ;
+            Calc,  Cell,     visible ;
+            Calc,  default,  visible ;
+            Calc,  EditCell, visible ;
+            Calc,  Pivot,    visible ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/ScPanelFactory/AlignmentPropertyPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>200</value>
+        </prop>
+      </node>
+
+      <node oor:name="CellAppearancePropertyPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Cell Appearance</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>CellAppearancePropertyPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="DefaultMenuCommand">
+          <value>.uno:FormatCellDialg</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Calc,  Auditing, visible ;
+            Calc,  Cell,     visible ;
+            Calc,  default,  visible ;
+            Calc,  Pivot,    visible ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/ScPanelFactory/CellAppearancePropertyPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>300</value>
+        </prop>
+      </node>
+
+      <node oor:name="NumberFormatPropertyPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Number Format</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>NumberFormatPropertyPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="DefaultMenuCommand">
+          <value>.uno:FormatCellDialog</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Calc,  Auditing, hidden ;
+            Calc,  Cell,     hidden ;
+            Calc,  default,  hidden ;
+            Calc,  Pivot,    hidden ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/ScPanelFactory/NumberFormatPropertyPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>400</value>
+        </prop>
+      </node>
+
+      <node oor:name="ParaPropertyPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Paragraph</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>ParaPropertyPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="DefaultMenuCommand">
+          <value>.uno:ParagraphDialog</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Calc,         DrawText,   visible ;
+            DrawImpress,  3DObject,   hidden  ;
+            DrawImpress,  Draw,       hidden  ;
+            DrawImpress,  DrawText,   visible ;
+            DrawImpress,  Graphic,    hidden  ;
+            DrawImpress,  Table,      visible ;
+            DrawImpress,  TextObject, visible ;
+            WriterAndWeb, Annotation, visible ;
+            WriterAndWeb, DrawText,   visible ;
+            WriterAndWeb, Table,      visible ;
+            WriterAndWeb, Text,       visible ;
+            WriterAndWeb, default,    visible ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SvxPanelFactory/ParaPropertyPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>200</value>
+        </prop>
+      </node>
+
+      <node oor:name="WrapPropertyPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Wrap</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>WrapPropertyPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>PropertyDeck</value>
+        </prop>
+        <prop oor:name="DefaultMenuCommand">
+          <value>.uno:ObjectWrapDialog</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+              Writer,   Graphic, visible ;
+              Writer,   OLE,     visible ;
+              Writer,   Frame,   visible ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SwPanelFactory/WrapPropertyPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>500</value>
+        </prop>
+      </node>
+
+      <node oor:name="SwNavigatorPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Navigator</value>
+        </prop>
+        <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>SwNavigatorPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>NavigatorDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            WriterAndWeb, any, visible ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SwPanelFactory/NavigatorPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>100</value>
+        </prop>
+      </node>
+
+      <node oor:name="ScNavigatorPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Navigator</value>
+        </prop>
+        <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>ScNavigatorPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>NavigatorDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Calc, any, visible ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/ScPanelFactory/NavigatorPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>100</value>
+        </prop>
+      </node>
+
+      <node oor:name="SdNavigatorPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Navigator</value>
+        </prop>
+        <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>SdNavigatorPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>NavigatorDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            DrawImpress, any, visible ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SdPanelFactory/NavigatorPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>100</value>
+        </prop>
+      </node>
+
+      <node oor:name="StyleListPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Styles and Formatting</value>
+        </prop>
+        <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>StyleListPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>StyleListDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            any, any, visible ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/SvxPanelFactory/StyleListPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>100</value>
+        </prop>
+      </node>
+
+      <node oor:name="FunctionsPanel" oor:op="replace">
+        <prop oor:name="Title" oor:type="xs:string">
+          <value xml:lang="en-US">Functions</value>
+        </prop>
+        <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="Id" oor:type="xs:string">
+          <value>FunctionsPanel</value>
+        </prop>
+        <prop oor:name="DeckId" oor:type="xs:string">
+          <value>FunctionsDeck</value>
+        </prop>
+        <prop oor:name="ContextList">
+          <value oor:separator=";">
+            Calc, any, visible ;
+          </value>
+        </prop>
+        <prop oor:name="ImplementationURL" oor:type="xs:string">
+          <value>private:resource/toolpanel/ScPanelFactory/FunctionsPanel</value>
+        </prop>
+        <prop oor:name="OrderIndex" oor:type="xs:int">
+          <value>100</value>
+        </prop>
+      </node>
+
+    </node>
+  </node>
+</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk b/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
index b32c99cc6040..f1b446db9b43 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
@@ -64,6 +64,7 @@ LOCALIZEDFILES= \
     WriterWebWindowState.xcu \
     WriterCommands.xcu\
     GenericCategories.xcu\
+    Sidebar.xcu
 
 XCUFILES= \
     $(LOCALIZEDFILES) \
diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu b/officecfg/registry/data/org/openoffice/Office/Views.xcu
index ade5cb482762..8b27bf326cb7 100644
--- a/officecfg/registry/data/org/openoffice/Office/Views.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu
@@ -29,5 +29,13 @@
     <value>false</value>
    </prop>
   </node>
+
+  <!-- show Sidebar child window by default - oor:name == SID_SIDEBAR -->
+  <node oor:name="10336" oor:op="replace">
+    <prop oor:name="Visible" oor:type="xs:boolean">
+      <value>true</value>
+    </prop>
+  </node>
  </node>
+
 </oor:component-data>
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
new file mode 100644
index 000000000000..ca821b78a7af
--- /dev/null
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ ***********************************************************-->
+
+
+<!DOCTYPE oor:component-schema SYSTEM "../../../../../component-schema.dtd">
+<oor:component-schema
+    xmlns:oor="http://openoffice.org/2001/registry"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    oor:name="Sidebar"
+    oor:package="org.openoffice.Office.UI"
+    xml:lang="en-US">
+  <info>
+    <author>Andre Fischer</author>
+    <desc>Specification of decks and content panels of the sidebar.</desc>
+  </info>
+  <templates>
+    <group oor:name="Deck">
+      <info>
+        <desc>Specification of a sidebar deck which is a container of content panels.</desc>
+      </info>
+      <prop oor:name="Title" oor:type="xs:string" oor:localized="true">
+        <info>
+          <desc>The deck title is displayed above the content panels.</desc>
+        </info>
+        <value></value>
+      </prop>
+      <prop oor:name="Id" oor:type="xs:string" oor:localized="false">
+        <info>
+          <desc>Internally used to identify the deck.  Not displayed in the UI.</desc>
+        </info>
+        <value></value>
+      </prop>
+      <prop oor:name="IconURL" oor:type="xs:string">
+        <info>
+          <desc>This icon is displayed in the sidebar tab bar.
+          Any URL scheme supported by the com.sun.star.graphic.GraphicProvider service is suitable here.</desc>
+        </info>
+        <value></value>
+      </prop>
+      <prop oor:name="HighContrastIconURL" oor:type="xs:string">
+        <info>
+          <desc>This icon is displayed in the sidebar tab bar when high contrast mode is active.
+          Any URL scheme supported by the com.sun.star.graphic.GraphicProvider service is suitable here.</desc>
+        </info>
+        <value></value>
+      </prop>
+      <prop oor:name="HelpURL" oor:type="xs:string">
+        <info>
+          <desc>Help about the sidebar deck.</desc>
+        </info>
+        <value></value>
+      </prop>
+      <prop oor:name="ContextList" oor:type="oor:string-list">
+        <info><desc>
+          List of context descriptors.  Each context descriptor is a string that contains four comma
+          separated values (note that values are case sensitive):
+          1  Application name. Valid values are
+                 com.sun.star.text.TextDocument
+                 com.sun.star.sheet.SpreadsheetDocument
+                 com.sun.star.presentation.PresentationDocument
+                 com.sun.star.drawing.DrawingDocument
+             
+             Recognized shortcuts:
+                 Writer
+                 Calc
+                 Impress
+                 Draw
+
+             Shortcuts for multiple applications:
+                 DrawImpress
+                 WriterAndWeb
+             These shortcuts exist for even more convenience and handle the frequent case of Draw
+	     and Impress as well as Writer and WriterWeb having otherwise identical context descriptions.
+             
+             Special values:
+                 any
+                 none
+
+          2  Context name
+              Know context names are 3DObject, Annotation, Auditing, Cell, Chart, Draw, DrawPage, DrawText,
+              EditCell, Form, Frame, Graphic, HandoutPage, MasterPage, Media, Multiobj, OLE, OutlineText,
+              Pivot, SlidesorterPage, Table, Text, TextObject,
+              default
+
+             Special values:
+                 any
+
+          3  Panel state.  One of 
+             visible  Panel is initially visible and expanded
+             hidden   Panel is initially collapsed, ie only its title bar is visible
+
+          4  (Optional, only used for panels) UNO command that overrides the DefaultMenuCommand.  Use 
+             the special value none to override the DefaultMenuCommand to the empty string and thereby
+             disable the showing of a) the menu button in the panel titlebar and b) the showing of a dialog.
+        </desc></info>
+      </prop>
+      <prop oor:name="OrderIndex" oor:type="xs:int">
+        <info>
+          <desc>Index used for ordering decks in the tab bar.  Smaller values correspond to positions nearer to the top of the tab bar.</desc>
+        </info>
+        <value>10000</value>
+      </prop>
+    </group>
+    <group oor:name="Panel">
+      <info>
+        <desc>Specification of a sidebar content panel.</desc>
+      </info>
+      <prop oor:name="Title" oor:type="xs:string" oor:localized="true">
+        <info>
+          <desc>The panel title is displayed above the content panel.</desc>
+        </info>
+        <value></value>
+      </prop>
+      <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+        <info>
+          <desc>When true then the title bar can be ommitted when the panel is the only panel in a deck.</desc>
+        </info>
+        <value>false</value>
+      </prop>
+      <prop oor:name="Id" oor:type="xs:string" oor:localized="false">
+        <info>
+          <desc>Internally used to identify the panel.</desc>
+        </info>
+        <value></value>
+      </prop>
+      <prop oor:name="DeckId" oor:type="xs:string" oor:localized="false">
+        <info>
+          <desc>Id of the deck to which the panel belongs.</desc>
+        </info>
+        <value></value>
+      </prop>
+      <prop oor:name="HelpURL" oor:type="xs:string">
+        <info>
+          <desc>Help about the sidebar content panel.</desc>
+        </info>
+        <value></value>
+      </prop>
+      <prop oor:name="DefaultMenuCommand" oor:type="xs:string">
+        <info><desc>
+          The default UNO command to execute when the user clicks on the menu button in the panel title bar.
+          Can be overriden in the ContextList to provide context dependent menu dialogs.
+          When empty then the menu icon is not shown in the panel title bar.
+        </desc></info>
+        <value></value>
+      </prop>
+      <prop oor:name="ContextList" oor:type="oor:string-list">
+        <info>
+          <desc>For documentation, please see the Deck/ContextList.</desc>
+        </info>
+      </prop>
+      <prop oor:name="ImplementationURL" oor:type="xs:string">
+        <info>
+          <desc>URL by which the implementation of the panel is known by its factory.</desc>
+        </info>
+        <value></value>
+      </prop>
+      <prop oor:name="OrderIndex" oor:type="xs:int">
+        <info>
+          <desc>Index used for ordering panels inside a deck.  Smaller values correspond to positions nearer to the top of the deck.</desc>
+        </info>
+        <value>10000</value>
+      </prop>
+      <prop oor:name="WantsCanvas" oor:type="xs:boolean">
+        <info>
+          <desc>Experimental: Set to true when panel wants to paint its content via a XCanvas.</desc>
+        </info>
+        <value>false</value>
+      </prop>
+    </group>
+  </templates>
+  <component>
+    <group oor:name="Content">
+      <info>
+        <desc>Description of the decks and panels that can be displayed in the content area of the sidebar.</desc>
+      </info>
+      <set oor:name="DeckList" oor:node-type="Deck">
+        <info>
+          <desc>Contains all registered sidebar decks.</desc>
+        </info>
+      </set>
+      <set oor:name="PanelList" oor:node-type="Panel">
+        <info>
+          <desc>Contains all registered sidebar content panels.</desc>
+        </info>
+      </set>
+    </group>
+  </component>
+</oor:component-schema>
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
index 09ac99084fc1..00af7425f4d2 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
@@ -70,7 +70,8 @@ XCSFILES= \
     Category.xcs \
     GenericCategories.xcs \
     GlobalSettings.xcs \
-    WindowContentFactories.xcs
+    WindowContentFactories.xcs \
+    Sidebar.xcs
 
 .INCLUDE :  target.mk