#i89450# removed unused code

32 files changed, 169 insertions, 1022 deletions

diff --git a/sd/source/ui/toolpanel/EmptyWindow.cxx b/sd/source/ui/toolpanel/EmptyWindow.cxx
deleted file mode 100644
index 2e964fa4e30b..000000000000
--- a/sd/source/ui/toolpanel/EmptyWindow.cxx
+++ /dev/null
@@ -1,96 +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 "EmptyWindow.hxx"
-
-namespace sd { namespace toolpanel {
-
-
-EmptyWindow::EmptyWindow (
-        Window* pParentWindow,
-        Color aBackgroundColor,
-        const String& rText)
-    : Window (pParentWindow, WinBits()),
-      msText (rText)
-{
-    SetBackground (aBackgroundColor);
-}
-
-
-
-
-EmptyWindow::~EmptyWindow (void)
-{
-}
-
-
-
-
-void EmptyWindow::Paint (const Rectangle& )
-{
-    Size aWindowSize (GetOutputSizePixel());
-    Point aPosition(aWindowSize.Width()/2,aWindowSize.Height()/2);
-
-    Rectangle aBBox;
-    aPosition = Point(10,aWindowSize.Height()/2);
-    if (GetTextBoundRect (aBBox, msText))
-        aPosition = Point (
-            (aWindowSize.Width()-aBBox.GetWidth())/2,
-            (aWindowSize.Height()-aBBox.GetHeight())/2);
-    DrawText (aPosition, msText);
-
-    String sSizeString = String::CreateFromInt32(aWindowSize.Width());
-    sSizeString.Append (String::CreateFromAscii(" x "));
-    sSizeString.Append (String::CreateFromInt32(aWindowSize.Height()));
-    if (GetTextBoundRect (aBBox, sSizeString))
-        aPosition = Point (
-            (aWindowSize.Width()-aBBox.GetWidth())/2,
-            aPosition.Y() + GetTextHeight() + aBBox.GetHeight());
-    DrawText (aPosition, sSizeString);
-}
-
-
-
-
-void EmptyWindow::Resize (void)
-{
-    Window::Resize();
-}
-
-
-
-
-void EmptyWindow::GetFocus (void)
-{
-    GetParent()->GrabFocus();
-}
-
-
-} } // end of namespace ::sd::tpv
diff --git a/sd/source/ui/toolpanel/EmptyWindow.hxx b/sd/source/ui/toolpanel/EmptyWindow.hxx
deleted file mode 100644
index 4137020874f5..000000000000
--- a/sd/source/ui/toolpanel/EmptyWindow.hxx
+++ /dev/null
@@ -1,57 +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_EMPTY_WINDOW_HXX
-#define SD_EMPTY_WINDOW_HXX
-
-#include <vcl/window.hxx>
-
-namespace sd { namespace toolpanel {
-
-/** Simply paint a solid background and a centered text.
-*/
-class EmptyWindow
-    : public ::Window
-{
-public:
-    EmptyWindow (
-        ::Window* pParentWindow,
-        Color rBackgroundColor,
-        const String& rText);
-    virtual ~EmptyWindow (void);
-
-    virtual void Paint (const Rectangle& rBoundingBox);
-    virtual void Resize (void);
-    virtual void GetFocus (void);
-
-private:
-    String msText;
-};
-
-} } // end of namespace ::sd::toolpanel
-
-#endif
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index a2bb1d0cbbac..6e5a73c3aecc 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -305,14 +305,6 @@ LayoutMenu::~LayoutMenu (void)
 
 
 
-String LayoutMenu::GetSelectedLayoutName (void)
-{
-    return GetItemText (GetSelectItemId());
-}
-
-
-
-
 AutoLayout LayoutMenu::GetSelectedAutoLayout (void)
 {
     AutoLayout aResult = AUTOLAYOUT_NONE;
diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx
index bd121403c2d3..d2f019b5bc34 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.hxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.hxx
@@ -99,10 +99,6 @@ public:
         ViewShellBase& rBase,
         DrawDocShell& rDocShell);
 
-    /** Return the name of the currently selected layout.
-    */
-    String GetSelectedLayoutName (void);
-
     /** Return a numerical value representing the currently selected
         layout.
     */
diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx
index cff065777235..13bb9c8e8d35 100644
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -110,15 +110,6 @@ ScrollPanel::~ScrollPanel (void)
 
 
 
