CWS-TOOLING: integrate CWS slidecopy

132 files changed, 3096 insertions, 3501 deletions

diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 53223fa5ff1b..65aec562f084 100755
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -430,7 +430,7 @@
 
 #define SID_LEFT_PANE_IMPRESS               (SID_SD_START+414)
 #define SID_LEFT_PANE_DRAW                  (SID_SD_START+415)
-#define SID_RIGHT_PANE                      (SID_SD_START+416)
+    // FREE
 #define SID_NOTES_WINDOW                    (SID_SD_START+417)
 #define SID_SWITCH_SHELL_PANE               (SID_SD_START+418)
 #define SID_LAYER_DIALOG_WIN                (SID_SD_START+419)
@@ -446,7 +446,7 @@
 #define SID_TP_USE_FOR_NEW_PRESENTATIONS    (SID_SD_START+427)
 #define SID_TP_SHOW_LARGE_PREVIEW           (SID_SD_START+428)
 #define SID_TP_SHOW_SMALL_PREVIEW           (SID_SD_START+429)
-#define SID_TASK_PANE                       (SID_SD_START+430)
+#define SID_SHOW_TOOL_PANEL                 (SID_SD_START+430)
 #define SID_INSERT_MASTER_PAGE              (SID_SD_START+431)
 #define SID_DELETE_MASTER_PAGE              (SID_SD_START+432)
 #define SID_RENAME_MASTER_PAGE              (SID_SD_START+433)
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index 7e77d56e4dbb..73189f135e62 100755
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -138,6 +138,7 @@
 #define STR_LEFT_IMPRESS_PANE_SHELL             RID_GLOB_START+113
 #define STR_LEFT_DRAW_PANE_SHELL                RID_GLOB_START+114
 #define STR_RIGHT_PANE_SHELL                    RID_GLOB_START+115
+#define STR_TOOL_PANEL_SHELL                    RID_GLOB_START+116
 
 #define RID_CUSTOMANIMATION_START               RID_GLOB_START+120
 #define RID_CUSTOMANIMATION_END                 RID_GLOB_START+199
@@ -150,6 +151,8 @@
 #define DLG_TABLEDESIGNPANE                     RID_GLOB_START+224
 #define STR_TABLEOBJECTBARSHELL                 RID_GLOB_START+225
 #define RID_TABPAGE_PARA_NUMBERING              RID_GLOB_START+226
+#define STR_CUSTOMANIMATIONPANE                 RID_GLOB_START+227
+#define STR_SLIDE_TRANSITION_PANE               RID_GLOB_START+228
 
 
 
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx
index 12b63c74b310..278aef490fdb 100644..100755
--- a/sd/inc/glob.hxx
+++ b/sd/inc/glob.hxx
@@ -66,6 +66,8 @@
 #define SD_IF_SDRIGHTPANESHELL          SFX_INTERFACE_SD_START + 26
 #define SD_IF_SDDRAWTABLEOBJECTBAR      SFX_INTERFACE_SD_START + 27
 #define SD_IF_SDANNOTATIONSHELL         SFX_INTERFACE_SD_START + 28
+#define SD_IF_SDTOOLPANELPANESHELL      SFX_INTERFACE_SD_START + 29
+#define SD_IF_SDTOOLPANELSHELL          SFX_INTERFACE_SD_START + 30
 
 // Inventor-Id fuer StarDraw UserData
 const UINT32 SdUDInventor=UINT32('S')*0x00000001+
diff --git a/sd/prj/d.lst b/sd/prj/d.lst
index fd21f7cd4b5b..14f85e982eab 100644..100755
--- a/sd/prj/d.lst
+++ b/sd/prj/d.lst
@@ -8,16 +8,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\menubar
 mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\menubar
 mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\toolbar
 mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator\en-US
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator\de
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator\es
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator\fr
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\en-US
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\de
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\es
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\fr
 mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\statusbar
 mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\statusbar
 
@@ -62,15 +52,6 @@ mkdir: %_DEST%\inc%_EXT%\sd
 ..\uiconfig\simpress\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\menubar\*.xml
 ..\uiconfig\sdraw\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\toolbar\*.xml
 ..\uiconfig\simpress\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\toolbar\*.xml
-..\uiconfig\sdraw\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator\en-US\*.xml
-..\uiconfig\sdraw\accelerator\de\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator\de\*.xml
-..\uiconfig\sdraw\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator\es\*.xml
-..\uiconfig\sdraw\accelerator\fr\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\accelerator\fr\*.xml
-..\uiconfig\simpress\accelerator\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\*.xml
-..\uiconfig\simpress\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\en-US\*.xml
-..\uiconfig\simpress\accelerator\de\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\de\*.xml
-..\uiconfig\simpress\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\es\*.xml
-..\uiconfig\simpress\accelerator\fr\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\accelerator\fr\*.xml
 ..\uiconfig\sdraw\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\statusbar\*.xml
 ..\uiconfig\simpress\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\statusbar\*.xml
 
diff --git a/sd/sdi/TaskPaneViewShell.sdi b/sd/sdi/ToolPanelViewShell.sdi
index 22f0fba21265..a72342c52da5 100644
--- a/sd/sdi/TaskPaneViewShell.sdi
+++ b/sd/sdi/ToolPanelViewShell.sdi
@@ -1,5 +1,4 @@
 /*************************************************************************
- *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -23,7 +22,7 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************/
+************************************************************************/
 
 SfxVoidItem TaskPaneApplyToAllSlides SID_TP_APPLY_TO_ALL_SLIDES
 [
@@ -302,7 +301,7 @@ shell LayoutMenu
     import TaskPaneLayoutMenuInterface[Automation];
 }
 
-shell TaskPaneViewShell
+shell ToolPanelViewShell
 {
 }
 
diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi
index e9cb7119fa89..3602e711db1b 100644..100755
--- a/sd/sdi/ViewShellBase.sdi
+++ b/sd/sdi/ViewShellBase.sdi
@@ -135,32 +135,6 @@ SfxBoolItem LeftPaneDraw SID_LEFT_PANE_DRAW
     GroupId = GID_MODIFY;
 ]
 
-SfxBoolItem RightPane SID_RIGHT_PANE
-
-[
-    /* flags: */
-    AutoUpdate = TRUE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = TRUE,
-    ReadOnlyDoc = FALSE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Asynchron;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_MODIFY;
-]
-
 SfxVoidItem NotesChildWindow SID_NOTES_WINDOW
 
 [
@@ -239,7 +213,7 @@ SfxBoolItem SlideSorterMultiPaneGUI SID_SLIDE_SORTER_MULTI_PANE_GUI
     GroupId = GID_MODIFY;
 ]
 
-SfxVoidItem TaskPaneShowPanel SID_TASK_PANE (
+SfxVoidItem TaskPaneShowPanel SID_SHOW_TOOL_PANEL (
     SfxBoolItem IsPanelVisible ID_VAL_ISVISIBLE,
     SfxUInt32Item PanelId ID_VAL_PANEL_INDEX)
 [
@@ -280,7 +254,7 @@ interface ViewShellBaseView
         ExecMethod = Execute;
         StateMethod = GetState;
     ]
-    SID_RIGHT_PANE
+    SID_TASKPANE
     [
         ExecMethod = Execute;
         StateMethod = GetState;
@@ -325,7 +299,7 @@ interface ViewShellBaseView
         ExecMethod = Execute;
         StateMethod = GetState;
     ]
-    SID_TASK_PANE
+    SID_SHOW_TOOL_PANEL
     [
         ExecMethod = Execute;
         StateMethod = GetState;
diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk
index ab128c378afc..a950aad5d7a5 100644..100755
--- a/sd/sdi/makefile.mk
+++ b/sd/sdi/makefile.mk
@@ -66,7 +66,7 @@ SVSDI1DEPEND= \
     outlnvsh.sdi \
     SlideSorterController.sdi \
     ViewShellBase.sdi \
-    TaskPaneViewShell.sdi \
+    ToolPanelViewShell.sdi \
     sdslots.hrc \
     $(PRJ)$/inc$/app.hrc
 
@@ -88,7 +88,7 @@ SVSDI2DEPEND= \
         mediaob.sdi \
     outlnvsh.sdi \
     ViewShellBase.sdi \
-    TaskPaneViewShell.sdi \
+    ToolPanelViewShell.sdi \
     sdslots.hrc \
     $(PRJ)$/inc$/app.hrc
 
diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi
index 21e60e6a1a79..fbfc8da1903b 100644..100755
--- a/sd/sdi/sdslots.sdi
+++ b/sd/sdi/sdslots.sdi
@@ -104,5 +104,5 @@ ModulePrefix( "Sd" )
         include "ViewShellBase.sdi"
         include "mediaob.sdi"
         include "tables.sdi"
-        include "TaskPaneViewShell.sdi"
+        include "ToolPanelViewShell.sdi"
 }
diff --git a/sd/source/ui/accessibility/AccessibleTaskPane.cxx b/sd/source/ui/accessibility/AccessibleTaskPane.cxx
deleted file mode 100644
index c2a2dafef296..000000000000
--- a/sd/source/ui/accessibility/AccessibleTaskPane.cxx
+++ /dev/null
@@ -1,94 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
-#include "AccessibleTaskPane.hxx"
-
-#include "AccessibleTreeNode.hxx"
-
-#include "taskpane/ToolPanel.hxx"
-#include "taskpane/ControlContainer.hxx"
-#include "taskpane/TitledControl.hxx"
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
-
-#include <vos/mutex.hxx>
-#include <vcl/svapp.hxx>
-
-using namespace ::rtl;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
-using namespace ::com::sun::star::uno;
-
-namespace accessibility {
-
-AccessibleTaskPane::AccessibleTaskPane (
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible> & rxParent,
-    const OUString& rsName,
-    const OUString& rsDescription,
-    ::sd::toolpanel::ToolPanel& rTaskPane)
-    : AccessibleTreeNode(
-        rxParent,
-        rTaskPane,
-        rsName,
-        rsDescription,
-        AccessibleRole::PANEL)
-{
-}
-
-
-
-
-AccessibleTaskPane::~AccessibleTaskPane (void)
-{
-}
-
-
-
-
-//=====  XServiceInfo  ========================================================
-
-OUString SAL_CALL
-    AccessibleTaskPane::getImplementationName (void)
-    throw (RuntimeException)
-{
-    return OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleTaskPane"));
-}
-
-
-
-
-void AccessibleTaskPane::UpdateStateSet (void)
-{
-    // The task pane itself can not be focused.
-    UpdateState(AccessibleStateType::FOCUSED, false);
-}
-
-
-} // end of namespace accessibility
diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
index ad8d8facf9da..5c7462581d0b 100644..100755
--- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx
+++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
@@ -714,6 +714,7 @@ IMPL_LINK(AccessibleTreeNode, WindowEventListener, VclWindowEvent*, pEvent)
         case VCLEVENT_WINDOW_GETFOCUS:
         case VCLEVENT_WINDOW_LOSEFOCUS:
             UpdateStateSet();
+            break;
     }
     return 1;
 }
diff --git a/sd/source/ui/accessibility/makefile.mk b/sd/source/ui/accessibility/makefile.mk
index d5eb47b06149..25d79aa7f8da 100755
--- a/sd/source/ui/accessibility/makefile.mk
+++ b/sd/source/ui/accessibility/makefile.mk
@@ -56,7 +56,6 @@ SLOFILES =      									\
     $(SLO)$/AccessibleScrollPanel.obj				\
     $(SLO)$/AccessibleSlideSorterView.obj			\
     $(SLO)$/AccessibleSlideSorterObject.obj			\
-    $(SLO)$/AccessibleTaskPane.obj					\
     $(SLO)$/AccessibleTreeNode.obj					\
     $(SLO)$/SdShapeTypes.obj
 
diff --git a/sd/source/ui/app/menuids2_tmpl.src b/sd/source/ui/app/menuids2_tmpl.src
index 54b9ed6ba44c..21d906bfedf0 100644..100755
--- a/sd/source/ui/app/menuids2_tmpl.src
+++ b/sd/source/ui/app/menuids2_tmpl.src
@@ -983,40 +983,5 @@
         Text [ en-US ] = "Pre~view Mode" ; \
     };
 
-#define MN_MULTI_PANE_GUI \
-    MenuItem\
-    {\
-        Identifier = SID_MULTI_PANE_GUI ; \
-        HelpID = SID_MULTI_PANE_GUI ; \
-        Text = "Multi Pane GUI" ; \
-        SubMenu = Menu \
-        {\
-            ItemList =\
-            {\
-                MenuItem\
-                {\
-                    Identifier = SID_TOOLPANEL ; \
-                    HelpID = SID_TOOLPANEL ; \
-                    Check = TRUE ; \
-                    Text = "Tool Panel" ; \
-                };\
-                MenuItem\
-                {\
-                    Identifier = SID_SLIDE_BROWSER ; \
-                    HelpID = SID_SLIDE_BROWSER ; \
-                    Check = TRUE ; \
-                    Text = "Slide Browser" ; \
-                };\
-                MenuItem\
-                {\
-                    Identifier = SID_NOTES_WINDOW ; \
-                    HelpID = SID_NOTES_WINDOW ; \
-                    Check = TRUE ; \
-                    Text = "Notes Window" ; \
-                };\
-            };\
-        };\
-    };
-
 #endif // _MENUIDS2_SRC
 
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 8b214a2fbc2a..0901e53df0ed 100755
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -477,30 +477,6 @@ Bitmap BMP_WAIT_ICON
 
 // ----------------------------------------
 
-Bitmap BMP_CLOSE_DOC
-{
-    File = "closedoc.bmp";
-};
-Bitmap BMP_CLOSE_DOC_H
-{
-    File = "closedochc.bmp";
-};
-Bitmap BMP_TRIANGLE_RIGHT
-{
-    File = "triangle_right.bmp";
-};
-Bitmap BMP_TRIANGLE_RIGHT_H
-{
-    File = "triangle_right_hc.bmp";
-};
-Bitmap BMP_TRIANGLE_DOWN
-{
-    File = "triangle_down.bmp";
-};
-Bitmap BMP_TRIANGLE_DOWN_H
-{
-    File = "triangle_down_hc.bmp";
-};
 Bitmap BMP_FADE_EFFECT_INDICATOR
 {
     File = "fade_effect_indicator.bmp";
diff --git a/sd/source/ui/app/sddll1.cxx b/sd/source/ui/app/sddll1.cxx
index 30aea6cba7b1..53a2b4e9b1e9 100644..100755
--- a/sd/source/ui/app/sddll1.cxx
+++ b/sd/source/ui/app/sddll1.cxx
@@ -48,12 +48,8 @@
 #include "GraphicViewShellBase.hxx"
 #include "DrawDocShell.hxx"
 #include "GraphicDocShell.hxx"
-#ifndef SD_SLIDEBROWSER_SLIDE_SORTER_VIEW_SHELL_HXX
 #include "SlideSorterViewShell.hxx"
-#endif
-#ifndef SD_SLIDEBROWSER_TASK_PANE_VIEW_SHELL_HXX
-#include "TaskPaneViewShell.hxx"
-#endif
+#include "taskpane/ToolPanelViewShell.hxx"
 #include "FactoryIds.hxx"
 #include "sdmod.hxx"
 #include "app.hrc"
@@ -131,8 +127,8 @@ void SdDLL::RegisterInterfaces()
 
     // View shells for the side panes.
     ::sd::slidesorter::SlideSorterViewShell::RegisterInterface (pMod);
-    ::sd::toolpanel::TaskPaneViewShell::RegisterInterface(pMod);
-    // Tell the task pane view shell to register the interfaces of its
+    ::sd::toolpanel::ToolPanelViewShell::RegisterInterface(pMod);
+    // Tell the tool panel view shell to register the interfaces of its
     // controls.
-    ::sd::toolpanel::TaskPaneViewShell::RegisterControls();
+    ::sd::toolpanel::ToolPanelViewShell::RegisterControls();
 }
diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx
index ee12bda8286f..3b576c8c668b 100755
--- a/sd/source/ui/app/sddll2.cxx
+++ b/sd/source/ui/app/sddll2.cxx
@@ -140,7 +140,7 @@ void SdDLL::RegisterControllers()
     ::avmedia::MediaPlayer::RegisterChildWindow(0, pMod);
     ::sd::LeftPaneImpressChildWindow::RegisterChildWindow(0, pMod);
     ::sd::LeftPaneDrawChildWindow::RegisterChildWindow(0, pMod);
-    ::sd::RightPaneChildWindow::RegisterChildWindow(0, pMod);
+    ::sd::ToolPanelChildWindow::RegisterChildWindow(0, pMod);
 
     SvxFillToolBoxControl::RegisterControl(0, pMod);
     SvxLineStyleToolBoxControl::RegisterControl(0, pMod);
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 743b7a35610d..3c1abc0c7d22 100644..100755
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -68,7 +68,6 @@
 #include "sdresid.hxx"
 #include "OutlineViewShell.hxx"
 #include "ViewShellBase.hxx"
-#include "TaskPaneViewShell.hxx"
 #ifndef SD_FRAMW_VIEW_HXX
 #include "FrameView.hxx"
 #endif
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index c6a4d21de7db..e992e7016f04 100755
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -1211,6 +1211,14 @@ String DLG_TABLEDESIGNPANE
 {
     Text [ en-US ] = "Table Designs";
 };
+String STR_CUSTOMANIMATIONPANE
+{
+    Text [ en-US ] = "Custom Animation";
+};
+String STR_SLIDE_TRANSITION_PANE
+{
+    Text [ en-US ] = "Slide Transition";
+};
 String STR_NAVIGATOR_SHOW_NAMED_SHAPES
 {
     Text [ en-US ] = "Named shapes";
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx
index ca8ee8724037..6a6d515822f8 100644..100755
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -29,28 +29,26 @@
 #include "precompiled_sd.hxx"
 #include "PaneChildWindows.hxx"
 #include "PaneDockingWindow.hrc"
+#include "PaneDockingWindow.hxx"
+#include "ViewShellBase.hxx"
+#include "framework/FrameworkHelper.hxx"
+#include "taskpane/ToolPanelViewShell.hxx"
 #include "app.hrc"
 #include "strings.hrc"
 #include "sdresid.hxx"
+
 #include <sfx2/app.hxx>
 #include <sfx2/dockwin.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
-
-namespace sd
-{
-    SFX_IMPL_DOCKINGWINDOW(LeftPaneImpressChildWindow, SID_LEFT_PANE_IMPRESS)
-    SFX_IMPL_DOCKINGWINDOW(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW)
-    SFX_IMPL_DOCKINGWINDOW(RightPaneChildWindow, SID_RIGHT_PANE)
-}
-
-
-#include "PaneDockingWindow.hxx"
-#include "ViewShellBase.hxx"
-#include "framework/FrameworkHelper.hxx"
+#include <tools/diagnose_ex.h>
 
 namespace sd {
 
+SFX_IMPL_DOCKINGWINDOW(LeftPaneImpressChildWindow, SID_LEFT_PANE_IMPRESS)
+SFX_IMPL_DOCKINGWINDOW(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW)
+SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_TASKPANE)
+
 //===== PaneChildWindow =======================================================
 
 PaneChildWindow::PaneChildWindow (
@@ -58,8 +56,8 @@ PaneChildWindow::PaneChildWindow (
     USHORT nId,
     SfxBindings* pBindings,
     SfxChildWinInfo* pInfo,
-    const ResId& rResId,
-    const ::rtl::OUString& rsTitle,
+    const USHORT nDockWinTitleResId,
+    const USHORT nTitleBarResId,
     SfxChildAlignment eAlignment)
     : SfxChildWindow (pParentWindow, nId)
 {
@@ -67,9 +65,8 @@ PaneChildWindow::PaneChildWindow (
         pBindings,
         this,
         pParentWindow,
-        rResId,
-        framework::FrameworkHelper::msLeftImpressPaneURL,
-        rsTitle);
+        SdResId( nDockWinTitleResId ),
+        String( SdResId( nTitleBarResId ) ) );
     eChildAlignment = eAlignment;
     static_cast<SfxDockingWindow*>(pWindow)->Initialize(pInfo);
     SetHideNotDelete(TRUE);
@@ -112,8 +109,8 @@ LeftPaneImpressChildWindow::LeftPaneImpressChildWindow (
         nId,
         pBindings,
         pInfo,
-        SdResId(FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW),
-        String(SdResId(STR_LEFT_PANE_IMPRESS_TITLE)),
+        FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW,
+        STR_LEFT_PANE_IMPRESS_TITLE,
         SFX_ALIGN_LEFT)
 {
 }
@@ -133,8 +130,8 @@ LeftPaneDrawChildWindow::LeftPaneDrawChildWindow (
         nId,
         pBindings,
         pInfo,
-        SdResId(FLT_LEFT_PANE_DRAW_DOCKING_WINDOW),
-        String(SdResId(STR_LEFT_PANE_DRAW_TITLE)),
+        FLT_LEFT_PANE_DRAW_DOCKING_WINDOW,
+        STR_LEFT_PANE_DRAW_TITLE,
         SFX_ALIGN_LEFT)
 {
 }
@@ -142,23 +139,40 @@ LeftPaneDrawChildWindow::LeftPaneDrawChildWindow (
 
 
 
-//===== RightPaneChildWindow ==================================================
-
-RightPaneChildWindow::RightPaneChildWindow (
-    ::Window* pParentWindow,
-    USHORT nId,
-    SfxBindings* pBindings,
-    SfxChildWinInfo* pInfo)
-    : PaneChildWindow(
-        pParentWindow,
-        nId,
-        pBindings,
-        pInfo,
-        SdResId(FLT_RIGHT_PANE_DOCKING_WINDOW),
-        String(SdResId(STR_RIGHT_PANE_TITLE)),
-        SFX_ALIGN_RIGHT)
+//======================================================================================================================
+//= ToolPanelChildWindow
+//======================================================================================================================
+//----------------------------------------------------------------------------------------------------------------------
+ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, USHORT i_nId, SfxBindings* i_pBindings,
+        SfxChildWinInfo* i_pChildWindowInfo )
+    :PaneChildWindow( i_pParentWindow, i_nId, i_pBindings, i_pChildWindowInfo,
+        FLT_TOOL_PANEL_DOCKING_WINDOW, STR_RIGHT_PANE_TITLE, SFX_ALIGN_RIGHT )
 {
 }
 
+//----------------------------------------------------------------------------------------------------------------------
+void ToolPanelChildWindow::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL )
+{
+    SfxDockingWindow* pDockingWindow = dynamic_cast< SfxDockingWindow* >( GetWindow() );
+    ViewShellBase* pViewShellBase = ViewShellBase::GetViewShellBase( pDockingWindow->GetBindings().GetDispatcher()->GetFrame() );
+    ENSURE_OR_RETURN_VOID( pViewShellBase != NULL, "ToolPanelChildWindow::ActivateToolPanel: no view shell access!" );
+
+    const ::boost::shared_ptr< framework::FrameworkHelper > pFrameworkHelper( framework::FrameworkHelper::Instance( *pViewShellBase ) );
+
+    if ( i_rPanelURL.indexOf( framework::FrameworkHelper::msTaskPanelURLPrefix ) == 0 )
+    {
+        // it's one of our standard panels known to the drawing framework
+        pFrameworkHelper->RequestTaskPanel( i_rPanelURL );
+    }
+    else
+    {
+        // TODO: it would be nice if the drawing framework were able to handle non-standard panels, installed by
+        // extensions, too. As long as this is not the case, we need to take the direct way ...
+        ::boost::shared_ptr< ViewShell > pViewShell = pFrameworkHelper->GetViewShell( framework::FrameworkHelper::msRightPaneURL );
+        toolpanel::ToolPanelViewShell* pToolPanelViewShell = dynamic_cast< toolpanel::ToolPanelViewShell* >( pViewShell.get() );
+        ENSURE_OR_RETURN_VOID( pToolPanelViewShell != NULL, "ToolPanelChildWindow::ActivateToolPanel: no tool panel view shell access!" );
+        pToolPanelViewShell->ActivatePanel( i_rPanelURL );
+    }
+}
 
 } // end of namespace ::sd
diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx
index c0dcd76f0fae..c1dedd5d8293 100644..100755
--- a/sd/source/ui/dlg/PaneDockingWindow.cxx
+++ b/sd/source/ui/dlg/PaneDockingWindow.cxx
@@ -41,299 +41,26 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
+using ::sfx2::TitledDockingWindow;
 
 namespace sd {
 
-PaneDockingWindow::PaneDockingWindow (
-    SfxBindings *_pBindings,
-    SfxChildWindow *pChildWindow,
-    ::Window* pParent,
-    const ResId& rResId,
-    const ::rtl::OUString& rsPaneURL,
-    const ::rtl::OUString& rsTitle)
-    : SfxDockingWindow (
-        _pBindings,
-        pChildWindow,
-        pParent,
-        rResId
-        ),
-      msPaneURL(rsPaneURL),
-      msTitle(rsTitle),
-      mpTitleToolBox(),
-      maBorder (3,1,3,3),
-      mnChildWindowId(pChildWindow->GetType()),
-      mpContentWindow(new ::Window(this)),
-      mbIsLayoutPending(false)
+PaneDockingWindow::PaneDockingWindow(
+        SfxBindings *_pBindings, SfxChildWindow *pChildWindow, ::Window* pParent,
+        const ResId& rResId, const ::rtl::OUString& rsTitle )
+        :TitledDockingWindow( _pBindings, pChildWindow, pParent, rResId )
 {
-    SetBackground (Wallpaper());
-
-    InitializeTitleToolBox();
-
-    // Tell the system window about the new docking window so that it can be
-    // reached via the keyboard.
-    SystemWindow* pSystemWindow = GetSystemWindow();
-    if (pSystemWindow != NULL)
-        pSystemWindow->GetTaskPaneList()->AddWindow(this);
-
-    mpContentWindow->Show();
+    SetTitle( rsTitle );
 }
 
-
-
-
 PaneDockingWindow::~PaneDockingWindow (void)
 {
-    // Tell the next system window that the docking window is no longer
-    // available.
-    SystemWindow* pSystemWindow = GetSystemWindow();
-    if (pSystemWindow != NULL)
-        pSystemWindow->GetTaskPaneList()->RemoveWindow(this);
-    mpTitleToolBox.reset();
-}
-
-
-
-
-void PaneDockingWindow::SetTitle (const String& rsTitle)
-{
-    msTitle = rsTitle;
-    Invalidate();
-}
-
-
-
-
-void PaneDockingWindow::Resize (void)
-{
-    SfxDockingWindow::Resize();
-    mbIsLayoutPending = true;
-}
-
-
-
-
-void PaneDockingWindow::Layout (void)
-{
-    mbIsLayoutPending = false;
-
-    Size aWindowSize (GetOutputSizePixel());
-    Size aToolBoxSize (0,0);
-    int nTitleBarHeight (GetSettings().GetStyleSettings().GetTitleHeight());
-
-    // Place the title tool box.
-    if (mpTitleToolBox.get() != NULL)
-    {
-        if (IsFloatingMode())
-            mpTitleToolBox->HideItem (1);
-        else
-            mpTitleToolBox->ShowItem (1);
-
-        aToolBoxSize = mpTitleToolBox->CalcWindowSizePixel();
-        if (aToolBoxSize.Height() > nTitleBarHeight)
-            nTitleBarHeight = aToolBoxSize.Height();
-        mpTitleToolBox->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;
-    mpContentWindow->SetPosSizePixel(
-        Point(maBorder.Left(),nTitleBarHeight+maBorder.Top()),
-        Size (aWindowSize.Width()-maBorder.Left()-maBorder.Right(),
-            aWindowSize.Height()-maBorder.Top()-maBorder.Bottom()));
-}
-
-
-
-
-void PaneDockingWindow::Paint (const Rectangle& rRectangle)
-{
-    if (mbIsLayoutPending)
-        Layout();
-
-    SfxDockingWindow::Paint (rRectangle);
-    int nTitleBarHeight (GetSettings().GetStyleSettings().GetTitleHeight());
-    Size aToolBoxSize = mpTitleToolBox->CalcWindowSizePixel();
-    if (aToolBoxSize.Height() > nTitleBarHeight)
-        nTitleBarHeight = aToolBoxSize.Height();
-    Color aOriginalLineColor (GetLineColor());
-    Color aOriginalFillColor (GetFillColor());
-    SetFillColor (GetSettings().GetStyleSettings().GetDialogColor());
-    SetLineColor ();
-
-    // Make font bold.
-    const Font& rOriginalFont (GetFont());
-    Font aFont (rOriginalFont);
-    aFont.SetWeight (WEIGHT_BOLD);
-    SetFont (aFont);
-
-    // Set border values.
-    Size aWindowSize (GetOutputSizePixel());
-    int nOuterLeft = 0;
-    int nInnerLeft = nOuterLeft + maBorder.Left() - 1;
-    int nOuterRight = aWindowSize.Width() - 1;
-    int nInnerRight = nOuterRight - maBorder.Right() + 1;
-    int nInnerTop = nTitleBarHeight + maBorder.Top() - 1;
-    int nOuterBottom = aWindowSize.Height() - 1;
-    int nInnerBottom = nOuterBottom - maBorder.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 (maBorder.Top() > 0)
-        DrawLine (
-            Point(nInnerLeft,nInnerTop),
-            Point(nInnerLeft,nInnerBottom));
-    if (maBorder.Left() > 0)
-        DrawLine (
-            Point(nInnerLeft,nInnerTop),
-            Point(nInnerRight,nInnerTop));
-    SetLineColor (GetSettings().GetStyleSettings().GetLightColor());
-    if (maBorder.Bottom() > 0)
-        DrawLine (
-            Point(nInnerRight,nInnerBottom),
-            Point(nInnerLeft,nInnerBottom));
-    if (maBorder.Right() > 0)
-        DrawLine (
-            Point(nInnerRight,nInnerBottom),
-            Point(nInnerRight,nInnerTop));
-
-    // Paint title bar text.
-    SetLineColor (GetSettings().GetStyleSettings().GetActiveTextColor());
-    SetFillColor ();
-    aTitleBarBox.Left() += 3;
-    DrawText (aTitleBarBox, msTitle,
-        TEXT_DRAW_LEFT
-        | TEXT_DRAW_VCENTER
-        | TEXT_DRAW_MULTILINE
-        | TEXT_DRAW_WORDBREAK);
-
-    // Restore original values of the output device.
-    SetFont (rOriginalFont);
-    SetFillColor (aOriginalFillColor);
 }
 
-
-
-
-void PaneDockingWindow::InitializeTitleToolBox (void)
-{
-    if (mpTitleToolBox.get() == NULL)
-    {
-        // Initialize the title tool box.
-        mpTitleToolBox.reset (new ToolBox(this));
-        mpTitleToolBox->SetSelectHdl (
-            LINK(this, PaneDockingWindow, ToolboxSelectHandler));
-        mpTitleToolBox->SetOutStyle (TOOLBOX_STYLE_FLAT);
-        mpTitleToolBox->SetBackground (Wallpaper (
-            GetSettings().GetStyleSettings().GetDialogColor()));
-        mpTitleToolBox->Show();
-    }
-    else
-        mpTitleToolBox->Clear();
-
-    // Get the closer bitmap and set it as right most button.
-    Bitmap aBitmap (SdResId (BMP_CLOSE_DOC));
-    Bitmap aBitmapHC (SdResId (BMP_CLOSE_DOC_H));
-    Image aImage = Image (aBitmap, Color (COL_LIGHTMAGENTA));
-    Image aImageHC = Image (aBitmapHC, Color (BMP_COLOR_HIGHCONTRAST));
-    mpTitleToolBox->InsertItem (1,
-        GetSettings().GetStyleSettings().GetHighContrastMode()
-        ? aImageHC
-        : aImage);
-    mpTitleToolBox->ShowItem (1);
-}
-
-
-
-
-USHORT PaneDockingWindow::AddMenu (
-    const String& rsMenuName,
-    ULONG nHelpId,
-    const Link& rCallback)
-{
-    // Add the menu before the closer button.
-    USHORT nItemCount (mpTitleToolBox->GetItemCount());
-    USHORT nItemId (nItemCount+1);
-    mpTitleToolBox->InsertItem (
-        nItemId,
-        rsMenuName,
-        TIB_DROPDOWNONLY,
-        nItemCount>0 ? nItemCount-1 : (USHORT)-1);
-    mpTitleToolBox->SetHelpId( nItemId, nHelpId );
-    mpTitleToolBox->SetClickHdl (rCallback);
-    mpTitleToolBox->SetDropdownClickHdl (rCallback);
-
-    // The tool box has likely changed its size. The title bar has to be
-    // resized.
-    Resize();
-    Invalidate();
-
-    return nItemCount+1;
-}
-
-
-
-
-IMPL_LINK(PaneDockingWindow, ToolboxSelectHandler, ToolBox*, pToolBox)
-{
-    USHORT nId = pToolBox->GetCurItemId();
-
-    if (nId == 1)
-    {
-        EndTracking();
-        SfxBoolItem aVisibility (mnChildWindowId, FALSE);
-        GetBindings().GetDispatcher()->Execute (
-            mnChildWindowId,
-            SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
-            &aVisibility,
-            NULL);
-    }
-
-    return 0;
-}
-
-
-
-
-long PaneDockingWindow::Notify( NotifyEvent& rNEvt )
-{
-    return SfxDockingWindow::Notify (rNEvt);
-}
-
-
-
-
 void PaneDockingWindow::StateChanged( StateChangedType nType )
 {
     switch (nType)
     {
-        case STATE_CHANGE_INITSHOW:
-            Resize();
-            break;
-
         case STATE_CHANGE_VISIBLE:
             // The visibility of the docking window has changed.  Tell the
             // ConfigurationController so that it can activate or deactivate
@@ -351,61 +78,4 @@ void PaneDockingWindow::StateChanged( StateChangedType nType )
     SfxDockingWindow::StateChanged (nType);
 }
 
-
-
-
-void PaneDockingWindow::DataChanged (const DataChangedEvent& rEvent)
-{
-    SfxDockingWindow::DataChanged (rEvent);
-
-    switch (rEvent.GetType())
-    {
-        case DATACHANGED_SETTINGS:
-            if ((rEvent.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();
-
-            Resize();
-            Invalidate();
-        }
-        break;
-    }
-}
-
-
-
-
-::Window* PaneDockingWindow::GetContentWindow (void)
-{
-    return mpContentWindow.get();
-}
-
-
-
-
-::boost::shared_ptr<ToolBox> PaneDockingWindow::GetTitleToolBox (void) const
-{
-    return mpTitleToolBox;
-}
-
-
 } // end of namespace ::sd
diff --git a/sd/source/ui/dlg/PaneDockingWindow.src b/sd/source/ui/dlg/PaneDockingWindow.src
index 0359f9f18182..23b0d19ac79b 100644..100755
--- a/sd/source/ui/dlg/PaneDockingWindow.src
+++ b/sd/source/ui/dlg/PaneDockingWindow.src
@@ -59,7 +59,7 @@ DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW
     Text [ en-US ] = "Page Pane" ;
 };
 
-DockingWindow FLT_RIGHT_PANE_DOCKING_WINDOW
+DockingWindow FLT_TOOL_PANEL_DOCKING_WINDOW
 {
     //  HelpID = SID_EFFECT_WIN ;
     Border = TRUE ;
diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx
index 2e8032926846..bb1023482ea0 100644..100755
--- a/sd/source/ui/dlg/PaneShells.cxx
+++ b/sd/source/ui/dlg/PaneShells.cxx
@@ -109,36 +109,30 @@ LeftDrawPaneShell::~LeftDrawPaneShell (void)
 
 
 
-//===== RightPaneShell ========================================================
+//===== ToolPanelPaneShell ========================================================
 
 #undef ShellClass
-#define ShellClass RightPaneShell
+#define ShellClass ToolPanelPaneShell
 
-SFX_SLOTMAP(RightPaneShell)
+SFX_SLOTMAP( ToolPanelPaneShell )
 {
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-SFX_IMPL_INTERFACE(RightPaneShell, SfxShell, SdResId(STR_RIGHT_PANE_SHELL))
+SFX_IMPL_INTERFACE( ToolPanelPaneShell, SfxShell, SdResId( STR_TOOL_PANEL_SHELL ) )
 {
-    SFX_CHILDWINDOW_REGISTRATION(
-        ::sd::RightPaneChildWindow::GetChildWindowId());
+    SFX_CHILDWINDOW_REGISTRATION( ::sd::ToolPanelChildWindow::GetChildWindowId() );
 }
 
-TYPEINIT1(RightPaneShell, SfxShell);
-
+TYPEINIT1( ToolPanelPaneShell, SfxShell );
 
-
-RightPaneShell::RightPaneShell (void)
-    : SfxShell()
+ToolPanelPaneShell::ToolPanelPaneShell()
+    :SfxShell()
 {
-    SetName(rtl::OUString::createFromAscii("RightPane"));
+    SetName( ::rtl::OUString::createFromAscii( "ToolPanel" ) );
 }
 
-
-
-
-RightPaneShell::~RightPaneShell (void)
+ToolPanelPaneShell::~ToolPanelPaneShell(void)
 {
 }
 
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 9dbf8e22629c..e6fa5df0de04 100644..100755
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -56,6 +56,7 @@
 
 #include <com/sun/star/embed/XEmbedPersist.hpp>
 #include <svtools/embedtransfer.hxx>
+#include <tools/diagnose_ex.h>
 #include <ViewShell.hxx>
 
 using namespace com::sun::star;
@@ -1268,7 +1269,7 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt )
     }
     catch (com::sun::star::uno::Exception&)
     {
-        OSL_ASSERT(false);
+        DBG_UNHANDLED_EXCEPTION();
     }
 
     if (nRet == DND_ACTION_NONE)
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
index e708909ee928..ff167f07520a 100644..100755
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -123,8 +124,7 @@ void ConfigurationControllerBroadcaster::NotifyListeners (
         }
         catch(RuntimeException&)
         {
-            DBG_ASSERT(false,
-                "ConfigurationController: caught exception while notifying listeners");
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 }
@@ -212,8 +212,7 @@ void ConfigurationControllerBroadcaster::DisposeAndClear (void)
                 }
                 catch (RuntimeException&)
                 {
-                    DBG_ASSERT(false,
-                        "ConfigurationController: caught exception while notifying dispose");
+                    DBG_UNHANDLED_EXCEPTION();
                 }
             }
             else
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
index bb5aab8a05d3..93ff7ee54e00 100644..100755
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
@@ -32,6 +32,7 @@
 #include "ResourceFactoryManager.hxx"
 #include "framework/FrameworkHelper.hxx"
 #include <com/sun/star/lang/DisposedException.hpp>
+#include <tools/diagnose_ex.h>
 #include <algorithm>
 #include <boost/bind.hpp>
 
@@ -168,7 +169,7 @@ void ConfigurationControllerResourceManager::ActivateResource (
         }
         catch(Exception&)
         {
-            OSL_ENSURE(false, "caught exception while activating resource");
+            DBG_UNHANDLED_EXCEPTION();
         }
 
         if (xResource.is())
