slidecopy: merge after copying in CWS renaissance2

122 files changed, 9722 insertions, 4478 deletions

diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index cab46edc0185..e8f9e004ca6a 100644
--- a/basic/inc/pch/precompiled_basic.hxx
+++ b/basic/inc/pch/precompiled_basic.hxx
@@ -187,7 +187,7 @@
 #include "svtools/svmedit.hxx"
 #include "svl/svstdarr.hxx"
 #include "svtools/svtdata.hxx"
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 #include "svtools/svtreebx.hxx"
 #include "unotools/syslocale.hxx"
 #include "svtools/taskbar.hxx"
diff --git a/basic/source/sbx/format.src b/basic/source/sbx/format.src
index 8ebe6e93c4bb..7e576134fad5 100644
--- a/basic/source/sbx/format.src
+++ b/basic/source/sbx/format.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 
 String STR_BASICKEY_FORMAT_ON
 {
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 6d5d24fcb951..3d45818e6401 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -47,7 +47,7 @@
 #include "sbxres.hxx"
 #include <basic/sbxbase.hxx>
 #include <basic/sbxform.hxx>
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 
 #include "basrid.hxx"
 #include "runtime.hxx"
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 60f6a4a54e46..190db364cdfe 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -1229,7 +1229,19 @@ rtl::OUString Access::getHierarchicalName() throw (css::uno::RuntimeException) {
     OSL_ASSERT(thisIs(IS_ANY));
     osl::MutexGuard g(lock);
     checkLocalizedPropertyAccess();
-    return getRelativePathRepresentation();
+    // For backwards compatibility, return an absolute path representation where
+    // available:
+    rtl::OUStringBuffer path;
+    rtl::Reference< RootAccess > root(getRootAccess());
+    if (root.is()) {
+        path.append(root->getAbsolutePathRepresentation());
+    }
+    rtl::OUString rel(getRelativePathRepresentation());
+    if (path.getLength() != 0 && rel.getLength() != 0) {
+        path.append(sal_Unicode('/'));
+    }
+    path.append(rel);
+    return path.makeStringAndClear();
 }
 
 rtl::OUString Access::composeHierarchicalName(
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 48f90fa8382e..5b30e9491eb4 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -149,11 +149,12 @@ bool Components::allLocales(rtl::OUString const & locale) {
 }
 
 rtl::Reference< Node > Components::resolvePathRepresentation(
-    rtl::OUString const & pathRepresentation, Path * path,
-    int * finalizedLayer) const
+    rtl::OUString const & pathRepresentation,
+    rtl::OUString * canonicRepresentation, Path * path, int * finalizedLayer)
+    const
 {
     return data_.resolvePathRepresentation(
-        pathRepresentation, path, finalizedLayer);
+        pathRepresentation, canonicRepresentation, path, finalizedLayer);
 }
 
 rtl::Reference< Node > Components::getTemplate(
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index a78ed325969d..2e635680c1ce 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -72,8 +72,9 @@ public:
     static bool allLocales(rtl::OUString const & locale);
 
     rtl::Reference< Node > resolvePathRepresentation(
-        rtl::OUString const & pathRepresentation, Path * path,
-        int * finalizedLayer) const;
+        rtl::OUString const & pathRepresentation,
+        rtl::OUString * canonicRepresenation, Path * path, int * finalizedLayer)
+        const;
 
     rtl::Reference< Node > getTemplate(
         int layer, rtl::OUString const & fullName) const;
diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx
index 5540a40fd5f4..e12f9596940b 100644
--- a/configmgr/source/data.cxx
+++ b/configmgr/source/data.cxx
@@ -205,7 +205,8 @@ rtl::Reference< Node > Data::findNode(
 }
 
 rtl::Reference< Node > Data::resolvePathRepresentation(
-    rtl::OUString const & pathRepresentation, Path * path, int * finalizedLayer)
+    rtl::OUString const & pathRepresentation,
+    rtl::OUString * canonicRepresentation, Path * path, int * finalizedLayer)
     const
 {
     if (pathRepresentation.getLength() == 0 || pathRepresentation[0] != '/') {
@@ -216,6 +217,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
     }
     rtl::OUString seg;
     bool setElement;
+    rtl::OUString templateName;
     sal_Int32 n = parseSegment(pathRepresentation, 1, &seg, &setElement, 0);
     if (n == -1 || setElement)
     {
@@ -225,6 +227,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
             css::uno::Reference< css::uno::XInterface >());
     }
     NodeMap::const_iterator i(components.find(seg));
+    rtl::OUStringBuffer canonic;
     if (path != 0) {
         path->clear();
     }
@@ -234,6 +237,10 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
         if (!p.is()) {
             return p;
         }
+        if (canonicRepresentation != 0) {
+            canonic.append(sal_Unicode('/'));
+            canonic.append(createSegment(templateName, seg));
+        }
         if (path != 0) {
             path->push_back(seg);
         }
@@ -248,13 +255,16 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
         }
         // for backwards compatibility, ignore a final slash
         if (n == pathRepresentation.getLength()) {
+            if (canonicRepresentation != 0) {
+                *canonicRepresentation = canonic.makeStringAndClear();
+            }
             if (finalizedLayer != 0) {
                 *finalizedLayer = finalized;
             }
             return p;
         }
         parent = p;
-        rtl::OUString templateName;
+        templateName = rtl::OUString();
         n = parseSegment(
             pathRepresentation, n, &seg, &setElement, &templateName);
         if (n == -1) {
diff --git a/configmgr/source/data.hxx b/configmgr/source/data.hxx
index 495ca1233878..52353d066b67 100644
--- a/configmgr/source/data.hxx
+++ b/configmgr/source/data.hxx
@@ -74,8 +74,9 @@ struct Data: private boost::noncopyable {
         int layer, NodeMap const & map, rtl::OUString const & name);
 
     rtl::Reference< Node > resolvePathRepresentation(
-        rtl::OUString const & pathRepresentation, Path * path,
-        int * finalizedLayer) const;
+        rtl::OUString const & pathRepresentation,
+        rtl::OUString * canonicRepresenation, Path * path, int * finalizedLayer)
+        const;
 
     rtl::Reference< Node > getTemplate(
         int layer, rtl::OUString const & fullName) const;
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index f8ccc6a31546..95a346d720c2 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -113,6 +113,11 @@ void RootAccess::release() throw () {
     Access::release();
 }
 
+rtl::OUString RootAccess::getAbsolutePathRepresentation() {
+    getNode(); // turn pathRepresentation_ into canonic form
+    return pathRepresentation_;
+}
+
 rtl::OUString RootAccess::getLocale() const {
     return locale_;
 }
@@ -136,9 +141,10 @@ rtl::OUString RootAccess::getRelativePathRepresentation() {
 
 rtl::Reference< Node > RootAccess::getNode() {
     if (!node_.is()) {
+        rtl::OUString canonic;
         int finalizedLayer;
         node_ = getComponents().resolvePathRepresentation(
-            pathRepresentation_, &path_, &finalizedLayer);
+            pathRepresentation_, &canonic, &path_, &finalizedLayer);
         if (!node_.is()) {
             throw css::uno::RuntimeException(
                 (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cannot find ")) +
@@ -150,6 +156,7 @@ rtl::Reference< Node > RootAccess::getNode() {
                 // queryInterface on it would cause trouble; therefore,
                 // RuntimeException.Context is left null here
         }
+        pathRepresentation_ = canonic;
         OSL_ASSERT(!path_.empty());
         name_ = path_.back();
         finalized_ = finalizedLayer != Data::NO_LAYER;
@@ -285,7 +292,7 @@ void RootAccess::commitChanges()
         Modifications globalMods;
         commitChildChanges(
             ((getComponents().resolvePathRepresentation(
-                  pathRepresentation_, 0, &finalizedLayer)
+                  pathRepresentation_, 0, 0, &finalizedLayer)
               == node_) &&
              finalizedLayer == Data::NO_LAYER),
             &globalMods);
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index 45d4193d70de..77d945cdbbed 100644
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
@@ -78,6 +78,8 @@ public:
 
     virtual void SAL_CALL release() throw ();
 
+    rtl::OUString getAbsolutePathRepresentation();
+
     rtl::OUString getLocale() const;
 
     bool isUpdate() const;
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index f9f439c98916..eda478b18b70 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -395,7 +395,8 @@ void XcuParser::handleItem(XmlReader & reader) {
     rtl::OUString path(xmldata::convertFromUtf8(attrPath));
     int finalizedLayer;
     rtl::Reference< Node > node(
-        data_.resolvePathRepresentation(path, &path_, &finalizedLayer));
+        data_.resolvePathRepresentation(
+            path, 0, &path_, &finalizedLayer));
     if (!node.is()) {
         OSL_TRACE(
             "configmgr unknown item %s in %s",
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 2d0733dfbae3..21ec1ce46ff5 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -30,7 +30,7 @@
 
 #include "dp_gui.hrc"
 #include "svtools/controldims.hrc"
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 
 #include "dp_gui.h"
 #include "dp_gui_dialog2.hxx"
diff --git a/fpicker/source/aqua/resourceprovider.cxx b/fpicker/source/aqua/resourceprovider.cxx
index 5d958d8e2888..51985208c7ed 100644
--- a/fpicker/source/aqua/resourceprovider.cxx
+++ b/fpicker/source/aqua/resourceprovider.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
 #ifndef _SVTOOLS_SVTOOLS_HRC_
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #endif
 
 #ifndef _SVTOOLS_FILEDLG2_HRC_
diff --git a/fpicker/source/office/OfficeFilePicker.src b/fpicker/source/office/OfficeFilePicker.src
index 77de1dc3918b..8fbbc35a40e5 100644
--- a/fpicker/source/office/OfficeFilePicker.src
+++ b/fpicker/source/office/OfficeFilePicker.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 
 String STR_SVT_FILEPICKER_AUTO_EXTENSION
 {
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index c7a18050c3ff..b9d7fac3aa3b 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -57,7 +57,7 @@
 #include <unotools/localfilehelper.hxx>
 
 #ifndef _SVTOOLS_HRC
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 #endif
 #ifndef _SVT_HELPID_HRC
 #include "svtools/helpid.hrc"
@@ -1587,6 +1587,9 @@ void SvtFileDialog::UpdateControls( const String& rURL )
                 sText = sURL;
         }
 
+        if ( !sText.Len() && rURL.Len() )
+            // happens, for instance, for URLs which the INetURLObject does not know to belong to a hierarchical scheme
+            sText = rURL;
         _pImp->_pFtCurrentPath->SetText( sText );
     }
 
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index 9f5997a4089c..15f5121b0965 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -29,7 +29,7 @@
 #define _SVTOOLS_IODLGIMPL_HRC
 
 #ifndef _SVTOOLS_HRC
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 #endif
 
 // ModalDialog DLG_SVT_EXPLORERFILE
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index b1712e6b1820..0b3c27b68071 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 
  // includes ******************************************************************
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 #include "svtools/helpid.hrc"
 #include "iodlg.hrc"
 
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 4a7c615a35b3..5e57075a6bb7 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -46,15 +46,12 @@
 #include "svtools/fileview.hxx"
 #include "svtools/inettbc.hxx"
 #include "iodlg.hxx"
-#ifndef _SVTOOLS_IODLGIMPL_HRC
 #include "iodlg.hrc"
-#endif
 #include "svtools/imagemgr.hxx"
 #include <unotools/localfilehelper.hxx>
 #include "unotools/useroptions.hxx"
-#ifndef _RTL_INSTANCE_HXX_
 #include "rtl/instance.hxx"
-#endif
+#include <svl/svl.hrc>
 
 #define _SVSTDARR_STRINGSSORTDTOR
 #define _SVSTDARR_STRINGSDTOR
diff --git a/fpicker/source/unx/gnome/resourceprovider.cxx b/fpicker/source/unx/gnome/resourceprovider.cxx
index dba51c5a606a..393ea7585d5a 100644
--- a/fpicker/source/unx/gnome/resourceprovider.cxx
+++ b/fpicker/source/unx/gnome/resourceprovider.cxx
@@ -40,7 +40,7 @@
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #include <svtools/filedlg2.hrc>
 
 //------------------------------------------------------------
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 046147ff4b77..a7fa01a5ece6 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 
 #include <vos/mutex.hxx>
 
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index 805f24c315d7..b5448a93008c 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 
 //------------------------------------------------------------
 // namespace directives
diff --git a/framework/inc/classes/sfxhelperfunctions.hxx b/framework/inc/classes/sfxhelperfunctions.hxx
index ab20e9f0f25f..ac3fa472f249 100644
--- a/framework/inc/classes/sfxhelperfunctions.hxx
+++ b/framework/inc/classes/sfxhelperfunctions.hxx
@@ -40,6 +40,7 @@ typedef svt::StatusbarController* ( *pfunc_setStatusBarControllerCreator)( const
 typedef void ( *pfunc_getRefreshToolbars)( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
 typedef void ( *pfunc_createDockingWindow)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
 typedef bool ( *pfunc_isDockingWindowVisible)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
+typedef void ( *pfunc_activateToolPanel)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
 
 namespace framework
 {
@@ -63,6 +64,10 @@ void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com
 pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible );
 
 bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
+
+pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i_pActivator );
+
+void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
 }
 
 #endif // __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_
diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/helper/imageproducer.hxx
index 6d8885a5fa96..dff0ccfd1049 100644
--- a/framework/inc/helper/imageproducer.hxx
+++ b/framework/inc/helper/imageproducer.hxx
@@ -39,11 +39,11 @@
 namespace framework
 {
 
-typedef Image ( *pfunc_getImage)( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+typedef Image ( *pfunc_getImage)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
 
 pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
 
-Image SAL_CALL GetImageFromURL( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
 
 }
 
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index c3ec5075cc07..05ab216d6f06 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -101,6 +101,9 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
         virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException);
 
         // XUIElement
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
 
         // XUpdatable
diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx
index e5df1a142826..bc83765b09fe 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -92,6 +92,9 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
         virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
 
         // XUIElement
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
 
     //-------------------------------------------------------------------------------------------------------------
diff --git a/framework/inc/uielement/uielementtypenames.hxx b/framework/inc/uielement/uielementtypenames.hxx
index fcd14c2f8bff..ca7815f90af7 100644
--- a/framework/inc/uielement/uielementtypenames.hxx
+++ b/framework/inc/uielement/uielementtypenames.hxx
@@ -7,5 +7,6 @@
 #define UIELEMENTTYPE_STATUSBAR_NAME        "statusbar"
 #define UIELEMENTTYPE_FLOATINGWINDOW_NAME   "floater"
 #define UIELEMENTTYPE_PROGRESSBAR_NAME      "progressbar"
+#define UIELEMENTTYPE_TOOLPANEL_NAME        "toolpanel"
 
 #endif // __FRAMEWORK_UIELEMENT_UIELEMENTTYPENAMES_HXX_
diff --git a/framework/prj/d.lst b/framework/prj/d.lst
index a8640138ba25..7f260f07cf65 100644
--- a/framework/prj/d.lst
+++ b/framework/prj/d.lst
@@ -5,8 +5,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
 mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule
 mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar
 mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\accelerator
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\accelerator\en-US
 mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar
 
 ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
@@ -47,7 +45,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar
 
 ..\uiconfig\startmodule\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar\*.xml
 ..\uiconfig\startmodule\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar\*.xml
-..\uiconfig\startmodule\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\accelerator\en-US\*.xml
 ..\uiconfig\startmodule\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar\*.xml
 
 ..\source\unotypes\fw?.xml %_DEST%\xml%_EXT%\*.xml
diff --git a/framework/source/classes/sfxhelperfunctions.cxx b/framework/source/classes/sfxhelperfunctions.cxx
index 655d96cdb681..c6953b1ea2b9 100644
--- a/framework/source/classes/sfxhelperfunctions.cxx
+++ b/framework/source/classes/sfxhelperfunctions.cxx
@@ -32,11 +32,14 @@
 #include <classes/sfxhelperfunctions.hxx>
 #endif
 
+#include <tools/diagnose_ex.h>
+
 static pfunc_setToolBoxControllerCreator   pToolBoxControllerCreator   = NULL;
 static pfunc_setStatusBarControllerCreator pStatusBarControllerCreator = NULL;
 static pfunc_getRefreshToolbars            pRefreshToolbars            = NULL;
 static pfunc_createDockingWindow           pCreateDockingWindow        = NULL;
 static pfunc_isDockingWindowVisible        pIsDockingWindowVisible     = NULL;
+static pfunc_activateToolPanel             pActivateToolPanel          = NULL;
 
 
 
@@ -155,4 +158,24 @@ bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::
         return false;
 }
 
+pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i_pActivator )
+{
+    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+    pfunc_activateToolPanel pOldFunc = pActivateToolPanel;
+    pActivateToolPanel = i_pActivator;
+    return pOldFunc;
+}
+
+void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL )
+{
+    pfunc_activateToolPanel pActivator = NULL;
+    {
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+        pActivator = pActivateToolPanel;
+    }
+
+    ENSURE_OR_RETURN_VOID( pActivator, "framework::ActivateToolPanel: no activator function!" );
+    (*pActivator)( i_rFrame, i_rPanelURL );
+}
+
 }
diff --git a/framework/source/helper/imageproducer.cxx b/framework/source/helper/imageproducer.cxx
index 7870697f42a1..c4cf5921ee11 100644
--- a/framework/source/helper/imageproducer.cxx
+++ b/framework/source/helper/imageproducer.cxx
@@ -44,7 +44,7 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc )
 }
 
 
-Image SAL_CALL GetImageFromURL( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast )
+Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast )
 {
     if ( _pGetImageFunc )
         return _pGetImageFunc( rFrame, aURL, bBig, bHiContrast );
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 5660e5a310e3..030ec5bf8cf6 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -549,4 +549,23 @@ Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_
     return m_xConfigData;
 }
 
+Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame() throw (RuntimeException)
+{
+    ResetableGuard aLock( m_aLock );
+    Reference< XFrame > xFrame( m_xWeakFrame );
+    return xFrame;
+}
+
+::rtl::OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException)
+{
+    ResetableGuard aLock( m_aLock );
+    return m_aResourceURL;
+}
+
+::sal_Int16 SAL_CALL UIConfigElementWrapperBase::getType() throw (RuntimeException)
+{
+    ResetableGuard aLock( m_aLock );
+    return m_nType;
+}
+
 }
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 85bb1cdb1e60..6329f94b3063 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -151,6 +151,23 @@ throw ( Exception, RuntimeException )
     }
 }
 
+// XUIElement
+::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL UIElementWrapperBase::getFrame() throw (::com::sun::star::uno::RuntimeException)
+{
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( m_xWeakFrame );
+    return xFrame;
+}
+
+::rtl::OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (::com::sun::star::uno::RuntimeException)
+{
+    return m_aResourceURL;
+}
+
+::sal_Int16 SAL_CALL UIElementWrapperBase::getType() throw (::com::sun::star::uno::RuntimeException)
+{
+    return m_nType;
+}
+
 // XUpdatable
 void SAL_CALL UIElementWrapperBase::update() throw (::com::sun::star::uno::RuntimeException)
 {
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 458368bd6581..f72759891acb 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -4707,6 +4707,14 @@ throw (RuntimeException)
 
             impl_setDockingWindowVisibility( xSMGR, xFrame, aElementName, true );
         }
+        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolpanel" ))
+        {
+            ReadGuard aReadGuard( m_aLock );
+            css::uno::Reference< css::frame::XFrame > xFrame( m_xFrame );
+            aReadGuard.unlock();
+
+            ActivateToolPanel( m_xFrame, aName );
+        }
     }
 
     if ( bNotify )
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index e4d37d1fe059..fb3d6a18eb79 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -42,7 +42,7 @@
 
 #include "unotools/dynamicmenuoptions.hxx"
 #include "svtools/imagemgr.hxx"
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 
 #include "comphelper/processfactory.hxx"
 #include "comphelper/sequenceashashmap.hxx"
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 8840aee6a634..4bdc626ee91d 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -120,7 +120,8 @@ static const char* UIELEMENTTYPENAMES[] =
     UIELEMENTTYPE_TOOLBAR_NAME,
     UIELEMENTTYPE_STATUSBAR_NAME,
     UIELEMENTTYPE_FLOATINGWINDOW_NAME,
-    UIELEMENTTYPE_PROGRESSBAR_NAME
+    UIELEMENTTYPE_PROGRESSBAR_NAME,
+    UIELEMENTTYPE_TOOLPANEL_NAME
 };
 
 static const char       RESOURCEURL_PREFIX[] = "private:resource/";
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 4adebdd36c47..e704fe680ae9 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -118,7 +118,8 @@ static const char* UIELEMENTTYPENAMES[] =
     UIELEMENTTYPE_TOOLBAR_NAME,
     UIELEMENTTYPE_STATUSBAR_NAME,
     UIELEMENTTYPE_FLOATINGWINDOW_NAME,
-    UIELEMENTTYPE_PROGRESSBAR_NAME
+    UIELEMENTTYPE_PROGRESSBAR_NAME,
+    UIELEMENTTYPE_TOOLPANEL_NAME
 };
 
 static const char       RESOURCEURL_PREFIX[] = "private:resource/";
diff --git a/framework/uiconfig/startmodule/accelerator/en-GB/default.xml b/framework/uiconfig/startmodule/accelerator/en-GB/default.xml
deleted file mode 100644
index eefe2b0dde23..000000000000
--- a/framework/uiconfig/startmodule/accelerator/en-GB/default.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <accel:item accel:code="KEY_Q" accel:mod1="true" xlink:href=".uno:Quit"/>
-    <accel:item accel:code="KEY_N" accel:shift="true" accel:mod1="true" xlink:href=".uno:NewDoc"/>
-    <accel:item accel:code="KEY_O" accel:mod1="true" xlink:href=".uno:Open"/>
-    <accel:item accel:code="KEY_OPEN" xlink:href=".uno:Open"/>
-    <accel:item accel:code="KEY_P" accel:mod1="true" xlink:href=".uno:Print"/>
-    <accel:item accel:code="KEY_S" accel:mod1="true" xlink:href=".uno:Save"/>
-    <accel:item accel:code="KEY_N" accel:mod1="true" xlink:href=".uno:AddDirect"/>
-    <accel:item accel:code="KEY_W" accel:mod1="true" xlink:href=".uno:CloseWin"/>
-    <accel:item accel:code="KEY_F4" accel:mod1="true" xlink:href=".uno:CloseWin"/>
-    <accel:item accel:code="KEY_X" accel:mod1="true" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_DELETE" accel:shift="true" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_CUT" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_C" accel:mod1="true" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_INSERT" accel:mod1="true" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_COPY" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_V" accel:mod1="true" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_INSERT" accel:shift="true" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_PASTE" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_DELETE" xlink:href=".uno:Delete"/>
-    <accel:item accel:code="KEY_A" accel:mod1="true" xlink:href=".uno:SelectAll"/>
-    <accel:item accel:code="KEY_F" accel:mod1="true" xlink:href=".uno:SearchDialog"/>
-    <accel:item accel:code="KEY_Q" accel:shift="true" accel:mod1="true" xlink:href=".uno:BasicBreak"/>
-    <accel:item accel:code="KEY_F4" xlink:href=".uno:ViewDataSourceBrowser"/>
-    <accel:item accel:code="KEY_F5" accel:mod1="true" xlink:href=".uno:GrabControlFocus"/>
-    <accel:item accel:code="KEY_F7" accel:shift="true" accel:mod1="true" xlink:href=".uno:HangulHanjaConversion"/>
-</accel:acceleratorlist>
diff --git a/framework/uiconfig/startmodule/accelerator/en-US/default.xml b/framework/uiconfig/startmodule/accelerator/en-US/default.xml
deleted file mode 100644
index eefe2b0dde23..000000000000
--- a/framework/uiconfig/startmodule/accelerator/en-US/default.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <accel:item accel:code="KEY_Q" accel:mod1="true" xlink:href=".uno:Quit"/>
-    <accel:item accel:code="KEY_N" accel:shift="true" accel:mod1="true" xlink:href=".uno:NewDoc"/>
-    <accel:item accel:code="KEY_O" accel:mod1="true" xlink:href=".uno:Open"/>
-    <accel:item accel:code="KEY_OPEN" xlink:href=".uno:Open"/>
-    <accel:item accel:code="KEY_P" accel:mod1="true" xlink:href=".uno:Print"/>
-    <accel:item accel:code="KEY_S" accel:mod1="true" xlink:href=".uno:Save"/>
-    <accel:item accel:code="KEY_N" accel:mod1="true" xlink:href=".uno:AddDirect"/>
-    <accel:item accel:code="KEY_W" accel:mod1="true" xlink:href=".uno:CloseWin"/>
-    <accel:item accel:code="KEY_F4" accel:mod1="true" xlink:href=".uno:CloseWin"/>
-    <accel:item accel:code="KEY_X" accel:mod1="true" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_DELETE" accel:shift="true" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_CUT" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_C" accel:mod1="true" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_INSERT" accel:mod1="true" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_COPY" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_V" accel:mod1="true" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_INSERT" accel:shift="true" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_PASTE" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_DELETE" xlink:href=".uno:Delete"/>
-    <accel:item accel:code="KEY_A" accel:mod1="true" xlink:href=".uno:SelectAll"/>
-    <accel:item accel:code="KEY_F" accel:mod1="true" xlink:href=".uno:SearchDialog"/>
-    <accel:item accel:code="KEY_Q" accel:shift="true" accel:mod1="true" xlink:href=".uno:BasicBreak"/>
-    <accel:item accel:code="KEY_F4" xlink:href=".uno:ViewDataSourceBrowser"/>
-    <accel:item accel:code="KEY_F5" accel:mod1="true" xlink:href=".uno:GrabControlFocus"/>
-    <accel:item accel:code="KEY_F7" accel:shift="true" accel:mod1="true" xlink:href=".uno:HangulHanjaConversion"/>
-</accel:acceleratorlist>
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index 8db415e7c57b..353cecfd51c2 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -123,27 +123,27 @@
           <node oor:name="ResourceList">
             <node oor:name="R0" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/taskpanel/MasterPages</value>
+                <value>private:resource/toolpanel/DrawingFramework/MasterPages</value>
               </prop>
             </node>
             <node oor:name="R1" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/taskpanel/Layouts</value>
+                <value>private:resource/toolpanel/DrawingFramework/Layouts</value>
               </prop>
             </node>
             <node oor:name="R2" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/taskpanel/TableDesign</value>
+                <value>private:resource/toolpanel/DrawingFramework/TableDesign</value>
               </prop>
             </node>
             <node oor:name="R3" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/taskpanel/CustomAnimations</value>
+                <value>private:resource/toolpanel/DrawingFramework/CustomAnimations</value>
               </prop>
             </node>
             <node oor:name="R4" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/taskpanel/SlideTransitions</value>
+                <value>private:resource/toolpanel/DrawingFramework/SlideTransitions</value>
               </prop>
             </node>
           </node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 2b388902c1dd..7138636549d6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1,846 +1,973 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE oor:component-data SYSTEM "../../../../../component-update.dtd">
 <oor:component-data oor:name="DrawImpressCommands" oor:package="org.openoffice.Office.UI" 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="UserInterface">
-        <node oor:name="Commands">
-            <node oor:name=".uno:Polygon" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Polygon, filled</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ColorView" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Black &amp; White View</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:RenamePage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Rename Slide</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:RenameLayer" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Rename</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Presentation" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Slide Show</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:RehearseTimings" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Rehearse Timings</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Dia" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">SlideTransition</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ShowSlide" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Sho~w Slide</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:HideSlide" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Hide Slide</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:TextAttributes" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Te~xt...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PagesPerRow" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Slides Per Row</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:TextFitToSizeTool" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Fit Text to Frame</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:VerticalTextFitToSizeTool" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Fit Vertical Text to Frame</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Objects3DToolbox" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">3D Objects</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Cube" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Cube</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Sphere" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Sphere</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Cylinder" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Cylinder</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Cone" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Cone</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Cyramid" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Pyramid</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueEditMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Glue Points</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueInsertPoint" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Insert Glue Point</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GluePercent" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Glue Point Relative</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>9</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueEscapeDirection" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Exit Direction</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueHorzAlignCenter" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Glue Point Horizontal Center</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueHorzAlignLeft" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Glue Point Horizontal Left</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueHorzAlignRight" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Glue Point Horizontal Right</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueVertAlignCenter" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Glue Point Vertical Center</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueVertAlignTop" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Glue Point Vertical Top</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueVertAlignBottom" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Glue Point Vertical Bottom</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Shell3D" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Shell</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Torus" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Torus</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:HalfSphere" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Half-Sphere</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueEscapeDirectionLeft" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Exit Direction Left</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueEscapeDirectionRight" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Exit Direction Right</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueEscapeDirectionTop" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Exit Direction Top</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GlueEscapeDirectionBottom" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Exit Direction Bottom</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertToolbox" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Insert</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Morphing" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Cross-fading...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MeasureAttributes" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Dimen~sions...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GridFront" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Grid to ~Front</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:HelplinesVisible" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Display Guides</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:HelplinesFront" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Guides to ~Front</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:BeforeObject" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">In Front of ~Object</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PreviewWindow" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Pre~view</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CustomAnimation" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Custom Animation...</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CustomAnimationSchemes" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Animation Schemes...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SlideChangeWindow" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Slide Transition...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorAttributes" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Connector...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PresentationDialog" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">S~lide Show Settings...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Hyphenation" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Hyphenation</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>9</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:NewRouting" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Reset Routing</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DuplicatePage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">D~uplicate Slide</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ExpandPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">E~xpand Slide</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SummaryPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Su~mmary Slide</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LeaveAllGroups" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Exit All Groups</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ParaspaceIncrease" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Increase Spacing</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ParaspaceDecrease" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Decrease Spacing</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SlideMasterPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Slide Master</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:HandoutMasterPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Handout Master</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:NotesMasterPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Notes Master</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:TitleMasterPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Title Slide Master</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertPageQuick" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Insert Slide Direct</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertDateFieldVar" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Dat~e (variable)</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertDateFieldFix" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Date (fixed)</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertTimeFieldVar" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">T~ime (variable)</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertTimeFieldFix" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Time (fixed)</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertPageField" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Page Number</value>
-                </prop>
-            </node>
+  <node oor:name="UserInterface">
+    <node oor:name="Commands">
+      <node oor:name=".uno:Polygon" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Polygon, filled</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ColorView" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Black &amp; White View</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:RenamePage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Rename Slide</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:RenameLayer" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Rename</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Presentation" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Slide Show</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:RehearseTimings" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Rehearse Timings</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Dia" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">SlideTransition</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ShowSlide" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Sho~w Slide</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:HideSlide" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Hide Slide</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:TextAttributes" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Te~xt...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PagesPerRow" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Slides Per Row</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:TextFitToSizeTool" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Fit Text to Frame</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:VerticalTextFitToSizeTool" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Fit Vertical Text to Frame</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Objects3DToolbox" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">3D Objects</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Cube" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Cube</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Sphere" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Sphere</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Cylinder" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Cylinder</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Cone" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Cone</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Cyramid" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Pyramid</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueEditMode" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Glue Points</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueInsertPoint" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Insert Glue Point</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GluePercent" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Glue Point Relative</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueEscapeDirection" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Exit Direction</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueHorzAlignCenter" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Glue Point Horizontal Center</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueHorzAlignLeft" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Glue Point Horizontal Left</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueHorzAlignRight" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Glue Point Horizontal Right</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueVertAlignCenter" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Glue Point Vertical Center</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueVertAlignTop" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Glue Point Vertical Top</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueVertAlignBottom" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Glue Point Vertical Bottom</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Shell3D" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Shell</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Torus" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Torus</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:HalfSphere" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Half-Sphere</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueEscapeDirectionLeft" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Exit Direction Left</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueEscapeDirectionRight" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Exit Direction Right</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueEscapeDirectionTop" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Exit Direction Top</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GlueEscapeDirectionBottom" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Exit Direction Bottom</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertToolbox" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Insert</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Morphing" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Cross-fading...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:MeasureAttributes" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Dimen~sions...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GridFront" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Grid to ~Front</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:HelplinesVisible" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Display Guides</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:HelplinesFront" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Guides to ~Front</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:BeforeObject" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">In Front of ~Object</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PreviewWindow" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Pre~view</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:CustomAnimation" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Custom Animation...</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:CustomAnimationSchemes" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Animation Schemes...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SlideChangeWindow" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Slide Transition...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorAttributes" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Connector...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PresentationDialog" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">S~lide Show Settings...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Hyphenation" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Hyphenation</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:NewRouting" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Reset Routing</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DuplicatePage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">D~uplicate Slide</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ExpandPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">E~xpand Slide</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SummaryPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Su~mmary Slide</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:LeaveAllGroups" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Exit All Groups</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ParaspaceIncrease" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Increase Spacing</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ParaspaceDecrease" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Decrease Spacing</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SlideMasterPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Slide Master</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:HandoutMasterPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Handout Master</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:NotesMasterPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Notes Master</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:TitleMasterPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Title Slide Master</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertPageQuick" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Insert Slide Direct</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertDateFieldVar" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Dat~e (variable)</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertDateFieldFix" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Date (fixed)</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertTimeFieldVar" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">T~ime (variable)</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertTimeFieldFix" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Time (fixed)</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertPageField" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Page Number</value>
+        </prop>
+      </node>
       <node oor:name=".uno:InsertPagesField" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
+
           <value xml:lang="en-US">Page ~Count</value>
         </prop>
       </node>
       <node oor:name=".uno:ModifyField" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">F~ields...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertFileField" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~File Name</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertAuthorField" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Author</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CustomShowDialog" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Custom Slide Show...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:OutputQualityColor" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Color</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:OutputQualityGrayscale" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Grayscale</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:OutputQualityBlackWhite" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Black and White</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PreviewQualityColor" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Color</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PreviewQualityGrayscale" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Grayscale</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PreviewQualityBlackWhite" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Black and White</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertInto3D" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">To 3~D</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertInto3DLatheFast" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">To 3D ~Rotation Object</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertIntoBitmap" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">To ~Bitmap</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertIntoMetaFile" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">To ~Metafile</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PackAndGo" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Pack</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:convert_to_contour" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">To C~ontour</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:EditHyperlink" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">H~yperlink...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PageSetup" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Page...</value>
-                </prop>
-            </node>
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">F~ields...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertFileField" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~File Name</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertAuthorField" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Author</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:CustomShowDialog" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Custom Slide Show...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:OutputQualityColor" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Color</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:OutputQualityGrayscale" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Grayscale</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:OutputQualityBlackWhite" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Black and White</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PreviewQualityColor" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Color</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PreviewQualityGrayscale" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Grayscale</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PreviewQualityBlackWhite" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Black and White</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConvertInto3D" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">To 3~D</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConvertInto3DLatheFast" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">To 3D ~Rotation Object</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConvertIntoBitmap" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">To ~Bitmap</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConvertIntoMetaFile" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">To ~Metafile</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PackAndGo" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Pack</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:convert_to_contour" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">To C~ontour</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:EditHyperlink" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">H~yperlink...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PageSetup" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Page...</value>
+        </prop>
+      </node>
       <node oor:name=".uno:PasteSpecial" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Paste ~Special...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CopyObjects" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Duplicat~e...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ManageLinks" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Lin~ks...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertInto3DLathe" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">In 3D Rotation Object</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DrawingMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Drawing View</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:OutlineMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Outline</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:OutputQualityContrast" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~High Contrast</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DiaMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Sli~de Sorter</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PreviewQualityContrast" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~High Contrast</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Slid~e</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ImportFromFile" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~File...</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ZoomPanning" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Shift</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PixelMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Pixel Mode</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ObjectPosition" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Arrange</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Combine" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Comb~ine</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ObjectTitleDescription" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Description...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:NameGroup" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Name...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorToolbox" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Connector</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Forward" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Bring ~Forward</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Backward" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Send Back~ward</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MirrorVert" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Vertically</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MirrorHorz" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Horizontally</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ChangeBezier" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">To ~Curve</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ChangePolygon" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">To ~Polygon</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CapturePoint" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Insert Snap Point/Line...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ShowRuler" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Ruler</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertLayer" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Layer...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ModifyPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Slide ~Layout...</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ModifyLayer" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Layer...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PageMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Normal</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LayerMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Layer</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MeasureLine" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Dimension Line</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MasterPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Master</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DiaEffect" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Slide Effects</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DiaSpeed" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Transition Speed</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DiaAuto" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">AutoTransition</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DiaTime" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Time</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Connector" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Connector</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ActionMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Allow Interaction</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:AnimationObjects" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Animated Image...</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:AnimationEffects" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Interaction...</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PresentationLayout" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Slide D~esign...</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-      <node oor:name=".uno:AssignLayout" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
 
+          <value xml:lang="en-US">Paste ~Special...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:CopyObjects" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Duplicat~e...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ManageLinks" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Lin~ks...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConvertInto3DLathe" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">In 3D Rotation Object</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DrawingMode" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Drawing View</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:OutlineMode" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Outline</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:OutputQualityContrast" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~High Contrast</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DiaMode" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Sli~de Sorter</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PreviewQualityContrast" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~High Contrast</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Slid~e</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ImportFromFile" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~File...</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ZoomPanning" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Shift</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PixelMode" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Pixel Mode</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ObjectPosition" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Arrange</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Combine" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Comb~ine</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ObjectTitleDescription" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Description...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:NameGroup" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Name...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorToolbox" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Connector</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Forward" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Bring ~Forward</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Backward" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Send Back~ward</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:MirrorVert" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Vertically</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:MirrorHorz" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Horizontally</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ChangeBezier" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">To ~Curve</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ChangePolygon" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">To ~Polygon</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:CapturePoint" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Insert Snap Point/Line...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ShowRuler" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Ruler</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertLayer" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Layer...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ModifyPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Slide ~Layout...</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ModifyLayer" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Layer...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PageMode" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Normal</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:LayerMode" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Layer</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:MeasureLine" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Dimension Line</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:MasterPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Master</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DiaEffect" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Slide Effects</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DiaSpeed" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Transition Speed</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DiaAuto" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">AutoTransition</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DiaTime" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Time</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Connector" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Connector</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ActionMode" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Allow Interaction</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:AnimationObjects" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Animated Image...</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:AnimationEffects" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Interaction...</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PresentationLayout" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Slide D~esign...</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:AssignLayout" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Slide Layout</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
@@ -848,974 +975,1087 @@
         </prop>
       </node>
       <node oor:name=".uno:NotesMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Notes ~Page</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:HandoutMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">H~andout Page</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DeletePage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">D~elete Slide</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DeleteLayer" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Delete</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Dismantle" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Split</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PageStatus" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Slide/Layer</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LayoutStatus" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Layout</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CrookRotate" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Set in Circle (perspective)</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CrookSlant" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Set to circle (slant)</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CrookStretch" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Set in Circle (distort)</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Connect" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">C~onnect</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Break" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Break</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:AdvancedMode" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Effects</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InteractiveTransparence" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Transparency</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InteractiveGradient" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Gradient</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Shear" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Distort</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:BehindObject" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Be~hind Object</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ReverseOrder" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Reverse</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorArrowStart" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Connector Starts with Arrow</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorArrowEnd" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Connector Ends with Arrow</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorArrows" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Connector with Arrows</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorCircleStart" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Connector Starts with Circle</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorCircleEnd" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Connector Ends with Circle</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorCircles" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Connector with Circles</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:TextToolbox" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Text</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorLine" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Straight Connector</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:RectangleToolbox" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Rectangle</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorLineArrowStart" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Straight Connector starts with Arrow</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:EllipseToolbox" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Ellipse</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorLineArrowEnd" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Straight Connector ends with Arrow</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LineToolbox" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Curve</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorLineArrows" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Straight Connector with Arrows</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorLineCircleStart" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Straight Connector starts with Circle</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorLineCircleEnd" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Straight Connector ends with Circle</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorLineCircles" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Straight Connector with Circles</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorCurve" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Curved Connector</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorCurveArrowStart" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Curved Connector Starts with Arrow</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorCurveArrowEnd" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Curved Connector Ends with Arrow</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorCurveArrows" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Curved Connector with Arrows</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorCurveCircleStart" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Curved Connector Starts with Circle</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorCurveCircleEnd" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Curved Connector Ends with Circle</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorCurveCircles" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Curved Connector with Circles</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorLines" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Line Connector</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorLinesArrowStart" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Line Connector Starts with Arrow</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorLinesArrowEnd" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Line Connector Ends with Arrow</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorLinesArrows" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Line Connector with Arrows</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorLinesCircleStart" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Line Connector Starts with Circle</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorLinesCircleEnd" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Line Connector Ends with Circle</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConnectorLinesCircles" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Line Connector with Circles</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GraphicDraft" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Picture Placeholders</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:FillDraft" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Contour Mode</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:TextDraft" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Text Placeholders</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LineDraft" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Line Contour Only</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:HandlesDraft" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Simple Handles</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SolidCreate" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Modify Object with Attributes</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:HelplinesUse" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Snap to Guides</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SnapBorder" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Snap to Page Margins</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SnapFrame" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Snap to Object Border</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SnapPoints" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Snap to Object Points</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:QuickEdit" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Allow Quick Editing</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PickThrough" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Select Text Area Only</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertTo1BitThreshold" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">1 Bit Threshold</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertTo1BitMatrix" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">1 Bit Dithered</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertTo4BitGrays" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">4 Bit grayscales</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertTo4BitColors" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">4 Bit color palette</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertTo8BitGrays" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">8 Bit Grayscales</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertTo8BitColors" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">8 Bit color palette</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertToTrueColor" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">24 Bit True Color</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:BigHandles" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Large Handles</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DoubleClickTextEdit" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Double-click to edit Text</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ClickChangeRotation" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Rotation Mode after Clicking Object</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ArrowsToolbox" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Lines and Arrows</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LineArrowStart" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Line Starts with Arrow</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LineArrowEnd" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Line Ends with Arrow</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LineArrows" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Line with Arrows</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LineArrowCircle" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Line with Arrow/Circle</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LineCircleArrow" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Line with Circle/Arrow</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LineArrowSquare" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Line with Arrow/Square</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LineSquareArrow" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Line with Square/Arrow</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:Mirror" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Flip</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertMasterPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">New Master</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DeleteMasterPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Delete Master</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:RenameMasterPage" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Rename Master</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CloseMasterView" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Close Master View</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SendMailDocAsMS" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">E-mail as ~Microsoft PowerPoint Presentation...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SendMailDocAsOOo" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">E-mail as ~OpenDocument Presentation...</value>
-                </prop>
-            </node>
-        </node>
-        <node oor:name="Popups">
-            <node oor:name=".uno:ModifyMenu" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Modify</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:WorkspaceMenu" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Wor~kspace</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MirrorMenu" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Flip</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:PreviewDisplayQualityMenu" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Pre~view Mode</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LayerMenu" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">La~yer</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:GridMenu" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Gr~id</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ConvertMenu" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Convert</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:ArrangeMenu" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Arrange</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DisplayQualityMenu" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Color/Grayscale</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SlideShowMenu" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Slide Show</value>
-                </prop>
-            </node>
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Notes ~Page</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:HandoutMode" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">H~andout Page</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DeletePage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">D~elete Slide</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DeleteLayer" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Delete</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Dismantle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Split</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PageStatus" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Slide/Layer</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:LayoutStatus" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Layout</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:CrookRotate" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Set in Circle (perspective)</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:CrookSlant" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Set to circle (slant)</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:CrookStretch" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Set in Circle (distort)</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Connect" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">C~onnect</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Break" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Break</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:AdvancedMode" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Effects</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InteractiveTransparence" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Transparency</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InteractiveGradient" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Gradient</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Shear" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Distort</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:BehindObject" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Be~hind Object</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ReverseOrder" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Reverse</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorArrowStart" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Connector Starts with Arrow</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorArrowEnd" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Connector Ends with Arrow</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorArrows" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Connector with Arrows</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorCircleStart" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Connector Starts with Circle</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorCircleEnd" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Connector Ends with Circle</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorCircles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Connector with Circles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:TextToolbox" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Text</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorLine" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Straight Connector</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:RectangleToolbox" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Rectangle</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorLineArrowStart" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Straight Connector starts with Arrow</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:EllipseToolbox" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Ellipse</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorLineArrowEnd" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Straight Connector ends with Arrow</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:LineToolbox" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Curve</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorLineArrows" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Straight Connector with Arrows</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorLineCircleStart" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Straight Connector starts with Circle</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorLineCircleEnd" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Straight Connector ends with Circle</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorLineCircles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Straight Connector with Circles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorCurve" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Curved Connector</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorCurveArrowStart" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Curved Connector Starts with Arrow</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorCurveArrowEnd" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Curved Connector Ends with Arrow</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorCurveArrows" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Curved Connector with Arrows</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorCurveCircleStart" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Curved Connector Starts with Circle</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorCurveCircleEnd" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Curved Connector Ends with Circle</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorCurveCircles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Curved Connector with Circles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorLines" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Line Connector</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorLinesArrowStart" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Line Connector Starts with Arrow</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorLinesArrowEnd" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Line Connector Ends with Arrow</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorLinesArrows" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Line Connector with Arrows</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorLinesCircleStart" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Line Connector Starts with Circle</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorLinesCircleEnd" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Line Connector Ends with Circle</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConnectorLinesCircles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Line Connector with Circles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GraphicDraft" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Picture Placeholders</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:FillDraft" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Contour Mode</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:TextDraft" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Text Placeholders</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:LineDraft" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Line Contour Only</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:HandlesDraft" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Simple Handles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SolidCreate" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Modify Object with Attributes</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:HelplinesUse" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Snap to Guides</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SnapBorder" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Snap to Page Margins</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SnapFrame" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Snap to Object Border</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SnapPoints" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Snap to Object Points</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:QuickEdit" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Allow Quick Editing</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PickThrough" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Select Text Area Only</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConvertTo1BitThreshold" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">1 Bit Threshold</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConvertTo1BitMatrix" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">1 Bit Dithered</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConvertTo4BitGrays" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">4 Bit grayscales</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConvertTo4BitColors" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">4 Bit color palette</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConvertTo8BitGrays" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">8 Bit Grayscales</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConvertTo8BitColors" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">8 Bit color palette</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConvertToTrueColor" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">24 Bit True Color</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:BigHandles" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Large Handles</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DoubleClickTextEdit" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Double-click to edit Text</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ClickChangeRotation" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Rotation Mode after Clicking Object</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ArrowsToolbox" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Lines and Arrows</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:LineArrowStart" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Line Starts with Arrow</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:LineArrowEnd" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Line Ends with Arrow</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:LineArrows" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Line with Arrows</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:LineArrowCircle" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Line with Arrow/Circle</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:LineCircleArrow" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Line with Circle/Arrow</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:LineArrowSquare" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Line with Arrow/Square</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:LineSquareArrow" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Line with Square/Arrow</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:Mirror" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Flip</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+
+      <node oor:name=".uno:InsertMasterPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">New Master</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DeleteMasterPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Delete Master</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:RenameMasterPage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Rename Master</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:CloseMasterView" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Close Master View</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SendMailDocAsMS" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">E-mail as ~Microsoft PowerPoint Presentation...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SendMailDocAsOOo" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">E-mail as ~OpenDocument Presentation...</value>
+        </prop>
+      </node>
+    </node>
+    <node oor:name="Popups">
+      <node oor:name=".uno:ModifyMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Modify</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:WorkspaceMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Wor~kspace</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:MirrorMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Flip</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PreviewDisplayQualityMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Pre~view Mode</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:LayerMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">La~yer</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:GridMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Gr~id</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ConvertMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Convert</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ArrangeMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Arrange</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DisplayQualityMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Color/Grayscale</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SlideShowMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Slide Show</value>
+        </prop>
+      </node>
       <!--node oor:name=".uno:ReviewMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Review</value>
         </prop>
       </node-->
       <node oor:name=".uno:GroupMenu" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Group</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SendMenu" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Sen~d</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:TemplatesMenu" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Styl~es</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SnapLinesMenu" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Guides</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MasterPageMenu" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Master</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MasterLayoutsMenu" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Master Lay~outs</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MasterLayouts" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Master ~Elements...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MasterLayoutsNotes" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Notes Master Layout...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MasterLayoutsHandouts" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Handout Master Layout...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:HeaderAndFooter" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Header and Footer...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertPageNumber" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">P~age Number...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertDateAndTime" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Date and ~Time...</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:NormalMultiPaneGUI" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Normal</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SlideSorterMultiPaneGUI" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Sli~de Sorter</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LeftPaneImpress" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">S~lide Pane</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:LeftPaneDraw" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Page Pane</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:RightPane" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Tas~k Pane</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:MergeCells" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Zellen verbinden</value>
-                    <value xml:lang="en-US">Merge Cells</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SplitCell" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Zelle teilen</value>
-                    <value xml:lang="en-US">Split Cells</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:OptimizeTable" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Optimieren</value>
-                    <value xml:lang="en-US">Optimize</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DistributeColumns" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Distribute Columns Evenly</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DistributeRows" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Distribute Rows Equally </value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CellVertBottom" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Unten</value>
-                    <value xml:lang="en-US">Bottom</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CellVertCenter" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Mittig (vertikal)</value>
-                    <value xml:lang="en-US">Center ( vertical )</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:CellVertTop" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Oben</value>
-                    <value xml:lang="en-US">Top</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertRows" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Zeile einfügen</value>
-                    <value xml:lang="en-US">Insert Row</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Group</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SendMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Sen~d</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:TemplatesMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Styl~es</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SnapLinesMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Guides</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:MasterPageMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Master</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:MasterLayoutsMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Master Lay~outs</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:MasterLayouts" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Master ~Elements...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:MasterLayoutsNotes" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Notes Master Layout...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:MasterLayoutsHandouts" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Handout Master Layout...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:HeaderAndFooter" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Header and Footer...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertPageNumber" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">P~age Number...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertDateAndTime" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Date and ~Time...</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:NormalMultiPaneGUI" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">~Normal</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SlideSorterMultiPaneGUI" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Sli~de Sorter</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:LeftPaneImpress" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">S~lide Pane</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:LeftPaneDraw" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">~Page Pane</value>
+        </prop>
+      </node>
+
+      <node oor:name=".uno:RightPane" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Tas~k Pane</value>
+        </prop>
+      </node>
+
+      <node oor:name=".uno:MergeCells" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">Zellen verbinden</value>
+          <value xml:lang="en-US">Merge Cells</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SplitCell" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">Zelle teilen</value>
+          <value xml:lang="en-US">Split Cells</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:OptimizeTable" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">Optimieren</value>
+          <value xml:lang="en-US">Optimize</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DistributeColumns" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Distribute Columns Evenly</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DistributeRows" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Distribute Rows Equally </value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:CellVertBottom" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">Unten</value>
+          <value xml:lang="en-US">Bottom</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:CellVertCenter" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">Mittig (vertikal)</value>
+          <value xml:lang="en-US">Center ( vertical )</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:CellVertTop" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">Oben</value>
+          <value xml:lang="en-US">Top</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertRows" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">Zeile einfügen</value>
+          <value xml:lang="en-US">Insert Row</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:InsertRowDialog" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Rows...</value>
         </prop>
       </node>
       <node oor:name=".uno:InsertColumns" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Spalte einfügen</value>
-                    <value xml:lang="en-US">Insert Column</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">Spalte einfügen</value>
+          <value xml:lang="en-US">Insert Column</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:InsertColumnDialog" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Columns...</value>
         </prop>
       </node>
       <node oor:name=".uno:DeleteRows" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Zeile löschen</value>
-                    <value xml:lang="en-US">Delete Row</value>
-                </prop>
-                <prop oor:name="ContextLabel" oor:type="xs:string">
-                    <value xml:lang="de">Zeilen</value>
-                    <value xml:lang="en-US">~Rows</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:DeleteColumns" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Spalte löschen</value>
-                    <value xml:lang="en-US">Delete Column</value>
-                </prop>
-                <prop oor:name="ContextLabel" oor:type="xs:string">
-                    <value xml:lang="de">Spalten</value>
-                    <value xml:lang="en-US">~Columns</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:SelectTable" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Tabelle selektieren</value>
-                    <value xml:lang="en-US">Select Table</value>
-                </prop>
-                <prop oor:name="ContextLabel" oor:type="xs:string">
-                    <value xml:lang="de">Tabelle</value>
-                    <value xml:lang="en-US">~Table</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:EntireColumn" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Spalte selektieren</value>
-                    <value xml:lang="en-US">Select Column</value>
-                </prop>
-                <prop oor:name="ContextLabel" oor:type="xs:string">
-                    <value xml:lang="de">Spalten</value>
-                    <value xml:lang="en-US">~Columns</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:EntireRow" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Zeile selektieren</value>
-                    <value xml:lang="en-US">Select Rows</value>
-                </prop>
-                <prop oor:name="ContextLabel" oor:type="xs:string">
-                    <value xml:lang="de">Zeilen</value>
-                    <value xml:lang="en-US">~Rows</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:TableDialog" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Tabelleneigenschaften...</value>
-                    <value xml:lang="en-US">Ta~ble Properties...</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:AutoSum" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Summe</value>
-                    <value xml:lang="en-US">Sum</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:TableSort" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Sorti~eren...</value>
-                    <value xml:lang="en-US">So~rt...</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
-            <node oor:name=".uno:InsertTable" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">~Tabelle...</value>
-                    <value xml:lang="en-US">~Table...</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">Zeile löschen</value>
+          <value xml:lang="en-US">Delete Row</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
+          <value xml:lang="de">Zeilen</value>
+          <value xml:lang="en-US">~Rows</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DeleteColumns" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">Spalte löschen</value>
+          <value xml:lang="en-US">Delete Column</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
+          <value xml:lang="de">Spalten</value>
+          <value xml:lang="en-US">~Columns</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SelectTable" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">Tabelle selektieren</value>
+          <value xml:lang="en-US">Select Table</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
+          <value xml:lang="de">Tabelle</value>
+          <value xml:lang="en-US">~Table</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:EntireColumn" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">Spalte selektieren</value>
+          <value xml:lang="en-US">Select Column</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
+          <value xml:lang="de">Spalten</value>
+          <value xml:lang="en-US">~Columns</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:EntireRow" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">Zeile selektieren</value>
+          <value xml:lang="en-US">Select Rows</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
+          <value xml:lang="de">Zeilen</value>
+          <value xml:lang="en-US">~Rows</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:TableDialog" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">Tabelleneigenschaften...</value>
+          <value xml:lang="en-US">Ta~ble Properties...</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:AutoSum" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">Summe</value>
+          <value xml:lang="en-US">Sum</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:TableSort" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">Sorti~eren...</value>
+          <value xml:lang="en-US">So~rt...</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:InsertTable" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="de">~Tabelle...</value>
+          <value xml:lang="en-US">~Table...</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:Grow" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Increase Font</value>
@@ -1881,5 +2121,5 @@
         </prop>
       </node>
     </node>
-    </node>
+  </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
index 83554a37d09e..479c193280bb 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
@@ -45,44 +45,58 @@
       </node>
       <node oor:name="generic_toolbar_factory" oor:op="replace">
         <prop oor:name="Type">
-            <value>toolbar</value>
+          <value>toolbar</value>
         </prop>
         <prop oor:name="Name">
-            <value/>
+          <value/>
         </prop>
         <prop oor:name="Module">
-            <value/>
+          <value/>
         </prop>
         <prop oor:name="FactoryImplementation">
-            <value>com.sun.star.comp.framework.ToolBarFactory</value>
+          <value>com.sun.star.comp.framework.ToolBarFactory</value>
         </prop>
       </node>
       <node oor:name="addons_toolbar_factory" oor:op="replace">
         <prop oor:name="Type">
-            <value>toolbar</value>
+          <value>toolbar</value>
         </prop>
         <prop oor:name="Name">
-            <value>addon_</value>
+          <value>addon_</value>
         </prop>
         <prop oor:name="Module">
-            <value/>
+          <value/>
         </prop>
         <prop oor:name="FactoryImplementation">
-            <value>com.sun.star.comp.framework.AddonsToolBarFactory</value>
+          <value>com.sun.star.comp.framework.AddonsToolBarFactory</value>
         </prop>
       </node>
       <node oor:name="statusbar_factory" oor:op="replace">
         <prop oor:name="Type">
-            <value>statusbar</value>
+          <value>statusbar</value>
+        </prop>
+        <prop oor:name="Name">
+          <value/>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="FactoryImplementation">
+          <value>com.sun.star.comp.framework.StatusBarFactory</value>
+        </prop>
+      </node>
+      <node oor:name="org.openoffice.Office.Impress.ImpressToolPanelFactory" oor:op="replace">
+        <prop oor:name="Type">
+          <value>toolpanel</value>
         </prop>
         <prop oor:name="Name">
-            <value/>
+          <value>DrawingFramework</value>
         </prop>
         <prop oor:name="Module">
-            <value/>
+          <value>com.sun.star.presentation.PresentationDocument</value>
         </prop>
         <prop oor:name="FactoryImplementation">
-            <value>com.sun.star.comp.framework.StatusBarFactory</value>
+          <value>com.sun.star.drawing.DefaultToolPanelFactory</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 b2759e4f7dbf..183f7366a84a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3420,7 +3420,12 @@
                     <value>9</value>
                 </prop>
             </node>
-            <node oor:name=".uno:RestoreEditingView" oor:op="replace">
+      <node oor:name=".uno:TaskPane" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Task Pane</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:RestoreEditingView" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Restore Editing View</value>
                 </prop>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index 422230b9e0a1..de59f330d340 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,734 +27,734 @@
  ************************************************************************ -->
 <!DOCTYPE oor:component-data SYSTEM "../../../../../component-update.dtd">
 <oor:component-data oor:name="ImpressWindowState" 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="UIElements">
-        <node oor:name="States">
-            <node oor:name="private:resource/toolbar/extrusionobjectbar" oor:op="replace">
-                <prop oor:name="DockingArea" oor:type="xs:int">
-                    <value>0</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">3D-Settings</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/drawingobjectbar" oor:op="replace">
-                <prop oor:name="DockPos" oor:type="xs:string">
-                    <value>0,1</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="DockingArea" oor:type="xs:int">
-                    <value>0</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Line and Filling</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/3dobjectsbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <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">3D-Objects</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/alignmentbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <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">Align</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/arrowsbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <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">Arrows</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/choosemodebar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <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">Mode</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/commontaskbar" oor:op="replace">
-                <prop oor:name="DockPos" oor:type="xs:string">
-                    <value>1,0</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="DockingArea" oor:type="xs:int">
-                    <value>0</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Presentation</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/connectorsbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Connectors</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/fullscreenbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="Style" oor:type="xs:int">
-                    <value>2</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Full Screen</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="NoClose" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/ellipsesbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Circles and Ovals</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-            </node>
+  <node oor:name="UIElements">
+    <node oor:name="States">
+      <node oor:name="private:resource/toolbar/extrusionobjectbar" oor:op="replace">
+        <prop oor:name="DockingArea" oor:type="xs:int">
+          <value>0</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">3D-Settings</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/drawingobjectbar" oor:op="replace">
+        <prop oor:name="DockPos" oor:type="xs:string">
+          <value>0,1</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="DockingArea" oor:type="xs:int">
+          <value>0</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Line and Filling</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/3dobjectsbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <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">3D-Objects</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/alignmentbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <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">Align</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/arrowsbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <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">Arrows</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/choosemodebar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <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">Mode</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/commontaskbar" oor:op="replace">
+        <prop oor:name="DockPos" oor:type="xs:string">
+          <value>1,0</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="DockingArea" oor:type="xs:int">
+          <value>0</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Presentation</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/connectorsbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Connectors</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/fullscreenbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Style" oor:type="xs:int">
+          <value>2</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Full Screen</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="NoClose" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/ellipsesbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Circles and Ovals</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/toolbar/formtextobjectbar" oor:op="replace">
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Text Box Formatting</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/formsfilterbar" oor:op="replace">
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Form Filter</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="NoClose" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/formsnavigationbar" oor:op="replace">
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Form Navigation</value>
-                </prop>
-                <prop oor:name="DockPos" oor:type="xs:string">
-                    <value>0,1</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="DockingArea" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/formcontrols" oor:op="replace">
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Form Controls</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">More Controls</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Form Design</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/fontworkobjectbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Fontwork</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/fontworkshapetype" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Fontwork Shape</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/graphicobjectbar" oor:op="replace">
-                <prop oor:name="DockPos" oor:type="xs:string">
-                    <value>0,1</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="DockingArea" oor:type="xs:int">
-                    <value>0</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Picture</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/graffilterbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Graphic Filter</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/outlinetoolbar" oor:op="replace">
-                <prop oor:name="DockPos" oor:type="xs:string">
-                    <value>1,0</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="DockingArea" oor:type="xs:int">
-                    <value>0</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Outline</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/insertbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <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">Insert</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/linesbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Lines</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/basicshapes" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Basic Shapes</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/symbolshapes" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Symbol Shapes</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/arrowshapes" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Block Arrows</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/flowchartshapes" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Flowchart</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/calloutshapes" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Callouts</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/starshapes" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Stars and Banners</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/optionsbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Options</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/rectanglesbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Rectangles</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/positionbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Position</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/slideviewtoolbar" oor:op="replace">
-                <prop oor:name="DockPos" oor:type="xs:string">
-                    <value>0,1</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="DockingArea" oor:type="xs:int">
-                    <value>0</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Slide Sorter</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/slideviewobjectbar" oor:op="replace">
-                <prop oor:name="DockPos" oor:type="xs:string">
-                    <value>0,1</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="DockingArea" oor:type="xs:int">
-                    <value>0</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Slide View</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/standardbar" oor:op="replace">
-                <prop oor:name="DockPos" oor:type="xs:string">
-                    <value>0,0</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="DockingArea" oor:type="xs:int">
-                    <value>0</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Standard</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/textbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Text</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/textobjectbar" oor:op="replace">
-                <prop oor:name="DockPos" oor:type="xs:string">
-                    <value>0,1</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Text Formatting</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/toolbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="DockingArea" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Drawing</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/tableobjectbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Table</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/zoombar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Zoom</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/gluepointsobjectbar" oor:op="replace">
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Gluepoints</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/bezierobjectbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Edit Points</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/viewerbar" oor:op="replace">
-                <prop oor:name="DockingArea" oor:type="xs:int">
-                    <value>0</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Standard (Viewing Mode)</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="NoClose" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/mediaobjectbar" oor:op="replace">
-                <prop oor:name="DockPos" oor:type="xs:string">
-                    <value>0,1</value>
-                </prop>
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="DockingArea" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Media Playback</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
-            <node oor:name="private:resource/toolbar/colorbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <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">Color</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-            </node>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Text Box Formatting</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/formsfilterbar" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Form Filter</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="NoClose" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/formsnavigationbar" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Form Navigation</value>
+        </prop>
+        <prop oor:name="DockPos" oor:type="xs:string">
+          <value>0,1</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="DockingArea" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/formcontrols" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Form Controls</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/moreformcontrols" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">More Controls</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/formdesign" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Form Design</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/fontworkobjectbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Fontwork</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/fontworkshapetype" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Fontwork Shape</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/graphicobjectbar" oor:op="replace">
+        <prop oor:name="DockPos" oor:type="xs:string">
+          <value>0,1</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="DockingArea" oor:type="xs:int">
+          <value>0</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Picture</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/graffilterbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Graphic Filter</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/outlinetoolbar" oor:op="replace">
+        <prop oor:name="DockPos" oor:type="xs:string">
+          <value>1,0</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="DockingArea" oor:type="xs:int">
+          <value>0</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Outline</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/insertbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <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">Insert</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/linesbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Lines</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/basicshapes" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Basic Shapes</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/symbolshapes" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Symbol Shapes</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/arrowshapes" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Block Arrows</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/flowchartshapes" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Flowchart</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/calloutshapes" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Callouts</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/starshapes" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Stars and Banners</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/optionsbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Options</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/rectanglesbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Rectangles</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/positionbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Position</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/slideviewtoolbar" oor:op="replace">
+        <prop oor:name="DockPos" oor:type="xs:string">
+          <value>0,1</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="DockingArea" oor:type="xs:int">
+          <value>0</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Slide Sorter</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/slideviewobjectbar" oor:op="replace">
+        <prop oor:name="DockPos" oor:type="xs:string">
+          <value>0,1</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="DockingArea" oor:type="xs:int">
+          <value>0</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Slide View</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/standardbar" oor:op="replace">
+        <prop oor:name="DockPos" oor:type="xs:string">
+          <value>0,0</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="DockingArea" oor:type="xs:int">
+          <value>0</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Standard</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/textbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Text</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/textobjectbar" oor:op="replace">
+        <prop oor:name="DockPos" oor:type="xs:string">
+          <value>0,1</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Text Formatting</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/toolbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="DockingArea" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Drawing</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/tableobjectbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Table</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/zoombar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Zoom</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/gluepointsobjectbar" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Gluepoints</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/bezierobjectbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Edit Points</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/viewerbar" oor:op="replace">
+        <prop oor:name="DockingArea" oor:type="xs:int">
+          <value>0</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Standard (Viewing Mode)</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="NoClose" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/mediaobjectbar" oor:op="replace">
+        <prop oor:name="DockPos" oor:type="xs:string">
+          <value>0,1</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="DockingArea" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Media Playback</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/colorbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <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">Color</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/toolbar/commentsbar" oor:op="replace">
         <prop oor:name="Docked" oor:type="xs:boolean">
           <value>false</value>
@@ -770,36 +770,91 @@
         </prop>
       </node>
       <node oor:name="private:resource/toolbar/masterviewtoolbar" oor:op="replace">
-                <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="DockingArea" oor:type="xs:int">
-                    <value>0</value>
-                </prop>
-                <prop oor:name="Locked" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="Style" oor:type="xs:int">
-                    <value>0</value>
-                </prop>
-                <prop oor:name="Visible" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="Pos" oor:type="xs:string">
-                    <value>500,100</value>
-                </prop>
-                <prop oor:name="UIName" oor:type="xs:string">
-                    <value xml:lang="en-US">Master View</value>
-                </prop>
-                <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
-                    <value>false</value>
-                </prop>
-                <prop oor:name="NoClose" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
-                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
-                    <value>true</value>
-                </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="DockingArea" oor:type="xs:int">
+          <value>0</value>
+        </prop>
+        <prop oor:name="Locked" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="Style" oor:type="xs:int">
+          <value>0</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="Pos" oor:type="xs:string">
+          <value>500,100</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Master View</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="NoClose" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <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">
@@ -816,5 +871,5 @@
         </prop>
       </node>
     </node>
-    </node>
+  </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
index df824b593a8d..88d2abef62f3 100644
--- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
@@ -175,6 +175,17 @@
                 <value/>
               </prop>
             </node>
+            <node oor:name="Provider14" oor:op="replace">
+              <prop oor:name="ServiceName">
+                <value>com.sun.star.ucb.ExtensionContentProvider</value>
+              </prop>
+              <prop oor:name="URLTemplate">
+                <value>vnd.sun.star.extension</value>
+              </prop>
+              <prop oor:name="Arguments">
+                <value/>
+              </prop>
+            </node>
             <!-- We want the Provider to be the final fallback provider -->
             <node oor:name="Provider999" oor:op="replace" install:module="gio">
               <prop oor:name="ServiceName">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index a5a703c0480c..8317e3e0082d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -26,375 +26,380 @@
  *
  ************************************************************************ -->
 <!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="Impress" oor:package="org.openoffice.Office" xml:lang="en-US"> <info>
-		<author>AF</author>
-		<desc >Contains configuration items related to the Impress application.</desc>
-	</info>
-	<import oor:component="org.openoffice.Office.Common"/>
-	<templates>
-        <group oor:name="MasterPageDescriptor">
+<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="Impress" oor:package="org.openoffice.Office" xml:lang="en-US">
+  <info>
+    <author>AF</author>
+    <desc >Contains configuration items related to the Impress application.</desc>
+  </info>
+  <import oor:component="org.openoffice.Office.Common"/>
+  <templates>
+    <group oor:name="MasterPageDescriptor">
+      <info>
+        <desc>Describes master pages that belong to the list of recently used master pages.</desc>
+      </info>
+      <prop oor:name="URL" oor:type="xs:string">
+        <info>
+          <desc>The URL of the template document that contains the master page.</desc>
+        </info>
+      </prop>
+      <prop oor:name="Name" oor:type="xs:string">
+        <info>
+          <desc>The internal name of the master page.</desc>
+        </info>
+      </prop>
+    </group>
+    <group oor:name="Resource">
+      <info>
+        <desc>A factory that can create one more resources for the multi pane framework.</desc>
+      </info>
+      <prop oor:name="URL" oor:type="xs:string">
+        <info>
+          <desc>URL of a multi pane framework resource.</desc>
+        </info>
+      </prop>
+    </group>
+    <group oor:name="ResourceFactory">
+      <info>
+        <desc>A factory that can create one more resources for the multi pane framework.</desc>
+      </info>
+      <prop oor:name="ServiceName" oor:type="xs:string">
+        <info>
+          <desc>
+            The service name of the factory.  This service is not the factory itself.
+            It is expected to create and register a set of factories when an instance of
+            the service is created.
+          </desc>
+        </info>
+      </prop>
+      <set oor:name="ResourceList" oor:node-type="Resource">
+        <info>
+          <desc>List of URLs of the resources that are created by the factory.</desc>
+        </info>
+      </set>
+    </group>
+    <group oor:name="StartupService">
+      <info>
+        <desc>
+          A service that is instantiated when a framework is initializd for a
+          Draw or Impress document.
+        </desc>
+      </info>
+      <prop oor:name="ServiceName" oor:type="xs:string">
+        <info>
+          <desc>The name of the startup service.</desc>
+        </info>
+      </prop>
+    </group>
+  </templates>
+  <component>
+    <group oor:name="Layout">
+      <info>
+        <desc>Contains general properties of the graphical object representation.</desc>
+      </info>
+      <group oor:name="Display">
+        <info>
+          <desc>Contains general properties of the graphical object representation of screen displays.</desc>
+        </info>
+        <prop oor:name="Ruler" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Layout/Display -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation - Layout - [Section] Display -->
+          <info>
+            <desc>Indicates whether to show the rulers at the left and at the top of the working area.</desc>
+            <label>Rulers visible</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="Helpline" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Layout/Display -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation - Layout - [Section] Display -->
+          <info>
+            <desc>Indicates whether to show help-lines that can be created by dragging them from the rulers.</desc>
+            <label>Helplines visible</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="Guide" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Layout/Display -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation - Layout - [Section] Display -->
+          <info>
+            <desc>Indicates whether to show help-lines when moving an object.</desc>
+            <label>Guides when moving</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="Bezier" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Layout/Display -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation - Layout - [Section] Display -->
+          <info>
+            <desc>Indicates whether to show all control points in the Bezier curve editor.</desc>
+            <label>All control points in Bezier editor</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="Contour" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Layout/Display -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation - Layout - [Section] Display -->
+          <info>
+            <desc>Indicates whether to show the outline of all moved objects when moving more then one object at the same time.</desc>
+            <label>Contour of each individual object</label>
+          </info>
+          <value>true</value>
+        </prop>
+      </group>
+      <group oor:name="Other">
+        <info>
+          <desc>Specifies other layout options that do not fit into any other group.</desc>
+          <label>Other Layout Options</label>
+        </info>
+        <group oor:name="TabStop">
+          <!-- OldPath: Impress/Layout -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation - Layout - [Section] Tab stops -->
+          <!-- Notice: Default-Nonmetric Value: 1270 1/100 mm-->
+          <info>
+            <desc>Specifies the distance between adjacent tab stops with regard to whether the metric or the non-metric system is currently selected.</desc>
+            <label>Tab stops</label>
+          </info>
+          <prop oor:name="Metric" oor:type="xs:int">
             <info>
-				<desc>Describes master pages that belong to the list of recently used master pages.</desc>
+              <desc>Specifies the distance between adjacent tab stops in 1/100 mm when the metric system is selected.</desc>
+              <label/>
             </info>
-			<prop oor:name="URL" oor:type="xs:string">
+            <value>1250</value>
+          </prop>
+          <prop oor:name="NonMetric" oor:type="xs:int">
+            <info>
+              <desc>Specifies the distance between adjacent tab stops in 1/100 mm when the non-metric system is selected.</desc>
+              <label/>
+            </info>
+            <value>1270</value>
+          </prop>
+        </group>
+        <group oor:name="MeasureUnit">
+          <!-- OldPath: Impress/Layout -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation- Layout - [Section] Meas. units -->
+          <info>
+            <desc>Specifies the measurement unit to be used with respect to whether the metric or the non-metric system is selected.</desc>
+            <label>Measurement unit</label>
+          </info>
+          <prop oor:name="Metric" oor:type="xs:int">
+            <info>
+              <desc>Specifies the measurement unit to be used when the metric system is selected.</desc>
+              <label>Measurement unit</label>
+            </info>
+            <constraints>
+              <enumeration oor:value="1">
                 <info>
-	    			<desc>The URL of the template document that contains the master page.</desc>
+                  <desc>Millimeter</desc>
                 </info>
-            </prop>
-			<prop oor:name="Name" oor:type="xs:string">
+              </enumeration>
+              <enumeration oor:value="2">
                 <info>
-	    			<desc>The internal name of the master page.</desc>
+                  <desc>Centimeter</desc>
                 </info>
-            </prop>
-		</group>
-        <group oor:name="Resource">
-            <info>
-				<desc>A factory that can create one more resources for the multi pane framework.</desc>
-            </info>
-			<prop oor:name="URL" oor:type="xs:string">
+              </enumeration>
+              <enumeration oor:value="6">
+                <info>
+                  <desc>Point</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="7">
                 <info>
-	    			<desc>URL of a multi pane framework resource.</desc>
+                  <desc>Pica</desc>
                 </info>
-            </prop>
-		</group>
-        <group oor:name="ResourceFactory">
+              </enumeration>
+              <enumeration oor:value="8">
+                <info>
+                  <desc>Inch</desc>
+                </info>
+              </enumeration>
+            </constraints>
+            <value>2</value>
+          </prop>
+          <prop oor:name="NonMetric" oor:type="xs:int">
             <info>
-				<desc>A factory that can create one more resources for the multi pane framework.</desc>
+              <desc>Specifies the measurement unit to be used when the non-metric system is selected.</desc>
+              <label>Measurement unit</label>
             </info>
-			<prop oor:name="ServiceName" oor:type="xs:string">
+            <constraints>
+              <enumeration oor:value="1">
+                <info>
+                  <desc>Millimeter</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="2">
                 <info>
-	    			<desc>The service name of the factory.  This service is not the factory itself.
-                      It is expected to create and register a set of factories when an instance of
-                      the service is created.</desc>
+                  <desc>Centimeter</desc>
                 </info>
-            </prop>
-            <set oor:name="ResourceList" oor:node-type="Resource">
+              </enumeration>
+              <enumeration oor:value="6">
                 <info>
-                    <desc>List of URLs of the resources that are created by the factory.</desc>
+                  <desc>Point</desc>
                 </info>
-			</set>
-		</group>
-		<group oor:name="StartupService">
-			<info>
-				<desc>A service that is instantiated when a framework is initializd for a
-                Draw or Impress document.</desc>
-			</info>
-			<prop oor:name="ServiceName" oor:type="xs:string">
-				<info>
-					<desc>The name of the startup service.</desc>
-				</info>
-			</prop>
-		</group>
-	</templates>
-	<component>
-		<group oor:name="Layout">
-			<info>
-				<desc>Contains general properties of the graphical object representation.</desc>
-			</info>
-			<group oor:name="Display">
-				<info>
-					<desc>Contains general properties of the graphical object representation of screen displays.</desc>
-				</info>
-				<prop oor:name="Ruler" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Layout/Display -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation - Layout - [Section] Display -->
-					<info>
-						<desc>Indicates whether to show the rulers at the left and at the top of the working area.</desc>
-						<label>Rulers visible</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="Helpline" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Layout/Display -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation - Layout - [Section] Display -->
-					<info>
-						<desc>Indicates whether to show help-lines that can be created by dragging them from the rulers.</desc>
-						<label>Helplines visible</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="Guide" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Layout/Display -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation - Layout - [Section] Display -->
-					<info>
-						<desc>Indicates whether to show help-lines when moving an object.</desc>
-						<label>Guides when moving</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="Bezier" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Layout/Display -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation - Layout - [Section] Display -->
-					<info>
-						<desc>Indicates whether to show all control points in the Bezier curve editor.</desc>
-						<label>All control points in Bezier editor</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="Contour" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Layout/Display -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation - Layout - [Section] Display -->
-					<info>
-						<desc>Indicates whether to show the outline of all moved objects when moving more then one object at the same time.</desc>
-						<label>Contour of each individual object</label>
-					</info>
-					<value>true</value>
-				</prop>
-			</group>
-			<group oor:name="Other">
-				<info>
-					<desc>Specifies other layout options that do not fit into any other group.</desc>
-					<label>Other Layout Options</label>
-				</info>
-				<group oor:name="TabStop">
-					<!-- OldPath: Impress/Layout -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation - Layout - [Section] Tab stops -->
-					<!-- Notice: Default-Nonmetric Value: 1270 1/100 mm-->
-					<info>
-						<desc>Specifies the distance between adjacent tab stops with regard to whether the metric or the non-metric system is currently selected.</desc>
-						<label>Tab stops</label>
-					</info>
-					<prop oor:name="Metric" oor:type="xs:int">
-						<info>
-							<desc>Specifies the distance between adjacent tab stops in 1/100 mm when the metric system is selected.</desc>
-							<label/>
-						</info>
-						<value>1250</value>
-					</prop>
-					<prop oor:name="NonMetric" oor:type="xs:int">
-						<info>
-							<desc>Specifies the distance between adjacent tab stops in 1/100 mm when the non-metric system is selected.</desc>
-							<label/>
-						</info>
-						<value>1270</value>
-					</prop>
-				</group>
-				<group oor:name="MeasureUnit">
-					<!-- OldPath: Impress/Layout -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation- Layout - [Section] Meas. units -->
-					<info>
-						<desc>Specifies the measurement unit to be used with respect to whether the metric or the non-metric system is selected.</desc>
-						<label>Measurement unit</label>
-					</info>
-					<prop oor:name="Metric" oor:type="xs:int">
-						<info>
-							<desc>Specifies the measurement unit to be used when the metric system is selected.</desc>
-							<label>Measurement unit</label>
-						</info>
-						<constraints>
-							<enumeration oor:value="1">
-								<info>
-									<desc>Millimeter</desc>
-								</info>
-							</enumeration>
-							<enumeration oor:value="2">
-								<info>
-									<desc>Centimeter</desc>
-								</info>
-							</enumeration>
-							<enumeration oor:value="6">
-								<info>
-									<desc>Point</desc>
-								</info>
-							</enumeration>
-							<enumeration oor:value="7">
-								<info>
-									<desc>Pica</desc>
-								</info>
-							</enumeration>
-							<enumeration oor:value="8">
-								<info>
-									<desc>Inch</desc>
-								</info>
-							</enumeration>
-						</constraints>
-						<value>2</value>
-					</prop>
-					<prop oor:name="NonMetric" oor:type="xs:int">
-						<info>
-							<desc>Specifies the measurement unit to be used when the non-metric system is selected.</desc>
-							<label>Measurement unit</label>
-						</info>
-						<constraints>
-							<enumeration oor:value="1">
-								<info>
-									<desc>Millimeter</desc>
-								</info>
-							</enumeration>
-							<enumeration oor:value="2">
-								<info>
-									<desc>Centimeter</desc>
-								</info>
-							</enumeration>
-							<enumeration oor:value="6">
-								<info>
-									<desc>Point</desc>
-								</info>
-							</enumeration>
-							<enumeration oor:value="7">
-								<info>
-									<desc>Pica</desc>
-								</info>
-							</enumeration>
-							<enumeration oor:value="8">
-								<info>
-									<desc>Inch</desc>
-								</info>
-							</enumeration>
-						</constraints>
-						<value>8</value>
-					</prop>
-				</group>
-			</group>
-		</group>
-		<group oor:name="Content">
-			<info>
-				<desc>Contains content related configuration items.</desc>
-			</info>
-			<group oor:name="Display">
-				<info>
-					<desc>Contains configuration items related to the display of Impress documents.</desc>
-				</info>
-				<prop oor:name="PicturePlaceholder" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Contents/Display -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation - Contents - [Section] Alternative display -->
-					<info>
-						<desc>Indicates whether to show only the bounding box of graphic-objects like bitmaps and drawings.</desc>
-						<label>Picture placeholders</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="ContourMode" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Contents/Display -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation - Contents - [Section] Alternative display -->
-					<info>
-						<desc>Indicates whether to show only outlines of objects such as filled rectangles and filled ellipses.</desc>
-						<label>Contour mode</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="TextPlaceholder" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Contents/Display -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation - Contents - [Section] Alternative display -->
-					<info>
-						<desc>Indicates whether to show only a placeholder for text in graphical objects.</desc>
-						<label>Text placeholders</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="LineContour" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Contents/Display -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation - Contents - [Section] Alternative display -->
-					<info>
-						<desc>Indicates whether to show only hairlines instead of the true line styles.</desc>
-						<label>Line contour only</label>
-					</info>
-					<value>false</value>
-				</prop>
-			</group>
-		</group>
-		<group oor:name="Misc">
-			<info>
-				<desc>Contains a collection of configuration items for the Impress application that do not fit into another category.</desc>
-			</info>
-			<prop oor:name="BackgroundCache" oor:type="xs:boolean">
-				<!-- OldPath: Impress/Other -->
-				<!-- OldLocation: Soffice.cfg -->
-				<!-- UIHints: Tools - Options - Presentation  Other  [Section] Other -->
-				<info>
-					<desc>Indicates whether to store master pages in a cache to speed up drawing.</desc>
-					<label>Use background cache</label>
-				</info>
-				<value>true</value>
-			</prop>
-			<prop oor:name="CopyWhileMoving" oor:type="xs:boolean">
-				<!-- OldPath: Impress/Other -->
-				<!-- OldLocation: Soffice.cfg -->
-				<!-- UIHints: Tools - Options - Presentation  Other  [Section] Other -->
-				<info>
-					<desc>Indicates whether moving while holding the Control key makes a copy of the moved object.</desc>
-					<label>Copy while moving</label>
-				</info>
-				<value>false</value>
-			</prop>
-			<prop oor:name="ObjectMoveable" oor:type="xs:boolean">
-				<!-- OldPath: Impress/Other -->
-				<!-- OldLocation: Soffice.cfg -->
-				<!-- UIHints: Tools - Options - Presentation  Other  [Section] Other -->
-				<info>
-					<desc>Indicates whether objects can still be moved while in rotating mode.</desc>
-					<label>Objects always moveable</label>
-				</info>
-				<value>true</value>
-			</prop>
-			<prop oor:name="NoDistort" oor:type="xs:boolean">
-				<!-- OldPath: Impress/Other -->
-				<!-- OldLocation: Soffice.cfg -->
-				<!-- UIHints: Tools - Options - Presentation  Other  [Section] Other -->
-				<info>
-					<desc>Indicates whether objects that are placed on a circle keep their original form, i.e. may be moved and rotated but not resized or otherwise distorted.</desc>
-					<label>Don&apos;t distort objects in curve</label>
-				</info>
-				<value>false</value>
-			</prop>
-			<prop oor:name="DclickTextedit" oor:type="xs:boolean">
-				<!-- OldPath: Impress/Other -->
-				<!-- OldLocation: soffice.cfg -->
-				<!-- UIHints: Option Bar -->
-				<info>
-					<desc>Indicates whether a double-click on a text object activates the edit mode.</desc>
-					<label>Double-Click Text to Edit</label>
-				</info>
-				<value>true</value>
-			</prop>
-			<prop oor:name="RotateClick" oor:type="xs:boolean">
-				<!-- OldPath: Impress/Other -->
-				<!-- OldLocation: soffice.cfg -->
-				<!-- UIHints: Option Bar -->
-				<info>
-					<desc>Indicates whether a double-click on an object activates the rotation mode.</desc>
-					<label>Rotation Mode after clicking object</label>
-				</info>
-				<value>false</value>
-			</prop>
-			<prop oor:name="Preview" oor:type="xs:double">
-				<!-- OldPath: Impress/Other -->
-				<!-- OldLocation: soffice.cfg -->
-				<!-- UIHints: Menu: view - preview mode -->
-				<info>
-					<desc>Specifies the color quality of the preview: 0 - Color, 868 - Grayscale, 5381 - Black/White.</desc>
-					<label>Preview-Mode</label>
-				</info>
-				<constraints>
-					<enumeration oor:value="0">
-						<info>
-							<desc>Color</desc>
-						</info>
-					</enumeration>
-					<enumeration oor:value="868">
-						<info>
-							<desc>Grayscale</desc>
-						</info>
-					</enumeration>
-					<enumeration oor:value="5381">
-						<info>
-							<desc>Black/White</desc>
-						</info>
-					</enumeration>
-				</constraints>
-				<value>0</value>
-			</prop>
+              </enumeration>
+              <enumeration oor:value="7">
+                <info>
+                  <desc>Pica</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="8">
+                <info>
+                  <desc>Inch</desc>
+                </info>
+              </enumeration>
+            </constraints>
+            <value>8</value>
+          </prop>
+        </group>
+      </group>
+    </group>
+    <group oor:name="Content">
+      <info>
+        <desc>Contains content related configuration items.</desc>
+      </info>
+      <group oor:name="Display">
+        <info>
+          <desc>Contains configuration items related to the display of Impress documents.</desc>
+        </info>
+        <prop oor:name="PicturePlaceholder" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Contents/Display -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation - Contents - [Section] Alternative display -->
+          <info>
+            <desc>Indicates whether to show only the bounding box of graphic-objects like bitmaps and drawings.</desc>
+            <label>Picture placeholders</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="ContourMode" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Contents/Display -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation - Contents - [Section] Alternative display -->
+          <info>
+            <desc>Indicates whether to show only outlines of objects such as filled rectangles and filled ellipses.</desc>
+            <label>Contour mode</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="TextPlaceholder" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Contents/Display -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation - Contents - [Section] Alternative display -->
+          <info>
+            <desc>Indicates whether to show only a placeholder for text in graphical objects.</desc>
+            <label>Text placeholders</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="LineContour" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Contents/Display -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation - Contents - [Section] Alternative display -->
+          <info>
+            <desc>Indicates whether to show only hairlines instead of the true line styles.</desc>
+            <label>Line contour only</label>
+          </info>
+          <value>false</value>
+        </prop>
+      </group>
+    </group>
+    <group oor:name="Misc">
+      <info>
+        <desc>Contains a collection of configuration items for the Impress application that do not fit into another category.</desc>
+      </info>
+      <prop oor:name="BackgroundCache" oor:type="xs:boolean">
+        <!-- OldPath: Impress/Other -->
+        <!-- OldLocation: Soffice.cfg -->
+        <!-- UIHints: Tools - Options - Presentation  Other  [Section] Other -->
+        <info>
+          <desc>Indicates whether to store master pages in a cache to speed up drawing.</desc>
+          <label>Use background cache</label>
+        </info>
+        <value>true</value>
+      </prop>
+      <prop oor:name="CopyWhileMoving" oor:type="xs:boolean">
+        <!-- OldPath: Impress/Other -->
+        <!-- OldLocation: Soffice.cfg -->
+        <!-- UIHints: Tools - Options - Presentation  Other  [Section] Other -->
+        <info>
+          <desc>Indicates whether moving while holding the Control key makes a copy of the moved object.</desc>
+          <label>Copy while moving</label>
+        </info>
+        <value>false</value>
+      </prop>
+      <prop oor:name="ObjectMoveable" oor:type="xs:boolean">
+        <!-- OldPath: Impress/Other -->
+        <!-- OldLocation: Soffice.cfg -->
+        <!-- UIHints: Tools - Options - Presentation  Other  [Section] Other -->
+        <info>
+          <desc>Indicates whether objects can still be moved while in rotating mode.</desc>
+          <label>Objects always moveable</label>
+        </info>
+        <value>true</value>
+      </prop>
+      <prop oor:name="NoDistort" oor:type="xs:boolean">
+        <!-- OldPath: Impress/Other -->
+        <!-- OldLocation: Soffice.cfg -->
+        <!-- UIHints: Tools - Options - Presentation  Other  [Section] Other -->
+        <info>
+          <desc>Indicates whether objects that are placed on a circle keep their original form, i.e. may be moved and rotated but not resized or otherwise distorted.</desc>
+          <label>Don&apos;t distort objects in curve</label>
+        </info>
+        <value>false</value>
+      </prop>
+      <prop oor:name="DclickTextedit" oor:type="xs:boolean">
+        <!-- OldPath: Impress/Other -->
+        <!-- OldLocation: soffice.cfg -->
+        <!-- UIHints: Option Bar -->
+        <info>
+          <desc>Indicates whether a double-click on a text object activates the edit mode.</desc>
+          <label>Double-Click Text to Edit</label>
+        </info>
+        <value>true</value>
+      </prop>
+      <prop oor:name="RotateClick" oor:type="xs:boolean">
+        <!-- OldPath: Impress/Other -->
+        <!-- OldLocation: soffice.cfg -->
+        <!-- UIHints: Option Bar -->
+        <info>
+          <desc>Indicates whether a double-click on an object activates the rotation mode.</desc>
+          <label>Rotation Mode after clicking object</label>
+        </info>
+        <value>false</value>
+      </prop>
+      <prop oor:name="Preview" oor:type="xs:double">
+        <!-- OldPath: Impress/Other -->
+        <!-- OldLocation: soffice.cfg -->
+        <!-- UIHints: Menu: view - preview mode -->
+        <info>
+          <desc>Specifies the color quality of the preview: 0 - Color, 868 - Grayscale, 5381 - Black/White.</desc>
+          <label>Preview-Mode</label>
+        </info>
+        <constraints>
+          <enumeration oor:value="0">
+            <info>
+              <desc>Color</desc>
+            </info>
+          </enumeration>
+          <enumeration oor:value="868">
+            <info>
+              <desc>Grayscale</desc>
+            </info>
+          </enumeration>
+          <enumeration oor:value="5381">
+            <info>
+              <desc>Black/White</desc>
+            </info>
+          </enumeration>
+        </constraints>
+        <value>0</value>
+      </prop>
       <prop oor:name="ShowComments" oor:type="xs:boolean">
         <info>
           <author>CL</author>
@@ -404,774 +409,778 @@
         <value>true</value>
       </prop>
       <prop oor:name="SimpleHandles" oor:type="xs:boolean">
-				<!-- OldPath: Impress/Other -->
-				<!-- OldLocation: soffice.cfg -->
-				<!-- UIHints: Optionbar -->
-				<info>
-					<desc>Indicates whether to show simple (true) or 3D-handles (false).</desc>
-					<label>Simple Handles</label>
-				</info>
-				<value>false</value>
-			</prop>
-			<prop oor:name="BigHandles" oor:type="xs:boolean">
-				<!-- OldPath: Impress/Other -->
-				<!-- OldLocation: soffice.cfg -->
-				<!-- UIHints: Optionbar -->
-				<info>
-					<desc>Indicates whether to show big (true) or small (false) handles.</desc>
-					<label>Big Handles</label>
-				</info>
-				<value>false</value>
-			</prop>
-			<prop oor:name="ModifyWithAttributes" oor:type="xs:boolean">
-				<!-- OldPath: Impress/Other -->
-				<!-- OldLocation: soffice.cfg -->
-				<!-- UIHints: Optionbar -->
-				<info>
+        <!-- OldPath: Impress/Other -->
+        <!-- OldLocation: soffice.cfg -->
+        <!-- UIHints: Optionbar -->
+        <info>
+          <desc>Indicates whether to show simple (true) or 3D-handles (false).</desc>
+          <label>Simple Handles</label>
+        </info>
+        <value>false</value>
+      </prop>
+      <prop oor:name="BigHandles" oor:type="xs:boolean">
+        <!-- OldPath: Impress/Other -->
+        <!-- OldLocation: soffice.cfg -->
+        <!-- UIHints: Optionbar -->
+        <info>
+          <desc>Indicates whether to show big (true) or small (false) handles.</desc>
+          <label>Big Handles</label>
+        </info>
+        <value>false</value>
+      </prop>
+      <prop oor:name="ModifyWithAttributes" oor:type="xs:boolean">
+        <!-- OldPath: Impress/Other -->
+        <!-- OldLocation: soffice.cfg -->
+        <!-- UIHints: Optionbar -->
+        <info>
           <author>AF</author>
           <desc>Indicates whether the object creation and modification will be visualized using the full object attribute set or wireframe.</desc>
           <label>Modify with attributes</label>
-				</info>
-				<value>true</value>
-			</prop>
-			<prop oor:name="ShowUndoDeleteWarning" oor:type="xs:boolean">
-				<!-- OldPath: -->
-				<!-- OldLocation: -->
-				<!-- UIHints: UNDO stack delete warnng dialog -->
-				<info>
-					<author>AW</author>
-					<desc>Indicates whether the warning dialog appears when setting a new standard page layout.</desc>
-					<label>Show Undo-Stack Delete Warning</label>
-				</info>
-				<value>true</value>
-			</prop>
-			<prop oor:name="SlideshowRespectZOrder" oor:type="xs:boolean">
-				<!-- OldPath: -->
-				<!-- OldLocation: -->
-				<!-- UIHints: Slideshow Z order for animations -->
-				<info>
-					<author>THB</author>
-					<desc>Indicates whether the slideshow should respect shape z-order while animating shapes. Disabling this can improve slideshow performance</desc>
-					<label>Enable shape z-order during slideshow animations</label>
-				</info>
-				<value>true</value>
-			</prop>
-			<prop oor:name="TransitionFiles" oor:type="oor:string-list">
-				<!-- OldPath: -->
-				<!-- OldLocation: -->
-				<!-- UIHints: List of files containing transition effects -->
-				<info>
-					<author>THB</author>
-					<desc>Contains a list of odf files, that define
-					slideshow transitions. Values are put through
-					macro expansion, so, vnd.sun.star.expand prefix
-					is allowed. </desc>
-					<label>List of files containing transition effects</label>
-				</info>
-                <value oor:separator=";">vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml</value>
-			</prop>
-			<prop oor:name="EffectFiles" oor:type="oor:string-list">
-				<!-- OldPath: -->
-				<!-- OldLocation: -->
-				<!-- UIHints: List of files containing object effects -->
-				<info>
-					<author>THB</author>
-					<desc>Contains a list of odf files, that define
-					slideshow shape effects. Values are put through
-					macro expansion, so, vnd.sun.star.expand prefix
-					is allowed.</desc>
-					<label>List of files containing object effects</label>
-				</info>
-                <value oor:separator=";">vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/effects.xml</value>
-			</prop>
-			<prop oor:name="PreviewNewEffects" oor:type="xs:boolean">
-				<!-- OldPath: -->
-				<!-- OldLocation: -->
-				<!-- UIHints: automatic preview checkbox in create new effect dialog -->
-				<info>
-					<author>CL</author>
-					<desc>Indicates whether a selected effect in the custom animation create dialog should be previewed.</desc>
-					<label>Automatic preview for new custom animation</label>
-				</info>
-				<value>true</value>
-			</prop>
-			<prop oor:name="PreviewChangedEffects" oor:type="xs:boolean">
-				<!-- OldPath: -->
-				<!-- OldLocation: -->
-				<!-- UIHints: automatic preview in custom animation panel -->
-				<info>
-					<author>CL</author>
-					<desc>Indicates whether changes in the custom animation panel should be previewed.</desc>
-					<label>Automatic preview for custom animation panel</label>
-				</info>
-				<value>true</value>
-			</prop>
-			<prop oor:name="PreviewTransitions" oor:type="xs:boolean">
-				<!-- OldPath: -->
-				<!-- OldLocation: -->
-				<!-- UIHints: automatic preview in slide transtion panel -->
-				<info>
-					<author>CL</author>
-					<desc>Indicates whether changes in the slide transition panel should be previewed.</desc>
-					<label>Automatic preview for slide transition panel</label>
-				</info>
-				<value>true</value>
-			</prop>
-			<prop oor:name="Display" oor:type="xs:int">
-				<!-- OldPath: -->
-				<!-- OldLocation: -->
-				<!-- UIHints: slide show settings display listbox -->
-				<info>
-					<author>CL</author>
-					<desc>Number of the display used for full screen slide show mode.</desc>
-					<label>Display for full screen slide show mode</label>
-				</info>
-				<value>0</value>
-			</prop>
-			<group oor:name="TextObject">
-				<info>
-					<desc>Contains text editing related configuration items.</desc>
-				</info>
-				<prop oor:name="QuickEditing" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Other/Text_Objects -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Other  [Section] Text objects -->
-					<info>
-						<desc>Indicates whether a simple click on a text object changes it to edit mode.</desc>
-						<label>Allow quick editing</label>
-					</info>
-					<value>true</value>
-				</prop>
-				<prop oor:name="Selectable" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Other/Text_Objects -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Other  [Section] Text objects -->
-					<info>
-						<desc>Indicates whether a text frame can only be selected by clicking on the text or by clicking somewhere in the frame.</desc>
-						<label>Only text area selectable</label>
-					</info>
-					<value>true</value>
-				</prop>
-			</group>
-			<group oor:name="NewDoc">
-				<info>
-					<desc>Specifies configuration items governing the behavior when creating a new document or a new page.</desc>
-					<label>Start with AutoPilots</label>
-				</info>
-				<prop oor:name="AutoPilot" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Other/New_Doc -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Other  [Section] New document -->
-					<info>
-						<desc>Indicates whether to show the autopilot when creating a new presentation.</desc>
-						<label>Start with AutoPilots</label>
-					</info>
-					<value>true</value>
-				</prop>
-				<prop oor:name="Layout" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Other/New_Doc -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Other  [Section] New document -->
-					<info>
-						<desc>Indicates whether to show the layout dialog when creating a new page.</desc>
-						<label>Start with AutoPilots</label>
-					</info>
-					<value>true</value>
-				</prop>
-			</group>
-			<group oor:name="Start">
-				<info>
-					<desc>Specifies configuration items governing behavior when starting a presentation.</desc>
-				</info>
-				<prop oor:name="CurrentPage" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Other/Start -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Other  [Section] Start presentation -->
-					<info>
-						<desc>Indicates whether to start the presentation with the current (true) or the first (false) page.</desc>
-						<label>Always with current page</label>
-					</info>
-					<value>true</value>
-				</prop>
-			</group>
-			<group oor:name="Compatibility">
-				<info>
-					<desc>Contains the group of options that control the compatibility to other applications.</desc>
-					<label>Compatibility options.</label>
-				</info>
-				<prop oor:name="AddBetween" oor:type="xs:boolean">
-					<!-- OldPath: Writer/Other/Compatibility -->
-					<!-- UIHints: Tools - Options - Presentation - Other - [Section] Compatibility -->
-					<info>
-						<author>SJ</author>
-						<desc>Specifies if spacing between paragraphs should be added to ensure compatibility to MS Word documents</desc>
-						<label>Add spacing between paragraphs</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="PrinterIndependentLayout" oor:type="xs:short">
-					<!-- UIHints: Tools - Options - Presentation - Other - [Section] Compatibility -->
-					<info>
-						<author>AF</author>
-						<desc>Indicates whether to use printer independent metrics for document formatting (2) or to use metrics derived from the current printer (1). Refer to com::sun::star::document::PrinterIndependentLayout for valid values.</desc>
-						<label>Use printer independent metrics for document formatting</label>
-					</info>
-					<value>2</value>
-				</prop>
-			</group>
-			<group oor:name="DefaultObjectSize">
-				<!-- OldPath: -->
-				<!-- OldLocation: -->
-				<!-- UIHints: Default size for newly created objects when using CTRL-Return or CTRL-Klick -->
-				<info>
-					<author>AW</author>
-					<desc>Defines the default size of newly created objects using CTRL-Return or CTRL-Click at a object creating Button.</desc>
-					<label>Default Object Size</label>
-				</info>
-				<prop oor:name="Width" oor:type="xs:int">
-					<info>
-						<desc>[UNIT=1/100 mm]</desc>
-						<label/>
-					</info>
-					<value>8000</value>
-				</prop>
-				<prop oor:name="Height" oor:type="xs:int">
-					<info>
-						<desc>[UNIT=1/100 mm]</desc>
-						<label/>
-					</info>
-					<value>5000</value>
-				</prop>
-			</group>
-		</group>
-		<group oor:name="Snap">
-			<info>
-				<desc>Specifies how to force object positions and sizes to the snap grid or to align with other objects.</desc>
-			</info>
-			<group oor:name="Object">
-				<info>
-					<desc>Specifies how to force object positions and sizes to predefined locations in relation to other objects.</desc>
-				</info>
-				<prop oor:name="Grid" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Snap/Objects -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap to -->
-					<info>
-						<desc>Indicates whether to snap an object when moved to the next grid point.</desc>
-						<label>Grid lines</label>
-					</info>
-					<value>true</value>
-				</prop>
-				<prop oor:name="SnapLine" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Snap/Objects -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap to -->
-					<info>
-						<desc>Indicates whether to snap at snap lines.</desc>
-						<label>Snap lines</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="PageMargin" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Snap/Objects -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap to -->
-					<info>
-						<desc>Indicates whether the outline of an object is justified with adjacent page margins.</desc>
-						<label>Page margins</label>
-					</info>
-					<value>true</value>
-				</prop>
-				<prop oor:name="ObjectFrame" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Snap/Objects -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap to -->
-					<info>
-						<desc>Indicates whether to justify the outline of an object to that of an adjacent object.</desc>
-						<label>Object frame</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="ObjectPoint" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Snap/Objects -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap to -->
-					<info>
-						<desc>Indicates whether to snap corner points of adjacent objects.</desc>
-						<label>Object points</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="Range" oor:type="xs:int">
-					<!-- OldPath: Impress/Snap/Objects -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap to -->
-					<info>
-						<desc>Specifies the maximal range in pixels along the coordinate axes at which snapping becomes active.</desc>
-						<label>Snap range</label>
-					</info>
-					<constraints>
-						<minInclusive oor:value="1">
-							<info>
-								<desc>Specifies that the minimum snap range is 1.</desc>
-							</info>
-						</minInclusive>
-						<maxInclusive oor:value="50">
-							<info>
-								<desc>Specifies that the maximal snap range is 50.</desc>
-							</info>
-						</maxInclusive>
-					</constraints>
-					<value>5</value>
-				</prop>
-			</group>
-			<group oor:name="Position">
-				<info>
-					<desc>Specifies constraints regarding the creation and modification of graphical objects.</desc>
-				</info>
-				<prop oor:name="CreatingMoving" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Snap/Position -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap position -->
-					<info>
-						<desc>Indicates whether to restrict the creation of objects to squares, circles, etc. and to retain the x/y ratio when resizing.</desc>
-						<label>When creating or moving objects</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="ExtendEdges" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Snap/Position -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap position -->
-					<info>
-						<desc>Indicates whether to use the longer (true) or the shorter (false) of the two distances along the coordinates axes from the initial to the current position to determine a new square&apos;s edge length or a new circle&apos;s diameter.</desc>
-						<label>Extend edges</label>
-					</info>
-					<value>true</value>
-				</prop>
-				<prop oor:name="Rotating" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Snap/Position -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap position -->
-					<info>
-						<desc>Indicates whether to use snapping while rotating an object.</desc>
-						<label>When rotating</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="RotatingValue" oor:type="xs:int">
-					<!-- OldPath: Impress/Snap/Position -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap position -->
-					<info>
-						<desc>Specifies the rotation angle when snapping for rotation is enabled. [UNIT=Degree/100]</desc>
-						<label>When rotating</label>
-					</info>
-					<constraints>
-						<minInclusive oor:value="0">
-							<info>
-								<desc>Specifies that the minimum rotation angle is 0/100 degrees.</desc>
-							</info>
-						</minInclusive>
-						<maxInclusive oor:value="18000">
-							<info>
-								<desc>Specifies that the maximum rotation angle is 18000/100 degrees.</desc>
-							</info>
-						</maxInclusive>
-					</constraints>
-					<value>1500</value>
-				</prop>
-				<prop oor:name="PointReduction" oor:type="xs:int">
-					<!-- OldPath: Impress/Snap/Position -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap position -->
-					<info>
-						<desc>Specifies the maximum angle that you can move a line before it snaps into place in the point editor that connects two points [UNIT=Degree/100].</desc>
-						<label>Point reduction</label>
-					</info>
-					<constraints>
-						<minInclusive oor:value="100">
-							<info>
-								<desc>Specifies that the minimum angle is 100/100 degrees.</desc>
-							</info>
-						</minInclusive>
-						<maxInclusive oor:value="9000">
-							<info>
-								<desc>Specifies that the maximum angle is 9000/100 degrees.</desc>
-							</info>
-						</maxInclusive>
-					</constraints>
-					<value>1500</value>
-				</prop>
-			</group>
-		</group>
-		<group oor:name="Grid">
-			<info>
-				<desc>Defines the handling and display of the snap grid.</desc>
-			</info>
-			<group oor:name="Option">
-				<info>
-					<desc>Specifies switches regarding use and display of the snap grid.</desc>
-				</info>
-				<prop oor:name="SnapToGrid" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Grid/Options -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation Grid - [Section] Options -->
-					<info>
-						<desc>Indicates whether to force frames and drawing elements on grid points.</desc>
-						<label>Snap to grid</label>
-					</info>
-					<value>true</value>
-				</prop>
-				<prop oor:name="VisibleGrid" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Grid/Options -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation Grid - [Section] Options -->
-					<info>
-						<desc>Indicates whether to show the grid.</desc>
-						<label>Visible grid</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="Synchronize" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Grid/Options -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation Grid - [Section] Options -->
-					<info>
-						<desc>Indicates whether to synchronize the resolutions of x- and y-grids.</desc>
-						<label>Synchronize axes</label>
-					</info>
-					<value>false</value>
-				</prop>
-			</group>
-			<group oor:name="Resolution">
-				<info>
-					<desc>Specifies grid resolution.</desc>
-				</info>
-				<group oor:name="XAxis">
-					<!-- OldPath: Impress/Grid/Resolution -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Grid - [Section] Grid -->
-					<!-- Notice: Default-nonmetrical value: 1270 1/100 mm. -->
-					<info>
-						<desc>Defines the horizontal distance between adjacent grid points.</desc>
-						<label>X Axis Resolution</label>
-					</info>
-					<prop oor:name="Metric" oor:type="xs:int">
-						<info>
-							<desc>Defines the horizontal distance between adjacent grid points in 1/100 mm, used when the metric system is active.</desc>
-							<label/>
-						</info>
-						<value>1000</value>
-					</prop>
-					<prop oor:name="NonMetric" oor:type="xs:int">
-						<info>
-							<desc>Defines the horizontal distance between adjacent grid points in 1/100 mm, used when the non-metric system is active.</desc>
-							<label/>
-						</info>
-						<value>1270</value>
-					</prop>
-				</group>
-				<group oor:name="YAxis">
-					<!-- OldPath: Impress/Grid/Resolution -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Grid - [Section] Grid -->
-					<!-- Notice: Default- nonmerical value: 1270 1/100 mm. -->
-					<info>
-						<desc>Defines the vertical distance between adjacent grid points.</desc>
-						<label>Y Axis Resolution</label>
-					</info>
-					<prop oor:name="Metric" oor:type="xs:int">
-						<info>
-							<desc>Defines the vertical distance between adjacent grid points in 1/100 mm, used when the metric system is active.</desc>
-							<label/>
-						</info>
-						<value>1000</value>
-					</prop>
-					<prop oor:name="NonMetric" oor:type="xs:int">
-						<info>
-							<desc>Defines the vertical distance between adjacent grid points in 1/100 mm, used when the non-metric system is active.</desc>
-							<label/>
-						</info>
-						<value>1270</value>
-					</prop>
-				</group>
-			</group>
-			<group oor:name="Subdivision">
-				<info>
-					<desc>Specifies the subdivision of the grid.</desc>
-				</info>
-				<prop oor:name="XAxis" oor:type="xs:double">
-					<!-- OldPath: Impress/Grid/Subdivision -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Grid - [Section] Grid -->
-					<!-- Notice: Default value for English Version only: 254 Points) -->
-					<info>
-						<desc>Specifies the number of points between two adjacent grid points on the X axis.</desc>
-						<label>X Axis Subdivision</label>
-					</info>
-					<value>1</value>
-				</prop>
-				<prop oor:name="YAxis" oor:type="xs:double">
-					<!-- OldPath: Impress/Grid/Subdivision -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Grid - [Section] Grid -->
-					<!-- Notice: Default value for English Version only: 254 Points) -->
-					<info>
-						<desc>Specifies the number of intervals between two adjacent grid points on the Y axis</desc>
-						<label>Y Axis Subdivision</label>
-					</info>
-					<value>1</value>
-				</prop>
-			</group>
-			<group oor:name="SnapGrid">
-				<info>
-					<desc>Contains the specifications of the snap grid.</desc>
-				</info>
-				<prop oor:name="Size" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Grid/Snap_Grid -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Grid - [Section] Snap grid -->
-					<info>
-						<desc>Indicates whether to synchronize grid and snap-grid.</desc>
-						<label>Size to grid</label>
-					</info>
-					<value>true</value>
-				</prop>
-				<group oor:name="XAxis">
-					<!-- OldPath: Impress/Grid/Snap_Grid -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Grid - [Section] Snap grid -->
-					<!-- Notice: Default-nonmetrical value: 1270 1/100 mm. -->
-					<info>
-						<desc>Defines the horizontal distance between adjacent points of the snap grid.</desc>
-						<label>X axis</label>
-					</info>
-					<prop oor:name="Metric" oor:type="xs:int">
-						<info>
-							<desc>Defines the horizontal distance between adjacent points of the snap grid in 1/100 mm, used when the metric system is selected.</desc>
-							<label/>
-						</info>
-						<value>1000</value>
-					</prop>
-					<prop oor:name="NonMetric" oor:type="xs:int">
-						<info>
-							<desc>Defines the horizontal distance between adjacent points of the snap grid in 1/100 mm, used when the non-metric system is selected.</desc>
-							<label/>
-						</info>
-						<value>1270</value>
-					</prop>
-				</group>
-				<group oor:name="YAxis">
-					<!-- OldPath: Impress/Grid/Snap_Grid -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Grid - [Section] Snap grid -->
-					<!-- Notice: Default-Default-nonmetrical value: 1270 1/100 mm. -->
-					<info>
-						<desc>Defines the vertical distance between adjacent points of the snap grid.</desc>
-						<label>Y axis</label>
-					</info>
-					<prop oor:name="Metric" oor:type="xs:int">
-						<info>
-							<desc>Defines the vertical distance between adjacent points of the snap grid in 1/100 mm, used when the metric system is selected.</desc>
-							<label/>
-						</info>
-						<value>1000</value>
-					</prop>
-					<prop oor:name="NonMetric" oor:type="xs:int">
-						<info>
-							<desc>Defines the vertical distance between adjacent points of the snap grid in 1/100 mm, used when the non-metric system is selected.</desc>
-							<label/>
-						</info>
-						<value>1270</value>
-					</prop>
-				</group>
-			</group>
-		</group>
-		<group oor:name="Print">
-			<info>
-				<desc>Defines options regarding the printing of Impress documents.</desc>
-			</info>
-			<group oor:name="Content">
-				<info>
-					<desc>Defines options regarding the printing of document content.</desc>
-				</info>
-				<prop oor:name="Presentation" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Print/Contents -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Print - [Section] Contents -->
-					<info>
-						<desc>Indicates whether the presentation will be printed.</desc>
-						<label>Presentation</label>
-					</info>
-					<value>true</value>
-				</prop>
-				<prop oor:name="Note" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Print/Contents -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Print - [Section] Contents -->
-					<info>
-						<desc>Indicates whether the notes will be printed.</desc>
-						<label>Notes</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="Handout" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Print/Contents -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Print - [Section] Contents -->
-					<info>
-						<desc>Indicates whether the handouts will be printed.</desc>
-						<label>Handouts</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="Outline" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Print/Contents -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Print - [Section] Contents -->
-					<info>
-						<desc>Indicates whether the outlines will be printed.</desc>
-						<label>Outline</label>
-					</info>
-					<value>false</value>
-				</prop>
-			</group>
-			<group oor:name="Page">
-				<info>
-					<desc>Specifies how and which pages will be printed.</desc>
-				</info>
-				<prop oor:name="PageSize" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Print/Page -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Print - [Section] Page options -->
-					<info>
-						<desc>Indicates whether to enlarge or shrink a document&apos;s page size while printing to fit the physical paper size.</desc>
-						<label>Fit to page</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="PageTile" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Print/Page -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Print - [Section] Page options -->
-					<info>
-						<desc>Indicates whether to print the pages&apos; titles at the top of every page.</desc>
-						<label>Tile pages</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="Booklet" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Print/Page -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Print - [Section] Page options -->
-					<info>
-						<desc>Indicates whether to print a document in the form of a brochure.</desc>
-						<label>Brochure</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="BookletFront" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Print/Page -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Print - [Section] Page options -->
-					<info>
-						<desc>Indicates whether to print the front side pages of a brochure.</desc>
-						<label>Front side</label>
-					</info>
-					<value>true</value>
-				</prop>
-				<prop oor:name="BookletBack" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Print/Page -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Print - [Section] Page options -->
-					<info>
-						<desc>Indicates whether to print the back side pages of a brochure.</desc>
-						<label>Back side</label>
-					</info>
-					<value>true</value>
-				</prop>
-			</group>
-			<group oor:name="Other">
-				<info>
-					<desc>Specifies general printing related issues.</desc>
-				</info>
-				<prop oor:name="PageName" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Print -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Print - [Section] Print -->
-					<info>
-						<desc>Indicates whether to print page names.</desc>
-						<label>Page name</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="Date" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Print -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Print - [Section] Print -->
-					<info>
-						<desc>Indicates whether to print the current date at the top of every page.</desc>
-						<label>Date</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="Time" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Print -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Print - [Section] Print -->
-					<info>
-						<desc>Indicates whether to print the current time at the top of every page.</desc>
-						<label>Time</label>
-					</info>
-					<value>false</value>
-				</prop>
-				<prop oor:name="HiddenPage" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Print -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Print - [Section] Print -->
-					<info>
-						<desc>Indicates whether to print hidden pages.</desc>
-						<label>Hidden pages</label>
-					</info>
-					<value>true</value>
-				</prop>
-				<prop oor:name="Quality" oor:type="xs:int">
-					<!-- OldPath: Impress/Print -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Print - [Section] Quality -->
-					<info>
-						<desc>Specifies the quality of the printed colors.</desc>
-					</info>
-					<constraints>
-						<enumeration oor:value="0">
-							<info>
-								<desc>Color</desc>
-							</info>
-						</enumeration>
-						<enumeration oor:value="1">
-							<info>
-								<desc>Grayscale</desc>
-							</info>
-						</enumeration>
-						<enumeration oor:value="2">
-							<info>
-								<desc>Black/White</desc>
-							</info>
-						</enumeration>
-					</constraints>
-					<value>0</value>
-				</prop>
-				<prop oor:name="FromPrinterSetup" oor:type="xs:boolean">
-					<!-- OldPath: Impress/Print -->
-					<!-- OldLocation: Soffice.cfg -->
-					<!-- UIHints: Tools - Options - Presentation  Print  [Check box] From printer setup -->
-					<info>
-						<desc>Indicates whether to use the system settings of the printer to choose the paper tray.</desc>
-						<label>From printer setup</label>
-					</info>
-					<value>false</value>
-				</prop>
+        </info>
+        <value>true</value>
+      </prop>
+      <prop oor:name="ShowUndoDeleteWarning" oor:type="xs:boolean">
+        <!-- OldPath: -->
+        <!-- OldLocation: -->
+        <!-- UIHints: UNDO stack delete warnng dialog -->
+        <info>
+          <author>AW</author>
+          <desc>Indicates whether the warning dialog appears when setting a new standard page layout.</desc>
+          <label>Show Undo-Stack Delete Warning</label>
+        </info>
+        <value>true</value>
+      </prop>
+      <prop oor:name="SlideshowRespectZOrder" oor:type="xs:boolean">
+        <!-- OldPath: -->
+        <!-- OldLocation: -->
+        <!-- UIHints: Slideshow Z order for animations -->
+        <info>
+          <author>THB</author>
+          <desc>Indicates whether the slideshow should respect shape z-order while animating shapes. Disabling this can improve slideshow performance</desc>
+          <label>Enable shape z-order during slideshow animations</label>
+        </info>
+        <value>true</value>
+      </prop>
+      <prop oor:name="TransitionFiles" oor:type="oor:string-list">
+        <!-- OldPath: -->
+        <!-- OldLocation: -->
+        <!-- UIHints: List of files containing transition effects -->
+        <info>
+          <author>THB</author>
+          <desc>
+            Contains a list of odf files, that define
+            slideshow transitions. Values are put through
+            macro expansion, so, vnd.sun.star.expand prefix
+            is allowed.
+          </desc>
+          <label>List of files containing transition effects</label>
+        </info>
+        <value oor:separator=";">vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml</value>
+      </prop>
+      <prop oor:name="EffectFiles" oor:type="oor:string-list">
+        <!-- OldPath: -->
+        <!-- OldLocation: -->
+        <!-- UIHints: List of files containing object effects -->
+        <info>
+          <author>THB</author>
+          <desc>
+            Contains a list of odf files, that define
+            slideshow shape effects. Values are put through
+            macro expansion, so, vnd.sun.star.expand prefix
+            is allowed.
+          </desc>
+          <label>List of files containing object effects</label>
+        </info>
+        <value oor:separator=";">vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/effects.xml</value>
+      </prop>
+      <prop oor:name="PreviewNewEffects" oor:type="xs:boolean">
+        <!-- OldPath: -->
+        <!-- OldLocation: -->
+        <!-- UIHints: automatic preview checkbox in create new effect dialog -->
+        <info>
+          <author>CL</author>
+          <desc>Indicates whether a selected effect in the custom animation create dialog should be previewed.</desc>
+          <label>Automatic preview for new custom animation</label>
+        </info>
+        <value>true</value>
+      </prop>
+      <prop oor:name="PreviewChangedEffects" oor:type="xs:boolean">
+        <!-- OldPath: -->
+        <!-- OldLocation: -->
+        <!-- UIHints: automatic preview in custom animation panel -->
+        <info>
+          <author>CL</author>
+          <desc>Indicates whether changes in the custom animation panel should be previewed.</desc>
+          <label>Automatic preview for custom animation panel</label>
+        </info>
+        <value>true</value>
+      </prop>
+      <prop oor:name="PreviewTransitions" oor:type="xs:boolean">
+        <!-- OldPath: -->
+        <!-- OldLocation: -->
+        <!-- UIHints: automatic preview in slide transtion panel -->
+        <info>
+          <author>CL</author>
+          <desc>Indicates whether changes in the slide transition panel should be previewed.</desc>
+          <label>Automatic preview for slide transition panel</label>
+        </info>
+        <value>true</value>
+      </prop>
+      <prop oor:name="Display" oor:type="xs:int">
+        <!-- OldPath: -->
+        <!-- OldLocation: -->
+        <!-- UIHints: slide show settings display listbox -->
+        <info>
+          <author>CL</author>
+          <desc>Number of the display used for full screen slide show mode.</desc>
+          <label>Display for full screen slide show mode</label>
+        </info>
+        <value>0</value>
+      </prop>
+      <group oor:name="TextObject">
+        <info>
+          <desc>Contains text editing related configuration items.</desc>
+        </info>
+        <prop oor:name="QuickEditing" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Other/Text_Objects -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Other  [Section] Text objects -->
+          <info>
+            <desc>Indicates whether a simple click on a text object changes it to edit mode.</desc>
+            <label>Allow quick editing</label>
+          </info>
+          <value>true</value>
+        </prop>
+        <prop oor:name="Selectable" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Other/Text_Objects -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Other  [Section] Text objects -->
+          <info>
+            <desc>Indicates whether a text frame can only be selected by clicking on the text or by clicking somewhere in the frame.</desc>
+            <label>Only text area selectable</label>
+          </info>
+          <value>true</value>
+        </prop>
+      </group>
+      <group oor:name="NewDoc">
+        <info>
+          <desc>Specifies configuration items governing the behavior when creating a new document or a new page.</desc>
+          <label>Start with AutoPilots</label>
+        </info>
+        <prop oor:name="AutoPilot" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Other/New_Doc -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Other  [Section] New document -->
+          <info>
+            <desc>Indicates whether to show the autopilot when creating a new presentation.</desc>
+            <label>Start with AutoPilots</label>
+          </info>
+          <value>true</value>
+        </prop>
+        <prop oor:name="Layout" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Other/New_Doc -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Other  [Section] New document -->
+          <info>
+            <desc>Indicates whether to show the layout dialog when creating a new page.</desc>
+            <label>Start with AutoPilots</label>
+          </info>
+          <value>true</value>
+        </prop>
+      </group>
+      <group oor:name="Start">
+        <info>
+          <desc>Specifies configuration items governing behavior when starting a presentation.</desc>
+        </info>
+        <prop oor:name="CurrentPage" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Other/Start -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Other  [Section] Start presentation -->
+          <info>
+            <desc>Indicates whether to start the presentation with the current (true) or the first (false) page.</desc>
+            <label>Always with current page</label>
+          </info>
+          <value>true</value>
+        </prop>
+      </group>
+      <group oor:name="Compatibility">
+        <info>
+          <desc>Contains the group of options that control the compatibility to other applications.</desc>
+          <label>Compatibility options.</label>
+        </info>
+        <prop oor:name="AddBetween" oor:type="xs:boolean">
+          <!-- OldPath: Writer/Other/Compatibility -->
+          <!-- UIHints: Tools - Options - Presentation - Other - [Section] Compatibility -->
+          <info>
+            <author>SJ</author>
+            <desc>Specifies if spacing between paragraphs should be added to ensure compatibility to MS Word documents</desc>
+            <label>Add spacing between paragraphs</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="PrinterIndependentLayout" oor:type="xs:short">
+          <!-- UIHints: Tools - Options - Presentation - Other - [Section] Compatibility -->
+          <info>
+            <author>AF</author>
+            <desc>Indicates whether to use printer independent metrics for document formatting (2) or to use metrics derived from the current printer (1). Refer to com::sun::star::document::PrinterIndependentLayout for valid values.</desc>
+            <label>Use printer independent metrics for document formatting</label>
+          </info>
+          <value>2</value>
+        </prop>
+      </group>
+      <group oor:name="DefaultObjectSize">
+        <!-- OldPath: -->
+        <!-- OldLocation: -->
+        <!-- UIHints: Default size for newly created objects when using CTRL-Return or CTRL-Klick -->
+        <info>
+          <author>AW</author>
+          <desc>Defines the default size of newly created objects using CTRL-Return or CTRL-Click at a object creating Button.</desc>
+          <label>Default Object Size</label>
+        </info>
+        <prop oor:name="Width" oor:type="xs:int">
+          <info>
+            <desc>[UNIT=1/100 mm]</desc>
+            <label/>
+          </info>
+          <value>8000</value>
+        </prop>
+        <prop oor:name="Height" oor:type="xs:int">
+          <info>
+            <desc>[UNIT=1/100 mm]</desc>
+            <label/>
+          </info>
+          <value>5000</value>
+        </prop>
+      </group>
+    </group>
+    <group oor:name="Snap">
+      <info>
+        <desc>Specifies how to force object positions and sizes to the snap grid or to align with other objects.</desc>
+      </info>
+      <group oor:name="Object">
+        <info>
+          <desc>Specifies how to force object positions and sizes to predefined locations in relation to other objects.</desc>
+        </info>
+        <prop oor:name="Grid" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Snap/Objects -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap to -->
+          <info>
+            <desc>Indicates whether to snap an object when moved to the next grid point.</desc>
+            <label>Grid lines</label>
+          </info>
+          <value>true</value>
+        </prop>
+        <prop oor:name="SnapLine" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Snap/Objects -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap to -->
+          <info>
+            <desc>Indicates whether to snap at snap lines.</desc>
+            <label>Snap lines</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="PageMargin" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Snap/Objects -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap to -->
+          <info>
+            <desc>Indicates whether the outline of an object is justified with adjacent page margins.</desc>
+            <label>Page margins</label>
+          </info>
+          <value>true</value>
+        </prop>
+        <prop oor:name="ObjectFrame" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Snap/Objects -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap to -->
+          <info>
+            <desc>Indicates whether to justify the outline of an object to that of an adjacent object.</desc>
+            <label>Object frame</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="ObjectPoint" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Snap/Objects -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap to -->
+          <info>
+            <desc>Indicates whether to snap corner points of adjacent objects.</desc>
+            <label>Object points</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="Range" oor:type="xs:int">
+          <!-- OldPath: Impress/Snap/Objects -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap to -->
+          <info>
+            <desc>Specifies the maximal range in pixels along the coordinate axes at which snapping becomes active.</desc>
+            <label>Snap range</label>
+          </info>
+          <constraints>
+            <minInclusive oor:value="1">
+              <info>
+                <desc>Specifies that the minimum snap range is 1.</desc>
+              </info>
+            </minInclusive>
+            <maxInclusive oor:value="50">
+              <info>
+                <desc>Specifies that the maximal snap range is 50.</desc>
+              </info>
+            </maxInclusive>
+          </constraints>
+          <value>5</value>
+        </prop>
+      </group>
+      <group oor:name="Position">
+        <info>
+          <desc>Specifies constraints regarding the creation and modification of graphical objects.</desc>
+        </info>
+        <prop oor:name="CreatingMoving" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Snap/Position -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap position -->
+          <info>
+            <desc>Indicates whether to restrict the creation of objects to squares, circles, etc. and to retain the x/y ratio when resizing.</desc>
+            <label>When creating or moving objects</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="ExtendEdges" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Snap/Position -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap position -->
+          <info>
+            <desc>Indicates whether to use the longer (true) or the shorter (false) of the two distances along the coordinates axes from the initial to the current position to determine a new square&apos;s edge length or a new circle&apos;s diameter.</desc>
+            <label>Extend edges</label>
+          </info>
+          <value>true</value>
+        </prop>
+        <prop oor:name="Rotating" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Snap/Position -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap position -->
+          <info>
+            <desc>Indicates whether to use snapping while rotating an object.</desc>
+            <label>When rotating</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="RotatingValue" oor:type="xs:int">
+          <!-- OldPath: Impress/Snap/Position -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap position -->
+          <info>
+            <desc>Specifies the rotation angle when snapping for rotation is enabled. [UNIT=Degree/100]</desc>
+            <label>When rotating</label>
+          </info>
+          <constraints>
+            <minInclusive oor:value="0">
+              <info>
+                <desc>Specifies that the minimum rotation angle is 0/100 degrees.</desc>
+              </info>
+            </minInclusive>
+            <maxInclusive oor:value="18000">
+              <info>
+                <desc>Specifies that the maximum rotation angle is 18000/100 degrees.</desc>
+              </info>
+            </maxInclusive>
+          </constraints>
+          <value>1500</value>
+        </prop>
+        <prop oor:name="PointReduction" oor:type="xs:int">
+          <!-- OldPath: Impress/Snap/Position -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Snap to Grid - [Section] Snap position -->
+          <info>
+            <desc>Specifies the maximum angle that you can move a line before it snaps into place in the point editor that connects two points [UNIT=Degree/100].</desc>
+            <label>Point reduction</label>
+          </info>
+          <constraints>
+            <minInclusive oor:value="100">
+              <info>
+                <desc>Specifies that the minimum angle is 100/100 degrees.</desc>
+              </info>
+            </minInclusive>
+            <maxInclusive oor:value="9000">
+              <info>
+                <desc>Specifies that the maximum angle is 9000/100 degrees.</desc>
+              </info>
+            </maxInclusive>
+          </constraints>
+          <value>1500</value>
+        </prop>
+      </group>
+    </group>
+    <group oor:name="Grid">
+      <info>
+        <desc>Defines the handling and display of the snap grid.</desc>
+      </info>
+      <group oor:name="Option">
+        <info>
+          <desc>Specifies switches regarding use and display of the snap grid.</desc>
+        </info>
+        <prop oor:name="SnapToGrid" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Grid/Options -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation Grid - [Section] Options -->
+          <info>
+            <desc>Indicates whether to force frames and drawing elements on grid points.</desc>
+            <label>Snap to grid</label>
+          </info>
+          <value>true</value>
+        </prop>
+        <prop oor:name="VisibleGrid" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Grid/Options -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation Grid - [Section] Options -->
+          <info>
+            <desc>Indicates whether to show the grid.</desc>
+            <label>Visible grid</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="Synchronize" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Grid/Options -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation Grid - [Section] Options -->
+          <info>
+            <desc>Indicates whether to synchronize the resolutions of x- and y-grids.</desc>
+            <label>Synchronize axes</label>
+          </info>
+          <value>false</value>
+        </prop>
+      </group>
+      <group oor:name="Resolution">
+        <info>
+          <desc>Specifies grid resolution.</desc>
+        </info>
+        <group oor:name="XAxis">
+          <!-- OldPath: Impress/Grid/Resolution -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Grid - [Section] Grid -->
+          <!-- Notice: Default-nonmetrical value: 1270 1/100 mm. -->
+          <info>
+            <desc>Defines the horizontal distance between adjacent grid points.</desc>
+            <label>X Axis Resolution</label>
+          </info>
+          <prop oor:name="Metric" oor:type="xs:int">
+            <info>
+              <desc>Defines the horizontal distance between adjacent grid points in 1/100 mm, used when the metric system is active.</desc>
+              <label/>
+            </info>
+            <value>1000</value>
+          </prop>
+          <prop oor:name="NonMetric" oor:type="xs:int">
+            <info>
+              <desc>Defines the horizontal distance between adjacent grid points in 1/100 mm, used when the non-metric system is active.</desc>
+              <label/>
+            </info>
+            <value>1270</value>
+          </prop>
+        </group>
+        <group oor:name="YAxis">
+          <!-- OldPath: Impress/Grid/Resolution -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Grid - [Section] Grid -->
+          <!-- Notice: Default- nonmerical value: 1270 1/100 mm. -->
+          <info>
+            <desc>Defines the vertical distance between adjacent grid points.</desc>
+            <label>Y Axis Resolution</label>
+          </info>
+          <prop oor:name="Metric" oor:type="xs:int">
+            <info>
+              <desc>Defines the vertical distance between adjacent grid points in 1/100 mm, used when the metric system is active.</desc>
+              <label/>
+            </info>
+            <value>1000</value>
+          </prop>
+          <prop oor:name="NonMetric" oor:type="xs:int">
+            <info>
+              <desc>Defines the vertical distance between adjacent grid points in 1/100 mm, used when the non-metric system is active.</desc>
+              <label/>
+            </info>
+            <value>1270</value>
+          </prop>
+        </group>
+      </group>
+      <group oor:name="Subdivision">
+        <info>
+          <desc>Specifies the subdivision of the grid.</desc>
+        </info>
+        <prop oor:name="XAxis" oor:type="xs:double">
+          <!-- OldPath: Impress/Grid/Subdivision -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Grid - [Section] Grid -->
+          <!-- Notice: Default value for English Version only: 254 Points) -->
+          <info>
+            <desc>Specifies the number of points between two adjacent grid points on the X axis.</desc>
+            <label>X Axis Subdivision</label>
+          </info>
+          <value>1</value>
+        </prop>
+        <prop oor:name="YAxis" oor:type="xs:double">
+          <!-- OldPath: Impress/Grid/Subdivision -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Grid - [Section] Grid -->
+          <!-- Notice: Default value for English Version only: 254 Points) -->
+          <info>
+            <desc>Specifies the number of intervals between two adjacent grid points on the Y axis</desc>
+            <label>Y Axis Subdivision</label>
+          </info>
+          <value>1</value>
+        </prop>
+      </group>
+      <group oor:name="SnapGrid">
+        <info>
+          <desc>Contains the specifications of the snap grid.</desc>
+        </info>
+        <prop oor:name="Size" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Grid/Snap_Grid -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Grid - [Section] Snap grid -->
+          <info>
+            <desc>Indicates whether to synchronize grid and snap-grid.</desc>
+            <label>Size to grid</label>
+          </info>
+          <value>true</value>
+        </prop>
+        <group oor:name="XAxis">
+          <!-- OldPath: Impress/Grid/Snap_Grid -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Grid - [Section] Snap grid -->
+          <!-- Notice: Default-nonmetrical value: 1270 1/100 mm. -->
+          <info>
+            <desc>Defines the horizontal distance between adjacent points of the snap grid.</desc>
+            <label>X axis</label>
+          </info>
+          <prop oor:name="Metric" oor:type="xs:int">
+            <info>
+              <desc>Defines the horizontal distance between adjacent points of the snap grid in 1/100 mm, used when the metric system is selected.</desc>
+              <label/>
+            </info>
+            <value>1000</value>
+          </prop>
+          <prop oor:name="NonMetric" oor:type="xs:int">
+            <info>
+              <desc>Defines the horizontal distance between adjacent points of the snap grid in 1/100 mm, used when the non-metric system is selected.</desc>
+              <label/>
+            </info>
+            <value>1270</value>
+          </prop>
+        </group>
+        <group oor:name="YAxis">
+          <!-- OldPath: Impress/Grid/Snap_Grid -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Grid - [Section] Snap grid -->
+          <!-- Notice: Default-Default-nonmetrical value: 1270 1/100 mm. -->
+          <info>
+            <desc>Defines the vertical distance between adjacent points of the snap grid.</desc>
+            <label>Y axis</label>
+          </info>
+          <prop oor:name="Metric" oor:type="xs:int">
+            <info>
+              <desc>Defines the vertical distance between adjacent points of the snap grid in 1/100 mm, used when the metric system is selected.</desc>
+              <label/>
+            </info>
+            <value>1000</value>
+          </prop>
+          <prop oor:name="NonMetric" oor:type="xs:int">
+            <info>
+              <desc>Defines the vertical distance between adjacent points of the snap grid in 1/100 mm, used when the non-metric system is selected.</desc>
+              <label/>
+            </info>
+            <value>1270</value>
+          </prop>
+        </group>
+      </group>
+    </group>
+    <group oor:name="Print">
+      <info>
+        <desc>Defines options regarding the printing of Impress documents.</desc>
+      </info>
+      <group oor:name="Content">
+        <info>
+          <desc>Defines options regarding the printing of document content.</desc>
+        </info>
+        <prop oor:name="Presentation" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Print/Contents -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Print - [Section] Contents -->
+          <info>
+            <desc>Indicates whether the presentation will be printed.</desc>
+            <label>Presentation</label>
+          </info>
+          <value>true</value>
+        </prop>
+        <prop oor:name="Note" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Print/Contents -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Print - [Section] Contents -->
+          <info>
+            <desc>Indicates whether the notes will be printed.</desc>
+            <label>Notes</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="Handout" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Print/Contents -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Print - [Section] Contents -->
+          <info>
+            <desc>Indicates whether the handouts will be printed.</desc>
+            <label>Handouts</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="Outline" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Print/Contents -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Print - [Section] Contents -->
+          <info>
+            <desc>Indicates whether the outlines will be printed.</desc>
+            <label>Outline</label>
+          </info>
+          <value>false</value>
+        </prop>
+      </group>
+      <group oor:name="Page">
+        <info>
+          <desc>Specifies how and which pages will be printed.</desc>
+        </info>
+        <prop oor:name="PageSize" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Print/Page -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Print - [Section] Page options -->
+          <info>
+            <desc>Indicates whether to enlarge or shrink a document&apos;s page size while printing to fit the physical paper size.</desc>
+            <label>Fit to page</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="PageTile" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Print/Page -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Print - [Section] Page options -->
+          <info>
+            <desc>Indicates whether to print the pages&apos; titles at the top of every page.</desc>
+            <label>Tile pages</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="Booklet" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Print/Page -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Print - [Section] Page options -->
+          <info>
+            <desc>Indicates whether to print a document in the form of a brochure.</desc>
+            <label>Brochure</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="BookletFront" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Print/Page -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Print - [Section] Page options -->
+          <info>
+            <desc>Indicates whether to print the front side pages of a brochure.</desc>
+            <label>Front side</label>
+          </info>
+          <value>true</value>
+        </prop>
+        <prop oor:name="BookletBack" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Print/Page -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Print - [Section] Page options -->
+          <info>
+            <desc>Indicates whether to print the back side pages of a brochure.</desc>
+            <label>Back side</label>
+          </info>
+          <value>true</value>
+        </prop>
+      </group>
+      <group oor:name="Other">
+        <info>
+          <desc>Specifies general printing related issues.</desc>
+        </info>
+        <prop oor:name="PageName" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Print -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Print - [Section] Print -->
+          <info>
+            <desc>Indicates whether to print page names.</desc>
+            <label>Page name</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="Date" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Print -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Print - [Section] Print -->
+          <info>
+            <desc>Indicates whether to print the current date at the top of every page.</desc>
+            <label>Date</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="Time" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Print -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Print - [Section] Print -->
+          <info>
+            <desc>Indicates whether to print the current time at the top of every page.</desc>
+            <label>Time</label>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="HiddenPage" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Print -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Print - [Section] Print -->
+          <info>
+            <desc>Indicates whether to print hidden pages.</desc>
+            <label>Hidden pages</label>
+          </info>
+          <value>true</value>
+        </prop>
+        <prop oor:name="Quality" oor:type="xs:int">
+          <!-- OldPath: Impress/Print -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Print - [Section] Quality -->
+          <info>
+            <desc>Specifies the quality of the printed colors.</desc>
+          </info>
+          <constraints>
+            <enumeration oor:value="0">
+              <info>
+                <desc>Color</desc>
+              </info>
+            </enumeration>
+            <enumeration oor:value="1">
+              <info>
+                <desc>Grayscale</desc>
+              </info>
+            </enumeration>
+            <enumeration oor:value="2">
+              <info>
+                <desc>Black/White</desc>
+              </info>
+            </enumeration>
+          </constraints>
+          <value>0</value>
+        </prop>
+        <prop oor:name="FromPrinterSetup" oor:type="xs:boolean">
+          <!-- OldPath: Impress/Print -->
+          <!-- OldLocation: Soffice.cfg -->
+          <!-- UIHints: Tools - Options - Presentation  Print  [Check box] From printer setup -->
+          <info>
+            <desc>Indicates whether to use the system settings of the printer to choose the paper tray.</desc>
+            <label>From printer setup</label>
+          </info>
+          <value>false</value>
+        </prop>
         <prop oor:name="HandoutHorizontal" oor:type="xs:boolean">
           <!-- UIHints: File - Print - [Section] Print content - [Radio buttons] Horizontal(TRUE)/Vertical(FALSE) -->
           <info>
@@ -1179,7 +1188,8 @@
             <label>Handout orientation</label>
           </info>
           <value>false</value>
-        </prop>       <prop oor:name="PagesPerHandout" oor:type="xs:int">
+        </prop>
+        <prop oor:name="PagesPerHandout" oor:type="xs:int">
           <!-- UIHints: File - Print - [Section] Print content - [ListBox] Slides per page -->
           <info>
             <desc>Specifies the number of slide thumbnails printed on each handout page.</desc>
@@ -1219,274 +1229,292 @@
           </constraints>
           <value>0</value>
         </prop>
-			</group>
-		</group>
-		<group oor:name="Filter">
-			<info>
-				<desc>Contains the group of options that control the behavior of filters.</desc>
-				<label>Filter Options</label>
-			</info>
-			<group oor:name="Import">
-				<info>
-					<desc>Contains the group of options that control the behavior of the import filters.</desc>
-					<label>Import Filter</label>
-				</info>
-				<group oor:name="VBA">
-					<info>
-						<desc>Contains the group of options that control the behavior of the VBA filter.</desc>
-						<label>VBA Filter</label>
-					</info>
-					<prop oor:name="Load" oor:type="xs:boolean">
-						<!-- OldPath: Filter/MS_Office/Basic/PowerPoint -->
-						<!-- OldLocation: soffice.cfg -->
-						<!-- UIHints: Tools  Options - Filter Settings  Microsoft Office  [Section] Microsoft PowerPoint 97/2000 -->
-						<info>
-							<author>OS</author>
-							<desc>Converts VBA Basic into Office Basic as commands (True).</desc>
-							<label>Load Basic Code to edit</label>
-						</info>
-						<value>true</value>
-					</prop>
-					<prop oor:name="Save" oor:type="xs:boolean">
-						<!-- OldPath: Filter/MS_Office/Basic/PowerPoint -->
-						<!-- OldLocation: soffice.cfg -->
-						<!-- UIHints: Tools  Options - Filter Settings  Microsoft Office  [Section] Microsoft PowerPoint 97/2000 -->
-						<info>
-							<author>OS</author>
-							<desc>Holds original VBA storage for saving in the memory (True).</desc>
-							<label>Save Original Basic Code again</label>
-						</info>
-						<value>true</value>
-					</prop>
-				</group>
-			</group>
-			<group oor:name="Export">
-				<info>
-					<desc>Exports related configuration items.</desc>
-				</info>
-				<prop oor:name="LastUsed" oor:type="xs:string">
-					<!-- OldPath: STARIMPRESS -->
-					<!-- OldLocation: soffice.ini -->
-					<!-- UIHints: Set after export -->
-					<info>
-						<desc>Specifies the filter last used to export an Impress document.</desc>
-					</info>
-					<constraints>
-						<enumeration oor:value="HTML">
-							<info>
-								<desc>HTML</desc>
-							</info>
-						</enumeration>
-						<enumeration oor:value="BMP - MS Windows">
-							<info>
-								<desc>MS Windows bitmap</desc>
-							</info>
-						</enumeration>
-						<enumeration oor:value="PNG - Portable Network Graphic">
-							<info>
-								<desc>Portable Network Graphic</desc>
-							</info>
-						</enumeration>
-						<enumeration oor:value="EPS - Encapsulated PostScript">
-							<info>
-								<desc>Encapsulated PostScript</desc>
-							</info>
-						</enumeration>
-						<enumeration oor:value="GIF - Graphic Interchange">
-							<info>
-								<desc>Graphic Interchange Format</desc>
-							</info>
-						</enumeration>
-						<enumeration oor:value="JPG - JPEG">
-							<info>
-								<desc>JPEG</desc>
-							</info>
-						</enumeration>
-						<enumeration oor:value="MET - OS/2 Metafile">
-							<info>
-								<desc>OS/2 Metafile</desc>
-							</info>
-						</enumeration>
-						<enumeration oor:value="PCT - Mac Pict">
-							<info>
-								<desc>Mac Pict</desc>
-							</info>
-						</enumeration>
-						<enumeration oor:value="PBM - Portable Bitmap">
-							<info>
-								<desc>Portable Bitmap</desc>
-							</info>
-						</enumeration>
-						<enumeration oor:value="PGM - Portable Graymap">
-							<info>
-								<desc>Portable Graymap</desc>
-							</info>
-						</enumeration>
-						<enumeration oor:value="PPM - Portable Pixelmap">
-							<info>
-								<desc>Portable Pixelmap</desc>
-							</info>
-						</enumeration>
-						<enumeration oor:value="RAS - Sun Rasterfile">
-							<info>
-								<desc>Sun Rasterfile</desc>
-							</info>
-						</enumeration>
-						<enumeration oor:value="SVM - StarView Metafile">
-							<info>
-								<desc>StarView Metafile</desc>
-							</info>
-						</enumeration>
-						<enumeration oor:value="WMF - MS Windows Metafile">
-							<info>
-								<desc>MS Windows Metafile</desc>
-							</info>
-						</enumeration>
-						<enumeration oor:value="XPM">
-							<info>
-								<desc>XPM</desc>
-							</info>
-						</enumeration>
-					</constraints>
-				</prop>
-			</group>
-		</group>
-		<group oor:name="MultiPaneGUI">
+      </group>
+    </group>
+    <group oor:name="Filter">
+      <info>
+        <desc>Contains the group of options that control the behavior of filters.</desc>
+        <label>Filter Options</label>
+      </info>
+      <group oor:name="Import">
+        <info>
+          <desc>Contains the group of options that control the behavior of the import filters.</desc>
+          <label>Import Filter</label>
+        </info>
+        <group oor:name="VBA">
+          <info>
+            <desc>Contains the group of options that control the behavior of the VBA filter.</desc>
+            <label>VBA Filter</label>
+          </info>
+          <prop oor:name="Load" oor:type="xs:boolean">
+            <!-- OldPath: Filter/MS_Office/Basic/PowerPoint -->
+            <!-- OldLocation: soffice.cfg -->
+            <!-- UIHints: Tools  Options - Filter Settings  Microsoft Office  [Section] Microsoft PowerPoint 97/2000 -->
+            <info>
+              <author>OS</author>
+              <desc>Converts VBA Basic into Office Basic as commands (True).</desc>
+              <label>Load Basic Code to edit</label>
+            </info>
+            <value>true</value>
+          </prop>
+          <prop oor:name="Save" oor:type="xs:boolean">
+            <!-- OldPath: Filter/MS_Office/Basic/PowerPoint -->
+            <!-- OldLocation: soffice.cfg -->
+            <!-- UIHints: Tools  Options - Filter Settings  Microsoft Office  [Section] Microsoft PowerPoint 97/2000 -->
+            <info>
+              <author>OS</author>
+              <desc>Holds original VBA storage for saving in the memory (True).</desc>
+              <label>Save Original Basic Code again</label>
+            </info>
+            <value>true</value>
+          </prop>
+        </group>
+      </group>
+      <group oor:name="Export">
+        <info>
+          <desc>Exports related configuration items.</desc>
+        </info>
+        <prop oor:name="LastUsed" oor:type="xs:string">
+          <!-- OldPath: STARIMPRESS -->
+          <!-- OldLocation: soffice.ini -->
+          <!-- UIHints: Set after export -->
+          <info>
+            <desc>Specifies the filter last used to export an Impress document.</desc>
+          </info>
+          <constraints>
+            <enumeration oor:value="HTML">
+              <info>
+                <desc>HTML</desc>
+              </info>
+            </enumeration>
+            <enumeration oor:value="BMP - MS Windows">
+              <info>
+                <desc>MS Windows bitmap</desc>
+              </info>
+            </enumeration>
+            <enumeration oor:value="PNG - Portable Network Graphic">
+              <info>
+                <desc>Portable Network Graphic</desc>
+              </info>
+            </enumeration>
+            <enumeration oor:value="EPS - Encapsulated PostScript">
+              <info>
+                <desc>Encapsulated PostScript</desc>
+              </info>
+            </enumeration>
+            <enumeration oor:value="GIF - Graphic Interchange">
+              <info>
+                <desc>Graphic Interchange Format</desc>
+              </info>
+            </enumeration>
+            <enumeration oor:value="JPG - JPEG">
+              <info>
+                <desc>JPEG</desc>
+              </info>
+            </enumeration>
+            <enumeration oor:value="MET - OS/2 Metafile">
+              <info>
+                <desc>OS/2 Metafile</desc>
+              </info>
+            </enumeration>
+            <enumeration oor:value="PCT - Mac Pict">
+              <info>
+                <desc>Mac Pict</desc>
+              </info>
+            </enumeration>
+            <enumeration oor:value="PBM - Portable Bitmap">
+              <info>
+                <desc>Portable Bitmap</desc>
+              </info>
+            </enumeration>
+            <enumeration oor:value="PGM - Portable Graymap">
+              <info>
+                <desc>Portable Graymap</desc>
+              </info>
+            </enumeration>
+            <enumeration oor:value="PPM - Portable Pixelmap">
+              <info>
+                <desc>Portable Pixelmap</desc>
+              </info>
+            </enumeration>
+            <enumeration oor:value="RAS - Sun Rasterfile">
+              <info>
+                <desc>Sun Rasterfile</desc>
+              </info>
+            </enumeration>
+            <enumeration oor:value="SVM - StarView Metafile">
+              <info>
+                <desc>StarView Metafile</desc>
+              </info>
+            </enumeration>
+            <enumeration oor:value="WMF - MS Windows Metafile">
+              <info>
+                <desc>MS Windows Metafile</desc>
+              </info>
+            </enumeration>
+            <enumeration oor:value="XPM">
+              <info>
+                <desc>XPM</desc>
+              </info>
+            </enumeration>
+          </constraints>
+        </prop>
+      </group>
+    </group>
+    <group oor:name="MultiPaneGUI">
+      <info>
+        <desc>Options that control the content and appearance of the multi pane GUI.</desc>
+        <label>Multi Pane GUI Options</label>
+      </info>
+      <group oor:name="ToolPanel">
+        <info>
+          <desc>Options that control the tool panel.</desc>
+          <label>Tool Panel Options</label>
+        </info>
+        <set oor:name="RecentlyUsedMasterPages" oor:node-type="MasterPageDescriptor">
+          <info>
+            <desc>List of the URLs of the most recently used master pages.</desc>
+            <label>Recently Used Master Pages</label>
+          </info>
+        </set>
+      </group>
+      <group oor:name="Framework">
+        <info>
+          <desc>Options that control the multi pane framework.</desc>
+          <label>Multi Pane Framework Options</label>
+        </info>
+        <set oor:name="ResourceFactories" oor:node-type="ResourceFactory">
+          <info>
+            <desc>Set of factories and the resources created by them.</desc>
+            <label>Multi Pane Framework Resource Factories</label>
+          </info>
+        </set>
+        <set oor:name="StartupServices" oor:node-type="StartupService">
+          <info>
+            <desc>
+              Set of services that are instantiated every time the
+              framework of a Draw or Impress document is initialized.
+            </desc>
+            <label>Multi Pane Framework Startup Services</label>
+          </info>
+        </set>
+      </group>
+      <group oor:name="SlideSorter">
+        <info>
+          <desc>Values related to the slide sorter.</desc>
+          <label>Slide Sorter Options</label>
+        </info>
+        <group oor:name="PreviewCache">
+          <info>
+            <desc>Values for tuning the preview cache of the slide sorter.</desc>
+            <label>Preview Cache Options</label>
+          </info>
+          <prop oor:name="CacheSize" oor:type="xs:int">
+            <info>
+              <desc>
+                Maximal size of the cache that stores slide
+                preview bitmaps.  This size does only cover
+                previews of slides that are not currently
+                visible.  Depending on the compression policy
+                this upper bound may be violated.
+              </desc>
+              <label>Preview Cache Size</label>
+            </info>
+            <value>4194304</value>
+          </prop>
+          <prop oor:name="CompactionPolicy" oor:type="xs:string">
             <info>
-                <desc>Options that control the content and appearance of the multi pane GUI.</desc>
-    			<label>Multi Pane GUI Options</label>
+              <desc>Technique of how to reduce the memory used by the cache.</desc>
+              <label>Compaction Policy</label>
             </info>
-			<group oor:name="ToolPanel">
+            <constraints>
+              <enumeration oor:value="None">
                 <info>
-                    <desc>Options that control the tool panel.</desc>
-    	    		<label>Tool Panel Options</label>
+                  <desc>Ignore the maximal cache size.</desc>
                 </info>
-				<set oor:name="RecentlyUsedMasterPages" oor:node-type="MasterPageDescriptor">
-                    <info>
-                        <desc>List of the URLs of the most recently used master pages.</desc>
-    	        		<label>Recently Used Master Pages</label>
-                    </info>
-                </set>
-			</group>
-			<group oor:name="Framework">
+              </enumeration>
+              <enumeration oor:value="Compress">
                 <info>
-                    <desc>Options that control the multi pane framework.</desc>
-    	    		<label>Multi Pane Framework Options</label>
+                  <desc>
+                    Use the compression policy to compress preview bitmaps
+                    that are not visible.
+                  </desc>
                 </info>
-				<set oor:name="ResourceFactories" oor:node-type="ResourceFactory">
-                    <info>
-                        <desc>Set of factories and the resources created by them.</desc>
-    	        		<label>Multi Pane Framework Resource Factories</label>
-                    </info>
-                </set>
-				<set oor:name="StartupServices" oor:node-type="StartupService">
-					<info>
-						<desc>Set of services that are instantiated every time the
-                        framework of a Draw or Impress document is initialized.</desc>
-						<label>Multi Pane Framework Startup Services</label>
-					</info>
-				</set>
-            </group>
-			<group oor:name="SlideSorter">
+              </enumeration>
+            </constraints>
+            <value>Compress</value>
+          </prop>
+          <prop oor:name="CompressionPolicy" oor:type="xs:string">
+            <info>
+              <desc>
+                Technique of how to compress preview bitmaps for
+                slides that are moved out of the visible area in
+                order to save cache space.
+              </desc>
+              <label>Compression Policy</label>
+            </info>
+            <constraints>
+              <enumeration oor:value="None">
+                <info>
+                  <desc>
+                    Keep bitmaps unmodified in cache.  This effectively
+                    ignores the maximal cache size.
+                  </desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="Erase">
+                <info>
+                  <desc>Remove preview from cache</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="ResolutionReduction">
+                <info>
+                  <desc>
+                    Reduce the resolution to a width
+                    of 100 Pixels
+                  </desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="PNGCompression">
                 <info>
-		    		<desc>Values related to the slide sorter.</desc>
-                    <label>Slide Sorter Options</label>
+                  <desc>Store preview as compressed PNG bitmap</desc>
                 </info>
-				<group oor:name="PreviewCache">
-                	<info>
-		    			<desc>Values for tuning the preview cache of the slide sorter.</desc>
-                    	<label>Preview Cache Options</label>
-                	</info>
-    				<prop oor:name="CacheSize" oor:type="xs:int">
-                    	<info>
-	        				<desc>Maximal size of the cache that stores slide
-                            preview bitmaps.  This size does only cover
-                            previews of slides that are not currently
-                            visible.  Depending on the compression policy
-                            this upper bound may be violated.</desc>
-                        	<label>Preview Cache Size</label>
-                    	</info>
-                    	<value>4194304</value>
-                	</prop>
-    				<prop oor:name="CompactionPolicy" oor:type="xs:string">
-                    	<info>
-	        				<desc>Technique of how to reduce the memory used by the cache.</desc> 
-                        	<label>Compaction Policy</label>
-                    	</info>
-						<constraints>
-							<enumeration oor:value="None">
-								<info>
-									<desc>Ignore the maximal cache size.</desc>
-								</info>
-							</enumeration>
-							<enumeration oor:value="Compress">
-								<info>
-									<desc>Use the compression policy to compress preview bitmaps
-                                    that are not visible.</desc>
-								</info>
-							</enumeration>
-						</constraints>
-                    	<value>Compress</value>
-                    </prop>
-    				<prop oor:name="CompressionPolicy" oor:type="xs:string">
-                    	<info>
-	        				<desc>Technique of how to compress preview bitmaps for
-	        				slides that are moved out of the visible area in
-	        				order to save cache space.</desc> 
-                        	<label>Compression Policy</label>
-                    	</info>
-						<constraints>
-							<enumeration oor:value="None">
-								<info>
-									<desc>Keep bitmaps unmodified in cache.  This effectively 
-                                    ignores the maximal cache size.</desc>
-								</info>
-							</enumeration>
-							<enumeration oor:value="Erase">
-								<info>
-									<desc>Remove preview from cache</desc>
-								</info>
-							</enumeration>
-							<enumeration oor:value="ResolutionReduction">
-								<info>
-									<desc>Reduce the resolution to a width
-									of 100 Pixels</desc>
-								</info>
-							</enumeration>
-							<enumeration oor:value="PNGCompression">
-								<info>
-									<desc>Store preview as compressed PNG bitmap</desc>
-								</info>
-							</enumeration>
-						</constraints>
-                    	<value>ResolutionReduction</value>
-                	</prop>
-       				<prop oor:name="TimeBetweenHighPriorityRequests" oor:type="xs:int">
-                    	<info>
-	        				<desc>Time in milli seconds to wait between processing
-                            preview creation requests with high priority.</desc>
-                        	<label>Time Between High Priority Requests</label>
-                    	</info>
-                    	<value>10</value>
-                	</prop>
-       				<prop oor:name="TimeBetweenLowPriorityRequests" oor:type="xs:int">
-                    	<info>
-	        				<desc>Time in milli seconds to wait between processing 
-                            preview creation requests with low priority.</desc>
-                        	<label>Time Between Low Priority Requests</label>
-                    	</info>
-                    	<value>100</value>
-                	</prop>
-       				<prop oor:name="TimeBetweenRequestsDuringShow" oor:type="xs:int">
-                    	<info>
-	        				<desc>Time in milli seconds to wait between processing 
-                            preview creation requestsest when show is running.</desc>
-                        	<label>Time Between Requests During Show</label>
-                    	</info>
-                    	<value>1000</value>
-                	</prop>
-	     		</group>
-	     	</group>
-		</group>
-	</component>
+              </enumeration>
+            </constraints>
+            <value>ResolutionReduction</value>
+          </prop>
+          <prop oor:name="TimeBetweenHighPriorityRequests" oor:type="xs:int">
+            <info>
+              <desc>
+                Time in milli seconds to wait between processing
+                preview creation requests with high priority.
+              </desc>
+              <label>Time Between High Priority Requests</label>
+            </info>
+            <value>10</value>
+          </prop>
+          <prop oor:name="TimeBetweenLowPriorityRequests" oor:type="xs:int">
+            <info>
+              <desc>
+                Time in milli seconds to wait between processing
+                preview creation requests with low priority.
+              </desc>
+              <label>Time Between Low Priority Requests</label>
+            </info>
+            <value>100</value>
+          </prop>
+          <prop oor:name="TimeBetweenRequestsDuringShow" oor:type="xs:int">
+            <info>
+              <desc>
+                Time in milli seconds to wait between processing
+                preview creation requestsest when show is running.
+              </desc>
+              <label>Time Between Requests During Show</label>
+            </info>
+            <value>1000</value>
+          </prop>
+        </group>
+      </group>
+    </group>
+  </component>
 </oor:component-schema>
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs
index 39545cab2391..b56629aca2eb 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs
@@ -95,6 +95,21 @@
                     <desc>Specifies the user interface element name. It is used for floating user interface elements to set the title and for the bubble help.</desc>
                 </info>
             </prop>
+            <prop oor:name="ImageURL" oor:type="xs:string">
+              <info>
+                <desc>Specifies the URL of an image to associate with the user interface element. 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>
+                  Specifies the help URL of the tool panel.
+                </desc>
+              </info>
+              <value></value>
+            </prop>
             <prop oor:name="InternalState" oor:type="xs:int">
                 <info>
                     <desc>Specifies an internal state for the user interface element. Please don't change this value it describes an internal value.</desc>
diff --git a/sfx2/inc/imagemgr.hxx b/sfx2/inc/imagemgr.hxx
index ead9b6988cea..79dc724210c4 100644
--- a/sfx2/inc/imagemgr.hxx
+++ b/sfx2/inc/imagemgr.hxx
@@ -33,4 +33,4 @@
 #include <rtl/ustring.hxx>
 #include <vcl/image.hxx>
 
-SFX2_DLLPUBLIC Image SAL_CALL GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+SFX2_DLLPUBLIC Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index 8cd8f9d8561f..b43dba7d6673 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -566,7 +566,7 @@
 #include "svl/svdde.hxx"
 #include "svl/svstdarr.hxx"
 #include "svtools/svtdata.hxx"
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 #include "unotools/syslocale.hxx"
 #include "unotools/syslocaleoptions.hxx"
 #include "svl/szitem.hxx"
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index cac0b72f13cf..fd1eb65d54df 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -87,13 +87,13 @@ struct SfxChildWinInfo
 };
 
 // Factory-Methode eines ChildWindows
-typedef SfxChildWindow* (*SfxChildWinCtor)( Window *pParentWindow,
+typedef SfxChildWindow* (*SfxChildWinCtor)( ::Window *pParentWindow,
                                             sal_uInt16 nId,
                                             SfxBindings *pBindings,
                                             SfxChildWinInfo *pInfo);
 
 // Factory-Methode eines ChildWindowsContexts
-typedef SfxChildWindowContext* (*SfxChildWinContextCtor)( Window *pParentWindow,
+typedef SfxChildWindowContext* (*SfxChildWinContextCtor)( ::Window *pParentWindow,
                                             SfxBindings *pBindings,
                                             SfxChildWinInfo *pInfo);
 struct SfxChildWinContextFactory
@@ -143,8 +143,8 @@ struct SfxChildWindow_Impl;
 class SFX2_DLLPUBLIC SfxChildWindowContext
 {
 friend class SfxChildWindow;
-    Window*             pWindow;
-    sal_uInt16              nContextId;
+    ::Window*           pWindow;
+    sal_uInt16          nContextId;
 
 protected:
                         SfxChildWindowContext( sal_uInt16 nId );
@@ -152,9 +152,9 @@ protected:
 public:
     virtual             ~SfxChildWindowContext();
 
-    void                SetWindow( Window* pWin )
+    void                SetWindow( ::Window* pWin )
                         { pWindow=pWin; }
-    Window*             GetWindow() const
+    ::Window*           GetWindow() const
                         { return pWindow; }
     sal_uInt16              GetContextId() const
                         { return nContextId; }
@@ -169,12 +169,12 @@ public:
 
 class SFX2_DLLPUBLIC SfxChildWindow
 {
-    Window*                 pParent;        // parent window ( Topwindow )
-    sal_uInt16                  nType;          // ChildWindow-Id
+    ::Window*               pParent;        // parent window ( Topwindow )
+    sal_uInt16              nType;          // ChildWindow-Id
 
 protected:
     SfxChildAlignment       eChildAlignment;// aktuelles ::com::sun::star::drawing::Alignment
-    Window*                 pWindow;        // eigentlicher Inhalt
+    ::Window*               pWindow;        // eigentlicher Inhalt
     SfxChildWindow_Impl*    pImp;           // Imp-Daten
 
 private:
@@ -185,14 +185,14 @@ private:
                         { return pContext; }
 
 protected:
-                        SfxChildWindow(Window *pParentWindow, sal_uInt16 nId);
+                        SfxChildWindow(::Window *pParentWindow, sal_uInt16 nId);
 
 public:
     virtual             ~SfxChildWindow();
     void                Destroy();
-    Window*             GetWindow() const
+    ::Window*           GetWindow() const
                         { return pWindow; }
-    Window*             GetParent() const
+    ::Window*           GetParent() const
                         { return pParent; }
     SfxChildAlignment   GetAlignment() const
                         { return eChildAlignment; }
@@ -217,17 +217,17 @@ public:
     sal_uInt16              GetContextId() const
                         { return pContext ? pContext->GetContextId(): 0; }
 
-    Window*             GetContextWindow() const
+    ::Window*           GetContextWindow() const
                         { return pContext ? pContext->GetWindow(): 0; }
 
-    Window*             GetContextWindow( SfxModule *pModule ) const;
+    ::Window*           GetContextWindow( SfxModule *pModule ) const;
 
     virtual SfxChildWinInfo GetInfo() const;
     void                SaveStatus(const SfxChildWinInfo& rInfo);
 
     static void         RegisterChildWindow(SfxModule*, SfxChildWinFactory*);
 
-    static SfxChildWindow* CreateChildWindow( sal_uInt16, Window*, SfxBindings*, SfxChildWinInfo&);
+    static SfxChildWindow* CreateChildWindow( sal_uInt16, ::Window*, SfxBindings*, SfxChildWinInfo&);
     void                SetHideNotDelete( sal_Bool bOn );
     sal_Bool                IsHideNotDelete() const;
     void                SetHideAtToggle( sal_Bool bOn );
@@ -258,19 +258,19 @@ public:
 //------------------------------------------------------------------
 //! demn"achst hinf"allig !
 #define SFX_DECL_CHILDWINDOW_CONTEXT(Class) \
-        static  SfxChildWindowContext* CreateImpl(Window *pParent, \
+        static  SfxChildWindowContext* CreateImpl(::Window *pParent, \
                     SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \
         static  void RegisterChildWindowContext(SfxModule *pMod=0); \
 
 //! Das Macro der Zukunft ...
 #define SFX_DECL_CHILDWINDOWCONTEXT(Class) \
-        static  SfxChildWindowContext* CreateImpl(Window *pParent, \
+        static  SfxChildWindowContext* CreateImpl(::Window *pParent, \
                     SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \
         static  void RegisterChildWindowContext(sal_uInt16, SfxModule *pMod=0); \
 
 //! demn"achst hinf"allig !
 #define SFX_IMPL_CHILDWINDOW_CONTEXT(Class, MyID, ShellClass) \
-        SfxChildWindowContext* __EXPORT Class::CreateImpl( Window *pParent, \
+        SfxChildWindowContext* __EXPORT Class::CreateImpl( ::Window *pParent, \
                 SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \
         {   \
             SfxChildWindowContext *pContext = new Class(pParent, \
@@ -290,7 +290,7 @@ public:
 // CreateImpl mu\s noch als Parameter die Factory mitbekommen wg. ContextId
 // Solange wird diese Id auf 0 gesetzt und in SfxChildWindow::CreateContext gepatched
 #define SFX_IMPL_CHILDWINDOWCONTEXT(Class, MyID) \
-        SfxChildWindowContext* __EXPORT Class::CreateImpl( Window *pParent, \
+        SfxChildWindowContext* __EXPORT Class::CreateImpl( ::Window *pParent, \
                 SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \
         {   \
             SfxChildWindowContext *pContext = new Class(pParent,0,pBindings,pInfo);\
@@ -305,7 +305,7 @@ public:
 
 #define SFX_DECL_CHILDWINDOW(Class) \
     public  :   \
-        static  SfxChildWindow* CreateImpl(Window *pParent, sal_uInt16 nId, \
+        static  SfxChildWindow* CreateImpl(::Window *pParent, sal_uInt16 nId, \
                     SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \
         static  void RegisterChildWindow (sal_Bool bVisible=sal_False, SfxModule *pMod=NULL, sal_uInt16 nFlags=0); \
         static  sal_uInt16 GetChildWindowId ();\
@@ -315,7 +315,7 @@ public:
         SFX_IMPL_POS_CHILDWINDOW(Class, MyID, CHILDWIN_NOPOS)
 
 #define SFX_IMPL_POS_CHILDWINDOW(Class, MyID, Pos) \
-        SfxChildWindow* __EXPORT Class::CreateImpl( Window *pParent, \
+        SfxChildWindow* __EXPORT Class::CreateImpl( ::Window *pParent, \
                 sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \
                 {   \
                     SfxChildWindow *pWin = new Class(pParent, nId, pBindings, pInfo);\
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx
index d17553e2b2d0..9b775f8e827d 100644
--- a/sfx2/inc/sfx2/filedlghelper.hxx
+++ b/sfx2/inc/sfx2/filedlghelper.hxx
@@ -102,30 +102,6 @@ class Window;
 #define FILE_OPEN_SERVICE_NAME_SYSTEM "com.sun.star.ui.dialogs.SystemFilePicker"
 #define FILE_OPEN_SERVICE_NAME_OOO   "com.sun.star.ui.dialogs.OfficeFilePicker"
 
-//*****************************************************************************
-// SfxUrlDialog
-//*****************************************************************************
-
-//#if 0 // _SOLAR__PRIVATE
-#ifndef DONT_USE_FILE_DIALOG_SERVICE
-
-class SfxUrlDialog : public ModalDialog
-{
-private:
-    Edit            aEdit;
-    OKButton        aOk;
-    CancelButton    aCancel;
-
-public:
-                    SfxUrlDialog( Window* pParent );
-
-    String          GetUrl() const { return aEdit.GetText(); }
-    void            SetUrl( const String& rUrl ) { aEdit.SetText( rUrl ); }
-};
-
-#endif
-//#endif
-
 //-----------------------------------------------------------------------------
 
 namespace sfx2 {
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index 793dd8f76cab..ad83bb4a7418 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.hxx
@@ -93,6 +93,8 @@ public:
     virtual void                Invalidate(USHORT nId = 0);
     BOOL                        IsActive() const;
 
+    /*virtual*/ bool            IsChildWindowAvailable( const USHORT i_nId, const SfxViewFrame* i_pViewFrame ) const;
+
     static SfxModule*           GetActiveModule( SfxViewFrame* pFrame=NULL );
     static FieldUnit            GetCurrentFieldUnit();
     FieldUnit                   GetFieldUnit() const;
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index bc4c11b53184..41dceafc1756 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -867,6 +867,7 @@
 #define SID_HYPERLINK_GETLINK               (SID_SVX_START + 361)
 #define SID_HYPERLINK_SETLINK               (SID_SVX_START + 362)
 #define SID_NAVIGATOR                       (SID_SVX_START + 366)
+#define SID_TASKPANE                        (SID_SVX_START + 370)
 #define SID_ZOOM_NEXT                       (SID_SVX_START + 402)
 #define SID_ZOOM_PREV                       (SID_SVX_START + 403)
 #define SID_INET_DLG                        (SID_SVX_START + 416)
diff --git a/sfx2/inc/sfx2/taskpane.hxx b/sfx2/inc/sfx2/taskpane.hxx
new file mode 100644
index 000000000000..69ebd866a50b
--- /dev/null
+++ b/sfx2/inc/sfx2/taskpane.hxx
@@ -0,0 +1,245 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SFX_TASKPANE_HXX
+#define SFX_TASKPANE_HXX
+
+#include "sfx2/dllapi.h"
+#include "sfx2/childwin.hxx"
+#include "sfx2/titledockwin.hxx"
+
+#include <svtools/toolpanel/tabalignment.hxx>
+#include <svtools/toolpanel/tabitemcontent.hxx>
+
+#include <boost/scoped_ptr.hpp>
+#include <boost/optional.hpp>
+
+namespace svt
+{
+    class ToolPanelDeck;
+}
+
+//......................................................................................................................
+namespace sfx2
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= ITaskPaneToolPanelAccess
+    //==================================================================================================================
+    class SAL_NO_VTABLE ITaskPaneToolPanelAccess
+    {
+    public:
+        virtual void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ) = 0;
+    };
+
+    //==================================================================================================================
+    //= TaskPaneWrapper
+    //==================================================================================================================
+    class SFX2_DLLPUBLIC TaskPaneWrapper    :public SfxChildWindow
+                                            ,public ITaskPaneToolPanelAccess
+    {
+    public:
+        TaskPaneWrapper(
+            Window* i_pParent,
+            USHORT i_nId,
+            SfxBindings* i_pBindings,
+            SfxChildWinInfo* i_pInfo
+        );
+
+        SFX_DECL_CHILDWINDOW( TaskPaneWrapper );
+
+        // ITaskPaneToolPanelAccess
+        virtual void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL );
+    };
+
+    //==================================================================================================================
+    //= IToolPanelCompare
+    //==================================================================================================================
+    class SFX2_DLLPUBLIC SAL_NO_VTABLE IToolPanelCompare
+    {
+    public:
+        /** compares to tool panel URLs
+            @return
+                <ul>
+                <li>-1 if the tool panel described by i_rLHS should precede the one described by i_rRHS</li>
+                <li>0 if the two panels have no particular relative order</li>
+                <li>1 if the tool panel described by i_rLHS should succeed the one described by i_rRHS</li>
+
+        */
+        virtual short compareToolPanelsURLs(
+                        const ::rtl::OUString& i_rLHS,
+                        const ::rtl::OUString& i_rRHS
+                    ) const = 0;
+    };
+
+    //==================================================================================================================
+    //= ModuleTaskPane
+    //==================================================================================================================
+    class ModuleTaskPane_Impl;
+    /** SFX-less version of a module dependent task pane, filled with tool panels as specified in the respective
+        module's configuration
+    */
+    class SFX2_DLLPUBLIC ModuleTaskPane : public Window
+    {
+    public:
+        /** creates a new instance
+            @param i_rParentWindow
+                the parent window
+            @param i_rDocumentFrame
+                the frame to which the task pane belongs. Will be passed to any custom tool panels created
+                via an XUIElementFactory. Also, it is used to determine the module which the task pane is
+                responsible for, thus controlling which tool panels are actually available.
+        */
+        ModuleTaskPane(
+            Window& i_rParentWindow,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocumentFrame
+        );
+        /** creates a new instance
+            @param i_rParentWindow
+                the parent window
+            @param i_rDocumentFrame
+                the frame to which the task pane belongs. Will be passed to any custom tool panels created
+                via an XUIElementFactory. Also, it is used to determine the module which the task pane is
+                responsible for, thus controlling which tool panels are actually available.
+            @param i_rCompare
+                a comparator for tool panel URLs, which allows controlling the order in which the panels are
+                added to the tool panel deck.
+        */
+        ModuleTaskPane(
+            Window& i_rParentWindow,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocumentFrame,
+            const IToolPanelCompare& i_rCompare
+        );
+        ~ModuleTaskPane();
+
+        /** determines whether a given module has any registered tool panels
+        */
+        static bool ModuleHasToolPanels( const ::rtl::OUString& i_rModuleIdentifier );
+        /** determines whether a given module has any registered tool panels
+        */
+        static bool ModuleHasToolPanels( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocumentFrame );
+
+        /** provides access to the Window aspect of the PanelDeck
+
+            Be careful with this method. For instance, you're not allowed to insert arbitrary IToolPanel implementations
+            into the deck, as the ModuleTaskPane has certain assumptions about the panel implementations. However,
+            you're allowed to remove and re-insert panels, which have originally been created by the ModuleTaskPane
+            itself.
+        */
+              ::svt::ToolPanelDeck& GetPanelDeck();
+        const ::svt::ToolPanelDeck& GetPanelDeck() const;
+
+        /** returns the position of the panel with the given resource URL
+        */
+        ::boost::optional< size_t >
+                    GetPanelPos( const ::rtl::OUString& i_rResourceURL );
+
+        /** returns the resource URL of the panel at the specified position
+        */
+        ::rtl::OUString
+                    GetPanelResourceURL( const size_t i_nPanelPos ) const;
+
+        /// sets the "classical" layout of the tool panel deck, using drawers
+        void    SetDrawersLayout();
+        /// sets the new layout of the tool panel deck, using tabs
+        void    SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent );
+
+    protected:
+        // Window overridables
+        virtual void Resize();
+        virtual void GetFocus();
+
+    private:
+        ::boost::scoped_ptr< ModuleTaskPane_Impl >  m_pImpl;
+    };
+
+    //==================================================================================================================
+    //= TaskPaneController
+    //==================================================================================================================
+    class TaskPaneController_Impl;
+    /** is a helper class for connecting a ModuleTaskPane and a TitledDockingWindow, for clients of the ModuleTaskPane
+        which do not use the TaskPaneDockingWindow
+
+        The controller will add a drop down menu to the docking window which contains one item for each panel in the
+        panel deck, and allows toggling their visibility.
+    */
+    class SFX2_DLLPUBLIC TaskPaneController
+    {
+    public:
+        TaskPaneController(
+            ModuleTaskPane& i_rTaskPane,
+            TitledDockingWindow& i_rDockingWindow
+        );
+        ~TaskPaneController();
+
+        /** sets the default title to be used for the TitledDockingWindow
+
+            When the controller switches the docking window to "tabbed" mode, then the title of the docking window
+            will contain the name of the currently active panel (since this name isn't to be seen elsewhere).
+            When the controller switches the docking window to "drawer" mode, then the title of the docking window
+            contains the default title as given here (since in this mode, the names of the panels are shown in
+            the drawers).
+        */
+        void    SetDefaultTitle( const String& i_rTitle );
+
+        /// activates the panel with the given URL
+        void    ActivateToolPanel( const ::rtl::OUString& i_rPanelURL );
+
+    private:
+        ::boost::scoped_ptr< TaskPaneController_Impl >  m_pImpl;
+    };
+
+    //==================================================================================================================
+    //= TaskPaneDockingWindow
+    //==================================================================================================================
+    class TaskPaneDockingWindow :public TitledDockingWindow
+                                ,public ITaskPaneToolPanelAccess
+    {
+    public:
+        TaskPaneDockingWindow( SfxBindings* i_pBindings, TaskPaneWrapper& i_rWrapper,
+            Window* i_pParent, WinBits i_nBits );
+
+        // ITaskPaneToolPanelAccess
+        virtual void    ActivateToolPanel( const ::rtl::OUString& i_rPanelURL );
+
+    protected:
+        // Window overridables
+        virtual void        GetFocus();
+
+        // TitledDockingWindow overridables
+        virtual void onLayoutDone();
+
+    private:
+        ModuleTaskPane      m_aTaskPane;
+        TaskPaneController  m_aPaneController;
+    };
+
+//......................................................................................................................
+} // namespace sfx2
+//......................................................................................................................
+
+#endif // SFX_TASKPANE_HXX
diff --git a/sfx2/inc/sfx2/titledockwin.hxx b/sfx2/inc/sfx2/titledockwin.hxx
new file mode 100644
index 000000000000..ebb4497a0ba2
--- /dev/null
+++ b/sfx2/inc/sfx2/titledockwin.hxx
@@ -0,0 +1,162 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SFX_TITLEDOCKWIN_HXX
+#define SFX_TITLEDOCKWIN_HXX
+
+#include "sfx2/dllapi.h"
+#include "sfx2/dockwin.hxx"
+
+#include <vcl/toolbox.hxx>
+#include <tools/svborder.hxx>
+
+//......................................................................................................................
+namespace sfx2
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= TitledDockingWindow
+    //==================================================================================================================
+    class SFX2_DLLPUBLIC TitledDockingWindow : public SfxDockingWindow
+    {
+    public:
+        TitledDockingWindow(
+            SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow,
+            Window* i_pParent, WinBits i_nStyle = 0
+        );
+
+        TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow,
+            Window* i_pParent, const ResId& i_rResId
+        );
+
+        virtual ~TitledDockingWindow();
+
+        /** sets a title to be displayed in the docking window
+        */
+        void        SetTitle( const String& i_rTitle );
+        /** returns the current title displayed in the docking window
+
+            Note that if you never called SetTitle before, then this method will not return an empty string,
+            but the window text (Window::GetText), since this is what is displayed as title then.
+        */
+        String      GetTitle() const;
+
+        /** adds a drop down item to the toolbox. Usually, this is used to add some kind of menu to the toolbox.
+
+            @param i_rItemText
+                the text to display for the item
+            @param i_nHelpId
+                the help ID for the new toolbox item
+            @param i_rCallback
+                the callback to invoke when the drop item has been clicked
+            @return
+                the ID of the newly created toolbox item
+        */
+        USHORT  AddDropDownToolBoxItem( const String& i_rItemText, ULONG i_nHelpId, const Link& i_rCallback )
+        {
+            return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback );
+        }
+
+        void        SetEndDockingHdl( const Link& i_rEndDockingHdl ) { m_aEndDockingHdl = i_rEndDockingHdl; }
+        const Link& GetEndDockingHdl() const { return m_aEndDockingHdl; }
+
+        /** resets the toolbox. Upon return, the only item in the toolbox is the closer.
+        */
+        void    ResetToolBox()
+        {
+            impl_resetToolBox();
+        }
+
+        /** returns the content window, which is to be used as parent window for any content to be displayed
+            in the docking window.
+        */
+        ::Window&       GetContentWindow()          { return m_aContentWindow; }
+        const ::Window& GetContentWindow() const    { return m_aContentWindow; }
+
+        ToolBox&        GetToolBox()        { return m_aToolbox; }
+        const ToolBox&  GetToolBox() const  { return m_aToolbox; }
+
+    protected:
+        // Window overridables
+        virtual void Paint( const Rectangle& i_rArea );
+        virtual void Resize();
+        virtual void StateChanged( StateChangedType i_nType );
+        virtual void DataChanged( const DataChangedEvent& i_rDataChangedEvent );
+        virtual void SetText( const String& i_rText );
+
+        // DockingWindow overridables
+        void EndDocking( const Rectangle& rRect, BOOL bFloatMode );
+
+        // own overridables
+        virtual void onLayoutDone();
+
+    protected:
+        /** internal version of ResetToolBox
+        */
+        void    impl_resetToolBox();
+
+        /** internal version of AddDropDownToolBoxItem
+        */
+        USHORT  impl_addDropDownToolBoxItem( const String& i_rItemText, ULONG i_nHelpId, const Link& i_rCallback );
+
+        /** returns the current title.
+
+            If no title has been set via SetTitle, then the window text (Window::GetText) is returned.
+        */
+        String  impl_getTitle() const;
+
+    private:
+        DECL_LINK( OnToolboxItemSelected, ToolBox* );
+
+        void    impl_construct();
+        void    impl_layout();
+        void    impl_scheduleLayout();
+
+    private:
+        String              m_sTitle;
+        ToolBox             m_aToolbox;
+        Window              m_aContentWindow;
+
+        Link                m_aEndDockingHdl;
+
+        /** The border that is painted arround the inner window.  The bevel
+            shadow lines are part of the border, so where the border is 0 no
+            such line is painted.
+        */
+        SvBorder            m_aBorder;
+
+        /** Remember that a layout is pending, i.e. Resize() has been called
+            since the last Paint().
+        */
+        bool                m_bLayoutPending;
+    };
+
+//......................................................................................................................
+} // namespace sfx2
+//......................................................................................................................
+
+#endif // SFX_TITLEDOCKWIN_HXX
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index 8350bc5f0f9d..d376236bf830 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -40,6 +40,8 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XController2.hpp>
 
+#include <tools/svborder.hxx>
+
 class SfxMacro;
 class SvBorder;
 class SfxDispatcher;
@@ -70,67 +72,6 @@ SV_DECL_REF(SfxObjectShell)
 #endif
 
 //========================================================================
-#include <tools/gen.hxx>
-class SvBorder
-{
-    long nTop, nRight, nBottom, nLeft;
-public:
-    SvBorder()
-    { nTop = nRight = nBottom = nLeft = 0; }
-    SvBorder( const Size & rSz )
-    { nTop = nBottom = rSz.Height(); nRight = nLeft = rSz.Width(); }
-    SvBorder( const Rectangle & rOuter, const Rectangle & rInner );
-    SvBorder( long nLeftP, long nTopP, long nRightP, long nBottomP )
-    { nLeft = nLeftP; nTop = nTopP; nRight = nRightP; nBottom = nBottomP; }
-    BOOL    operator == ( const SvBorder & rObj ) const
-            {
-                return nTop == rObj.nTop && nRight == rObj.nRight &&
-                       nBottom == rObj.nBottom && nLeft == rObj.nLeft;
-            }
-    BOOL    operator != ( const SvBorder & rObj ) const
-            { return !(*this == rObj); }
-    SvBorder & operator = ( const SvBorder & rBorder )
-            {
-                Left()   = rBorder.Left();
-                Top()    = rBorder.Top();
-                Right()  = rBorder.Right();
-                Bottom() = rBorder.Bottom();
-                return *this;
-            }
-    SvBorder & operator += ( const SvBorder & rBorder )
-            {
-                Left()   += rBorder.Left();
-                Top()    += rBorder.Top();
-                Right()  += rBorder.Right();
-                Bottom() += rBorder.Bottom();
-                return *this;
-            }
-    SvBorder & operator -= ( const SvBorder & rBorder )
-            {
-                Left()   -= rBorder.Left();
-                Top()    -= rBorder.Top();
-                Right()  -= rBorder.Right();
-                Bottom() -= rBorder.Bottom();
-                return *this;
-            }
-    BOOL    IsInside( const SvBorder & rInside )
-            {
-                return nTop >= rInside.nTop && nRight >= rInside.nRight &&
-                       nBottom >= rInside.nBottom && nLeft >= rInside.nLeft;
-            }
-    long &  Top()    { return nTop; }
-    long &  Right()  { return nRight; }
-    long &  Bottom() { return nBottom; }
-    long &  Left()   { return nLeft; }
-    long    Top()    const { return nTop; }
-    long    Right()  const { return nRight; }
-    long    Bottom() const { return nBottom; }
-    long    Left()   const { return nLeft; }
-};
-Rectangle & operator += ( Rectangle & rRect, const SvBorder & rBorder );
-Rectangle & operator -= ( Rectangle & rRect, const SvBorder & rBorder );
-
-
 DBG_NAMEEX(SfxViewFrame)
 class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener
 {
@@ -228,6 +169,8 @@ public:
 
     String                  UpdateTitle();
 
+    static void ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
+
     // interne Handler
     SAL_DLLPRIVATE virtual BOOL SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder );
     SAL_DLLPRIVATE virtual const SvBorder& GetBorderPixelImpl( const SfxViewShell *pSh ) const;
@@ -304,6 +247,7 @@ public:
     SAL_DLLPRIVATE void INetState_Impl(SfxItemSet &);
 
     SAL_DLLPRIVATE void SetCurViewId_Impl( const USHORT i_nID );
+    SAL_DLLPRIVATE void ActivateToolPanel_Impl( const ::rtl::OUString& i_rPanelURL );
 
 //#endif
 private:
diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst
index 3e791fbc2000..763c60810b3e 100644
--- a/sfx2/prj/build.lst
+++ b/sfx2/prj/build.lst
@@ -2,7 +2,6 @@ sf      sfx2    :    l10n idl basic xmlscript framework shell setup_native sax S
 sf	sfx2									usr1	-	all	sf_mkout NULL
 sf	sfx2\inc								nmake	-	all	sf_inc NULL
 sf	sfx2\prj								get		-	all	sf_prj NULL
-sf	sfx2\win\res							get		-	all	sf_wres NULL
 sf	sfx2\mac\res							get		-	all	sf_mres NULL
 sf	sfx2\source\inc							get		-	all	sf_sinc NULL
 sf	sfx2\sdi								nmake	-	all	sf_sdi NULL
@@ -20,5 +19,6 @@ sf	sfx2\source\statbar						nmake	-	all	sf_sbar sf_sdi sf_inc NULL
 sf	sfx2\source\toolbox						nmake	-	all	sf_tbox sf_sdi sf_inc NULL
 sf	sfx2\source\inet						nmake	-	all	sf_inet sf_sdi sf_inc NULL
 sf	sfx2\source\explorer					nmake	-	all	sf_expl sf_sdi sf_inc NULL
+sf	sfx2\workben\custompanel                nmake   -   all sf_wb_custompanel NULL
 sf      sfx2\util                                                               nmake   -       all     sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL
 sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi
index c4210b801bf6..dbf9267448e1 100644
--- a/sfx2/sdi/frmslots.sdi
+++ b/sfx2/sdi/frmslots.sdi
@@ -50,6 +50,11 @@ interface Window
         ExecMethod = ChildWindowExecute ;
         StateMethod = ChildWindowState ;
     ]
+    SID_TASKPANE // status(final|play)
+    [
+        ExecMethod = ChildWindowExecute ;
+        StateMethod = ChildWindowState ;
+    ]
     SID_SHOW_BROWSER // ole(no) api(final/play/rec)
     [
         ExecMethod = ChildWindowExecute ;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 10a920852848..dbe7cdfbb7e1 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3931,6 +3931,33 @@ SfxBoolItem Navigator SID_NAVIGATOR
     ToolBoxConfig = TRUE,
     GroupId = GID_NAVIGATOR;
 ]
+
+//--------------------------------------------------------------------------
+SfxBoolItem TaskPane SID_TASKPANE
+[
+    /* flags: */
+    AutoUpdate = TRUE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Asynchron;
+
+    Readonly = FALSE,
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_VIEW;
+]
+
 //--------------------------------------------------------------------------
 SfxVoidItem RestoreEditingView SID_RESTORE_EDITING_VIEW
 
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index d42d203e57f5..6e13894feb49 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -322,6 +322,7 @@ SfxApplication* SfxApplication::GetOrCreate()
         ::framework::SetStatusBarControllerCreator( SfxStatusBarControllerFactory );
         ::framework::SetDockingWindowCreator( SfxDockingWindowFactory );
         ::framework::SetIsDockingWindowVisible( IsDockingWindowVisible );
+        ::framework::SetActivateToolPanel( &SfxViewFrame::ActivateToolPanel );
 
         SfxHelp* pSfxHelp = new SfxHelp;
         Application::SetHelp( pSfxHelp );
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index a34a2e0d6a32..08023c5414a6 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <svtools/soerr.hxx>
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #include <unotools/saveopt.hxx>
 #include <unotools/localisationoptions.hxx>
 #include <tools/config.hxx>
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index 47bf98292316..addace134362 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -42,6 +42,7 @@
 #include "inettbc.hxx"
 #include "stbitem.hxx"
 #include <sfx2/navigat.hxx>
+#include <sfx2/taskpane.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/viewfrm.hxx>
 #include "partwnd.hxx"
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index f7cccf2712b8..3b26eae1858d 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -71,7 +71,7 @@ static WeakReference< XModuleUIConfigurationManagerSupplier > m_xModuleCfgMgrSup
 static WeakReference< XURLTransformer >                       m_xURLTransformer;
 static ModuleIdToImagegMgr                                    m_aModuleIdToImageMgrMap;
 
-Image SAL_CALL GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast )
+Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast )
 {
     // TODO/LATeR: shouldn't this become a method at SfxViewFrame?! That would save the UnoTunnel
     if ( !rFrame.is() )
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index c8a9742f49cf..895263ef4783 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -49,6 +49,8 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svl/intitem.hxx>
+#include "sfx2/taskpane.hxx"
+#include <tools/diagnose_ex.h>
 
 #define SfxModule
 #include "sfxslots.hxx"
@@ -400,6 +402,17 @@ BOOL SfxModule::IsActive() const
     return FALSE;
 }
 
+bool SfxModule::IsChildWindowAvailable( const USHORT i_nId, const SfxViewFrame* i_pViewFrame ) const
+{
+    if ( i_nId != SID_TASKPANE )
+        // by default, assume it is
+        return true;
+
+    const SfxViewFrame* pViewFrame = i_pViewFrame ? i_pViewFrame : GetFrame();
+    ENSURE_OR_RETURN( pViewFrame, "SfxModule::IsChildWindowAvailable: no frame to ask for the module identifier!", false );
+    return ::sfx2::ModuleTaskPane::ModuleHasToolPanels( pViewFrame->GetFrame().GetFrameInterface() );
+}
+
 SfxModule* SfxModule::GetActiveModule( SfxViewFrame* pFrame )
 {
     if ( !pFrame )
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 24cf7dab8095..f9a388deee5c 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -53,6 +53,7 @@
 #include <vcl/taskpanelist.hxx>
 #include <vcl/toolbox.hxx>
 #include <tools/rcid.h>
+#include <tools/diagnose_ex.h>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemiter.hxx>
@@ -1538,6 +1539,16 @@ void SfxWorkWindow::UpdateObjectBars_Impl()
     }
 }
 
+bool SfxWorkWindow::AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const
+{
+    // or checking the availability of child windows, we need access to the module
+    const SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
+    const SfxObjectShell* pShell = pViewFrame ? pViewFrame->GetObjectShell() : NULL;
+    const SfxModule* pModule = pShell ? pShell->GetModule() : NULL;
+    ENSURE_OR_RETURN( pModule, "SfxWorkWindow::UpdateChildWindows_Impl: did not find an SfxModule to ask for the child win availability!", true );
+    return pModule->IsChildWindowAvailable( i_rCW.nId, pViewFrame );
+}
+
 void SfxWorkWindow::UpdateChildWindows_Impl()
 {
     // alle vorhandenen oder in den Kontext gekommenen ChildWindows
@@ -1550,7 +1561,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
         {
             // Im Kontext ist ein geeignetes ChildWindow erlaubt;
             // ist es auch eingeschaltet ?
-            if ( pChildWin == 0 && pCW->bCreate )
+            if ( pChildWin == NULL && pCW->bCreate )
             {
                 // Internal docking is only used for embedding into another
                 // container. We force the floating state of all floatable
@@ -1571,6 +1582,9 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
                 else
                     bCreate = TRUE;
 
+                if ( bCreate )
+                    bCreate = AllowChildWindowCreation_Impl( *pCW );
+
                 // Momentan kein Fenster da, aber es ist eingeschaltet; Fenster
                 // und ggf. Context erzeugen
                 if ( bCreate )
@@ -1588,19 +1602,25 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
                 if ( ( !bIsFullScreen || pChildWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT ) && bAllChildsVisible )
                 {
                     // Updatemode ist kompatibel; auf jeden Fall wieder einschalten
-                    bCreate = TRUE;
-                    if ( pCW->pCli )
+                    bCreate = AllowChildWindowCreation_Impl( *pCW );
+                    if ( bCreate )
                     {
-                        // Fenster ist direktes Child
-                        if ( bAllChildsVisible && ( (IsDockingAllowed() && bInternalDockingAllowed) || pCW->pCli->eAlign == SFX_ALIGN_NOALIGNMENT ) )
-                            pCW->pCli->nVisible |= CHILD_NOT_HIDDEN;
+                        if ( pCW->pCli )
+                        {
+                            // Fenster ist direktes Child
+                            if ( bAllChildsVisible && ( (IsDockingAllowed() && bInternalDockingAllowed) || pCW->pCli->eAlign == SFX_ALIGN_NOALIGNMENT ) )
+                                pCW->pCli->nVisible |= CHILD_NOT_HIDDEN;
+                        }
+                        else
+                        {
+                            if ( pCW->bCreate && IsDockingAllowed() && bInternalDockingAllowed )
+                                // Fenster liegt in einem SplitWindow
+                                ((SfxDockingWindow*)pChildWin->GetWindow())->Reappear_Impl();
+                        }
+
+                        if ( pCW->nInterfaceId != pChildWin->GetContextId() )
+                            pChildWin->CreateContext( pCW->nInterfaceId, GetBindings() );
                     }
-                    else if ( pCW->bCreate && IsDockingAllowed() && bInternalDockingAllowed )
-                        // Fenster liegt in einem SplitWindow
-                        ((SfxDockingWindow*)pChildWin->GetWindow())->Reappear_Impl();
-
-                    if ( pCW->nInterfaceId != pChildWin->GetContextId() )
-                        pChildWin->CreateContext( pCW->nInterfaceId, GetBindings() );
                 }
             }
         }
@@ -2225,7 +2245,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
         SfxChildWin_Impl *pCW = (*pChildWins)[n];
         SfxChildWindow *pChild = pCW->pWin;
 
-        bool bCreationAllowed( sal_True );
+        bool bCreationAllowed( true );
         if ( !bInternalDockingAllowed )
         {
             // Special case for all non-floatable child windows. We have
@@ -2233,43 +2253,51 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
             bCreationAllowed = !( pCW->aInfo.nFlags & SFX_CHILDWIN_FORCEDOCK );
         }
 
-        if ( pChild && pCW->bCreate && bCreationAllowed )
+        if ( bCreationAllowed )
         {
-            if ( pChild->QueryClose() )
+            if ( pCW->bCreate )
             {
-                if ( pChild && pChild->IsHideAtToggle() )
+                if ( pChild )
                 {
-                    pCW->bCreate = !pCW->bCreate;
-                    ShowChildWindow_Impl( nId, pCW->bCreate, bSetFocus );
+                    if ( pChild->QueryClose() )
+                    {
+                        pCW->bCreate = FALSE;
+                        if ( pChild->IsHideAtToggle() )
+                        {
+                            ShowChildWindow_Impl( nId, FALSE, bSetFocus );
+                        }
+                        else
+                        {
+                            // Fenster soll ausgeschaltet werdem
+                            pChild->SetVisible_Impl( FALSE );
+                            RemoveChildWin_Impl( pCW );
+                        }
+                    }
                 }
                 else
                 {
-                    // Fenster soll ausgeschaltet werdem
+                    // no actual Window exists, yet => just remember the "switched off" state
                     pCW->bCreate = FALSE;
-                    pChild->SetVisible_Impl( FALSE );
-                    RemoveChildWin_Impl( pCW );
                 }
             }
-        }
-        else if ( pCW->bCreate && bCreationAllowed )
-        {
-            pCW->bCreate = FALSE;
-        }
-        else if ( bCreationAllowed )
-        {
-            pCW->bCreate = TRUE;
-
-            if ( pChild )
-            {
-                ShowChildWindow_Impl( nId, pCW->bCreate, bSetFocus );
-            }
             else
             {
-                // Fenster erzeugen
-                CreateChildWin_Impl( pCW, bSetFocus );
-                if ( !pCW->pWin )
-                    // Erzeugung war erfolglos
-                    pCW->bCreate = FALSE;
+                pCW->bCreate = AllowChildWindowCreation_Impl( *pCW );
+                if ( pCW->bCreate )
+                {
+                    if ( pChild )
+                    {
+                        ShowChildWindow_Impl( nId, TRUE, bSetFocus );
+                    }
+                    else
+                    {
+                        // create actual Window
+                        CreateChildWin_Impl( pCW, bSetFocus );
+                        if ( !pCW->pWin )
+                            // no success
+                            pCW->bCreate = FALSE;
+                    }
+                }
             }
         }
 
@@ -2488,7 +2516,6 @@ void SfxWorkWindow::ShowChildWindow_Impl(USHORT nId, BOOL bVisible, BOOL bSetFoc
         SfxChildWindow *pChildWin = pCW->pWin;
         if ( pChildWin )
         {
-//          pCW->bCreate = bVisible;
             if ( bVisible )
             {
                 if ( pCW->pCli )
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index f1e100e17cf5..7f03bf416431 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -39,54 +39,24 @@
 
 #define RID_DLG_ALIEN_WARNING           ( RC_DIALOG_BEGIN + 0)
 #define STR_RESET                       ( RC_DIALOG_BEGIN + 0)
-#define STR_BASEFMT                     ( RC_DIALOG_BEGIN + 1)
 
-#define CB_USE_PASSWD                   ( RC_DIALOG_BEGIN + 2)
-#define CB_READ_ONLY                    ( RC_DIALOG_BEGIN + 3)
-#define BTN_MANAGER                     ( RC_DIALOG_BEGIN + 4)
-#define BTN_STANDARD                    ( RC_DIALOG_BEGIN + 5)
 #define DLG_PASSWD                      ( RC_DIALOG_BEGIN + 8)
-#define STR_FILEDLG_INSERT              ( RC_DIALOG_BEGIN + 10)
 #define STR_TABPAGE_MANAGESTYLES        ( RC_DIALOG_BEGIN + 12)
 #define MSG_TABPAGE_INVALIDNAME         ( RC_DIALOG_BEGIN + 13)
 #define MSG_TABPAGE_INVALIDSTYLE        ( RC_DIALOG_BEGIN + 14)
 #define DLG_NEW_STYLE_BY_EXAMPLE        ( RC_DIALOG_BEGIN + 15)
 #define MSG_POOL_STYLE_NAME             ( RC_DIALOG_BEGIN + 16)
-#define MSG_OVERWRITE_STYLE             ( RC_DIALOG_BEGIN + 17)
 #define MSG_TABPAGE_INVALIDPARENT       ( RC_DIALOG_BEGIN + 18)
 
 #define STR_DELETE_STYLE                ( RC_DIALOG_BEGIN + 18)
 #define STR_DELETE_STYLE_USED           ( RC_DIALOG_BEGIN + 20)
 
-#define LOGO_IMAGELIST                  ( RC_DIALOG_BEGIN + 45)
 #define MN_CONTEXT_TEMPLDLG             ( RC_DIALOG_BEGIN + 46)
 
-#define MSG_LAYOUT_NOT_LOADING          ( RC_DIALOG_BEGIN + 49)
-#define ACC_LAYOUT_NOT_LOADING          ( RC_DIALOG_BEGIN + 50)
-
-#define MSG_ERR_CANT_EDIT_OLD_FORMAT    ( RC_DIALOG_BEGIN + 60 )
-#define MSG_ERR_CANT_EDIT_OPEN_DOCS     ( RC_DIALOG_BEGIN + 61 )
-
-#define RID_URLOPEN                     ( RC_DIALOG_BEGIN + 62 )
-#define RID_URLOPEN_OK                  1
-#define RID_URLOPEN_CANCEL              2
-#define RID_URLOPEN_URL                 3
-
-#define CB_FILE                         ( RC_DIALOG_BEGIN + 63 )
-#define CB_URL                          ( RC_DIALOG_BEGIN + 64 )
-
-#define STR_INTERNET                    ( RC_DIALOG_BEGIN + 65 )
-#define RID_AUTOHIDE                    ( RC_DIALOG_BEGIN + 66 )
-
-#define DLG_ONLINE_REGISTER             ( RC_DIALOG_BEGIN + 68 )
 #define DLG_VERSIONS                    ( RC_DIALOG_BEGIN + 69 )
 #define DLG_COMMENTS                    ( RC_DIALOG_BEGIN + 70 )
 
-#define RID_REGISTER_DLG                ( RC_DIALOG_BEGIN + 73 )
-#define DLG_PHONE_CONFIGURATION         ( RC_DIALOG_BEGIN + 74 )
-#define DLG_RECOGNIZER_ENGINEMODE       ( RC_DIALOG_BEGIN + 75 )
 #define MSG_ERROR_WRONG_CONFIRM         ( RC_DIALOG_BEGIN + 76 )
-#define DLG_RECOGNIZER_SPEAKER          ( RC_DIALOG_BEGIN + 77 )
 
 #define STR_APPLY                       ( RC_DIALOG_BEGIN + 87 )
 
@@ -104,7 +74,6 @@
 #define RID_DLG_SEARCH                  ( RC_DIALOG_BEGIN + 109 )
 
 #define STR_PDF_EXPORT_SEND             ( RC_DIALOG_BEGIN + 120 )
-#define STR_RECHECK_DOCUMENT            ( RC_DIALOG_BEGIN + 121 )
 #define IMG_INFO                        ( RC_DIALOG_BEGIN + 122 )
 #define RID_EDIT_DURATIONS              ( RC_DIALOG_BEGIN + 123 )
 #define SFX_PB_EDIT                     ( RC_DIALOG_BEGIN + 124 )
diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src
index a54d2c340d04..c39425510ae2 100644
--- a/sfx2/source/dialog/dialog.src
+++ b/sfx2/source/dialog/dialog.src
@@ -31,30 +31,6 @@
 #include "helpid.hrc"
 #include "sfxlocal.hrc"
 
- // Imageliste fuer die AboutBox
-ImageList LOGO_IMAGELIST
-{
-    Prefix = "an";
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-    IdList =
-    {
-        1 ;
-        2 ;
-        3 ;
-        4 ;
-        5 ;
-        6 ;
-    };
-    IdCount =
-    {
-        6 ;
-    };
-};
 String STR_RESET
 {
     Text [ en-US ] = "~Reset" ;
@@ -63,48 +39,6 @@ String STR_APPLY
 {
     Text [ en-US ] = "Apply";
 };
-String STR_INTERNET
-{
-    Text [ en-US ] = "(Internet)" ;
-};
-String STR_BASEFMT
-{
-    Text [ en-US ] = "Base format" ;
-};
-CheckBox CB_USE_PASSWD
-{
-    HelpId = HID_FILEDLG_USE_PASSWD ;
-    Text [ en-US ] = "~Password" ;
-};
-CheckBox CB_READ_ONLY
-{
-    HelpId = HID_FILEDLG_READ_ONLY ;
-    Text [ en-US ] = "~Read-only" ;
-};
-PushButton CB_FILE
-{
-    HelpId = HID_FILEDLG_FILE ;
-    Text [ en-US ] = "~File System" ;
-};
-PushButton CB_URL
-{
-    HelpId = HID_FILEDLG_URL ;
-    Text [ en-US ] = "Int~ernet" ;
-};
-PushButton BTN_MANAGER
-{
-    HelpId = HID_FILEDLG_MANAGER ;
-    Text [ en-US ] = "~Manager..." ;
-};
-PushButton BTN_STANDARD
-{
-    HelpId = HID_FILEDLG_STANDARD ;
-    Text [ en-US ] = "~Home" ;
-};
-String STR_FILEDLG_INSERT
-{
-    Text [ en-US ] = "Insert File" ;
-};
 String STR_TABPAGE_MANAGESTYLES
 {
     Text [ en-US ] = "Organizer" ;
@@ -131,12 +65,6 @@ InfoBox MSG_POOL_STYLE_NAME
 {
     Message [ en-US ] = "Name already exists as a default Style.\nPlease choose another name." ;
 };
-QueryBox MSG_OVERWRITE_STYLE
-{
-    Buttons = WB_YES_NO ;
-    DefButton = WB_DEF_NO ;
-    Message [ en-US ] = "Style already exists. Overwrite?" ;
-};
 String STR_DELETE_STYLE
 {
     Text [ en-US ] = "Do you really want to delete Style $1?" ;
@@ -170,87 +98,15 @@ Menu MN_CONTEXT_TEMPLDLG
     };
 };
 
-InfoBox MSG_LAYOUT_NOT_LOADING
-{
-    BUTTONS = WB_OK ;
-    DEFBUTTON = WB_DEF_OK ;
-    Message [ en-US ] = "Loading document without layout." ;
-};
-Accelerator ACC_LAYOUT_NOT_LOADING
-{
-    ItemList =
-    {
-        AcceleratorItem
-        {
-            Key = KeyCode
-            {
-                Code = KEY_L ;
-                Shift = FALSE ; Modifier1 = TRUE ; Modifier2 = TRUE ;
-            };
-            Identifier = 1 ;
-        };
-    };
-};
  //------------------------------------------------------------------------
-ErrorBox MSG_ERR_CANT_EDIT_OLD_FORMAT
-{
-    Message [ en-US ] = "Cannot edit document info for documents\n in this file format." ;
-};
- //------------------------------------------------------------------------
-ErrorBox MSG_ERR_CANT_EDIT_OPEN_DOCS
-{
-    Message [ en-US ] = "Document info of documents\n being currently edited cannot be modified from within the document manager." ;
-};
-ModalDialog RID_URLOPEN
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 204 , 44 ) ;
-    Moveable = TRUE ;
-    Text [ en-US ] = "Enter URL" ;
-    Moveable = TRUE ;
-    OKButton RID_URLOPEN_OK
-    {
-        Pos = MAP_APPFONT ( 148 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton RID_URLOPEN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 148 , 24 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    Edit RID_URLOPEN_URL
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 16 ) ;
-        Size = MAP_APPFONT ( 138 , 12 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-    };
-};
-Menu RID_AUTOHIDE
-{
-    ItemList =
-    {
-        MenuItem
-        {
-            Identifier = SID_AUTOHIDE ;
-            HelpID = SID_AUTOHIDE ;
-            Text [ en-US ] = "Hide" ;
-        };
-    };
-};
-String RID_AUTOHIDE
-{
-    Text [ en-US ] = "Don't Hide" ;
-};
 String SID_NAVIGATOR
 {
     Text [ en-US ] = "Navigator";
 };
+String SID_TASKPANE
+{
+    Text [ en-US ] = "Task Pane";
+};
 
 ErrorBox MSG_ERROR_WRONG_CONFIRM
 {
@@ -264,11 +120,6 @@ String STR_PDF_EXPORT_SEND
   Text [ en-US ] = "Send" ;
 };
 
-String STR_RECHECK_DOCUMENT
-{
-  Text [ en-US ] = "Recheck Document" ;
-};
-
 Image IMG_INFO
 {
     ImageBitmap = Bitmap
diff --git a/sfx2/source/dialog/makefile.mk b/sfx2/source/dialog/makefile.mk
index 87ef0f1a7af1..3d0c53cdb932 100644
--- a/sfx2/source/dialog/makefile.mk
+++ b/sfx2/source/dialog/makefile.mk
@@ -45,7 +45,8 @@ EXCEPTIONSFILES=\
         $(SLO)$/recfloat.obj        \
         $(SLO)$/templdlg.obj        \
         $(SLO)$/dinfdlg.obj         \
-        $(SLO)$/dockwin.obj
+        $(SLO)$/dockwin.obj         \
+        $(SLO)$/taskpane.obj
 
 SLOFILES =\
         $(EXCEPTIONSFILES)			\
@@ -60,7 +61,6 @@ SLOFILES =\
         $(SLO)$/passwd.obj			\
         $(SLO)$/printopt.obj		\
         $(SLO)$/sfxdlg.obj          \
-        $(SLO)$/sfxurl.obj			\
         $(SLO)$/splitwin.obj		\
         $(SLO)$/srchdlg.obj         \
         $(SLO)$/styfitem.obj		\
@@ -68,7 +68,8 @@ SLOFILES =\
         $(SLO)$/tabdlg.obj			\
         $(SLO)$/tplcitem.obj		\
         $(SLO)$/tplpitem.obj		\
-        $(SLO)$/versdlg.obj
+        $(SLO)$/versdlg.obj         \
+        $(SLO)$/titledockwin.obj
 
 SRS1NAME=$(TARGET)
 SRC1FILES =\
@@ -85,7 +86,9 @@ SRC1FILES =\
         templdlg.src		\
         versdlg.src			\
         printopt.src        \
-        srchdlg.src
+        srchdlg.src         \
+        titledockwin.src    \
+        taskpane.src
 
 .IF "$(BUILD_VER_STRING)"!=""
 .IF "$(GUI)"=="UNX"
@@ -102,9 +105,9 @@ CFLAGS+=-DBUILD_VER_STRING="$(subst,",\" "$(BUILD_VER_STRING)")"
 $(INCCOM)$/cuilib.hxx: makefile.mk
 .IF "$(GUI)"=="UNX"
     $(RM) $@
-    echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@
+    @echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@
 .ELSE
-    echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
+    @echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
 .ENDIF
 
 $(SLO)$/sfxdlg.obj : $(INCCOM)$/cuilib.hxx
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
new file mode 100644
index 000000000000..f25485a1401c
--- /dev/null
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -0,0 +1,1283 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_sfx2.hxx"
+
+#include "sfx2/taskpane.hxx"
+#include "imagemgr.hxx"
+#include "sfx2/sfxsids.hrc"
+#include "sfx2/bindings.hxx"
+#include "sfx2/dispatch.hxx"
+#include "sfxresid.hxx"
+#include "sfxlocal.hrc"
+#include "helpid.hrc"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/ui/XToolPanel.hpp>
+#include <com/sun/star/ui/XUIElementFactory.hpp>
+#include <com/sun/star/awt/XWindowPeer.hpp>
+#include <com/sun/star/awt/PosSize.hpp>
+#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/graphic/XGraphicProvider.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/awt/XControl.hpp>
+/** === end UNO includes === **/
+
+#include <comphelper/componentcontext.hxx>
+#include <comphelper/namedvaluecollection.hxx>
+#include <comphelper/types.hxx>
+#include <comphelper/processfactory.hxx>
+#include <tools/diagnose_ex.h>
+#include <svtools/toolpanel/toolpaneldeck.hxx>
+#include <svtools/toolpanel/tablayouter.hxx>
+#include <svtools/toolpanel/drawerlayouter.hxx>
+#include <unotools/confignode.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/svapp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+
+#include <boost/noncopyable.hpp>
+
+//......................................................................................................................
+namespace sfx2
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::frame::XModuleManager;
+    using ::com::sun::star::container::XNameAccess;
+    using ::com::sun::star::ui::XToolPanel;
+    using ::com::sun::star::ui::XUIElementFactory;
+    using ::com::sun::star::ui::XUIElement;
+    using ::com::sun::star::awt::XWindow;
+    using ::com::sun::star::frame::XModuleManager;
+    using ::com::sun::star::frame::XFrame;
+    using ::com::sun::star::lang::XComponent;
+    using ::com::sun::star::graphic::XGraphicProvider;
+    using ::com::sun::star::graphic::XGraphic;
+    using ::com::sun::star::accessibility::XAccessible;
+    using ::com::sun::star::awt::XControl;
+    /** === end UNO using === **/
+    namespace PosSize = ::com::sun::star::awt::PosSize;
+
+    //==================================================================================================================
+    //= helpers
+    //==================================================================================================================
+    namespace
+    {
+        //--------------------------------------------------------------------------------------------------------------
+        ::utl::OConfigurationTreeRoot lcl_getModuleUIElementStatesConfig( const ::rtl::OUString& i_rModuleIdentifier,
+            const ::rtl::OUString& i_rResourceURL = ::rtl::OUString() )
+        {
+            const ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
+            ::rtl::OUStringBuffer aPathComposer;
+            try
+            {
+                const Reference< XNameAccess > xModuleAccess( aContext.createComponent( "com.sun.star.frame.ModuleManager" ), UNO_QUERY_THROW );
+                const ::comphelper::NamedValueCollection aModuleProps( xModuleAccess->getByName( i_rModuleIdentifier ) );
+
+                const ::rtl::OUString sWindowStateRef( aModuleProps.getOrDefault( "ooSetupFactoryWindowStateConfigRef", ::rtl::OUString() ) );
+
+                aPathComposer.appendAscii( "org.openoffice.Office.UI." );
+                aPathComposer.append( sWindowStateRef );
+                aPathComposer.appendAscii( "/UIElements/States" );
+                if ( i_rResourceURL.getLength() )
+                {
+                    aPathComposer.appendAscii( "/" );
+                    aPathComposer.append( i_rResourceURL );
+                }
+            }
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
+            return ::utl::OConfigurationTreeRoot( aContext, aPathComposer.makeStringAndClear(), false );
+        }
+
+        //--------------------------------------------------------------------------------------------------------------
+        ::rtl::OUString lcl_identifyModule( const Reference< XFrame >& i_rDocumentFrame )
+        {
+            ::rtl::OUString sModuleName;
+            try
+            {
+                const ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
+                const Reference< XModuleManager > xModuleManager( aContext.createComponent( "com.sun.star.frame.ModuleManager" ), UNO_QUERY_THROW );
+                sModuleName = xModuleManager->identify( i_rDocumentFrame );
+            }
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
+            return sModuleName;
+        }
+
+        //--------------------------------------------------------------------------------------------------------------
+        Reference< XFrame > lcl_getFrame( const SfxBindings* i_pBindings )
+        {
+            const SfxViewFrame* pViewFrame = i_pBindings->GetDispatcher()->GetFrame();
+            const SfxFrame& rFrame = pViewFrame->GetFrame();
+            const Reference< XFrame > xFrame( rFrame.GetFrameInterface() );
+            return xFrame;
+        }
+
+        //--------------------------------------------------------------------------------------------------------------
+        ::rtl::OUString lcl_getPanelHelpURL( const ::utl::OConfigurationNode& i_rPanelConfigNode )
+        {
+            const ::rtl::OUString sHelpURL( ::comphelper::getString( i_rPanelConfigNode.getNodeValue( "HelpURL" ) ) );
+            return sHelpURL;
+        }
+
+        //--------------------------------------------------------------------------------------------------------------
+        Image lcl_getPanelImage( const Reference< XFrame >& i_rDocFrame, const ::utl::OConfigurationNode& i_rPanelConfigNode )
+        {
+            const ::rtl::OUString sImageURL( ::comphelper::getString( i_rPanelConfigNode.getNodeValue( "ImageURL" ) ) );
+            if ( sImageURL.getLength() )
+            {
+                try
+                {
+                    ::comphelper::NamedValueCollection aMediaProperties;
+                    aMediaProperties.put( "URL", sImageURL );
+
+                    // special handling: if the ImageURL denotes a CommandName, then retrieve the image for that command
+                    const sal_Char* pCommandImagePrefix = "private:commandimage/";
+                    const sal_Int32 nCommandImagePrefixLen = strlen( pCommandImagePrefix );
+                    if ( sImageURL.compareToAscii( pCommandImagePrefix, nCommandImagePrefixLen ) == 0 )
+                    {
+                        ::rtl::OUStringBuffer aCommandName;
+                        aCommandName.appendAscii( ".uno:" );
+                        aCommandName.append( sImageURL.copy( nCommandImagePrefixLen ) );
+                        const ::rtl::OUString sCommandName( aCommandName.makeStringAndClear() );
+
+                        const BOOL bHiContrast( Application::GetSettings().GetStyleSettings().GetHighContrastMode() );
+                        const Image aPanelImage( GetImage( i_rDocFrame, sCommandName, FALSE, bHiContrast ) );
+                        return aPanelImage.GetXGraphic();
+                    }
+
+                    // otherwise, delegate to the GraphicProvider
+                    const ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
+                    const Reference< XGraphicProvider > xGraphicProvider( aContext.createComponent( "com.sun.star.graphic.GraphicProvider" ), UNO_QUERY_THROW );
+
+                    const Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties.getPropertyValues() ), UNO_SET_THROW );
+                    return Image( xGraphic );
+                }
+                catch( const Exception& )
+                {
+                    DBG_UNHANDLED_EXCEPTION();
+                }
+            }
+            return Image();
+        }
+    }
+
+    //==================================================================================================================
+    //= TaskPaneDockingWindow
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    TaskPaneDockingWindow::TaskPaneDockingWindow( SfxBindings* i_pBindings, TaskPaneWrapper& i_rWrapper, Window* i_pParent, WinBits i_nBits )
+        :TitledDockingWindow( i_pBindings, &i_rWrapper, i_pParent, i_nBits )
+        ,m_aTaskPane( GetContentWindow(), lcl_getFrame( i_pBindings ) )
+        ,m_aPaneController( m_aTaskPane, *this )
+    {
+        m_aTaskPane.Show();
+        SetText( String( SfxResId( SID_TASKPANE ) ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TaskPaneDockingWindow::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL )
+    {
+        m_aPaneController.ActivateToolPanel( i_rPanelURL );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TaskPaneDockingWindow::GetFocus()
+    {
+        TitledDockingWindow::GetFocus();
+        m_aTaskPane.GrabFocus();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TaskPaneDockingWindow::onLayoutDone()
+    {
+        m_aTaskPane.SetPosSizePixel( Point(), GetContentWindow().GetOutputSizePixel() );
+    }
+
+    //==================================================================================================================
+    //= TaskPaneWrapper
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    SFX_IMPL_DOCKINGWINDOW( TaskPaneWrapper, SID_TASKPANE );
+
+    //------------------------------------------------------------------------------------------------------------------
+    TaskPaneWrapper::TaskPaneWrapper( Window* i_pParent, USHORT i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo )
+        :SfxChildWindow( i_pParent, i_nId )
+    {
+        pWindow = new TaskPaneDockingWindow( i_pBindings, *this, i_pParent,
+            WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE);
+        eChildAlignment = SFX_ALIGN_RIGHT;
+
+        pWindow->SetHelpId( HID_TASKPANE_WINDOW );
+        pWindow->SetOutputSizePixel( Size( 300, 450 ) );
+        pWindow->Show();
+
+        dynamic_cast< SfxDockingWindow* >( pWindow )->Initialize( i_pInfo );
+        SetHideNotDelete( TRUE );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TaskPaneWrapper::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL )
+    {
+        TaskPaneDockingWindow* pDockingWindow = dynamic_cast< TaskPaneDockingWindow* >( GetWindow() );
+        ENSURE_OR_RETURN_VOID( pDockingWindow, "TaskPaneWrapper::ActivateToolPanel: invalid docking window implementation!" );
+        pDockingWindow->ActivateToolPanel( i_rPanelURL );
+    }
+
+    //==================================================================================================================
+    //= CustomPanelUIElement
+    //==================================================================================================================
+    class CustomPanelUIElement
+    {
+    public:
+        CustomPanelUIElement()
+            :m_xUIElement()
+            ,m_xToolPanel()
+            ,m_xPanelWindow()
+        {
+        }
+
+        CustomPanelUIElement( const Reference< XUIElement >& i_rUIElement )
+            :m_xUIElement( i_rUIElement, UNO_SET_THROW )
+            ,m_xToolPanel( i_rUIElement->getRealInterface(), UNO_QUERY_THROW )
+            ,m_xPanelWindow( m_xToolPanel->getWindow(), UNO_SET_THROW )
+        {
+        }
+
+        bool is() const { return m_xPanelWindow.is(); }
+
+        const Reference< XUIElement >&  getUIElement() const { return m_xUIElement; }
+        const Reference< XToolPanel >&  getToolPanel() const { return m_xToolPanel; }
+        const Reference< XWindow >&     getPanelWindow() const { return m_xPanelWindow; }
+
+    private:
+        Reference< XUIElement > m_xUIElement;
+        Reference< XToolPanel > m_xToolPanel;
+        Reference< XWindow >    m_xPanelWindow;
+    };
+
+    //==================================================================================================================
+    //= CustomToolPanel
+    //==================================================================================================================
+    class CustomToolPanel : public ::svt::ToolPanelBase
+    {
+    public:
+        CustomToolPanel( const ::utl::OConfigurationNode& i_rPanelWindowState, const Reference< XFrame >& i_rFrame );
+
+        virtual ::rtl::OUString GetDisplayName() const;
+        virtual Image GetImage() const;
+        virtual SmartId GetHelpID() const;
+        virtual void Activate( Window& i_rParentWindow );
+        virtual void Deactivate();
+        virtual void SetSizePixel( const Size& i_rPanelWindowSize );
+        virtual void GrabFocus();
+        virtual void Dispose();
+        virtual Reference< XAccessible >
+                    CreatePanelAccessible( const Reference< XAccessible >& i_rParentAccessible );
+
+        const ::rtl::OUString&
+                    GetResourceURL() const { return m_sResourceURL; }
+
+    protected:
+        ~CustomToolPanel();
+
+    private:
+        bool    impl_ensureToolPanelWindow( Window& i_rPanelParentWindow );
+        void    impl_updatePanelConfig( const bool i_bVisible ) const;
+
+    private:
+        const ::rtl::OUString   m_sUIName;
+        const Image             m_aPanelImage;
+        const ::rtl::OUString   m_aPanelHelpURL;
+        const ::rtl::OUString   m_sResourceURL;
+        const ::rtl::OUString   m_sPanelConfigPath;
+        Reference< XFrame >     m_xFrame;
+        CustomPanelUIElement    m_aCustomPanel;
+        bool                    m_bAttemptedCreation;
+    };
+
+    //------------------------------------------------------------------------------------------------------------------
+    CustomToolPanel::CustomToolPanel( const ::utl::OConfigurationNode& i_rPanelWindowState, const Reference< XFrame >& i_rFrame )
+        :m_sUIName( ::comphelper::getString( i_rPanelWindowState.getNodeValue( "UIName" ) ) )
+        ,m_aPanelImage( lcl_getPanelImage( i_rFrame, i_rPanelWindowState ) )
+        ,m_aPanelHelpURL( lcl_getPanelHelpURL( i_rPanelWindowState ) )
+        ,m_sResourceURL( i_rPanelWindowState.getLocalName() )
+        ,m_sPanelConfigPath( i_rPanelWindowState.getNodePath() )
+        ,m_xFrame( i_rFrame )
+        ,m_aCustomPanel()
+        ,m_bAttemptedCreation( false )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    CustomToolPanel::~CustomToolPanel()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    bool CustomToolPanel::impl_ensureToolPanelWindow( Window& i_rPanelParentWindow )
+    {
+        if ( m_bAttemptedCreation )
+            return m_aCustomPanel.is();
+
+        m_bAttemptedCreation = true;
+        try
+        {
+            const ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
+            const Reference< XUIElementFactory > xFactory( aContext.createComponent( "com.sun.star.ui.UIElementFactoryManager" ), UNO_QUERY_THROW );
+
+            ::comphelper::NamedValueCollection aCreationArgs;
+            aCreationArgs.put( "Frame", makeAny( m_xFrame ) );
+            aCreationArgs.put( "ParentWindow", makeAny( i_rPanelParentWindow.GetComponentInterface() ) );
+
+            const Reference< XUIElement > xElement(
+                xFactory->createUIElement( m_sResourceURL, aCreationArgs.getPropertyValues() ),
+                UNO_SET_THROW );
+
+            m_aCustomPanel = CustomPanelUIElement( xElement );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        return m_aCustomPanel.is();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void CustomToolPanel::impl_updatePanelConfig( const bool i_bVisible ) const
+    {
+        ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
+        ::utl::OConfigurationTreeRoot aConfig( aContext, m_sPanelConfigPath, true );
+
+        aConfig.setNodeValue( "Visible", makeAny( i_bVisible ) );
+        aConfig.commit();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString CustomToolPanel::GetDisplayName() const
+    {
+        return m_sUIName;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Image CustomToolPanel::GetImage() const
+    {
+        return m_aPanelImage;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    SmartId CustomToolPanel::GetHelpID() const
+    {
+        return SmartId( m_aPanelHelpURL );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void CustomToolPanel::Activate( Window& i_rParentWindow )
+    {
+        ENSURE_OR_RETURN_VOID( impl_ensureToolPanelWindow( i_rParentWindow ), "no panel to activate!" );
+
+        // TODO: we might need a mechanism to decide whether the panel should be destroyed/re-created, or (as it is
+        // done now) hidden/shown
+        m_aCustomPanel.getPanelWindow()->setVisible( sal_True );
+
+        // update the panel's configuration
+        impl_updatePanelConfig( true );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void CustomToolPanel::Deactivate()
+    {
+        ENSURE_OR_RETURN_VOID( m_aCustomPanel.is(), "no panel to deactivate!" );
+
+        m_aCustomPanel.getPanelWindow()->setVisible( sal_False );
+
+        // update the panel's configuration
+        impl_updatePanelConfig( false );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void CustomToolPanel::SetSizePixel( const Size& i_rPanelWindowSize )
+    {
+        ENSURE_OR_RETURN_VOID( m_aCustomPanel.is(), "no panel/window to position!" );
+
+        try
+        {
+            m_aCustomPanel.getPanelWindow()->setPosSize( 0, 0, i_rPanelWindowSize.Width(), i_rPanelWindowSize.Height(),
+                PosSize::POSSIZE );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void CustomToolPanel::GrabFocus()
+    {
+        ENSURE_OR_RETURN_VOID( m_aCustomPanel.is(), "no panel/window to focus!" );
+
+        m_aCustomPanel.getPanelWindow()->setFocus();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void CustomToolPanel::Dispose()
+    {
+        if ( !m_bAttemptedCreation )
+            // nothing to dispose
+            return;
+
+        ENSURE_OR_RETURN_VOID( m_aCustomPanel.is(), "no panel to destroy!" );
+        try
+        {
+            Reference< XComponent > xUIElementComponent( m_aCustomPanel.getUIElement(), UNO_QUERY_THROW );
+            xUIElementComponent->dispose();
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessible > CustomToolPanel::CreatePanelAccessible( const Reference< XAccessible >& i_rParentAccessible )
+    {
+        ENSURE_OR_RETURN( m_aCustomPanel.is(), "no panel to ask!", NULL );
+
+        Reference< XAccessible > xPanelAccessible;
+        try
+        {
+            xPanelAccessible.set( m_aCustomPanel.getToolPanel()->createAccessible( i_rParentAccessible ), UNO_SET_THROW );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        return xPanelAccessible;
+    }
+
+    //==================================================================================================================
+    //= ModuleTaskPane_Impl
+    //==================================================================================================================
+    class ModuleTaskPane_Impl : public ::boost::noncopyable
+    {
+    public:
+        ModuleTaskPane_Impl( ModuleTaskPane& i_rAntiImpl, const Reference< XFrame >& i_rDocumentFrame,
+                const IToolPanelCompare* i_pPanelCompare )
+            :m_rAntiImpl( i_rAntiImpl )
+            ,m_sModuleIdentifier( lcl_identifyModule( i_rDocumentFrame ) )
+            ,m_xFrame( i_rDocumentFrame )
+            ,m_aPanelDeck( i_rAntiImpl )
+        {
+            m_aPanelDeck.Show();
+            OnResize();
+            impl_initFromConfiguration( i_pPanelCompare );
+        }
+
+        ~ModuleTaskPane_Impl()
+        {
+        }
+
+        void    OnResize();
+        void    OnGetFocus();
+
+        static bool ModuleHasToolPanels( const ::rtl::OUString& i_rModuleIdentifier );
+
+              ::svt::ToolPanelDeck& GetPanelDeck()          { return m_aPanelDeck; }
+        const ::svt::ToolPanelDeck& GetPanelDeck() const    { return m_aPanelDeck; }
+
+        ::boost::optional< size_t >
+                    GetPanelPos( const ::rtl::OUString& i_rResourceURL );
+        ::rtl::OUString
+                    GetPanelResourceURL( const size_t i_nPanelPos ) const;
+
+        void        SetDrawersLayout();
+        void        SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent );
+
+    private:
+        void    impl_initFromConfiguration( const IToolPanelCompare* i_pPanelCompare );
+
+        static bool
+                impl_isToolPanelResource( const ::rtl::OUString& i_rResourceURL );
+
+        DECL_LINK( OnActivatePanel, void* );
+
+    private:
+        ModuleTaskPane&             m_rAntiImpl;
+        const ::rtl::OUString       m_sModuleIdentifier;
+        const Reference< XFrame >   m_xFrame;
+        ::svt::ToolPanelDeck        m_aPanelDeck;
+    };
+
+    //------------------------------------------------------------------------------------------------------------------
+    void ModuleTaskPane_Impl::OnResize()
+    {
+        m_aPanelDeck.SetPosSizePixel( Point(), m_rAntiImpl.GetOutputSizePixel() );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void ModuleTaskPane_Impl::OnGetFocus()
+    {
+        m_aPanelDeck.GrabFocus();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    IMPL_LINK( ModuleTaskPane_Impl, OnActivatePanel, void*, i_pArg )
+    {
+        m_aPanelDeck.ActivatePanel( reinterpret_cast< size_t >( i_pArg ) );
+        return 1L;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    bool ModuleTaskPane_Impl::impl_isToolPanelResource( const ::rtl::OUString& i_rResourceURL )
+    {
+        return i_rResourceURL.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:resource/toolpanel/" ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void ModuleTaskPane_Impl::impl_initFromConfiguration( const IToolPanelCompare* i_pPanelCompare )
+    {
+        const ::utl::OConfigurationTreeRoot aWindowStateConfig( lcl_getModuleUIElementStatesConfig( m_sModuleIdentifier ) );
+        if ( !aWindowStateConfig.isValid() )
+            return;
+
+        ::rtl::OUString sFirstVisiblePanelResource;
+
+        const Sequence< ::rtl::OUString > aUIElements( aWindowStateConfig.getNodeNames() );
+        for (   const ::rtl::OUString* resource = aUIElements.getConstArray();
+                resource != aUIElements.getConstArray() + aUIElements.getLength();
+                ++resource
+            )
+        {
+            if ( !impl_isToolPanelResource( *resource ) )
+                continue;
+
+            ::utl::OConfigurationNode aResourceNode( aWindowStateConfig.openNode( *resource ) );
+            ::svt::PToolPanel pCustomPanel( new CustomToolPanel( aResourceNode, m_xFrame ) );
+
+            size_t nPanelPos = m_aPanelDeck.GetPanelCount();
+            if ( i_pPanelCompare )
+            {
+                // assuming that nobody will insert hundreths of panels, a simple O(n) search should suffice here ...
+                while ( nPanelPos > 0 )
+                {
+                    const short nCompare = i_pPanelCompare->compareToolPanelsURLs(
+                        *resource,
+                        GetPanelResourceURL( --nPanelPos )
+                    );
+                    if ( nCompare >= 0 )
+                    {
+                        ++nPanelPos;
+                        break;
+                    }
+                }
+            }
+            nPanelPos = m_aPanelDeck.InsertPanel( pCustomPanel, nPanelPos );
+
+            if ( ::comphelper::getBOOL( aResourceNode.getNodeValue( "Visible" ) ) )
+                sFirstVisiblePanelResource = *resource;
+        }
+
+        if ( sFirstVisiblePanelResource.getLength() )
+        {
+            ::boost::optional< size_t > aPanelPos( GetPanelPos( sFirstVisiblePanelResource ) );
+            OSL_ENSURE( !!aPanelPos, "ModuleTaskPane_Impl::impl_isToolPanelResource: just inserted it, and it's not there?!" );
+            if ( !!aPanelPos )
+                m_rAntiImpl.PostUserEvent( LINK( this, ModuleTaskPane_Impl, OnActivatePanel ), reinterpret_cast< void* >( *aPanelPos ) );
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    bool ModuleTaskPane_Impl::ModuleHasToolPanels( const ::rtl::OUString& i_rModuleIdentifier )
+    {
+        const ::utl::OConfigurationTreeRoot aWindowStateConfig( lcl_getModuleUIElementStatesConfig( i_rModuleIdentifier ) );
+        if ( !aWindowStateConfig.isValid() )
+            return false;
+
+        const Sequence< ::rtl::OUString > aUIElements( aWindowStateConfig.getNodeNames() );
+        for (   const ::rtl::OUString* resource = aUIElements.getConstArray();
+                resource != aUIElements.getConstArray() + aUIElements.getLength();
+                ++resource
+            )
+        {
+            if ( impl_isToolPanelResource( *resource ) )
+                return true;
+        }
+        return false;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::boost::optional< size_t > ModuleTaskPane_Impl::GetPanelPos( const ::rtl::OUString& i_rResourceURL )
+    {
+        ::boost::optional< size_t > aPanelPos;
+        for ( size_t i = 0; i < m_aPanelDeck.GetPanelCount(); ++i )
+        {
+            const ::svt::PToolPanel pPanel( m_aPanelDeck.GetPanel( i ) );
+            const CustomToolPanel* pCustomPanel = dynamic_cast< const CustomToolPanel* >( pPanel.get() );
+            ENSURE_OR_CONTINUE( pCustomPanel != NULL, "ModuleTaskPane_Impl::GetPanelPos: illegal panel implementation!" );
+            if ( pCustomPanel->GetResourceURL() == i_rResourceURL )
+            {
+                aPanelPos = i;
+                break;
+            }
+        }
+        return aPanelPos;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString ModuleTaskPane_Impl::GetPanelResourceURL( const size_t i_nPanelPos ) const
+    {
+        ENSURE_OR_RETURN( i_nPanelPos < m_aPanelDeck.GetPanelCount(), "ModuleTaskPane_Impl::GetPanelResourceURL: illegal panel position!", ::rtl::OUString() );
+        const ::svt::PToolPanel pPanel( m_aPanelDeck.GetPanel( i_nPanelPos ) );
+        const CustomToolPanel* pCustomPanel = dynamic_cast< const CustomToolPanel* >( pPanel.get() );
+        ENSURE_OR_RETURN( pCustomPanel != NULL, "ModuleTaskPane_Impl::GetPanelPos: illegal panel implementation!", ::rtl::OUString() );
+        return pCustomPanel->GetResourceURL();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void ModuleTaskPane_Impl::SetDrawersLayout()
+    {
+        const ::svt::PDeckLayouter pLayouter( m_aPanelDeck.GetLayouter() );
+        const ::svt::DrawerDeckLayouter* pDrawerLayouter = dynamic_cast< const ::svt::DrawerDeckLayouter* >( pLayouter.get() );
+        if ( pDrawerLayouter != NULL )
+            // already have the proper layout
+            return;
+        m_aPanelDeck.SetLayouter( new ::svt::DrawerDeckLayouter( m_aPanelDeck, m_aPanelDeck ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void ModuleTaskPane_Impl::SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent )
+    {
+        ::svt::PDeckLayouter pLayouter( m_aPanelDeck.GetLayouter() );
+        ::svt::TabDeckLayouter* pTabLayouter = dynamic_cast< ::svt::TabDeckLayouter* >( pLayouter.get() );
+        if  (   ( pTabLayouter != NULL )
+            &&  ( pTabLayouter->GetTabAlignment() == i_eTabAlignment )
+            &&  ( pTabLayouter->GetTabItemContent() == i_eTabContent )
+            )
+            // already have the requested layout
+            return;
+
+        if ( pTabLayouter && ( pTabLayouter->GetTabAlignment() == i_eTabAlignment ) )
+        {
+            // changing only the item content does not require a new layouter instance
+            pTabLayouter->SetTabItemContent( i_eTabContent );
+            return;
+        }
+
+        m_aPanelDeck.SetLayouter( new ::svt::TabDeckLayouter( m_aPanelDeck, m_aPanelDeck, i_eTabAlignment, i_eTabContent ) );
+    }
+
+    //==================================================================================================================
+    //= ModuleTaskPane
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    ModuleTaskPane::ModuleTaskPane( Window& i_rParentWindow, const Reference< XFrame >& i_rDocumentFrame )
+        :Window( &i_rParentWindow, WB_DIALOGCONTROL )
+        ,m_pImpl( new ModuleTaskPane_Impl( *this, i_rDocumentFrame, NULL ) )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ModuleTaskPane::ModuleTaskPane( Window& i_rParentWindow, const Reference< XFrame >& i_rDocumentFrame,
+            const IToolPanelCompare& i_rCompare )
+        :Window( &i_rParentWindow, WB_DIALOGCONTROL )
+        ,m_pImpl( new ModuleTaskPane_Impl( *this, i_rDocumentFrame, &i_rCompare ) )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ModuleTaskPane::~ModuleTaskPane()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    bool ModuleTaskPane::ModuleHasToolPanels( const ::rtl::OUString& i_rModuleIdentifier )
+    {
+        return ModuleTaskPane_Impl::ModuleHasToolPanels( i_rModuleIdentifier );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    bool ModuleTaskPane::ModuleHasToolPanels( const Reference< XFrame >& i_rDocumentFrame )
+    {
+        return ModuleTaskPane_Impl::ModuleHasToolPanels( lcl_identifyModule( i_rDocumentFrame ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void ModuleTaskPane::Resize()
+    {
+        Window::Resize();
+        m_pImpl->OnResize();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void ModuleTaskPane::GetFocus()
+    {
+        Window::GetFocus();
+        m_pImpl->OnGetFocus();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::svt::ToolPanelDeck& ModuleTaskPane::GetPanelDeck()
+    {
+        return m_pImpl->GetPanelDeck();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    const ::svt::ToolPanelDeck& ModuleTaskPane::GetPanelDeck() const
+    {
+        return m_pImpl->GetPanelDeck();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::boost::optional< size_t > ModuleTaskPane::GetPanelPos( const ::rtl::OUString& i_rResourceURL )
+    {
+        return m_pImpl->GetPanelPos( i_rResourceURL );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString ModuleTaskPane::GetPanelResourceURL( const size_t i_nPanelPos ) const
+    {
+        return m_pImpl->GetPanelResourceURL( i_nPanelPos );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void ModuleTaskPane::SetDrawersLayout()
+    {
+        m_pImpl->SetDrawersLayout();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void ModuleTaskPane::SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent )
+    {
+        m_pImpl->SetTabsLayout( i_eTabAlignment, i_eTabContent );
+    }
+
+    // =====================================================================================================================
+    // = PanelSelectorLayout
+    // =====================================================================================================================
+    enum PanelSelectorLayout
+    {
+        LAYOUT_DRAWERS,
+        LAYOUT_TABS_RIGHT,
+        LAYOUT_TABS_LEFT,
+        LAYOUT_TABS_TOP,
+        LAYOUT_TABS_BOTTOM
+    };
+
+    //==================================================================================================================
+    //= helper
+    //==================================================================================================================
+    namespace
+    {
+        PanelSelectorLayout lcl_getTabLayoutFromAlignment( const SfxChildAlignment i_eAlignment )
+        {
+            switch ( i_eAlignment )
+            {
+            case SFX_ALIGN_LEFT:
+                return LAYOUT_TABS_LEFT;
+            case SFX_ALIGN_TOP:
+                return LAYOUT_TABS_TOP;
+            case SFX_ALIGN_BOTTOM:
+                return LAYOUT_TABS_BOTTOM;
+            default:
+                return LAYOUT_TABS_RIGHT;
+            }
+        }
+    }
+
+    // =====================================================================================================================
+    // = PanelDescriptor
+    // =====================================================================================================================
+    /** is a helper class for TaskPaneController_Impl, holding the details about a single panel which is not
+        contained in the IToolPanel implementation itself.
+    */
+    struct PanelDescriptor
+    {
+        ::svt::PToolPanel   pPanel;
+        bool                bHidden;
+
+        PanelDescriptor()
+            :pPanel()
+            ,bHidden( false )
+        {
+        }
+
+        PanelDescriptor( const ::svt::PToolPanel& i_rPanel )
+            :pPanel( i_rPanel )
+            ,bHidden( false )
+        {
+        }
+    };
+
+    //==================================================================================================================
+    //= TaskPaneController_Impl
+    //==================================================================================================================
+    class TaskPaneController_Impl   :public ::boost::noncopyable
+                                    ,public ::svt::IToolPanelDeckListener
+    {
+    public:
+        TaskPaneController_Impl(
+            ModuleTaskPane& i_rTaskPane,
+            TitledDockingWindow& i_rDockingWindow
+        );
+        ~TaskPaneController_Impl();
+
+        void    SetDefaultTitle( const String& i_rTitle );
+        void    ActivateToolPanel( const ::rtl::OUString& i_rPanelURL );
+
+    protected:
+        // IToolPanelDeckListener overridables
+        virtual void PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition );
+        virtual void PanelRemoved( const size_t i_nPosition );
+        virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive );
+        virtual void LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter );
+        virtual void Dying();
+
+    private:
+        DECL_LINK( OnToolboxClicked, ToolBox* );
+        DECL_LINK( OnMenuItemSelected, Menu* );
+        DECL_LINK( DockingChanged, TitledDockingWindow* );
+        ::std::auto_ptr< PopupMenu > impl_createPopupMenu() const;
+
+        /// sets the given layout for the panel selector
+        void    impl_setLayout( const PanelSelectorLayout i_eLayout, const bool i_bForce = false );
+
+        /// returns the current layout of the panel selector
+        PanelSelectorLayout
+                impl_getLayout() const { return m_eCurrentLayout; }
+
+        void    impl_updateDockingWindowTitle();
+        void    impl_togglePanelVisibility( const size_t i_nLogicalPanelIndex );
+        size_t  impl_getLogicalPanelIndex( const size_t i_nVisibleIndex );
+
+    private:
+        enum MenuId
+        {
+            MID_UNLOCK_TASK_PANEL = 1,
+            MID_LOCK_TASK_PANEL = 2,
+            MID_LAYOUT_TABS = 3,
+            MID_LAYOUT_DRAWERS = 4,
+            MID_FIRST_PANEL = 5
+        };
+
+    private:
+        typedef ::std::vector< PanelDescriptor >    PanelDescriptors;
+
+        ModuleTaskPane&         m_rTaskPane;
+        TitledDockingWindow&    m_rDockingWindow;
+        USHORT                  m_nViewMenuID;
+        PanelSelectorLayout     m_eCurrentLayout;
+        PanelDescriptors        m_aPanelRepository;
+        bool                    m_bTogglingPanelVisibility;
+        ::rtl::OUString         m_sDefaultTitle;
+    };
+
+    //------------------------------------------------------------------------------------------------------------------
+    TaskPaneController_Impl::TaskPaneController_Impl( ModuleTaskPane& i_rTaskPane, TitledDockingWindow& i_rDockingWindow )
+        :m_rTaskPane( i_rTaskPane )
+        ,m_rDockingWindow( i_rDockingWindow )
+        ,m_nViewMenuID( 0 )
+        ,m_eCurrentLayout( LAYOUT_DRAWERS )
+        ,m_aPanelRepository()
+        ,m_bTogglingPanelVisibility( false )
+        ,m_sDefaultTitle()
+    {
+        m_rDockingWindow.ResetToolBox();
+        m_nViewMenuID = m_rDockingWindow.AddDropDownToolBoxItem(
+            String( SfxResId( STR_SFX_TASK_PANE_VIEW ) ),
+            HID_TASKPANE_VIEW_MENU,
+            LINK( this, TaskPaneController_Impl, OnToolboxClicked )
+        );
+        m_rDockingWindow.SetEndDockingHdl( LINK( this, TaskPaneController_Impl, DockingChanged ) );
+        impl_setLayout( LAYOUT_DRAWERS, true );
+
+        m_rTaskPane.GetPanelDeck().AddListener( *this );
+
+        // initialize the panel repository
+        for ( size_t i = 0; i < m_rTaskPane.GetPanelDeck().GetPanelCount(); ++i )
+        {
+            ::svt::PToolPanel pPanel( m_rTaskPane.GetPanelDeck().GetPanel( i ) );
+            m_aPanelRepository.push_back( PanelDescriptor( pPanel ) );
+        }
+
+        SetDefaultTitle( String( SfxResId( STR_SFX_TASKS ) ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    TaskPaneController_Impl::~TaskPaneController_Impl()
+    {
+        m_rTaskPane.GetPanelDeck().RemoveListener( *this );
+
+        // remove the panels which are not under the control of the panel deck currently
+        for (   PanelDescriptors::iterator panelPos = m_aPanelRepository.begin();
+                panelPos != m_aPanelRepository.end();
+                ++panelPos
+            )
+        {
+            if ( panelPos->bHidden )
+                panelPos->pPanel->Dispose();
+        }
+        m_aPanelRepository.clear();
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    void TaskPaneController_Impl::SetDefaultTitle( const String& i_rTitle )
+    {
+        m_sDefaultTitle = i_rTitle;
+        impl_updateDockingWindowTitle();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TaskPaneController_Impl::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL )
+    {
+        ::boost::optional< size_t > aPanelPos( m_rTaskPane.GetPanelPos( i_rPanelURL ) );
+        ENSURE_OR_RETURN_VOID( !!aPanelPos, "TaskPaneController_Impl::ActivateToolPanel: no such panel!" );
+
+        if ( aPanelPos == m_rTaskPane.GetPanelDeck().GetActivePanel() )
+        {
+            ::svt::PToolPanel pPanel( m_rTaskPane.GetPanelDeck().GetPanel( *aPanelPos ) );
+            pPanel->GrabFocus();
+        }
+        else
+        {
+            m_rTaskPane.GetPanelDeck().ActivatePanel( aPanelPos );
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    IMPL_LINK( TaskPaneController_Impl, DockingChanged, TitledDockingWindow*, i_pDockingWindow )
+    {
+        ENSURE_OR_RETURN( i_pDockingWindow && &m_rDockingWindow, "TaskPaneController_Impl::DockingChanged: where does this come from?", 0L );
+
+        if ( impl_getLayout() == LAYOUT_DRAWERS )
+            return 0L;
+
+        impl_setLayout( lcl_getTabLayoutFromAlignment( i_pDockingWindow->GetAlignment() ) );
+        return 1L;
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    IMPL_LINK( TaskPaneController_Impl, OnToolboxClicked, ToolBox*, i_pToolBox )
+    {
+        if ( i_pToolBox->GetCurItemId() == m_nViewMenuID )
+        {
+            i_pToolBox->EndSelection();
+
+            ::std::auto_ptr< PopupMenu > pMenu = impl_createPopupMenu();
+            pMenu->SetSelectHdl( LINK( this, TaskPaneController_Impl, OnMenuItemSelected ) );
+
+            // pass toolbox button rect so the menu can stay open on button up
+            Rectangle aMenuRect( i_pToolBox->GetItemRect( m_nViewMenuID ) );
+            aMenuRect.SetPos( i_pToolBox->GetPosPixel() );
+            pMenu->Execute( &m_rDockingWindow, aMenuRect, POPUPMENU_EXECUTE_DOWN );
+        }
+
+        return 0;
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------------
+    IMPL_LINK( TaskPaneController_Impl, OnMenuItemSelected, Menu*, i_pMenu )
+    {
+        ENSURE_OR_RETURN( i_pMenu, "TaskPaneController_Impl::OnMenuItemSelected: illegal menu!", 0L );
+
+        i_pMenu->Deactivate();
+        switch ( i_pMenu->GetCurItemId() )
+        {
+            case MID_UNLOCK_TASK_PANEL:
+                m_rDockingWindow.SetFloatingMode( TRUE );
+                break;
+
+            case MID_LOCK_TASK_PANEL:
+                m_rDockingWindow.SetFloatingMode( FALSE );
+                break;
+
+            case MID_LAYOUT_DRAWERS:
+                impl_setLayout( LAYOUT_DRAWERS );
+                break;
+
+            case MID_LAYOUT_TABS:
+                impl_setLayout( lcl_getTabLayoutFromAlignment( m_rDockingWindow.GetAlignment() ) );
+                break;
+
+            default:
+            {
+                size_t nPanelIndex = size_t( i_pMenu->GetCurItemId() - MID_FIRST_PANEL );
+                impl_togglePanelVisibility( nPanelIndex );
+            }
+            break;
+        }
+
+        return 1L;
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------------
+    size_t TaskPaneController_Impl::impl_getLogicalPanelIndex( const size_t i_nVisibleIndex )
+    {
+        size_t nLogicalIndex = 0;
+        size_t nVisibleIndex( i_nVisibleIndex );
+        for ( size_t i=0; i < m_aPanelRepository.size(); ++i )
+        {
+            if ( !m_aPanelRepository[i].bHidden )
+            {
+                if ( !nVisibleIndex )
+                    break;
+                --nVisibleIndex;
+            }
+            ++nLogicalIndex;
+        }
+        return nLogicalIndex;
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------------
+    void TaskPaneController_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition )
+    {
+        if ( m_bTogglingPanelVisibility )
+            return;
+
+        const size_t nLogicalIndex( impl_getLogicalPanelIndex( i_nPosition ) );
+        m_aPanelRepository.insert( m_aPanelRepository.begin() + nLogicalIndex, PanelDescriptor( i_pPanel ) );
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------------
+    void TaskPaneController_Impl::PanelRemoved( const size_t i_nPosition )
+    {
+        if ( m_bTogglingPanelVisibility )
+            return;
+
+        const size_t nLogicalIndex( impl_getLogicalPanelIndex( i_nPosition ) );
+        m_aPanelRepository.erase( m_aPanelRepository.begin() + nLogicalIndex );
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------------
+    void TaskPaneController_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive )
+    {
+        if ( impl_getLayout() == LAYOUT_DRAWERS )
+            // no adjustment of the title when we use the classical "drawers" layout
+            return;
+
+        impl_updateDockingWindowTitle( );
+        (void)i_rOldActive;
+        (void)i_rNewActive;
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------------
+    void TaskPaneController_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter )
+    {
+        // not interested in
+        (void)i_rNewLayouter;
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------------
+    void TaskPaneController_Impl::Dying()
+    {
+        OSL_ENSURE( false, "TaskPaneController_Impl::Dying: unexpected call!" );
+        // We are expected to live longer than the ToolPanelDeck we work with. Since we remove ourself, in our dtor,
+        // as listener from the panel deck, this method here should never be called.
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------------
+    void TaskPaneController_Impl::impl_togglePanelVisibility( const size_t i_nLogicalPanelIndex )
+    {
+        ENSURE_OR_RETURN_VOID( i_nLogicalPanelIndex < m_aPanelRepository.size(), "illegal index" );
+
+        // get the actual panel index, within the deck
+        size_t nActualPanelIndex(0);
+        for ( size_t i=0; i < i_nLogicalPanelIndex; ++i )
+        {
+            if ( !m_aPanelRepository[i].bHidden )
+                ++nActualPanelIndex;
+        }
+
+        ::boost::optional< size_t > aActivatePanel;
+
+        m_bTogglingPanelVisibility = true;
+        if ( m_aPanelRepository[ i_nLogicalPanelIndex ].bHidden )
+        {
+            OSL_VERIFY( m_rTaskPane.GetPanelDeck().InsertPanel( m_aPanelRepository[ i_nLogicalPanelIndex ].pPanel, nActualPanelIndex ) == nActualPanelIndex );
+            // if there has not been an active panel before, activate the newly inserted one
+            ::boost::optional< size_t > aActivePanel( m_rTaskPane.GetPanelDeck().GetActivePanel() );
+            if ( !aActivePanel )
+                aActivatePanel = nActualPanelIndex;
+        }
+        else
+        {
+            OSL_VERIFY( m_rTaskPane.GetPanelDeck().RemovePanel( nActualPanelIndex ).get() == m_aPanelRepository[ i_nLogicalPanelIndex ].pPanel.get() );
+        }
+        m_bTogglingPanelVisibility = false;
+        m_aPanelRepository[ i_nLogicalPanelIndex ].bHidden = !m_aPanelRepository[ i_nLogicalPanelIndex ].bHidden;
+
+        if ( !!aActivatePanel )
+            m_rTaskPane.GetPanelDeck().ActivatePanel( *aActivatePanel );
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------------
+    void TaskPaneController_Impl::impl_setLayout( const PanelSelectorLayout i_eLayout, const bool i_bForce )
+    {
+        if ( !i_bForce && ( m_eCurrentLayout == i_eLayout ) )
+            return;
+
+        switch ( i_eLayout )
+        {
+        case LAYOUT_DRAWERS:
+            m_rTaskPane.SetDrawersLayout();
+            break;
+        case LAYOUT_TABS_TOP:
+            m_rTaskPane.SetTabsLayout( ::svt::TABS_TOP, ::svt::TABITEM_IMAGE_ONLY );
+            break;
+        case LAYOUT_TABS_BOTTOM:
+            m_rTaskPane.SetTabsLayout( ::svt::TABS_BOTTOM, ::svt::TABITEM_IMAGE_ONLY );
+            break;
+        case LAYOUT_TABS_LEFT:
+            m_rTaskPane.SetTabsLayout( ::svt::TABS_LEFT, ::svt::TABITEM_IMAGE_ONLY );
+            break;
+        case LAYOUT_TABS_RIGHT:
+            m_rTaskPane.SetTabsLayout( ::svt::TABS_RIGHT, ::svt::TABITEM_IMAGE_ONLY );
+            break;
+        }
+        m_eCurrentLayout = i_eLayout;
+
+        impl_updateDockingWindowTitle();
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------------
+    void TaskPaneController_Impl::impl_updateDockingWindowTitle()
+    {
+        ::boost::optional< size_t > aActivePanel( m_rTaskPane.GetPanelDeck().GetActivePanel() );
+        if ( !aActivePanel || ( impl_getLayout() == LAYOUT_DRAWERS ) )
+            m_rDockingWindow.SetTitle( m_sDefaultTitle );
+        else
+        {
+            size_t nNewActive( *aActivePanel );
+            for ( size_t i=0; i < m_aPanelRepository.size(); ++i )
+            {
+                if ( m_aPanelRepository[i].bHidden )
+                    continue;
+
+                if ( !nNewActive )
+                {
+                    m_rDockingWindow.SetTitle( m_aPanelRepository[i].pPanel->GetDisplayName() );
+                    break;
+                }
+                --nNewActive;
+            }
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------------
+    ::std::auto_ptr< PopupMenu > TaskPaneController_Impl::impl_createPopupMenu() const
+    {
+        ::std::auto_ptr<PopupMenu> pMenu( new PopupMenu );
+        FloatingWindow* pMenuWindow = static_cast< FloatingWindow* >( pMenu->GetWindow() );
+        if ( pMenuWindow != NULL )
+        {
+            pMenuWindow->SetPopupModeFlags ( pMenuWindow->GetPopupModeFlags() | FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE );
+        }
+
+        // Add one entry for every tool panel element to individually make
+        // them visible or hide them.
+        USHORT nIndex = MID_FIRST_PANEL;
+        for ( size_t i=0; i<m_aPanelRepository.size(); ++i, ++nIndex )
+        {
+            const PanelDescriptor& rPanelDesc( m_aPanelRepository[i] );
+            pMenu->InsertItem( nIndex, rPanelDesc.pPanel->GetDisplayName(), MIB_CHECKABLE );
+            pMenu->CheckItem( nIndex, !rPanelDesc.bHidden );
+        }
+        pMenu->InsertSeparator();
+
+    #if OSL_DEBUG_LEVEL > 0
+        pMenu->InsertItem( MID_LAYOUT_TABS, String::CreateFromAscii( "Tab-Layout (exp.)" ), MIB_CHECKABLE );
+        pMenu->CheckItem( MID_LAYOUT_TABS, impl_getLayout() != LAYOUT_DRAWERS );
+        pMenu->InsertItem( MID_LAYOUT_DRAWERS, String::CreateFromAscii( "Drawer-Layout" ), MIB_CHECKABLE );
+        pMenu->CheckItem( MID_LAYOUT_DRAWERS, impl_getLayout() == LAYOUT_DRAWERS );
+
+        pMenu->InsertSeparator();
+    #endif
+
+        // Add entry for docking or un-docking the tool panel.
+        if ( m_rDockingWindow.IsFloatingMode() )
+            pMenu->InsertItem(
+                MID_LOCK_TASK_PANEL,
+                String( SfxResId( STR_SFX_DOCK ) )
+            );
+        else
+            pMenu->InsertItem(
+                MID_UNLOCK_TASK_PANEL,
+                String( SfxResId( STR_SFX_UNDOCK ) )
+            );
+
+        pMenu->RemoveDisabledEntries( FALSE, FALSE );
+
+        return pMenu;
+    }
+
+    //==================================================================================================================
+    //= TaskPaneController
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    TaskPaneController::TaskPaneController( ModuleTaskPane& i_rTaskPane, TitledDockingWindow& i_rDockingWindow )
+        :m_pImpl( new TaskPaneController_Impl( i_rTaskPane, i_rDockingWindow ) )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    TaskPaneController::~TaskPaneController()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TaskPaneController::SetDefaultTitle( const String& i_rTitle )
+    {
+        m_pImpl->SetDefaultTitle( i_rTitle );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TaskPaneController::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL )
+    {
+        m_pImpl->ActivateToolPanel( i_rPanelURL );
+    }
+
+//......................................................................................................................
+} // namespace sfx2
+//......................................................................................................................
diff --git a/sfx2/source/dialog/sfxurl.cxx b/sfx2/source/dialog/taskpane.src
index 47e4062ac350..5a955e8587d1 100644
--- a/sfx2/source/dialog/sfxurl.cxx
+++ b/sfx2/source/dialog/taskpane.src
@@ -1,5 +1,4 @@
 /*************************************************************************
- *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -25,17 +24,24 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
-#include <sfx2/filedlghelper.hxx>
-#include <sfxresid.hxx>
-#include <dialog.hrc>
+#include <sfx2/sfx.hrc>
+#include "sfxlocal.hrc"
+
+String STR_SFX_DOCK
+{
+    Text [ en-US ] = "Dock";
+};
+
+String STR_SFX_UNDOCK
+{
+    Text [ en-US ] = "Undock";
+};
 
-SfxUrlDialog::SfxUrlDialog( Window *pParent )
-    : ModalDialog( pParent, SfxResId( RID_URLOPEN ) ),
-      aEdit( this, SfxResId(RID_URLOPEN_URL) ),
-      aOk( this, SfxResId(RID_URLOPEN_OK) ),
-      aCancel( this, SfxResId(RID_URLOPEN_CANCEL) )
+String STR_SFX_TASK_PANE_VIEW
+{
+    Text [ en-US ] = "View";
+};
+String STR_SFX_TASKS
 {
-    FreeResource();
-}
+    Text [ en-US ] = "Tasks";
+};
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
new file mode 100644
index 000000000000..58a61d66ba8b
--- /dev/null
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -0,0 +1,364 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_sfx2.hxx"
+
+#include "sfx2/titledockwin.hxx"
+#include "sfx2/bindings.hxx"
+#include "sfx2/dispatch.hxx"
+#include "sfxlocal.hrc"
+#include "sfxresid.hxx"
+
+#include <svl/eitem.hxx>
+
+//......................................................................................................................
+namespace sfx2
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= TitledDockingWindow
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, Window* i_pParent,
+            WinBits i_nStyle )
+        :SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_nStyle )
+        ,m_sTitle()
+        ,m_aToolbox( this )
+        ,m_aContentWindow( this, WB_DIALOGCONTROL )
+        ,m_aBorder( 3, 1, 3, 3 )
+        ,m_bLayoutPending( false )
+    {
+        impl_construct();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, Window* i_pParent,
+            const ResId& i_rResId )
+        :SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_rResId )
+        ,m_sTitle()
+        ,m_aToolbox( this )
+        ,m_aContentWindow( this )
+        ,m_aBorder( 3, 1, 3, 3 )
+        ,m_bLayoutPending( false )
+    {
+        impl_construct();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TitledDockingWindow::impl_construct()
+    {
+        SetBackground( Wallpaper() );
+
+        m_aToolbox.SetSelectHdl( LINK( this, TitledDockingWindow, OnToolboxItemSelected ) );
+        m_aToolbox.SetOutStyle( TOOLBOX_STYLE_FLAT );
+        m_aToolbox.SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetDialogColor() ) );
+        m_aToolbox.Show();
+        impl_resetToolBox();
+
+        m_aContentWindow.Show();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    TitledDockingWindow::~TitledDockingWindow()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TitledDockingWindow::SetTitle( const String& i_rTitle )
+    {
+        m_sTitle = i_rTitle;
+        Invalidate();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    String TitledDockingWindow::GetTitle() const
+    {
+        return impl_getTitle();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TitledDockingWindow::SetText( const String& i_rText )
+    {
+        SfxDockingWindow::SetText( i_rText );
+        if ( m_sTitle.Len() == 0 )
+            // our text is used as title, too => repaint
+            Invalidate();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TitledDockingWindow::Resize()
+    {
+        SfxDockingWindow::Resize();
+        impl_scheduleLayout();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TitledDockingWindow::onLayoutDone()
+    {
+        // not interested in
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TitledDockingWindow::impl_scheduleLayout()
+    {
+        m_bLayoutPending = true;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TitledDockingWindow::impl_layout()
+    {
+        m_bLayoutPending = false;
+
+        m_aToolbox.ShowItem( 1, !IsFloatingMode() );
+
+        const Size aToolBoxSize( m_aToolbox.CalcWindowSizePixel() );
+        Size aWindowSize( GetOutputSizePixel() );
+
+        // position the tool box
+        int nTitleBarHeight( GetSettings().GetStyleSettings().GetTitleHeight() );
+        if ( aToolBoxSize.Height() > nTitleBarHeight )
+            nTitleBarHeight = aToolBoxSize.Height();
+        m_aToolbox.SetPosSizePixel(
+            Point(
+                aWindowSize.Width() - aToolBoxSize.Width(),
+                ( nTitleBarHeight - aToolBoxSize.Height() ) / 2
+            ),
+            aToolBoxSize
+        );
+
+        // Place the content window.
+        if ( nTitleBarHeight < aToolBoxSize.Height() )
+            nTitleBarHeight = aToolBoxSize.Height();
+        aWindowSize.Height() -= nTitleBarHeight;
+        m_aContentWindow.SetPosSizePixel(
+            Point( m_aBorder.Left(), nTitleBarHeight + m_aBorder.Top() ),
+            Size(
+                aWindowSize.Width() - m_aBorder.Left() - m_aBorder.Right(),
+                aWindowSize.Height() - m_aBorder.Top() - m_aBorder.Bottom()
+            )
+        );
+
+        onLayoutDone();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TitledDockingWindow::Paint( const Rectangle& i_rArea )
+    {
+        if ( m_bLayoutPending )
+            impl_layout();
+
+        SfxDockingWindow::Paint( i_rArea );
+
+        Push( PUSH_FONT | PUSH_FILLCOLOR | PUSH_LINECOLOR );
+
+        int nTitleBarHeight( GetSettings().GetStyleSettings().GetTitleHeight() );
+        const Size aToolBoxSize = m_aToolbox.CalcWindowSizePixel();
+        if ( aToolBoxSize.Height() > nTitleBarHeight )
+            nTitleBarHeight = aToolBoxSize.Height();
+
+        SetFillColor( GetSettings().GetStyleSettings().GetDialogColor() );
+        SetLineColor();
+
+        // bold font
+        Font aFont( GetFont() );
+        aFont.SetWeight( WEIGHT_BOLD );
+        SetFont( aFont );
+
+        // Set border values.
+        Size aWindowSize( GetOutputSizePixel() );
+        int nOuterLeft = 0;
+        int nInnerLeft = nOuterLeft + m_aBorder.Left() - 1;
+        int nOuterRight = aWindowSize.Width() - 1;
+        int nInnerRight = nOuterRight - m_aBorder.Right() + 1;
+        int nInnerTop = nTitleBarHeight + m_aBorder.Top() - 1;
+        int nOuterBottom = aWindowSize.Height() - 1;
+        int nInnerBottom = nOuterBottom - m_aBorder.Bottom() + 1;
+
+        // Paint title bar background.
+        Rectangle aTitleBarBox( Rectangle(
+            nOuterLeft,
+            0,
+            nOuterRight,
+            nInnerTop-1
+        ) );
+        DrawRect( aTitleBarBox );
+
+        if ( nInnerLeft > nOuterLeft )
+            DrawRect( Rectangle( nOuterLeft, nInnerTop, nInnerLeft, nInnerBottom ) );
+        if ( nOuterRight > nInnerRight )
+            DrawRect( Rectangle( nInnerRight, nInnerTop, nOuterRight, nInnerBottom ) );
+        if ( nInnerBottom < nOuterBottom )
+            DrawRect( Rectangle( nOuterLeft, nInnerBottom, nOuterRight, nOuterBottom ) );
+
+        // Paint bevel border.
+        SetFillColor();
+        SetLineColor( GetSettings().GetStyleSettings().GetShadowColor() );
+        if ( m_aBorder.Top() > 0 )
+            DrawLine( Point( nInnerLeft, nInnerTop ), Point( nInnerLeft, nInnerBottom ) );
+        if ( m_aBorder.Left() > 0 )
+            DrawLine( Point( nInnerLeft, nInnerTop ), Point( nInnerRight, nInnerTop ) );
+
+        SetLineColor( GetSettings().GetStyleSettings().GetLightColor() );
+        if ( m_aBorder.Bottom() > 0 )
+            DrawLine( Point( nInnerRight, nInnerBottom ), Point( nInnerLeft, nInnerBottom ) );
+        if ( m_aBorder.Right() > 0 )
+            DrawLine( Point( nInnerRight, nInnerBottom ), Point( nInnerRight, nInnerTop ) );
+
+        // Paint title bar text.
+        SetLineColor( GetSettings().GetStyleSettings().GetActiveTextColor() );
+        aTitleBarBox.Left() += 3;
+        DrawText( aTitleBarBox, impl_getTitle(), TEXT_DRAW_LEFT | TEXT_DRAW_VCENTER | TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
+
+        // Restore original values of the output device.
+        Pop();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    String TitledDockingWindow::impl_getTitle() const
+    {
+        return m_sTitle.Len() ? m_sTitle : GetText();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TitledDockingWindow::impl_resetToolBox()
+    {
+        m_aToolbox.Clear();
+
+        // Get the closer bitmap and set it as right most button.
+        Image aImage( SfxResId( SFX_IMG_CLOSE_DOC ) );
+        Image aImageHC( SfxResId( SFX_IMG_CLOSE_DOC_HC ) );
+        m_aToolbox.InsertItem( 1,
+                GetSettings().GetStyleSettings().GetHighContrastMode()
+            ?   aImageHC
+            :   aImage
+        );
+        m_aToolbox.ShowItem( 1 );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    USHORT TitledDockingWindow::impl_addDropDownToolBoxItem( const String& i_rItemText, ULONG i_nHelpId, const Link& i_rCallback )
+    {
+        // Add the menu before the closer button.
+        const USHORT nItemCount( m_aToolbox.GetItemCount() );
+        const USHORT nItemId( nItemCount + 1 );
+        m_aToolbox.InsertItem( nItemId, i_rItemText, TIB_DROPDOWNONLY, nItemCount > 0 ? nItemCount - 1 : TOOLBOX_APPEND );
+        m_aToolbox.SetHelpId( nItemId, i_nHelpId );
+        m_aToolbox.SetClickHdl( i_rCallback );
+        m_aToolbox.SetDropdownClickHdl( i_rCallback );
+
+        // The tool box has likely changed its size. The title bar has to be
+        // resized.
+        impl_scheduleLayout();
+        Invalidate();
+
+        return nItemId;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    IMPL_LINK( TitledDockingWindow, OnToolboxItemSelected, ToolBox*, pToolBox )
+    {
+        const USHORT nId = pToolBox->GetCurItemId();
+
+        if ( nId == 1 )
+        {
+            // the closer
+            EndTracking();
+            const sal_uInt16 nChildWindowId( GetChildWindow_Impl()->GetType() );
+            const SfxBoolItem aVisibility( nChildWindowId, FALSE );
+            GetBindings().GetDispatcher()->Execute(
+                nChildWindowId,
+                SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                &aVisibility,
+                NULL
+            );
+        }
+
+        return 0;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TitledDockingWindow::StateChanged( StateChangedType i_nType )
+    {
+        switch ( i_nType )
+        {
+            case STATE_CHANGE_INITSHOW:
+                impl_scheduleLayout();
+                break;
+        }
+        SfxDockingWindow::StateChanged( i_nType );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TitledDockingWindow::EndDocking( const Rectangle& i_rRect, BOOL i_bFloatMode )
+    {
+        SfxDockingWindow::EndDocking( i_rRect, i_bFloatMode );
+
+        if ( m_aEndDockingHdl.IsSet() )
+            m_aEndDockingHdl.Call( this );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void TitledDockingWindow::DataChanged( const DataChangedEvent& i_rDataChangedEvent )
+    {
+        SfxDockingWindow::DataChanged( i_rDataChangedEvent );
+
+        switch ( i_rDataChangedEvent.GetType() )
+        {
+            case DATACHANGED_SETTINGS:
+                if ( ( i_rDataChangedEvent.GetFlags() & SETTINGS_STYLE ) == 0)
+                    break;
+                // else fall through.
+            case DATACHANGED_FONTS:
+            case DATACHANGED_FONTSUBSTITUTION:
+            {
+                const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
+
+                // Font.
+                Font aFont = rStyleSettings.GetAppFont();
+                if ( IsControlFont() )
+                    aFont.Merge( GetControlFont() );
+                SetZoomedPointFont( aFont );
+
+                // Color.
+                Color aColor;
+                if ( IsControlForeground() )
+                    aColor = GetControlForeground();
+                else
+                    aColor = rStyleSettings.GetButtonTextColor();
+                SetTextColor( aColor );
+                SetTextFillColor();
+
+                impl_scheduleLayout();
+                Invalidate();
+            }
+            break;
+        }
+    }
+
+//......................................................................................................................
+} // namespace sfx2
+//......................................................................................................................
diff --git a/sfx2/source/dialog/titledockwin.src b/sfx2/source/dialog/titledockwin.src
new file mode 100644
index 000000000000..3f52e84ab75d
--- /dev/null
+++ b/sfx2/source/dialog/titledockwin.src
@@ -0,0 +1,39 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <sfx2/sfx.hrc>
+#include "sfxlocal.hrc"
+
+Image SFX_IMG_CLOSE_DOC
+{
+    ImageBitmap = Bitmap { File = "closedoc.png" ; };
+};
+
+Image SFX_IMG_CLOSE_DOC_HC
+{
+    ImageBitmap = Bitmap { File = "closedochc.png" ; };
+};
+
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 29ad461d18da..848446a774e9 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -330,7 +330,8 @@
 #define HID_CONFIG_SAVE                             (HID_SFX_START + 310)
 
 #define HID_SEARCHDIALOG                            (HID_SFX_START + 311)
-
+#define HID_TASKPANE_WINDOW                         (HID_SFX_START + 312)
+#define HID_TASKPANE_VIEW_MENU                      (HID_SFX_START + 313)
 #define HID_XMLSEC_WARNING_BROKENSIGNATURE          (HID_SFX_START + 314)
 #define HID_XMLSEC_QUERY_LOSINGSIGNATURE            (HID_SFX_START + 315)
 #define HID_XMLSEC_QUERY_SAVEBEFORESIGN             (HID_SFX_START + 316)
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index fb21cb0ab13c..202ed6f6f00f 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -44,6 +44,10 @@
 #define STR_SFX_EXPLORERFILE_BUTTONINSERT   (RID_SFX_SFXLOCAL_START +  4)
 #define STR_SFX_IMPORT_ALL                  (RID_SFX_SFXLOCAL_START +  5)
 #define STR_SFX_EXPLORERFILE_EXPORT         (RID_SFX_SFXLOCAL_START +  6)
+#define STR_SFX_DOCK                        (RID_SFX_SFXLOCAL_START +  7)
+#define STR_SFX_UNDOCK                      (RID_SFX_SFXLOCAL_START +  8)
+#define STR_SFX_TASK_PANE_VIEW              (RID_SFX_SFXLOCAL_START +  9)
+#define STR_SFX_TASKS                       (RID_SFX_SFXLOCAL_START + 10)
 
 // Controls --------------------------------------------------------------
 
@@ -55,13 +59,17 @@
 #define SFX_PB_PROPERTY_REMOVE              (RID_SFX_SFXLOCAL_START +  5)
 #define SFX_WIN_PROPERTY_YESNO              (RID_SFX_SFXLOCAL_START +  6)
 #define SFX_QB_WRONG_TYPE                   (RID_SFX_SFXLOCAL_START +  7)
-#define SFX_IMG_PROPERTY_REMOVE             (RID_SFX_SFXLOCAL_START +  8)
-#define SFX_IMG_PROPERTY_REMOVE_HC          (RID_SFX_SFXLOCAL_START +  9)
 #define SFX_FLD_DATE                        (RID_SFX_SFXLOCAL_START +  10)
 #define SFX_FLD_TIME                        (RID_SFX_SFXLOCAL_START +  11)
 #define SFX_FLD_DURATION                    (RID_SFX_SFXLOCAL_START +  12)
 #define SFX_ST_DURATION_FORMAT              (RID_SFX_SFXLOCAL_START +  13)
 
+// Images ----------------------------------------------------------------
+
+#define SFX_IMG_PROPERTY_REMOVE             (RID_SFX_SFXLOCAL_START +  0)
+#define SFX_IMG_PROPERTY_REMOVE_HC          (RID_SFX_SFXLOCAL_START +  1)
+#define SFX_IMG_CLOSE_DOC                   (RID_SFX_SFXLOCAL_START +  2)
+#define SFX_IMG_CLOSE_DOC_HC                (RID_SFX_SFXLOCAL_START +  3)
 
 #endif
 
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index ae005d1bad88..a82b72bc2947 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -365,6 +365,7 @@ public:
     void                    SetActiveChild_Impl( Window *pChild );
     Window*                 GetActiveChild_Impl();
     virtual BOOL            ActivateNextChild_Impl( BOOL bForward = TRUE );
+    bool                    AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const;
 
     // Methoden f"ur StatusBar
     void                    SetTempStatusBar_Impl( BOOL bSet );
diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx
index 5460d613c7e8..abe4cb6852d9 100644
--- a/sfx2/source/view/impviewframe.hxx
+++ b/sfx2/source/view/impviewframe.hxx
@@ -31,6 +31,8 @@
 #include <svtools/asynclink.hxx>
 #include <vcl/window.hxx>
 
+#include <boost/optional.hpp>
+
 struct SfxViewFrame_Impl
 {
     SvBorder            aBorder;
@@ -56,6 +58,8 @@ struct SfxViewFrame_Impl
     sal_Bool            bWindowWasEnabled:1;
     sal_Bool            bActive;
     String              aFactoryName;
+    ::boost::optional< bool >
+                        aHasToolPanels;
 
                         SfxViewFrame_Impl( SfxFrame& i_rFrame )
                         : rFrame( i_rFrame )
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 66af0d7ac8ba..189c9a8aae0e 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -44,6 +44,7 @@
 #endif
 #include <unotools/moduleoptions.hxx>
 #include <svl/intitem.hxx>
+#include <svl/visitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/slstitm.hxx>
@@ -94,6 +95,8 @@
 #include <svtools/asynclink.hxx>
 #include <svl/sharecontrolfile.hxx>
 
+#include <boost/optional.hpp>
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
@@ -108,6 +111,7 @@ namespace css = ::com::sun::star;
 
 // wg. ViewFrame::Current
 #include "appdata.hxx"
+#include <sfx2/taskpane.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
 #include "openflag.hxx"
@@ -169,6 +173,19 @@ TYPEINIT1(SfxViewFrameItem, SfxPoolItem);
 //=========================================================================
 
 //-------------------------------------------------------------------------
+namespace
+{
+    bool moduleHasToolPanels( SfxViewFrame_Impl& i_rViewFrameImpl )
+    {
+        if ( !i_rViewFrameImpl.aHasToolPanels )
+        {
+            i_rViewFrameImpl.aHasToolPanels.reset( ::sfx2::ModuleTaskPane::ModuleHasToolPanels(
+                i_rViewFrameImpl.rFrame.GetFrameInterface() ) );
+        }
+        return *i_rViewFrameImpl.aHasToolPanels;
+    }
+}
+//-------------------------------------------------------------------------
 void SfxViewFrame::SetDowning_Impl()
 {
     pImp->bIsDowning = sal_True;
@@ -3294,6 +3311,22 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
             else if ( KnowsChildWindow(nSID) )
                 rState.Put( SfxBoolItem( nSID, HasChildWindow(nSID) ) );
         }
+        else if ( nSID == SID_TASKPANE )
+        {
+            if  ( !KnowsChildWindow( nSID ) )
+            {
+                OSL_ENSURE( false, "SID_TASKPANE state requested, but no task pane child window exists for this ID!" );
+                rState.DisableItem( nSID );
+            }
+            else if ( !moduleHasToolPanels( *pImp ) )
+            {
+                rState.Put( SfxVisibilityItem( nSID, sal_False ) );
+            }
+            else
+            {
+                rState.Put( SfxBoolItem( nSID, HasChildWindow( nSID ) ) );
+            }
+        }
         else if ( KnowsChildWindow(nSID) )
             rState.Put( SfxBoolItem( nSID, HasChildWindow(nSID) ) );
         else
@@ -3381,3 +3414,37 @@ void SfxViewFrame::SetViewFrame( SfxViewFrame* pFrame )
 {
     SFX_APP()->SetViewFrame_Impl( pFrame );
 }
+
+// ---------------------------------------------------------------------------------------------------------------------
+void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL )
+{
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+
+    // look up the SfxFrame for the given XFrame
+    SfxFrame* pFrame = NULL;
+    for ( pFrame = SfxFrame::GetFirst(); pFrame; pFrame = SfxFrame::GetNext( *pFrame ) )
+    {
+        if ( pFrame->GetFrameInterface() == i_rFrame )
+            break;
+    }
+    SfxViewFrame* pViewFrame = pFrame ? pFrame->GetCurrentViewFrame() : NULL;
+    ENSURE_OR_RETURN_VOID( pViewFrame != NULL, "SfxViewFrame::ActivateToolPanel: did not find an SfxFrame for the given XFrame!" );
+
+    pViewFrame->ActivateToolPanel_Impl( i_rPanelURL );
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void SfxViewFrame::ActivateToolPanel_Impl( const ::rtl::OUString& i_rPanelURL )
+{
+    // ensure the task pane is visible
+    ENSURE_OR_RETURN_VOID( KnowsChildWindow( SID_TASKPANE ), "SfxViewFrame::ActivateToolPanel: this frame/module does not allow for a task pane!" );
+    if ( !HasChildWindow( SID_TASKPANE ) )
+        ToggleChildWindow( SID_TASKPANE );
+
+    SfxChildWindow* pTaskPaneChildWindow = GetChildWindow( SID_TASKPANE );
+    ENSURE_OR_RETURN_VOID( pTaskPaneChildWindow, "SfxViewFrame::ActivateToolPanel_Impl: just switched it on, but it is not there!" );
+
+    ::sfx2::ITaskPaneToolPanelAccess* pPanelAccess = dynamic_cast< ::sfx2::ITaskPaneToolPanelAccess* >( pTaskPaneChildWindow );
+    ENSURE_OR_RETURN_VOID( pPanelAccess, "SfxViewFrame::ActivateToolPanel_Impl: task pane child window does not implement a required interface!" );
+    pPanelAccess->ActivateToolPanel( i_rPanelURL );
+}
diff --git a/sfx2/util/hidother.src b/sfx2/util/hidother.src
index 72b178b2d629..bbea19100df9 100644
--- a/sfx2/util/hidother.src
+++ b/sfx2/util/hidother.src
@@ -165,3 +165,4 @@ hidspecial HID_DID_SAVE_PACKED_XML              { HelpID = HID_DID_SAVE_PACKED_X
 hidspecial HID_HELP_ONHELP                      { HelpID = HID_HELP_ONHELP; };
 hidspecial HID_HELP_TEXT_SELECTION_MODE         { HelpID = HID_HELP_TEXT_SELECTION_MODE; };
 hidspecial HID_DLG_CHECKFORONLINEUPDATE         { HelpID = HID_DLG_CHECKFORONLINEUPDATE; };
+hidspecial HID_TASKPANE_VIEW_MENU               { HelpID = HID_TASKPANE_VIEW_MENU; };
\ No newline at end of file
diff --git a/sfx2/win/res/expdesk.ico b/sfx2/win/res/expdesk.ico
deleted file mode 100644
index 06fb6e712e89..000000000000
--- a/sfx2/win/res/expdesk.ico
+++ /dev/null
diff --git a/sfx2/win/res/expexp.ico b/sfx2/win/res/expexp.ico
deleted file mode 100644
index e0643765f605..000000000000
--- a/sfx2/win/res/expexp.ico
+++ /dev/null
diff --git a/sfx2/win/res/expfld.ico b/sfx2/win/res/expfld.ico
deleted file mode 100644
index aeefecbdad51..000000000000
--- a/sfx2/win/res/expfld.ico
+++ /dev/null
diff --git a/sfx2/win/res/expftp.ico b/sfx2/win/res/expftp.ico
deleted file mode 100644
index e1a442067d35..000000000000
--- a/sfx2/win/res/expftp.ico
+++ /dev/null
diff --git a/sfx2/win/res/exptrash.ico b/sfx2/win/res/exptrash.ico
deleted file mode 100644
index 5c3e956863c3..000000000000
--- a/sfx2/win/res/exptrash.ico
+++ /dev/null
diff --git a/sfx2/win/res/expwork.ico b/sfx2/win/res/expwork.ico
deleted file mode 100644
index 93fe39c7a492..000000000000
--- a/sfx2/win/res/expwork.ico
+++ /dev/null
diff --git a/sfx2/win/res/frameset.ico b/sfx2/win/res/frameset.ico
deleted file mode 100644
index c9546f1e4d40..000000000000
--- a/sfx2/win/res/frameset.ico
+++ /dev/null
diff --git a/sfx2/win/res/search.ico b/sfx2/win/res/search.ico
deleted file mode 100644
index 13e96131e3b8..000000000000
--- a/sfx2/win/res/search.ico
+++ /dev/null
diff --git a/sfx2/workben/custompanel/CalcWindowState.xcu b/sfx2/workben/custompanel/CalcWindowState.xcu
new file mode 100644
index 000000000000..2f224f32aa77
--- /dev/null
+++ b/sfx2/workben/custompanel/CalcWindowState.xcu
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<oor:component-data oor:name="CalcWindowState" 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="UIElements">
+    <node oor:name="States">
+      <node oor:name="private:resource/toolpanel/org.openoffice.example.colorpanel/0000FF" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Soylent Blue</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="ImageURL" oor:type="xs:string">
+          <value>vnd.sun.star.extension://UPDATED_IDENTIFIER/panel.png</value>
+        </prop>
+        <prop oor:name="HelpURL" oor:type="xs:string">
+          <value>vnd.sun.star.help://UPDATED_IDENTIFIER/colorpanel</value>
+        </prop>
+      </node>
+    </node>
+  </node>
+</oor:component-data>
diff --git a/sfx2/workben/custompanel/DrawWindowState.xcu b/sfx2/workben/custompanel/DrawWindowState.xcu
new file mode 100644
index 000000000000..3c0992bc4871
--- /dev/null
+++ b/sfx2/workben/custompanel/DrawWindowState.xcu
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<oor:component-data oor:name="DrawWindowState" 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="UIElements">
+    <node oor:name="States">
+      <node oor:name="private:resource/toolpanel/org.openoffice.example.colorpanel/FFFF00" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Soylent Yellow</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="ImageURL" oor:type="xs:string">
+          <value>vnd.sun.star.extension://UPDATED_IDENTIFIER/panel.png</value>
+        </prop>
+        <prop oor:name="HelpURL" oor:type="xs:string">
+          <value>vnd.sun.star.help://UPDATED_IDENTIFIER/colorpanel</value>
+        </prop>
+      </node>
+    </node>
+  </node>
+</oor:component-data>
diff --git a/sfx2/workben/custompanel/Factories.xcu b/sfx2/workben/custompanel/Factories.xcu
new file mode 100644
index 000000000000..f8df23e9f40a
--- /dev/null
+++ b/sfx2/workben/custompanel/Factories.xcu
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<oor:component-data oor:name="Factories" oor:package="org.openoffice.Office.UI" 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="Registered">
+    <node oor:name="UIElementFactories">
+      <node oor:name="org.openoffice.example.CustomToolPanel" oor:op="replace">
+        <prop oor:name="Type">
+          <value>toolpanel</value>
+        </prop>
+        <prop oor:name="Name">
+          <value>org.openoffice.example.colorpanel</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="FactoryImplementation">
+          <value>org.openoffice.example.colorpanel.ToolPanelFactory</value>
+        </prop>
+      </node>
+    </node>
+  </node>
+</oor:component-data>
diff --git a/sfx2/workben/custompanel/ImpressWindowState.xcu b/sfx2/workben/custompanel/ImpressWindowState.xcu
new file mode 100644
index 000000000000..0fc1bb9d40c8
--- /dev/null
+++ b/sfx2/workben/custompanel/ImpressWindowState.xcu
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<oor:component-data oor:name="ImpressWindowState" 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="UIElements">
+    <node oor:name="States">
+      <node oor:name="private:resource/toolpanel/org.openoffice.example.colorpanel/FFCC99" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Soylent Orange</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="ImageURL" oor:type="xs:string">
+          <value>vnd.sun.star.extension://UPDATED_IDENTIFIER/panel.png</value>
+        </prop>
+        <prop oor:name="HelpURL" oor:type="xs:string">
+          <value>vnd.sun.star.help://UPDATED_IDENTIFIER/colorpanel</value>
+        </prop>
+      </node>
+    </node>
+  </node>
+</oor:component-data>
diff --git a/sfx2/workben/custompanel/WriterWindowState.xcu b/sfx2/workben/custompanel/WriterWindowState.xcu
new file mode 100644
index 000000000000..f1edd4a12881
--- /dev/null
+++ b/sfx2/workben/custompanel/WriterWindowState.xcu
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<oor:component-data oor:name="WriterWindowState" 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="UIElements">
+    <node oor:name="States">
+      <node oor:name="private:resource/toolpanel/org.openoffice.example.colorpanel/00FF00" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Soylent Green</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="ImageURL" oor:type="xs:string">
+          <value>vnd.sun.star.extension://UPDATED_IDENTIFIER/panel.png</value>
+        </prop>
+        <prop oor:name="HelpURL" oor:type="xs:string">
+          <value>vnd.sun.star.help://UPDATED_IDENTIFIER/colorpanel</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolpanel/org.openoffice.example.colorpanel/FF0000" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Soylent Red</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="ImageURL" oor:type="xs:string">
+          <value>vnd.sun.star.extension://UPDATED_IDENTIFIER/panel.png</value>
+        </prop>
+        <prop oor:name="HelpURL" oor:type="xs:string">
+          <value>vnd.sun.star.help://UPDATED_IDENTIFIER/colorpanel</value>
+        </prop>
+      </node>
+    </node>
+  </node>
+</oor:component-data>
diff --git a/sfx2/workben/custompanel/ctp_factory.cxx b/sfx2/workben/custompanel/ctp_factory.cxx
new file mode 100644
index 000000000000..54880cc5fcc7
--- /dev/null
+++ b/sfx2/workben/custompanel/ctp_factory.cxx
@@ -0,0 +1,167 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#include "precompiled_sfx2.hxx"
+
+#include "ctp_factory.hxx"
+#include "ctp_panel.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/lang/NotInitializedException.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+/** === end UNO includes === **/
+
+//......................................................................................................................
+namespace sd { namespace colortoolpanel
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::uno::XComponentContext;
+    using ::com::sun::star::lang::NotInitializedException;
+    using ::com::sun::star::lang::IllegalArgumentException;
+    using ::com::sun::star::lang::XComponent;
+    using ::com::sun::star::ui::XUIElement;
+    using ::com::sun::star::beans::PropertyValue;
+    using ::com::sun::star::container::NoSuchElementException;
+    using ::com::sun::star::beans::PropertyValue;
+    using ::com::sun::star::awt::XWindow;
+    /** === end UNO using === **/
+
+    //==================================================================================================================
+    //= ToolPanelFactory
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    ToolPanelFactory::ToolPanelFactory( const Reference< XComponentContext >& i_rContext )
+        :m_xContext( i_rContext )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ToolPanelFactory::~ToolPanelFactory()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XUIElement > SAL_CALL ToolPanelFactory::createUIElement( const ::rtl::OUString& i_rResourceURL, const Sequence< PropertyValue >& i_rArgs ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        if ( !i_rResourceURL.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:resource/toolpanel/org.openoffice.example.colorpanel/" ) ) )
+            throw NoSuchElementException( i_rResourceURL, *this );
+
+        const ::rtl::OUString sColor( i_rResourceURL.copy( i_rResourceURL.lastIndexOf( '/' ) + 1 ) );
+        const sal_Int32 nPanelColor = sColor.toInt32( 16 );
+
+        // retrieve the parent window
+        Reference< XWindow > xParentWindow;
+        const PropertyValue* pArg = i_rArgs.getConstArray();
+        const PropertyValue* pArgEnd = i_rArgs.getConstArray() + i_rArgs.getLength();
+        for ( ; pArg != pArgEnd; ++pArg )
+        {
+            if ( pArg->Name.equalsAscii( "ParentWindow" ) )
+            {
+                xParentWindow.set( pArg->Value, UNO_QUERY );
+                break;
+            }
+        }
+        if ( !xParentWindow.is() )
+        {
+            OSL_ENSURE( false, "ToolPanelFactory::createUIElement: no parent window in the args!" );
+            throw IllegalArgumentException(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No parent window provided in the creation arguments. Cannot create tool panel." ) ),
+                *this,
+                2
+            );
+        }
+
+        /// create the panel
+        Reference< XUIElement > xUIElement( new PanelUIElement( m_xContext, xParentWindow, i_rResourceURL, nPanelColor ) );
+        return xUIElement;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL ToolPanelFactory::getImplementationName(  ) throw (RuntimeException)
+    {
+        return getImplementationName_static();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL ToolPanelFactory::getImplementationName_static(  ) throw (RuntimeException)
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.example.custompanel.ToolPanelFactory" ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Bool SAL_CALL ToolPanelFactory::supportsService( const ::rtl::OUString& i_rServiceName ) throw (RuntimeException)
+    {
+        const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() );
+        for (   const ::rtl::OUString* serviceName = aServiceNames.getConstArray();
+                serviceName != aServiceNames.getConstArray() + aServiceNames.getLength();
+                ++serviceName
+            )
+        {
+            if ( i_rServiceName == *serviceName )
+                return  sal_True;
+        }
+        return sal_False;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames() throw (RuntimeException)
+    {
+        return getSupportedServiceNames_static();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames_static() throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aServiceNames(1);
+        aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.example.colorpanel.ToolPanelFactory" ) );
+        return aServiceNames;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XInterface > SAL_CALL ToolPanelFactory::Create( const Reference< XComponentContext >& i_rContext ) throw (RuntimeException)
+    {
+        return *( new ToolPanelFactory( i_rContext ) );
+    }
+
+//......................................................................................................................
+} } // namespace sd::colortoolpanel
+//......................................................................................................................
diff --git a/sfx2/workben/custompanel/ctp_factory.hxx b/sfx2/workben/custompanel/ctp_factory.hxx
new file mode 100644
index 000000000000..8a359f59caaf
--- /dev/null
+++ b/sfx2/workben/custompanel/ctp_factory.hxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SD_WORKBENCH_CTP_FACTORY_HXX
+#define SD_WORKBENCH_CTP_FACTORY_HXX
+
+/** === begin UNO includes === **/
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/ui/XUIElementFactory.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+/** === end UNO includes === **/
+
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/basemutex.hxx>
+
+//......................................................................................................................
+namespace sd { namespace colortoolpanel
+{
+//......................................................................................................................
+
+    class FactoryGuard;
+
+    //==================================================================================================================
+    //= ToolPanelFactory
+    //==================================================================================================================
+    typedef ::cppu::WeakImplHelper2 <   ::com::sun::star::ui::XUIElementFactory
+                                    ,   ::com::sun::star::lang::XServiceInfo
+                                    >   ToolPanelFactory_Base;
+    class ToolPanelFactory   :public ::cppu::BaseMutex
+                            ,public ToolPanelFactory_Base
+    {
+    public:
+        ToolPanelFactory(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext
+        );
+        ~ToolPanelFactory();
+
+        // XUIElementFactory
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& i_rResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rArgs ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+
+        // XServiceInfo
+        virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XServiceInfo - static versions
+        static ::rtl::OUString SAL_CALL getImplementationName_static(  ) throw (::com::sun::star::uno::RuntimeException);
+        static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(  ) throw (::com::sun::star::uno::RuntimeException);
+        static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext ) throw (::com::sun::star::uno::RuntimeException);
+
+    private:
+        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+                m_xContext;
+    };
+
+//......................................................................................................................
+} } // namespace sd::colortoolpanel
+//......................................................................................................................
+
+#endif // SD_WORKBENCH_CTP_FACTORY_HXX
diff --git a/sfx2/workben/custompanel/ctp_panel.cxx b/sfx2/workben/custompanel/ctp_panel.cxx
new file mode 100644
index 000000000000..ee94287bedbf
--- /dev/null
+++ b/sfx2/workben/custompanel/ctp_panel.cxx
@@ -0,0 +1,270 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#include "precompiled_sfx2.hxx"
+
+#include "ctp_panel.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/awt/XWindowPeer.hpp>
+#include <com/sun/star/awt/XToolkit.hpp>
+#include <com/sun/star/awt/WindowClass.hpp>
+#include <com/sun/star/awt/WindowAttribute.hpp>
+#include <com/sun/star/awt/PosSize.hpp>
+#include <com/sun/star/awt/XDevice.hpp>
+#include <com/sun/star/awt/XGraphics.hpp>
+#include <com/sun/star/ui/UIElementType.hpp>
+/** === end UNO includes === **/
+
+#include <tools/diagnose_ex.h>
+
+//......................................................................................................................
+namespace sd { namespace colortoolpanel
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::uno::XComponentContext;
+    using ::com::sun::star::awt::XWindow;
+    using ::com::sun::star::lang::DisposedException;
+    using ::com::sun::star::awt::XWindowPeer;
+    using ::com::sun::star::lang::XMultiComponentFactory;
+    using ::com::sun::star::awt::XToolkit;
+    using ::com::sun::star::awt::WindowDescriptor;
+    using ::com::sun::star::awt::WindowClass_SIMPLE;
+    using ::com::sun::star::awt::Rectangle;
+    using ::com::sun::star::awt::PaintEvent;
+    using ::com::sun::star::lang::EventObject;
+    using ::com::sun::star::awt::XDevice;
+    using ::com::sun::star::awt::XGraphics;
+    using ::com::sun::star::accessibility::XAccessible;
+    using ::com::sun::star::frame::XFrame;
+    /** === end UNO using === **/
+    namespace WindowAttribute = ::com::sun::star::awt::WindowAttribute;
+    namespace PosSize = ::com::sun::star::awt::PosSize;
+    namespace UIElementType = ::com::sun::star::ui::UIElementType;
+
+    //==================================================================================================================
+    //= helpers
+    //==================================================================================================================
+    namespace
+    {
+        Reference< XWindow > lcl_createPlainWindow_nothrow( const Reference< XComponentContext >& i_rContext,
+            const Reference< XWindowPeer >& i_rParentWindow )
+        {
+            try
+            {
+                ENSURE_OR_THROW( i_rContext.is(), "illegal component context" );
+                Reference< XMultiComponentFactory > xFactory( i_rContext->getServiceManager(), UNO_SET_THROW );
+                Reference< XToolkit > xToolkit( xFactory->createInstanceWithContext(
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ) ),
+                    i_rContext
+                ), UNO_QUERY_THROW );
+
+                WindowDescriptor aWindow;
+                aWindow.Type = WindowClass_SIMPLE;
+                aWindow.WindowServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "window" ) );
+                aWindow.Parent = i_rParentWindow;
+                aWindow.WindowAttributes = WindowAttribute::BORDER;
+
+                Reference< XWindowPeer > xWindow( xToolkit->createWindow( aWindow ), UNO_SET_THROW );
+                return Reference< XWindow >( xWindow, UNO_QUERY_THROW );
+            }
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
+            return NULL;
+        }
+    }
+    //==================================================================================================================
+    //= class SingleColorPanel
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    SingleColorPanel::SingleColorPanel( const Reference< XComponentContext >& i_rContext, const Reference< XWindow >& i_rParentWindow, const ::sal_Int32 i_nPanelColor )
+        :SingleColorPanel_Base( m_aMutex )
+        ,m_xWindow()
+        ,m_nPanelColor( i_nPanelColor )
+    {
+        // retrieve the parent window for our to-be-created pane window
+        Reference< XWindowPeer > xParentPeer( i_rParentWindow, UNO_QUERY );
+
+        osl_incrementInterlockedCount( &m_refCount );
+        if ( xParentPeer.is() )
+        {
+            m_xWindow = lcl_createPlainWindow_nothrow( i_rContext, xParentPeer );
+            m_xWindow->addPaintListener( this );
+            if ( m_xWindow.is() )
+            {
+                const Rectangle aPanelAnchorSize( i_rParentWindow->getPosSize() );
+                m_xWindow->setPosSize( 0, 0, aPanelAnchorSize.Width, aPanelAnchorSize.Height, PosSize::POSSIZE );
+                m_xWindow->setVisible( sal_True );
+            }
+        }
+        osl_decrementInterlockedCount( &m_refCount );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    SingleColorPanel::~SingleColorPanel()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XWindow > SAL_CALL SingleColorPanel::getWindow() throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( !m_xWindow.is() )
+            throw DisposedException( ::rtl::OUString(), *this );
+        return m_xWindow;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL SingleColorPanel::createAccessible( const Reference< XAccessible >& i_rParentAccessible ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( !m_xWindow.is() )
+            throw DisposedException( ::rtl::OUString(), *this );
+
+        // TODO: the following is wrong, since it doesn't respect i_rParentAccessible. In a real extension, you should
+        // implement this correctly :)
+        (void)i_rParentAccessible;
+        return Reference< XAccessible >( getWindow(), UNO_QUERY );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SingleColorPanel::windowPaint( const PaintEvent& i_rEvent ) throw (RuntimeException)
+    {
+        try
+        {
+            const Reference< XDevice > xDevice( i_rEvent.Source, UNO_QUERY_THROW );
+            const Reference< XGraphics > xGraphics( xDevice->createGraphics(), UNO_SET_THROW );
+            xGraphics->setFillColor( m_nPanelColor );
+            xGraphics->setLineColor( 0x00FFFFFF );
+
+            const Reference< XWindow > xWindow( i_rEvent.Source, UNO_QUERY_THROW );
+            const Rectangle aWindowRect( xWindow->getPosSize() );
+            xGraphics->drawRect( 0, 0, aWindowRect.Width - 1, aWindowRect.Height - 1 );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SingleColorPanel::disposing( const EventObject& i_rSource ) throw (RuntimeException)
+    {
+        (void)i_rSource;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SingleColorPanel::disposing()
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( !m_xWindow.is() )
+            // already disposed
+            return;
+        m_xWindow->removePaintListener( this );
+        try
+        {
+            Reference< XComponent > xWindowComp( m_xWindow, UNO_QUERY_THROW );
+            xWindowComp->dispose();
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        m_xWindow.clear();
+    }
+
+    //==================================================================================================================
+    //= PanelUIElement
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    PanelUIElement::PanelUIElement( const Reference< XComponentContext >& i_rContext, const Reference< XWindow >& i_rParentWindow,
+        const ::rtl::OUString& i_rResourceURL, const ::sal_Int32 i_nPanelColor )
+        :PanelUIElement_Base( m_aMutex )
+        ,m_sResourceURL( i_rResourceURL )
+        ,m_xToolPanel( new SingleColorPanel( i_rContext, i_rParentWindow, i_nPanelColor ) )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    PanelUIElement::~PanelUIElement()
+    {
+    }
+
+     //------------------------------------------------------------------------------------------------------------------
+    Reference< XFrame > SAL_CALL PanelUIElement::getFrame() throw (RuntimeException)
+    {
+        // TODO
+        return NULL;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL PanelUIElement::getResourceURL() throw (RuntimeException)
+    {
+        return m_sResourceURL;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int16 SAL_CALL PanelUIElement::getType() throw (RuntimeException)
+    {
+        return UIElementType::TOOLPANEL;
+    }
+
+     //------------------------------------------------------------------------------------------------------------------
+    Reference< XInterface > SAL_CALL PanelUIElement::getRealInterface(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( !m_xToolPanel.is() )
+            throw DisposedException();
+        return m_xToolPanel;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL PanelUIElement::disposing()
+    {
+        Reference< XComponent > xPanelComponent( m_xToolPanel, UNO_QUERY_THROW );
+        m_xToolPanel.clear();
+        xPanelComponent->dispose();
+    }
+
+//......................................................................................................................
+} } // namespace sd::colortoolpanel
+//......................................................................................................................
diff --git a/sfx2/workben/custompanel/ctp_panel.hxx b/sfx2/workben/custompanel/ctp_panel.hxx
new file mode 100644
index 000000000000..39c46c9d93a5
--- /dev/null
+++ b/sfx2/workben/custompanel/ctp_panel.hxx
@@ -0,0 +1,124 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SD_WORKBENCH_CTP_PANEL_HXX
+#define SD_WORKBENCH_CTP_PANEL_HXX
+
+/** === begin UNO includes === **/
+#include <com/sun/star/ui/XToolPanel.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/awt/XPaintListener.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/ui/XUIElement.hpp>
+/** === end UNO includes === **/
+
+#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/basemutex.hxx>
+
+#include <boost/scoped_ptr.hpp>
+
+//......................................................................................................................
+namespace sd { namespace colortoolpanel
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= SingleColorPanel
+    //==================================================================================================================
+    typedef ::cppu::WeakComponentImplHelper2    <   ::com::sun::star::ui::XToolPanel
+                                                ,   ::com::sun::star::awt::XPaintListener
+                                                >   SingleColorPanel_Base;
+    class SingleColorPanel  :public ::cppu::BaseMutex
+                            ,public SingleColorPanel_Base
+    {
+    public:
+        SingleColorPanel(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& i_rParentWindow,
+            const ::sal_Int32 i_nPanelColor
+        );
+
+        // XToolPanel
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getWindow() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL createAccessible( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XPaintListener
+        virtual void SAL_CALL windowPaint( const ::com::sun::star::awt::PaintEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XEventListener
+        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XComponent equivalents
+        virtual void SAL_CALL disposing();
+
+    protected:
+        ~SingleColorPanel();
+
+    private:
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >  m_xWindow;
+        const sal_Int32                                                     m_nPanelColor;
+    };
+
+    //==================================================================================================================
+    //= PanelUIElement
+    //==================================================================================================================
+    typedef ::cppu::WeakComponentImplHelper1    <   ::com::sun::star::ui::XUIElement
+                                                >   PanelUIElement_Base;
+    class PanelUIElement    :public ::cppu::BaseMutex
+                            ,public PanelUIElement_Base
+    {
+    public:
+        PanelUIElement(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& i_rParentWindow,
+            const ::rtl::OUString& i_rResourceURL,
+            const ::sal_Int32 i_nPanelColor
+        );
+
+        // XUIElement
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // OComponentHelper
+        virtual void SAL_CALL disposing();
+
+    protected:
+        ~PanelUIElement();
+
+    private:
+        const ::rtl::OUString   m_sResourceURL;
+        ::com::sun::star::uno::Reference< ::com::sun::star::ui::XToolPanel >
+                                m_xToolPanel;
+    };
+
+//......................................................................................................................
+} } // namespace sd::colortoolpanel
+//......................................................................................................................
+
+#endif // SD_WORKBENCH_CTP_PANEL_HXX
diff --git a/sfx2/workben/custompanel/ctp_services.cxx b/sfx2/workben/custompanel/ctp_services.cxx
new file mode 100644
index 000000000000..4164e8bc1629
--- /dev/null
+++ b/sfx2/workben/custompanel/ctp_services.cxx
@@ -0,0 +1,92 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#include "precompiled_sfx2.hxx"
+
+#include "ctp_factory.hxx"
+
+/** === begin UNO includes === **/
+/** === end UNO includes === **/
+
+#include <cppuhelper/implementationentry.hxx>
+
+//......................................................................................................................
+namespace sd { namespace colortoolpanel
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    /** === end UNO using === **/
+
+    //==================================================================================================================
+    //= descriptors for the services implemented in this component
+    //==================================================================================================================
+    static struct ::cppu::ImplementationEntry s_aServiceEntries[] =
+    {
+        {
+            ToolPanelFactory::Create,
+            ToolPanelFactory::getImplementationName_static,
+            ToolPanelFactory::getSupportedServiceNames_static,
+            ::cppu::createSingleComponentFactory, NULL, 0
+        },
+        { 0, 0, 0, 0, 0, 0 }
+    };
+
+//......................................................................................................................
+} } // namespace sd::colortoolpanel
+//......................................................................................................................
+
+extern "C"
+{
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
+    {
+        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey )
+    {
+        return ::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, ::sd::colortoolpanel::s_aServiceEntries );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+    {
+        return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::sd::colortoolpanel::s_aServiceEntries );
+    }
+}
diff --git a/sfx2/workben/custompanel/delzip b/sfx2/workben/custompanel/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sfx2/workben/custompanel/delzip
diff --git a/sfx2/workben/custompanel/description.xml b/sfx2/workben/custompanel/description.xml
new file mode 100644
index 000000000000..7b85d64eaf69
--- /dev/null
+++ b/sfx2/workben/custompanel/description.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<description
+    xmlns="http://openoffice.org/extensions/description/2006"
+    xmlns:d="http://openoffice.org/extensions/description/2006"
+    xmlns:xlink="http://www.w3.org/1999/xlink">
+
+  <identifier value="UPDATED_IDENTIFIER"/>
+  <version value="0.1" />
+  <platform value="UPDATED_SUPPORTED_PLATFORM" />
+  <display-name>
+    <name lang="en-US">Custom Tool Panel Example</name>
+  </display-name>
+  <dependencies>
+    <OpenOffice.org-minimal-version value="3.3" d:name="OpenOffice.org 3.3"/>
+  </dependencies>
+</description>
diff --git a/sfx2/workben/custompanel/makefile.mk b/sfx2/workben/custompanel/makefile.mk
new file mode 100644
index 000000000000..1eb20ceed35d
--- /dev/null
+++ b/sfx2/workben/custompanel/makefile.mk
@@ -0,0 +1,120 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=../..
+PRJNAME=sfx2
+
+TARGET=custompanel
+ENABLE_EXCEPTIONS=TRUE
+LIBTARGET=NO
+EXTENSIONNAME:=custom-tool-panel
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+#-------------------------------------------------------------------
+
+#---- extension version
+EXTENSION_VERSION_BASE=0.1
+.IF ( "$(CWS_WORK_STAMP)" == "" ) || ( "$(UPDATER)" == "YES" )
+    EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
+.ELSE
+    EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).cws.$(CWS_WORK_STAMP)
+.ENDIF
+
+#---- extension title package name
+EXTENSION_TITLE=Custom Tool Panel Example
+EXTENSION_ZIPNAME=$(EXTENSIONNAME)-$(EXTENSION_VERSION_BASE)-$(RTL_OS:l)-$(RTL_ARCH:l)
+
+#--------------------------------------------------
+
+SHL1DLLPRE=
+SHL1TARGET=$(TARGET).uno
+LIB1TARGET=$(SLB)/$(SHL1TARGET).lib
+LIB1OBJFILES= \
+        $(SLO)/ctp_factory.obj \
+        $(SLO)/ctp_services.obj \
+        $(SLO)/ctp_panel.obj
+
+SHL1STDLIBS= \
+        $(CPPULIB)          \
+        $(SALLIB)           \
+        $(SALHELPERLIB)     \
+        $(CPPUHELPERLIB)
+
+SHL1VERSIONMAP=$(SOLARSRC)/solenv/src/component.map
+SHL1LIBS=	$(LIB1TARGET)
+SHL1DEF=	$(MISC)/$(SHL1TARGET).def
+SHL1RPATH=  OXT
+DEF1NAME=	$(SHL1TARGET)
+
+# create Extension -----------------------------
+
+COMPONENT_CONFIGDEST=.
+
+COMPONENT_XCU = \
+    $(EXTENSIONDIR)/WriterWindowState.xcu \
+    $(EXTENSIONDIR)/CalcWindowState.xcu \
+    $(EXTENSIONDIR)/DrawWindowState.xcu \
+    $(EXTENSIONDIR)/ImpressWindowState.xcu \
+    $(EXTENSIONDIR)/Factories.xcu
+
+COMPONENT_LIBRARIES = \
+        $(EXTENSIONDIR)/$(SHL1TARGET)$(DLLPOST)
+
+COMPONENT_IMAGES= \
+    $(EXTENSIONDIR)/panel.png
+
+# ........ dependencies for packaging the extension ........
+EXTENSION_PACKDEPS=makefile.mk $(COMPONENT_IMAGES)
+
+# --- Targets ------------------------------------------------------
+.INCLUDE : extension_pre.mk
+.INCLUDE : target.mk
+.INCLUDE : extension_post.mk
+
+$(EXTENSIONDIR)/%.png : ./%.png
+    @@-$(MKDIRHIER) $(@:d)
+    @$(COPY) $< $@ > $(NULLDEV)
+
+$(EXTENSIONDIR)/WriterWindowState.xcu: ./WriterWindowState.xcu
+    @@-$(MKDIRHIER) $(@:d)
+    $(COMMAND_ECHO)$(TYPE) ./WriterWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/WriterWindowState.xcu
+
+$(EXTENSIONDIR)/CalcWindowState.xcu: ./CalcWindowState.xcu
+    @@-$(MKDIRHIER) $(@:d)
+    $(COMMAND_ECHO)$(TYPE) ./CalcWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/CalcWindowState.xcu
+
+$(EXTENSIONDIR)/DrawWindowState.xcu: ./DrawWindowState.xcu
+    @@-$(MKDIRHIER) $(@:d)
+    $(COMMAND_ECHO)$(TYPE) ./DrawWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/DrawWindowState.xcu
+
+$(EXTENSIONDIR)/ImpressWindowState.xcu: ./ImpressWindowState.xcu
+    @@-$(MKDIRHIER) $(@:d)
+    $(COMMAND_ECHO)$(TYPE) ./ImpressWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/ImpressWindowState.xcu
+
diff --git a/sfx2/workben/custompanel/manifest.xml b/sfx2/workben/custompanel/manifest.xml
new file mode 100644
index 000000000000..9122d16a4189
--- /dev/null
+++ b/sfx2/workben/custompanel/manifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
+                       manifest:full-path="custompanel.unoSHARED_EXTENSION"/>
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                       manifest:full-path="WriterWindowState.xcu"/>
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                       manifest:full-path="CalcWindowState.xcu"/>
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                       manifest:full-path="DrawWindowState.xcu"/>
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                       manifest:full-path="ImpressWindowState.xcu"/>
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                       manifest:full-path="Factories.xcu"/>
+  <!-- <manifest:file-entry manifest:media-type="image/png"
+                       manifest:full-path="panel.png"/>-->
+</manifest:manifest>
diff --git a/sfx2/workben/custompanel/panel.png b/sfx2/workben/custompanel/panel.png
new file mode 100644
index 000000000000..2438714af8a6
--- /dev/null
+++ b/sfx2/workben/custompanel/panel.png
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index b53b5f6dac26..61bb772ba994 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -706,6 +706,7 @@
 #define SID_ATTR_TEXT_FITTOSIZE                         ( SID_SVX_START + 367 )
 #define SID_ATTR_BRUSH_ROW                              ( SID_SVX_START + 368 )
 #define SID_OPTFILTER_MSOFFICE                          ( SID_SVX_START + 369 )
+//#define SID_TASKPANE                                    ( SID_SVX_START + 370 )   -> sfxsids.hrc
 #define SID_IMAP                                        ( SID_SVX_START + 371 )
 #define SID_IMAP_DLG                                    ( SID_SVX_START + 372 )
 #define SID_IMAP_SELECT                                 ( SID_SVX_START + 373 )
diff --git a/svx/prj/d.lst b/svx/prj/d.lst
index d4201f0caf34..6e40b1fd5846 100644
--- a/svx/prj/d.lst
+++ b/svx/prj/d.lst
@@ -2,9 +2,6 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid
 mkdir: %COMMON_DEST%\res%_EXT%
 mkdir: %_DEST%\xml%_EXT%\uiconfig
 mkdir: %_DEST%\xml%_EXT%\uiconfig\global
-mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator
-mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\en-US
-mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es
 
 ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
 ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
@@ -678,10 +675,6 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\table
 ..\xml\AccessibleControlShape.xml %_DEST%\xml%_EXT%\AccessibleControlShape.xml
 ..\xml\AccessibleEditableTextPara.xml %_DEST%\xml%_EXT%\AccessibleEditableTextPara.xml
 
-..\uiconfig\accelerator\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\*.xml
-..\uiconfig\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\en-US\*.xml
-..\uiconfig\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es\*.xml
-
 ..\inc\svx\subtoolboxcontrol.hxx %_DEST%\inc%_EXT%\svx\subtoolboxcontrol.hxx
 ..\inc\svx\svdtext.hxx %_DEST%\inc%_EXT%\svx\svdtext.hxx
 ..\inc\svx\svdotable.hxx %_DEST%\inc%_EXT%\svx\svdotable.hxx
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index e02e8664c6ac..8ce3d6e7ba7c 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -43,7 +43,7 @@
 #include <svtools/miscopt.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/viewoptions.hxx>
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/objitem.hxx>
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 8c752910b15e..bb18ae76f4e3 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -941,7 +941,6 @@ void SAL_CALL FmXFormShell::formDeactivated(const EventObject& rEvent) throw( Ru
 void FmXFormShell::disposing()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::disposing" );
-    OSL_TRACE( "--- FmXFormShell::disposing      : %p, ........, ........", this );
     impl_checkDisposed();
 
     FmXFormShell_BASE::disposing();
@@ -3793,7 +3792,6 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
 void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeactivateController /* = sal_True */ )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::viewDeactivated" );
-    OSL_TRACE( "--- FmXFormShell::viewDeactivated: %p, %p, ........", this, &_rCurrentView );
 
     if ( _rCurrentView.GetImpl() && !_rCurrentView.IsDesignMode() )
     {
@@ -3828,7 +3826,6 @@ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeacti
     // remove callbacks at the page
     if ( pPage )
     {
-        OSL_TRACE( "--- FmXFormShell::resetHandler   : %p, ........, %p", this, pPage );
         pPage->GetImpl().SetFormsCreationHdl( Link() );
     }
     UpdateForms( sal_True );
@@ -3867,7 +3864,6 @@ IMPL_LINK( FmXFormShell, OnFormsCreated, FmFormPage*, /*_pPage*/ )
 void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncAction /* = sal_False */ )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::viewActivated" );
-    OSL_TRACE( "--- FmXFormShell::viewActivated  : %p, %p, ........", this, &_rCurrentView );
 
     FmFormPage* pPage = _rCurrentView.GetCurPage();
 
@@ -3897,7 +3893,6 @@ void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncActi
     // set callbacks at the page
     if ( pPage )
     {
-        OSL_TRACE( "--- FmXFormShell::setHandler     : %p, ........, %p", this, pPage );
         pPage->GetImpl().SetFormsCreationHdl( LINK( this, FmXFormShell, OnFormsCreated ) );
     }
 
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 922d3f05ddff..22681d511b82 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -339,8 +339,6 @@ void FmFormView::GrabFirstControlFocus( sal_Bool _bForceSync )
 //------------------------------------------------------------------------
 SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage)
 {
-//    OSL_TRACE( "--- FmFormView::ShowSdrPage      : ........, %p, %p", this, pPage );
-
     SdrPageView* pPV = E3dView::ShowSdrPage(pPage);
 
     if (pPage)
@@ -377,8 +375,6 @@ SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage)
 //------------------------------------------------------------------------
 void FmFormView::HideSdrPage()
 {
-//    OSL_TRACE( "--- FmFormView::HideSdrPage      : ........, %p, %p", this, GetCurPage() );
-
     // --- 1. deactivate controls
     if ( !IsDesignMode() )
         DeactivateControls(GetSdrPageView());
diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src
index f963d95721fc..ecadfd9d4c6a 100644
--- a/svx/source/intro/iso.src
+++ b/svx/source/intro/iso.src
@@ -30,7 +30,7 @@
 #endif
 
 #ifndef _SVTOOLS_HRC
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #endif
 
 #include "intro.hrc"
diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src
index b29f3894c0c5..7c3cc150586c 100644
--- a/svx/source/intro/ooo.src
+++ b/svx/source/intro/ooo.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 #ifndef _SVTOOLS_HRC
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #endif
 
 #ifndef _SVTOOLS_IMAGEMGR_HRC
diff --git a/svx/uiconfig/accelerator/default.xml b/svx/uiconfig/accelerator/default.xml
deleted file mode 100644
index dafd9e022f12..000000000000
--- a/svx/uiconfig/accelerator/default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <accel:item accel:code="KEY_S" accel:shift="true" accel:mod1="true" xlink:href=".uno:SaveAs"/>
-    <accel:item accel:code="KEY_Y" accel:shift="true" accel:mod1="true" xlink:href=".uno:Repeat"/>
-</accel:acceleratorlist>
diff --git a/svx/uiconfig/accelerator/en-US/default.xml b/svx/uiconfig/accelerator/en-US/default.xml
deleted file mode 100644
index 67a6e9127c8a..000000000000
--- a/svx/uiconfig/accelerator/en-US/default.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <accel:item accel:code="KEY_Q" accel:mod1="true" xlink:href=".uno:Quit"/>
-    <accel:item accel:code="KEY_N" accel:shift="true" accel:mod1="true" xlink:href=".uno:NewDoc"/>
-    <accel:item accel:code="KEY_O" accel:mod1="true" xlink:href=".uno:Open"/>
-    <accel:item accel:code="KEY_OPEN" xlink:href=".uno:Open"/>
-    <accel:item accel:code="KEY_P" accel:mod1="true" xlink:href=".uno:Print"/>
-    <accel:item accel:code="KEY_S" accel:mod1="true" xlink:href=".uno:Save"/>
-    <accel:item accel:code="KEY_N" accel:mod1="true" xlink:href=".uno:AddDirect"/>
-    <accel:item accel:code="KEY_W" accel:mod1="true" xlink:href=".uno:CloseWin"/>
-    <accel:item accel:code="KEY_F4" accel:mod1="true" xlink:href=".uno:CloseWin"/>
-    <accel:item accel:code="KEY_X" accel:mod1="true" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_DELETE" accel:shift="true" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_CUT" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_C" accel:mod1="true" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_INSERT" accel:mod1="true" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_COPY" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_V" accel:mod1="true" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_INSERT" accel:shift="true" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_PASTE" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_DELETE" xlink:href=".uno:Delete"/>
-    <accel:item accel:code="KEY_A" accel:mod1="true" xlink:href=".uno:SelectAll"/>
-    <accel:item accel:code="KEY_F" accel:mod1="true" xlink:href=".uno:SearchDialog"/>
-    <accel:item accel:code="KEY_Q" accel:shift="true" accel:mod1="true" xlink:href=".uno:BasicBreak"/>
-    <accel:item accel:code="KEY_F4" xlink:href=".uno:ViewDataSourceBrowser"/>
-    <accel:item accel:code="KEY_F5" accel:mod1="true" xlink:href=".uno:GrabControlFocus"/>
-    <accel:item accel:code="KEY_F7" accel:shift="true" accel:mod1="true" xlink:href=".uno:HangulHanjaConversion"/>
-    <accel:item accel:code="KEY_F11" accel:mod2="true" xlink:href=".uno:MacroDialog"/>
-</accel:acceleratorlist>
diff --git a/svx/uiconfig/accelerator/es/default.xml b/svx/uiconfig/accelerator/es/default.xml
deleted file mode 100644
index 71ba6212d275..000000000000
--- a/svx/uiconfig/accelerator/es/default.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <accel:item accel:code="KEY_Q" accel:mod1="true" xlink:href=".uno:Quit"/>
-    <accel:item accel:code="KEY_N" accel:shift="true" accel:mod1="true" xlink:href=".uno:NewDoc"/>
-    <accel:item accel:code="KEY_A" accel:mod1="true" xlink:href=".uno:Open"/>
-    <accel:item accel:code="KEY_OPEN" xlink:href=".uno:Open"/>
-    <accel:item accel:code="KEY_P" accel:mod1="true" xlink:href=".uno:Print"/>
-    <accel:item accel:code="KEY_G" accel:mod1="true" xlink:href=".uno:Save"/>
-    <accel:item accel:code="KEY_U" accel:mod1="true" xlink:href=".uno:AddDirect"/>
-    <accel:item accel:code="KEY_W" accel:mod1="true" xlink:href=".uno:CloseWin"/>
-    <accel:item accel:code="KEY_F4" accel:mod1="true" xlink:href=".uno:CloseWin"/>
-    <accel:item accel:code="KEY_X" accel:mod1="true" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_DELETE" accel:shift="true" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_CUT" xlink:href=".uno:Cut"/>
-    <accel:item accel:code="KEY_C" accel:mod1="true" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_INSERT" accel:mod1="true" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_COPY" xlink:href=".uno:Copy"/>
-    <accel:item accel:code="KEY_V" accel:mod1="true" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_INSERT" accel:shift="true" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_PASTE" xlink:href=".uno:Paste"/>
-    <accel:item accel:code="KEY_DELETE" xlink:href=".uno:Delete"/>
-    <accel:item accel:code="KEY_E" accel:mod1="true" xlink:href=".uno:SelectAll"/>
-    <accel:item accel:code="KEY_B" accel:mod1="true" xlink:href=".uno:SearchDialog"/>
-    <accel:item accel:code="KEY_Q" accel:shift="true" accel:mod1="true" xlink:href=".uno:BasicBreak"/>
-    <accel:item accel:code="KEY_F4" xlink:href=".uno:ViewDataSourceBrowser"/>
-    <accel:item accel:code="KEY_F5" accel:mod1="true" xlink:href=".uno:GrabControlFocus"/>
-    <accel:item accel:code="KEY_F7" accel:shift="true" accel:mod1="true" xlink:href=".uno:HangulHanjaConversion"/>
-    <accel:item accel:code="KEY_F11" accel:mod2="true" xlink:href=".uno:MacroDialog"/>
-</accel:acceleratorlist>
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx
index 32d556b31626..baee57ad75dc 100644
--- a/svx/workben/msview/msview.cxx
+++ b/svx/workben/msview/msview.cxx
@@ -34,7 +34,7 @@
 #include <boost/shared_ptr.hpp>
 #include <sot/storage.hxx>
 #ifndef _SVTOOLS_HRC
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #endif
 
 #include <sal/main.h>
diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst
index a4d7ef6b4f6b..dad79213047e 100644
--- a/ucb/prj/build.lst
+++ b/ucb/prj/build.lst
@@ -1,4 +1,4 @@
-uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper NULL
+uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper tools NULL
 uc	ucb							usr1	-	all	uc_mkout NULL
 uc	ucb\inc					    nmake	-	all	uc_inc NULL
 uc	ucb\source\regexp		    nmake	-	all	uc_regexp uc_inc NULL
@@ -14,4 +14,5 @@ uc	ucb\source\ucp\webdav		nmake	-	all	uc_webdav uc_inc NULL
 uc	ucb\source\ucp\package		nmake	-	all	uc_package uc_inc NULL
 uc	ucb\source\ucp\tdoc			nmake	-	all	uc_tdoc uc_inc NULL
 uc	ucb\source\ucp\expand		nmake	-	all	uc_expand uc_inc NULL
+uc	ucb\source\ucp\ext		    nmake	-	all	uc_ext uc_inc NULL
 uc ucb\qa\unoapi nmake - all uc_qa_unoapi NULL
diff --git a/ucb/source/ucp/ext/makefile.mk b/ucb/source/ucp/ext/makefile.mk
new file mode 100644
index 000000000000..23c30b3bda5b
--- /dev/null
+++ b/ucb/source/ucp/ext/makefile.mk
@@ -0,0 +1,65 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.4 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ = ..$/..$/..
+PRJNAME = ucb
+TARGET = ucpext.uno
+ENABLE_EXCEPTIONS = TRUE
+
+.INCLUDE : settings.mk
+DLLPRE =
+
+SLOFILES= \
+        $(SLO)$/ucpext_provider.obj \
+        $(SLO)$/ucpext_content.obj \
+        $(SLO)$/ucpext_services.obj \
+        $(SLO)$/ucpext_resultset.obj \
+        $(SLO)$/ucpext_datasupplier.obj
+
+SHL1STDLIBS = \
+        $(UCBHELPERLIB)     \
+        $(COMPHELPERLIB)    \
+        $(CPPUHELPERLIB)    \
+        $(CPPULIB)          \
+        $(SALLIB)           \
+        $(SALHELPERLIB)
+
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
+SHL1TARGET = $(TARGET)
+
+SHL1DEPN =
+SHL1IMPLIB = i$(TARGET)
+SHL1LIBS = $(SLB)$/$(TARGET).lib
+SHL1DEF = $(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME = $(SHL1TARGET)
+
+.INCLUDE : target.mk
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
new file mode 100644
index 000000000000..7b7ada742840
--- /dev/null
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -0,0 +1,672 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#include "precompiled_ucb.hxx"
+
+#include "ucpext_content.hxx"
+
+#include "ucpext_content.hxx"
+#include "ucpext_provider.hxx"
+#include "ucpext_resultset.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/XPropertyAccess.hpp>
+#include <com/sun/star/lang/IllegalAccessException.hpp>
+#include <com/sun/star/sdbc/XRow.hpp>
+#include <com/sun/star/ucb/XCommandInfo.hpp>
+#include <com/sun/star/ucb/XPersistentPropertySet.hpp>
+#include <com/sun/star/io/XOutputStream.hpp>
+#include <com/sun/star/io/XActiveDataSink.hpp>
+#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
+#include <com/sun/star/ucb/OpenMode.hpp>
+#include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
+#include <com/sun/star/ucb/UnsupportedOpenModeException.hpp>
+#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
+#include <com/sun/star/ucb/OpenMode.hpp>
+#include <com/sun/star/ucb/XDynamicResultSet.hpp>
+#include <com/sun/star/lang/IllegalAccessException.hpp>
+#include <com/sun/star/deployment/XPackageInformationProvider.hpp>
+/** === end UNO includes === **/
+
+#include <ucbhelper/contentidentifier.hxx>
+#include <ucbhelper/propertyvalueset.hxx>
+#include <ucbhelper/cancelcommandexecution.hxx>
+#include <ucbhelper/content.hxx>
+#include <tools/diagnose_ex.h>
+#include <comphelper/string.hxx>
+#include <comphelper/componentcontext.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/uri.hxx>
+
+#include <algorithm>
+
+//......................................................................................................................
+namespace ucb { namespace ucp { namespace ext
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::lang::XMultiServiceFactory;
+    using ::com::sun::star::ucb::XContentIdentifier;
+    using ::com::sun::star::ucb::IllegalIdentifierException;
+    using ::com::sun::star::ucb::XContent;
+    using ::com::sun::star::ucb::XCommandEnvironment;
+    using ::com::sun::star::ucb::Command;
+    using ::com::sun::star::ucb::CommandAbortedException;
+    using ::com::sun::star::beans::Property;
+    using ::com::sun::star::lang::IllegalArgumentException;
+    using ::com::sun::star::beans::PropertyValue;
+    using ::com::sun::star::ucb::OpenCommandArgument2;
+    using ::com::sun::star::ucb::XDynamicResultSet;
+    using ::com::sun::star::ucb::UnsupportedOpenModeException;
+    using ::com::sun::star::io::XOutputStream;
+    using ::com::sun::star::io::XActiveDataSink;
+    using ::com::sun::star::io::XInputStream;
+    using ::com::sun::star::ucb::UnsupportedDataSinkException;
+    using ::com::sun::star::ucb::UnsupportedCommandException;
+    using ::com::sun::star::sdbc::XRow;
+    using ::com::sun::star::beans::XPropertySet;
+    using ::com::sun::star::beans::PropertyChangeEvent;
+    using ::com::sun::star::lang::IllegalAccessException;
+    using ::com::sun::star::ucb::CommandInfo;
+    using ::com::sun::star::deployment::XPackageInformationProvider;
+    /** === end UNO using === **/
+    namespace OpenMode = ::com::sun::star::ucb::OpenMode;
+    namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
+
+    //==================================================================================================================
+    //= helper
+    //==================================================================================================================
+    namespace
+    {
+        //--------------------------------------------------------------------------------------------------------------
+        ::rtl::OUString lcl_compose( const ::rtl::OUString& i_rBaseURL, const ::rtl::OUString& i_rRelativeURL )
+        {
+            ENSURE_OR_RETURN( i_rBaseURL.getLength(), "illegal base URL", i_rRelativeURL );
+
+            ::rtl::OUStringBuffer aComposer( i_rBaseURL );
+            if ( i_rBaseURL.getStr()[ i_rBaseURL.getLength() - 1 ] != '/' )
+                aComposer.append( sal_Unicode( '/' ) );
+            aComposer.append( i_rRelativeURL );
+            return aComposer.makeStringAndClear();
+        }
+
+        //--------------------------------------------------------------------------------------------------------------
+        struct SelectPropertyName : public ::std::unary_function< Property, ::rtl::OUString >
+        {
+            const ::rtl::OUString& operator()( const Property& i_rProperty ) const
+            {
+                return i_rProperty.Name;
+            }
+        };
+    }
+
+    //==================================================================================================================
+    //= Content
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    Content::Content( const Reference< XMultiServiceFactory >& i_rORB, ::ucbhelper::ContentProviderImplHelper* i_pProvider,
+                      const Reference< XContentIdentifier >& i_rIdentifier )
+        :Content_Base( i_rORB, i_pProvider, i_rIdentifier )
+        ,m_eExtContentType( E_UNKNOWN )
+        ,m_aIsFolder()
+        ,m_aContentType()
+        ,m_sExtensionId()
+        ,m_sPathIntoExtension()
+    {
+        const ::rtl::OUString sURL( getIdentifier()->getContentIdentifier() );
+        if ( denotesRootContent( sURL ) )
+        {
+            m_eExtContentType = E_ROOT;
+        }
+        else
+        {
+            const ::rtl::OUString sRelativeURL( sURL.copy( ContentProvider::getRootURL().getLength() ) );
+            const sal_Int32 nSepPos = sRelativeURL.indexOf( '/' );
+            if ( ( nSepPos == -1 ) || ( nSepPos == sRelativeURL.getLength() - 1 ) )
+            {
+                m_eExtContentType = E_EXTENSION_ROOT;
+            }
+            else
+            {
+                m_eExtContentType = E_EXTENSION_CONTENT;
+            }
+        }
+
+        if ( m_eExtContentType != E_ROOT )
+        {
+            const ::rtl::OUString sRootURL = ContentProvider::getRootURL();
+            m_sExtensionId = sURL.copy( sRootURL.getLength() );
+
+            const sal_Int32 nNextSep = m_sExtensionId.indexOf( '/' );
+            if ( nNextSep > -1 )
+            {
+                m_sPathIntoExtension = m_sExtensionId.copy( nNextSep + 1 );
+                m_sExtensionId = m_sExtensionId.copy( 0, nNextSep );
+            }
+            m_sExtensionId = Content::decodeIdentifier( m_sExtensionId );
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Content::~Content()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL Content::getImplementationName() throw( RuntimeException )
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.ucp.ext.Content" ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException )
+    {
+        Sequence< ::rtl::OUString > aServiceNames(2);
+        aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.Content" ) );
+        aServiceNames[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.ExtensionContent" ) );
+        return aServiceNames;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL Content::getContentType() throw( RuntimeException )
+    {
+        impl_determineContentType();
+        return *m_aContentType;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Any SAL_CALL Content::execute( const Command& aCommand, sal_Int32 /* CommandId */, const Reference< XCommandEnvironment >& i_rEvironment )
+        throw( Exception, CommandAbortedException, RuntimeException )
+    {
+        Any aRet;
+
+        if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getPropertyValues" ) ) )
+        {
+            Sequence< Property > Properties;
+            if ( !( aCommand.Argument >>= Properties ) )
+            {
+                ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException(
+                    ::rtl::OUString(), *this, -1 ) ),
+                    i_rEvironment );
+                // unreachable
+            }
+
+            aRet <<= getPropertyValues( Properties, i_rEvironment );
+        }
+        else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "setPropertyValues" ) ) )
+        {
+            Sequence< PropertyValue > aProperties;
+            if ( !( aCommand.Argument >>= aProperties ) )
+            {
+                ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException(
+                    ::rtl::OUString(), *this, -1 ) ),
+                    i_rEvironment );
+                // unreachable
+            }
+
+            if ( !aProperties.getLength() )
+            {
+                ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException(
+                    ::rtl::OUString(), *this, -1 ) ),
+                    i_rEvironment );
+                // unreachable
+            }
+
+            aRet <<= setPropertyValues( aProperties, i_rEvironment );
+        }
+        else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getPropertySetInfo" ) ) )
+        {
+            // implemented by base class.
+            aRet <<= getPropertySetInfo( i_rEvironment );
+        }
+        else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getCommandInfo" ) ) )
+        {
+            // implemented by base class.
+            aRet <<= getCommandInfo( i_rEvironment );
+        }
+        else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "open" ) ) )
+        {
+            OpenCommandArgument2 aOpenCommand;
+              if ( !( aCommand.Argument >>= aOpenCommand ) )
+            {
+                ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException(
+                    ::rtl::OUString(), *this, -1 ) ),
+                    i_rEvironment );
+                // unreachable
+            }
+
+            sal_Bool bOpenFolder =
+                ( ( aOpenCommand.Mode == OpenMode::ALL ) ||
+                  ( aOpenCommand.Mode == OpenMode::FOLDERS ) ||
+                  ( aOpenCommand.Mode == OpenMode::DOCUMENTS ) );
+
+
+            if ( bOpenFolder && impl_isFolder() )
+            {
+                Reference< XDynamicResultSet > xSet = new ResultSet(
+                    m_xSMgr, this, aOpenCommand, i_rEvironment );
+                aRet <<= xSet;
+              }
+
+            if ( aOpenCommand.Sink.is() )
+            {
+                const ::rtl::OUString sPhysicalContentURL( getPhysicalURL() );
+                ::ucbhelper::Content aRequestedContent( sPhysicalContentURL, i_rEvironment );
+                aRet = aRequestedContent.executeCommand( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), makeAny( aOpenCommand ) );
+            }
+        }
+
+        else
+        {
+            ::ucbhelper::cancelCommandExecution( makeAny( UnsupportedCommandException(
+                ::rtl::OUString(), *this ) ),
+                i_rEvironment );
+            // unreachable
+        }
+
+        return aRet;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL Content::abort( sal_Int32 ) throw( RuntimeException )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString Content::encodeIdentifier( const ::rtl::OUString& i_rIdentifier )
+    {
+        return ::rtl::Uri::encode( i_rIdentifier, rtl_UriCharClassRegName, rtl_UriEncodeIgnoreEscapes,
+            RTL_TEXTENCODING_UTF8 );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString Content::decodeIdentifier( const ::rtl::OUString& i_rIdentifier )
+    {
+        return ::rtl::Uri::decode( i_rIdentifier, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    bool Content::denotesRootContent( const ::rtl::OUString& i_rContentIdentifier )
+    {
+        const ::rtl::OUString sRootURL( ContentProvider::getRootURL() );
+        if ( i_rContentIdentifier == sRootURL )
+            return true;
+
+        // the root URL contains only two trailing /, but we also recognize 3 of them as denoting the root URL
+        if  (   i_rContentIdentifier.match( sRootURL )
+            &&  ( i_rContentIdentifier.getLength() == sRootURL.getLength() + 1 )
+            &&  ( i_rContentIdentifier[ i_rContentIdentifier.getLength() - 1 ] == '/' )
+            )
+            return true;
+
+        return false;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString Content::getParentURL()
+    {
+        const ::rtl::OUString sRootURL( ContentProvider::getRootURL() );
+
+        switch ( m_eExtContentType )
+        {
+        case E_ROOT:
+            // don't have a parent
+            return sRootURL;
+
+        case E_EXTENSION_ROOT:
+            // our parent is the root itself
+            return sRootURL;
+
+        case E_EXTENSION_CONTENT:
+        {
+            const ::rtl::OUString sURL = m_xIdentifier->getContentIdentifier();
+
+            // cut the root URL
+            ENSURE_OR_BREAK( sURL.match( sRootURL, 0 ), "illegal URL structure - no root" );
+            ::rtl::OUString sRelativeURL( sURL.copy( sRootURL.getLength() ) );
+
+            // cut the extension ID
+            const ::rtl::OUString sSeparatedExtensionId( encodeIdentifier( m_sExtensionId ) + ::rtl::OUString( sal_Unicode( '/' ) ) );
+            ENSURE_OR_BREAK( sRelativeURL.match( sSeparatedExtensionId ), "illegal URL structure - no extension ID" );
+            sRelativeURL = sRelativeURL.copy( sSeparatedExtensionId.getLength() );
+
+            // cut the final slash (if any)
+            ENSURE_OR_BREAK( sRelativeURL.getLength(), "illegal URL structure - ExtensionContent should have a level below the extension ID" );
+            if ( sRelativeURL.getStr()[ sRelativeURL.getLength() - 1 ] == '/' )
+                sRelativeURL = sRelativeURL.copy( 0, sRelativeURL.getLength() - 1 );
+
+            // remove the last segment
+            const sal_Int32 nLastSep = sRelativeURL.lastIndexOf( '/' );
+            sRelativeURL = sRelativeURL.copy( 0, nLastSep != -1 ? nLastSep : 0 );
+
+            ::rtl::OUStringBuffer aComposer;
+            aComposer.append( sRootURL );
+            aComposer.append( sSeparatedExtensionId );
+            aComposer.append( sRelativeURL );
+            return aComposer.makeStringAndClear();
+        }
+
+        default:
+            OSL_ENSURE( false, "Content::getParentURL: unhandled case!" );
+            break;
+        }
+        return ::rtl::OUString();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XRow > Content::getArtificialNodePropertyValues( const Reference< XMultiServiceFactory >& i_rORB,
+        const Sequence< Property >& i_rProperties, const ::rtl::OUString& i_rTitle )
+    {
+        // note: empty sequence means "get values of all supported properties".
+        ::rtl::Reference< ::ucbhelper::PropertyValueSet > xRow = new ::ucbhelper::PropertyValueSet( i_rORB );
+
+        const sal_Int32 nCount = i_rProperties.getLength();
+        if ( nCount )
+        {
+            Reference< XPropertySet > xAdditionalPropSet;
+
+            const Property* pProps = i_rProperties.getConstArray();
+            for ( sal_Int32 n = 0; n < nCount; ++n )
+            {
+                const Property& rProp = pProps[ n ];
+
+                // Process Core properties.
+                if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) )
+                {
+                    xRow->appendString ( rProp, ContentProvider::getArtificialNodeContentType() );
+                }
+                else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
+                {
+                    xRow->appendString ( rProp, i_rTitle );
+                }
+                else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) )
+                {
+                    xRow->appendBoolean( rProp, sal_False );
+                }
+                else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) )
+                {
+                    xRow->appendBoolean( rProp, sal_True );
+                }
+                else
+                {
+                    // append empty entry.
+                    xRow->appendVoid( rProp );
+                }
+            }
+        }
+        else
+        {
+            // Append all Core Properties.
+            xRow->appendString ( Property( ::rtl::OUString::createFromAscii( "ContentType" ),
+                          -1,
+                          getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ),
+                          PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
+                ContentProvider::getArtificialNodeContentType() );
+            xRow->appendString ( Property( ::rtl::OUString::createFromAscii( "Title" ),
+                          -1,
+                          getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ),
+                          PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
+                i_rTitle );
+            xRow->appendBoolean( Property( ::rtl::OUString::createFromAscii( "IsDocument" ),
+                          -1,
+                          getCppuBooleanType(),
+                          PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
+                sal_False );
+            xRow->appendBoolean( Property( ::rtl::OUString::createFromAscii( "IsFolder" ),
+                          -1,
+                          getCppuBooleanType(),
+                          PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
+                sal_True );
+        }
+
+        return Reference< XRow >( xRow.get() );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString Content::getPhysicalURL() const
+    {
+        ENSURE_OR_RETURN( m_eExtContentType != E_ROOT, "illegal call", ::rtl::OUString() );
+
+        // create an ucb::XContent for the physical file within the deployed extension
+        const ::comphelper::ComponentContext aContext( m_xSMgr );
+        const Reference< XPackageInformationProvider > xPackageInfo(
+            aContext.getSingleton( "com.sun.star.deployment.PackageInformationProvider" ), UNO_QUERY_THROW );
+        const ::rtl::OUString sPackageLocation( xPackageInfo->getPackageLocation( m_sExtensionId ) );
+
+        if ( m_sPathIntoExtension.getLength() == 0 )
+            return sPackageLocation;
+        return lcl_compose( sPackageLocation, m_sPathIntoExtension );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XRow > Content::getPropertyValues( const Sequence< Property >& i_rProperties, const Reference< XCommandEnvironment >& i_rEnv )
+    {
+        ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex );
+
+        switch ( m_eExtContentType )
+        {
+        case E_ROOT:
+            return getArtificialNodePropertyValues( m_xSMgr, i_rProperties, ContentProvider::getRootURL() );
+        case E_EXTENSION_ROOT:
+            return getArtificialNodePropertyValues( m_xSMgr, i_rProperties, m_sExtensionId );
+        case E_EXTENSION_CONTENT:
+        {
+            const ::rtl::OUString sPhysicalContentURL( getPhysicalURL() );
+            ::ucbhelper::Content aRequestedContent( sPhysicalContentURL, i_rEnv );
+
+            // translate the property request
+            Sequence< ::rtl::OUString > aPropertyNames( i_rProperties.getLength() );
+            ::std::transform(
+                i_rProperties.getConstArray(),
+                i_rProperties.getConstArray() + i_rProperties.getLength(),
+                aPropertyNames.getArray(),
+                SelectPropertyName()
+            );
+            const Sequence< Any > aPropertyValues = aRequestedContent.getPropertyValues( aPropertyNames );
+            const ::rtl::Reference< ::ucbhelper::PropertyValueSet > xValueRow = new ::ucbhelper::PropertyValueSet( m_xSMgr );
+            sal_Int32 i=0;
+            for (   const Any* value = aPropertyValues.getConstArray();
+                    value != aPropertyValues.getConstArray() + aPropertyValues.getLength();
+                    ++value, ++i
+                )
+            {
+                xValueRow->appendObject( aPropertyNames[i], *value );
+            }
+            return xValueRow.get();
+        }
+
+        default:
+            OSL_ENSURE( false, "Content::getPropertyValues: unhandled case!" );
+            break;
+        }
+
+        OSL_ENSURE( false, "Content::getPropertyValues: unreachable!" );
+        return NULL;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< Any > Content::setPropertyValues( const Sequence< PropertyValue >& i_rValues, const Reference< XCommandEnvironment >& /* xEnv */)
+    {
+        ::osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
+
+        Sequence< Any > aRet( i_rValues.getLength() );
+        Sequence< PropertyChangeEvent > aChanges( i_rValues.getLength() );
+
+        PropertyChangeEvent aEvent;
+        aEvent.Source         = static_cast< cppu::OWeakObject * >( this );
+        aEvent.Further        = sal_False;
+        aEvent.PropertyHandle = -1;
+
+        const PropertyValue* pValues = i_rValues.getConstArray();
+        const sal_Int32 nCount = i_rValues.getLength();
+
+        for ( sal_Int32 n = 0; n < nCount; ++n, ++pValues )
+        {
+            // all our properties are read-only ...
+            aRet[ n ] <<= IllegalAccessException( ::rtl::OUString::createFromAscii( "property is read-only." ), *this );
+        }
+
+        return aRet;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< CommandInfo > Content::getCommands( const Reference< XCommandEnvironment > & /*xEnv*/ )
+    {
+        sal_uInt32 nCommandCount = 5;
+        static const CommandInfo aCommandInfoTable[] =
+        {
+            ///////////////////////////////////////////////////////////////
+            // Mandatory commands
+            ///////////////////////////////////////////////////////////////
+            CommandInfo(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ),
+                -1,
+                getCppuVoidType()
+            ),
+            CommandInfo(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ),
+                -1,
+                getCppuVoidType()
+            ),
+            CommandInfo(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ),
+                -1,
+                getCppuType(
+                    static_cast< Sequence< Property > * >( 0 ) )
+            ),
+            CommandInfo(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ),
+                -1,
+                getCppuType(
+                    static_cast< Sequence< PropertyValue > * >( 0 ) )
+            )
+            ///////////////////////////////////////////////////////////////
+            // Optional standard commands
+            ///////////////////////////////////////////////////////////////
+            , CommandInfo(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ),
+                -1,
+                getCppuType( static_cast< OpenCommandArgument2 * >( 0 ) )
+            )
+        };
+
+        return Sequence< CommandInfo >( aCommandInfoTable, nCommandCount );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< Property > Content::getProperties( const Reference< XCommandEnvironment > & /*xEnv*/ )
+    {
+        static Property aProperties[] =
+        {
+            Property(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ),
+                -1,
+                getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ),
+                PropertyAttribute::BOUND | PropertyAttribute::READONLY
+            ),
+            Property(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ),
+                -1,
+                getCppuBooleanType(),
+                PropertyAttribute::BOUND | PropertyAttribute::READONLY
+            ),
+            Property(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ),
+                -1,
+                getCppuBooleanType(),
+                PropertyAttribute::BOUND | PropertyAttribute::READONLY
+            ),
+            Property(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ),
+                -1,
+                getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ),
+                PropertyAttribute::BOUND | PropertyAttribute::READONLY
+            )
+        };
+        return Sequence< Property >( aProperties, sizeof( aProperties ) / sizeof( aProperties[0] ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    bool Content::impl_isFolder()
+    {
+        if ( !!m_aIsFolder )
+            return *m_aIsFolder;
+
+        bool bIsFolder = false;
+        try
+        {
+            Sequence< Property > aProps(1);
+            aProps[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) );
+            Reference< XRow > xRow( getPropertyValues( aProps, NULL ), UNO_SET_THROW );
+            bIsFolder = xRow->getBoolean(1);
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        m_aIsFolder.reset( bIsFolder );
+        return *m_aIsFolder;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void Content::impl_determineContentType()
+    {
+        if ( !!m_aContentType )
+            return;
+
+        m_aContentType.reset( ContentProvider::getArtificialNodeContentType() );
+        if ( m_eExtContentType == E_EXTENSION_CONTENT )
+        {
+            try
+            {
+                Sequence< Property > aProps(1);
+                aProps[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) );
+                Reference< XRow > xRow( getPropertyValues( aProps, NULL ), UNO_SET_THROW );
+                m_aContentType.reset( xRow->getString(1) );
+            }
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
+        }
+    }
+
+//......................................................................................................................
+} } }   // namespace ucp::ext
+//......................................................................................................................
diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx
new file mode 100644
index 000000000000..36380d8a7d68
--- /dev/null
+++ b/ucb/source/ucp/ext/ucpext_content.hxx
@@ -0,0 +1,154 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef UCB_UCPEXT_CONTENT_HXX
+#define UCB_UCPEXT_CONTENT_HXX
+
+/** === begin UNO includes === **/
+#include <com/sun/star/sdbc/XRow.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+/** === end UNO includes === **/
+
+#include <rtl/ref.hxx>
+#include <ucbhelper/contenthelper.hxx>
+
+#include <list>
+#include <boost/optional.hpp>
+
+//......................................................................................................................
+namespace ucb { namespace ucp { namespace ext
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= ExtensionContentType
+    //==================================================================================================================
+    enum ExtensionContentType
+    {
+        E_ROOT,
+        E_EXTENSION_ROOT,
+        E_EXTENSION_CONTENT,
+
+        E_UNKNOWN
+    };
+
+    //==================================================================================================================
+    //= ContentProvider
+    //==================================================================================================================
+    typedef ::ucbhelper::ContentImplHelper  Content_Base;
+    class Content : public Content_Base
+    {
+    public:
+        Content(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
+            ::ucbhelper::ContentProviderImplHelper* pProvider,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier
+        );
+
+        static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
+            getArtificialNodePropertyValues(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rSMgr,
+                const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rProperties,
+                const ::rtl::OUString& rTitle
+            );
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
+            getPropertyValues(
+                const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rProperties,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv
+            );
+
+        static ::rtl::OUString
+            encodeIdentifier( const ::rtl::OUString& i_rIdentifier );
+        static ::rtl::OUString
+            decodeIdentifier( const ::rtl::OUString& i_rIdentifier );
+
+        virtual ::rtl::OUString getParentURL();
+
+        ExtensionContentType getExtensionContentType() const { return m_eExtContentType; }
+
+        /** retrieves the URL of the underlying physical content. Not to be called when getExtensionContentType()
+            returns E_ROOT.
+        */
+        ::rtl::OUString getPhysicalURL() const;
+
+    protected:
+        virtual ~Content();
+
+        // XServiceInfo
+        virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XContent
+        virtual rtl::OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException );
+
+        // XCommandProcessor
+        virtual com::sun::star::uno::Any SAL_CALL
+                execute(
+                    const com::sun::star::ucb::Command& aCommand,
+                    sal_Int32 CommandId,
+                    const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment
+                )
+                throw   (   ::com::sun::star::uno::Exception
+                        ,   ::com::sun::star::ucb::CommandAbortedException
+                        ,   ::com::sun::star::uno::RuntimeException
+                        );
+
+        virtual void SAL_CALL
+                abort(
+                    sal_Int32 CommandId
+                )
+                throw   (   ::com::sun::star::uno::RuntimeException
+                        );
+
+    private:
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > getProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& i_rEnv );
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::CommandInfo > getCommands( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& i_rEnv );
+
+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
+            setPropertyValues(
+                const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rValues,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv
+            );
+
+        static bool denotesRootContent( const ::rtl::OUString& i_rContentIdentifier );
+
+        bool impl_isFolder();
+        void impl_determineContentType();
+
+    private:
+        ExtensionContentType                    m_eExtContentType;
+        ::boost::optional< bool >               m_aIsFolder;
+        ::boost::optional< ::rtl::OUString >    m_aContentType;
+        ::rtl::OUString                         m_sExtensionId;
+        ::rtl::OUString                         m_sPathIntoExtension;
+    };
+
+//......................................................................................................................
+} } }   // namespace ucb::ucp::ext
+//......................................................................................................................
+
+#endif  // UCB_UCPEXT_CONTENT_HXX
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
new file mode 100644
index 000000000000..a3a9cc6876ff
--- /dev/null
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
@@ -0,0 +1,375 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#include "precompiled_ucb.hxx"
+
+#include "ucpext_datasupplier.hxx"
+#include "ucpext_content.hxx"
+#include "ucpext_provider.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/deployment/XPackageInformationProvider.hpp>
+/** === end UNO includes === **/
+
+#include <ucbhelper/contentidentifier.hxx>
+#include <comphelper/componentcontext.hxx>
+#include <ucbhelper/providerhelper.hxx>
+#include <ucbhelper/content.hxx>
+#include <ucbhelper/propertyvalueset.hxx>
+#include <tools/diagnose_ex.h>
+#include <rtl/ustrbuf.hxx>
+
+#include <vector>
+#include <boost/shared_ptr.hpp>
+
+//......................................................................................................................
+namespace ucb { namespace ucp { namespace ext
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::ucb::XContent;
+    using ::com::sun::star::ucb::XContentIdentifier;
+    using ::com::sun::star::sdbc::XRow;
+    using ::com::sun::star::lang::XMultiServiceFactory;
+    using ::com::sun::star::ucb::IllegalIdentifierException;
+    using ::com::sun::star::ucb::ResultSetException;
+    using ::com::sun::star::deployment::XPackageInformationProvider;
+    using ::com::sun::star::beans::Property;
+    using ::com::sun::star::sdbc::XResultSet;
+    using ::com::sun::star::sdbc::XRow;
+    using ::com::sun::star::ucb::XCommandEnvironment;
+    /** === end UNO using === **/
+    //==================================================================================================================
+    //= ResultListEntry
+    //==================================================================================================================
+    struct ResultListEntry
+    {
+        ::rtl::OUString                 sId;
+        Reference< XContentIdentifier > xId;
+        ::rtl::Reference< Content >     pContent;
+        Reference< XRow >               xRow;
+    };
+
+    typedef ::std::vector< ResultListEntry >    ResultList;
+
+    //==================================================================================================================
+    //= DataSupplier_Impl
+    //==================================================================================================================
+    struct DataSupplier_Impl
+    {
+        ::osl::Mutex                                m_aMutex;
+        ResultList                                  m_aResults;
+        ::rtl::Reference< Content >                 m_xContent;
+        Reference< XMultiServiceFactory >           m_xSMgr;
+        sal_Int32                                   m_nOpenMode;
+
+        DataSupplier_Impl( const Reference< XMultiServiceFactory >& i_rORB, const ::rtl::Reference< Content >& i_rContent,
+                           const sal_Int32 i_nOpenMode )
+            :m_xContent( i_rContent )
+            ,m_xSMgr( i_rORB )
+            ,m_nOpenMode( i_nOpenMode )
+        {
+        }
+        ~DataSupplier_Impl();
+    };
+
+    //------------------------------------------------------------------------------------------------------------------
+    DataSupplier_Impl::~DataSupplier_Impl()
+    {
+    }
+
+    //==================================================================================================================
+    //= helper
+    //==================================================================================================================
+    namespace
+    {
+        ::rtl::OUString lcl_compose( const ::rtl::OUString& i_rBaseURL, const ::rtl::OUString& i_rRelativeURL )
+        {
+            ENSURE_OR_RETURN( i_rBaseURL.getLength(), "illegal base URL", i_rRelativeURL );
+
+            ::rtl::OUStringBuffer aComposer( i_rBaseURL );
+            if ( i_rBaseURL.getStr()[ i_rBaseURL.getLength() - 1 ] != '/' )
+                aComposer.append( sal_Unicode( '/' ) );
+            aComposer.append( i_rRelativeURL );
+            return aComposer.makeStringAndClear();
+        }
+    }
+
+
+    //==================================================================================================================
+    //= DataSupplier
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    DataSupplier::DataSupplier( const Reference< XMultiServiceFactory >& i_rORB,
+                                const ::rtl::Reference< Content >& i_rContent,
+                                const sal_Int32 i_nOpenMode )
+        :m_pImpl( new DataSupplier_Impl( i_rORB, i_rContent, i_nOpenMode ) )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void DataSupplier::fetchData()
+    {
+        try
+        {
+            const ::comphelper::ComponentContext aContext( m_pImpl->m_xSMgr );
+            const Reference< XPackageInformationProvider > xPackageInfo(
+                aContext.getSingleton( "com.sun.star.deployment.PackageInformationProvider" ), UNO_QUERY_THROW );
+
+            const ::rtl::OUString sContentIdentifier( m_pImpl->m_xContent->getIdentifier()->getContentIdentifier() );
+
+            switch ( m_pImpl->m_xContent->getExtensionContentType() )
+            {
+            case E_ROOT:
+            {
+                Sequence< Sequence< ::rtl::OUString > > aExtensionInfo( xPackageInfo->getExtensionList() );
+                for (   const Sequence< ::rtl::OUString >* pExtInfo = aExtensionInfo.getConstArray();
+                        pExtInfo != aExtensionInfo.getConstArray() + aExtensionInfo.getLength();
+                        ++pExtInfo
+                    )
+                {
+                    ENSURE_OR_CONTINUE( pExtInfo->getLength() > 0, "illegal extension info" );
+
+                    const ::rtl::OUString& rLocalId = (*pExtInfo)[0];
+                    ResultListEntry aEntry;
+                    aEntry.sId = ContentProvider::getRootURL() + Content::encodeIdentifier( rLocalId ) + ::rtl::OUString( sal_Unicode( '/' ) );
+                    m_pImpl->m_aResults.push_back( aEntry );
+                }
+            }
+            break;
+            case E_EXTENSION_ROOT:
+            case E_EXTENSION_CONTENT:
+            {
+                const ::rtl::OUString sPackageLocation( m_pImpl->m_xContent->getPhysicalURL() );
+                ::ucbhelper::Content aWrappedContent( sPackageLocation, getResultSet()->getEnvironment() );
+
+                // obtain the properties which our result set is set up for from the wrapped content
+                Sequence< ::rtl::OUString > aPropertyNames(1);
+                aPropertyNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) );
+
+                const Reference< XResultSet > xFolderContent( aWrappedContent.createCursor( aPropertyNames ), UNO_SET_THROW );
+                const Reference< XRow > xContentRow( xFolderContent, UNO_QUERY_THROW );
+                while ( xFolderContent->next() )
+                {
+                    ResultListEntry aEntry;
+                    aEntry.sId = lcl_compose( sContentIdentifier, xContentRow->getString( 1 ) );
+                    m_pImpl->m_aResults.push_back( aEntry );
+                }
+            }
+            break;
+            default:
+                OSL_ENSURE( false, "DataSupplier::fetchData: unimplemented content type!" );
+                break;
+            }
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    DataSupplier::~DataSupplier()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 i_nIndex )
+    {
+        ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex );
+
+        if ( i_nIndex < m_pImpl->m_aResults.size() )
+        {
+            const ::rtl::OUString sId = m_pImpl->m_aResults[ i_nIndex ].sId;
+            if ( sId.getLength() )
+                return sId;
+        }
+
+        OSL_ENSURE( false, "DataSupplier::queryContentIdentifierString: illegal index, or illegal result entry id!" );
+        return ::rtl::OUString();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XContentIdentifier > DataSupplier::queryContentIdentifier( sal_uInt32 i_nIndex )
+    {
+        ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex );
+
+        if ( i_nIndex < m_pImpl->m_aResults.size() )
+        {
+            Reference< XContentIdentifier > xId( m_pImpl->m_aResults[ i_nIndex ].xId );
+            if ( xId.is() )
+                return xId;
+        }
+
+        ::rtl::OUString sId = queryContentIdentifierString( i_nIndex );
+        if ( sId.getLength() )
+        {
+            Reference< XContentIdentifier > xId = new ::ucbhelper::ContentIdentifier( sId );
+            m_pImpl->m_aResults[ i_nIndex ].xId = xId;
+            return xId;
+        }
+
+        return Reference< XContentIdentifier >();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XContent > DataSupplier::queryContent( sal_uInt32 i_nIndex )
+    {
+        ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex );
+        ENSURE_OR_RETURN( i_nIndex < m_pImpl->m_aResults.size(), "illegal index!", NULL );
+
+
+        ::rtl::Reference< Content > pContent( m_pImpl->m_aResults[ i_nIndex ].pContent );
+        if ( pContent.is() )
+            return pContent.get();
+
+        Reference< XContentIdentifier > xId( queryContentIdentifier( i_nIndex ) );
+        if ( xId.is() )
+        {
+            try
+            {
+                Reference< XContent > xContent( m_pImpl->m_xContent->getProvider()->queryContent( xId ) );
+                pContent.set( dynamic_cast< Content* >( xContent.get() ) );
+                OSL_ENSURE( pContent.is() || !xContent.is(), "DataSupplier::queryContent: invalid content implementation!" );
+                m_pImpl->m_aResults[ i_nIndex ].pContent = pContent;
+                return pContent.get();
+
+            }
+            catch ( const IllegalIdentifierException& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
+        }
+
+        return Reference< XContent >();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Bool DataSupplier::getResult( sal_uInt32 i_nIndex )
+    {
+        ::osl::ClearableGuard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex );
+
+        if ( m_pImpl->m_aResults.size() > i_nIndex )
+            // result already present.
+            return sal_True;
+
+        return sal_False;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_uInt32 DataSupplier::totalCount()
+    {
+        ::osl::ClearableGuard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex );
+        return m_pImpl->m_aResults.size();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_uInt32 DataSupplier::currentCount()
+    {
+        return m_pImpl->m_aResults.size();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Bool DataSupplier::isCountFinal()
+    {
+        return sal_True;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XRow > DataSupplier::queryPropertyValues( sal_uInt32 i_nIndex  )
+    {
+        ::osl::MutexGuard aGuard( m_pImpl->m_aMutex );
+        ENSURE_OR_RETURN( i_nIndex < m_pImpl->m_aResults.size(), "DataSupplier::queryPropertyValues: illegal index!", NULL );
+
+        Reference< XRow > xRow = m_pImpl->m_aResults[ i_nIndex ].xRow;
+        if ( xRow.is() )
+            return xRow;
+
+        ENSURE_OR_RETURN( queryContent( i_nIndex ).is(), "could not retrieve the content", NULL );
+
+        switch ( m_pImpl->m_xContent->getExtensionContentType() )
+        {
+        case E_ROOT:
+        {
+            const ::rtl::OUString& rId( m_pImpl->m_aResults[ i_nIndex ].sId );
+            const ::rtl::OUString sRootURL( ContentProvider::getRootURL() );
+            ::rtl::OUString sTitle = Content::decodeIdentifier( rId.copy( sRootURL.getLength() ) );
+            if ( ( sTitle.getLength() > 0 ) && ( sTitle[ sTitle.getLength() - 1 ] == '/' ) )
+                sTitle = sTitle.copy( 0, sTitle.getLength() - 1 );
+            xRow = Content::getArtificialNodePropertyValues( m_pImpl->m_xSMgr, getResultSet()->getProperties(), sTitle );
+        }
+        break;
+
+        case E_EXTENSION_ROOT:
+        case E_EXTENSION_CONTENT:
+        {
+            xRow = m_pImpl->m_aResults[ i_nIndex ].pContent->getPropertyValues(
+                getResultSet()->getProperties(), getResultSet()->getEnvironment() );
+        }
+        break;
+        default:
+            OSL_ENSURE( false, "DataSupplier::queryPropertyValues: unhandled case!" );
+            break;
+        }
+
+        m_pImpl->m_aResults[ i_nIndex ].xRow = xRow;
+        return xRow;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void DataSupplier::releasePropertyValues( sal_uInt32 i_nIndex )
+    {
+        ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex );
+
+        if ( i_nIndex < m_pImpl->m_aResults.size() )
+            m_pImpl->m_aResults[ i_nIndex ].xRow.clear();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void DataSupplier::close()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void DataSupplier::validate() throw( ResultSetException )
+    {
+    }
+
+//......................................................................................................................
+} } }   // namespace ucp::ext
+//......................................................................................................................
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx
new file mode 100644
index 000000000000..526491cd678b
--- /dev/null
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx
@@ -0,0 +1,86 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef UCB_UCPEXT_DATA_SUPPLIER_HXX
+#define UCB_UCPEXT_DATA_SUPPLIER_HXX
+
+#include <rtl/ref.hxx>
+#include <ucbhelper/resultset.hxx>
+
+#include <boost/scoped_ptr.hpp>
+
+//......................................................................................................................
+namespace ucb { namespace ucp { namespace ext
+{
+//......................................................................................................................
+
+    struct DataSupplier_Impl;
+    class Content;
+
+    //==================================================================================================================
+    //= DataSupplier
+    //==================================================================================================================
+    typedef ::ucbhelper::ResultSetDataSupplier  DataSupplier_Base;
+    class DataSupplier : public ::ucbhelper::ResultSetDataSupplier
+    {
+    public:
+        DataSupplier(
+            const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& i_rORB,
+            const rtl::Reference< Content >& rContent,
+            const sal_Int32 nOpenMode
+        );
+
+        void    fetchData();
+
+    protected:
+        virtual ~DataSupplier();
+
+        virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex );
+        virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex );
+        virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > queryContent( sal_uInt32 nIndex );
+
+        virtual sal_Bool getResult( sal_uInt32 nIndex );
+
+        virtual sal_uInt32 totalCount();
+        virtual sal_uInt32 currentCount();
+        virtual sal_Bool isCountFinal();
+
+        virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex  );
+        virtual void releasePropertyValues( sal_uInt32 nIndex );
+
+        virtual void close();
+
+        virtual void validate() throw( com::sun::star::ucb::ResultSetException );
+
+    private:
+        ::boost::scoped_ptr< DataSupplier_Impl >    m_pImpl;
+    };
+
+//......................................................................................................................
+} } }   // namespace ucp::ext
+//......................................................................................................................
+
+#endif  // UCB_UCPEXT_DATA_SUPPLIER_HXX
diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx
new file mode 100644
index 000000000000..0fbad1d8cf17
--- /dev/null
+++ b/ucb/source/ucp/ext/ucpext_provider.cxx
@@ -0,0 +1,208 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#include "precompiled_ucb.hxx"
+
+#include "ucpext_provider.hxx"
+#include "ucpext_content.hxx"
+
+/** === begin UNO includes === **/
+/** === end UNO includes === **/
+
+#include <ucbhelper/contentidentifier.hxx>
+#include <osl/diagnose.h>
+#include <osl/mutex.hxx>
+#include <comphelper/componentcontext.hxx>
+#include <rtl/ustrbuf.hxx>
+
+//......................................................................................................................
+namespace ucb { namespace ucp { namespace ext
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::lang::XMultiServiceFactory;
+    using ::com::sun::star::ucb::XContentIdentifier;
+    using ::com::sun::star::ucb::IllegalIdentifierException;
+    using ::com::sun::star::ucb::XContent;
+    using ::com::sun::star::uno::XComponentContext;
+    /** === end UNO using === **/
+
+    //==================================================================================================================
+    //= ContentProvider
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    ContentProvider::ContentProvider( const Reference< XMultiServiceFactory >& i_rServiceManager )
+        :ContentProvider_Base( i_rServiceManager )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ContentProvider::~ContentProvider()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL ContentProvider::getImplementationName_static() throw (RuntimeException)
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.ucp.ext.ContentProvider" ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL ContentProvider::getImplementationName() throw (RuntimeException)
+    {
+        return getImplementationName_static();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static(  ) throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aServiceNames(2);
+        aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.ContentProvider" ) );
+        aServiceNames[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.ExtensionContentProvider" ) );
+        return aServiceNames;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL ContentProvider::getSupportedServiceNames(  ) throw (RuntimeException)
+    {
+        return getSupportedServiceNames_static();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XInterface > ContentProvider::Create( const Reference< XComponentContext >& i_rContext )
+    {
+        const ::comphelper::ComponentContext aContext( i_rContext );
+        return *( new ContentProvider( aContext.getLegacyServiceFactory() ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString ContentProvider::getRootURL()
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.extension://" ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString ContentProvider::getArtificialNodeContentType()
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.extension-content" ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    namespace
+    {
+        void lcl_ensureAndTransfer( ::rtl::OUString& io_rIdentifierFragment, ::rtl::OUStringBuffer& o_rNormalization, const sal_Unicode i_nLeadingChar )
+        {
+            if ( ( io_rIdentifierFragment.getLength() == 0 ) || ( io_rIdentifierFragment[0] != i_nLeadingChar ) )
+                throw IllegalIdentifierException();
+            io_rIdentifierFragment = io_rIdentifierFragment.copy( 1 );
+            o_rNormalization.append( i_nLeadingChar );
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XContent > SAL_CALL ContentProvider::queryContent( const Reference< XContentIdentifier  >& i_rIdentifier )
+        throw( IllegalIdentifierException, RuntimeException )
+    {
+        // Check URL scheme...
+        const ::rtl::OUString sScheme( rtl::OUString::createFromAscii( "vnd.sun.star.extension" ) );
+        if ( !i_rIdentifier->getContentProviderScheme().equalsIgnoreAsciiCase( sScheme ) )
+            throw IllegalIdentifierException();
+
+        // normalize the identifier
+        const ::rtl::OUString sIdentifier( i_rIdentifier->getContentIdentifier() );
+
+        // the scheme needs to be lower-case
+        ::rtl::OUStringBuffer aComposer;
+        aComposer.append( sIdentifier.copy( 0, sScheme.getLength() ).toAsciiLowerCase() );
+
+        // one : is required after the scheme
+        ::rtl::OUString sRemaining( sIdentifier.copy( sScheme.getLength() ) );
+        lcl_ensureAndTransfer( sRemaining, aComposer, ':' );
+
+        // and at least one /
+        lcl_ensureAndTransfer( sRemaining, aComposer, '/' );
+
+        // the normalized form requires one additional /, but we also accept identifiers which don't have it
+        if ( sRemaining.getLength() == 0 )
+        {
+            // the root content is a special case, it requires ///
+            aComposer.appendAscii( "//" );
+        }
+        else
+        {
+            if ( sRemaining[0] != '/' )
+            {
+                aComposer.append( sal_Unicode( '/' ) );
+                aComposer.append( sRemaining );
+            }
+            else
+            {
+                lcl_ensureAndTransfer( sRemaining, aComposer, '/' );
+                // by now, we moved "vnd.sun.star.extension://" from the URL to aComposer
+                if ( sRemaining.getLength() == 0 )
+                {
+                    // again, it's the root content, but one / is missing
+                    aComposer.append( sal_Unicode( '/' ) );
+                }
+                else
+                {
+                    aComposer.append( sRemaining );
+                }
+            }
+        }
+        const Reference< XContentIdentifier > xNormalizedIdentifier( new ::ucbhelper::ContentIdentifier( m_xSMgr, aComposer.makeStringAndClear() ) );
+
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        // check if a content with given id already exists...
+        Reference< XContent > xContent( queryExistingContent( xNormalizedIdentifier ).get() );
+        if ( xContent.is() )
+            return xContent;
+
+        // create a new content
+        xContent = new Content( m_xSMgr, this, xNormalizedIdentifier );
+        if ( !xContent->getIdentifier().is() )
+            throw IllegalIdentifierException();
+
+        registerNewContent( xContent );
+        return xContent;
+    }
+
+//......................................................................................................................
+} } }   // namespace ucb::ucp::ext
+//......................................................................................................................
diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx
new file mode 100644
index 000000000000..1f41fdd0f084
--- /dev/null
+++ b/ucb/source/ucp/ext/ucpext_provider.hxx
@@ -0,0 +1,68 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef UCB_UCPEXT_CONTENT_PROVIDER_HXX
+#define UCB_UCPEXT_CONTENT_PROVIDER_HXX
+
+#include <ucbhelper/providerhelper.hxx>
+
+//......................................................................................................................
+namespace ucb { namespace ucp { namespace ext
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= ContentProvider
+    //==================================================================================================================
+    typedef ::ucbhelper::ContentProviderImplHelper  ContentProvider_Base;
+    class ContentProvider : public ContentProvider_Base
+    {
+    public:
+        ContentProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_rServiceManager );
+        virtual ~ContentProvider();
+
+        // XServiceInfo
+        virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XServiceInfo - static versions
+        static ::rtl::OUString SAL_CALL getImplementationName_static(  ) throw (::com::sun::star::uno::RuntimeException);
+        static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static() throw (::com::sun::star::uno::RuntimeException);
+        static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext );
+
+        // XContentProvider
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > SAL_CALL queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw (::com::sun::star::ucb::IllegalIdentifierException, ::com::sun::star::uno::RuntimeException);
+
+    public:
+        static ::rtl::OUString getRootURL();
+        static ::rtl::OUString getArtificialNodeContentType();
+    };
+
+//......................................................................................................................
+} } }   // namespace ucb::ucp::ext
+//......................................................................................................................
+
+#endif  // UCB_UCPEXT_CONTENT_PROVIDER_HXX
diff --git a/ucb/source/ucp/ext/ucpext_resultset.cxx b/ucb/source/ucp/ext/ucpext_resultset.cxx
new file mode 100644
index 000000000000..d8a2eb8e9914
--- /dev/null
+++ b/ucb/source/ucp/ext/ucpext_resultset.cxx
@@ -0,0 +1,99 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#include "precompiled_ucb.hxx"
+
+#include "ucpext_resultset.hxx"
+#include "ucpext_content.hxx"
+#include "ucpext_datasupplier.hxx"
+
+/** === begin UNO includes === **/
+/** === end UNO includes === **/
+
+#include <ucbhelper/resultset.hxx>
+
+//......................................................................................................................
+namespace ucb { namespace ucp { namespace ext
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::lang::XMultiServiceFactory;
+    using ::com::sun::star::ucb::XContentIdentifier;
+    using ::com::sun::star::ucb::OpenCommandArgument2;
+    using ::com::sun::star::ucb::XCommandEnvironment;
+    /** === end UNO using === **/
+
+    //==================================================================================================================
+    //= ResultSet
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    ResultSet::ResultSet( const Reference< XMultiServiceFactory >& i_rORB, const ::rtl::Reference< Content >& i_rContent,
+            const OpenCommandArgument2& i_rCommand, const Reference< XCommandEnvironment >& i_rEnv )
+        :ResultSetImplHelper( i_rORB, i_rCommand )
+        ,m_xEnvironment( i_rEnv )
+        ,m_xContent( i_rContent )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void ResultSet::initStatic()
+    {
+        ::rtl::Reference< DataSupplier > pDataSupplier( new DataSupplier(
+            m_xSMgr,
+            m_xContent,
+            m_aCommand.Mode
+        ) );
+        m_xResultSet1 = new ::ucbhelper::ResultSet(
+            m_xSMgr,
+            m_aCommand.Properties,
+            pDataSupplier.get(),
+            m_xEnvironment
+        );
+        pDataSupplier->fetchData();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void ResultSet::initDynamic()
+    {
+        initStatic();
+        m_xResultSet2 = m_xResultSet1;
+    }
+
+//......................................................................................................................
+} } }   // namespace ucp::ext
+//......................................................................................................................
diff --git a/ucb/source/ucp/ext/ucpext_resultset.hxx b/ucb/source/ucp/ext/ucpext_resultset.hxx
new file mode 100644
index 000000000000..2924197a0fdc
--- /dev/null
+++ b/ucb/source/ucp/ext/ucpext_resultset.hxx
@@ -0,0 +1,66 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef UCB_UCPEXT_RESULT_SET_HXX
+#define UCB_UCPEXT_RESULT_SET_HXX
+
+#include <rtl/ref.hxx>
+#include <ucbhelper/resultsethelper.hxx>
+
+//......................................................................................................................
+namespace ucb { namespace ucp { namespace ext
+{
+//......................................................................................................................
+
+    class Content;
+
+    //==================================================================================================================
+    //= ResultSet
+    //==================================================================================================================
+    class ResultSet : public ::ucbhelper::ResultSetImplHelper
+    {
+    public:
+        ResultSet(
+            const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& i_rORB,
+              const rtl::Reference< Content >& i_rContent,
+            const com::sun::star::ucb::OpenCommandArgument2& i_rCommand,
+              const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& i_rEnv
+        );
+
+    private:
+        ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >  m_xEnvironment;
+        ::rtl::Reference< Content >                                                     m_xContent;
+
+    private:
+        virtual void initStatic();
+        virtual void initDynamic();
+    };
+
+//......................................................................................................................
+} } }   // namespace ucp::ext
+//......................................................................................................................
+
+#endif  // UCB_UCPEXT_RESULT_SET_HXX
diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx
new file mode 100644
index 000000000000..8daa33f5cf8c
--- /dev/null
+++ b/ucb/source/ucp/ext/ucpext_services.cxx
@@ -0,0 +1,93 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#include "precompiled_ucb.hxx"
+
+#include "ucpext_provider.hxx"
+
+/** === begin UNO includes === **/
+/** === end UNO includes === **/
+
+#include <cppuhelper/implementationentry.hxx>
+
+//......................................................................................................................
+namespace ucb { namespace ucp { namespace ext
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::lang::XSingleComponentFactory;
+    /** === end UNO using === **/
+
+    //==================================================================================================================
+    //= descriptors for the services implemented in this component
+    //==================================================================================================================
+    static struct ::cppu::ImplementationEntry s_aServiceEntries[] =
+    {
+        {
+            ContentProvider::Create,
+            ContentProvider::getImplementationName_static,
+            ContentProvider::getSupportedServiceNames_static,
+            ::cppu::createOneInstanceComponentFactory, NULL, 0
+        },
+        { 0, 0, 0, 0, 0, 0 }
+    };
+
+//......................................................................................................................
+} } }   // namespace ucb::ucp::ext
+//......................................................................................................................
+
+extern "C"
+{
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
+    {
+        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey )
+    {
+        return ::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, ::ucb::ucp::ext::s_aServiceEntries );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+    {
+        return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::ucb::ucp::ext::s_aServiceEntries );
+    }
+}
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index d37376abdd00..3176171c4865 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -37,7 +37,7 @@
 #include "com/sun/star/task/XInteractionRetry.hpp"
 
 #include "tools/errinf.hxx" // ErrorHandler, ErrorContext, ...
-#include "svl/svtools.hrc" // RID_ERRHDL
+#include "svtools/svtools.hrc" // RID_ERRHDL
 
 #include "ids.hrc"
 #include "getcontinuations.hxx"