-void ScrollPanel::ListHasChanged (void)
-{
-    mpControlContainer->ListHasChanged ();
-    RequestResize ();
-}
-
-
-
-
 TitledControl* ScrollPanel::AddControl (
     ::std::auto_ptr<TreeNode> pControl,
     const String& rTitle,
diff --git a/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx b/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx
deleted file mode 100644
index 0aa2d3f91760..000000000000
--- a/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx
+++ /dev/null
@@ -1,98 +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 "SimpleLayoutWrapper.hxx"
-
-#include <vcl/window.hxx>
-
-namespace sd { namespace toolpanel {
-
-SimpleLayoutWrapper::SimpleLayoutWrapper (
-    ::std::auto_ptr< ::Window> pWindow,
-    int nPreferredWidth,
-    int nPreferredHeight,
-    bool bIsResizable)
-    : mpWindow (pWindow),
-      mnPreferredWidth(nPreferredWidth),
-      mnPreferredHeight(nPreferredHeight),
-      mbIsResizable (bIsResizable)
-{
-}
-
-
-
-
-SimpleLayoutWrapper::~SimpleLayoutWrapper (void)
-{
-}
-
-
-
-
-Size SimpleLayoutWrapper::GetPreferredSize (void)
-{
-    return Size (mnPreferredWidth, mnPreferredHeight);
-}
-
-
-
-
-sal_Int32 SimpleLayoutWrapper::GetPreferredWidth (sal_Int32)
-{
-    return mnPreferredWidth;
-}
-
-
-
-
-sal_Int32 SimpleLayoutWrapper::GetPreferredHeight (sal_Int32)
-{
-    return mnPreferredHeight;
-}
-
-
-
-
-bool SimpleLayoutWrapper::IsResizable (void)
-{
-    return mbIsResizable;
-}
-
-
-
-
-::Window* SimpleLayoutWrapper::GetWindow (void)
-{
-    return mpWindow.get();
-}
-
-
-} } // end of namespace ::sd::toolpanel
-
diff --git a/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx b/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx
deleted file mode 100644
index a05d9d6ff295..000000000000
--- a/sd/source/ui/toolpanel/SimpleLayoutWrapper.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_TASKPANE_SIMPLE_LAYOUT_WRAPPER_HXX
-#define SD_TASKPANE_SIMPLE_LAYOUT_WRAPPER_HXX
-
-#include "taskpane/ILayoutableWindow.hxx"
-
-#include <memory>
-
-namespace sd { namespace toolpanel {
-
-
-/** Simple wrapper arround a regular VCL window that implements the
-    methods that return the preferred size of the window.  They are
-    given once to the constructor and are not modified by the wrapper.
-*/
-class SimpleLayoutWrapper
-    : public virtual ILayoutableWindow
-{
-public:
-    SimpleLayoutWrapper (
-        ::std::auto_ptr< ::Window> pWindow,
-        int nPreferredWidth,
-        int nPreferredHeight,
-        bool bIsResizable);
-    virtual ~SimpleLayoutWrapper (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);
-
-    using sd::toolpanel::ILayoutableWindow::GetPreferredWidth;
-    using sd::toolpanel::ILayoutableWindow::GetPreferredHeight;
-private:
-    ::std::auto_ptr< ::Window> mpWindow;
-    int mnPreferredWidth;
-    int mnPreferredHeight;
-    bool mbIsResizable;
-};
-
-} } // end of namespace ::sd::toolpanel
-
-#endif
diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx
index 31c29f4f1c08..06b63ae2da85 100644
--- a/sd/source/ui/toolpanel/SubToolPanel.cxx
+++ b/sd/source/ui/toolpanel/SubToolPanel.cxx
@@ -86,64 +86,6 @@ SubToolPanel::~SubToolPanel (void)
 
 
 
-void SubToolPanel::ListHasChanged (void)
-{
-    mpControlContainer->ListHasChanged ();
-    RequestResize ();
-}
-
-
-
-
-void SubToolPanel::AddControl (
-    ::std::auto_ptr<TreeNode> pControl,
-    const String& rTitle,
-    ULONG nHelpId)
-{
-    pControl->GetWindow()->AddEventListener (
-        LINK(this,SubToolPanel,WindowEventListener));
-
-    // We are interested only in the title.  The control itself is
-    // managed by the content object.
-    TitledControl* pTitledControl = new TitledControl(
-        this,
-        pControl,
-        rTitle,
-        TitledControlStandardClickHandler(GetControlContainer(), ControlContainer::ES_TOGGLE),
-        TitleBar::TBT_SUB_CONTROL_HEADLINE);
-    pTitledControl->GetWindow()->SetParent(this);
-    pTitledControl->GetWindow()->SetHelpId(nHelpId);
-    ::std::auto_ptr<TreeNode> pChild (pTitledControl);
-
-    // Add a down link only for the first control so that when
-    // entering the sub tool panel the focus is set to the first control.
-    if (mpControlContainer->GetControlCount() == 0)
-        FocusManager::Instance().RegisterDownLink(GetParent(), pTitledControl->GetWindow());
-    FocusManager::Instance().RegisterUpLink(pTitledControl->GetWindow(), GetParent());
-
-    mpControlContainer->AddControl (pChild);
-}
-
-
-
-
-void SubToolPanel::AddControl (::std::auto_ptr<TreeNode> pControl)
-{
-    pControl->GetWindow()->AddEventListener (
-        LINK(this,SubToolPanel,WindowEventListener));
-
-    // Add a down link only for the first control so that when
-    // entering the sub tool panel the focus is set to the first control.
-    if (mpControlContainer->GetControlCount() == 0)
-        FocusManager::Instance().RegisterDownLink(GetParent(), pControl->GetWindow());
-    FocusManager::Instance().RegisterUpLink(pControl->GetWindow(), GetParent());
-
-    mpControlContainer->AddControl (pControl);
-}
-
-
-
-
 void SubToolPanel::Paint (const Rectangle& rRect)
 {
     if (mbIsRearrangePending)
diff --git a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx
index 5a4875340840..b1556c53d3d2 100644
--- a/sd/source/ui/toolpanel/TaskPaneShellManager.cxx
+++ b/sd/source/ui/toolpanel/TaskPaneShellManager.cxx
@@ -76,19 +76,6 @@ void TaskPaneShellManager::ReleaseShell (SfxShell* )
     // Nothing to do.
 }
 
-// hack for annotation panel, better fix?
-void TaskPaneShellManager_AddSubShell ( TaskPaneShellManager* pManager, sal_Int32 nId, SfxShell* pShell, ::Window* pWindow )
-{
-    if( pManager != NULL )
-        pManager->AddSubShell( (ShellId)nId, pShell, pWindow );
-}
-
-void TaskPaneShellManager_RemoveSubShell ( TaskPaneShellManager* pManager, const SfxShell* pShell)
-{
-    if( pManager != NULL )
-        pManager->RemoveSubShell( pShell );
-}
-
 void TaskPaneShellManager::AddSubShell (
     ShellId nId,
     SfxShell* pShell,
diff --git a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
index 152f576bd5bc..4e0daacb74b1 100644
--- a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
+++ b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
@@ -55,22 +55,6 @@ TreeNode::~TreeNode (void)
 
 
 
-bool TreeNode::IsLeaf (void)
-{
-    return (mpControlContainer.get()==NULL);
-}
-
-
-
-
-bool TreeNode::IsRoot (void)
-{
-    return (mpParent==NULL);
-}
-
-
-
-
 void TreeNode::SetParentNode (TreeNode* pNewParent)
 {
     mpParent = pNewParent;
@@ -288,18 +272,6 @@ void TreeNode::AddStateChangeListener (const Link& rListener)
 
 
 
-void TreeNode::RemoveStateChangeListener (const Link& rListener)
-{
-    maStateChangeListeners.erase (
-        ::std::find (
-            maStateChangeListeners.begin(),
-            maStateChangeListeners.end(),
-            rListener));
-}
-
-
-
-
 void TreeNode::FireStateChangeEvent (
     TreeNodeStateChangeEventId eEventId,
     TreeNode* pChild) const
diff --git a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx
index d80beba7cd10..b2f91d8aa0ba 100644
--- a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx
+++ b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx
@@ -46,8 +46,6 @@
 #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"
@@ -75,6 +73,7 @@
 #include <svx/colrctrl.hxx>
 #include <svx/xtable.hxx>
 #include <vcl/dockwin.hxx>
+#include <vcl/toolbox.hxx>
 #include "sdtreelb.hxx"
 #include "DrawViewShell.hxx"
 #include "drawdoc.hxx"
@@ -135,13 +134,6 @@ public:
     */
     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
@@ -622,21 +614,6 @@ SdPage* TaskPaneViewShell::getCurrentPage(void) const
 
 
 
-void TaskPaneViewShell::Execute (SfxRequest& )
-{
-}
-
-
-
-
-void TaskPaneViewShell::GetState (SfxItemSet& rItemSet)
-{
-    (void)rItemSet;
-}
-
-
-
-
 TaskPaneShellManager& TaskPaneViewShell::GetSubShellManager (void) const
 {
     return *mpSubShellManager.get();
@@ -675,21 +652,6 @@ void TaskPaneViewShell::ShowPanel (const PanelId nPublicId)
 
 
 
-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();
@@ -809,19 +771,6 @@ void TaskPaneViewShell::Implementation::AddPanel (
 
 
 
-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
@@ -840,27 +789,6 @@ sal_uInt32
 
 
 
-//===== 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 (
diff --git a/sd/source/ui/toolpanel/TestMenu.cxx b/sd/source/ui/toolpanel/TestMenu.cxx
index 7bfb6adebe8d..a7396cf36999 100644
--- a/sd/source/ui/toolpanel/TestMenu.cxx
+++ b/sd/source/ui/toolpanel/TestMenu.cxx
@@ -37,6 +37,7 @@
 
 namespace sd { namespace toolpanel {
 
+#ifdef SHOW_COLOR_MENU
 /** This factory class is used to create instances of ColorMenu.  It can be
     extended so that its constructor stores arguments that later are passed
     to new ColorMenu objects.
@@ -82,16 +83,12 @@ ColorMenu::~ColorMenu (void)
 }
 
 
-
-
 ::std::auto_ptr<ControlFactory> ColorMenu::CreateControlFactory (void)
 {
     return ::std::auto_ptr<ControlFactory>(new ColorMenuFactory());
 }
 
 
-
-
 /** The preferred size depends on the preferred number of columns, the
     number of items, and the size of the items.
 */
@@ -316,5 +313,6 @@ void ColorMenu::Fill (void)
     maSet.InsertItem (++i, rSettings.GetFontColor());
     maSet.SetItemText (i, String::CreateFromAscii("FontColor"));
 }
+#endif
 
 } } // end of namespace ::sd::toolpanel
diff --git a/sd/source/ui/toolpanel/TestMenu.hxx b/sd/source/ui/toolpanel/TestMenu.hxx
index 37ac6542970d..d1df4c9f4f5a 100644
--- a/sd/source/ui/toolpanel/TestMenu.hxx
+++ b/sd/source/ui/toolpanel/TestMenu.hxx
@@ -39,6 +39,8 @@ namespace sd { namespace toolpanel {
 
 class ControlFactory;
 
+#ifdef SHOW_COLOR_MENU
+
 /** This demo menu shows the colors that are available from the
     StyleSettings.
 */
@@ -75,6 +77,7 @@ private:
     int CalculateRowCount (const Size& rItemSize, int nColumnCount);
     void Fill (void);
 };
+#endif
 
 } } // end of namespace ::sd::toolpanel
 
diff --git a/sd/source/ui/toolpanel/TestPanel.cxx b/sd/source/ui/toolpanel/TestPanel.cxx
index e2786e23a0c5..2b05769e0db7 100644
--- a/sd/source/ui/toolpanel/TestPanel.cxx
+++ b/sd/source/ui/toolpanel/TestPanel.cxx
@@ -37,6 +37,7 @@
 
 namespace sd { namespace toolpanel {
 
+#ifdef SHOW_TEST_PANEL
 /** 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.
@@ -163,13 +164,11 @@ TestPanel::~TestPanel (void)
 {
 }
 
-
-
-
 std::auto_ptr<ControlFactory> TestPanel::CreateControlFactory (void)
 {
     return std::auto_ptr<ControlFactory>(new TestPanelFactory());
 }
+#endif
 
 
 } } // end of namespace ::sd::toolpanel
diff --git a/sd/source/ui/toolpanel/TestPanel.hxx b/sd/source/ui/toolpanel/TestPanel.hxx
index f883cc08c1e1..77b075df2660 100644
--- a/sd/source/ui/toolpanel/TestPanel.hxx
+++ b/sd/source/ui/toolpanel/TestPanel.hxx
@@ -36,6 +36,8 @@ namespace sd { namespace toolpanel {
 class ControlFactory;
 class TreeNode;
 
+#ifdef SHOW_TEST_PANEL
+
 /** This panel demonstrates how to create a panel for the task pane.
 */
 class TestPanel
@@ -48,6 +50,8 @@ public:
     static std::auto_ptr<ControlFactory> CreateControlFactory (void);
 };
 
+#endif
+
 } } // end of namespace ::sd::toolpanel
 
 #endif
diff --git a/sd/source/ui/toolpanel/TitleToolBox.cxx b/sd/source/ui/toolpanel/TitleToolBox.cxx
deleted file mode 100644
index 57cbac3fe132..000000000000
--- a/sd/source/ui/toolpanel/TitleToolBox.cxx
+++ /dev/null
@@ -1,116 +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 "TitleToolBox.hxx"
-
-#include "res_bmp.hrc"
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include "sdresid.hxx"
-#include <rtl/ustring.hxx>
-
-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()));
-}
-
-
-
-
-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);
-
-    if (rDCEvt.GetFlags() & SETTINGS_STYLE)
-    {
-        SetBackground (
-            Wallpaper (GetSettings().GetStyleSettings().GetDialogColor()));
-    }
-}
-
-
-
-
-} } // end of namespace ::sd::toolbox
diff --git a/sd/source/ui/toolpanel/TitleToolBox.hxx b/sd/source/ui/toolpanel/TitleToolBox.hxx
deleted file mode 100644
index 9433706579df..000000000000
--- a/sd/source/ui/toolpanel/TitleToolBox.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_TOOLBOX_TITLETOOLBOX_HXX
-#define SD_TOOLBOX_TITLETOOLBOX_HXX
-
-#include <vcl/toolbox.hxx>
-
-class PushButton;
-
-namespace sd { namespace toolpanel {
-
-/** Copied from vcl/menu.cxx
-// To get the transparent mouse-over look, the TitleToolBox is actually a toolbox
-// overload DataChange to handle style changes correctly
-*/
-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
-
-#endif
diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx
index 7930bb4cd7f1..eb84e4f72373 100644
--- a/sd/source/ui/toolpanel/TitledControl.cxx
+++ b/sd/source/ui/toolpanel/TitledControl.cxx
@@ -359,22 +359,6 @@ void TitledControl::SetEnabledState(bool bFlag)
 
 
 
-void TitledControl::SetUserData (void* pUserData)
-{
-    mpUserData = pUserData;
-}
-
-
-
-
-void* TitledControl::GetUserData (void) const
-{
-    return mpUserData;
-}
-
-
-
-
 bool TitledControl::IsShowing (void) const
 {
     return mbVisible;
diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx
index 89ab9397d4ee..e6621b1f544d 100644
--- a/sd/source/ui/toolpanel/ToolPanel.cxx
+++ b/sd/source/ui/toolpanel/ToolPanel.cxx
@@ -125,15 +125,6 @@ sal_uInt32 ToolPanel::AddControl (
 
 
 
-void ToolPanel::ListHasChanged (void)
-{
-    mpControlContainer->ListHasChanged ();
-    Rearrange ();
-}
-
-
-
-
 void ToolPanel::Resize (void)
 {
     Control::Resize();
diff --git a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx
index c4fc41e97744..730fc74795f2 100644
--- a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx
+++ b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.cxx
@@ -24,7 +24,93 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: AnimationSchemesPanel.cxx,v $
+ * $Revision: 1.6 $
+ *
+ * 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 "AnimationSchemesPanel.hxx"
+
+#include "strings.hrc"
+#include "sdresid.hxx"
+#include <com/sun/star/frame/XModel.hpp>
+
+namespace sd
+{
+
+    class ViewShellBase;
+    extern ::Window * createAnimationSchemesPanel( ::Window* pParent, ViewShellBase& rBase );
+
+namespace toolpanel { namespace controls {
 
+
+AnimationSchemesPanel::AnimationSchemesPanel(TreeNode* pParent, ViewShellBase& rBase)
+    : SubToolPanel (pParent),
+      maPreferredSize( 100, 200 )
+{
+    mpWrappedControl = createAnimationSchemesPanel( pParent->GetWindow(), rBase );
+    mpWrappedControl->Show();
+}
+
+AnimationSchemesPanel::~AnimationSchemesPanel()
+{
+    delete mpWrappedControl;
+}
+
+Size AnimationSchemesPanel::GetPreferredSize()
+{
+    return maPreferredSize;
+}
+sal_Int32 AnimationSchemesPanel::GetPreferredWidth(sal_Int32 )
+{
+    return maPreferredSize.Width();
+}
+sal_Int32 AnimationSchemesPanel::GetPreferredHeight(sal_Int32 )
+{
+    return maPreferredSize.Height();
+}
+::Window* AnimationSchemesPanel::GetWindow()
+{
+    return mpWrappedControl;
+}
+bool AnimationSchemesPanel::IsResizable()
+{
+    return true;
+}
+bool AnimationSchemesPanel::IsExpandable() const
+{
+    return true;
+}
+
+
+} } } // end of namespace ::sd::toolpanel::controls
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 #include "AnimationSchemesPanel.hxx"
diff --git a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx
index 4cee546dae0d..dd3388fb0342 100644
--- a/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx
+++ b/sd/source/ui/toolpanel/controls/AnimationSchemesPanel.hxx
@@ -24,6 +24,35 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: AnimationSchemesPanel.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * 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_TASKPANE_CONTROLS_ANIMATION_SCHEMES_PANEL_HXX
 #define SD_TASKPANE_CONTROLS_ANIMATION_SCHEMES_PANEL_HXX
@@ -66,3 +95,44 @@ private:
 } } } // end of namespace ::sd::toolpanel::controls
 
 #endif
+#ifndef SD_TASKPANE_CONTROLS_ANIMATION_SCHEMES_PANEL_HXX
+#define SD_TASKPANE_CONTROLS_ANIMATION_SCHEMES_PANEL_HXX
+
+#include "taskpane/SubToolPanel.hxx"
+
+namespace sd {
+class ViewShellBase;
+}
+
+namespace sd { namespace toolpanel {
+class TreeNode;
+} }
+
+namespace sd { namespace toolpanel { namespace controls {
+
+class AnimationSchemesPanel
+    : public SubToolPanel
+{
+public:
+    AnimationSchemesPanel (
+        TreeNode* pParent,
+        ViewShellBase& rBase);
+    virtual ~AnimationSchemesPanel (void);
+
+    virtual Size GetPreferredSize (void);
+    virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeigh);
+    virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth);
+    virtual ::Window* GetWindow (void);
+    virtual bool IsResizable (void);
+    virtual bool IsExpandable (void) const;
+
+    using Window::GetWindow;
+
+private:
+    Size maPreferredSize;
+    ::Window* mpWrappedControl;
+};
+
+} } } // end of namespace ::sd::toolpanel::controls
+
+#endif
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
index 444ecd6dacb4..80a094ec1a66 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
@@ -73,24 +73,6 @@ namespace {
 
 typedef ::std::vector<SharedMasterPageDescriptor> MasterPageContainerType;
 
-
-class PreviewCreationRequest
-{
-public:
-    PreviewCreationRequest (MasterPageContainer::Token aToken, int nPriority);
-    MasterPageContainer::Token maToken;
-    int mnPriority;
-    class Compare {public:
-        bool operator() (const PreviewCreationRequest& r1,const PreviewCreationRequest& r2);
-    };
-    class CompareToken {public:
-        MasterPageContainer::Token maToken;
-        CompareToken(MasterPageContainer::Token aToken);
-        bool operator() (const PreviewCreationRequest& rRequest);
-    };
-};
-
-
 } // end of anonymous namespace
 
 