@@ -197,7 +198,7 @@ void ConfigurationControllerResourceManager::ActivateResource (
     }
     catch (RuntimeException&)
     {
-        OSL_ASSERT(false);
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
@@ -257,7 +258,7 @@ void ConfigurationControllerResourceManager::DeactivateResource (
     }
     catch (RuntimeException&)
     {
-        OSL_ASSERT(false);
+        DBG_UNHANDLED_EXCEPTION();
     }
 
 #if defined VERBOSE && VERBOSE>=1
diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
index 63e45f8bb110..498f0670542e 100644..100755
--- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
@@ -41,16 +41,16 @@ void ConfigurationTracer::TraceConfiguration (
     const char* pMessage)
 {
 #ifdef DEBUG
-    OSL_TRACE("%s at %p {\n", pMessage, rxConfiguration.get());
+    OSL_TRACE("%s at %p {", pMessage, rxConfiguration.get());
     if (rxConfiguration.is())
     {
         TraceBoundResources(rxConfiguration, NULL, 0);
     }
     else
     {
-        OSL_TRACE("    empty\n");
+        OSL_TRACE("    empty");
     }
-    OSL_TRACE("}\n");
+    OSL_TRACE("}");
 #else
     (void)rxConfiguration;
     (void)pMessage;
@@ -74,7 +74,7 @@ void ConfigurationTracer::TraceBoundResources (
         ::rtl::OUString sLine (aResourceList[nIndex]->getResourceURL());
         for (int i=0; i<nIndentation; ++i)
             sLine = sIndentation + sLine;
-        OSL_TRACE("%s\n", OUStringToOString(sLine, RTL_TEXTENCODING_UTF8).getStr());
+        OSL_TRACE("%s", OUStringToOString(sLine, RTL_TEXTENCODING_UTF8).getStr());
         TraceBoundResources(rxConfiguration, aResourceList[nIndex], nIndentation+1);
     }
 #else
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index 77579e32f1a9..aa8aca5a5ffd 100755
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -35,6 +35,7 @@
 #include "framework/FrameworkHelper.hxx"
 
 #include <comphelper/scopeguard.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <boost/bind.hpp>
 
@@ -128,7 +129,7 @@ void ConfigurationUpdater::RequestUpdate (
     if (IsUpdatePossible())
     {
 #if defined VERBOSE && VERBOSE>=1
-        OSL_TRACE("UpdateConfiguration start\n");
+        OSL_TRACE("UpdateConfiguration start");
 #endif
 
         // Call UpdateConfiguration while that is possible and while someone
@@ -146,7 +147,7 @@ void ConfigurationUpdater::RequestUpdate (
     {
         mbUpdatePending = true;
 #if defined VERBOSE && VERBOSE>=1
-        OSL_TRACE("scheduling update for later\n");
+        OSL_TRACE("scheduling update for later");
 #endif
     }
 }
@@ -185,7 +186,7 @@ bool ConfigurationUpdater::IsUpdatePossible (void)
 void ConfigurationUpdater::UpdateConfiguration (void)
 {
 #if defined VERBOSE && VERBOSE>=1
-        OSL_TRACE("UpdateConfiguration update\n");
+        OSL_TRACE("UpdateConfiguration update");
 #endif
     SetUpdateBeingProcessed(true);
     comphelper::ScopeGuard aScopeGuard (
@@ -200,7 +201,7 @@ void ConfigurationUpdater::UpdateConfiguration (void)
         if (aClassifier.Partition())
         {
 #if defined VERBOSE && VERBOSE>=2
-            OSL_TRACE("ConfigurationUpdater::UpdateConfiguration(\n");
+            OSL_TRACE("ConfigurationUpdater::UpdateConfiguration(");
             ConfigurationTracer::TraceConfiguration(
                 mxRequestedConfiguration, "requested configuration");
             ConfigurationTracer::TraceConfiguration(
@@ -232,7 +233,7 @@ void ConfigurationUpdater::UpdateConfiguration (void)
         else
         {
 #if defined VERBOSE && VERBOSE>0
-            OSL_TRACE("nothing to do\n");
+            OSL_TRACE("nothing to do");
 #if defined VERBOSE && VERBOSE>=2
             ConfigurationTracer::TraceConfiguration(
                 mxRequestedConfiguration, "requested configuration");
@@ -244,8 +245,7 @@ void ConfigurationUpdater::UpdateConfiguration (void)
     }
     catch (RuntimeException e)
     {
-        OSL_TRACE("caught exception while updating the current configuration");
-        DBG_ASSERT(false, "caught exception while updating the current configuration");
+        DBG_UNHANDLED_EXCEPTION();
     }
 
 #if defined VERBOSE && VERBOSE>0
@@ -310,11 +310,11 @@ void ConfigurationUpdater::UpdateCore (const ConfigurationClassifier& rClassifie
     {
 #if defined VERBOSE && VERBOSE>=2
         rClassifier.TraceResourceIdVector(
-            "requested but not current resources:\n", rClassifier.GetC1minusC2());
+            "requested but not current resources:", rClassifier.GetC1minusC2());
         rClassifier.TraceResourceIdVector(
-            "current but not requested resources:\n", rClassifier.GetC2minusC1());
+            "current but not requested resources:", rClassifier.GetC2minusC1());
         rClassifier.TraceResourceIdVector(
-            "requested and current resources:\n", rClassifier.GetC1andC2());
+            "requested and current resources:", rClassifier.GetC1andC2());
 #endif
 
         // Updating of the sub controllers is done in two steps.  In the
@@ -325,11 +325,11 @@ void ConfigurationUpdater::UpdateCore (const ConfigurationClassifier& rClassifie
         mpResourceManager->ActivateResources(rClassifier.GetC1minusC2(), mxCurrentConfiguration);
 
 #if defined VERBOSE && VERBOSE>=2
-        OSL_TRACE("ConfigurationController::UpdateConfiguration)\n");
+        OSL_TRACE("ConfigurationController::UpdateConfiguration)");
         ConfigurationTracer::TraceConfiguration(
-            mxRequestedConfiguration, "requested configuration\n");
+            mxRequestedConfiguration, "requested configuration");
         ConfigurationTracer::TraceConfiguration(
-            mxCurrentConfiguration, "current configuration\n");
+            mxCurrentConfiguration, "current configuration");
 #endif
 
         // Deactivate pure anchors that have no child.
@@ -340,7 +340,7 @@ void ConfigurationUpdater::UpdateCore (const ConfigurationClassifier& rClassifie
     }
     catch(RuntimeException)
     {
-        OSL_ASSERT(false);
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
@@ -401,7 +401,7 @@ void ConfigurationUpdater::CheckPureAnchors (
         if (bDeactiveCurrentResource)
         {
 #if defined VERBOSE && VERBOSE>=2
-            OSL_TRACE("deactiving pure anchor %s because it has no children\n",
+            OSL_TRACE("deactiving pure anchor %s because it has no children",
                 OUStringToOString(
                     FrameworkHelper::ResourceIdToString(xResourceId),
                     RTL_TEXTENCODING_UTF8).getStr());
@@ -458,14 +458,14 @@ void ConfigurationUpdater::SetUpdateBeingProcessed (bool bValue)
 
 IMPL_LINK(ConfigurationUpdater, TimeoutHandler, Timer*, EMPTYARG)
 {
-    OSL_TRACE("configuration update timer\n");
+    OSL_TRACE("configuration update timer");
     if ( ! mbUpdateBeingProcessed
         && mxCurrentConfiguration.is()
         && mxRequestedConfiguration.is())
     {
         if ( ! AreConfigurationsEquivalent(mxCurrentConfiguration, mxRequestedConfiguration))
         {
-            OSL_TRACE("configurations differ, requesting update\n");
+            OSL_TRACE("configurations differ, requesting update");
             RequestUpdate(mxRequestedConfiguration);
         }
     }
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 969844f7650d..d6f60506c62f 100644..100755
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -44,6 +44,7 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::drawing::framework;
 
 using ::rtl::OUString;
@@ -270,7 +271,7 @@ void SAL_CALL BasicPaneFactory::initialize (const Sequence<Any>& aArguments)
 
 Reference<XResource> SAL_CALL BasicPaneFactory::createResource (
     const Reference<XResourceId>& rxPaneId)
-    throw (RuntimeException)
+    throw (RuntimeException, IllegalArgumentException, WrappedTargetException)
 {
     ThrowIfDisposed();
 
@@ -528,8 +529,8 @@ Reference<XResource> BasicPaneFactory::CreateChildWindowPane (
                 break;
 
             case RightPaneId:
-                pShell.reset(new RightPaneShell());
-                nChildWindowId = ::sd::RightPaneChildWindow::GetChildWindowId();
+                pShell.reset(new ToolPanelPaneShell());
+                nChildWindowId = ::sd::ToolPanelChildWindow::GetChildWindowId();
                 break;
 
             default:
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
index 1f442656d1d9..bceeae60003a 100644..100755
--- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
@@ -99,7 +99,7 @@ public:
     virtual css::uno::Reference<css::drawing::framework::XResource>
         SAL_CALL createResource (
             const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId)
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException);
 
     virtual void SAL_CALL
         releaseResource (
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
index 4645b0462399..d353cfc58c1f 100644..100755
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
@@ -38,6 +38,7 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::drawing::framework;
 
 namespace sd { namespace framework {
@@ -191,7 +192,7 @@ void SAL_CALL BasicToolBarFactory::disposing (
 
 Reference<XResource> SAL_CALL BasicToolBarFactory::createResource (
     const Reference<XResourceId>& rxToolBarId)
-    throw (RuntimeException)
+    throw (RuntimeException, IllegalArgumentException, WrappedTargetException)
 {
     ThrowIfDisposed();
 
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
index c305c334bf0f..686de897c179 100644..100755
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
@@ -80,7 +80,7 @@ public:
         createResource (
             const css::uno::Reference<
                 css::drawing::framework::XResourceId>& rxToolBarId)
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException);
 
     virtual void SAL_CALL
         releaseResource (
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 4f0137ea6530..1320df5c827b 100644..100755
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -42,7 +42,7 @@
 #include "DrawViewShell.hxx"
 #include "GraphicViewShell.hxx"
 #include "OutlineViewShell.hxx"
-#include "TaskPaneViewShell.hxx"
+#include "taskpane/ToolPanelViewShell.hxx"
 #include "PresentationViewShell.hxx"
 #include "SlideSorterViewShell.hxx"
 #include "FrameView.hxx"
@@ -55,6 +55,7 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::drawing::framework;
 
 using ::rtl::OUString;
@@ -189,7 +190,7 @@ void SAL_CALL BasicViewFactory::disposing (void)
 
 Reference<XResource> SAL_CALL BasicViewFactory::createResource (
     const Reference<XResourceId>& rxViewId)
-    throw(RuntimeException)
+    throw(RuntimeException, IllegalArgumentException, WrappedTargetException)
 {
     Reference<XResource> xView;
     const bool bIsCenterPane (
@@ -372,7 +373,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments)
             pDescriptor->mpViewShell,
             rxViewId,
             rxPane->getWindow());
-        pDescriptor->mxView = Reference<XResource>(pDescriptor->mpWrapper);
+        pDescriptor->mxView.set( pDescriptor->mpWrapper->queryInterface( XResource::static_type() ), UNO_QUERY_THROW );
     }
 
     return pDescriptor;
@@ -449,7 +450,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments)
     else if (rsViewURL.equals(FrameworkHelper::msTaskPaneURL))
     {
         pViewShell.reset(
-            new ::sd::toolpanel::TaskPaneViewShell (
+            new ::sd::toolpanel::ToolPanelViewShell(
                 &rFrame,
                 *mpBase,
                 &rWindow,
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx
index cc9218af26cc..e5bb43551a24 100644..100755
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
@@ -96,7 +96,7 @@ public:
     virtual css::uno::Reference<css::drawing::framework::XResource>
         SAL_CALL createResource (
             const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId)
-        throw(css::uno::RuntimeException);
+        throw(css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException);
 
     virtual void SAL_CALL releaseResource (
         const css::uno::Reference<css::drawing::framework::XResource>& xView)
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx
index 290c84c3ec75..5e4e6df987f0 100644..100755
--- a/sd/source/ui/framework/factories/ChildWindowPane.cxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx
@@ -191,7 +191,7 @@ void SAL_CALL ChildWindowPane::disposing (void)
             break;
 
         // At last, we have access to the window and its UNO wrapper.
-        mpWindow = pDockingWindow->GetContentWindow();
+        mpWindow = &pDockingWindow->GetContentWindow();
         mxWindow = VCLUnoHelper::GetInterface(mpWindow);
 
         // Register as window listener to be informed when the child window
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx
index 6ede6e439e02..6f22f1484627 100644..100755
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -34,10 +34,12 @@
 #include "ViewShellBase.hxx"
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <cppuhelper/compbase1.hxx>
+#include <tools/diagnose_ex.h>
 #include "slideshow.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::drawing::framework;
 
 using ::rtl::OUString;
@@ -154,7 +156,7 @@ PresentationFactory::PresentationFactory (
     }
     catch (RuntimeException&)
     {
-        OSL_ASSERT(false);
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
@@ -180,7 +182,7 @@ void SAL_CALL PresentationFactory::disposing (void)
 
 Reference<XResource> SAL_CALL PresentationFactory::createResource (
     const Reference<XResourceId>& rxViewId)
-    throw (RuntimeException)
+    throw (RuntimeException, IllegalArgumentException, WrappedTargetException)
 {
     ThrowIfDisposed();
 
@@ -308,7 +310,7 @@ void SAL_CALL PresentationFactoryProvider::initialize(
         }
         catch (RuntimeException&)
         {
-            OSL_ASSERT(false);
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 }
diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
index 8942833d2483..1cd156817afc 100644..100755
--- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx
+++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
@@ -27,18 +27,19 @@
 
 #include "precompiled_sd.hxx"
 #include "TaskPanelFactory.hxx"
-#include "TaskPaneViewShell.hxx"
+#include "taskpane/ToolPanelViewShell.hxx"
 #include "DrawController.hxx"
 #include "framework/FrameworkHelper.hxx"
 #include <cppuhelper/compbase1.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::drawing::framework;
 
 using ::rtl::OUString;
 using ::sd::framework::FrameworkHelper;
-using ::sd::toolpanel::TaskPaneViewShell;
 
 namespace sd { namespace framework {
 
@@ -85,14 +86,11 @@ class TaskPanelResource
 {
 public:
     TaskPanelResource (
-        const Reference<XResourceId>& rxResourceId,
-        const TaskPaneViewShell::PanelId ePaneId);
+        const Reference<XResourceId>& rxResourceId );
     virtual ~TaskPanelResource ();
 
     virtual void SAL_CALL disposing ();
 
-    TaskPaneViewShell::PanelId GetPaneId () const;
-
     // XResource
 
     virtual Reference<XResourceId> SAL_CALL getResourceId (void)
@@ -103,7 +101,6 @@ public:
 
 private:
     const Reference<XResourceId> mxResourceId;
-    const TaskPaneViewShell::PanelId mePaneId;
 };
 
 } // end of anonymous namespace.
@@ -185,9 +182,27 @@ void SAL_CALL TaskPanelFactory::initialize(
 
 //===== XResourceController ===================================================
 
+namespace
+{
+    void lcl_collectResourceURLs( const Reference< XResourceId >& i_rResourceId, ::std::vector< ::rtl::OUString >& o_rResourceURLs )
+    {
+        ENSURE_OR_RETURN_VOID( i_rResourceId.is(), "illegal resource ID" );
+        o_rResourceURLs.resize(0);
+
+        Reference< XResourceId > xResourceId( i_rResourceId );
+        ::rtl::OUString sResourceURL = xResourceId->getResourceURL();
+        while ( sResourceURL.getLength() > 0 )
+        {
+            o_rResourceURLs.push_back( sResourceURL );
+            xResourceId = xResourceId->getAnchor();
+            sResourceURL = xResourceId->getResourceURL();
+        }
+    }
+}
+
 Reference<XResource> SAL_CALL TaskPanelFactory::createResource (
     const Reference<XResourceId>& rxResourceId)
-    throw (RuntimeException)
+    throw (RuntimeException, IllegalArgumentException, WrappedTargetException)
 {
     Reference<XResource> xResource;
 
@@ -196,45 +211,26 @@ Reference<XResource> SAL_CALL TaskPanelFactory::createResource (
 
     OUString sResourceURL (rxResourceId->getResourceURL());
 
-    if (sResourceURL.match(FrameworkHelper::msTaskPanelURLPrefix))
+    if ( sResourceURL.match( FrameworkHelper::msTaskPanelURLPrefix ) )
     {
-        TaskPaneViewShell::PanelId ePaneId (TaskPaneViewShell::PID_UNKNOWN);
+        toolpanel::PanelId ePanelId( toolpanel::GetStandardPanelId( sResourceURL ) );
 
-        if (sResourceURL.equals(FrameworkHelper::msMasterPagesTaskPanelURL))
+        if ( ( ePanelId != toolpanel::PID_UNKNOWN ) && ( mpViewShellBase != NULL ) )
         {
-            ePaneId = TaskPaneViewShell::PID_MASTER_PAGES;
-        }
-        else if (sResourceURL.equals(FrameworkHelper::msLayoutTaskPanelURL))
-        {
-            ePaneId = TaskPaneViewShell::PID_LAYOUT;
-        }
-        else if (sResourceURL.equals(FrameworkHelper::msTableDesignPanelURL))
-        {
-            ePaneId = TaskPaneViewShell::PID_TABLE_DESIGN;
-        }
-        else if (sResourceURL.equals(FrameworkHelper::msCustomAnimationTaskPanelURL))
-        {
-            ePaneId = TaskPaneViewShell::PID_CUSTOM_ANIMATION;
-        }
-        else if (sResourceURL.equals(FrameworkHelper::msSlideTransitionTaskPanelURL))
-        {
-            ePaneId = TaskPaneViewShell::PID_SLIDE_TRANSITION;
-        }
+            ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( *mpViewShellBase ) );
 
-        if (ePaneId!=TaskPaneViewShell::PID_UNKNOWN && mpViewShellBase!=NULL)
-        {
-            toolpanel::TaskPaneViewShell* pTaskPane
-                = dynamic_cast<toolpanel::TaskPaneViewShell*>(
-                    FrameworkHelper::Instance(*mpViewShellBase)
-                        ->GetViewShell(FrameworkHelper::msRightPaneURL).get());
-            if (pTaskPane != NULL)
-            {
-                xResource = new TaskPanelResource(
-                    rxResourceId,
-                    ePaneId);
-                pTaskPane->ShowPanel(ePaneId);
-                pTaskPane->ExpandPanel(ePaneId);
-            }
+            // assume that the top-level anchor is the URL of the pane
+            ::std::vector< ::rtl::OUString > aResourceURLs;
+            lcl_collectResourceURLs( rxResourceId, aResourceURLs );
+
+            const ::rtl::OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ];
+            const ::boost::shared_ptr< ViewShell > pPaneViewShell( pFrameworkHelper->GetViewShell( sPaneURL ) );
+
+            toolpanel::ToolPanelViewShell* pToolPanel = dynamic_cast< toolpanel::ToolPanelViewShell* >( pPaneViewShell.get() );
+            if ( pToolPanel != NULL )
+                xResource = new TaskPanelResource( rxResourceId );
+
+            OSL_POSTCOND( xResource.is(), "TaskPanelFactory::createResource: did not find the given resource!" );
         }
     }
 
@@ -248,16 +244,37 @@ void SAL_CALL TaskPanelFactory::releaseResource (
     const Reference<XResource>& rxResource)
     throw (RuntimeException)
 {
-    toolpanel::TaskPaneViewShell* pTaskPane
-        = dynamic_cast<toolpanel::TaskPaneViewShell*>(
-            FrameworkHelper::Instance(*mpViewShellBase)
-                ->GetViewShell(FrameworkHelper::msRightPaneURL).get());
+    ENSURE_OR_RETURN_VOID( rxResource.is(), "illegal resource" );
+    const Reference< XResourceId > xResourceId( rxResource->getResourceId(), UNO_SET_THROW );
+
+    // assume that the top-level anchor is the URL of the pane
+    ::std::vector< ::rtl::OUString > aResourceURLs;
+    lcl_collectResourceURLs( xResourceId, aResourceURLs );
 
-    rtl::Reference<TaskPanelResource> pResource = dynamic_cast<TaskPanelResource*>(
-        rxResource.get());
+    OSL_ENSURE( !aResourceURLs.empty(), "TaskPanelFactory::releaseResource: illegal resource/URL!" );
+    if ( !aResourceURLs.empty() )
+    {
+        const ::rtl::OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ];
+        ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( *mpViewShellBase ) );
+        const ::boost::shared_ptr< ViewShell > pPaneViewShell( pFrameworkHelper->GetViewShell( sPaneURL ) );
+        if ( pPaneViewShell != NULL )
+        {
+            const ::rtl::OUString sPanelResourceURL( xResourceId->getResourceURL() );
+            const toolpanel::PanelId ePanelId( toolpanel::GetStandardPanelId( sPanelResourceURL ) );
+            toolpanel::ToolPanelViewShell* pToolPanel = dynamic_cast< toolpanel::ToolPanelViewShell* >( pPaneViewShell.get() );
 
-    if (pTaskPane != NULL && pResource.is())
-        pTaskPane->CollapsePanel(pResource->GetPaneId());
+            if  (   ( ePanelId != toolpanel::PID_UNKNOWN )
+                &&  ( pToolPanel != NULL )
+                )
+            {
+                pToolPanel->DeactivatePanel( sPanelResourceURL );
+            }
+            else
+            {
+                OSL_ENSURE( false, "TaskPanelFactory::releaseResource: don't know what to do with this resource!" );
+            }
+        }
+    }
 
     Reference<XComponent> xComponent (rxResource, UNO_QUERY);
     if (xComponent.is())
@@ -289,11 +306,9 @@ void TaskPanelFactory::ThrowIfDisposed (void) const
 namespace {
 
 TaskPanelResource::TaskPanelResource (
-    const Reference<XResourceId>& rxResourceId,
-    const TaskPaneViewShell::PanelId ePaneId)
+    const Reference<XResourceId>& rxResourceId)
     : TaskPanelResourceInterfaceBase(m_aMutex),
-      mxResourceId(rxResourceId),
-      mePaneId(ePaneId)
+      mxResourceId(rxResourceId)
 {
 }
 
@@ -314,14 +329,6 @@ void SAL_CALL TaskPanelResource::disposing ()
 
 
 
-TaskPaneViewShell::PanelId TaskPanelResource::GetPaneId () const
-{
-    return mePaneId;
-}
-
-
-
-
 Reference<XResourceId> SAL_CALL TaskPanelResource::getResourceId ()
     throw (css::uno::RuntimeException)
 {
diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.hxx b/sd/source/ui/framework/factories/TaskPanelFactory.hxx
index 1130a106a56c..1ab2fa783a4a 100644..100755
--- a/sd/source/ui/framework/factories/TaskPanelFactory.hxx
+++ b/sd/source/ui/framework/factories/TaskPanelFactory.hxx
@@ -80,7 +80,7 @@ public:
         SAL_CALL createResource (
             const css::uno::Reference<
                 css::drawing::framework::XResourceId>& rxResourcesId)
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException);
 
     virtual void SAL_CALL releaseResource (
         const css::uno::Reference<
diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
index 0a3aeccade7c..a1c0bd525c9e 100644..100755
--- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx
+++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
@@ -29,22 +29,32 @@
 
 #include "framework/ViewShellWrapper.hxx"
 #include "framework/Pane.hxx"
+#include "taskpane/ToolPanelViewShell.hxx"
 #include "ViewShell.hxx"
 #include "Window.hxx"
 
 #include <com/sun/star/drawing/framework/XPane.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 
 #include <rtl/uuid.h>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <comphelper/sequence.hxx>
+#include <cppuhelper/typeprovider.hxx>
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
+#include <tools/diagnose_ex.h>
 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 
+using ::com::sun::star::awt::XWindow;
+using ::com::sun::star::rendering::XCanvas;
+using ::com::sun::star::lang::DisposedException;
+
 using ::rtl::OUString;
+using ::sd::toolpanel::ToolPanelViewShell;
 
 namespace sd { namespace framework {
 
@@ -79,6 +89,8 @@ ViewShellWrapper::~ViewShellWrapper (void)
 
 void SAL_CALL ViewShellWrapper::disposing (void)
 {
+    ::osl::MutexGuard aGuard( maMutex );
+
     OSL_TRACE("disposing ViewShellWrapper %x", this);
     Reference<awt::XWindow> xWindow (mxWindow);
     if (xWindow.is())
@@ -101,14 +113,6 @@ void SAL_CALL ViewShellWrapper::disposing (void)
 
 
 
-bool ViewShellWrapper::IsUnique (void)
-{
-    return m_refCount==1;
-}
-
-
-
-
 //----- XResource -------------------------------------------------------------
 
 Reference<XResourceId> SAL_CALL ViewShellWrapper::getResourceId (void)
@@ -177,7 +181,7 @@ const Sequence<sal_Int8>& ViewShellWrapper::getUnoTunnelId (void)
     static Sequence<sal_Int8>* pSequence = NULL;
     if (pSequence == NULL)
     {
-        const ::vos::OGuard aSolarGuard (Application::GetSolarMutex());
+        const ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
         if (pSequence == NULL)
         {
             static ::com::sun::star::uno::Sequence<sal_Int8> aSequence (16);
diff --git a/sd/source/ui/framework/module/ImpressModule.cxx b/sd/source/ui/framework/module/ImpressModule.cxx
index 050429b3f289..a5856bc3ebc9 100644..100755
--- a/sd/source/ui/framework/module/ImpressModule.cxx
+++ b/sd/source/ui/framework/module/ImpressModule.cxx
@@ -33,7 +33,7 @@
 #include "ViewTabBarModule.hxx"
 #include "CenterViewFocusModule.hxx"
 #include "SlideSorterModule.hxx"
-#include "TaskPaneModule.hxx"
+#include "ToolPanelModule.hxx"
 #include "ToolBarModule.hxx"
 #include "ShellStackGuard.hxx"
 
@@ -54,7 +54,7 @@ void ImpressModule::Initialize (Reference<frame::XController>& rxController)
     new SlideSorterModule(
         rxController,
         FrameworkHelper::msLeftImpressPaneURL);
-    TaskPaneModule::Initialize(rxController);
+    ToolPanelModule::Initialize(rxController);
     new ToolBarModule(rxController);
     new ShellStackGuard(rxController);
 }
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index b90ebe851f0e..e910a8df7496 100644..100755
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -35,6 +35,8 @@
 #include <boost/bind.hpp>
 #include <hash_map>
 
+#include <tools/diagnose_ex.h>
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
@@ -168,7 +170,7 @@ void ModuleController::LoadFactories (const Reference<XComponentContext>& rxCont
     }
     catch (Exception&)
     {
-        OSL_TRACE("ERROR in ModuleController::LoadFactories");
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
diff --git a/sd/source/ui/framework/module/PresentationModule.cxx b/sd/source/ui/framework/module/PresentationModule.cxx
index e28432a25d93..6a5ba5dc5e7f 100644..100755
--- a/sd/source/ui/framework/module/PresentationModule.cxx
+++ b/sd/source/ui/framework/module/PresentationModule.cxx
@@ -31,7 +31,6 @@
 
 #include "CenterViewFocusModule.hxx"
 #include "SlideSorterModule.hxx"
-#include "TaskPaneModule.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/framework/module/TaskPaneModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx
index 03e2277bdcd3..888fa68ad708 100644
--- a/sd/source/ui/framework/module/TaskPaneModule.cxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.cxx
@@ -2,10 +2,13 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
+ * $RCSfile: ToolPanelModule.cxx,v $
+ * $Revision: 1.4 $
+ *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +30,7 @@
 
 #include "precompiled_sd.hxx"
 
-#include "TaskPaneModule.hxx"
+#include "ToolPanelModule.hxx"
 #include "ReadOnlyModeObserver.hxx"
 #include "framework/FrameworkHelper.hxx"
 
@@ -54,7 +57,7 @@ typedef ::cppu::WeakComponentImplHelper1 <
     > LocalReadOnlyModeObserverInterfaceBase;
 
 /** This local class enables or disables the ResourceManager of a
-    TaskPaneModule.  It connects to a ReadOnlyModeObserver and is called
+    ToolPanelModule.  It connects to a ReadOnlyModeObserver and is called
     when the state of the .uno:EditDoc command changes.  When either the
     ResourceManager or the ReadOnlyModeObserver are disposed then the
     LocalReadOnlyModeObserver disposes itself.  The link
@@ -138,9 +141,9 @@ private:
 
 
 
-//===== TaskPaneModule ====================================================
+//===== ToolPanelModule ====================================================
 
-void TaskPaneModule::Initialize (const Reference<frame::XController>& rxController)
+void ToolPanelModule::Initialize (const Reference<frame::XController>& rxController)
 {
     ::rtl::Reference<ResourceManager> pResourceManager (
         new ResourceManager(
diff --git a/sd/source/ui/framework/module/TaskPaneModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx
index 3495e4c93a73..7d728e60e93d 100644
--- a/sd/source/ui/framework/module/TaskPaneModule.hxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.hxx
@@ -1,5 +1,4 @@
 /*************************************************************************
- *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -23,10 +22,10 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************/
+************************************************************************/
 
-#ifndef SD_FRAMEWORK_TASK_PANE_MODULE_HXX
-#define SD_FRAMEWORK_TASK_PANE_MODULE_HXX
+#ifndef SD_FRAMEWORK_TOOL_PANEL_MODULE_HXX
+#define SD_FRAMEWORK_TOOL_PANEL_MODULE_HXX
 
 #include "ResourceManager.hxx"
 
@@ -38,7 +37,7 @@ class ReadOnlyModeObserver;
 
 /** This module is responsible for showing the task pane.
 */
-class TaskPaneModule
+class ToolPanelModule
 {
 public:
     static void Initialize (
diff --git a/sd/source/ui/framework/module/makefile.mk b/sd/source/ui/framework/module/makefile.mk
index 56c864a7df53..bec9b1a04075 100644..100755
--- a/sd/source/ui/framework/module/makefile.mk
+++ b/sd/source/ui/framework/module/makefile.mk
@@ -52,7 +52,7 @@ SLOFILES =      							\
     $(SLO)$/ResourceManager.obj				\
     $(SLO)$/ShellStackGuard.obj				\
     $(SLO)$/SlideSorterModule.obj			\
-    $(SLO)$/TaskPaneModule.obj				\
+    $(SLO)$/ToolPanelModule.obj             \
     $(SLO)$/ToolBarModule.obj				\
     $(SLO)$/ViewTabBarModule.obj
 
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 25790e736473..8c63a6871483 100644..100755
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -52,6 +52,7 @@
 #include "vcl/svapp.hxx"
 #include <osl/doublecheckedlocking.h>
 #include <osl/getglobalmutex.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -218,7 +219,7 @@ const OUString FrameworkHelper::msViewTabBarURL(
 
 // Task panel URLs.
 const ::rtl::OUString FrameworkHelper::msTaskPanelURLPrefix(
-    OUString::createFromAscii("private:resource/taskpanel/"));
+    OUString::createFromAscii("private:resource/toolpanel/DrawingFramework/"));
 const ::rtl::OUString FrameworkHelper::msMasterPagesTaskPanelURL(
     msTaskPanelURLPrefix + OUString::createFromAscii("MasterPages"));
 const ::rtl::OUString FrameworkHelper::msLayoutTaskPanelURL(
@@ -252,6 +253,46 @@ const OUString FrameworkHelper::msModuleControllerService(
 const OUString FrameworkHelper::msConfigurationControllerService(
     OUString::createFromAscii("com.sun.star.drawing.framework.ConfigurationController"));
 
+//----- helper ----------------------------------------------------------------
+namespace
+{
+    static ::boost::shared_ptr< ViewShell > lcl_getViewShell( const Reference< XResource >& i_rViewShellWrapper )
+    {
+        ::boost::shared_ptr< ViewShell > pViewShell;
+        if ( !i_rViewShellWrapper.is() )
+            return pViewShell;
+
+        try
+        {
+            Reference<lang::XUnoTunnel> xViewTunnel( i_rViewShellWrapper, UNO_QUERY_THROW );
+            pViewShell = reinterpret_cast< ViewShellWrapper* >(
+                xViewTunnel->getSomething( ViewShellWrapper::getUnoTunnelId() ) )->GetViewShell();
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        return pViewShell;
+    }
+    Reference< XResource > lcl_getFirstViewInPane( const Reference< XConfigurationController >& i_rConfigController,
+        const Reference< XResourceId >& i_rPaneId )
+    {
+        try
+        {
+            Reference< XConfiguration > xConfiguration( i_rConfigController->getRequestedConfiguration(), UNO_SET_THROW );
+            Sequence< Reference< XResourceId > > aViewIds( xConfiguration->getResources(
+                i_rPaneId, FrameworkHelper::msViewURLPrefix, AnchorBindingMode_DIRECT ) );
+            if ( aViewIds.getLength() > 0 )
+                return i_rConfigController->getResource( aViewIds[0] );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        return NULL;
+    }
+}
+
 
 //----- FrameworkHelper::ViewURLMap -------------------------------------------
 
@@ -438,8 +479,11 @@ bool FrameworkHelper::IsValid (void)
 
 ::boost::shared_ptr<ViewShell> FrameworkHelper::GetViewShell (const OUString& rsPaneURL)
 {
-    Reference<XResourceId> xPaneId (CreateResourceId(rsPaneURL));
-    return GetViewShell(GetView(xPaneId));
+    if ( !mxConfigurationController.is() )
+        return ::boost::shared_ptr<ViewShell>();
+
+    Reference<XResourceId> xPaneId( CreateResourceId( rsPaneURL ) );
+    return lcl_getViewShell( lcl_getFirstViewInPane( mxConfigurationController, xPaneId ) );
 }
 
 
@@ -447,22 +491,7 @@ bool FrameworkHelper::IsValid (void)
 
 ::boost::shared_ptr<ViewShell> FrameworkHelper::GetViewShell (const Reference<XView>& rxView)
 {
-    ::boost::shared_ptr<ViewShell> pViewShell;
-
-    try
-    {
-        Reference<lang::XUnoTunnel> xViewTunnel (rxView, UNO_QUERY);
-        if (xViewTunnel.is())
-        {
-            pViewShell = reinterpret_cast<ViewShellWrapper*>(xViewTunnel->getSomething(
-                ViewShellWrapper::getUnoTunnelId()))->GetViewShell();
-        }
-    }
-    catch (RuntimeException&)
-    {
-    }
-
-    return pViewShell;
+    return lcl_getViewShell( rxView.get() );
 }
 
 
@@ -479,21 +508,11 @@ Reference<XView> FrameworkHelper::GetView (const Reference<XResourceId>& rxPaneO
     {
         if (rxPaneOrViewId->getResourceURL().match(msViewURLPrefix))
         {
-            xView = Reference<XView>(
-                mxConfigurationController->getResource(rxPaneOrViewId), UNO_QUERY);
+            xView.set( mxConfigurationController->getResource( rxPaneOrViewId ), UNO_QUERY );
         }
         else
         {
-            Reference<XConfiguration> xConfiguration (
-                mxConfigurationController->getRequestedConfiguration());
-            if (xConfiguration.is())
-            {
-                Sequence<Reference<XResourceId> > aViewIds (xConfiguration->getResources(
-                    rxPaneOrViewId, msViewURLPrefix, AnchorBindingMode_DIRECT));
-                if (aViewIds.getLength() >= 1)
-                    xView = Reference<XView>(
-                        mxConfigurationController->getResource(aViewIds[0]), UNO_QUERY);
-            }
+            xView.set( lcl_getFirstViewInPane( mxConfigurationController, rxPaneOrViewId ), UNO_QUERY );
         }
     }
     catch (lang::DisposedException&)
@@ -501,7 +520,8 @@ Reference<XView> FrameworkHelper::GetView (const Reference<XResourceId>& rxPaneO
         Dispose();
     }
     catch (RuntimeException&)
-    {}
+    {
+    }
 
     return xView;
 }
@@ -717,7 +737,7 @@ void FrameworkHelper::HandleModeChangeSlot (
     }
     catch (RuntimeException&)
     {
-        OSL_TRACE("HandleModeChangeSlot: caught exception");
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
@@ -800,7 +820,7 @@ void FrameworkHelper::WaitForEvent (const OUString& rsEventType) const
 
         if( (osl_getGlobalTimer() - nStartTime) > 60000  )
         {
-            DBG_ERROR("FrameworkHelper::WaitForEvent(), no event since a minute? giving up!");
+            DBG_ERROR("FrameworkHelper::WaitForEvent(), no event for a minute? giving up!");
             break;
         }
     }
@@ -852,7 +872,7 @@ void FrameworkHelper::UpdateConfiguration (void)
         }
         catch (RuntimeException&)
         {
-            DBG_ASSERT(false, "FrameworkHelper::UpdateConfiguration: caught exception");
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 }
@@ -1053,7 +1073,7 @@ CallbackCaller::CallbackCaller (
     }
     catch (RuntimeException&)
     {
-        DBG_ASSERT(false,"ConfigurationUpdateGuard: caught exception");
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
@@ -1080,7 +1100,7 @@ void CallbackCaller::disposing (void)
     }
     catch (RuntimeException&)
     {
-        DBG_ASSERT(false,"~ConfigurationUpdateGuard: caught exception");
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
diff --git a/sd/source/ui/inc/AccessibleTaskPane.hxx b/sd/source/ui/inc/AccessibleTaskPane.hxx
deleted file mode 100644
index 913609ecec87..000000000000
--- a/sd/source/ui/inc/AccessibleTaskPane.hxx
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************
- *
- * 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_ACCESSIBILITY_ACCESSIBLE_TASK_PANE_HXX
-#define SD_ACCESSIBILITY_ACCESSIBLE_TASK_PANE_HXX
-
-#include "AccessibleTreeNode.hxx"
-
-namespace sd { namespace toolpanel {
-class ToolPanel;
-} }
-
-
-namespace accessibility {
-
-/** Make the task pane as implemented by sd::toolpanel::ToolPanel
-    accessible.
-    This derived class exists in order to disable the FOCUSED state.
-*/
-class AccessibleTaskPane
-    : public AccessibleTreeNode
-{
-public:
-    AccessibleTaskPane (
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::accessibility::XAccessible> & rxParent,
-        const ::rtl::OUString& rsName,
-        const ::rtl::OUString& rsDescription,
-        ::sd::toolpanel::ToolPanel& rTaskPane);
-    ~AccessibleTaskPane (void);
-
-    //=====  XServiceInfo  ====================================================
-
-    /** Returns an identifier for the implementation of this object.
-    */
-    virtual ::rtl::OUString SAL_CALL
-        getImplementationName (void)
-        throw (::com::sun::star::uno::RuntimeException);
-
-protected:
-    virtual void UpdateStateSet (void);
-};
-
-} // end of namespace accessibility
-
-#endif
diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx
index 9995ed4b00c8..9ba0a1f03720 100644..100755
--- a/sd/source/ui/inc/PaneChildWindows.hxx
+++ b/sd/source/ui/inc/PaneChildWindows.hxx
@@ -29,6 +29,7 @@
 #define SD_PANE_CHILD_WINDOWS_HXX
 
 #include <sfx2/childwin.hxx>
+#include <sfx2/taskpane.hxx>
 
 namespace sd {
 
@@ -41,8 +42,8 @@ public:
         USHORT nId,
         SfxBindings* pBindings,
         SfxChildWinInfo* pInfo,
-        const ResId& rResId,
-        const ::rtl::OUString& rsTitle,
+        const USHORT nDockWinTitleResId,
+        const USHORT nTitleBarResId,
         SfxChildAlignment eAlignment);
     virtual ~PaneChildWindow (void);
 };
@@ -74,16 +75,24 @@ public:
 
 
 
-class RightPaneChildWindow
-    : public PaneChildWindow
+//======================================================================================================================
+//= ToolPanelChildWindow
+//======================================================================================================================
+class ToolPanelChildWindow  :public PaneChildWindow
+                            ,public ::sfx2::ITaskPaneToolPanelAccess
 {
 public:
-    RightPaneChildWindow (::Window*, USHORT, SfxBindings*, SfxChildWinInfo*);
-
-    SFX_DECL_CHILDWINDOW(RightPaneChildWindow);
-};
+    ToolPanelChildWindow(
+        ::Window* i_pParentWindow,
+        USHORT i_nId,
+        SfxBindings* i_pBindings,
+        SfxChildWinInfo* i_pChildWindowInfo );
 
+    SFX_DECL_CHILDWINDOW( ToolPanelChildWindow );
 
+    // ::sfx2::ITaskPaneToolPanelAccess
+    virtual void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL );
+};
 
 
 } // end of namespace ::sd
diff --git a/sd/source/ui/inc/PaneDockingWindow.hrc b/sd/source/ui/inc/PaneDockingWindow.hrc
index e8e4a1fba597..eb7c23c075ec 100644..100755
--- a/sd/source/ui/inc/PaneDockingWindow.hrc
+++ b/sd/source/ui/inc/PaneDockingWindow.hrc
@@ -25,6 +25,6 @@
  *
  ************************************************************************/
 
-#define FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW   792
-#define FLT_LEFT_PANE_DRAW_DOCKING_WINDOW   793
-#define FLT_RIGHT_PANE_DOCKING_WINDOW  794
+#define FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW    792
+#define FLT_LEFT_PANE_DRAW_DOCKING_WINDOW       793
+#define FLT_TOOL_PANEL_DOCKING_WINDOW           794
diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx
index 03e6cf96c0f0..1874df10dd53 100644..100755
--- a/sd/source/ui/inc/PaneDockingWindow.hxx
+++ b/sd/source/ui/inc/PaneDockingWindow.hxx
@@ -28,7 +28,7 @@
 #ifndef SD_PANE_DOCKING_WINDOW_HXX
 #define SD_PANE_DOCKING_WINDOW_HXX
 
-#include <sfx2/dockwin.hxx>
+#include <sfx2/titledockwin.hxx>
 #include <sfx2/viewfrm.hxx>
 
 #include <boost/scoped_ptr.hpp>
@@ -38,15 +38,10 @@ class ToolBox;
 
 namespace sd {
 
-class PaneDockingWindow
-    : public SfxDockingWindow
+    class PaneDockingWindow : public ::sfx2::TitledDockingWindow
 {
 public:
-    /** Create a new docking window that will be displayed in the specified
-        pane.
-        The constructor will determine the ViewShellBase via the given
-        bindings and tell its PaneManager about the new window.  It will ask
-        the PaneManager for a window title.
+    /** Create a new docking window.
         @param pBindings
             Used, among others, to determine the ViewShellBase and
             PaneManager that manage the new docking window.
@@ -57,89 +52,19 @@ public:
             The parent window of the new docking window.
         @param rResId
             The resource is used to determine initial size and attributes.
-        @param ePane
-            The pane in which to show the docking window.
+        @param rsTitle
+            the initial title
     */
     PaneDockingWindow (
         SfxBindings *pBindings,
         SfxChildWindow *pChildWindow,
         ::Window* pParent,
         const ResId& rResId,
-        const ::rtl::OUString& rsPaneURL,
         const ::rtl::OUString& rsTitle);
 
     virtual ~PaneDockingWindow (void);
 
-    virtual void Paint (const Rectangle& rRectangle);
-    virtual void Resize (void);
-
-    virtual long Notify( NotifyEvent& rNEvt );
     virtual void StateChanged( StateChangedType nType );
-    virtual void DataChanged( const DataChangedEvent& rDCEvt );
-
-    /** Initializing the title tool box either creates a new title tool box
-        or clears all items from an existing one.  A closer is added as only
-        item.
-    */
-    void InitializeTitleToolBox (void);
-
-    /** Add a top down menu to the title bar or rather the top-level menu
-        entry.  The given callback is called when the menu is clicked and it
-        is the task of the callback to show the menu.
-        @return
-            The id of the new menu is returned.  It can be compared by the
-            callback to the value of GetCurItemId() when called at the given
-            tool box.
-    */
-    USHORT AddMenu (const String& rsMenuName, ULONG nHelpId, const Link& rCallback);
-
-    /** Set the title of the docking window to the given string.  Use this
-        method when the title is not yet known at the time of construction
-        or can not be passed to the constructor.
-    */
-    void SetTitle (const String& rsTitle);
-
-    ::Window* GetContentWindow (void);
-
-    ::boost::shared_ptr<ToolBox> GetTitleToolBox (void) const;
-
-private:
-    /** The pane which is represented by the docking window.
-    */
-    ::rtl::OUString msPaneURL;
-
-    /** Title that is shown at the top of the docking window.
-    */
-    ::rtl::OUString msTitle;
-
-    /** The tool box that is displayed in the window title area contains
-        menus and the closer button.
-    */
-    ::boost::shared_ptr<ToolBox> mpTitleToolBox;
-
-    /** 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 maBorder;
-
-    sal_uInt16 mnChildWindowId;
-
-    ::boost::scoped_ptr< ::Window> mpContentWindow;
-
-    /** Remember that a layout is pending, i.e. Resize() has been called
-        since the last Paint().
-    */
-    bool mbIsLayoutPending;
-
-    DECL_LINK(ToolboxSelectHandler, ToolBox*);
-
-    /** This does the actual placing and sizing of the title bar and the
-        content window after the size of the docking window has changed.
-        This method is called from withing the Paint() method when since its
-        last invocation the size of the docking window has changed.
-    */
-    void Layout (void);
 };
 
 } // end of namespace ::sd
diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx
index c34d2ba632d8..de410c2565bf 100644..100755
--- a/sd/source/ui/inc/PaneShells.hxx
+++ b/sd/source/ui/inc/PaneShells.hxx
@@ -75,15 +75,14 @@ public:
 /** Shell that displays the right pane for both Impress and Draw.  The shell
     does not do anything else and has especially no slots.
 */
-class RightPaneShell
-    : public SfxShell
+class ToolPanelPaneShell : public SfxShell
 {
 public:
     TYPEINFO();
-    SFX_DECL_INTERFACE(SD_IF_SDRIGHTPANESHELL)
+    SFX_DECL_INTERFACE( SD_IF_SDTOOLPANELPANESHELL )
 
-    RightPaneShell (void);
-    virtual ~RightPaneShell (void);
+    ToolPanelPaneShell();
+    virtual ~ToolPanelPaneShell();
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/inc/ToolPanelChildWindow.hrc b/sd/source/ui/inc/ToolPanelChildWindow.hrc
deleted file mode 100644
index 61dca11d21cc..000000000000
--- a/sd/source/ui/inc/ToolPanelChildWindow.hrc
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#define FLT_WIN_TOOLPANEL 788
-
-#define TOOLPANEL 1
diff --git a/sd/source/ui/inc/ToolPanelChildWindow.hxx b/sd/source/ui/inc/ToolPanelChildWindow.hxx
deleted file mode 100644
index 721c9baee3ac..000000000000
--- a/sd/source/ui/inc/ToolPanelChildWindow.hxx
+++ /dev/null
@@ -1,55 +0,0 @@
-/*************************************************************************
- *
- * 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_TOOL_PANEL_CHILD_WINDOW_HXX
-#define SD_TOOL_PANEL_CHILD_WINDOW_HXX
-
-#include <sfx2/childwin.hxx>
-
-#define TOOLPANEL_CHILD_WINDOW() (                                      \
-    static_cast< ::sd::toolpanel::ToolPanelChildWindow*>(               \
-        SfxViewFrame::Current()->GetChildWindow(                        \
-            ::sd::toolpanel::ToolPanelChildWindow::GetChildWindowId()   \
-            )->GetWindow()))
-
-
-namespace sd { namespace toolpanel {
-
-class ToolPanelChildWindow
-    : public SfxChildWindow
-{
-public:
-    ToolPanelChildWindow (::Window*, USHORT, SfxBindings*, SfxChildWinInfo*);
-    virtual ~ToolPanelChildWindow (void);
-
-    SFX_DECL_CHILDWINDOW (ToolPanelChildWindow);
-};
-
-
-} } // end of namespaces ::sd::toolpanel
-
-#endif
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 64bc5cbc02b7..64bc5cbc02b7 100644..100755
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index a25839b3e637..a25839b3e637 100644..100755
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx
index 4f35813a7205..a607542f2df0 100644..100755
--- a/sd/source/ui/inc/framework/PresentationFactory.hxx
+++ b/sd/source/ui/inc/framework/PresentationFactory.hxx
@@ -82,7 +82,7 @@ public:
         SAL_CALL createResource (
             const css::uno::Reference<
                 css::drawing::framework::XResourceId>& rxViewId)
-        throw(css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException);
 
     virtual void SAL_CALL releaseResource (
         const css::uno::Reference<css::drawing::framework::XResource>& xView)
diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
index 96846e5c08d7..12483f462d5e 100644..100755
--- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx
+++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
@@ -35,17 +35,17 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <osl/mutex.hxx>
 #include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/implbase1.hxx>
 
 #include <boost/shared_ptr.hpp>
 
 namespace {
 
-typedef ::cppu::WeakComponentImplHelper4 <
-      ::com::sun::star::drawing::framework::XView,
-      ::com::sun::star::lang::XUnoTunnel,
-      ::com::sun::star::awt::XWindowListener,
-      ::com::sun::star::drawing::framework::XRelocatableResource
-    > ViewShellWrapperInterfaceBase;
+typedef ::cppu::WeakComponentImplHelper4    <   ::com::sun::star::lang::XUnoTunnel
+                                            ,   ::com::sun::star::awt::XWindowListener
+                                            ,   ::com::sun::star::drawing::framework::XRelocatableResource
+                                            ,   ::com::sun::star::drawing::framework::XView
+                                            >   ViewShellWrapperInterfaceBase;
 
 } // end of anonymous namespace.
 
@@ -57,9 +57,8 @@ namespace sd { namespace framework {
     Most importantly it provides a tunnel to the ViewShell implementation.
     Then it forwards size changes of the pane window to the view shell.
 */
-class ViewShellWrapper
-    : private sd::MutexOwner,
-      public ViewShellWrapperInterfaceBase
+class ViewShellWrapper  :private sd::MutexOwner
+                        ,public ViewShellWrapperInterfaceBase
 {
 public:
     /** Create a new ViewShellWrapper object that wraps the given ViewShell
@@ -90,23 +89,11 @@ public:
     */
     ::boost::shared_ptr<ViewShell> GetViewShell (void);
 
-    /** Returns whether there is exactly one reference to the called
-        ViewShellWrapper object (the number of references to the wrapped
-        ViewShell object is not taken into account).  This method is
-        typically used by the owner of a ViewShellWrapper object to verify
-        that, at the end of the ViewShellWrapper object's lifetime, the
-        owner holds the last reference and by releasing it will destroy the
-        object.
-    */
-    bool IsUnique (void);
-
-
     // XUnoTunnel
 
     virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId)
         throw (com::sun::star::uno::RuntimeException);
 
-
     // XResource
 
     virtual ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>
@@ -151,10 +138,9 @@ public:
         throw (com::sun::star::uno::RuntimeException);
 
 private:
-    ::boost::shared_ptr<ViewShell> mpViewShell;
-    const ::com::sun::star::uno::Reference<
-        com::sun::star::drawing::framework::XResourceId> mxViewId;
-    ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow> mxWindow;
+    ::boost::shared_ptr< ViewShell >                                                            mpViewShell;
+    const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId >   mxViewId;
+    ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow >                             mxWindow;
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index abf4d054e2ad..1602dc698f3f 100755
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -155,12 +155,6 @@
 #define BMP_GROUP_H                         RID_SD_START+226
 #define BMP_WAIT_ICON_H                     RID_SD_START+229
 
-#define BMP_CLOSE_DOC                       RID_SD_START+325
-#define BMP_CLOSE_DOC_H                     RID_SD_START+326
-#define BMP_TRIANGLE_RIGHT                  RID_SD_START+327
-#define BMP_TRIANGLE_RIGHT_H                RID_SD_START+328
-#define BMP_TRIANGLE_DOWN                   RID_SD_START+329
-#define BMP_TRIANGLE_DOWN_H                 RID_SD_START+330
 #define BMP_FADE_EFFECT_INDICATOR           RID_SD_START+331
 #define BMP_FADE_EFFECT_INDICATOR_H         RID_SD_START+332
 
diff --git a/sd/source/ui/inc/taskpane/ControlContainer.hxx b/sd/source/ui/inc/taskpane/ControlContainer.hxx
index b4087da5b51b..9c1652f05887 100644..100755
--- a/sd/source/ui/inc/taskpane/ControlContainer.hxx
+++ b/sd/source/ui/inc/taskpane/ControlContainer.hxx
@@ -28,7 +28,6 @@
 #ifndef SD_TOOLPANEL_CONTROL_CONTAINER_HXX
 #define SD_TOOLPANEL_CONTROL_CONTAINER_HXX
 
-#include "TitleBar.hxx"
 #include <osl/mutex.hxx>
 
 #include <vector>
diff --git a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx
index 7a85120e1ad6..5aad9fa29f78 100644..100755
--- a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx
+++ b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx
@@ -48,7 +48,7 @@ public:
 
 
 /** This interface has to be implemented by windows that want to be
-    layouted by a ToolPanel, SubToolPanel, or ScrollablePanel object.
+    layouted by a SubToolPanel or ScrollablePanel object.
 */
 class ILayoutableWindow
 {
diff --git a/sd/source/ui/inc/taskpane/PanelId.hxx b/sd/source/ui/inc/taskpane/PanelId.hxx
new file mode 100644
index 000000000000..565745f97140
--- /dev/null
+++ b/sd/source/ui/inc/taskpane/PanelId.hxx
@@ -0,0 +1,62 @@
+/*************************************************************************
+ * 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_UI_TASKPANE_PANELID_HXX
+#define SD_UI_TASKPANE_PANELID_HXX
+
+namespace rtl
+{
+    class OUString;
+}
+
+//......................................................................................................................
+namespace sd { namespace toolpanel
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= PanelId
+    //==================================================================================================================
+    /** List of top level panels that can be shown in the task pane.
+    */
+    enum PanelId
+    {
+        PID_MASTER_PAGES        = 0,
+        PID_LAYOUT              = 1,
+        PID_TABLE_DESIGN        = 2,
+        PID_CUSTOM_ANIMATION    = 3,
+        PID_SLIDE_TRANSITION    = 4,
+
+        PID_UNKNOWN             = 5
+    };
+
+    PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL );
+
+//......................................................................................................................
+} } // namespace sd::toolpanel
+//......................................................................................................................
+
+#endif // SD_UI_TASKPANE_PANELID_HXX
diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx
index 019e06d9dd44..b3620255f913 100644..100755
--- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx
+++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx
@@ -60,6 +60,10 @@ public:
         parent.  This will usually be a child window.
     */
     ScrollPanel (TreeNode* pParent);
+    /** Create a new scroll panel which itself is the root of a TreeNode hierarchy
+        parent.  This will usually be a child window.
+    */
+    ScrollPanel (::Window& i_rParentWindow);
     virtual ~ScrollPanel (void);
 
     /** Add a control to the sub panel.  An title bar is added above the
@@ -171,6 +175,10 @@ private:
     */
     sal_Int32 LayoutChildren (void);
 
+    /** ctor-impl
+    */
+    void    Construct();
+
     Size SetupScrollBars (const Size& rRequiresSize);
     sal_Int32 SetupVerticalScrollBar (bool bShow, sal_Int32 nRange);
     sal_Int32 SetupHorizontalScrollBar (bool bShow, sal_Int32 nRange);
diff --git a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx
index 7d5c4c996bc1..933a25f4067d 100644..100755
--- a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx
+++ b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx
@@ -54,7 +54,6 @@ class Window;
 
 namespace sd { namespace toolpanel {
 
-class ControlFactory;
 class TreeNode;
 
 /** This panel demonstrates how to create a panel for the task pane.
@@ -71,8 +70,6 @@ public:
     virtual void Paint (const Rectangle& rBoundingBox);
     virtual void Resize (void);
 
-    static std::auto_ptr<ControlFactory> CreateControlFactory (const SdDrawDocument* pDocument);
-
     static SlideSorterCacheDisplay* Instance (const SdDrawDocument* pDocument);
 
     void SetPageCount (sal_Int32 nPageCount);
diff --git a/sd/source/ui/inc/taskpane/SubToolPanel.hxx b/sd/source/ui/inc/taskpane/SubToolPanel.hxx
index 9524cdddf748..94a73bc70996 100644..100755
--- a/sd/source/ui/inc/taskpane/SubToolPanel.hxx
+++ b/sd/source/ui/inc/taskpane/SubToolPanel.hxx
@@ -40,8 +40,6 @@ class Window;
 
 namespace sd { namespace toolpanel {
 
-class ToolPanel;
-
 /** The sub tool panel is in function similar to the tool panel.  It
     differes in two points.  First, it is a control that can be used
     as element in a tool panel and thus is actually a nested tool
@@ -67,6 +65,7 @@ public:
         parent.  This will usually be a child window.
     */
     SubToolPanel (TreeNode* pParent);
+    SubToolPanel (Window& i_rParentWindow);
     virtual ~SubToolPanel (void);
 
     /** Add a control to the sub panel.
diff --git a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx
index 483488b665ac..c86c496a770d 100644..100755
--- a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx
+++ b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx
@@ -58,37 +58,34 @@ public:
     ControlFactory (void);
     virtual ~ControlFactory (void);
 
-    /** Derived classes should overload InternalCreateControl(), not this
-        method.
+    /** creates a tree node which acts as root of an own tree
+
+        Derived classes should overload InternalCreateControl.
     */
-    ::std::auto_ptr<TreeNode> CreateControl (TreeNode* pTreeNode);
+    ::std::auto_ptr<TreeNode> CreateControl( ::Window& i_rParent );
 
 protected:
-    /** This is the internal hook for derived classes to overload in order
-        to provide a new control instance.
-    */
-    virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode) = 0;
+    virtual TreeNode* InternalCreateControl( ::Window& i_rParent ) = 0;
 };
 
 
 
-/** A simple helper class that realizes a ControlFactory that provides its
-    newly created controls with one additional argument (additional to the
-    parent TreeNode).
+/** A simple helper class that realizes a ControlFactory that is able to create root controls, providing
+    the to-be-created control with an additional parameter.
 */
 template<class ControlType, class ArgumentType>
-class ControlFactoryWithArgs1
+class RootControlFactoryWithArg
     : public ControlFactory
 {
 public:
-    ControlFactoryWithArgs1 (ArgumentType& rArgument)
+    RootControlFactoryWithArg (ArgumentType& rArgument)
         : mrArgument(rArgument)
     {}
 
 protected:
-    virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode)
+    virtual TreeNode* InternalCreateControl( ::Window& i_rParent )
     {
-        return new ControlType(pTreeNode, mrArgument);
+        return new ControlType( i_rParent, mrArgument );
     }
 
 private:
diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
index 250e73124854..0dbec3b292c3 100644..100755
--- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
+++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
@@ -53,9 +53,9 @@ enum TreeNodeStateChangeEventId {
 
 
 /** Base class for all members of the object hierarchy that makes up the
-    tool panel.  There are usually at least three levels.  At the top level
-    is the ToolPanel with one instance: the root of the tree.  At the
-    middle level there are SubToolPanels and Window/Control objects.  At the
+    tool panel. In the task pane, there are multiple hierarchies of such nodes,
+    with every panel having an own tree. The pane node is the root of the tree, below
+    that there are SubToolPanels and Window/Control objects. At the
     lowest level there are only Window or Control objects.
 
     This class provides the means of communication between objects on
@@ -94,14 +94,6 @@ public:
     */
     virtual sal_Int32 GetMinimumWidth (void);
 
-    /** Give each node access to the object bar manager of the tool panel.
-
-        At least the root node has to overwrite this method since the
-        default implementation simply returns the object bar manager of the
-        parent.
-    */
-    virtual ObjectBarManager* GetObjectBarManager (void);
-
     /** The default implementaion always returns <FALSE/>
     */
     virtual bool IsResizable (void);
@@ -151,7 +143,7 @@ public:
     ControlContainer& GetControlContainer (void);
 
     /** Give each node access to a shell manage.  This usually is the shell
-        manager of the TaskPaneViewShell.
+        manager of the ToolPanelViewShell.
 
         At least the root node has to overwrite this method since the
         default implementation simply returns the shell manager of its
diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx
index b10adcef07e0..995117516529 100644..100755
--- a/sd/source/ui/inc/taskpane/TitleBar.hxx
+++ b/sd/source/ui/inc/taskpane/TitleBar.hxx
@@ -41,22 +41,13 @@ class VirtualDevice;
 namespace sd { namespace toolpanel {
 
 
-/** The title bar above a control in a tool panel or sub tool panel.
-    The way the title bar is displayed depends on the TitleBarType
-    given to the constructor.  TBT_CONTROL_TITLE and
-    TBT_SUB_CONTROL_HEADLINE both show a expansion indicator in front of
-    the title string that shows whether the associated control is
-    visible (expanded) or not.
-    A title bar with TBT_WINDOW_TITLE is typically used only once as the
-    title bar of the whole task pane.
-
-    <p>The title bar shows three kinds of indicators: 1) Expansion is
+/** The title bar above a control in a sub tool panel.
+
+    <p>The title bar shows two kinds of indicators: 1) Expansion is
     displayed by two sets of two bitmaps, a triangle pointing to the right
     resp. a minus in a square indicates that the control is collapsed, a
     triangle pointing down resp. a plus in a square stands for an expanded
-    control. 2) Keyboard focus is indicated by a dotted rectangle. 3) An
-    underlined title string is a mouse over indicator for a
-    selectable/expandable control.</p>
+    control. 2) Keyboard focus is indicated by a dotted rectangle.
 */
 class TitleBar
     : public ::Window,
@@ -64,10 +55,8 @@ class TitleBar
 {
 public:
     enum TitleBarType {
-        TBT_WINDOW_TITLE,
-        TBT_CONTROL_TITLE,
         TBT_SUB_CONTROL_HEADLINE
-        };
+    };
 
     /** Create a new title bar whose content, the given title string,
         will be formatted according to the given type.
@@ -90,8 +79,8 @@ public:
     virtual bool Expand (bool bFlag = true);
     virtual bool IsExpanded (void) const;
     virtual void SetEnabledState(bool bFlag);
-
-    void SetFocus (bool bFlag);
+    virtual void GetFocus (void);
+    virtual void LoseFocus (void);
 
     virtual void MouseMove(const MouseEvent& rEvent);
     /** Empty implementation prevents forwarding to docking window.
@@ -115,17 +104,10 @@ private:
     String msTitle;
     bool mbExpanded;
     bool mbFocused;
-    bool mbMouseOver;
     // Size of the bounding box that encloses the title string.
-    Size maStringBox;
     ::std::auto_ptr<VirtualDevice> mpDevice;
     bool mbIsExpandable;
 
-    /** Set the mbMouseOver flag to the given value and paint the
-        title bar accordingly.
-    */
-    void SetMouseOver (bool bFlag);
-
     /** Return whether this TitleBar object has an expansion indicator
         bitmap.  It is safe to call GetExpansionIndicator() when this method
         returns <FALSE/> but unnecessary.
@@ -159,8 +141,6 @@ private:
         const Rectangle& rTextBox,
         int nTitleBarWidth);
 
-    void PaintWindowTitleBar (void);
-    void PaintPanelControlTitle (void);
     void PaintSubPanelHeadLineBar (void);
 
     void PaintBackground (const Rectangle& rTextBox);
@@ -168,12 +148,6 @@ private:
     /// Paint a focus indicator that encloses the given rectangle.
     void PaintFocusIndicator (const Rectangle& rIndicatorBox);
 
-    /** Paint a mouse over indicator.  If the mouse is over the title
-        bar than the text enclosed by the given rectangle is
-        underlined.
-    */
-    void PaintMouseOverIndicator (const Rectangle& rIndicatorBox);
-
     Rectangle PaintExpansionIndicator (const Rectangle& rTextBox);
 
     void PaintText (const Rectangle& rTextBox);
diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx
index a5a319ca5219..0aa63344fcd5 100644..100755
--- a/sd/source/ui/inc/taskpane/TitledControl.hxx
+++ b/sd/source/ui/inc/taskpane/TitledControl.hxx
@@ -45,7 +45,6 @@ class Window;
 namespace sd { namespace toolpanel {
 
 class ControlContainer;
-class ControlFactory;
 
 /** This wrapper adds a title bar to a control.  Both title bar and
     control are child windows.
@@ -80,13 +79,6 @@ public:
         const ClickHandler& rClickHandler,
         TitleBar::TitleBarType eType);
 
-    TitledControl (
-        TreeNode* pParent,
-        ::std::auto_ptr<ControlFactory> pControlFactory,
-        const String& rTitle,
-        const ClickHandler& rClickHandler,
-        TitleBar::TitleBarType eType);
-
     virtual ~TitledControl (void);
 
 
@@ -98,7 +90,6 @@ public:
 
     virtual void Resize (void);
     virtual void GetFocus (void);
-    virtual void LoseFocus (void);
     virtual void KeyInput (const KeyEvent& rEvent);
 
     //    void Select (bool bExpansionState);
@@ -108,8 +99,8 @@ public:
         the control has not yet been created and the given flag is <TRUE/>
         then the control is created.
     */
-    TreeNode* GetControl (bool bCreate=true);
-    const TreeNode* GetConstControl (bool bCreate=true) const;
+    TreeNode* GetControl (void);
+    const TreeNode* GetConstControl () const;
 
     const String& GetTitle (void) const;
 
@@ -156,15 +147,8 @@ private:
     String msTitle;
     bool mbVisible;
     void* mpUserData;
-    ::std::auto_ptr<ControlFactory> mpControlFactory;
     ::std::auto_ptr<ClickHandler> mpClickHandler;
 
-    /** Remember whether to toggle (true) the expansion state when the title
-        bar is clicked on.  When set to false then the control is always
-        expanded.
-    */
-    bool mbExpansionModeIsToggle;
-
     /// Do not use! Assignment operator is not supported.
     const TitledControl& operator= (
         const TitledControl& aDescriptor);
diff --git a/sd/source/ui/inc/taskpane/ToolPanel.hxx b/sd/source/ui/inc/taskpane/ToolPanel.hxx
deleted file mode 100644
index f2c573a21c06..000000000000
--- a/sd/source/ui/inc/taskpane/ToolPanel.hxx
+++ /dev/null
@@ -1,125 +0,0 @@
-/*************************************************************************
- *
- * 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_TOOL_PANEL_HXX
-#define SD_TOOL_PANEL_HXX
-
-#include "taskpane/TaskPaneTreeNode.hxx"
-#include "taskpane/TitledControl.hxx"
-#include <vcl/ctrl.hxx>
-
-#include <vector>
-#include <memory>
-
-class Window;
-
-namespace sd { namespace toolpanel {
-
-class TaskPaneViewShell;
-class ControlFactory;
-
-/** This control is basically a layout manager for the vertical
-    stacking of controls.  At any one time there is exactly one of
-    them visible.  For the others only their title bar is shown.
-
-    <p>Each control is independant of both other controls and the tool
-    panel itself.  To be usable by the tool panel they only have to be
-    derived from the vcl Window class.</p>
-*/
-class ToolPanel
-    : public Control,
-      public TreeNode
-{
-public:
-    /** Create a new tool panel with the given window as its parent.
-        This will usually be a child window.
-    */
-    ToolPanel (
-        ::Window* pParentWindow,
-        TaskPaneViewShell& rViewShell);
-
-    virtual ~ToolPanel (void);
-
-    /** Append the given control to the end of the list of controls that are
-        managed by the tool panel.
-        @param pControlFactory
-            Factory that provides the control on demand, typically when it
-            is expanded the first time.
-        @param rTitle
-            The string that is displayed in the title bar above the control.
-        @param nHelpId
-            The help id is set at the title bar not the actual control.
-        @param rClickHandler
-            The click handler typically expands a control when the user has
-            clicked on its title.
-    */
-    sal_uInt32 AddControl (
-        ::std::auto_ptr<ControlFactory> pControlFactory,
-        const String& rTitle,
-        ULONG nHelpId,
-        const TitledControl::ClickHandler& rClickHandler);
-
-    virtual void Resize (void);
-
-    virtual Size GetPreferredSize (void);
-    virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight);
-    virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth);
-    virtual bool IsResizable (void);
-    virtual ::Window* GetWindow (void);
-
-    virtual void RequestResize (void);
-
-    virtual TaskPaneShellManager* GetShellManager (void);
-
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible> CreateAccessibleObject (
-            const ::com::sun::star::uno::Reference<
-            ::com::sun::star::accessibility::XAccessible>& rxParent);
-
-    using Window::GetWindow;
-
-protected:
-    /** Initiate a rearrangement of the controls.
-    */
-    void ListHasChanged (void);
-
-private:
-    TaskPaneViewShell& mrViewShell;
-
-    /// Guard against recursive calls or Rearrange().
-    bool mbRearrangeActive;
-
-    /** Calculate position, size, and visibility of the controls.
-        Call this method after the list of controls has changed.
-    */
-    void Rearrange (void);
-};
-
-
-
-} } // end of namespace ::sd::toolpanel
-
-#endif
diff --git a/sd/source/ui/inc/TaskPaneViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
index d9f432029dc2..5bd0cd877803 100644
--- a/sd/source/ui/inc/TaskPaneViewShell.hxx
+++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
@@ -2,10 +2,13 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
+ * $RCSfile: ToolPanelViewShell.hxx,v $
+ * $Revision: 1.12 $
+ *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -25,30 +28,36 @@
  *
  ************************************************************************/
 
-#ifndef SD_TOOLPANEL_TASK_PANE_VIEW_SHELL_HXX
-#define SD_TOOLPANEL_TASK_PANE_VIEW_SHELL_HXX
+#ifndef SD_TOOL_PANEL_VIEW_SHELL_HXX
+#define SD_TOOL_PANEL_VIEW_SHELL_HXX
 
 #include "ViewShell.hxx"
 #include "glob.hxx"
+#include "taskpane/PanelId.hxx"
 #include "framework/FrameworkHelper.hxx"
 #include <vcl/button.hxx>
 #include <sfx2/shell.hxx>
 #include <sfx2/viewfac.hxx>
 #include <sfx2/dockwin.hxx>
 
-#include <memory>
 #include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
 
 class PopupMenu;
 
-namespace sd {  namespace toolpanel {
+namespace com { namespace sun { namespace star { namespace ui {
+    class XUIElement;
+} } } }
+
+namespace sd {
+class PaneDockingWindow;
 
+namespace toolpanel {
 class TaskPaneShellManager;
 class TitleToolBox;
 class TitleBar;
 class TitledControl;
-class ToolPanel;
-
+class ToolPanelViewShell_Impl;
 /** The tool panel is a view shell for some very specific reasons:
     - It fits better into the concept of panes being docking windows whose
     content, a view shell, can be exchanged on runtime.
@@ -58,34 +67,19 @@ class ToolPanel;
     If interpreted as object bars this can be handled by the
     ObjectBarManager of the ViewShell.
 */
-class TaskPaneViewShell
+class ToolPanelViewShell
     : public ViewShell
 {
 public:
     TYPEINFO();
-    SFX_DECL_INTERFACE(SD_IF_SDTASKPANEVIEWSHELL)
+    SFX_DECL_INTERFACE(SD_IF_SDTOOLPANELSHELL)
 
-    /** List of top level panels that can be shown in the task pane.
-    */
-    enum PanelId
-    {
-        PID__START = 0,
-        PID_UNKNOWN = PID__START,
-        PID_MASTER_PAGES,
-        PID_LAYOUT,
-        PID_TABLE_DESIGN,
-        PID_ANIMATION_SCHEMES,
-        PID_CUSTOM_ANIMATION,
-        PID_SLIDE_TRANSITION,
-        PID__END = PID_SLIDE_TRANSITION
-    };
-
-    TaskPaneViewShell (
+    ToolPanelViewShell (
         SfxViewFrame* pFrame,
         ViewShellBase& rViewShellBase,
         ::Window* pParentWindow,
         FrameView* pFrameView);
-    virtual ~TaskPaneViewShell (void);
+    virtual ~ToolPanelViewShell (void);
 
     /** Register the SFX interfaces so that (some of) the controls can be
         pushed as SFX shells on the shell stack and process slot calls and
@@ -108,37 +102,22 @@ public:
 
     TaskPaneShellManager& GetSubShellManager (void) const;
 
-    /** Called when a mouse button has been pressed but not yet
-        released, this handler is used to show the popup menu of the
-        title bar.
+    /** deactivates the given panel, bypassing the configuration controller. Only valid for tool panels which are
+        not under the drawing framework's control.
     */
-    DECL_LINK(ToolboxClickHandler, ToolBox*);
-    DECL_LINK(MenuSelectHandler, Menu*);
+    void    ActivatePanel( const ::rtl::OUString& i_rPanelResourceURL );
 
-    /** Make the specified panel visible and expand it.
-        @param nId
-            The id of the panel that is to be made visible.
+    /** deactivates the given panel, bypassing the configuration controller
     */
-    void ShowPanel (const PanelId nId);
+    void    DeactivatePanel( const ::rtl::OUString& i_rPanelResourceURL );
 
-    /** Hide and collapse the specified panel.
-        @param nId
-            The id of the panel that is to hide.
-    */
-    void HidePanel (const PanelId nId);
-
-    /** Expand the specified panel.  Its visibility state is not modified.
-        @param nId
-            The id of the panel that is to expand.
-    */
-    void ExpandPanel (const PanelId nId);
-
-    /** Collapse the specified panel.   Its visibility state is not
-        modified.
-        @param nId
-            The id of the panel that is to collapse.
+    /** Return a pointer to the docking window that is the parent or a
+        predecessor of the content window.
+        @return
+            When the view shell is not placed in a docking window, e.g. when
+            shown in the center pane, then <NULL?> is returned.
     */
-    void CollapsePanel (const PanelId nId);
+    DockingWindow* GetDockingWindow (void);
 
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible>
@@ -150,13 +129,19 @@ public:
     */
     virtual bool RelocateToParentWindow (::Window* pParentWindow);
 
-private:
-    class Implementation;
-    ::std::auto_ptr<Implementation> mpImpl;
+    /// returns <TRUE/> if and only if the given window is the panel anchor window of our ToolPanelDeck
+    bool    IsPanelAnchorWindow( const ::Window& i_rWindow ) const;
 
-    ::std::auto_ptr<ToolPanel> mpTaskPane;
+    /** creates an XUIElement for the given standard panel
+    */
+    ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >
+            CreatePanelUIElement(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocFrame,
+                const ::rtl::OUString& i_rPanelResourceURL
+            );
 
-    bool mbIsInitialized;
+private:
+    ::boost::scoped_ptr< ToolPanelViewShell_Impl >   mpImpl;
 
     ::boost::shared_ptr<TaskPaneShellManager> mpSubShellManager;
 
@@ -165,10 +150,9 @@ private:
     */
     USHORT mnMenuId;
 
-    /** Create a popup menu.  it contains three sections, one for
+    /** Create a popup menu.  it contains two sections, one for
         docking or un-docking the tool panel, one for toggling the
-        visibility state of the tool panel items, and one for bringing
-        up a customization dialog.
+        visibility state of the tool panel items.
         @param bIsDocking
             According to this flag one of the lock/unlock entries is
             made disabled.
@@ -176,22 +160,6 @@ private:
     ::std::auto_ptr<PopupMenu> CreatePopupMenu (bool bIsDocking);
 
 
-    /** Make sure that as long as there is at least one visible
-        control there is exactly one expanded control.
-        If the currently expanded control is being hidden then try to
-        expand the control after the hidden one or if that does not
-        exist expand the one before.
-    */
-    void EnsureExpandedControl (TitledControl* pHiddenControl);
-
-    /** Return a pointer to the docking window that is the parent or a
-        predecessor of the content window.
-        @return
-            When the view shell is not placed in a docking window, e.g. when
-            shown in the center pane, then <NULL?> is returned.
-    */
-    DockingWindow* GetDockingWindow (void);
-
     /** Initialize the task pane view shell if that has not yet been done
         before.  If mbIsInitialized is already set to <TRUE/> then this
         method returns immediately.
@@ -202,25 +170,6 @@ private:
 
 
 
-/** This functor makes visible a panel in the task pane.  It can be used
-    with the FrameworkHelper to make a panel visible after an asynchonous
-    update of the configuration, e.g. after switching to another view.
-*/
-class PanelActivation
-{
-public:
-    /** Create a new object that, when its operator() method is called, will
-        make the specified panel visible in the task pane that belongs to
-        the application window specified by the given ViewShellBase.
-    */
-    PanelActivation (ViewShellBase& rBase, TaskPaneViewShell::PanelId nPanelId);
-    void operator() (bool);
-private:
-    ViewShellBase& mrBase;
-    TaskPaneViewShell::PanelId mnPanelId;
-};
-
-
 } } // end of namespace ::sd::toolpanel
 
 #endif
diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx
index f0032b27d1a0..2841891f31ce 100644..100755
--- a/sd/source/ui/slideshow/PaneHider.cxx
+++ b/sd/source/ui/slideshow/PaneHider.cxx
@@ -42,6 +42,8 @@
 #include <com/sun/star/drawing/framework/XConfiguration.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 
+#include <tools/diagnose_ex.h>
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 using ::sd::framework::FrameworkHelper;
@@ -88,7 +90,7 @@ PaneHider::PaneHider (const ViewShell& rViewShell, SlideshowImpl* pSlideShow)
     }
     catch (RuntimeException&)
     {
-        DBG_ASSERT(false, "caught exception in PaneHider constructor");
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
index 8ed681e3ddfc..dcda73d38dba 100644..100755
--- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
@@ -317,7 +317,7 @@ void FocusManager::SetFocusToToolBox (void)
         {
             PaneDockingWindow* pPaneDockingWindow = dynamic_cast<PaneDockingWindow*>(pDockingWindow);
             if (pPaneDockingWindow != NULL)
-                pPaneDockingWindow->GetTitleToolBox()->GrabFocus();
+                pPaneDockingWindow->GetToolBox().GrabFocus();
         }
     }
 }
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 04a1821cd6d8..94b3b4afe717 100644..100755
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -49,6 +49,7 @@
 #include <com/sun/star/frame/FrameActionEvent.hpp>
 #include <com/sun/star/frame/FrameAction.hpp>
 #include <sfx2/viewfrm.hxx>
+#include <tools/diagnose_ex.h>
 
 
 using namespace ::com::sun::star::accessibility;
@@ -228,8 +229,7 @@ void Listener::ConnectToController (void)
             }
             catch (beans::UnknownPropertyException aEvent)
             {
-                OSL_TRACE ("caught exception in SlideSorterController::SetupListeners: %s",
-                    ::rtl::OUStringToOString(aEvent.Message, RTL_TEXTENCODING_UTF8).getStr());
+                DBG_UNHANDLED_EXCEPTION();
             }
             try
             {
@@ -237,8 +237,7 @@ void Listener::ConnectToController (void)
             }
             catch (beans::UnknownPropertyException aEvent)
             {
-                OSL_TRACE ("caught exception in SlideSorterController::SetupListeners: %s",
-                    ::rtl::OUStringToOString(aEvent.Message, RTL_TEXTENCODING_UTF8).getStr());
+                DBG_UNHANDLED_EXCEPTION();
             }
         }
 
@@ -286,9 +285,7 @@ void Listener::DisconnectFromController (void)
         }
         catch (beans::UnknownPropertyException aEvent)
         {
-            OSL_TRACE ("caught exception in destructor of SlideSorterController: %s",
-                ::rtl::OUStringToOString(aEvent.Message,
-                    RTL_TEXTENCODING_UTF8).getStr());
+            DBG_UNHANDLED_EXCEPTION();
         }
 
         mbListeningToController = false;
@@ -488,9 +485,7 @@ void SAL_CALL Listener::propertyChange (
             }
             catch (beans::UnknownPropertyException aEvent)
             {
-                OSL_TRACE ("caught exception while accessing the page number of a slide: %s",
-                    ::rtl::OUStringToOString(aEvent.Message,
-                        RTL_TEXTENCODING_UTF8).getStr());
+                DBG_UNHANDLED_EXCEPTION();
             }
             catch (lang::DisposedException&)
             {
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 13dee5b84219..85d07f0e74df 100755
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -65,7 +65,6 @@
 #include "ViewShellBase.hxx"
 #include "ViewShellImplementation.hxx"
 #include "sdattr.hxx"
-#include "TaskPaneViewShell.hxx"
 #include "FrameView.hxx"
 #include "zoomlist.hxx"
 #include "sdpage.hxx"
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index be298856c066..b149320cf0f2 100644..100755
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -50,6 +50,8 @@
 #include "sdpage.hxx"
 #include "FrameView.hxx"
 
+#include <tools/diagnose_ex.h>
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
@@ -225,13 +227,9 @@ sal_Int32 SlideSorterModel::GetIndex (const Reference<drawing::XDrawPage>& rxSli
                 return nNumber;
             }
         }
-        catch (beans::UnknownPropertyException&)
-        {
-            OSL_ASSERT(false);
-        }
-        catch (lang::DisposedException&)
+        catch (uno::Exception&)
         {
-            OSL_ASSERT(false);
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
index 8f259e2a8c0f..32098abb523f 100644..100755
--- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
@@ -61,6 +61,7 @@
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/uno/Exception.hpp>
 #include <vcl/svapp.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::sdr::contact;
 using namespace ::sd::slidesorter::model;
@@ -1166,7 +1167,7 @@ BitmapEx PageObjectViewObjectContact::GetPreview (
     }
     catch (const ::com::sun::star::uno::Exception&)
     {
-        OSL_TRACE("PageObjectViewObjectContact::GetPreview: caught exception");
+        DBG_UNHANDLED_EXCEPTION();
     }
 
     return aBitmap;
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 2f35d70b0f0d..cdba12e9887e 100755
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -391,7 +391,7 @@ void TableDesignPane::updateLayout()
                 mxControls[nId]->SetPaintTransparent(TRUE);
                 mxControls[nId]->SetBackground();
             }
-            aValueSetSize = Size( aPaneSize.Width() - 2 * aOffset.X(), nStylesHeight - mxControls[FL_TABLE_STYLES]->GetSizePixel().Height() - mnOrgOffsetY[FL_TABLE_STYLES]  );
+            aValueSetSize = Size( pValueSet->GetSizePixel().Width(), nStylesHeight - mxControls[FL_TABLE_STYLES]->GetSizePixel().Height() - mnOrgOffsetY[FL_TABLE_STYLES]  );
         }
         else
         {
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 2fc995aa45f9..7e0fd41ffb89 100755
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -47,6 +47,7 @@
 #include "controller/SlideSorterController.hxx"
 #include "controller/SlsPageSelector.hxx"
 #include "taskpane/TaskPaneControlFactory.hxx"
+#include "taskpane/ToolPanelViewShell.hxx"
 #include "taskpane/ScrollPanel.hxx"
 #include "tools/SlotStateListener.hxx"
 #include "EventMultiplexer.hxx"
@@ -84,40 +85,32 @@ using ::sd::framework::FrameworkHelper;
 
 namespace sd { namespace toolpanel {
 
-/** This factory class stores references to ViewShellBase and DrawDocShell
-    and passes them to new LayoutMenu objects.
-*/
-class LayoutMenuFactory
+class LayoutMenuRootFactory
     : public ControlFactory
 {
 public:
-    LayoutMenuFactory (ViewShellBase& rBase, DrawDocShell& rDocShell)
-        : mrBase(rBase),
-          mrDocShell(rDocShell)
-    {}
+    LayoutMenuRootFactory (ToolPanelViewShell& i_rPanelViewShell)
+        :mrPanelViewShell(i_rPanelViewShell)
+    {
+    }
 
 protected:
-    virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode)
+    virtual TreeNode* InternalCreateControl( ::Window& i_rParent )
     {
-        ScrollPanel* pScrollPanel = new ScrollPanel (pTreeNode);
+        ScrollPanel* pScrollPanel = new ScrollPanel (i_rParent);
         ::std::auto_ptr<TreeNode> pMenu (
             new LayoutMenu (
                 pScrollPanel,
-                mrDocShell,
-                mrBase,
-                false));
+                mrPanelViewShell));
         pScrollPanel->AddControl(pMenu);
         return pScrollPanel;
     }
 
 private:
-    ViewShellBase& mrBase;
-    DrawDocShell& mrDocShell;
+    ToolPanelViewShell& mrPanelViewShell;
 };
 
 
-
-
 SFX_IMPL_INTERFACE(LayoutMenu, SfxShell,
     SdResId(STR_TASKPANELAYOUTMENU))
 {
@@ -182,22 +175,29 @@ static snewfoil_value_info standard[] =
     {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
 };
 
-LayoutMenu::LayoutMenu (
-    TreeNode* pParent,
-    DrawDocShell& rDocumentShell,
-    ViewShellBase& rViewShellBase,
-    bool bUseOwnScrollBar)
+LayoutMenu::LayoutMenu( TreeNode* pParent, ToolPanelViewShell& i_rPanelViewShell )
     : ValueSet (pParent->GetWindow()),
       TreeNode(pParent),
       DragSourceHelper(this),
       DropTargetHelper(this),
-      mrBase (rViewShellBase),
-      mbUseOwnScrollBar (bUseOwnScrollBar),
+      mrBase( i_rPanelViewShell.GetViewShellBase() ),
+      mpShellManager (&i_rPanelViewShell.GetSubShellManager()),
+      mbUseOwnScrollBar( false ),
       mnPreferredColumnCount(3),
       mxListener(NULL),
       mbSelectionUpdatePending(true),
       mbIsMainViewChangePending(false)
 {
+    implConstruct( *mrBase.GetDocument()->GetDocSh() );
+}
+
+
+void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell )
+{
+    OSL_ENSURE( mrBase.GetDocument()->GetDocSh() == &rDocumentShell,
+        "LayoutMenu::implConstruct: hmm?" );
+    // if this fires, then my assumption that the rDocumentShell parameter to our first ctor is superfluous ...
+
     SetStyle (
         ( GetStyle()  & ~(WB_ITEMBORDER) )
         | WB_TABSTOP
@@ -236,7 +236,6 @@ LayoutMenu::LayoutMenu (
 
 
 
-
 LayoutMenu::~LayoutMenu (void)
 {
     // Tell the shell factory that this object is no longer available.
@@ -256,10 +255,9 @@ LayoutMenu::~LayoutMenu (void)
 
 
 ::std::auto_ptr<ControlFactory> LayoutMenu::CreateControlFactory (
-    ViewShellBase& rBase,
-    DrawDocShell& rDocShell)
+    ToolPanelViewShell& i_rPanelViewShell )
 {
-    return ::std::auto_ptr<ControlFactory>(new LayoutMenuFactory(rBase, rDocShell));
+    return ::std::auto_ptr<ControlFactory>(new LayoutMenuRootFactory(i_rPanelViewShell));
 }
 
 
@@ -591,6 +589,13 @@ void LayoutMenu::InsertPageWithLayout (AutoLayout aLayout)
 
 
 
+TaskPaneShellManager* LayoutMenu::GetShellManager()
+{
+    if ( mpShellManager )
+        return mpShellManager;
+    return TreeNode::GetShellManager();
+}
+
 void LayoutMenu::InvalidateContent (void)
 {
     // The number of items may have changed.  Request a resize so that the
diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx
index bd121403c2d3..86e01e9f803b 100644..100755
--- a/sd/source/ui/toolpanel/LayoutMenu.hxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.hxx
@@ -60,6 +60,7 @@ class EventMultiplexerEvent;
 namespace sd { namespace toolpanel {
 
 class ControlFactory;
+class ToolPanelViewShell;
 
 
 class LayoutMenu
@@ -76,28 +77,18 @@ public:
     /** Create a new layout menu.  Depending on the given flag it
         displays its own scroll bar or lets a surrounding window
         handle that.
-        @param rDocumentShell
-            Used to determine writing direction.
-        @param rViewShellBase
-            Gives access to the view shell at whose active page the
-            layout will be set.
-        @param bUseOwnScrollBar
-            When <TRUE/> then we will show our own scroll bar when not
-            all icons can be displayed in the visible window area.
-            When <FALSE/> then rely on an outer scroll bar.  In this
-            case we will set the height of the window so that all
-            icons are visible.
+        @param i_pParent
+            the parent node in the control tree
+        @param i_rPanelViewShell
+            the view shell of the task pane.
     */
     LayoutMenu (
-        TreeNode* pParent,
-        DrawDocShell& rDocumentShell,
-        ViewShellBase& rViewShellBase,
-        bool bUseOwnScrollBar);
+        TreeNode* i_pParent,
+        ToolPanelViewShell& i_rPanelViewShell);
     virtual ~LayoutMenu (void);
 
     static std::auto_ptr<ControlFactory> CreateControlFactory (
-        ViewShellBase& rBase,
-        DrawDocShell& rDocShell);
+        ToolPanelViewShell& i_rPanelViewShell );
 
     /** Return the name of the currently selected layout.
     */
@@ -140,6 +131,9 @@ public:
     enum MasterMode { MM_NORMAL, MM_MASTER, MM_UNKNOWN };
     void UpdateEnabledState (const MasterMode eMode);
 
+    // TreeNode overridables
+    virtual TaskPaneShellManager* GetShellManager (void);
+
     /** Call this method when the set of displayed layouts is not up-to-date
         anymore.  It will re-assemple this set according to the current
         settings.
@@ -168,6 +162,8 @@ public:
 private:
     ViewShellBase& mrBase;
 
+    TaskPaneShellManager*   mpShellManager;
+
     /** Do we use our own scroll bar or is viewport handling done by
         our parent?
     */
@@ -231,6 +227,9 @@ private:
     */
     void UpdateSelection (void);
 
+    // internal ctor
+    void    implConstruct( DrawDocShell& rDocumentShell );
+
     /** When clicked then set the current page of the view in the center pane.
     */
     DECL_LINK(ClickHandler, ValueSet*);
diff --git a/sd/source/ui/toolpanel/LayoutableWindow.hxx b/sd/source/ui/toolpanel/LayoutableWindow.hxx
deleted file mode 100644
index ed4e1ec77959..000000000000
--- a/sd/source/ui/toolpanel/LayoutableWindow.hxx
+++ /dev/null
@@ -1,79 +0,0 @@
-/*************************************************************************
- *
- * 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_TOOLPANEL_I_LAYOUTABLE_WINDOW_HXX
-#define SD_TOOLPANEL_I_LAYOUTABLE_WINDOW_HXX
-
-#include <vcl/gen.hxx>
-
-class Window;
-
-namespace sd { namespace toolpanel {
-
-
-/** This interface has to be implemented by windows that want to be
-    layouted by a ToolPanel, SubToolPanel, or ScrollablePanel object.
-*/
-class LayoutableWindow
-{
-public:
-    /** Return the preferred size without constraints on either the
-        height or the width.
-        The size the window will later be set to may but does not have
-        to be equal to this size.
-    */
-    virtual Size GetPreferredSize (void) = 0;
-
-    /** Return the preferred width with the constraint, that the
-        window will be set to the given height.
-        The width the window will later be set to may but does not have
-        to be equal to this width.
-    */
-    virtual int GetPreferredWidth (int nHeight) = 0;
-
-    /** Return the preferred height with the constraint, that the
-        window will be set to the given width.
-        The height the window will later be set to may but does not have
-        to be equal to this height.
-    */
-    virtual int GetPreferredHeight (int nWidth) = 0;
-
-    /** Return wether the window is generally resizable.  When used by
-        a VerticalLayouter then the width will always be resized and
-        the return value of this method determines whether the height
-        may be modified as well.
-    */
-    virtual bool IsResizable (void) = 0;
-
-    /** Return the window so that its size and position can be set.
-    */
-    virtual ::Window& GetWindow (void) = 0;
-};
-
-} } // end of namespace ::sd::toolpanel
-
-#endif
diff --git a/sd/source/ui/toolpanel/MethodGuard.hxx b/sd/source/ui/toolpanel/MethodGuard.hxx
new file mode 100644
index 000000000000..45b81367c8de
--- /dev/null
+++ b/sd/source/ui/toolpanel/MethodGuard.hxx
@@ -0,0 +1,67 @@
+/*************************************************************************
+ * 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_METHODGUARD_HXX
+#define SD_METHODGUARD_HXX
+
+#include <osl/mutex.hxx>
+
+//......................................................................................................................
+namespace sd { namespace toolpanel
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= MethodGuard
+    //==================================================================================================================
+    template < class COMPONENT >
+    class MethodGuard
+    {
+    public:
+        MethodGuard( COMPONENT& i_rComponent )
+            :m_aGuard( i_rComponent.getMutex() )
+        {
+            i_rComponent.checkDisposed();
+        }
+
+        ~MethodGuard()
+        {
+        }
+
+        inline void clear()
+        {
+            m_aGuard.clear();
+        }
+
+    private:
+        ::osl::ClearableMutexGuard  m_aGuard;
+    };
+
+//......................................................................................................................
+} } // namespace sd::toolpanel
+//......................................................................................................................
+
+#endif // SD_METHODGUARD_HXX
diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx
index cff065777235..cae08c76ca39 100644..100755
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -56,6 +56,30 @@ ScrollPanel::ScrollPanel (
       mnVerticalGap(3),
       mnHorizontalBorder(2)
 {
+    Construct();
+}
+
+ScrollPanel::ScrollPanel (
+    ::Window& i_rParentWindow)
+    : Control (&i_rParentWindow, WB_DIALOGCONTROL),
+      TreeNode(NULL),
+      maScrollWindow(this, WB_DIALOGCONTROL),
+      maVerticalScrollBar(this, WB_VERT),
+      maHorizontalScrollBar(this, WB_HORZ),
+      maScrollBarFiller(this),
+      maScrollWindowFiller(&maScrollWindow),
+      mbIsRearrangePending(true),
+      mbIsLayoutPending(true),
+      mnChildrenWidth(0),
+      mnVerticalBorder(2),
+      mnVerticalGap(3),
+      mnHorizontalBorder(2)
+{
+    Construct();
+}
+
+void ScrollPanel::Construct()
+{
     SetAccessibleName (
         ::rtl::OUString::createFromAscii("Sub Task Panel"));
     mpControlContainer->SetMultiSelection (true);
@@ -95,7 +119,7 @@ ScrollPanel::~ScrollPanel (void)
         // control instead of pNode directly.
         TitledControl* pTitledControl = static_cast<TitledControl*>(pNode);
         if (pTitledControl != NULL)
-            pControl = pTitledControl->GetControl(false);
+            pControl = pTitledControl->GetControl();
 
         // Remove this object as listener from the control.
         if (pControl != NULL && pControl->GetWindow()!=NULL)
diff --git a/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx b/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx
index 3cef1ca6ee88..a032b6ef02f0 100644..100755
--- a/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx
+++ b/sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx
@@ -71,38 +71,6 @@ namespace sd { namespace toolpanel {
 
 ::std::map<const SdDrawDocument*, SlideSorterCacheDisplay*> SlideSorterCacheDisplay::maDisplays;
 
-/** This factory class is used to create instances of TestPanel.  It can be
-    extended so that its constructor stores arguments that later are passed
-    to new TestPanel objects.
-*/
-class SlideSorterCacheDisplayFactory
-    : public ControlFactory
-{
-public:
-    SlideSorterCacheDisplayFactory (const SdDrawDocument* pDocument)
-        : mpDocument(pDocument)
-    {
-    }
-
-protected:
-    virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode)
-    {
-        SlideSorterCacheDisplay* pDisplay = SlideSorterCacheDisplay::Instance(mpDocument);
-        pDisplay->SetParentWindow(pTreeNode->GetWindow());
-        pDisplay->SetParentNode(pTreeNode);
-        return pDisplay;
-    }
-
-private:
-    const SdDrawDocument* mpDocument;
-};
-
-
-
-
-
-
-
 SlideSorterCacheDisplay::SlideSorterCacheDisplay (const SdDrawDocument* pDocument)
     : TreeNode(NULL),
       mpWindow(NULL),
@@ -137,15 +105,6 @@ void SlideSorterCacheDisplay::SetParentWindow (::Window* pParentWindow)
 
 
 
-std::auto_ptr<ControlFactory> SlideSorterCacheDisplay::CreateControlFactory (
-    const SdDrawDocument* pDocument)
-{
-    return std::auto_ptr<ControlFactory>(new SlideSorterCacheDisplayFactory(pDocument));
-}
-
-
-
-
 void SlideSorterCacheDisplay::Paint (const Rectangle& rBoundingBox)
 {
     if (maCellSize.Width()>0 && maCellSize.Height()>0 && mpWindow!=NULL)
diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx
index 31c29f4f1c08..f554d44e8f18 100644..100755
--- a/sd/source/ui/toolpanel/SubToolPanel.cxx
+++ b/sd/source/ui/toolpanel/SubToolPanel.cxx
@@ -70,6 +70,35 @@ SubToolPanel::SubToolPanel (
 
 
 
+SubToolPanel::SubToolPanel (
+    Window& i_rParentWindow)
+    : Control (&i_rParentWindow, WB_DIALOGCONTROL),
+      TreeNode(NULL),
+      maWindowFiller(this),
+      mbIsRearrangePending(true),
+      mbIsLayoutPending(true),
+      mnChildrenWidth(0),
+      mnVerticalBorder(0),
+      mnVerticalGap(3),
+      mnHorizontalBorder(2)
+{
+    SetAccessibleName (
+        ::rtl::OUString::createFromAscii("Sub Task Panel"));
+    mpControlContainer->SetMultiSelection (true);
+
+    SetBorderStyle (WINDOW_BORDER_NORMAL);
+    SetMapMode (MapMode(MAP_PIXEL));
+
+    // To reduce flickering during repaints make the container windows
+    // transparent and rely on their children to paint the whole area.
+    SetBackground(Wallpaper());
+    maWindowFiller.SetBackground(
+        Application::GetSettings().GetStyleSettings().GetWindowColor());
+}
+
+
+
+
 SubToolPanel::~SubToolPanel (void)
 {
     sal_uInt32 nCount = mpControlContainer->GetControlCount();
diff --git a/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx b/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx
index c1651d62010b..4ad610df7f7f 100644..100755
--- a/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx
+++ b/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx
@@ -48,13 +48,10 @@ ControlFactory::~ControlFactory (void)
 
 
 
-::std::auto_ptr<TreeNode> ControlFactory::CreateControl (TreeNode* pTreeNode)
+::std::auto_ptr<TreeNode> ControlFactory::CreateControl( ::Window& i_rParent )
 {
-    // Create a new control by using the protected virtual hook.
-    TreeNode* pNewNode = InternalCreateControl(pTreeNode);
-
-    return ::std::auto_ptr<TreeNode>(pNewNode);
+    TreeNode* pNewNode = InternalCreateControl( i_rParent );
+    return ::std::auto_ptr<TreeNode>( pNewNode );
 }
 
-
 } } // end of namespace ::sd::toolpanel
diff --git a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx
index 5a4875340840..52054c43fe8b 100644..100755
--- a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx
+++ b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx
@@ -31,7 +31,7 @@
 #include "TaskPaneShellManager.hxx"
 
 #include "ViewShellManager.hxx"
-#include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
 #include <vcl/window.hxx>
 
 #include <algorithm>
@@ -111,6 +111,21 @@ void TaskPaneShellManager::AddSubShell (
 
 
 
+void TaskPaneShellManager::RemoveSubShell (const ShellId i_nShellId)
+{
+    SubShells::iterator pos = maSubShells.find( i_nShellId );
+    ENSURE_OR_RETURN_VOID( pos != maSubShells.end(), "no shell for this ID" );
+    if ( pos->second.mpWindow != NULL )
+    {
+        pos->second.mpWindow->RemoveEventListener( LINK( this, TaskPaneShellManager, WindowCallback ) );
+    }
+    mpViewShellManager->DeactivateSubShell( mrViewShell, pos->first );
+    maSubShells.erase( pos );
+}
+
+
+
+
 void TaskPaneShellManager::RemoveSubShell (const SfxShell* pShell)
 {
     if (pShell != NULL)
diff --git a/sd/source/ui/toolpanel/TaskPaneShellManager.hxx b/sd/source/ui/toolpanel/TaskPaneShellManager.hxx
index 2c2e49b98c48..92e7b6b83b8d 100644..100755
--- a/sd/source/ui/toolpanel/TaskPaneShellManager.hxx
+++ b/sd/source/ui/toolpanel/TaskPaneShellManager.hxx
@@ -46,7 +46,7 @@ namespace sd { namespace toolpanel {
 /** The TaskPaneShellManager implements the ViewShellManager::ShellFactory
     interface.  However, it does not create or delete shells.  It only
     gives the ViewShellManager access to the sub shells of the
-    TaskPaneViewShell.  Life time control of the sub shells is managed by
+    ToolPanelViewShell.  Life time control of the sub shells is managed by
     the sub shells themselves.
 */
 class TaskPaneShellManager
@@ -86,6 +86,11 @@ public:
         NULL when this shell is requested.
     */
     void RemoveSubShell (const SfxShell* pShell);
+    /** removes the shell given by its ID from the set of sub shells managed by the
+        TaskPaneShellManager. Subsequent calls to CreateShell() will return
+        NULL when this shell is requested.
+    */
+    void RemoveSubShell (const ShellId i_nShellId);
 
     /** Move the given sub-shell to the top of the local shell stack.
         Furthermore move the view shell whose sub-shells this class manages
diff --git a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
index 152f576bd5bc..f70e643636d5 100644..100755
--- a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
+++ b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
@@ -122,17 +122,6 @@ sal_Int32 TreeNode::GetMinimumWidth (void)
 
 
 
-ObjectBarManager* TreeNode::GetObjectBarManager (void)
-{
-    if (mpParent != NULL)
-        return mpParent->GetObjectBarManager();
-    else
-        return NULL;
-}
-
-
-
-
 bool TreeNode::IsResizable (void)
 {
     return false;
diff --git a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx
deleted file mode 100644
index d80beba7cd10..000000000000
--- a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx
+++ /dev/null
@@ -1,889 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
-#include "TaskPaneViewShell.hxx"
-
-#include "TaskPaneShellManager.hxx"
-#include "ToolPanelChildWindow.hrc"
-#include "ToolPanelChildWindow.hxx"
-#include "taskpane/SlideSorterCacheDisplay.hxx"
-#include "taskpane/ToolPanel.hxx"
-#include "taskpane/TitledControl.hxx"
-#include "LayoutMenu.hxx"
-#include "TaskPaneFocusManager.hxx"
-#include "taskpane/SubToolPanel.hxx"
-#include "taskpane/ScrollPanel.hxx"
-#include "taskpane/TaskPaneControlFactory.hxx"
-#include "controls/MasterPagesPanel.hxx"
-#include "controls/MasterPagesSelector.hxx"
-#include "controls/TableDesignPanel.hxx"
-#include "controls/CustomAnimationPanel.hxx"
-#include "controls/SlideTransitionPanel.hxx"
-#include "controls/AnimationSchemesPanel.hxx"
-#include "TitleToolBox.hxx"
-#include "taskpane/ControlContainer.hxx"
-#include "FrameView.hxx"
-#include "Window.hxx"
-#include "PaneDockingWindow.hxx"
-#include "AccessibleTaskPane.hxx"
-#include "DrawSubController.hxx"
-#include "sdmod.hxx"
-#include "app.hrc"
-#include "glob.hrc"
-#include "res_bmp.hrc"
-#include "helpids.h"
-#include "strings.hrc"
-#include "sdresid.hxx"
-#include "framework/FrameworkHelper.hxx"
-#include <com/sun/star/drawing/framework/XResourceId.hpp>
-#include <com/sun/star/drawing/framework/ResourceActivationMode.hpp>
-#include <com/sun/star/drawing/XDrawSubController.hpp>
-
-#include <svx/dlgctrl.hxx>
-#include <sfx2/bindings.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/msg.hxx>
-#include <sfx2/objface.hxx>
-#include <svx/colrctrl.hxx>
-#include <svx/xtable.hxx>
-#include <vcl/dockwin.hxx>
-#include "sdtreelb.hxx"
-#include "DrawViewShell.hxx"
-#include "drawdoc.hxx"
-#include "ViewShellBase.hxx"
-#include <svx/ruler.hxx>
-#include <vcl/svapp.hxx>
-
-//#define SHOW_TEST_PANEL
-#ifdef SHOW_TEST_PANEL
-#include "TestPanel.hxx"
-#endif
-//#define SHOW_COLOR_MENU
-#ifdef SHOW_COLOR_MENU
-#include "TestMenu.hxx"
-#endif
-
-#include <vector>
-#include <boost/shared_ptr.hpp>
-
-using namespace ::sd::toolpanel;
-
-#define TaskPaneViewShell
-#include "sdslots.hxx"
-
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using ::sd::framework::FrameworkHelper;
-
-namespace sd { namespace toolpanel {
-
-SFX_IMPL_INTERFACE(TaskPaneViewShell, SfxShell, SdResId(STR_TASKPANEVIEWSHELL))
-{
-}
-
-
-TYPEINIT1(TaskPaneViewShell, ViewShell);
-
-
-/** Inner implementation class of TaskPaneViewShell.
-*/
-class TaskPaneViewShell::Implementation
-{
-public:
-    static const sal_uInt32 mnInvalidId = 0xffffffff;
-
-    Implementation (void);
-    ~Implementation (void);
-
-    /** Here the panels are created that are shown in the task pane.
-    */
-    void Setup (ToolPanel* pToolPanel, ViewShellBase& rBase);
-
-    /** Make a new panel known to the translation table that translates
-        between internal indices as returned by
-        ControlContainer::AddControl() and public indices defined by
-        TaskPaneViewShell::PanelId.
-    */
-    void AddPanel (sal_uInt32 nInternalId, PanelId nPublicId);
-
-    /** Return the public id for the given internal one.
-        @return
-            When the given public id is not known then PID_UNKNOWN is
-            returned.
-    */
-    PanelId GetPublicId (sal_uInt32 nInternalId) const;
-
-    /** Return the internal id for the given public one.
-        @return
-            When the given public id is not known then mnInvalidId is
-            returned.
-    */
-    sal_uInt32 GetInternalId (PanelId nPublicId) const;
-
-private:
-    /** This map translates between internal indices returned by
-        ControlContainer::AddControl() and public indices defined by
-        TaskPaneViewShell::PanelId.
-    */
-    typedef ::std::vector<PanelId> InternalIdToPanelIdMap;
-    InternalIdToPanelIdMap maIndexMap;
-};
-
-
-
-
-namespace {
-
-enum MenuId {
-    MID_UNLOCK_TASK_PANEL = 1,
-    MID_LOCK_TASK_PANEL = 2,
-    MID_CUSTOMIZE = 3,
-    MID_FIRST_CONTROL = 4
-};
-
-/** This control is used for extracting the title string from the resource
-    of some dialogs that are displayed in the task pane.  With this the
-    actual controls can be created on demand.  This class only loads (a part
-    of) their resource.
-*/
-class DummyControl : public Control
-{
-public:
-    DummyControl (::Window* pParent, const ResId& rResId)
-        : Control(pParent,rResId)
-    {
-        FreeResource();
-    }
-};
-
-class ResourceActivationClickHandler
-{
-public:
-    ResourceActivationClickHandler (
-        const ::boost::shared_ptr<FrameworkHelper>& rpFrameworkHelper,
-        const Reference<drawing::framework::XResourceId>& rxResourceId,
-        ControlContainer& rControlContainer);
-    void operator () (TitledControl& rTitledControl);
-
-private:
-    ::boost::shared_ptr<FrameworkHelper> mpFrameworkHelper;
-    Reference<drawing::framework::XResourceId> mxResourceId;
-    ControlContainer& mrControlContainer;
-};
-
-} // end of anonymouse namespace
-
-
-
-
-
-void TaskPaneViewShell::Implementation::Setup (
-    ToolPanel* pToolPanel,
-    ViewShellBase& rBase)
-{
-    SdDrawDocument* pDocument = rBase.GetDocument();
-    sal_uInt32 nId;
-    sal_uInt32 nIdOfControlToExpand;
-
-    ::boost::shared_ptr<FrameworkHelper> pFrameworkHelper (FrameworkHelper::Instance(rBase));
-    Reference<drawing::framework::XResourceId> xTaskPaneId (pFrameworkHelper->CreateResourceId(
-        FrameworkHelper::msTaskPaneURL, FrameworkHelper::msRightPaneURL));
-
-    // The master page controls.
-    nId = pToolPanel->AddControl (
-        controls::MasterPagesPanel::CreateControlFactory(rBase),
-        SdResId(STR_TASKPANEL_MASTER_PAGE_TITLE),
-        HID_SD_SLIDE_DESIGNS,
-        ResourceActivationClickHandler(
-            pFrameworkHelper,
-            pFrameworkHelper->CreateResourceId(
-                FrameworkHelper::msMasterPagesTaskPanelURL, xTaskPaneId),
-            pToolPanel->GetControlContainer()));
-    AddPanel (nId, PID_MASTER_PAGES);
-
-    // Layout Menu.
-    nId = pToolPanel->AddControl (
-        LayoutMenu::CreateControlFactory(rBase, *pDocument->GetDocSh()),
-        SdResId(STR_TASKPANEL_LAYOUT_MENU_TITLE),
-        HID_SD_SLIDE_LAYOUTS,
-        ResourceActivationClickHandler(
-            pFrameworkHelper,
-            pFrameworkHelper->CreateResourceId(
-                FrameworkHelper::msLayoutTaskPanelURL, xTaskPaneId),
-            pToolPanel->GetControlContainer()));
-    AddPanel (nId, PID_LAYOUT);
-    nIdOfControlToExpand = nId;
-
-    {
-        DummyControl aControl (pToolPanel, SdResId(DLG_TABLEDESIGNPANE));
-
-        // TableDesignPanel
-        nId = pToolPanel->AddControl (
-            controls::TableDesignPanel::CreateControlFactory(rBase),
-            aControl.GetText(),
-            HID_SD_TABLE_DESIGN,
-            ResourceActivationClickHandler(
-                pFrameworkHelper,
-                    pFrameworkHelper->CreateResourceId(
-                        FrameworkHelper::msTableDesignPanelURL, xTaskPaneId),
-                pToolPanel->GetControlContainer()));
-        AddPanel (nId, PID_TABLE_DESIGN);
-    }
-
-    {
-        DummyControl aControl (pToolPanel, SdResId(RID_CUSTOMANIMATION_START+0));
-
-        // CustomAnimationPanel
-        nId = pToolPanel->AddControl (
-            controls::CustomAnimationPanel::CreateControlFactory(rBase),
-            aControl.GetText(),
-            HID_SD_CUSTOM_ANIMATIONS,
-            ResourceActivationClickHandler(
-                pFrameworkHelper,
-                    pFrameworkHelper->CreateResourceId(
-                        FrameworkHelper::msCustomAnimationTaskPanelURL, xTaskPaneId),
-                pToolPanel->GetControlContainer()));
-        AddPanel (nId, PID_CUSTOM_ANIMATION);
-    }
-
-    // SlideTransitionPanel
-    {
-        DummyControl aControl (pToolPanel, SdResId(RID_CUSTOMANIMATION_START+3));
-
-        nId = pToolPanel->AddControl (
-            controls::SlideTransitionPanel::CreateControlFactory(rBase),
-            aControl.GetText(),
-            HID_SD_SLIDE_TRANSITIONS,
-            ResourceActivationClickHandler(
-                pFrameworkHelper,
-                    pFrameworkHelper->CreateResourceId(
-                        FrameworkHelper::msSlideTransitionTaskPanelURL, xTaskPaneId),
-                pToolPanel->GetControlContainer()));
-        AddPanel (nId, PID_SLIDE_TRANSITION);
-    }
-
-#ifdef SHOW_COLOR_MENU
-    // Test Menu.
-    pToolPanel->AddControl (
-        ColorMenu::CreateControlFactory(),
-        String::CreateFromAscii ("Color Test Menu"),
-        0);
-#endif
-
-#ifdef SHOW_TEST_PANEL
-    // Test Panel.
-    pToolPanel->AddControl (
-        TestPanel::CreateControlFactory(),
-        String::CreateFromAscii ("Test Panel"),
-        0);
-#endif
-
-#ifdef USE_SLIDE_SORTER_CACHE_DISPLAY
-    pToolPanel->AddControl (
-        SlideSorterCacheDisplay::CreateControlFactory(pDocument),
-        String::CreateFromAscii("Slide Sorter Cache Status"),
-        0);
-#endif
-
-    // Expand the layout menu.
-    pToolPanel->GetControlContainer().SetExpansionState (
-        nIdOfControlToExpand,
-        ControlContainer::ES_EXPAND);
-
-    pToolPanel->GetWindow()->Show();
-}
-
-
-
-
-void TaskPaneViewShell::Initialize (void)
-{
-    if ( ! mbIsInitialized)
-    {
-        mbIsInitialized = true;
-        mpImpl->Setup (mpTaskPane.get(), GetViewShellBase());
-    }
-}
-
-
-
-
-TaskPaneViewShell::TaskPaneViewShell (
-    SfxViewFrame* pFrame,
-    ViewShellBase& rViewShellBase,
-    ::Window* pParentWindow,
-    FrameView* pFrameViewArgument)
-    : ViewShell (pFrame, pParentWindow, rViewShellBase),
-      mpImpl(NULL),
-      mpTaskPane(NULL),
-      mbIsInitialized(false),
-      mpSubShellManager(),
-      mnMenuId(0)
-{
-    meShellType = ST_TASK_PANE;
-
-    mpImpl.reset (new Implementation());
-
-    mpContentWindow->SetCenterAllowed (false);
-    pParentWindow->SetStyle(pParentWindow->GetStyle() | WB_DIALOGCONTROL);
-
-    mpTaskPane = ::std::auto_ptr<ToolPanel>(new ToolPanel (
-        mpContentWindow.get(), *this));
-
-    GetParentWindow()->SetBackground(Wallpaper());
-    mpContentWindow->SetBackground(Wallpaper());
-
-    GetParentWindow()->SetHelpId(HID_SD_TASK_PANE);
-
-    PaneDockingWindow* pDockingWindow = dynamic_cast<PaneDockingWindow*>(GetDockingWindow());
-    if (pDockingWindow != NULL)
-    {
-        pDockingWindow->InitializeTitleToolBox();
-        mnMenuId = pDockingWindow->AddMenu (
-            String(SdResId(STR_TASKPANEL_MASTER_PAGE_MENU_TITLE)),
-            HID_SD_TASK_PANE_VIEW_MENU,
-            LINK(this, TaskPaneViewShell, ToolboxClickHandler));
-    }
-
-    // Tell the focus manager that we want to pass the focus to our
-    // child.
-    FocusManager::Instance().RegisterDownLink(pParentWindow, mpTaskPane.get());
-
-    SetPool (&GetDoc()->GetPool());
-
-    if (pFrameViewArgument != NULL)
-        mpFrameView = pFrameViewArgument;
-    else
-        mpFrameView = new FrameView(GetDoc());
-    GetFrameView()->Connect();
-
-    // Hide or delete unused controls that we have inherited from the
-    // ViewShell base class.
-    mpHorizontalScrollBar.reset();
-    mpVerticalScrollBar.reset();
-    mpScrollBarBox.reset();
-    mpHorizontalRuler.reset();
-    mpVerticalRuler.reset();
-
-    SetName (String (RTL_CONSTASCII_USTRINGPARAM("TaskPaneViewShell")));
-
-    // For accessibility we have to shortly hide the content window.  This
-    // triggers the construction of a new accessibility object for the new
-    // view shell.  (One is created earlier while the construtor of the base
-    // class is executed.  At that time the correct accessibility object can
-    // not be constructed.)
-    if (mpContentWindow.get() !=NULL)
-    {
-        mpContentWindow->Hide();
-        mpContentWindow->Show();
-    }
-
-    // Register the shell manager as factory at the ViewShellManager.
-    mpSubShellManager.reset (new TaskPaneShellManager(
-        GetViewShellBase().GetViewShellManager(),
-        *this));
-    GetViewShellBase().GetViewShellManager()->AddSubShellFactory(this, mpSubShellManager);
-}
-
-
-
-
-TaskPaneViewShell::~TaskPaneViewShell (void)
-{
-    GetViewShellBase().GetViewShellManager()->RemoveSubShellFactory(this, mpSubShellManager);
-}
-
-
-
-// static
-void TaskPaneViewShell::RegisterControls (void)
-{
-    SfxModule* pModule = SD_MOD();
-    controls::MasterPagesSelector::RegisterInterface (pModule);
-    LayoutMenu::RegisterInterface (pModule);
-}
-
-
-
-
-void TaskPaneViewShell::ArrangeGUIElements (void)
-{
-    ViewShell::ArrangeGUIElements();
-
-    Point aOrigin (maViewPos);
-    Size aSize (maViewSize);
-
-    Initialize();
-
-    // Place the task pane.
-    if (mpTaskPane.get() != NULL)
-        mpTaskPane->SetPosSizePixel (Point(0,0), aSize);
-}
-
-
-
-
-void TaskPaneViewShell::GetFocus (void)
-{
-    Invalidate ();
-}
-
-
-
-
-void TaskPaneViewShell::LoseFocus (void)
-{
-    Invalidate ();
-}
-
-
-
-
-void TaskPaneViewShell::KeyInput (const KeyEvent& rEvent)
-{
-    KeyCode nCode = rEvent.GetKeyCode();
-    if (nCode == KEY_RETURN)
-    {
-        mpTaskPane->GrabFocus();
-    }
-    else
-        ViewShell::KeyInput (rEvent, NULL);
-}
-
-
-
-
-IMPL_LINK(TaskPaneViewShell, ToolboxClickHandler, ToolBox*, pToolBox)
-{
-    if (pToolBox->GetCurItemId() == mnMenuId)
-    {
-        pToolBox->EndSelection();
-
-        DockingWindow* pDockingWindow = GetDockingWindow();
-        ::std::auto_ptr<PopupMenu> pMenu = CreatePopupMenu (
-            pDockingWindow!=NULL && !pDockingWindow->IsFloatingMode());
-        pMenu->SetSelectHdl (
-            LINK(this, TaskPaneViewShell, MenuSelectHandler));
-
-        // pass toolbox button rect so the menu can stay open on button up
-        Rectangle aRect = pToolBox->GetItemRect(mnMenuId);
-        aRect.SetPos(pToolBox->GetPosPixel() );
-        pMenu->Execute (pDockingWindow, aRect, POPUPMENU_EXECUTE_DOWN);
-    }
-
-    return 0;
-}
-
-
-
-
-IMPL_LINK(TaskPaneViewShell, MenuSelectHandler, Menu*, pMenu)
-{
-    if (pMenu)
-    {
-        pMenu->Deactivate();
-        switch (pMenu->GetCurItemId())
-        {
-            case MID_UNLOCK_TASK_PANEL:
-            {
-                DockingWindow* pDockingWindow = GetDockingWindow();
-                if (pDockingWindow != NULL)
-                    pDockingWindow->SetFloatingMode (TRUE);
-            }
-            break;
-
-            case MID_LOCK_TASK_PANEL:
-            {
-                DockingWindow* pDockingWindow = GetDockingWindow();
-                if (pDockingWindow != NULL)
-                    pDockingWindow->SetFloatingMode (FALSE);
-            }
-            break;
-
-            case MID_CUSTOMIZE:
-                DBG_ASSERT (0, "Customization not yet implemented");
-                break;
-
-            default:
-            {
-                sal_uInt32 nIndex (pMenu->GetUserValue(pMenu->GetCurItemId()));
-                mpTaskPane->GetControlContainer().SetVisibilityState (
-                    nIndex,
-                    ControlContainer::VS_TOGGLE);
-                //                mpTaskPane->Resize();
-                //                mpTaskPane->Invalidate();
-            }
-            break;
-        }
-    }
-
-    return 0;
-}
-
-
-
-
-::std::auto_ptr<PopupMenu> TaskPaneViewShell::CreatePopupMenu (
-    bool bIsDocking)
-{
-    ::std::auto_ptr<PopupMenu> pMenu (new PopupMenu ());
-    FloatingWindow* pFloat = static_cast<FloatingWindow*>(pMenu->GetWindow());
-    if (pFloat != NULL)
-    {
-        pFloat->SetPopupModeFlags (
-            pFloat->GetPopupModeFlags()
-            | FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE);
-    }
-
-    // warning free code changes:
-    // FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE is 0x10000, so cast to USHORT is 0
-    // so why was this used anyway?
-    pMenu->SetMenuFlags (
-        pMenu->GetMenuFlags() /* | (USHORT)FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE */ );
-
-    // Add one entry for every tool panel element to individually make
-    // them visible or hide them.
-    USHORT nIndex = MID_FIRST_CONTROL;
-    sal_uInt32 nControlIndex;
-    ControlContainer& rContainer (mpTaskPane->GetControlContainer());
-    for (nControlIndex=0;
-         nControlIndex<rContainer.GetControlCount();
-         nControlIndex=rContainer.GetNextIndex(nControlIndex,true,false))
-    {
-        TreeNode* pChild = rContainer.GetControl(nControlIndex);
-        TitledControl* pControl
-            = static_cast<TitledControl*>(pChild->GetWindow());
-        pMenu->InsertItem (nIndex,
-            pControl->GetTitle(),
-            MIB_CHECKABLE);
-        pMenu->SetUserValue (nIndex, nControlIndex);
-        if (pControl->IsVisible())
-            pMenu->CheckItem (nIndex, TRUE);
-        nIndex++;
-    }
-
-    pMenu->InsertSeparator ();
-
-    // Add entry for docking or un-docking the tool panel.
-    if (bIsDocking)
-        pMenu->InsertItem (
-            MID_UNLOCK_TASK_PANEL,
-            String(SdResId(STR_TASKPANEL_MASTER_PAGE_MENU_UNLOCK)));
-    else
-        pMenu->InsertItem (
-            MID_LOCK_TASK_PANEL,
-            String(SdResId(STR_TASKPANEL_MASTER_PAGE_MENU_LOCK)));
-    pMenu->RemoveDisabledEntries (FALSE, FALSE);
-
-    return pMenu;
-}
-
-
-
-
-SdPage* TaskPaneViewShell::GetActualPage (void)
-{
-    return NULL;
-}
-
-SdPage* TaskPaneViewShell::getCurrentPage(void) const
-{
-    return NULL;
-}
-
-
-
-void TaskPaneViewShell::Execute (SfxRequest& )
-{
-}
-
-
-
-
-void TaskPaneViewShell::GetState (SfxItemSet& rItemSet)
-{
-    (void)rItemSet;
-}
-
-
-
-
-TaskPaneShellManager& TaskPaneViewShell::GetSubShellManager (void) const
-{
-    return *mpSubShellManager.get();
-}
-
-
-
-
-DockingWindow* TaskPaneViewShell::GetDockingWindow (void)
-{
-    ::Window* pParentWindow = GetParentWindow();
-    DockingWindow* pDockingWindow = NULL;
-    while (pParentWindow!=NULL && pDockingWindow==NULL)
-    {
-        pDockingWindow = dynamic_cast<DockingWindow*>(pParentWindow);
-        pParentWindow = pParentWindow->GetParent();
-    }
-    return pDockingWindow;
-}
-
-
-
-
-void TaskPaneViewShell::ShowPanel (const PanelId nPublicId)
-{
-    Initialize();
-    sal_uInt32 nId (mpImpl->GetInternalId(nPublicId));
-    if (nId != Implementation::mnInvalidId)
-    {
-        mpTaskPane->GetControlContainer().SetVisibilityState (
-            nId,
-            ControlContainer::VS_SHOW);
-    }
-}
-
-
-
-
-void TaskPaneViewShell::HidePanel (const PanelId nPublicId)
-{
-    Initialize();
-    sal_uInt32 nId (mpImpl->GetInternalId(nPublicId));
-    if (nId != Implementation::mnInvalidId)
-    {
-        mpTaskPane->GetControlContainer().SetVisibilityState (
-            nId,
-            ControlContainer::VS_HIDE);
-    }
-}
-
-
-
-
-void TaskPaneViewShell::ExpandPanel (const PanelId nPublicId)
-{
-   Initialize();
-    sal_uInt32 nId (mpImpl->GetInternalId(nPublicId));
-    if (nId != Implementation::mnInvalidId)
-    {
-        mpTaskPane->GetControlContainer().SetExpansionState (
-            nId,
-            ControlContainer::ES_EXPAND);
-    }
-}
-
-
-
-
-void TaskPaneViewShell::CollapsePanel (const PanelId nPublicId)
-{
-    Initialize();
-    sal_uInt32 nId (mpImpl->GetInternalId(nPublicId));
-    if (nId != Implementation::mnInvalidId)
-    {
-        mpTaskPane->GetControlContainer().SetExpansionState (
-            nId,
-            ControlContainer::ES_COLLAPSE);
-    }
-}
-
-
-
-
-::com::sun::star::uno::Reference<
-    ::com::sun::star::accessibility::XAccessible>
-    TaskPaneViewShell::CreateAccessibleDocumentView (::sd::Window* pWindow)
-{
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible> xAccessible;
-
-    if (mpTaskPane.get()!=NULL && pWindow!=NULL)
-    {
-        // We have to call CreateAccessible directly so that we can specify
-        // the correct accessible parent.
-        ::Window* pParentWindow = pWindow->GetAccessibleParentWindow();
-        if (pParentWindow != NULL)
-            xAccessible = mpTaskPane->CreateAccessibleObject(
-                pParentWindow->GetAccessible());
-    }
-
-    return xAccessible;
-}
-
-
-
-
-Reference<drawing::XDrawSubController> TaskPaneViewShell::CreateSubController (void)
-{
-    // This view shell is not designed to be the main view shell and thus
-    // does not support a UNO sub controller.
-    return Reference<drawing::XDrawSubController>();
-}
-
-
-
-
-bool TaskPaneViewShell::RelocateToParentWindow (::Window* pParentWindow)
-{
-    ::Window* pOldParentWindow = GetParentWindow();
-    FocusManager::Instance().RemoveLinks(pOldParentWindow, mpTaskPane.get());
-    FocusManager::Instance().RemoveLinks(mpTaskPane.get(), pOldParentWindow);
-
-    ViewShell::RelocateToParentWindow(pParentWindow);
-
-    PaneDockingWindow* pDockingWindow = dynamic_cast<PaneDockingWindow*>(GetDockingWindow());
-    if (pDockingWindow != NULL)
-    {
-        pDockingWindow->InitializeTitleToolBox();
-        mnMenuId = pDockingWindow->AddMenu (
-            String(SdResId(STR_TASKPANEL_MASTER_PAGE_MENU_TITLE)),
-            HID_SD_TASK_PANE_VIEW_MENU,
-            LINK(this, TaskPaneViewShell, ToolboxClickHandler));
-    }
-    FocusManager::Instance().RegisterDownLink(pParentWindow, mpTaskPane.get());
-
-    Resize();
-
-    return true;
-}
-
-
-
-
-//===== TaskPaneViewShell::Implementation =====================================
-
-TaskPaneViewShell::Implementation::Implementation (void)
-    : maIndexMap(
-        (InternalIdToPanelIdMap::size_type)PID__END,
-        PID_UNKNOWN)
-{
-}
-
-
-
-
-TaskPaneViewShell::Implementation::~Implementation (void)
-{
-}
-
-
-
-
-void TaskPaneViewShell::Implementation::AddPanel (
-    sal_uInt32 nInternalId,
-    PanelId nPublicId)
-{
-    maIndexMap[nInternalId] = nPublicId;
-}
-
-
-
-
-TaskPaneViewShell::PanelId
-    TaskPaneViewShell::Implementation::GetPublicId (
-        sal_uInt32 nInternalId) const
-{
-    if (nInternalId < maIndexMap.size())
-        return maIndexMap[nInternalId];
-    else
-        return PID_UNKNOWN;
-}
-
-
-
-
-sal_uInt32
-    TaskPaneViewShell::Implementation::GetInternalId (
-        TaskPaneViewShell::PanelId nPublicId) const
-{
-    sal_uInt32 nId = mnInvalidId;
-    for (sal_uInt32 nI=0; nI<maIndexMap.size(); nI++)
-        if (maIndexMap[nI] == nPublicId)
-        {
-            nId = nI;
-            break;
-        }
-
-    return nId;
-}
-
-
-
-
-//===== PanelActivation =======================================================
-
-PanelActivation::PanelActivation (ViewShellBase& rBase, TaskPaneViewShell::PanelId nPanelId)
-    : mrBase(rBase),
-      mnPanelId(nPanelId)
-{
-}
-
-void PanelActivation::operator() (bool)
-{
-    toolpanel::TaskPaneViewShell* pTaskPane
-        = dynamic_cast<toolpanel::TaskPaneViewShell*>(
-            framework::FrameworkHelper::Instance(mrBase)
-            ->GetViewShell(framework::FrameworkHelper::msRightPaneURL).get());
-    if (pTaskPane != NULL)
-        pTaskPane->ShowPanel(mnPanelId);
-}
-
-
-
-
-//===== ResourceActivationClickHandler ========================================
-
-ResourceActivationClickHandler::ResourceActivationClickHandler (
-    const ::boost::shared_ptr<FrameworkHelper>& rpFrameworkHelper,
-    const Reference<drawing::framework::XResourceId>& rxResourceId,
-    ControlContainer& rControlContainer)
-    : mpFrameworkHelper(rpFrameworkHelper),
-      mxResourceId(rxResourceId),
-      mrControlContainer(rControlContainer)
-{
-}
-
-
-
-
-void ResourceActivationClickHandler::operator () (TitledControl& rTitledControl)
-{
-    mrControlContainer.SetExpansionState (
-        &rTitledControl,
-        ControlContainer::ES_EXPAND);
-    mpFrameworkHelper->GetConfigurationController()->requestResourceActivation(
-        mxResourceId, drawing::framework::ResourceActivationMode_REPLACE);
-}
-
-
-} } // end of namespace ::sd::toolpanel
diff --git a/sd/source/ui/toolpanel/TestMenu.cxx b/sd/source/ui/toolpanel/TestMenu.cxx
index 7bfb6adebe8d..54c865f12728 100644..100755
--- a/sd/source/ui/toolpanel/TestMenu.cxx
+++ b/sd/source/ui/toolpanel/TestMenu.cxx
@@ -45,16 +45,16 @@ class ColorMenuFactory
     : public ControlFactory
 {
 protected:
-    virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode)
+    virtual TreeNode* InternalCreateControl( ::Window& i_rParent )
     {
-        return new ColorMenu (pTreeNode);
+        return new ColorMenu (&i_rParent);
     }
 };
 
 
-ColorMenu::ColorMenu (TreeNode* pParent)
-    : Window (pParent->GetWindow()),
-      TreeNode(pParent),
+ColorMenu::ColorMenu (::Window* i_pParent)
+    : Window (i_pParent),
+      TreeNode(NULL),
       maSet (this),
       mnPreferredColumnCount(2)
 {
@@ -71,7 +71,7 @@ ColorMenu::ColorMenu (TreeNode* pParent)
 
     Fill ();
     maSet.Show();
-    pParent->RequestResize();
+    i_pParent->Resize();
 }
 
 
diff --git a/sd/source/ui/toolpanel/TestMenu.hxx b/sd/source/ui/toolpanel/TestMenu.hxx
index 37ac6542970d..2b5dfe2e2e57 100644..100755
--- a/sd/source/ui/toolpanel/TestMenu.hxx
+++ b/sd/source/ui/toolpanel/TestMenu.hxx
@@ -47,7 +47,7 @@ class ColorMenu
       public TreeNode
 {
 public:
-    ColorMenu (TreeNode* pParent);
+    ColorMenu (::Window* i_pParent);
     virtual ~ColorMenu (void);
 
     static ::std::auto_ptr<ControlFactory> CreateControlFactory (void);
diff --git a/sd/source/ui/toolpanel/TestPanel.cxx b/sd/source/ui/toolpanel/TestPanel.cxx
index e2786e23a0c5..f0b6951cefc4 100644..100755
--- a/sd/source/ui/toolpanel/TestPanel.cxx
+++ b/sd/source/ui/toolpanel/TestPanel.cxx
@@ -45,9 +45,9 @@ class TestPanelFactory
     : public ControlFactory
 {
 protected:
-    virtual TreeNode* InternalCreateControl (TreeNode* pTreeNode)
+    virtual TreeNode* InternalCreateControl( ::Window& i_rParent )
     {
-        return new TestPanel (pTreeNode);
+        return new TestPanel (i_rParent);
     }
 };
 
@@ -109,8 +109,8 @@ private:
 };
 
 
-TestPanel::TestPanel (TreeNode* pParent)
-    : SubToolPanel (pParent)
+TestPanel::TestPanel (::Window& i_rParent)
+    : SubToolPanel (i_rParent)
 {
     // Create a scrollable panel with two list boxes.
     ScrollPanel* pScrollPanel = new ScrollPanel (this);
diff --git a/sd/source/ui/toolpanel/TestPanel.hxx b/sd/source/ui/toolpanel/TestPanel.hxx
index f883cc08c1e1..af1b97d0f885 100644..100755
--- a/sd/source/ui/toolpanel/TestPanel.hxx
+++ b/sd/source/ui/toolpanel/TestPanel.hxx
@@ -42,7 +42,7 @@ class TestPanel
     : public SubToolPanel
 {
 public:
-    TestPanel (TreeNode* pParent);
+    TestPanel (::Window& i_rParent);
     virtual ~TestPanel (void);
 
     static std::auto_ptr<ControlFactory> CreateControlFactory (void);
diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx
index e0b48a6cf57b..de49b7a6abb5 100644..100755
--- a/sd/source/ui/toolpanel/TitleBar.cxx
+++ b/sd/source/ui/toolpanel/TitleBar.cxx
@@ -60,13 +60,12 @@ namespace sd { namespace toolpanel {
 const int TitleBar::snIndentationWidth = 16;
 
 TitleBar::TitleBar ( ::Window* pParent, const String& rsTitle, TitleBarType eType, bool bIsExpandable)
-: ::Window (pParent)
+: ::Window (pParent, WB_TABSTOP)
 , TreeNode(this)
 , meType(eType)
 , msTitle(rsTitle)
 , mbExpanded(false)
 , mbFocused(false)
-, mbMouseOver(false)
 , mpDevice(new VirtualDevice (*this))
 , mbIsExpandable (bIsExpandable)
 {
@@ -77,10 +76,6 @@ TitleBar::TitleBar ( ::Window* pParent, const String& rsTitle, TitleBarType eTyp
     // Change the mouse pointer shape so that it acts as a mouse over effect.
     switch (meType)
     {
-        case TBT_WINDOW_TITLE:
-            break;
-
-        case TBT_CONTROL_TITLE:
         case TBT_SUB_CONTROL_HEADLINE:
             if (mbIsExpandable)
                 SetPointer (POINTER_REFHAND);
@@ -170,14 +165,6 @@ void TitleBar::Paint (const Rectangle& rBoundingBox)
 
     switch (meType)
     {
-        case TBT_WINDOW_TITLE:
-            PaintWindowTitleBar ();
-            break;
-
-        case TBT_CONTROL_TITLE:
-            PaintPanelControlTitle ();
-            break;
-
         case TBT_SUB_CONTROL_HEADLINE:
             PaintSubPanelHeadLineBar ();
             break;
@@ -223,22 +210,21 @@ void TitleBar::SetEnabledState(bool bFlag)
 }
 
 
-void TitleBar::SetFocus (bool bFlag)
+
+
+void TitleBar::GetFocus()
 {
-    mbFocused = bFlag;
-    Invalidate ();
+    mbFocused = true;
+    Invalidate();
 }
 
 
 
 
-void TitleBar::SetMouseOver (bool bFlag)
+void TitleBar::LoseFocus()
 {
-    if (bFlag != mbMouseOver)
-    {
-        mbMouseOver = bFlag;
-        //        Invalidate();
-    }
+    mbFocused = false;
+    Invalidate();
 }
 
 
@@ -251,15 +237,9 @@ bool TitleBar::HasExpansionIndicator (void) const
     {
         switch (meType)
         {
-            case TBT_CONTROL_TITLE:
             case TBT_SUB_CONTROL_HEADLINE:
                 bHasExpansionIndicator = true;
                 break;
-
-            default:
-            case TBT_WINDOW_TITLE:
-                // bHasExpansionIndicator remains false
-                break;
         }
     }
     return bHasExpansionIndicator;
@@ -277,21 +257,6 @@ Image TitleBar::GetExpansionIndicator (void) const
         USHORT nResourceId = 0;
         switch (meType)
         {
-            case TBT_CONTROL_TITLE:
-                if (mbExpanded)
-                    if (bHighContrastMode)
-                        nResourceId = BMP_TRIANGLE_DOWN_H;
-                    else
-                        nResourceId = BMP_TRIANGLE_DOWN;
-                else
-                    if (bHighContrastMode)
-                        nResourceId = BMP_TRIANGLE_RIGHT_H;
-                    else
-                        nResourceId = BMP_TRIANGLE_RIGHT;
-
-                aIndicator = IconCache::Instance().GetIcon(nResourceId);
-                break;
-
             case TBT_SUB_CONTROL_HEADLINE:
                 if (mbExpanded)
                     if (bHighContrastMode)
@@ -306,11 +271,6 @@ Image TitleBar::GetExpansionIndicator (void) const
 
                 aIndicator = IconCache::Instance().GetIcon(nResourceId);
                 break;
-
-            default:
-            case TBT_WINDOW_TITLE:
-                // aIndicator remains empty Image.
-                break;
         }
     }
 
@@ -320,35 +280,6 @@ Image TitleBar::GetExpansionIndicator (void) const
 
 
 
-void TitleBar::PaintPanelControlTitle (void)
-{
-    int nWidth (GetOutputSizePixel().Width());
-    Rectangle aTextBox (CalculateTextBoundingBox (nWidth, true));
-    PaintBackground(CalculateTitleBarBox(aTextBox, nWidth));
-    Rectangle aFocusBox (PaintExpansionIndicator (aTextBox));
-    PaintText (aTextBox);
-    aFocusBox.Union (aTextBox);
-    aFocusBox.Left() += 2;
-    PaintFocusIndicator (aFocusBox);
-    PaintMouseOverIndicator (aTextBox);
-}
-
-
-
-
-void TitleBar::PaintWindowTitleBar (void)
-{
-    Rectangle aTextBox (CalculateTextBoundingBox (
-        GetOutputSizePixel().Width(),
-        true));
-
-    PaintText (aTextBox);
-    PaintFocusIndicator (aTextBox);
-}
-
-
-
-
 void TitleBar::PaintSubPanelHeadLineBar (void)
 {
     int nWidth (GetOutputSizePixel().Width());
@@ -369,7 +300,6 @@ void TitleBar::PaintSubPanelHeadLineBar (void)
     aFocusBox.Left() -= 2;
     aFocusBox.Right() += 1;
     PaintFocusIndicator (aFocusBox);
-    PaintMouseOverIndicator (aTextBox);
 }
 
 
@@ -406,21 +336,6 @@ void TitleBar::PaintFocusIndicator (const Rectangle& rTextBox)
 
 
 
-void TitleBar::PaintMouseOverIndicator (const Rectangle& rTextBox)
-{
-    if (mbMouseOver)
-    {
-        Rectangle aBox (rTextBox);
-        // Show the line below the focus rectangle (which is painted
-        // after and over the mouse over indicator.)
-        //        aBox.Bottom() += 2;
-        //        DrawLine (aBox.BottomLeft(), aBox.BottomRight());
-    }
-}
-
-
-
-
 Rectangle TitleBar::PaintExpansionIndicator (const Rectangle& rTextBox)
 {
     Rectangle aExpansionIndicatorArea;
@@ -482,29 +397,6 @@ void TitleBar::PaintBackground (const Rectangle& rTitleBarBox)
 
     switch (meType)
     {
-        case TBT_CONTROL_TITLE:
-        {
-            mpDevice->SetFillColor (
-                GetSettings().GetStyleSettings().GetDialogColor());
-            mpDevice->DrawRect(rTitleBarBox);
-
-            mpDevice->SetFillColor();
-            mpDevice->SetLineColor (
-                GetSettings().GetStyleSettings().GetLightColor());
-            mpDevice->DrawLine(
-                rTitleBarBox.TopLeft(),rTitleBarBox.TopRight());
-            mpDevice->DrawLine(
-                rTitleBarBox.TopLeft(),rTitleBarBox.BottomLeft());
-
-            mpDevice->SetLineColor (
-                GetSettings().GetStyleSettings().GetShadowColor());
-            mpDevice-> DrawLine(
-                rTitleBarBox.BottomLeft(), rTitleBarBox.BottomRight());
-            mpDevice->DrawLine(
-                rTitleBarBox.TopRight(), rTitleBarBox.BottomRight());
-        }
-        break;
-
         case TBT_SUB_CONTROL_HEADLINE:
         {
             Color aColor (GetSettings().GetStyleSettings().GetDialogColor());
@@ -534,10 +426,6 @@ void TitleBar::PaintBackground (const Rectangle& rTitleBarBox)
                 Point(rTitleBarBox.Right(), rTitleBarBox.Bottom()));
         }
         break;
-
-        default:
-        case TBT_WINDOW_TITLE:
-            break;
     }
 }
 
@@ -588,16 +476,6 @@ Rectangle TitleBar::CalculateTitleBarBox (
 
    switch (meType)
    {
-       case TBT_WINDOW_TITLE:
-           aTitleBarBox.Bottom() += aTitleBarBox.Top();
-           aTitleBarBox.Top() = 0;
-           break;
-
-        case TBT_CONTROL_TITLE:
-           aTitleBarBox.Bottom() += aTitleBarBox.Top();
-           aTitleBarBox.Top() = 0;
-           break;
-
         case TBT_SUB_CONTROL_HEADLINE:
            aTitleBarBox.Top() -= 3;
            aTitleBarBox.Bottom() += 3;
@@ -614,15 +492,8 @@ Rectangle TitleBar::CalculateTitleBarBox (
 
 
 
-void TitleBar::MouseMove (const MouseEvent& rEvent)
+void TitleBar::MouseMove (const MouseEvent& )
 {
-    Point aRelativePosition = rEvent.GetPosPixel() - GetPosPixel();
-    Size aSize = GetSizePixel();
-    SetMouseOver (
-        aRelativePosition.X() >= 0
-        && aRelativePosition.Y() >= 0
-        && aRelativePosition.X() < aSize.Width()
-        && aRelativePosition.Y() < aSize.Height());
 }
 
 
diff --git a/sd/source/ui/toolpanel/TitleToolBox.cxx b/sd/source/ui/toolpanel/TitleToolBox.cxx
index 57cbac3fe132..403e826ee27a 100644..100755
--- a/sd/source/ui/toolpanel/TitleToolBox.cxx
+++ b/sd/source/ui/toolpanel/TitleToolBox.cxx
@@ -42,18 +42,6 @@ namespace sd { namespace toolpanel {
 TitleToolBox::TitleToolBox (::Window* pParent, WinBits nStyle )
     : ToolBox( pParent, nStyle )
 {
-    lastSize = -1;
-
-    Bitmap aBitmap (SdResId (BMP_CLOSE_DOC));
-    Bitmap aBitmapHC (SdResId (BMP_CLOSE_DOC_H));
-    Bitmap aTriangleRight (SdResId (BMP_TRIANGLE_RIGHT));
-    Bitmap aTriangleDown (SdResId (BMP_TRIANGLE_DOWN));
-
-    maImage = Image (aBitmap, Color (COL_LIGHTMAGENTA));
-    maImageHC = Image (aBitmapHC, Color (BMP_COLOR_HIGHCONTRAST));
-    maTriangleRight = Image (aTriangleRight, Color (COL_LIGHTMAGENTA));
-    maTriangleDown = Image (aTriangleDown, Color (COL_LIGHTMAGENTA));
-
     SetOutStyle (TOOLBOX_STYLE_FLAT);
     SetBackground (Wallpaper (
         GetSettings().GetStyleSettings().GetDialogColor()));
@@ -62,43 +50,6 @@ TitleToolBox::TitleToolBox (::Window* pParent, WinBits nStyle )
 
 
 
-void TitleToolBox::AddItem (ToolBoxId aId)
-{
-    switch (aId)
-    {
-        case TBID_PANEL_MENU:
-            InsertItem (TBID_PANEL_MENU,
-                String::CreateFromAscii ("Panel"),
-                TIB_DROPDOWN);
-            break;
-
-        case TBID_DOCUMENT_CLOSE:
-            InsertItem (TBID_DOCUMENT_CLOSE,
-                GetSettings().GetStyleSettings().GetHighContrastMode()
-                ? maImageHC : maImage, 0 );
-            break;
-
-        case TBID_TRIANGLE_RIGHT:
-            InsertItem (TBID_TRIANGLE_RIGHT,
-                maTriangleRight, 0);
-            break;
-
-        case TBID_TRIANGLE_DOWN:
-            InsertItem (TBID_TRIANGLE_DOWN,
-                maTriangleDown, 0);
-            break;
-
-        case TBID_TEST:
-            InsertItem (TBID_TEST,
-                String::CreateFromAscii ("Test"),
-                TIB_DROPDOWN);
-            break;
-    }
-}
-
-
-
-
 void TitleToolBox::DataChanged (const DataChangedEvent& rDCEvt)
 {
     Window::DataChanged (rDCEvt);
diff --git a/sd/source/ui/toolpanel/TitleToolBox.hxx b/sd/source/ui/toolpanel/TitleToolBox.hxx
index 9433706579df..db2c971c3539 100644..100755
--- a/sd/source/ui/toolpanel/TitleToolBox.hxx
+++ b/sd/source/ui/toolpanel/TitleToolBox.hxx
@@ -42,27 +42,9 @@ class TitleToolBox
     : public ToolBox
 {
 public:
-    enum ToolBoxId {
-        TBID_DOCUMENT_CLOSE = 1,
-        TBID_PANEL_MENU = 2,
-        TBID_TRIANGLE_RIGHT = 3,
-        TBID_TRIANGLE_DOWN = 4,
-        TBID_TEST
-    };
-
     TitleToolBox (::Window* pParent, WinBits nStyle = 0);
 
-    void AddItem (ToolBoxId aId);
-
     void DataChanged (const DataChangedEvent& rDCEvt);
-
-private:
-    Image maImage;
-    Image maImageHC;
-    Image maTriangleRight;
-    Image maTriangleDown;
-
-    long lastSize;
 };
 
 } } // end of namespace ::sd::toolbox
diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx
index 7930bb4cd7f1..4843102feb48 100644..100755
--- a/sd/source/ui/toolpanel/TitledControl.cxx
+++ b/sd/source/ui/toolpanel/TitledControl.cxx
@@ -52,53 +52,15 @@ TitledControl::TitledControl (
       msTitle(rTitle),
       mbVisible(true),
       mpUserData(NULL),
-      mpControlFactory(NULL),
-      mpClickHandler(new ClickHandler(rClickHandler)),
-      mbExpansionModeIsToggle(eType!=TitleBar::TBT_CONTROL_TITLE)
-{
-    if (pControl.get() != NULL)
-    {
-        mpControlContainer->AddControl (::std::auto_ptr<TreeNode> (
-            new TitleBar (this, rTitle, eType, pControl->IsExpandable())));
-        pControl->SetParentNode (this);
-    }
-    mpControlContainer->AddControl (pControl);
-
-    FocusManager::Instance().RegisterDownLink(this, GetControl()->GetWindow());
-    FocusManager::Instance().RegisterUpLink(GetControl()->GetWindow(), this);
-
-    SetBackground (Wallpaper());
-
-    GetTitleBar()->GetWindow()->Show ();
-    GetTitleBar()->GetWindow()->AddEventListener (
-        LINK(this,TitledControl,WindowEventListener));
-
-    UpdateStates ();
-}
-
-
-
-
-TitledControl::TitledControl (
-    TreeNode* pParent,
-    ::std::auto_ptr<ControlFactory> pControlFactory,
-    const String& rTitle,
-    const ClickHandler& rClickHandler,
-    TitleBar::TitleBarType eType)
-    : ::Window (pParent->GetWindow(), WB_TABSTOP),
-      TreeNode(pParent),
-      msTitle (rTitle),
-      mbVisible (true),
-      mpUserData (NULL),
-      mpControlFactory(pControlFactory),
-      mpClickHandler(new ClickHandler(rClickHandler)),
-      mbExpansionModeIsToggle(eType!=TitleBar::TBT_CONTROL_TITLE)
+      mpClickHandler(new ClickHandler(rClickHandler))
 {
     mpControlContainer->AddControl (::std::auto_ptr<TreeNode> (
-        new TitleBar (this, rTitle, eType, true)));
+        new TitleBar (this, rTitle, eType, pControl->IsExpandable())));
+    pControl->SetParentNode (this);
+    mpControlContainer->AddControl (pControl);
 
-    // The second control is created on demand, i.e. when GetControl(true)
-    // is called the first time.
+    FocusManager::Instance().RegisterDownLink( GetTitleBar()->GetWindow(), GetControl()->GetWindow() );
+    FocusManager::Instance().RegisterUpLink( GetControl()->GetWindow(), GetTitleBar()->GetWindow() );
 
     SetBackground (Wallpaper());
 
@@ -124,7 +86,7 @@ TitledControl::~TitledControl (void)
 Size TitledControl::GetPreferredSize (void)
 {
     Size aPreferredSize;
-    if (GetControl(false) != NULL)
+    if (GetControl() != NULL)
     {
         aPreferredSize = GetControl()->GetPreferredSize();
         if ( ! IsExpanded())
@@ -146,7 +108,7 @@ Size TitledControl::GetPreferredSize (void)
 sal_Int32 TitledControl::GetPreferredWidth (sal_Int32 nHeight)
 {
     int nPreferredWidth = 0;
-    if (GetControl(false) != NULL)
+    if (GetControl() != NULL)
         nPreferredWidth = GetControl()->GetPreferredWidth(
             nHeight - GetTitleBar()->GetWindow()->GetSizePixel().Height());
     else
@@ -163,7 +125,7 @@ sal_Int32 TitledControl::GetPreferredWidth (sal_Int32 nHeight)
 sal_Int32 TitledControl::GetPreferredHeight (sal_Int32 nWidth)
 {
     int nPreferredHeight = 0;
-    if (IsExpanded() && GetControl(false)!=NULL)
+    if (IsExpanded() && GetControl()!=NULL)
         nPreferredHeight = GetControl()->GetPreferredHeight(nWidth);
     nPreferredHeight += GetTitleBar()->GetPreferredHeight(nWidth);
 
@@ -201,7 +163,7 @@ void TitledControl::Resize (void)
         Size (aWindowSize.Width(), nTitleBarHeight));
 
 
-    TreeNode* pControl = GetControl(false);
+    TreeNode* pControl = GetControl();
     if (pControl != NULL
         && pControl->GetWindow() != NULL
         && pControl->GetWindow()->IsVisible())
@@ -219,17 +181,7 @@ void TitledControl::GetFocus (void)
 {
     ::Window::GetFocus();
     if (GetTitleBar() != NULL)
-        GetTitleBar()->SetFocus (true);
-}
-
-
-
-
-void TitledControl::LoseFocus (void)
-{
-    ::Window::LoseFocus();
-    if (GetTitleBar() != NULL)
-        GetTitleBar()->SetFocus (false);
+        GetTitleBar()->GrabFocus();
 }
 
 
@@ -258,7 +210,7 @@ void TitledControl::KeyInput (const KeyEvent& rEvent)
         if ( ! FocusManager::Instance().TransferFocus(this,nCode))
         {
             // When already expanded then put focus on first child.
-            TreeNode* pControl = GetControl(false);
+            TreeNode* pControl = GetControl();
             if (pControl!=NULL && IsExpanded())
                 if (pControl->GetWindow() != NULL)
                     pControl->GetWindow()->GrabFocus();
@@ -296,7 +248,7 @@ bool TitledControl::Expand (bool bExpanded)
         // Get the control.  Use the bExpanded parameter as argument to
         // indicate that a control is created via its factory only when it
         // is to be expanded.  When it is collapsed this is not necessary.
-        TreeNode* pControl = GetControl(bExpanded);
+        TreeNode* pControl = GetControl();
         if (pControl != NULL
             && GetControl()->IsExpanded() != bExpanded)
         {
@@ -314,7 +266,7 @@ bool TitledControl::Expand (bool bExpanded)
 
 bool TitledControl::IsExpandable (void) const
 {
-    const TreeNode* pControl = GetConstControl(false);
+    const TreeNode* pControl = GetConstControl();
     if (pControl != NULL)
         return pControl->IsExpandable();
     else
@@ -328,7 +280,7 @@ bool TitledControl::IsExpandable (void) const
 
 bool TitledControl::IsExpanded (void) const
 {
-    const TreeNode* pControl = GetConstControl(false);
+    const TreeNode* pControl = GetConstControl();
     if (pControl != NULL)
         return pControl->IsExpanded();
     else
@@ -402,7 +354,7 @@ void TitledControl::UpdateStates (void)
     else
         GetWindow()->Hide();
 
-    TreeNode* pControl = GetControl(false);
+    TreeNode* pControl = GetControl();
     if (pControl!=NULL  &&  pControl->GetWindow() != NULL)
     {
         if (IsVisible() && IsExpanded())
@@ -435,33 +387,17 @@ IMPL_LINK(TitledControl, WindowEventListener,
 
 
 
-TreeNode* TitledControl::GetControl (bool bCreate)
+TreeNode* TitledControl::GetControl (void)
 {
-    TreeNode* pNode = mpControlContainer->GetControl(1);
-    if (pNode==NULL && mpControlFactory.get()!=NULL && bCreate)
-    {
-        // We have to create the control with the factory object.
-        ::std::auto_ptr<TreeNode> pControl (mpControlFactory->CreateControl(this));//GetParentNode()));
-        if (pControl.get() != NULL)
-        {
-            pControl->SetParentNode(this);
-            mpControlContainer->AddControl(pControl);
-
-            pNode = mpControlContainer->GetControl(1);
-            FocusManager::Instance().RegisterDownLink(this, pNode->GetWindow());
-            FocusManager::Instance().RegisterUpLink(pNode->GetWindow(), this);
-        }
-    }
-
-    return pNode;
+    return mpControlContainer->GetControl(1);
 }
 
 
 
 
-const TreeNode* TitledControl::GetConstControl (bool bCreate) const
+const TreeNode* TitledControl::GetConstControl () const
 {
-    return const_cast<TitledControl*>(this)->GetControl(bCreate);
+    return const_cast<TitledControl*>(this)->GetControl();
 }
 
 
diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx
index c87b3cc63ef5..6dbcae52547a 100755
--- a/sd/source/ui/toolpanel/ToolPanel.cxx
+++ b/sd/source/ui/toolpanel/ToolPanel.cxx
@@ -1,5 +1,4 @@
 /*************************************************************************
- *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -25,265 +24,90 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 
-#include "taskpane/ToolPanel.hxx"
-
-#include "TaskPaneFocusManager.hxx"
-#include "taskpane/TitleBar.hxx"
-#include "taskpane/TitledControl.hxx"
-#include "taskpane/ControlContainer.hxx"
-#include "TaskPaneViewShell.hxx"
-#include "taskpane/TaskPaneControlFactory.hxx"
-#include "AccessibleTaskPane.hxx"
-
-#include "strings.hrc"
-#include "sdresid.hxx"
-#include <vcl/decoview.hxx>
-#include <vcl/menu.hxx>
-#include <vcl/svapp.hxx>
-
-namespace sd { namespace toolpanel {
-
-
-/** Use WB_DIALOGCONTROL as argument for the Control constructor to
-    let VCL handle focus traveling.  In addition the control
-    descriptors have to use WB_TABSTOP.
-*/
-ToolPanel::ToolPanel (
-    Window* pParentWindow,
-    TaskPaneViewShell& rViewShell)
-    : Control (pParentWindow, WB_DIALOGCONTROL),
-      TreeNode (NULL),
-      mrViewShell(rViewShell),
-      mbRearrangeActive(false)
-{
-    SetBackground (Wallpaper ());
-}
-
-
-
-
-ToolPanel::~ToolPanel (void)
-{
-}
-
+#include "ToolPanel.hxx"
+#include "MethodGuard.hxx"
+#include <taskpane/TaskPaneTreeNode.hxx>
 
+/** === begin UNO includes === **/
+#include <com/sun/star/lang/DisposedException.hpp>
+/** === end UNO includes === **/
 
+#include <vcl/window.hxx>
 
-sal_uInt32 ToolPanel::AddControl (
-    ::std::auto_ptr<ControlFactory> pControlFactory,
-    const String& rTitle,
-    ULONG nHelpId,
-    const TitledControl::ClickHandler& rClickHandler)
+//......................................................................................................................
+namespace sd { namespace toolpanel
 {
-    TitledControl* pTitledControl = new TitledControl (
-        this,
-        pControlFactory,
-        rTitle,
-        rClickHandler,
-        TitleBar::TBT_CONTROL_TITLE);
-    ::std::auto_ptr<TreeNode> pChild (pTitledControl);
-
-    // Get the (grand) parent window which is focus-wise our parent.
-    Window* pParent = GetParent();
-    if (pParent != NULL)
-        pParent = pParent->GetParent();
-
-    FocusManager& rFocusManager (FocusManager::Instance());
-    int nControlCount (mpControlContainer->GetControlCount());
-
-    // Add a link up from every control to the parent.  A down link is added
-    // only for the first control so that when entering the sub tool panel
-    // the focus is set to the first control.
-    if (pParent != NULL)
+//......................................................................................................................
+
+    /** === 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::DisposedException;
+    using ::com::sun::star::awt::XWindow;
+    using ::com::sun::star::accessibility::XAccessible;
+    /** === end UNO using === **/
+
+    typedef MethodGuard< ToolPanel > ToolPanelGuard;
+
+    //==================================================================================================================
+    //= ToolPanel
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    ToolPanel::ToolPanel( ::std::auto_ptr< TreeNode >& i_rControl )
+        :ToolPanel_Base( m_aMutex )
+        ,m_pControl( i_rControl )
     {
-        if (nControlCount == 1)
-            rFocusManager.RegisterDownLink(pParent, pChild->GetWindow());
-        rFocusManager.RegisterUpLink(pChild->GetWindow(), pParent);
     }
 
-    // Replace the old links for cycling between first and last child by
-    // current onems.
-    if (nControlCount > 0)
+    //------------------------------------------------------------------------------------------------------------------
+    ToolPanel::~ToolPanel()
     {
-        ::Window* pFirst = mpControlContainer->GetControl(0)->GetWindow();
-        ::Window* pLast = mpControlContainer->GetControl(nControlCount-1)->GetWindow();
-        rFocusManager.RemoveLinks(pFirst,pLast);
-        rFocusManager.RemoveLinks(pLast,pFirst);
-
-        rFocusManager.RegisterLink(pFirst,pChild->GetWindow(), KEY_UP);
-        rFocusManager.RegisterLink(pChild->GetWindow(),pFirst, KEY_DOWN);
     }
 
-    pTitledControl->GetWindow()->SetHelpId(nHelpId);
-
-    return mpControlContainer->AddControl (pChild);
-}
-
-
-
-
-void ToolPanel::ListHasChanged (void)
-{
-    mpControlContainer->ListHasChanged ();
-    Rearrange ();
-}
-
-
-
-
-void ToolPanel::Resize (void)
-{
-    Control::Resize();
-    Rearrange ();
-}
-
-
-
-
-void ToolPanel::RequestResize (void)
-{
-    Invalidate();
-    Rearrange ();
-}
-
-
-
-
-/** Subtract the space for the title bars from the available space and
-    give the remaining space to the active control.
-*/
-void ToolPanel::Rearrange (void)
-{
-    // Prevent recursive calls.
-    if ( ! mbRearrangeActive && mpControlContainer->GetVisibleControlCount()>0)
+    //------------------------------------------------------------------------------------------------------------------
+    void ToolPanel::checkDisposed()
     {
-        mbRearrangeActive = true;
-
-        SetBackground (Wallpaper ());
-
-        // Make the area that is covered by the children a little bit
-        // smaller so that a frame is visible arround them.
-        Rectangle aAvailableArea (Point(0,0), GetOutputSizePixel());
-
-        int nWidth = aAvailableArea.GetWidth();
-        sal_uInt32 nControlCount (mpControlContainer->GetControlCount());
-        sal_uInt32 nActiveControlIndex (
-            mpControlContainer->GetActiveControlIndex());
+        if ( m_pControl.get() == NULL )
+            throw DisposedException( ::rtl::OUString(), *this );
+    }
 
-        // Place title bars of controls above the active control and thereby
-        // determine the top of the active control.
-        sal_uInt32 nIndex;
-        for (nIndex=mpControlContainer->GetFirstIndex();
-             nIndex<nActiveControlIndex;
-             nIndex=mpControlContainer->GetNextIndex(nIndex))
-        {
-            TreeNode* pChild = mpControlContainer->GetControl(nIndex);
-            if (pChild != NULL)
-            {
-                sal_uInt32 nHeight = pChild->GetPreferredHeight (nWidth);
-                pChild->GetWindow()->SetPosSizePixel (
-                    aAvailableArea.TopLeft(),
-                    Size(nWidth, nHeight));
-                aAvailableArea.Top() += nHeight;
-            }
-        }
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XWindow > SAL_CALL ToolPanel::getWindow() throw (RuntimeException)
+    {
+        ToolPanelGuard aGuard( *this );
+        return Reference< XWindow >( m_pControl->GetWindow()->GetComponentInterface(), UNO_QUERY_THROW );
+    }
 
-        // Place title bars of controls below the active control and thereby
-        // determine the bottom of the active control.
-        for (nIndex=mpControlContainer->GetLastIndex();
-             nIndex<nControlCount && nIndex!=nActiveControlIndex;
-             nIndex=mpControlContainer->GetPreviousIndex(nIndex))
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL ToolPanel::createAccessible( const Reference< XAccessible >& i_rParentAccessible ) throw (RuntimeException)
+    {
+        ToolPanelGuard aGuard( *this );
+        Reference< XAccessible > xAccessible( m_pControl->GetWindow()->GetAccessible( FALSE ) );
+        if ( !xAccessible.is() )
         {
-            TreeNode* pChild = mpControlContainer->GetControl(nIndex);
-            if (pChild != NULL)
-            {
-                sal_uInt32 nHeight = pChild->GetPreferredHeight (nWidth);
-                pChild->GetWindow()->SetPosSizePixel (
-                    Point(aAvailableArea.Left(),
-                        aAvailableArea.Bottom()-nHeight+1),
-                        Size(nWidth, nHeight));
-                aAvailableArea.Bottom() -= nHeight;
-            }
+            xAccessible.set( m_pControl->CreateAccessibleObject( i_rParentAccessible ) );
+            m_pControl->GetWindow()->SetAccessible( xAccessible );
         }
-
-        // Finally place the active control.
-        TreeNode* pChild = mpControlContainer->GetControl(nActiveControlIndex);
-        if (pChild != NULL)
-            pChild->GetWindow()->SetPosSizePixel (
-                aAvailableArea.TopLeft(),
-                aAvailableArea.GetSize());
-
-        mbRearrangeActive = false;
+        return xAccessible;
     }
-    else
-        SetBackground (
-            Application::GetSettings().GetStyleSettings().GetDialogColor());
-}
-
-
-
-
-Size ToolPanel::GetPreferredSize (void)
-{
-    return Size(300,300);
-}
-
-
-
-
-sal_Int32 ToolPanel::GetPreferredWidth (sal_Int32 )
-{
-    return 300;
-}
-
-
-
-
-sal_Int32 ToolPanel::GetPreferredHeight (sal_Int32 )
-{
-    return 300;
-}
 
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL ToolPanel::disposing()
+    {
+        m_pControl.reset();
+    }
 
-
-
-bool ToolPanel::IsResizable (void)
-{
-    return true;
-}
-
-
-
-
-::Window* ToolPanel::GetWindow (void)
-{
-    return this;
-}
-
-
-
-
-TaskPaneShellManager* ToolPanel::GetShellManager (void)
-{
-    return &mrViewShell.GetSubShellManager();
-}
-
-
-
-
-::com::sun::star::uno::Reference<
-    ::com::sun::star::accessibility::XAccessible> ToolPanel::CreateAccessibleObject (
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible>& rxParent)
-{
-    return new ::accessibility::AccessibleTaskPane (
-        rxParent,
-        String(SdResId(STR_RIGHT_PANE_TITLE)),
-        String(SdResId(STR_RIGHT_PANE_TITLE)),
-        *this);
-}
-
-} } // end of namespace ::sd::toolpanel
+//......................................................................................................................
+} } // namespace sd::toolpanel
+//......................................................................................................................
diff --git a/sd/source/ui/toolpanel/ToolPanel.hxx b/sd/source/ui/toolpanel/ToolPanel.hxx
new file mode 100644
index 000000000000..2fe4a64c71be
--- /dev/null
+++ b/sd/source/ui/toolpanel/ToolPanel.hxx
@@ -0,0 +1,80 @@
+/*************************************************************************
+ * 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_TOOLPANEL_HXX
+#define SD_TOOLPANEL_HXX
+
+/** === begin UNO includes === **/
+#include <com/sun/star/ui/XToolPanel.hpp>
+/** === end UNO includes === **/
+
+#include <cppuhelper/basemutex.hxx>
+#include <cppuhelper/compbase1.hxx>
+
+#include <memory>
+
+//......................................................................................................................
+namespace sd { namespace toolpanel
+{
+//......................................................................................................................
+
+    class TreeNode;
+
+    //==================================================================================================================
+    //= ToolPanel
+    //==================================================================================================================
+    typedef ::cppu::WeakComponentImplHelper1    <   ::com::sun::star::ui::XToolPanel
+                                                >   ToolPanel_Base;
+    class ToolPanel :public ::cppu::BaseMutex
+                    ,public ToolPanel_Base
+    {
+    public:
+        ToolPanel(
+            ::std::auto_ptr< TreeNode >& i_rControl
+        );
+
+        // 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 >& ParentAccessible ) throw (::com::sun::star::uno::RuntimeException);
+
+        // OComponentHelper
+        virtual void SAL_CALL disposing();
+
+        ::osl::Mutex& getMutex() { return m_aMutex; }
+        void checkDisposed();
+
+    protected:
+        ~ToolPanel();
+
+    private:
+        ::std::auto_ptr< TreeNode > m_pControl;
+    };
+
+//......................................................................................................................
+} } // namespace sd::toolpanel
+//......................................................................................................................
+
+#endif // SD_TOOLPANEL_HXX
diff --git a/sd/source/ui/toolpanel/ToolPanelChildWindow.cxx b/sd/source/ui/toolpanel/ToolPanelChildWindow.cxx
deleted file mode 100644
index 1db383091bff..000000000000
--- a/sd/source/ui/toolpanel/ToolPanelChildWindow.cxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
-#include "ToolPanelChildWindow.hxx"
-#include "ToolPanelDockingWindow.hxx"
-
-#include "sdresid.hxx"
-#include "app.hrc"
-#include "sfx2/app.hxx"
-
-
-namespace sd { namespace toolpanel {
-
-
-
-ToolPanelChildWindow::ToolPanelChildWindow (
-    ::Window* pParentWindow,
-    USHORT nId,
-    SfxBindings* pBindings,
-    SfxChildWinInfo* pInfo)
-    : SfxChildWindow (pParentWindow, nId)
-{
-    pWindow = new ToolPanelDockingWindow (pBindings, this, pParentWindow);
-    eChildAlignment = SFX_ALIGN_RIGHT;
-    static_cast<SfxDockingWindow*>(pWindow)->Initialize (pInfo);
-    //  SetHideNotDelete (TRUE);
-};
-
-
-
-
-ToolPanelChildWindow::~ToolPanelChildWindow()
-{}
-
-
-SFX_IMPL_DOCKINGWINDOW(ToolPanelChildWindow, SID_TOOLPANEL)
-
-
-
-
-} } // end of namespace ::sd::toolpanel
diff --git a/sd/source/ui/toolpanel/ToolPanelChildWindow.src b/sd/source/ui/toolpanel/ToolPanelChildWindow.src
deleted file mode 100644
index 079f9608f616..000000000000
--- a/sd/source/ui/toolpanel/ToolPanelChildWindow.src
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************
- *
- * 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 "app.hrc"
-#include "ToolPanelChildWindow.hrc"
-
-DockingWindow FLT_WIN_TOOLPANEL
-{
-    HelpID = SID_TOOLPANEL ;
-    Border = TRUE ;
-    Hide = FALSE ;
-    SVLook = TRUE ;
-    Sizeable = TRUE ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    Dockable = TRUE ;
-    EnableResizing = TRUE ;
-    Size = MAP_APPFONT ( 140 , 120 ) ;
-    Text = "Tool Panel" ;
-
-    Control TOOLPANEL
-    {
-        Pos = MAP_APPFONT ( 0 , 0 ) ;
-        Size = MAP_APPFONT ( 69, 150 ) ;
-        Border = FALSE;
-    };
-};
diff --git a/sd/source/ui/toolpanel/ToolPanelFactory.cxx b/sd/source/ui/toolpanel/ToolPanelFactory.cxx
new file mode 100644
index 000000000000..db4602c991d0
--- /dev/null
+++ b/sd/source/ui/toolpanel/ToolPanelFactory.cxx
@@ -0,0 +1,255 @@
+/*************************************************************************
+ * 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_sd.hxx"
+
+#include "taskpane/ToolPanelViewShell.hxx"
+#include "framework/FrameworkHelper.hxx"
+#include "PaneChildWindows.hxx"
+#include "ViewShellBase.hxx"
+#include "app.hrc"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/ui/XUIElementFactory.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
+/** === end UNO includes === **/
+
+#include <sfx2/frame.hxx>
+#include <vcl/svapp.hxx>
+#include <vos/mutex.hxx>
+#include <sfx2/viewfrm.hxx>
+#include <cppuhelper/implbase3.hxx>
+#include <comphelper/namedvaluecollection.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+
+//......................................................................................................................
+namespace sd { namespace toolpanel
+{
+//......................................................................................................................
+
+    /** === 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::ui::XUIElementFactory;
+    using ::com::sun::star::ui::XUIElement;
+    using ::com::sun::star::beans::PropertyValue;
+    using ::com::sun::star::container::NoSuchElementException;
+    using ::com::sun::star::lang::IllegalArgumentException;
+    using ::com::sun::star::lang::XServiceInfo;
+    using ::com::sun::star::lang::XInitialization;
+    using ::com::sun::star::frame::XFrame;
+    using ::com::sun::star::awt::XWindow;
+    /** === end UNO using === **/
+
+    //==================================================================================================================
+    //= ToolPanelFactory
+    //==================================================================================================================
+    typedef ::cppu::WeakImplHelper3 <   XUIElementFactory
+                                    ,   XServiceInfo
+                                    ,   XInitialization
+                                    >   ToolPanelFactory_Base;
+    class ToolPanelFactory : public ToolPanelFactory_Base
+    {
+    public:
+        ToolPanelFactory( const Reference< XComponentContext >& i_rContext );
+
+        // XUIElementFactory
+        virtual Reference< XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const Sequence< PropertyValue >& Args ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException);
+
+        // XServiceInfo
+        virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (RuntimeException);
+        virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException);
+        virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException);
+
+        // XInitialization
+        virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException);
+
+    protected:
+        virtual ~ToolPanelFactory();
+
+    private:
+        const Reference< XComponentContext >    m_xContext;
+    };
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XInterface > SAL_CALL ToolPanelFactory_createInstance( const Reference< XComponentContext >& i_rContext )
+    {
+        return Reference< XInterface >( *new ToolPanelFactory( i_rContext ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString ToolPanelFactory_getImplementationName() throw(RuntimeException)
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.drawing.ToolPanelFactory" ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL ToolPanelFactory_getSupportedServiceNames (void)
+        throw (RuntimeException)
+    {
+        const ::rtl::OUString sServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DefaultToolPanelFactory" ) );
+        return Sequence< ::rtl::OUString >( &sServiceName, 1 );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    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)
+    {
+        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+
+        const PanelId ePanelId( toolpanel::GetStandardPanelId( i_rResourceURL ) );
+        if ( ePanelId == PID_UNKNOWN )
+            throw NoSuchElementException( i_rResourceURL, *this );
+
+        const ::comphelper::NamedValueCollection aArgs( i_rArgs );
+        const Reference< XFrame > xDocFrame( aArgs.getOrDefault( "Frame", Reference< XFrame >() ) );
+        const Reference< XWindow > xParentWindow( aArgs.getOrDefault( "ParentWindow", Reference< XWindow >() ) );
+        if ( !xDocFrame.is() || !xParentWindow.is() )
+            throw IllegalArgumentException(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "For creating a standard tool panel, a Frame and a Parent window are needed." ) ),
+                *this,
+                2
+            );
+
+        // look up the Sfx(View)Frame for the given XFrame
+        SfxViewFrame* pViewFrame = NULL;
+        for (   SfxFrame* pFrame = SfxFrame::GetFirst();
+                pFrame != NULL;
+                pFrame = SfxFrame::GetNext( *pFrame )
+            )
+        {
+            if ( pFrame->GetFrameInterface() == xDocFrame )
+            {
+                pViewFrame = pFrame->GetCurrentViewFrame();
+                break;
+            }
+        }
+
+        if ( !pViewFrame || !pViewFrame->HasChildWindow( SID_TASKPANE ) )
+            throw IllegalArgumentException(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Illegal frame." ) ),
+                *this,
+                2
+            );
+
+        // retrieve the task pane
+        ToolPanelChildWindow* pToolPanelWindow( dynamic_cast< ToolPanelChildWindow* >( pViewFrame->GetChildWindow( SID_TASKPANE ) ) );
+        if ( !pToolPanelWindow )
+            throw IllegalArgumentException(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No Impress document, or no Impress Task Pane." ) ),
+                *this,
+                2
+            );
+
+        // retrieve the ViewShellBase, and the view shell of the task pane
+        ViewShellBase* pViewShellBase = dynamic_cast< ViewShellBase* >( pViewFrame->GetViewShell() );
+        ::boost::shared_ptr< framework::FrameworkHelper > pFrameworkHelper;
+        if ( pViewShellBase )
+            pFrameworkHelper = framework::FrameworkHelper::Instance( *pViewShellBase );
+        ::boost::shared_ptr< ViewShell > pViewShell;
+        if ( pFrameworkHelper.get() )
+            pViewShell = pFrameworkHelper->GetViewShell( framework::FrameworkHelper::msRightPaneURL );
+        ToolPanelViewShell* pToolPanelShell = dynamic_cast< ToolPanelViewShell* >( pViewShell.get() );
+
+        if ( !pToolPanelShell )
+            throw IllegalArgumentException(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Wrong document type." ) ),
+                *this,
+                2
+            );
+
+        ::Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow );
+        if ( !pParentWindow || !pToolPanelShell->IsPanelAnchorWindow( *pParentWindow ) )
+            throw IllegalArgumentException(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unsupported parent window." ) ),
+                *this,
+                2
+            );
+
+        return pToolPanelShell->CreatePanelUIElement( xDocFrame, i_rResourceURL );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL ToolPanelFactory::getImplementationName(  ) throw (RuntimeException)
+    {
+        return ToolPanelFactory_getImplementationName();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Bool SAL_CALL ToolPanelFactory::supportsService( const ::rtl::OUString& i_rServiceName ) throw (RuntimeException)
+    {
+        const Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() );
+        for (   const ::rtl::OUString* pSupported = aSupported.getConstArray();
+                pSupported != aSupported.getConstArray() + aSupported.getLength();
+                ++pSupported
+            )
+            if ( *pSupported == i_rServiceName )
+                return sal_True;
+
+        return sal_False;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames(  ) throw (RuntimeException)
+    {
+        return ToolPanelFactory_getSupportedServiceNames();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL ToolPanelFactory::initialize( const Sequence< Any >& i_rArguments ) throw (Exception, RuntimeException)
+    {
+        ::comphelper::NamedValueCollection aArgs( i_rArguments );
+        (void)aArgs;
+        // TODO
+    }
+
+//......................................................................................................................
+} } // namespace sd::toolpanel
+//......................................................................................................................
diff --git a/sd/source/ui/toolpanel/ToolPanelUIElement.cxx b/sd/source/ui/toolpanel/ToolPanelUIElement.cxx
new file mode 100644
index 000000000000..e81f683bcfa7
--- /dev/null
+++ b/sd/source/ui/toolpanel/ToolPanelUIElement.cxx
@@ -0,0 +1,134 @@
+/*************************************************************************
+ * 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_sd.hxx"
+
+#include "ToolPanelUIElement.hxx"
+#include "MethodGuard.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/ui/UIElementType.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+/** === end UNO includes === **/
+
+#include <tools/diagnose_ex.h>
+
+//......................................................................................................................
+namespace sd { namespace toolpanel
+{
+//......................................................................................................................
+
+    /** === 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::XFrame;
+    using ::com::sun::star::lang::XComponent;
+    using ::com::sun::star::ui::XToolPanel;
+    using ::com::sun::star::lang::DisposedException;
+    /** === end UNO using === **/
+    namespace UIElementType = ::com::sun::star::ui::UIElementType;
+
+    typedef MethodGuard< ToolPanelUIElement > UIElementMethodGuard;
+
+    //==================================================================================================================
+    //= ToolPanelUIElement
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    ToolPanelUIElement::ToolPanelUIElement( const Reference< XFrame >& i_rFrame, const ::rtl::OUString& i_rResourceURL,
+            const Reference< XToolPanel >& i_rToolPanel )
+        :ToolPanelUIElement_Base( m_aMutex )
+        ,m_xFrame( i_rFrame )
+        ,m_sResourceURL( i_rResourceURL )
+        ,m_xToolPanel( i_rToolPanel )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ToolPanelUIElement::~ToolPanelUIElement()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void ToolPanelUIElement::checkDisposed()
+    {
+        if ( !m_xToolPanel.is() )
+            throw DisposedException( ::rtl::OUString(), *this );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XFrame > SAL_CALL ToolPanelUIElement::getFrame() throw (RuntimeException)
+    {
+        UIElementMethodGuard aGuard( *this );
+        return m_xFrame;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL ToolPanelUIElement::getResourceURL() throw (RuntimeException)
+    {
+        UIElementMethodGuard aGuard( *this );
+        return m_sResourceURL;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int16 SAL_CALL ToolPanelUIElement::getType() throw (RuntimeException)
+    {
+        UIElementMethodGuard aGuard( *this );
+        return UIElementType::TOOLPANEL;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XInterface > SAL_CALL ToolPanelUIElement::getRealInterface(  ) throw (RuntimeException)
+    {
+        UIElementMethodGuard aGuard( *this );
+        return m_xToolPanel.get();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL ToolPanelUIElement::disposing()
+    {
+        try
+        {
+            Reference< XComponent > xPanelComponent( m_xToolPanel, UNO_QUERY_THROW );
+            xPanelComponent->dispose();
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
+
+//......................................................................................................................
+} } // namespace sd::toolpanel
+//......................................................................................................................
diff --git a/sd/source/ui/toolpanel/ToolPanelUIElement.hxx b/sd/source/ui/toolpanel/ToolPanelUIElement.hxx
new file mode 100644
index 000000000000..0a74b7bd449e
--- /dev/null
+++ b/sd/source/ui/toolpanel/ToolPanelUIElement.hxx
@@ -0,0 +1,87 @@
+/*************************************************************************
+ * 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_TOOLPANELUIELEMENT_HXX
+#define SD_TOOLPANELUIELEMENT_HXX
+
+/** === begin UNO includes === **/
+#include <com/sun/star/ui/XUIElement.hpp>
+#include <com/sun/star/ui/XToolPanel.hpp>
+/** === end UNO includes === **/
+
+#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/basemutex.hxx>
+
+#include <memory>
+
+//......................................................................................................................
+namespace sd { namespace toolpanel
+{
+//......................................................................................................................
+
+    class TreeNode;
+
+    //==================================================================================================================
+    //= ToolPanelUIElement
+    //==================================================================================================================
+    typedef ::cppu::WeakComponentImplHelper1    <   ::com::sun::star::ui::XUIElement
+                                                >   ToolPanelUIElement_Base;
+    class ToolPanelUIElement    :public ::cppu::BaseMutex
+                                ,public ToolPanelUIElement_Base
+    {
+    public:
+        ToolPanelUIElement(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame,
+            const ::rtl::OUString& i_rResourceURL,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XToolPanel >& i_rToolPanel
+        );
+
+        // 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);
+
+        void checkDisposed();
+        ::osl::Mutex& getMutex() { return m_aMutex; }
+
+    protected:
+        virtual ~ToolPanelUIElement();
+
+        // OComponentHelper
+        virtual void SAL_CALL disposing();
+
+    private:
+        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >   m_xFrame;
+        const ::rtl::OUString                                                       m_sResourceURL;
+        const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XToolPanel >  m_xToolPanel;
+    };
+
+//......................................................................................................................
+} } // namespace sd::toolpanel
+//......................................................................................................................
+
+#endif // SD_TOOLPANELUIELEMENT_HXX
diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
new file mode 100755
index 000000000000..c62faf29ca50
--- /dev/null
+++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
@@ -0,0 +1,900 @@
+/*************************************************************************
+ * 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.
+ *
+************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sd.hxx"
+
+#include "taskpane/ToolPanelViewShell.hxx"
+
+#include "TaskPaneShellManager.hxx"
+#include "TaskPaneFocusManager.hxx"
+#include "taskpane/TaskPaneControlFactory.hxx"
+#include "controls/MasterPagesPanel.hxx"
+#include "LayoutMenu.hxx"
+#include "DrawDocShell.hxx"
+#include "controls/TableDesignPanel.hxx"
+#include "controls/CustomAnimationPanel.hxx"
+#include "controls/SlideTransitionPanel.hxx"
+#include "controls/MasterPagesSelector.hxx"
+#include "ToolPanel.hxx"
+#include "ToolPanelUIElement.hxx"
+#include "PaneDockingWindow.hxx"
+#include "FrameView.hxx"
+#include "Window.hxx"
+#include "sdmod.hxx"
+#include "app.hrc"
+#include "glob.hrc"
+#include "res_bmp.hrc"
+#include "helpids.h"
+#include "strings.hrc"
+#include "sdresid.hxx"
+#include "framework/FrameworkHelper.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/drawing/framework/XResourceId.hpp>
+#include <com/sun/star/drawing/framework/ResourceActivationMode.hpp>
+#include <com/sun/star/drawing/framework/AnchorBindingMode.hpp>
+#include <com/sun/star/drawing/framework/ResourceActivationMode.hpp>
+#include <com/sun/star/drawing/XDrawSubController.hpp>
+/** === end UNO includes === **/
+
+#include <svtools/toolpanel/toolpanel.hxx>
+#include <svtools/toolpanel/toolpaneldeck.hxx>
+#include <svx/dlgctrl.hxx>
+#include <sfx2/taskpane.hxx>
+#include <sfx2/imagemgr.hxx>
+#include <sfx2/bindings.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/viewfrm.hxx>
+#include <sfx2/msg.hxx>
+#include <sfx2/objface.hxx>
+#include <svx/colrctrl.hxx>
+#include <svx/xtable.hxx>
+#include <vcl/dockwin.hxx>
+#include "sdtreelb.hxx"
+#include "DrawViewShell.hxx"
+#include "drawdoc.hxx"
+#include "ViewShellBase.hxx"
+#include <svx/ruler.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/toolbox.hxx>
+#include <tools/diagnose_ex.h>
+#include <unotools/confignode.hxx>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/componentcontext.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/basemutex.hxx>
+
+#include <vector>
+
+using namespace ::sd::toolpanel;
+
+#define ToolPanelViewShell
+#include "sdslots.hxx"
+
+/** === 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::accessibility::XAccessible;
+using ::com::sun::star::drawing::XDrawSubController;
+using ::com::sun::star::frame::XFrame;
+using ::com::sun::star::drawing::framework::XResourceId;
+using ::com::sun::star::drawing::framework::XConfigurationChangeListener;
+using ::com::sun::star::drawing::framework::ConfigurationChangeEvent;
+using ::com::sun::star::lang::EventObject;
+using ::com::sun::star::lang::DisposedException;
+using ::com::sun::star::drawing::framework::XConfigurationControllerBroadcaster;
+using ::com::sun::star::drawing::framework::XConfigurationController;
+using ::com::sun::star::drawing::framework::XConfiguration;
+using ::com::sun::star::drawing::framework::AnchorBindingMode_DIRECT;
+using ::com::sun::star::ui::XUIElement;
+using ::com::sun::star::ui::XToolPanel;
+using ::com::sun::star::drawing::framework::ResourceActivationMode_REPLACE;
+/** === end UNO using === **/
+
+using ::sd::framework::FrameworkHelper;
+
+namespace sd { namespace toolpanel {
+
+// =====================================================================================================================
+// = misc helper
+// =====================================================================================================================
+// ---------------------------------------------------------------------------------------------------------------------
+PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL, const bool i_bIgnoreUnknown )
+{
+    PanelId ePanelId( PID_UNKNOWN );
+
+    if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msMasterPagesTaskPanelURL ) )
+    {
+        ePanelId = PID_MASTER_PAGES;
+    }
+    else if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msLayoutTaskPanelURL ) )
+    {
+        ePanelId = PID_LAYOUT;
+    }
+    else if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msTableDesignPanelURL ) )
+    {
+        ePanelId = PID_TABLE_DESIGN;
+    }
+    else if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msCustomAnimationTaskPanelURL ) )
+    {
+        ePanelId = PID_CUSTOM_ANIMATION;
+    }
+    else if ( i_rTaskPanelResourceURL.equals( FrameworkHelper::msSlideTransitionTaskPanelURL ) )
+    {
+        ePanelId = PID_SLIDE_TRANSITION;
+    }
+    else
+    {
+        OSL_ENSURE( i_bIgnoreUnknown, "GetStandardPanelId: cannot translate the given resource URL!" );
+        (void)i_bIgnoreUnknown;
+    }
+
+    return ePanelId;
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL )
+{
+    return GetStandardPanelId( i_rTaskPanelResourceURL, false );
+}
+
+// =====================================================================================================================
+// = ConfigurationListener - declaration
+// =====================================================================================================================
+typedef ::cppu::WeakImplHelper1 <   XConfigurationChangeListener
+                                >   ConfigurationListener_Base;
+
+class ConfigurationListener :public ::cppu::BaseMutex
+                            ,public ConfigurationListener_Base
+{
+public:
+    ConfigurationListener( ToolPanelViewShell_Impl& i_rShellImpl );
+
+    // XConfigurationChangeListener
+    virtual void SAL_CALL notifyConfigurationChange( const ConfigurationChangeEvent& aEvent ) throw (RuntimeException);
+
+    // XEventListener
+    virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException);
+
+    // XComponent equivalents (not available per UNO interface)
+    void    dispose();
+
+protected:
+    ~ConfigurationListener();
+
+    void impl_checkDisposed_throw()
+    {
+        if ( !m_pShellImpl )
+            throw DisposedException( ::rtl::OUString(), *this );
+    }
+
+private:
+    ToolPanelViewShell_Impl* m_pShellImpl;
+};
+
+// =====================================================================================================================
+// = ToolPanelViewShell_Impl - declaration
+// =====================================================================================================================
+/** Inner implementation class of ToolPanelViewShell.
+*/
+class ToolPanelViewShell_Impl   :public ::boost::noncopyable
+                                ,public ::svt::IToolPanelDeckListener
+                                ,public ::sfx2::IToolPanelCompare
+{
+public:
+    static const size_t mnInvalidId = static_cast< size_t >( -1 );
+
+    ToolPanelViewShell_Impl( ToolPanelViewShell& i_rPanelViewShell, ::Window& i_rPanelDeckParent );
+    ~ToolPanelViewShell_Impl();
+
+    ToolPanelViewShell& GetAntiImpl() { return m_rPanelViewShell; }
+
+    /** Here the panels are created that are shown in the task pane.
+    */
+    void Setup();
+
+    /** clean up the instance
+    */
+    void Cleanup();
+
+    /** activates the panel which has the given resource URL
+    */
+    void    ActivatePanelByResource( const ::rtl::OUString& i_rPanelResourceURL );
+
+    /** de-activates the panel given by its resource URL, bypassing the configuration controller
+
+        If the panel is not active currently, nothing happens.
+    */
+    void    DeactivatePanelByResource( const ::rtl::OUString& i_rPanelResourceURL );
+
+    /** provides access to the the VCL window of the panel deck
+    */
+          ::sfx2::ModuleTaskPane& GetTaskPane()       { return *m_pTaskPane; }
+    const ::sfx2::ModuleTaskPane& GetTaskPane() const { return *m_pTaskPane; }
+
+          ::svt::ToolPanelDeck& GetToolPanelDeck()       { return GetTaskPane().GetPanelDeck(); }
+    const ::svt::ToolPanelDeck& GetToolPanelDeck() const { return GetTaskPane().GetPanelDeck(); }
+
+    Reference< XAccessible >
+            CreateAccessible( ::sd::Window& i_rWindow );
+
+    void    ConnectToDockingWindow();
+
+private:
+    // 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();
+
+    // IToolPanelCompare overridables
+    virtual short compareToolPanelsURLs( const ::rtl::OUString& i_rLHS, const ::rtl::OUString& i_rRHS ) const;
+
+private:
+    struct InitialPanel
+    {
+        ::rtl::OUString sPanelResourceURL;
+        bool            bActivateDirectly;
+        InitialPanel()
+            :sPanelResourceURL()
+            ,bActivateDirectly( true )
+        {
+        }
+    };
+    InitialPanel        impl_determineInitialPanel();
+    ::rtl::OUString     impl_getPanelURL( const ::boost::optional< size_t >& i_rPanel );
+
+private:
+    ToolPanelViewShell&                             m_rPanelViewShell;
+    ::boost::scoped_ptr< ::sfx2::ModuleTaskPane >   m_pTaskPane;
+    ::std::auto_ptr< ::sfx2::TaskPaneController >   m_pTaskPaneController;
+    ::rtl::Reference< ConfigurationListener >       m_pConfigListener;
+    bool                                            m_bInitialized;
+};
+
+// =====================================================================================================================
+// = ConfigurationListener - implementation
+// =====================================================================================================================
+// ---------------------------------------------------------------------------------------------------------------------
+ConfigurationListener::ConfigurationListener( ToolPanelViewShell_Impl& i_rShellImpl )
+    :m_pShellImpl( &i_rShellImpl )
+{
+    ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( i_rShellImpl.GetAntiImpl().GetViewShellBase() ) );
+    Reference< XConfigurationControllerBroadcaster > xBroadcaster;
+    if ( pFrameworkHelper.get() )
+        xBroadcaster.set( pFrameworkHelper->GetConfigurationController().get() );
+    ENSURE_OR_THROW( pFrameworkHelper.get(), "no access to the config controller" );
+
+    osl_incrementInterlockedCount( &m_refCount );
+    {
+        xBroadcaster->addConfigurationChangeListener( this, ::rtl::OUString(), Any() );
+    }
+    osl_decrementInterlockedCount( &m_refCount );
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+ConfigurationListener::~ConfigurationListener()
+{
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void SAL_CALL ConfigurationListener::notifyConfigurationChange( const ConfigurationChangeEvent& i_rEvent ) throw (RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
+    // is this an event we're interested in?
+    if ( i_rEvent.Type != FrameworkHelper::msResourceActivationEvent )
+        return;
+
+    // is this a resource we're interested in? Must be anchored in the task pane ...
+    Reference< XResourceId > xAnchorId;
+    if ( i_rEvent.ResourceId.is() )
+        xAnchorId = i_rEvent.ResourceId->getAnchor();
+    if ( !xAnchorId.is() )
+        return;
+    const ::rtl::OUString sAnchorURL( xAnchorId->getResourceURL() );
+    if ( sAnchorURL != FrameworkHelper::msTaskPaneURL )
+        return;
+
+    m_pShellImpl->ActivatePanelByResource( i_rEvent.ResourceId->getResourceURL() );
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void SAL_CALL ConfigurationListener::disposing( const EventObject& i_rEvent ) throw (RuntimeException)
+{
+    (void)i_rEvent;
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        impl_checkDisposed_throw();
+    }
+
+    dispose();
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ConfigurationListener::dispose()
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    m_pShellImpl = NULL;
+}
+
+// =====================================================================================================================
+// = ToolPanelViewShell
+// =====================================================================================================================
+// ---------------------------------------------------------------------------------------------------------------------
+SFX_IMPL_INTERFACE(ToolPanelViewShell, SfxShell, SdResId(STR_TASKPANEVIEWSHELL))
+{
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+TYPEINIT1(ToolPanelViewShell, ViewShell);
+
+// ---------------------------------------------------------------------------------------------------------------------
+ToolPanelViewShell_Impl::InitialPanel ToolPanelViewShell_Impl::impl_determineInitialPanel()
+{
+    InitialPanel aPanelToActivate;
+    if ( GetAntiImpl().GetViewShellBase().GetDocShell()->GetDocumentType() == DOCUMENT_TYPE_DRAW )
+        // for Draw, rely on SFX's default handling, which is to activate the previously active panel
+        return aPanelToActivate;
+
+    // Default to Layout panel, but check whether the requested configuration already contains a tool panel, in this case,
+    // use that one.
+    aPanelToActivate.sPanelResourceURL = FrameworkHelper::msLayoutTaskPanelURL;
+    aPanelToActivate.bActivateDirectly = false;
+    try
+    {
+        ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( m_rPanelViewShell.GetViewShellBase() ) );
+        const Reference< XResourceId > xToolPanelId( pFrameworkHelper->CreateResourceId( FrameworkHelper::msTaskPaneURL, FrameworkHelper::msRightPaneURL ) );
+        Reference< XConfigurationController > xCC( pFrameworkHelper->GetConfigurationController(), UNO_QUERY_THROW );
+        Reference< XConfiguration > xConfiguration( xCC->getRequestedConfiguration(), UNO_QUERY_THROW );
+        Sequence< Reference< XResourceId > > aViewIds( xConfiguration->getResources(
+            FrameworkHelper::CreateResourceId( FrameworkHelper::msTaskPaneURL, FrameworkHelper::msRightPaneURL ),
+            FrameworkHelper::msTaskPanelURLPrefix, AnchorBindingMode_DIRECT ) );
+
+        if ( aViewIds.getLength() > 0 )
+        {
+            const ::rtl::OUString sResourceURL( aViewIds[0]->getResourceURL() );
+            PanelId nRequestedPanel = GetStandardPanelId( sResourceURL );
+            if ( nRequestedPanel != PID_UNKNOWN )
+            {
+                aPanelToActivate.sPanelResourceURL = sResourceURL;
+                aPanelToActivate.bActivateDirectly = true;
+            }
+        }
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
+    return aPanelToActivate;
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell_Impl::Setup()
+{
+    if ( m_bInitialized )
+        return;
+    m_bInitialized = true;
+
+    // initially activate a panel
+    const InitialPanel aInitialPanel = impl_determineInitialPanel();
+    if ( aInitialPanel.sPanelResourceURL.getLength() )
+    {
+        if ( aInitialPanel.bActivateDirectly )
+        {
+            ActivatePanelByResource( aInitialPanel.sPanelResourceURL );
+        }
+        else
+        {
+            ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( GetAntiImpl().GetViewShellBase() ) );
+            pFrameworkHelper->RequestTaskPanel( aInitialPanel.sPanelResourceURL );
+        }
+    }
+
+    // listen at the configuration
+    m_pConfigListener.set( new ConfigurationListener( *this ) );
+
+    m_pTaskPane->Show();
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell_Impl::Cleanup()
+{
+    if ( m_bInitialized )
+    {
+        if ( m_pConfigListener.is() )
+            m_pConfigListener->dispose();
+    }
+    GetToolPanelDeck().RemoveListener( *this );
+    m_pTaskPaneController.reset();
+    m_pTaskPane.reset();
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell_Impl::ActivatePanelByResource( const ::rtl::OUString& i_rResourceURL )
+{
+    // determine position of the requested panel
+    ::boost::optional< size_t > aPanelPos = GetTaskPane().GetPanelPos( i_rResourceURL );
+    OSL_ENSURE( !!aPanelPos, "ToolPanelViewShell_Impl::ActivatePanelByResource: illegal panel resource, or illegal panel deck setup!" );
+    if ( !!aPanelPos )
+        GetToolPanelDeck().ActivatePanel( *aPanelPos );
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell_Impl::DeactivatePanelByResource( const ::rtl::OUString& i_rPanelResourceURL )
+{
+    // determine position of the requested panel
+    ::boost::optional< size_t > aPanelPos = GetTaskPane().GetPanelPos( i_rPanelResourceURL );
+    OSL_ENSURE( !!aPanelPos, "ToolPanelViewShell_Impl::DeactivatePanelByResource: illegal panel resource, or illegal panel deck setup!" );
+    if ( !!aPanelPos )
+    {
+        if ( GetToolPanelDeck().GetActivePanel() == *aPanelPos )
+            GetToolPanelDeck().ActivatePanel( ::boost::optional< size_t >() );
+    }
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell::Initialize()
+{
+    mpImpl->Setup();
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow,
+        FrameView* pFrameViewArgument )
+    :ViewShell(pFrame, pParentWindow, rViewShellBase)
+    ,mpImpl( new ToolPanelViewShell_Impl( *this, *mpContentWindow.get() ) )
+    ,mpSubShellManager()
+    ,mnMenuId(0)
+{
+    meShellType = ST_TASK_PANE;
+
+    mpContentWindow->SetCenterAllowed( false );
+    pParentWindow->SetStyle( pParentWindow->GetStyle() | WB_DIALOGCONTROL );
+
+    GetParentWindow()->SetBackground( Wallpaper() );
+    mpContentWindow->SetBackground( Wallpaper() );
+
+    GetParentWindow()->SetHelpId(HID_SD_TASK_PANE);
+
+    mpImpl->ConnectToDockingWindow();
+
+    SetPool( &GetDoc()->GetPool() );
+
+    if ( pFrameViewArgument )
+        mpFrameView = pFrameViewArgument;
+    else
+        mpFrameView = new FrameView( GetDoc() );
+    GetFrameView()->Connect();
+
+    // Hide or delete unused controls that we have inherited from the
+    // ViewShell base class.
+    mpHorizontalScrollBar.reset();
+    mpVerticalScrollBar.reset();
+    mpScrollBarBox.reset();
+    mpHorizontalRuler.reset();
+    mpVerticalRuler.reset();
+
+    SetName( String( RTL_CONSTASCII_USTRINGPARAM( "ToolPanelViewShell" ) ) );
+
+    // For accessibility we have to shortly hide the content window.  This
+    // triggers the construction of a new accessibility object for the new
+    // view shell.  (One is created earlier while the construtor of the base
+    // class is executed.  At that time the correct accessibility object can
+    // not be constructed.)
+    if ( mpContentWindow.get() )
+    {
+        mpContentWindow->Hide();
+        mpContentWindow->Show();
+    }
+
+    // Register the shell manager as factory at the ViewShellManager.
+    mpSubShellManager.reset( new TaskPaneShellManager(
+        GetViewShellBase().GetViewShellManager(),
+        *this
+    ) );
+    GetViewShellBase().GetViewShellManager()->AddSubShellFactory( this, mpSubShellManager );
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+ToolPanelViewShell::~ToolPanelViewShell()
+{
+    mpImpl->Cleanup();
+
+    // reset our impl before destroying the panel deck, to ensure the hidden panels are properly
+    // disposed/destroyed, too
+    mpImpl.reset();
+    GetViewShellBase().GetViewShellManager()->RemoveSubShellFactory(this, mpSubShellManager);
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+// static
+void ToolPanelViewShell::RegisterControls()
+{
+    SfxModule* pModule = SD_MOD();
+    controls::MasterPagesSelector::RegisterInterface( pModule );
+    LayoutMenu::RegisterInterface( pModule );
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell::ArrangeGUIElements()
+{
+    ViewShell::ArrangeGUIElements();
+
+    Initialize();
+
+    mpImpl->GetTaskPane().SetPosSizePixel( Point(), maViewSize );
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell::GetFocus()
+{
+    Invalidate();
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell::LoseFocus()
+{
+    Invalidate();
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell::KeyInput( const KeyEvent& i_rKeyEvent )
+{
+    const KeyCode nCode = i_rKeyEvent.GetKeyCode();
+    if ( nCode == KEY_RETURN )
+    {
+        if ( !mpImpl->GetTaskPane().HasChildPathFocus() )
+            mpImpl->GetTaskPane().GrabFocus();
+    }
+    else
+        ViewShell::KeyInput( i_rKeyEvent, NULL );
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+SdPage* ToolPanelViewShell::GetActualPage()
+{
+    return NULL;
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+SdPage* ToolPanelViewShell::getCurrentPage() const
+{
+    return NULL;
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell::Execute( SfxRequest& )
+{
+    OSL_ENSURE( false, "ToolPanelViewShell::Execute: not to be called! (right?)" );
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell::GetState( SfxItemSet& )
+{
+    OSL_ENSURE( false, "ToolPanelViewShell::GetState: not to be called! (right?)" );
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+TaskPaneShellManager& ToolPanelViewShell::GetSubShellManager() const
+{
+    return *mpSubShellManager.get();
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+DockingWindow* ToolPanelViewShell::GetDockingWindow()
+{
+    ::Window* pParentWindow = GetParentWindow();
+    DockingWindow* pDockingWindow = NULL;
+    while (pParentWindow!=NULL && pDockingWindow==NULL)
+    {
+        pDockingWindow = dynamic_cast<DockingWindow*>(pParentWindow);
+        pParentWindow = pParentWindow->GetParent();
+    }
+    return pDockingWindow;
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+Reference< XAccessible > ToolPanelViewShell::CreateAccessibleDocumentView( ::sd::Window* i_pWindow )
+{
+    ENSURE_OR_RETURN( i_pWindow, "ToolPanelViewShell::CreateAccessibleDocumentView: illegal window!", NULL );
+    return mpImpl->CreateAccessible( *i_pWindow );
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+Reference< XDrawSubController > ToolPanelViewShell::CreateSubController()
+{
+    // This view shell is not designed to be the main view shell and thus
+    // does not support a UNO sub controller.
+    return Reference< XDrawSubController >();
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+bool ToolPanelViewShell::RelocateToParentWindow( ::Window* pParentWindow )
+{
+    ::Window* pOldParentWindow = GetParentWindow();
+    FocusManager::Instance().RemoveLinks( pOldParentWindow, &mpImpl->GetTaskPane() );
+    FocusManager::Instance().RemoveLinks( &mpImpl->GetTaskPane(), pOldParentWindow );
+
+    PaneDockingWindow* pDockingWindow = dynamic_cast< PaneDockingWindow* >( GetDockingWindow() );
+    if ( pDockingWindow != NULL )
+    {
+        pDockingWindow->SetEndDockingHdl( Link() );
+    }
+
+    ViewShell::RelocateToParentWindow(pParentWindow);
+
+    mpImpl->ConnectToDockingWindow();
+
+    Resize();
+
+    return true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+bool ToolPanelViewShell::IsPanelAnchorWindow( const ::Window& i_rWindow ) const
+{
+    return &mpImpl->GetToolPanelDeck().GetPanelWindowAnchor() == &i_rWindow;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+namespace
+{
+    typedef std::auto_ptr< ControlFactory > (*ControlFactoryFactory)( ToolPanelViewShell& i_rToolPanelShell );
+
+    struct PanelFactory
+    {
+        ControlFactoryFactory   pFactory;
+        ULONG                   nHelpID;
+        PanelFactory( const ControlFactoryFactory i_pFactory, const ULONG i_nHelpID )
+            :pFactory( i_pFactory )
+            ,nHelpID( i_nHelpID )
+        {
+        }
+    };
+
+    const PanelFactory lcl_describePanel( const PanelId i_ePanelId )
+    {
+        switch ( i_ePanelId )
+        {
+        case PID_MASTER_PAGES:
+            return PanelFactory( &controls::MasterPagesPanel::CreateControlFactory, HID_SD_SLIDE_DESIGNS );
+        case PID_LAYOUT:
+            return PanelFactory( &LayoutMenu::CreateControlFactory, HID_SD_SLIDE_LAYOUTS );
+        case PID_TABLE_DESIGN:
+            return PanelFactory( &controls::TableDesignPanel::CreateControlFactory, HID_SD_TABLE_DESIGN );
+        case PID_CUSTOM_ANIMATION:
+            return PanelFactory( &controls::CustomAnimationPanel::CreateControlFactory, HID_SD_CUSTOM_ANIMATIONS );
+        case PID_SLIDE_TRANSITION:
+            return PanelFactory( &controls::SlideTransitionPanel::CreateControlFactory, HID_SD_SLIDE_TRANSITIONS );
+        default:
+            break;
+        }
+        throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal panel ID" ) ), NULL );
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+Reference< XUIElement > ToolPanelViewShell::CreatePanelUIElement( const Reference< XFrame >& i_rDocFrame, const ::rtl::OUString& i_rPanelResourceURL )
+{
+    const PanelId ePanelId( GetStandardPanelId( i_rPanelResourceURL ) );
+    ENSURE_OR_RETURN( ePanelId != PID_UNKNOWN, "ToolPanelViewShell::CreatePanelUIElement: illegal panel URL!", NULL );
+
+    // a TreeNode which will resemble the panel
+    const PanelFactory aPanelFactory( lcl_describePanel( ePanelId ) );
+    ::std::auto_ptr< ControlFactory > pControlFactory( (*aPanelFactory.pFactory)( *this ) );
+    ::std::auto_ptr< TreeNode > pNode( pControlFactory->CreateControl( mpImpl->GetToolPanelDeck().GetPanelWindowAnchor() ) );
+    ENSURE_OR_THROW( ( pNode.get() != NULL ) && ( pNode->GetWindow() != NULL ),
+        "illegal node returned by the control factory" );
+    pNode->GetWindow()->SetHelpId( aPanelFactory.nHelpID );
+
+    // create an XToolPanel
+    Reference< XToolPanel > xPanel( new ToolPanel( pNode ) );
+
+    // create an XUIElement providing this panel
+    const Reference< XUIElement > xUIElement( new ToolPanelUIElement( i_rDocFrame, i_rPanelResourceURL, xPanel ) );
+
+    return xUIElement;
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell::ActivatePanel( const ::rtl::OUString& i_rPanelResourceURL )
+{
+    OSL_ENSURE( i_rPanelResourceURL.indexOf( FrameworkHelper::msTaskPanelURLPrefix ) < 0,
+        "ToolPanelViewShell::ActivatePanel: for drawing-framework-controller panels, please use FrameworkHelper::RequestTaskPanel!" );
+    mpImpl->ActivatePanelByResource( i_rPanelResourceURL );
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell::DeactivatePanel( const ::rtl::OUString& i_rPanelResourceURL )
+{
+    mpImpl->DeactivatePanelByResource( i_rPanelResourceURL );
+}
+
+// =====================================================================================================================
+// = ToolPanelViewShell_Impl - implementation
+// =====================================================================================================================
+// ---------------------------------------------------------------------------------------------------------------------
+ToolPanelViewShell_Impl::ToolPanelViewShell_Impl( ToolPanelViewShell& i_rPanelViewShell, ::Window& i_rPanelDeckParent )
+    :m_rPanelViewShell( i_rPanelViewShell )
+    ,m_pTaskPane( new ::sfx2::ModuleTaskPane( i_rPanelDeckParent, i_rPanelViewShell.GetViewShellBase().GetViewFrame()->GetFrame().GetFrameInterface(), *this ) )
+    ,m_bInitialized( false )
+{
+    const String sPaneTitle( SdResId( STR_RIGHT_PANE_TITLE ) );
+    GetToolPanelDeck().SetAccessibleName( sPaneTitle );
+    GetToolPanelDeck().SetAccessibleDescription( sPaneTitle );
+
+    GetToolPanelDeck().AddListener( *this );
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+ToolPanelViewShell_Impl::~ToolPanelViewShell_Impl()
+{
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition )
+{
+    // not interested in
+    (void)i_pPanel;
+    (void)i_nPosition;
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell_Impl::PanelRemoved( const size_t i_nPosition )
+{
+    // not interested in
+    (void)i_nPosition;
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+::rtl::OUString ToolPanelViewShell_Impl::impl_getPanelURL( const ::boost::optional< size_t >& i_rPanel )
+{
+    ::rtl::OUString sPanelURL;
+    if ( !!i_rPanel )
+    {
+        sPanelURL = GetTaskPane().GetPanelResourceURL( *i_rPanel );
+        const PanelId ePanelId( GetStandardPanelId( sPanelURL, true ) );
+        if ( ePanelId == PID_UNKNOWN )
+            sPanelURL = ::rtl::OUString();
+    }
+    return sPanelURL;
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive )
+{
+    // update the configuration controller, since this change in the active panel might have been triggered by means other
+    // than the drawing framework, so it does not yet know about it.
+
+    const ::rtl::OUString sOldPanelURL( impl_getPanelURL( i_rOldActive ) );
+    const ::rtl::OUString sNewPanelURL( impl_getPanelURL( i_rNewActive ) );
+
+    const ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( GetAntiImpl().GetViewShellBase() ) );
+    if ( sNewPanelURL.getLength() )
+    {
+        // activate the resource belonging to the new panel. This will automatically de-activate the previously active
+        // panel resource (since ResourceActivationMode_REPLACE is used)
+        pFrameworkHelper->RequestTaskPanel( sNewPanelURL );
+    }
+    else if ( sOldPanelURL.getLength() )
+    {
+        // there is no new active panel, or it is not one of our standard panels, i.e. it is not covered by the
+        // resource framework. => Deactivate the old resource.
+        try
+        {
+            Reference< XConfigurationController > xConfigController( pFrameworkHelper->GetConfigurationController(), UNO_QUERY_THROW );
+            xConfigController->requestResourceDeactivation(
+                pFrameworkHelper->CreateResourceId(
+                    sOldPanelURL,
+                    FrameworkHelper::msTaskPaneURL,
+                    FrameworkHelper::msRightPaneURL
+                )
+            );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter )
+{
+    // not interested in
+    (void)i_rNewLayouter;
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell_Impl::Dying()
+{
+    // not interested in
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+short ToolPanelViewShell_Impl::compareToolPanelsURLs( const ::rtl::OUString& i_rLHS, const ::rtl::OUString& i_rRHS ) const
+{
+    const PanelId eLHS( GetStandardPanelId( i_rLHS, true ) );
+    const PanelId eRHS( GetStandardPanelId( i_rRHS, true ) );
+    if ( eLHS < eRHS )
+        return -1;
+    if ( eLHS == eRHS )
+        return 0;
+    return 1;
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void ToolPanelViewShell_Impl::ConnectToDockingWindow()
+{
+    m_pTaskPaneController.reset();
+    DockingWindow* pDockingWindow( GetAntiImpl().GetDockingWindow() );
+    if ( pDockingWindow )
+    {
+        PaneDockingWindow* pPaneDockingWindow = dynamic_cast< PaneDockingWindow* >( pDockingWindow );
+        OSL_ENSURE( pPaneDockingWindow, "ToolPanelViewShell_Impl::ConnectToDockingWindow: unsupported docking window type!" );
+        if ( pPaneDockingWindow != NULL )
+            m_pTaskPaneController.reset( new ::sfx2::TaskPaneController( GetTaskPane(), *pPaneDockingWindow ) );
+    }
+
+    // Tell the focus manager that we want to pass the focus to our
+    // child.
+    FocusManager::Instance().RegisterDownLink( GetAntiImpl().GetParentWindow(), &GetTaskPane() );
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+Reference< XAccessible > ToolPanelViewShell_Impl::CreateAccessible( ::sd::Window& i_rWindow )
+{
+    Reference< XAccessible > xAccessible( GetToolPanelDeck().GetAccessible( FALSE ) );
+    if ( !xAccessible.is() )
+    {
+        // determine the XAccessible which is the parent of the to-be-created object
+        ::Window* pAccessibleParent = i_rWindow.GetAccessibleParentWindow();
+        OSL_ENSURE( pAccessibleParent, "ToolPanelViewShell_Impl::CreateAccessible: illegal accessible parent provided by the sd::Window!" );
+        GetToolPanelDeck().SetAccessibleParentWindow( pAccessibleParent );
+
+        xAccessible = GetToolPanelDeck().GetAccessible( TRUE );
+        ENSURE_OR_RETURN( xAccessible.is(), "ToolPanelViewShell_Impl::CreateAccessible: illegal ToolPanelDeck accessible!", NULL );
+        OSL_ENSURE( xAccessible->getAccessibleContext().is()
+                &&  xAccessible->getAccessibleContext()->getAccessibleParent() == pAccessibleParent->GetAccessible(),
+                "ToolPanelViewShell_Impl::CreateAccessible: illegal parenthood!" );
+    }
+    return xAccessible;
+}
+
+} } // end of namespace ::sd::toolpanel
diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx
index 9767efe87c48..e7edf109cffd 100644..100755
--- a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx
+++ b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx
@@ -31,6 +31,7 @@
 #include "CustomAnimationPanel.hxx"
 
 #include "taskpane/TaskPaneControlFactory.hxx"
+#include "taskpane/ToolPanelViewShell.hxx"
 
 #include "strings.hrc"
 #include "sdresid.hxx"
@@ -44,10 +45,11 @@ namespace sd
 namespace toolpanel { namespace controls {
 
 
-CustomAnimationPanel::CustomAnimationPanel(TreeNode* pParent, ViewShellBase& rBase)
-    : SubToolPanel (pParent)
+CustomAnimationPanel::CustomAnimationPanel(Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell)
+    :SubToolPanel( i_rParentWindow )
+    ,m_pPanelViewShell( &i_rPanelViewShell )
 {
-    mpWrappedControl = createCustomAnimationPanel( pParent->GetWindow(), rBase );
+    mpWrappedControl = createCustomAnimationPanel( &i_rParentWindow, i_rPanelViewShell.GetViewShellBase() );
     mpWrappedControl->Show();
 }
 
@@ -56,10 +58,17 @@ CustomAnimationPanel::~CustomAnimationPanel()
     delete mpWrappedControl;
 }
 
-std::auto_ptr<ControlFactory> CustomAnimationPanel::CreateControlFactory (ViewShellBase& rBase)
+std::auto_ptr< ControlFactory > CustomAnimationPanel::CreateControlFactory( ToolPanelViewShell& i_rToolPanelShell )
 {
-    return std::auto_ptr<ControlFactory>(
-        new ControlFactoryWithArgs1<CustomAnimationPanel,ViewShellBase>(rBase));
+    return std::auto_ptr< ControlFactory >(
+        new RootControlFactoryWithArg< CustomAnimationPanel, ToolPanelViewShell >( i_rToolPanelShell ) );
+}
+
+TaskPaneShellManager* CustomAnimationPanel::GetShellManager()
+{
+    if ( m_pPanelViewShell )
+        return &m_pPanelViewShell->GetSubShellManager();
+    return SubToolPanel::GetShellManager();
 }
 
 Size CustomAnimationPanel::GetPreferredSize()
diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx
index 734965e5264b..864ba637b94d 100644..100755
--- a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx
+++ b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx
@@ -37,6 +37,7 @@ class ViewShellBase;
 namespace sd { namespace toolpanel {
 class TreeNode;
 class ControlFactory;
+class ToolPanelViewShell;
 } }
 
 namespace sd { namespace toolpanel { namespace controls {
@@ -46,12 +47,16 @@ class CustomAnimationPanel
 {
 public:
     CustomAnimationPanel (
-        TreeNode* pParent,
-        ViewShellBase& rBase);
+        Window& i_rParentWindow,
+        ToolPanelViewShell& i_rPanelViewShell);
     virtual ~CustomAnimationPanel (void);
 
-    static std::auto_ptr<ControlFactory> CreateControlFactory (ViewShellBase& rBase);
+    static std::auto_ptr<ControlFactory> CreateControlFactory (ToolPanelViewShell& i_rPanelViewShell);
 
+    // TreeNode overridables
+    virtual TaskPaneShellManager* GetShellManager();
+
+    // ILayoutableWindow overridables
     virtual Size GetPreferredSize (void);
     virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeigh);
     virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth);
@@ -68,6 +73,7 @@ public:
 private:
     Size maPreferredSize;
     ::Window* mpWrappedControl;
+    ToolPanelViewShell* m_pPanelViewShell;
 };
 
 } } } // end of namespace ::sd::toolpanel::controls
diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
index 2e121098194a..b9040e72283f 100644..100755
--- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
+++ b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
@@ -44,6 +44,8 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include "stlpool.hxx"
 #include <svx/xfillit0.hxx>
+#include <tools/diagnose_ex.h>
+
 using namespace ::com::sun::star;
 
 namespace sd { namespace toolpanel { namespace controls {
@@ -245,9 +247,7 @@ SdPage* DocumentHelper::AddMasterPage (
         catch (uno::Exception& rException)
         {
             pClonedMasterPage = NULL;
-            OSL_TRACE("caught exception while adding master page: %s",
-                ::rtl::OUStringToOString(rException.Message,
-                    RTL_TEXTENCODING_UTF8).getStr());
+            DBG_UNHANDLED_EXCEPTION();
         }
         catch (::std::exception rException)
         {
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
index 6b9ff09bbed3..9a5eefb6d925 100644..100755
--- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
@@ -40,6 +40,7 @@
 #include <vcl/image.hxx>
 #include <vcl/pngread.hxx>
 #include <com/sun/star/embed/ElementModes.hpp>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -291,7 +292,7 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume
     }
     catch (uno::RuntimeException)
     {
-        OSL_TRACE ("caught exception while loading page from template file");
+        DBG_UNHANDLED_EXCEPTION();
         pPage = NULL;
     }
 
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
index b897e1514862..8dab51e93a58 100644..100755
--- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
@@ -33,6 +33,7 @@
 #include "CurrentMasterPagesSelector.hxx"
 #include "RecentMasterPagesSelector.hxx"
 #include "AllMasterPagesSelector.hxx"
+#include "taskpane/ToolPanelViewShell.hxx"
 #include "taskpane/TaskPaneControlFactory.hxx"
 #include "taskpane/TitledControl.hxx"
 #include "../TaskPaneShellManager.hxx"
@@ -48,8 +49,14 @@
 namespace sd { namespace toolpanel { namespace controls {
 
 
-MasterPagesPanel::MasterPagesPanel (TreeNode* pParent, ViewShellBase& rBase)
-    : ScrollPanel (pParent)
+MasterPagesPanel::MasterPagesPanel (::Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell)
+    :ScrollPanel (i_rParentWindow)
+    ,m_pPanelViewShell( &i_rPanelViewShell )
+{
+    impl_construct( m_pPanelViewShell->GetViewShellBase() );
+}
+
+void MasterPagesPanel::impl_construct( ViewShellBase& rBase )
 {
     SdDrawDocument* pDocument = rBase.GetDocument();
     ::std::auto_ptr<controls::MasterPagesSelector> pSelector;
@@ -118,18 +125,33 @@ MasterPagesPanel::MasterPagesPanel (TreeNode* pParent, ViewShellBase& rBase)
 
 MasterPagesPanel::~MasterPagesPanel (void)
 {
+    TaskPaneShellManager* pShellManager( GetShellManager() );
+    OSL_ENSURE( pShellManager, "MasterPagesPanel::~MasterPagesPanel: no shell manager anymore - cannot remove sub shells!" );
+    if ( pShellManager )
+    {
+        pShellManager->RemoveSubShell( HID_SD_TASK_PANE_PREVIEW_CURRENT );
+        pShellManager->RemoveSubShell( HID_SD_TASK_PANE_PREVIEW_RECENT );
+        pShellManager->RemoveSubShell( HID_SD_TASK_PANE_PREVIEW_ALL );
+    }
 }
 
 
 
 
-std::auto_ptr<ControlFactory> MasterPagesPanel::CreateControlFactory (ViewShellBase& rBase)
+TaskPaneShellManager* MasterPagesPanel::GetShellManager()
 {
-    return std::auto_ptr<ControlFactory>(
-        new ControlFactoryWithArgs1<MasterPagesPanel,ViewShellBase>(rBase));
+    if ( m_pPanelViewShell )
+        return &m_pPanelViewShell->GetSubShellManager();
+    return TreeNode::GetShellManager();
 }
 
 
 
 
+std::auto_ptr< ControlFactory > MasterPagesPanel::CreateControlFactory( ToolPanelViewShell& i_rToolPanelShell )
+{
+    return std::auto_ptr< ControlFactory >(
+        new RootControlFactoryWithArg< MasterPagesPanel, ToolPanelViewShell >( i_rToolPanelShell ) );
+}
+
 } } } // end of namespace ::sd::toolpanel::controls
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx
index 1c6d75ea8dcb..932007802ebf 100644..100755
--- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx
@@ -37,6 +37,7 @@ class ViewShellBase;
 namespace sd { namespace toolpanel {
 class ControlFactory;
 class TreeNode;
+class ToolPanelViewShell;
 } }
 
 namespace sd { namespace toolpanel { namespace controls {
@@ -50,11 +51,20 @@ class MasterPagesPanel
 {
 public:
     MasterPagesPanel (
-        TreeNode* pParent,
-        ViewShellBase& rBase);
+        ::Window& i_rParentWindow,
+        ToolPanelViewShell& i_rPanelViewShell);
     virtual ~MasterPagesPanel (void);
 
-    static std::auto_ptr<ControlFactory> CreateControlFactory (ViewShellBase& rBase);
+    // TreeNode overridables
+    virtual TaskPaneShellManager* GetShellManager (void);
+
+    static std::auto_ptr<ControlFactory> CreateControlFactory (ToolPanelViewShell& i_rToolPanelShell);
+
+private:
+    void    impl_construct( ViewShellBase& rBase );
+
+private:
+    ToolPanelViewShell* m_pPanelViewShell;
 };
 
 } } } // end of namespace ::sd::toolpanel::controls
diff --git a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx
index 2cb0f58a029b..4ad67b876983 100644..100755
--- a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx
+++ b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx
@@ -30,6 +30,7 @@
 #include "SlideTransitionPanel.hxx"
 
 #include "taskpane/TaskPaneControlFactory.hxx"
+#include "taskpane/ToolPanelViewShell.hxx"
 
 #include "strings.hrc"
 #include "sdresid.hxx"
@@ -45,11 +46,12 @@ namespace toolpanel { namespace controls {
 
 
 
-SlideTransitionPanel::SlideTransitionPanel(TreeNode* pParent, ViewShellBase& rBase)
-    : SubToolPanel (pParent),
-      maPreferredSize( 100, 200 )
+SlideTransitionPanel::SlideTransitionPanel(Window& i_rParentWindow, ToolPanelViewShell& i_rToolPanelShell)
+    :SubToolPanel( i_rParentWindow )
+    ,maPreferredSize( 100, 200 )
+    ,m_pPanelViewShell( &i_rToolPanelShell )
 {
-    mpWrappedControl = createSlideTransitionPanel( pParent->GetWindow(), rBase );
+    mpWrappedControl = createSlideTransitionPanel( &i_rParentWindow, i_rToolPanelShell.GetViewShellBase() );
     mpWrappedControl->Show();
 }
 
@@ -58,10 +60,17 @@ SlideTransitionPanel::~SlideTransitionPanel()
     delete mpWrappedControl;
 }
 
-std::auto_ptr<ControlFactory> SlideTransitionPanel::CreateControlFactory (ViewShellBase& rBase)
+std::auto_ptr< ControlFactory > SlideTransitionPanel::CreateControlFactory( ToolPanelViewShell& i_rToolPanelShell )
 {
-    return std::auto_ptr<ControlFactory>(
-        new ControlFactoryWithArgs1<SlideTransitionPanel,ViewShellBase>(rBase));
+    return std::auto_ptr< ControlFactory >(
+        new RootControlFactoryWithArg< SlideTransitionPanel, ToolPanelViewShell >( i_rToolPanelShell ) );
+}
+
+TaskPaneShellManager* SlideTransitionPanel::GetShellManager()
+{
+    if ( m_pPanelViewShell )
+        return &m_pPanelViewShell->GetSubShellManager();
+    return SubToolPanel::GetShellManager();
 }
 
 Size SlideTransitionPanel::GetPreferredSize()
diff --git a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx
index 478f69091f63..f62cb918806b 100644..100755
--- a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx
+++ b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx
@@ -36,6 +36,7 @@ class ViewShellBase;
 namespace sd { namespace toolpanel {
 class ControlFactory;
 class TreeNode;
+class ToolPanelViewShell;
 } }
 
 namespace sd { namespace toolpanel { namespace controls {
@@ -45,12 +46,16 @@ class SlideTransitionPanel
 {
 public:
     SlideTransitionPanel (
-        TreeNode* pParent,
-        ViewShellBase& rBase);
+        Window& i_rParentWindow,
+        ToolPanelViewShell& i_rToolPanelShell);
     virtual ~SlideTransitionPanel (void);
 
-    static std::auto_ptr<ControlFactory> CreateControlFactory (ViewShellBase& rBase);
+    static std::auto_ptr<ControlFactory> CreateControlFactory (ToolPanelViewShell& i_rToolPanelShell);
 
+    // TreeNode overridables
+    virtual TaskPaneShellManager* GetShellManager();
+
+    // ILayoutableWindow overridables
     virtual Size GetPreferredSize (void);
     virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeigh);
     virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth);
@@ -68,6 +73,7 @@ public:
 private:
     Size maPreferredSize;
     ::Window* mpWrappedControl;
+    ToolPanelViewShell* m_pPanelViewShell;
 };
 
 } } } // end of namespace ::sd::toolpanel::controls
diff --git a/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx b/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx
index ce242d557ee7..d6507a25c11f 100644..100755
--- a/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx
+++ b/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx
@@ -31,6 +31,7 @@
 #include "TableDesignPanel.hxx"
 
 #include "taskpane/TaskPaneControlFactory.hxx"
+#include "taskpane/ToolPanelViewShell.hxx"
 
 #include "strings.hrc"
 #include "sdresid.hxx"
@@ -44,10 +45,11 @@ namespace sd
 namespace toolpanel { namespace controls {
 
 
-TableDesignPanel::TableDesignPanel(TreeNode* pParent, ViewShellBase& rBase)
-    : SubToolPanel (pParent)
+TableDesignPanel::TableDesignPanel( ::Window& i_rParentWindow, ToolPanelViewShell& i_rPanelViewShell )
+    :SubToolPanel( i_rParentWindow )
+    ,m_pPanelViewShell( &i_rPanelViewShell )
 {
-    mpWrappedControl = createTableDesignPanel( pParent->GetWindow(), rBase );
+    mpWrappedControl = createTableDesignPanel( &i_rParentWindow, i_rPanelViewShell.GetViewShellBase() );
     mpWrappedControl->Show();
 }
 
@@ -56,10 +58,17 @@ TableDesignPanel::~TableDesignPanel()
     delete mpWrappedControl;
 }
 
-std::auto_ptr<ControlFactory> TableDesignPanel::CreateControlFactory (ViewShellBase& rBase)
+std::auto_ptr< ControlFactory > TableDesignPanel::CreateControlFactory( ToolPanelViewShell& i_rToolPanelShell )
 {
-    return std::auto_ptr<ControlFactory>(
-        new ControlFactoryWithArgs1<TableDesignPanel,ViewShellBase>(rBase));
+    return std::auto_ptr< ControlFactory >(
+        new RootControlFactoryWithArg< TableDesignPanel, ToolPanelViewShell >( i_rToolPanelShell ) );
+}
+
+TaskPaneShellManager* TableDesignPanel::GetShellManager()
+{
+    if ( m_pPanelViewShell )
+        return &m_pPanelViewShell->GetSubShellManager();
+    return SubToolPanel::GetShellManager();
 }
 
 Size TableDesignPanel::GetPreferredSize()
diff --git a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx
index aae06e37ad14..a3620df2ef68 100644..100755
--- a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx
+++ b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx
@@ -37,6 +37,7 @@ class ViewShellBase;
 namespace sd { namespace toolpanel {
 class TreeNode;
 class ControlFactory;
+class ToolPanelViewShell;
 } }
 
 namespace sd { namespace toolpanel { namespace controls {
@@ -46,12 +47,16 @@ class TableDesignPanel
 {
 public:
     TableDesignPanel (
-        TreeNode* pParent,
-        ViewShellBase& rBase);
+        ::Window& i_rParentWindow,
+        ToolPanelViewShell& i_rPanelViewShell);
     virtual ~TableDesignPanel (void);
 
-    static std::auto_ptr<ControlFactory> CreateControlFactory (ViewShellBase& rBase);
+    static std::auto_ptr<ControlFactory> CreateControlFactory (ToolPanelViewShell& i_rToolPanelShell);
 
+    // TreeNode overridables
+    virtual TaskPaneShellManager* GetShellManager();
+
+    // ILayoutableWindow overridables
     virtual Size GetPreferredSize (void);
     virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeigh);
     virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth);
@@ -68,6 +73,7 @@ public:
 private:
     Size maPreferredSize;
     ::Window* mpWrappedControl;
+    ToolPanelViewShell* m_pPanelViewShell;
 };
 
 } } } // end of namespace ::sd::toolpanel::controls
diff --git a/sd/source/ui/toolpanel/makefile.mk b/sd/source/ui/toolpanel/makefile.mk
index 08a966fe4061..4d83b8a85a70 100644..100755
--- a/sd/source/ui/toolpanel/makefile.mk
+++ b/sd/source/ui/toolpanel/makefile.mk
@@ -50,12 +50,14 @@ SLOFILES =      								\
     $(SLO)$/TitleBar.obj 						\
     $(SLO)$/TitleToolBox.obj					\
     $(SLO)$/TitledControl.obj 					\
-    $(SLO)$/ToolPanel.obj						\
     $(SLO)$/TaskPaneControlFactory.obj 			\
     $(SLO)$/TaskPaneFocusManager.obj 			\
     $(SLO)$/TaskPaneShellManager.obj 			\
     $(SLO)$/TaskPaneTreeNode.obj 			    \
-    $(SLO)$/TaskPaneViewShell.obj 				\
+    $(SLO)$/ToolPanel.obj                       \
+    $(SLO)$/ToolPanelViewShell.obj              \
+    $(SLO)$/ToolPanelFactory.obj                \
+    $(SLO)$/ToolPanelUIElement.obj              \
                                                 \
     $(SLO)$/EmptyWindow.obj						\
     $(SLO)$/LayoutMenu.obj                      \
diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx
index 94ada78461ec..bf4fbc6e6ebe 100644..100755
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <comphelper/processfactory.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -113,11 +114,9 @@ void ConfigurationAccess::Initialize (
             sAccessService,
             aCreationArguments);
     }
-    catch (Exception& rException)
+    catch (Exception&)
     {
-        OSL_TRACE ("caught exception while opening configuration: %s",
-            ::rtl::OUStringToOString(rException.Message,
-                RTL_TEXTENCODING_UTF8).getStr());
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index b791454bd10a..c416e689efcf 100644..100755
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -42,6 +42,7 @@
 #include <editeng/editstat.hxx>
 #include <tools/link.hxx>
 #include <vcl/svapp.hxx>
+#include <tools/diagnose_ex.h>
 
 
 namespace sd {
@@ -131,7 +132,7 @@ Image PreviewRenderer::RenderPage (
         }
         catch (const com::sun::star::uno::Exception&)
         {
-            OSL_TRACE("PreviewRenderer::RenderPage: caught exception");
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
@@ -193,7 +194,7 @@ Image PreviewRenderer::RenderSubstitution (
     }
     catch (const com::sun::star::uno::Exception&)
     {
-        OSL_TRACE("PreviewRenderer::RenderPage: caught exception");
+        DBG_UNHANDLED_EXCEPTION();
     }
 
     return aPreview;
@@ -302,7 +303,7 @@ void PreviewRenderer::PaintPage (const SdPage* pPage)
     }
     catch (const ::com::sun::star::uno::Exception&)
     {
-        OSL_TRACE("PreviewRenderer::PaintPage: caught exception");
+        DBG_UNHANDLED_EXCEPTION();
     }
 
     // Restore the previous online spelling and redlining states.
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index a1caf207cb3d..1ac245ad00d4 100755
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -150,6 +150,17 @@ extern uno::Sequence<OUString> SAL_CALL PresentationFactoryProvider_getSupported
 } }
 
 
+namespace sd { namespace toolpanel {
+
+extern uno::Reference<uno::XInterface> SAL_CALL ToolPanelFactory_createInstance(
+    const uno::Reference<uno::XComponentContext>& rxContext)
+    throw(uno::Exception);
+extern OUString ToolPanelFactory_getImplementationName(void) throw (uno::RuntimeException);
+extern uno::Sequence<OUString> SAL_CALL ToolPanelFactory_getSupportedServiceNames (void)
+    throw (uno::RuntimeException);
+
+} }
+
 namespace sd { namespace presenter {
 extern uno::Reference<uno::XInterface> SAL_CALL SlideRenderer_createInstance(
     const uno::Reference<uno::XComponentContext>& rxContext)
@@ -207,6 +218,7 @@ using namespace ::sd;
 using namespace ::sd::framework;
 using namespace ::sd::presenter;
 using namespace ::sd::slidesorter;
+using namespace ::sd::toolpanel;
 
 
 
@@ -230,6 +242,7 @@ enum FactoryId
     BasicToolBarFactoryFactoryId,
     BasicViewFactoryFactoryId,
     TaskPanelFactoryFactoryId,
+    ToolPanelFactoryFactoryId,
     ResourceIdFactoryId,
     PresentationFactoryProviderFactoryId,
     SlideRendererFactoryId,
@@ -263,6 +276,7 @@ static ::boost::shared_ptr<FactoryMap> spFactoryMap;
         (*spFactoryMap)[BasicToolBarFactory_getImplementationName()] = BasicToolBarFactoryFactoryId;
         (*spFactoryMap)[BasicViewFactory_getImplementationName()] = BasicViewFactoryFactoryId;
         (*spFactoryMap)[TaskPanelFactory_getImplementationName()] = TaskPanelFactoryFactoryId;
+        (*spFactoryMap)[ToolPanelFactory_getImplementationName()] = ToolPanelFactoryFactoryId;
         (*spFactoryMap)[ResourceId_getImplementationName()] = ResourceIdFactoryId;
         (*spFactoryMap)[PresentationFactoryProvider_getImplementationName()] = PresentationFactoryProviderFactoryId;
         (*spFactoryMap)[SlideRenderer_getImplementationName()] = SlideRendererFactoryId;
@@ -347,6 +361,10 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
                 sd::framework::TaskPanelFactory_getSupportedServiceNames());
             writeInfo(
                 pKey,
+                sd::toolpanel::ToolPanelFactory_getImplementationName(),
+                sd::toolpanel::ToolPanelFactory_getSupportedServiceNames());
+            writeInfo(
+                pKey,
                 sd::framework::ResourceId_getImplementationName(),
                 sd::framework::ResourceId_getSupportedServiceNames());
             writeInfo(
@@ -504,6 +522,13 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
                         sd::framework::TaskPanelFactory_getSupportedServiceNames());
                     break;
 
+                case ToolPanelFactoryFactoryId:
+                    xComponentFactory = ::cppu::createSingleComponentFactory(
+                        sd::toolpanel::ToolPanelFactory_createInstance,
+                        sd::toolpanel::ToolPanelFactory_getImplementationName(),
+                        sd::toolpanel::ToolPanelFactory_getSupportedServiceNames());
+                    break;
+
                 case ResourceIdFactoryId:
                     xComponentFactory = ::cppu::createSingleComponentFactory(
                         sd::framework::ResourceId_createInstance,
diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx
index 38409bb2376e..759103760bfe 100644..100755
--- a/sd/source/ui/view/GraphicViewShellBase.cxx
+++ b/sd/source/ui/view/GraphicViewShellBase.cxx
@@ -100,18 +100,18 @@ void GraphicViewShellBase::Execute (SfxRequest& rRequest)
 
     switch (nSlotId)
     {
-        case SID_RIGHT_PANE:
         case SID_NOTES_WINDOW:
         case SID_SLIDE_SORTER_MULTI_PANE_GUI:
         case SID_DIAMODE:
         case SID_OUTLINEMODE:
         case SID_NOTESMODE:
         case SID_HANDOUTMODE:
-        case SID_TASK_PANE:
+        case SID_SHOW_TOOL_PANEL:
             // Prevent some Impress-only slots from being executed.
             rRequest.Cancel();
             break;
 
+        case SID_TASKPANE:
         case SID_SWITCH_SHELL:
         case SID_LEFT_PANE_DRAW:
         case SID_LEFT_PANE_IMPRESS:
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 5314f6dbe768..a7c9786dd160 100644..100755
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -57,6 +57,8 @@
 #include <vcl/metric.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svtools/langtab.hxx>
+#include <tools/diagnose_ex.h>
+
 #include "strings.hrc"
 #include "sdstring.hrc"
 #include "eetext.hxx"
@@ -974,7 +976,7 @@ void Outliner::ProvideNextTextObject (void)
     }
     catch (::com::sun::star::uno::Exception e)
     {
-        OSL_TRACE ("Outliner %p: caught exception while ending text edit mode", this);
+        DBG_UNHANDLED_EXCEPTION();
     }
     SetUpdateMode(FALSE);
     OutlinerView* pOutlinerView = mpImpl->GetOutlinerView();
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 4919a9fe2bbb..4919a9fe2bbb 100644..100755
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index f609f669da03..14da3ea1a526 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -64,9 +64,9 @@
 #include "OutlineViewShell.hxx"
 #include "SlideSorterViewShell.hxx"
 #include "PresentationViewShell.hxx"
-#include "TaskPaneViewShell.hxx"
 #include "FormShellManager.hxx"
 #include "ToolBarManager.hxx"
+#include "taskpane/PanelId.hxx"
 #include "Window.hxx"
 #include "framework/ConfigurationController.hxx"
 #include "DocumentRenderer.hxx"
@@ -91,6 +91,7 @@
 #include <svl/whiter.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vcl/msgbox.hxx>
+#include <tools/diagnose_ex.h>
 
 #include "fubullet.hxx"
 
@@ -808,7 +809,7 @@ void ViewShellBase::Execute (SfxRequest& rRequest)
                 framework::FrameworkHelper::msSlideSorterURL);
             break;
 
-        case SID_RIGHT_PANE:
+        case SID_TASKPANE:
             mpImpl->SetPaneVisibility(
                 rRequest,
                 framework::FrameworkHelper::msRightPaneURL,
@@ -829,7 +830,7 @@ void ViewShellBase::Execute (SfxRequest& rRequest)
             // The full screen mode is not supported.  Ignore the request.
             break;
 
-        case SID_TASK_PANE:
+        case SID_SHOW_TOOL_PANEL:
             mpImpl->ProcessTaskPaneSlot(rRequest);
             break;
 
@@ -1493,9 +1494,9 @@ void ViewShellBase::Implementation::SetPaneVisibility (
             xConfigurationController->requestResourceDeactivation(
                 xPaneId);
     }
-    catch (RuntimeException&)
+    catch (const Exception &)
     {
-        DBG_ASSERT(false, "ViewShellBase::Implementation::SetPaneVisibility(): caught exception");
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
@@ -1540,7 +1541,7 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
                             xContext, FrameworkHelper::msLeftDrawPaneURL);
                         break;
 
-                    case SID_RIGHT_PANE:
+                    case SID_TASKPANE:
                         xResourceId = ResourceId::create(
                             xContext, FrameworkHelper::msRightPaneURL);
                         break;
@@ -1631,7 +1632,7 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
     }
     catch (RuntimeException&)
     {
-        DBG_ASSERT(false, "ViewShellBase::Implementation::GetSlotState(): caught exception");
+        DBG_UNHANDLED_EXCEPTION();
     }
 
 }
@@ -1644,8 +1645,8 @@ void ViewShellBase::Implementation::ProcessTaskPaneSlot (SfxRequest& rRequest)
     // Set the visibility state of the toolpanel and one of its top
     // level panels.
     BOOL bShowToolPanel = TRUE;
-    toolpanel::TaskPaneViewShell::PanelId nPanelId (
-        toolpanel::TaskPaneViewShell::PID_UNKNOWN);
+    toolpanel::PanelId nPanelId (
+        toolpanel::PID_UNKNOWN);
     bool bPanelIdGiven = false;
 
     // Extract the given arguments.
@@ -1666,7 +1667,7 @@ void ViewShellBase::Implementation::ProcessTaskPaneSlot (SfxRequest& rRequest)
             if (pPanelId != NULL)
             {
                 nPanelId = static_cast<
-                    toolpanel::TaskPaneViewShell::PanelId>(
+                    toolpanel::PanelId>(
                         pPanelId->GetValue());
                 bPanelIdGiven = true;
             }
@@ -1676,7 +1677,7 @@ void ViewShellBase::Implementation::ProcessTaskPaneSlot (SfxRequest& rRequest)
     // Ignore the request for some combinations of panels and view
     // shell types.
     if (bPanelIdGiven
-        && ! (nPanelId==toolpanel::TaskPaneViewShell::PID_LAYOUT
+        && ! (nPanelId==toolpanel::PID_LAYOUT
             && mrBase.GetMainViewShell()!=NULL
             && mrBase.GetMainViewShell()->GetShellType()==ViewShell::ST_OUTLINE))
     {
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 09d4a127d526..926d579e93e9 100755
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -47,11 +47,11 @@
 #include "DrawController.hxx"
 #include "FactoryIds.hxx"
 #include "slideshow.hxx"
-#include "TaskPaneViewShell.hxx"
 #include "ViewShellBase.hxx"
 #include "FrameView.hxx"
 #include "DrawViewShell.hxx"
 #include "ViewShellHint.hxx"
+#include "taskpane/PanelId.hxx"
 #include "framework/FrameworkHelper.hxx"
 
 #include <sfx2/bindings.hxx>
@@ -195,12 +195,12 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
             // Make the layout menu visible in the tool pane.
             SfxBoolItem aMakeToolPaneVisible (ID_VAL_ISVISIBLE, TRUE);
             SfxUInt32Item aPanelId (ID_VAL_PANEL_INDEX,
-                ::sd::toolpanel::TaskPaneViewShell::PID_LAYOUT);
+                ::sd::toolpanel::PID_LAYOUT);
             SfxViewFrame* pFrame = mrViewShell.GetViewFrame();
             if (pFrame!=NULL && pFrame->GetDispatcher()!=NULL)
             {
                 pFrame->GetDispatcher()->Execute (
-                    SID_TASK_PANE,
+                    SID_SHOW_TOOL_PANEL,
                     SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
                     &aMakeToolPaneVisible,
                     &aPanelId,
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 280252a61621..a12412bf7f7d 100644..100755
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -54,6 +54,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <comphelper/processfactory.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -472,7 +473,7 @@ bool ViewTabBar::ActivatePage (void)
     }
     catch (RuntimeException&)
     {
-        DBG_ASSERT(false,"ViewTabBar::ActivatePage(): caught exception");
+        DBG_UNHANDLED_EXCEPTION();
     }
 
     return false;
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 852e56096a76..28f8d909031b 100644..100755
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -90,6 +90,7 @@
 #include "DrawDocShell.hxx"
 #include "sdabstdlg.hxx"
 #include <sfx2/ipclient.hxx>
+#include <tools/diagnose_ex.h>
 #include "ViewShellBase.hxx"
 #include "FormShellManager.hxx"
 #include "LayerTabBar.hxx"
@@ -413,7 +414,7 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
             }
             catch (RuntimeException&)
             {
-                DBG_ASSERT(false, "caught exception while handline SID_RELOAD");
+                DBG_UNHANDLED_EXCEPTION();
             }
 
             // We have to return immediately to avoid accessing this object.
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 4dd3c61556e1..c4c6b20f8ca8 100755
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -81,7 +81,6 @@
 #include "FrameView.hxx"
 #include "Window.hxx"
 #include "DrawDocShell.hxx"
-#include "TaskPaneViewShell.hxx"
 #include "framework/FrameworkHelper.hxx"
 
 namespace sd {
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index a8b2d0814c3e..76590dd45003 100644..100755
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -106,6 +106,7 @@ SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) //SOH
 {
     SFX_POPUPMENU_REGISTRATION( SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP) );
     SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR );
+    SFX_CHILDWINDOW_REGISTRATION( SID_TASKPANE );
     SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() );
     SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() );
     SFX_CHILDWINDOW_REGISTRATION( SvxColorChildWindow::GetChildWindowId() );
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 7cae5d452a1b..5ae673b8769f 100644..100755
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -36,7 +36,6 @@
 #include <svx/svxids.hrc>
 
 #include <editeng/outliner.hxx>
-
 #include <editeng/editview.hxx>
 
 #include "app.hrc"
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 29e727d6360d..8bfdefd240da 100755
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -69,7 +69,6 @@
 #endif
 #include "DrawViewShell.hxx"
 #include "OutlineViewShell.hxx"
-#include "TaskPaneViewShell.hxx"
 #include "drawview.hxx"
 
 #include "sdattr.hxx"
@@ -80,6 +79,7 @@
 #include "Window.hxx"
 #include "DrawDocShell.hxx"
 #include "FrameView.hxx"
+#include "framework/FrameworkHelper.hxx"
 #include "optsitem.hxx"
 #include "sdresid.hxx"
 
@@ -254,7 +254,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
             && rBase.GetMainViewShell()->GetShellType()!=ViewShell::ST_DRAW)
         {
             framework::FrameworkHelper::Instance(GetViewShellBase())->RequestTaskPanel(
-            framework::FrameworkHelper::msLayoutTaskPanelURL);
+                framework::FrameworkHelper::msLayoutTaskPanelURL);
         }
 */
 
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 20ca059b16d5..1373bfd60e10 100644..100755
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -1,330 +1,331 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <menu:menubar xmlns:menu="http://openoffice.org/2001/menu" menu:id="menubar">
-    <menu:menu menu:id=".uno:PickList">
+  <menu:menu menu:id=".uno:PickList">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:AddDirect"/>
+      <menu:menuitem menu:id=".uno:Open"/>
+      <menu:menuitem menu:id=".uno:RecentFileList"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:CloseDoc"/>
+      <menu:menuitem menu:id=".uno:Save"/>
+      <menu:menuitem menu:id=".uno:SaveAs"/>
+      <menu:menuitem menu:id=".uno:SaveAll"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:Reload"/>
+      <menu:menuitem menu:id=".uno:VersionDialog"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ExportTo"/>
+      <menu:menuitem menu:id=".uno:ExportToPDF"/>
+      <menu:menu menu:id=".uno:SendMenu">
+        <menu:menupopup>
+          <menu:menuitem menu:id=".uno:SendMail"/>
+          <menu:menuitem menu:id=".uno:SendMailDocAsPDF"/>
+        </menu:menupopup>
+      </menu:menu>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:SetDocumentProperties"/>
+      <menu:menuitem menu:id=".uno:Signature"/>
+      <menu:menu menu:id=".uno:TemplateMenu">
+        <menu:menupopup>
+          <menu:menuitem menu:id=".uno:Organizer"/>
+          <menu:menuitem menu:id=".uno:AddressBookSource"/>
+          <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
+          <menu:menuitem menu:id=".uno:OpenTemplate"/>
+        </menu:menupopup>
+      </menu:menu>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:WebHtml"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:Print"/>
+      <menu:menuitem menu:id=".uno:PrinterSetup"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:Quit"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:EditMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:Undo"/>
+      <menu:menuitem menu:id=".uno:Redo"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:Cut"/>
+      <menu:menuitem menu:id=".uno:Copy"/>
+      <menu:menuitem menu:id=".uno:Paste"/>
+      <menu:menuitem menu:id=".uno:PasteSpecial"/>
+      <menu:menuitem menu:id=".uno:SelectAll"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:SearchDialog"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:CopyObjects"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
+      <menu:menuitem menu:id=".uno:GlueEditMode"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:Morphing"/>
+      <menu:menuitem menu:id=".uno:ModifyField"/>
+      <menu:menuitem menu:id=".uno:DeletePage"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ManageLinks"/>
+      <menu:menuitem menu:id=".uno:PlugInsActive"/>
+      <menu:menuitem menu:id=".uno:ImageMapDialog"/>
+      <menu:menuitem menu:id=".uno:ObjectMenue"/>
+      <menu:menuitem menu:id=".uno:EditHyperlink"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ViewMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:PageMode" menu:style="radio"/>
+      <menu:menuitem menu:id=".uno:MasterPage" menu:style="radio"/>
+      <menu:menuseparator/>
+      <menu:menu menu:id=".uno:DisplayQualityMenu">
         <menu:menupopup>
-            <menu:menuitem menu:id=".uno:AddDirect"/>
-            <menu:menuitem menu:id=".uno:Open"/>
-            <menu:menuitem menu:id=".uno:RecentFileList"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:CloseDoc"/>
-            <menu:menuitem menu:id=".uno:Save"/>
-            <menu:menuitem menu:id=".uno:SaveAs"/>
-            <menu:menuitem menu:id=".uno:SaveAll"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:Reload"/>
-            <menu:menuitem menu:id=".uno:VersionDialog"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:ExportTo"/>
-            <menu:menuitem menu:id=".uno:ExportToPDF"/>
-            <menu:menu menu:id=".uno:SendMenu">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:SendMail"/>
-                    <menu:menuitem menu:id=".uno:SendMailDocAsPDF"/>
-                </menu:menupopup>
-            </menu:menu>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:SetDocumentProperties"/>
-            <menu:menuitem menu:id=".uno:Signature"/>
-            <menu:menu menu:id=".uno:TemplateMenu">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:Organizer"/>
-                    <menu:menuitem menu:id=".uno:AddressBookSource"/>
-                    <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
-                    <menu:menuitem menu:id=".uno:OpenTemplate"/>
-                </menu:menupopup>
-            </menu:menu>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:WebHtml"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:Print"/>
-            <menu:menuitem menu:id=".uno:PrinterSetup"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:Quit"/>
+          <menu:menuitem menu:id=".uno:OutputQualityColor" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:OutputQualityGrayscale" menu:style="radio"/>
+          <menu:menuitem menu:id=".uno:OutputQualityBlackWhite" menu:style="radio"/>
         </menu:menupopup>
-    </menu:menu>
-    <menu:menu menu:id=".uno:EditMenu">
+      </menu:menu>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:LeftPaneDraw"/>
+      <menu:menuitem menu:id=".uno:AvailableToolbars"/>
+      <menu:menuitem menu:id=".uno:StatusBarVisible"/>
+      <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
+      <menu:menuitem menu:id=".uno:ShowRuler"/>
+      <menu:menu menu:id=".uno:GridMenu">
         <menu:menupopup>
-            <menu:menuitem menu:id=".uno:Undo"/>
-            <menu:menuitem menu:id=".uno:Redo"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:Cut"/>
-            <menu:menuitem menu:id=".uno:Copy"/>
-            <menu:menuitem menu:id=".uno:Paste"/>
-                        <menu:menuitem menu:id=".uno:PasteSpecial"/>
-            <menu:menuitem menu:id=".uno:SelectAll"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:SearchDialog"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:CopyObjects"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
-            <menu:menuitem menu:id=".uno:GlueEditMode"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:Morphing"/>
-            <menu:menuitem menu:id=".uno:ModifyField"/>
-            <menu:menuitem menu:id=".uno:DeletePage"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:ManageLinks"/>
-            <menu:menuitem menu:id=".uno:PlugInsActive"/>
-            <menu:menuitem menu:id=".uno:ImageMapDialog"/>
-            <menu:menuitem menu:id=".uno:ObjectMenue"/>
-            <menu:menuitem menu:id=".uno:EditHyperlink"/>
+          <menu:menuitem menu:id=".uno:GridVisible"/>
+          <menu:menuitem menu:id=".uno:GridUse"/>
+          <menu:menuitem menu:id=".uno:GridFront"/>
         </menu:menupopup>
-    </menu:menu>
-    <menu:menu menu:id=".uno:ViewMenu">
+      </menu:menu>
+      <menu:menu menu:id=".uno:SnapLinesMenu">
         <menu:menupopup>
-            <menu:menuitem menu:id=".uno:PageMode" menu:style="radio"/>
-            <menu:menuitem menu:id=".uno:MasterPage" menu:style="radio"/>
-            <menu:menuseparator/>
-            <menu:menu menu:id=".uno:DisplayQualityMenu">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:OutputQualityColor" menu:style="radio"/>
-                    <menu:menuitem menu:id=".uno:OutputQualityGrayscale" menu:style="radio"/>
-                    <menu:menuitem menu:id=".uno:OutputQualityBlackWhite" menu:style="radio"/>
-                </menu:menupopup>
-            </menu:menu>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:LeftPaneDraw"/>
-            <menu:menuitem menu:id=".uno:AvailableToolbars"/>
-            <menu:menuitem menu:id=".uno:StatusBarVisible"/>
-            <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
-            <menu:menuitem menu:id=".uno:ShowRuler"/>
-            <menu:menu menu:id=".uno:GridMenu">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:GridVisible"/>
-                    <menu:menuitem menu:id=".uno:GridUse"/>
-                    <menu:menuitem menu:id=".uno:GridFront"/>
-                </menu:menupopup>
-            </menu:menu>
-            <menu:menu menu:id=".uno:SnapLinesMenu">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:HelplinesVisible"/>
-                    <menu:menuitem menu:id=".uno:HelplinesUse"/>
-                    <menu:menuitem menu:id=".uno:HelplinesFront"/>
-                </menu:menupopup>
-            </menu:menu>
+          <menu:menuitem menu:id=".uno:HelplinesVisible"/>
+          <menu:menuitem menu:id=".uno:HelplinesUse"/>
+          <menu:menuitem menu:id=".uno:HelplinesFront"/>
+        </menu:menupopup>
+      </menu:menu>
       <menu:menuitem menu:id=".uno:ShowAnnotations"/>
       <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:Navigator"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:Zoom"/>
-        </menu:menupopup>
-    </menu:menu>
-    <menu:menu menu:id=".uno:InsertMenu">
+      <menu:menuitem menu:id=".uno:Navigator"/>
+      <menu:menuitem menu:id=".uno:TaskPane"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:Zoom"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:InsertMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:InsertPage"/>
+      <menu:menuitem menu:id=".uno:DuplicatePage"/>
+      <menu:menuitem menu:id=".uno:InsertLayer"/>
+      <menu:menuitem menu:id=".uno:CapturePoint"/>
+      <menu:menu menu:id=".uno:FieldMenu">
         <menu:menupopup>
-            <menu:menuitem menu:id=".uno:InsertPage"/>
-            <menu:menuitem menu:id=".uno:DuplicatePage"/>
-            <menu:menuitem menu:id=".uno:InsertLayer"/>
-            <menu:menuitem menu:id=".uno:CapturePoint"/>
-            <menu:menu menu:id=".uno:FieldMenu">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:InsertDateFieldFix"/>
-                    <menu:menuitem menu:id=".uno:InsertDateFieldVar"/>
-                    <menu:menuitem menu:id=".uno:InsertTimeFieldFix"/>
-                    <menu:menuitem menu:id=".uno:InsertTimeFieldVar"/>
-                    <menu:menuseparator/>
-                    <menu:menuitem menu:id=".uno:InsertAuthorField"/>
-                    <menu:menuitem menu:id=".uno:InsertPageField"/>
+          <menu:menuitem menu:id=".uno:InsertDateFieldFix"/>
+          <menu:menuitem menu:id=".uno:InsertDateFieldVar"/>
+          <menu:menuitem menu:id=".uno:InsertTimeFieldFix"/>
+          <menu:menuitem menu:id=".uno:InsertTimeFieldVar"/>
+          <menu:menuseparator/>
+          <menu:menuitem menu:id=".uno:InsertAuthorField"/>
+          <menu:menuitem menu:id=".uno:InsertPageField"/>
           <menu:menuitem menu:id=".uno:InsertPagesField"/>
           <menu:menuitem menu:id=".uno:InsertFileField"/>
-                </menu:menupopup>
-            </menu:menu>
+        </menu:menupopup>
+      </menu:menu>
       <menu:menuitem menu:id=".uno:InsertAnnotation"/>
       <menu:menuitem menu:id=".uno:InsertSymbol"/>
       <menu:menu menu:id=".uno:FormattingMarkMenu">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:InsertNonBreakingSpace"/>
-                    <menu:menuitem menu:id=".uno:InsertHardHyphen"/>
-                    <menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
-                    <menu:menuitem menu:id=".uno:InsertZWSP"/>
-                    <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
-                    <menu:menuitem menu:id=".uno:InsertLRM"/>
-                    <menu:menuitem menu:id=".uno:InsertRLM"/>
-                </menu:menupopup>
-            </menu:menu>
-            <menu:menuitem menu:id=".uno:HyperlinkDialog"/>
-            <menu:menuseparator/>
-            <menu:menu menu:id=".uno:GraphicMenu">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:InsertGraphic"/>
-                    <menu:menu menu:id=".uno:Scan">
-                        <menu:menupopup>
-                            <menu:menuitem menu:id=".uno:TwainSelect"/>
-                            <menu:menuitem menu:id=".uno:TwainTransfer"/>
-                        </menu:menupopup>
-                    </menu:menu>
-                </menu:menupopup>
-            </menu:menu>
-            <menu:menuitem menu:id=".uno:InsertTable"/>
-            <menu:menuitem menu:id=".uno:InsertAVMedia"/>
-            <menu:menu menu:id=".uno:ObjectMenu">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:InsertObject"/>
-                    <menu:menuitem menu:id=".uno:InsertPlugin"/>
-                    <menu:menuitem menu:id=".uno:InsertSound"/>
-                    <menu:menuitem menu:id=".uno:InsertVideo"/>
-                    <menu:menuitem menu:id=".uno:InsertMath"/>
-                </menu:menupopup>
-            </menu:menu>
-            <menu:menuitem menu:id=".uno:InsertObjectChart"/>
-            <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:ImportFromFile"/>
+        <menu:menupopup>
+          <menu:menuitem menu:id=".uno:InsertNonBreakingSpace"/>
+          <menu:menuitem menu:id=".uno:InsertHardHyphen"/>
+          <menu:menuitem menu:id=".uno:InsertSoftHyphen"/>
+          <menu:menuitem menu:id=".uno:InsertZWSP"/>
+          <menu:menuitem menu:id=".uno:InsertZWNBSP"/>
+          <menu:menuitem menu:id=".uno:InsertLRM"/>
+          <menu:menuitem menu:id=".uno:InsertRLM"/>
         </menu:menupopup>
-    </menu:menu>
-    <menu:menu menu:id=".uno:FormatMenu">
+      </menu:menu>
+      <menu:menuitem menu:id=".uno:HyperlinkDialog"/>
+      <menu:menuseparator/>
+      <menu:menu menu:id=".uno:GraphicMenu">
         <menu:menupopup>
-            <menu:menuitem menu:id=".uno:SetDefault"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:FontDialog"/>
-            <menu:menuitem menu:id=".uno:ParagraphDialog"/>
-            <menu:menuitem menu:id=".uno:OutlineBullet"/>
-            <menu:menuitem menu:id=".uno:PageSetup"/>
-            <menu:menuseparator/>
-            <menu:menu menu:id=".uno:TransliterateMenu">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
-                    <menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
-                    <menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
-                    <menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
-                    <menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>
-                    <menu:menuitem menu:id=".uno:ChangeCaseToKatakana"/>
-                </menu:menupopup>
-            </menu:menu>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:TransformDialog"/>
-            <menu:menuitem menu:id=".uno:FormatLine"/>
-            <menu:menuitem menu:id=".uno:FormatArea"/>
-            <menu:menuitem menu:id=".uno:TextAttributes"/>
-            <menu:menuitem menu:id=".uno:GrafAttrCrop"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:ModifyLayer"/>
-            <menu:menuitem menu:id=".uno:DesignerDialog"/>
+          <menu:menuitem menu:id=".uno:InsertGraphic"/>
+          <menu:menu menu:id=".uno:Scan">
+            <menu:menupopup>
+              <menu:menuitem menu:id=".uno:TwainSelect"/>
+              <menu:menuitem menu:id=".uno:TwainTransfer"/>
+            </menu:menupopup>
+          </menu:menu>
         </menu:menupopup>
-    </menu:menu>
-    <menu:menu menu:id=".uno:ToolsMenu">
+      </menu:menu>
+      <menu:menuitem menu:id=".uno:InsertTable"/>
+      <menu:menuitem menu:id=".uno:InsertAVMedia"/>
+      <menu:menu menu:id=".uno:ObjectMenu">
         <menu:menupopup>
-            <menu:menuitem menu:id=".uno:SpellDialog"/>
-            <menu:menu menu:id=".uno:LanguageMenu">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:HangulHanjaConversion"/>
-                    <menu:menuitem menu:id=".uno:ChineseConversion"/>
-                    <menu:menuitem menu:id=".uno:Thesaurus"/>
-                    <menu:menuitem menu:id=".uno:Hyphenation"/>
-                    <menu:menuseparator/>
-                    <menu:menuitem menu:id=".uno:MoreDictionaries"/>
-                </menu:menupopup>
-            </menu:menu>
-      <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:Gallery"/>
-            <menu:menuitem menu:id=".uno:BmpMask"/>
-            <menu:menuitem menu:id=".uno:AVMediaPlayer"/>
-            <menu:menuseparator/>
-            <menu:menu menu:id=".uno:MacrosMenu">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
-                    <menu:menuitem menu:id=".uno:RunMacro"/>
-                    <menu:menu menu:id=".uno:ScriptOrganizer"/>
-                    <menu:menuitem menu:id=".uno:MacroSignature"/>
-                    <menu:menuseparator/>
-                    <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
-                </menu:menupopup>
-            </menu:menu>
+          <menu:menuitem menu:id=".uno:InsertObject"/>
+          <menu:menuitem menu:id=".uno:InsertPlugin"/>
+          <menu:menuitem menu:id=".uno:InsertSound"/>
+          <menu:menuitem menu:id=".uno:InsertVideo"/>
+          <menu:menuitem menu:id=".uno:InsertMath"/>
+        </menu:menupopup>
+      </menu:menu>
+      <menu:menuitem menu:id=".uno:InsertObjectChart"/>
+      <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ImportFromFile"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:FormatMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetDefault"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:FontDialog"/>
+      <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+      <menu:menuitem menu:id=".uno:OutlineBullet"/>
+      <menu:menuitem menu:id=".uno:PageSetup"/>
+      <menu:menuseparator/>
+      <menu:menu menu:id=".uno:TransliterateMenu">
+        <menu:menupopup>
+          <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
+          <menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
+          <menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
+          <menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
+          <menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>
+          <menu:menuitem menu:id=".uno:ChangeCaseToKatakana"/>
+        </menu:menupopup>
+      </menu:menu>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:TransformDialog"/>
+      <menu:menuitem menu:id=".uno:FormatLine"/>
+      <menu:menuitem menu:id=".uno:FormatArea"/>
+      <menu:menuitem menu:id=".uno:TextAttributes"/>
+      <menu:menuitem menu:id=".uno:GrafAttrCrop"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ModifyLayer"/>
+      <menu:menuitem menu:id=".uno:DesignerDialog"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ToolsMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SpellDialog"/>
+      <menu:menu menu:id=".uno:LanguageMenu">
+        <menu:menupopup>
+          <menu:menuitem menu:id=".uno:HangulHanjaConversion"/>
+          <menu:menuitem menu:id=".uno:ChineseConversion"/>
+          <menu:menuitem menu:id=".uno:Thesaurus"/>
+          <menu:menuitem menu:id=".uno:Hyphenation"/>
+          <menu:menuseparator/>
+          <menu:menuitem menu:id=".uno:MoreDictionaries"/>
+        </menu:menupopup>
+      </menu:menu>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:Gallery"/>
+      <menu:menuitem menu:id=".uno:BmpMask"/>
+      <menu:menuitem menu:id=".uno:AVMediaPlayer"/>
+      <menu:menuseparator/>
+      <menu:menu menu:id=".uno:MacrosMenu">
+        <menu:menupopup>
+          <menu:menuitem menu:id=".uno:MacroRecorder"/>
+          <menu:menuitem menu:id=".uno:RunMacro"/>
+          <menu:menu menu:id=".uno:ScriptOrganizer"/>
+          <menu:menuitem menu:id=".uno:MacroSignature"/>
+          <menu:menuseparator/>
+          <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
+        </menu:menupopup>
+      </menu:menu>
 
-            <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
-            <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/>
-            <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
-            <menu:menuitem menu:id=".uno:ConfigureDialog"/>
-            <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
+      <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
+      <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/>
+      <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
+      <menu:menuitem menu:id=".uno:ConfigureDialog"/>
+      <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ModifyMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ToggleObjectRotateMode"/>
+      <menu:menu menu:id=".uno:MirrorMenu">
+        <menu:menupopup>
+          <menu:menuitem menu:id=".uno:MirrorVert"/>
+          <menu:menuitem menu:id=".uno:MirrorHorz"/>
+        </menu:menupopup>
+      </menu:menu>
+      <menu:menu menu:id=".uno:ConvertMenu">
+        <menu:menupopup>
+          <menu:menuitem menu:id=".uno:ChangeBezier"/>
+          <menu:menuitem menu:id=".uno:ChangePolygon"/>
+          <menu:menuitem menu:id=".uno:convert_to_contour"/>
+          <menu:menuitem menu:id=".uno:ConvertInto3D"/>
+          <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
+          <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
+          <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
         </menu:menupopup>
-    </menu:menu>
-    <menu:menu menu:id=".uno:ModifyMenu">
+      </menu:menu>
+      <menu:menuseparator/>
+      <menu:menu menu:id=".uno:ArrangeMenu">
         <menu:menupopup>
-            <menu:menuitem menu:id=".uno:ToggleObjectRotateMode"/>
-            <menu:menu menu:id=".uno:MirrorMenu">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:MirrorVert"/>
-                    <menu:menuitem menu:id=".uno:MirrorHorz"/>
-                </menu:menupopup>
-            </menu:menu>
-            <menu:menu menu:id=".uno:ConvertMenu">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:ChangeBezier"/>
-                    <menu:menuitem menu:id=".uno:ChangePolygon"/>
-                    <menu:menuitem menu:id=".uno:convert_to_contour"/>
-                    <menu:menuitem menu:id=".uno:ConvertInto3D"/>
-                    <menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
-                    <menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
-                    <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
-                </menu:menupopup>
-            </menu:menu>
-            <menu:menuseparator/>
-            <menu:menu menu:id=".uno:ArrangeMenu">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:BringToFront"/>
-                    <menu:menuitem menu:id=".uno:Forward"/>
-                    <menu:menuitem menu:id=".uno:Backward"/>
-                    <menu:menuitem menu:id=".uno:SendToBack"/>
-                    <menu:menuseparator/>
-                    <menu:menuitem menu:id=".uno:BeforeObject"/>
-                    <menu:menuitem menu:id=".uno:BehindObject"/>
-                    <menu:menuseparator/>
-                    <menu:menuitem menu:id=".uno:ReverseOrder"/>
-                </menu:menupopup>
-            </menu:menu>
-            <menu:menu menu:id=".uno:ObjectAlign">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
-                    <menu:menuitem menu:id=".uno:AlignCenter"/>
-                    <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
-                    <menu:menuseparator/>
-                    <menu:menuitem menu:id=".uno:AlignUp"/>
-                    <menu:menuitem menu:id=".uno:AlignMiddle"/>
-                    <menu:menuitem menu:id=".uno:AlignDown"/>
-                </menu:menupopup>
-            </menu:menu>
-            <menu:menuitem menu:id=".uno:DistributeSelection"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
-            <menu:menuitem menu:id=".uno:NameGroup"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:FormatGroup"/>
-            <menu:menuitem menu:id=".uno:FormatUngroup"/>
-            <menu:menuitem menu:id=".uno:EnterGroup"/>
-            <menu:menuitem menu:id=".uno:LeaveGroup"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:Combine"/>
-            <menu:menuitem menu:id=".uno:Dismantle"/>
-            <menu:menu menu:id=".uno:PolyFormen">
-                <menu:menupopup>
-                    <menu:menuitem menu:id=".uno:Merge"/>
-                    <menu:menuitem menu:id=".uno:Substract"/>
-                    <menu:menuitem menu:id=".uno:Intersect"/>
-                </menu:menupopup>
-            </menu:menu>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:Connect"/>
-            <menu:menuitem menu:id=".uno:Break"/>
+          <menu:menuitem menu:id=".uno:BringToFront"/>
+          <menu:menuitem menu:id=".uno:Forward"/>
+          <menu:menuitem menu:id=".uno:Backward"/>
+          <menu:menuitem menu:id=".uno:SendToBack"/>
+          <menu:menuseparator/>
+          <menu:menuitem menu:id=".uno:BeforeObject"/>
+          <menu:menuitem menu:id=".uno:BehindObject"/>
+          <menu:menuseparator/>
+          <menu:menuitem menu:id=".uno:ReverseOrder"/>
         </menu:menupopup>
-    </menu:menu>
-    <menu:menu menu:id=".uno:WindowList">
+      </menu:menu>
+      <menu:menu menu:id=".uno:ObjectAlign">
         <menu:menupopup>
-            <menu:menuitem menu:id=".uno:NewWindow"/>
-            <menu:menuitem menu:id=".uno:CloseWin"/>
-            <menu:menuseparator/>
+          <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
+          <menu:menuitem menu:id=".uno:AlignCenter"/>
+          <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
+          <menu:menuseparator/>
+          <menu:menuitem menu:id=".uno:AlignUp"/>
+          <menu:menuitem menu:id=".uno:AlignMiddle"/>
+          <menu:menuitem menu:id=".uno:AlignDown"/>
         </menu:menupopup>
-    </menu:menu>
-    <menu:menu menu:id=".uno:HelpMenu">
+      </menu:menu>
+      <menu:menuitem menu:id=".uno:DistributeSelection"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+      <menu:menuitem menu:id=".uno:NameGroup"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:FormatGroup"/>
+      <menu:menuitem menu:id=".uno:FormatUngroup"/>
+      <menu:menuitem menu:id=".uno:EnterGroup"/>
+      <menu:menuitem menu:id=".uno:LeaveGroup"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:Combine"/>
+      <menu:menuitem menu:id=".uno:Dismantle"/>
+      <menu:menu menu:id=".uno:PolyFormen">
         <menu:menupopup>
-            <menu:menuitem menu:id=".uno:HelpIndex"/>
-            <menu:menuitem menu:id=".uno:ExtendedHelp"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:HelpSupport"/>
-            <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
-            <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:About"/>
+          <menu:menuitem menu:id=".uno:Merge"/>
+          <menu:menuitem menu:id=".uno:Substract"/>
+          <menu:menuitem menu:id=".uno:Intersect"/>
         </menu:menupopup>
-    </menu:menu>
+      </menu:menu>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:Connect"/>
+      <menu:menuitem menu:id=".uno:Break"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:WindowList">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:NewWindow"/>
+      <menu:menuitem menu:id=".uno:CloseWin"/>
+      <menu:menuseparator/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:HelpMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:HelpIndex"/>
+      <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:HelpSupport"/>
+      <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:About"/>
+    </menu:menupopup>
+  </menu:menu>
 </menu:menubar>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 03d4c238e360..59bf75aa1025 100644..100755
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -99,8 +99,8 @@
                 </menu:menupopup>
             </menu:menu>
             <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:RightPane"/>
-            <menu:menuitem menu:id=".uno:LeftPaneImpress"/>
+      <menu:menuitem menu:id=".uno:TaskPane"/>
+      <menu:menuitem menu:id=".uno:LeftPaneImpress"/>
             <menu:menuitem menu:id=".uno:AvailableToolbars"/>
             <menu:menuitem menu:id=".uno:StatusBarVisible"/>
             <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
diff --git a/sd/workben/custompanel/ctp_panel.cxx b/sd/workben/custompanel/ctp_panel.cxx
new file mode 100644
index 000000000000..f36dd897736c
--- /dev/null
+++ b/sd/workben/custompanel/ctp_panel.cxx
@@ -0,0 +1,249 @@
+/*************************************************************************
+ * 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_sd.hxx"
+
+#include "ctp_panel.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/drawing/framework/XPane.hpp>
+#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>
+/** === 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::drawing::framework::XConfigurationController;
+    using ::com::sun::star::drawing::framework::XResourceId;
+    using ::com::sun::star::uno::XComponentContext;
+    using ::com::sun::star::drawing::framework::XPane;
+    using ::com::sun::star::awt::XWindow;
+    using ::com::sun::star::rendering::XCanvas;
+    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;
+    /** === end UNO using === **/
+    namespace WindowAttribute = ::com::sun::star::awt::WindowAttribute;
+    namespace PosSize = ::com::sun::star::awt::PosSize;
+
+    //==================================================================================================================
+    //= 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< XConfigurationController >& i_rConfigController, const Reference< XResourceId >& i_rResourceId )
+        :SingleColorPanel_Base( m_aMutex )
+        ,m_xContext( i_rContext )
+        ,m_xResourceId( i_rResourceId )
+        ,m_xWindow()
+    {
+        ENSURE_OR_THROW( i_rConfigController.is(), "invalid configuration controller" );
+        ENSURE_OR_THROW( m_xResourceId.is(), "invalid resource id" );
+
+        // retrieve the parent window for our to-be-created pane window
+        Reference< XWindow > xParentWindow;
+        Reference< XWindowPeer > xParentPeer;
+        try
+        {
+            Reference< XResource > xAnchor( i_rConfigController->getResource( m_xResourceId->getAnchor() ), UNO_SET_THROW );
+            Reference< XPane > xAnchorPane( xAnchor, UNO_QUERY_THROW );
+            xParentWindow.set( xAnchorPane->getWindow(), UNO_SET_THROW );
+            xParentPeer.set( xParentWindow, UNO_QUERY_THROW );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        osl_incrementInterlockedCount( &m_refCount );
+        if ( xParentWindow.is() )
+        {
+            m_xWindow = lcl_createPlainWindow_nothrow( m_xContext, xParentPeer );
+            m_xWindow->addPaintListener( this );
+            if ( m_xWindow.is() )
+            {
+                const Rectangle aPanelAnchorSize( xParentWindow->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.get() )
+            throw DisposedException( ::rtl::OUString(), *this );
+        return m_xWindow;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL SingleColorPanel::createAccessible( const Reference< XAccessible >& i_rParentAccessible ) throw (RuntimeException)
+    {
+        (void)i_rParentAccessible;
+        return Reference< XAccessible >( m_xWindow, UNO_QUERY );
+        // TODO: this is, strictly, not correct, as we ignore i_ParentAccessible here. If you are not doing a sample
+        // extension only, you'll want to do this correctly ....
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XResourceId > SAL_CALL SingleColorPanel::getResourceId(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( !m_xWindow.is() )
+            throw DisposedException( ::rtl::OUString(), *this );
+        return m_xResourceId;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Bool SAL_CALL SingleColorPanel::isAnchorOnly(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( !m_xWindow.is() )
+            throw DisposedException( ::rtl::OUString(), *this );
+        return sal_False;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    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( 0x80 << 8 );
+            xGraphics->setLineColor( 0x80 << 16 );
+
+            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();
+    }
+
+//......................................................................................................................
+} } // namespace sd::colortoolpanel
+//......................................................................................................................
diff --git a/sd/workben/custompanel/ctp_panel.hxx b/sd/workben/custompanel/ctp_panel.hxx
new file mode 100644
index 000000000000..e82d33ea1b4d
--- /dev/null
+++ b/sd/workben/custompanel/ctp_panel.hxx
@@ -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.
+ *
+************************************************************************/
+
+#ifndef SD_WORKBENCH_CTP_PANEL_HXX
+#define SD_WORKBENCH_CTP_PANEL_HXX
+
+/** === begin UNO includes === **/
+#include <com/sun/star/drawing/framework/XView.hpp>
+#include <com/sun/star/ui/XToolPanel.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
+#include <com/sun/star/drawing/framework/XResourceId.hpp>
+#include <com/sun/star/awt/XPaintListener.hpp>
+/** === end UNO includes === **/
+
+#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/basemutex.hxx>
+
+#include <boost/scoped_ptr.hpp>
+
+//......................................................................................................................
+namespace sd { namespace colortoolpanel
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= class SingleColorPanel
+    //==================================================================================================================
+    typedef ::cppu::WeakComponentImplHelper3    <   ::com::sun::star::drawing::framework::XView
+                                                ,   ::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::drawing::framework::XConfigurationController >& i_rConfigController,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >& i_rResourceId
+        );
+
+        // 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 >& ParentAccessible ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XView
+        // (no methods)
+
+        // XResource
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId > SAL_CALL getResourceId(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL isAnchorOnly(  ) 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::uno::XComponentContext >            m_xContext;
+        ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId >   m_xResourceId;
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >                      m_xWindow;
+    };
+
+//......................................................................................................................
+} } // namespace sd::colortoolpanel
+//......................................................................................................................
+
+#endif // SD_WORKBENCH_CTP_PANEL_HXX