@@ -423,28 +405,6 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForURL (
 
 
 
-MasterPageContainer::Token MasterPageContainer::GetTokenForPageName (
-    const String& sPageName)
-{
-    const ::osl::MutexGuard aGuard (mpImpl->maMutex);
-
-    Token aResult (NIL_TOKEN);
-    if (sPageName.Len() > 0)
-    {
-        MasterPageContainerType::iterator iEntry (
-            ::std::find_if (
-                mpImpl->maContainer.begin(),
-                mpImpl->maContainer.end(),
-                MasterPageDescriptor::PageNameComparator(sPageName)));
-        if (iEntry != mpImpl->maContainer.end())
-            aResult = (*iEntry)->maToken;
-    }
-    return aResult;
-}
-
-
-
-
 MasterPageContainer::Token MasterPageContainer::GetTokenForStyleName (const String& sStyleName)
 {
     const ::osl::MutexGuard aGuard (mpImpl->maMutex);
@@ -589,46 +549,6 @@ sal_Int32 MasterPageContainer::GetTemplateIndexForToken (Token aToken)
 
 
 
-void MasterPageContainer::SetPreviewProviderForToken (
-    Token aToken,
-    const ::boost::shared_ptr<PreviewProvider>& rpPreviewProvider)
-{
-    const ::osl::MutexGuard aGuard (mpImpl->maMutex);
-
-    SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken);
-    if (pDescriptor.get()!=NULL)
-    {
-        pDescriptor->mpPreviewProvider = rpPreviewProvider;
-        mpImpl->InvalidatePreview(aToken);
-    }
-}
-
-
-
-
-SdPage* MasterPageContainer::GetSlideForToken (
-    MasterPageContainer::Token aToken,
-    bool bLoad)
-{
-    const ::osl::MutexGuard aGuard (mpImpl->maMutex);
-
-    SdPage* pSlide = NULL;
-    SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken);
-    if (pDescriptor.get() != NULL)
-    {
-        pSlide = pDescriptor->mpSlide;
-        if (pSlide==NULL && bLoad)
-        {
-            GetPageObjectForToken(aToken, bLoad);
-            pSlide = pDescriptor->mpSlide;
-        }
-    }
-    return pSlide;
-}
-
-
-
-
 SharedMasterPageDescriptor MasterPageContainer::GetDescriptorForToken (
     MasterPageContainer::Token aToken)
 {
@@ -639,19 +559,6 @@ SharedMasterPageDescriptor MasterPageContainer::GetDescriptorForToken (
 
 
 
-
-bool MasterPageContainer::UpdateDescriptor (
-    const SharedMasterPageDescriptor& rpDescriptor,
-    bool bForcePageObject,
-    bool bForcePreview,
-    bool bSendEvents)
-{
-    return mpImpl->UpdateDescriptor(rpDescriptor, bForcePageObject, bForcePreview, bSendEvents);
-}
-
-
-
-
 void MasterPageContainer::InvalidatePreview (MasterPageContainer::Token aToken)
 {
     mpImpl->InvalidatePreview(aToken);
@@ -1311,58 +1218,3 @@ void MasterPageContainer::Implementation::FillingDone (void)
 
 
 } } } // end of namespace ::sd::toolpanel::controls
-
-
-
-
-namespace {
-
-//===== PreviewCreationRequest ================================================
-
-PreviewCreationRequest::PreviewCreationRequest (
-    MasterPageContainer::Token aToken,
-    int nPriority)
-    : maToken(aToken),
-      mnPriority(nPriority)
-{
-}
-
-
-
-
-bool PreviewCreationRequest::Compare::operator() (
-    const PreviewCreationRequest& aRequest1,
-    const PreviewCreationRequest& aRequest2)
-{
-    if (aRequest1.mnPriority != aRequest2.mnPriority)
-    {
-        // Prefer requests with higher priority.
-        return aRequest1.mnPriority > aRequest2.mnPriority;
-    }
-    else
-    {
-        // Prefer tokens that have been earlier created (those with lower
-        // value).
-        return aRequest1.maToken < aRequest2.maToken;
-    }
-}
-
-
-
-
-PreviewCreationRequest::CompareToken::CompareToken (MasterPageContainer::Token aToken)
-    : maToken(aToken)
-{
-}
-
-
-
-
-bool PreviewCreationRequest::CompareToken::operator() (const PreviewCreationRequest& aRequest)
-{
-    return maToken==aRequest.maToken;
-}
-
-
-
-} // end of anonymous namespace
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx
index d922c089ffb4..60f760f63e34 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx
@@ -143,26 +143,16 @@ public:
     Token GetTokenForIndex (int nIndex);
 
     Token GetTokenForURL (const String& sURL);
-    Token GetTokenForPageName (const String& sPageName);
     Token GetTokenForStyleName (const String& sStyleName);
     Token GetTokenForPageObject (const SdPage* pPage);
 
     String GetURLForToken (Token aToken);
     String GetPageNameForToken (Token aToken);
     String GetStyleNameForToken (Token aToken);
-    SdPage* GetSlideForToken (Token aToken, bool bLoad=true);
     SdPage* GetPageObjectForToken (Token aToken, bool bLoad=true);
     Origin GetOriginForToken (Token aToken);
     sal_Int32 GetTemplateIndexForToken (Token aToken);
     ::boost::shared_ptr<MasterPageDescriptor> GetDescriptorForToken (Token aToken);
-    bool UpdateDescriptor (
-        const ::boost::shared_ptr<MasterPageDescriptor>& rpDescriptor,
-        bool bForcePageObject,
-        bool bForcePreview,
-        bool bSendEvents);
-
-    void SetPreviewProviderForToken (Token aToken,
-        const ::boost::shared_ptr<PreviewProvider>& rpPreviewProvider);
 
     void InvalidatePreview (Token aToken);
 
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
index 6b9ff09bbed3..e45fed2c9c1b 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
@@ -386,46 +386,6 @@ bool DefaultPageObjectProvider::operator== (const PageObjectProvider& rProvider)
 
 
 
-//===== DefaultPagePreviewProvider ============================================
-
-DefaultPagePreviewProvider::DefaultPagePreviewProvider (void)
-{
-}
-
-
-
-Image DefaultPagePreviewProvider::operator() (
-    int nWidth,
-    SdPage* pPage,
-    ::sd::PreviewRenderer& rRenderer)
-{
-    // Unused parameters.
-    (void)nWidth;
-    (void)pPage;
-    (void)rRenderer;
-
-    return Image();
-}
-
-
-
-
-int DefaultPagePreviewProvider::GetCostIndex (void)
-{
-    return 0;
-}
-
-
-
-
-bool DefaultPagePreviewProvider::NeedsPageObject (void)
-{
-    return false;
-}
-
-
-
-
 //===== ExistingPageProvider ==================================================
 
 ExistingPageProvider::ExistingPageProvider (SdPage* pPage)
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx
index 7cde148b3e3d..071b23cdbb16 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx
@@ -170,21 +170,6 @@ public:
 
 
 
-
-/** Used temporarily to avoid the (expensive) creation of the default page
-    too early.
-*/
-class DefaultPagePreviewProvider : public PreviewProvider
-{
-public:
-    DefaultPagePreviewProvider (void);
-    virtual Image operator() (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer);
-    virtual int GetCostIndex (void);
-    virtual bool NeedsPageObject (void);
-};
-
-
-
 /** This implementation of the PageObjectProvider simply returns an already
     existing master page object.
 */
diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
index 49ae6dff264d..6871883d65f5 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
@@ -337,28 +337,6 @@ bool MasterPageDescriptor::URLComparator::operator() (
 
 
 
-//===== PageNameComparator ====================================================
-
-MasterPageDescriptor::PageNameComparator::PageNameComparator (const ::rtl::OUString& sPageName)
-    : msPageName(sPageName)
-{
-}
-
-
-
-
-bool MasterPageDescriptor::PageNameComparator::operator() (
-    const SharedMasterPageDescriptor& rDescriptor)
-{
-    if (rDescriptor.get() == NULL)
-        return false;
-    else
-        return rDescriptor->msPageName.equals(msPageName);
-}
-
-
-
-
 // ===== StyleNameComparator ==================================================
 
 MasterPageDescriptor::StyleNameComparator::StyleNameComparator (const ::rtl::OUString& sStyleName)
diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
index 1eea46bd1802..0303989e3379 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
@@ -214,11 +214,6 @@ public:
         URLComparator (const ::rtl::OUString& sURL);
         bool operator() (const SharedMasterPageDescriptor& rDescriptor);
     };
-    class PageNameComparator { public:
-        ::rtl::OUString msPageName;
-        PageNameComparator (const ::rtl::OUString& sPageName);
-        bool operator() (const SharedMasterPageDescriptor& rDescriptor);
-    };
     class StyleNameComparator { public:
         ::rtl::OUString msStyleName;
         StyleNameComparator (const ::rtl::OUString& sStyleName);
diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
index 0f485174009d..2ba0cc678403 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
@@ -187,15 +187,6 @@ MasterPageObserver::~MasterPageObserver (void)
 
 
 
-MasterPageObserver::MasterPageNameSet MasterPageObserver::GetMasterPageNames (
-    SdDrawDocument& rDocument)
-{
-    return mpImpl->GetMasterPageNames (rDocument);
-}
-
-
-
-
 //===== MasterPageObserver::Implementation ====================================
 
 void MasterPageObserver::Implementation::RegisterDocument (
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
index 4571d4278140..b321dbf8dd14 100644
--- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
@@ -41,7 +41,6 @@
 #include "app.hrc"
 #include "res_bmp.hrc"
 #include "strings.hrc"
-#include "showview.hxx"
 #include "DrawViewShell.hxx"
 #include "DrawController.hxx"
 #include "SlideSorterViewShell.hxx"
@@ -699,21 +698,6 @@ void MasterPagesSelector::RemoveTokenToIndexEntry (
 
 
 
-void MasterPagesSelector::InvalidatePreview (MasterPageContainer::Token aToken)
-{
-    const ::osl::MutexGuard aGuard (maMutex);
-
-    int nIndex (GetIndexForToken(aToken));
-    if (nIndex > 0)
-    {
-        mpContainer->InvalidatePreview(aToken);
-        mpContainer->RequestPreview(aToken);
-    }
-}
-
-
-
-
 void MasterPagesSelector::InvalidatePreview (const SdPage* pPage)
 {
     const ::osl::MutexGuard aGuard (maMutex);
@@ -734,20 +718,6 @@ void MasterPagesSelector::InvalidatePreview (const SdPage* pPage)
     }
 }
 
-
-
-
-void MasterPagesSelector::InvalidateAllPreviews (void)
-{
-    const ::osl::MutexGuard aGuard (maMutex);
-
-    for (USHORT nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++)
-        InvalidatePreview(nIndex);
-}
-
-
-
-
 void MasterPagesSelector::UpdateAllPreviews (void)
 {
     const ::osl::MutexGuard aGuard (maMutex);
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
index a480729aa9c8..a2df51f2bd4b 100644
--- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
@@ -131,14 +131,8 @@ public:
             Index into the value set control that is used for displaying the
             previews.
     */
-    void InvalidatePreview (MasterPageContainer::Token aToken);
     void InvalidatePreview (const SdPage* pPage);
 
-    /** Mark all previews as no being up-to-date anymore.  This method is
-        typically called when the size of the previews has changed.
-    */
-    void InvalidateAllPreviews (void);
-
     void UpdateAllPreviews (void);
 
 protected:
diff --git a/sd/source/ui/toolpanel/controls/makefile.mk b/sd/source/ui/toolpanel/controls/makefile.mk
index 33871a415a7e..b2218e55008c 100644
--- a/sd/source/ui/toolpanel/controls/makefile.mk
+++ b/sd/source/ui/toolpanel/controls/makefile.mk
@@ -59,8 +59,7 @@ SLOFILES =      							\
     $(SLO)$/RecentMasterPagesSelector.obj	\
     $(SLO)$/CustomAnimationPanel.obj		\
     $(SLO)$/SlideTransitionPanel.obj		\
-    $(SLO)$/TableDesignPanel.obj			\
-    $(SLO)$/AnimationSchemesPanel.obj
+    $(SLO)$/TableDesignPanel.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sd/source/ui/toolpanel/makefile.mk b/sd/source/ui/toolpanel/makefile.mk
index 08a966fe4061..e59e37ff9e03 100644
--- a/sd/source/ui/toolpanel/makefile.mk
+++ b/sd/source/ui/toolpanel/makefile.mk
@@ -45,10 +45,8 @@ PRJINC=..$/slidesorter
 SLOFILES =      								\
     $(SLO)$/ControlContainer.obj				\
     $(SLO)$/ScrollPanel.obj						\
-    $(SLO)$/SimpleLayoutWrapper.obj				\
     $(SLO)$/SubToolPanel.obj					\
     $(SLO)$/TitleBar.obj 						\
-    $(SLO)$/TitleToolBox.obj					\
     $(SLO)$/TitledControl.obj 					\
     $(SLO)$/ToolPanel.obj						\
     $(SLO)$/TaskPaneControlFactory.obj 			\
@@ -57,7 +55,6 @@ SLOFILES =      								\
     $(SLO)$/TaskPaneTreeNode.obj 			    \
     $(SLO)$/TaskPaneViewShell.obj 				\
                                                 \
-    $(SLO)$/EmptyWindow.obj						\
     $(SLO)$/LayoutMenu.obj                      \
     $(SLO)$/TestMenu.obj                        \
     $(SLO)$/TestPanel.obj						\